From 1055304fd43eb84cf642d3c5dc7235abe7cec545 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@localhost.localdomain>
Date: Thu, 18 Aug 2011 06:56:11 +0200
Subject: [PATCH 001/344] Update to 5.28.00f

---
 root.spec | 20 +++++++++++++-------
 sources   |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/root.spec b/root.spec
index 5ccaa3a..7332d04 100644
--- a/root.spec
+++ b/root.spec
@@ -18,9 +18,9 @@
 %endif
 
 Name:		root
-Version:	5.28.00e
+Version:	5.28.00f
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -1064,7 +1064,7 @@ rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
 rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
 sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
 #  * unuran
-rm -rf math/unuran/src/unuran-1.5.1-root.tar.gz
+rm -rf math/unuran/src/*.tar.gz
 #  * xrootd
 rm -rf net/xrootd/src
 
@@ -1122,15 +1122,15 @@ unset QTINC
 	    --enable-editline \
 	    --enable-exceptions \
 	    --enable-explicitlink \
-	    --enable-fitsio \
 	    --enable-fftw3 \
+	    --enable-fitsio \
 	    --enable-gdml \
+	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
 	    --enable-krb5 \
 	    --enable-ldap \
-	    --enable-genvector \
 	    --enable-mathmore \
 	    --enable-memstat \
 	    --enable-minuit2 \
@@ -1171,6 +1171,7 @@ unset QTINC
 %else
 	    --disable-cintex \
 %endif
+	    --disable-afdsmgrd \
 	    --disable-afs \
 	    --disable-alien \
 	    --disable-alloc \
@@ -1189,13 +1190,15 @@ unset QTINC
 	    --disable-srp \
 	    --fail-on-missing
 
-make OPTFLAGS="%{optflags}" %{?_smp_mflags}
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
 
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 mkdir pyroot26
 cp bindings/pyroot26/ROOT.py pyroot26
-make OPTFLAGS="%{optflags}" %{?_smp_mflags} \
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
 	MODULES="build cint/cint core/utils bindings/pyroot26" \
 	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
 	PYROOTLIB=pyroot26/libPyROOT.so ROOTPY=pyroot26/ROOT.py
@@ -2267,6 +2270,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00f-1
+- Update to 5.28.00f
+
 * Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-2
 - Change build requires from qt-devel to qt4-devel
 
diff --git a/sources b/sources
index efa3738..faa0188 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82d18ee3e2edfd0f1ca737162cdebae6  root-5.28.00e.tar.gz
+1ec8f97214e40455c3cfeec49512810f  root-5.28.00f.tar.gz

From 138fe78ba2d3be255510c688e6f3299d7dd769ca Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 14 Sep 2011 23:03:14 +0200
Subject: [PATCH 002/344] Update to 5.28.00g

---
 root.spec | 5 ++++-
 sources   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 7332d04..383e195 100644
--- a/root.spec
+++ b/root.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name:		root
-Version:	5.28.00f
+Version:	5.28.00g
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -2270,6 +2270,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Sep 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00g-1
+- Update to 5.28.00g
+
 * Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00f-1
 - Update to 5.28.00f
 
diff --git a/sources b/sources
index faa0188..e136fb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ec8f97214e40455c3cfeec49512810f  root-5.28.00f.tar.gz
+3db0a2db880f8744e4a01234d3020909  root-5.28.00g.tar.gz

From 2aabc6531ead1e82b52e5eaf3a0b894382094be6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 13 Jan 2012 20:53:59 -0600
Subject: [PATCH 003/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index fc31e45..f6c7fa8 100644
--- a/root.spec
+++ b/root.spec
@@ -20,7 +20,7 @@
 Name:		root
 Version:	5.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2286,6 +2286,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
 - Update to 5.30.04
 

From d2b52a9934520e30aca9788a12f00a9efeec3fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 10 Feb 2012 13:09:36 +0100
Subject: [PATCH 004/344] Rebuild against PCRE 8.30

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index f6c7fa8..2faa310 100644
--- a/root.spec
+++ b/root.spec
@@ -20,7 +20,7 @@
 Name:		root
 Version:	5.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2286,6 +2286,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
+- Rebuild against PCRE 8.30
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From 01f8f751371ddd32f090295096dda1ff07850f5b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 13 Feb 2012 07:24:08 +0100
Subject: [PATCH 005/344] Update to 5.32.00

---
 root-cern-ppc.patch    |  11 --
 root-fit.patch         |  75 ++++++++++++
 root-globals.patch     | 270 +++++++++++++++++++++++++++++++++++++++++
 root-globus-deps.patch |  30 +++++
 root-html.C            |   8 +-
 root-includelist       |  10 +-
 root-rfio.patch        |  74 +++++++++++
 root-ruby.patch        | 211 ++++++++++++++++++++++++++++++++
 root-xrootd.patch      | 101 ++++++---------
 root.spec              |  63 +++++++---
 sources                |   2 +-
 11 files changed, 746 insertions(+), 109 deletions(-)
 delete mode 100644 root-cern-ppc.patch
 create mode 100644 root-fit.patch
 create mode 100644 root-globals.patch
 create mode 100644 root-globus-deps.patch
 create mode 100644 root-rfio.patch
 create mode 100644 root-ruby.patch

diff --git a/root-cern-ppc.patch b/root-cern-ppc.patch
deleted file mode 100644
index dfba748..0000000
--- a/root-cern-ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-5.26.00d.orig/tutorials/tree/cernbuild.C	2010-08-29 10:20:56.069801363 +0200
-+++ root-5.26.00d/tutorials/tree/cernbuild.C	2010-08-29 15:52:51.000000000 +0200
-@@ -22,7 +22,7 @@
-    TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-    dir.ReplaceAll("cernbuild.C","");
-    dir.ReplaceAll("/./","/");
--   FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
-+   FILE *fp = fopen((dir+"cernstaff.dat").Data(),"r");
- 
-    TFile *hfile = 0;
-    if (get) {
diff --git a/root-fit.patch b/root-fit.patch
new file mode 100644
index 0000000..09a255f
--- /dev/null
+++ b/root-fit.patch
@@ -0,0 +1,75 @@
+diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/Chi2FCN.h root-5.32.00/math/mathcore/inc/Fit/Chi2FCN.h
+--- root-5.32.00.orig/math/mathcore/inc/Fit/Chi2FCN.h	2011-12-02 12:41:53.000000000 +0100
++++ root-5.32.00/math/mathcore/inc/Fit/Chi2FCN.h	2012-02-12 22:45:37.560460921 +0100
+@@ -61,17 +61,14 @@
+    @ingroup  FitMethodFunc   
+ */ 
+ template<class FunType> 
+-class Chi2FCN : public ::ROOT::Math::BasicFitMethodFunction<FunType> {
++class Chi2FCN : public ROOT::Math::BasicFitMethodFunction<FunType> {
+ 
+ public: 
++   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
++   typedef typename BaseObjFunction::BaseFunction BaseFunction; 
+ 
+-
+-
+-   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
+-   typedef typename  BaseObjFunction::BaseFunction BaseFunction; 
+-
+-   //typedef  typename ::ROOT::Math::ParamFunctionTrait<FunType>::PFType IModelFunction;
+-   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
++   //typedef typename ROOT::Math::ParamFunctionTrait<FunType>::PFType IModelFunction;
++   typedef ROOT::Math::IParamMultiFunction IModelFunction;
+    typedef typename BaseObjFunction::Type_t Type_t;
+ 
+    /** 
+diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/LogLikelihoodFCN.h root-5.32.00/math/mathcore/inc/Fit/LogLikelihoodFCN.h
+--- root-5.32.00.orig/math/mathcore/inc/Fit/LogLikelihoodFCN.h	2011-12-02 12:41:53.000000000 +0100
++++ root-5.32.00/math/mathcore/inc/Fit/LogLikelihoodFCN.h	2012-02-12 22:48:57.058092616 +0100
+@@ -50,17 +50,13 @@
+    @ingroup  FitMethodFunc   
+ */ 
+ template<class FunType> 
+-class LogLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction<FunType>  {
++class LogLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction<FunType>  {
+ 
+ public: 
++   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
++   typedef typename BaseObjFunction::BaseFunction BaseFunction; 
+ 
+-
+-
+-   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
+-   typedef typename  BaseObjFunction::BaseFunction BaseFunction; 
+-
+-   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
+-
++   typedef ROOT::Math::IParamMultiFunction IModelFunction;
+ 
+    /** 
+       Constructor from unbin data set and model function (pdf)
+diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h root-5.32.00/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h
+--- root-5.32.00.orig/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h	2011-12-02 12:41:53.000000000 +0100
++++ root-5.32.00/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h	2012-02-12 22:48:29.878448447 +0100
+@@ -50,16 +50,13 @@
+    @ingroup  FitMethodFunc
+ */
+ template<class FunType>
+-class PoissonLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction<FunType>  {
++class PoissonLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction<FunType>  {
+ 
+ public:
++   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
++   typedef typename BaseObjFunction::BaseFunction BaseFunction;
+ 
+-
+-   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
+-   typedef typename  BaseObjFunction::BaseFunction BaseFunction;
+-
+-   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
+-
++   typedef ROOT::Math::IParamMultiFunction IModelFunction;
+ 
+    /**
+       Constructor from unbin data set and model function (pdf)
diff --git a/root-globals.patch b/root-globals.patch
new file mode 100644
index 0000000..325fa64
--- /dev/null
+++ b/root-globals.patch
@@ -0,0 +1,270 @@
+diff -ur root-5.32.00.orig/hist/hist/src/TGraph2DErrors.cxx root-5.32.00/hist/hist/src/TGraph2DErrors.cxx
+--- root-5.32.00.orig/hist/hist/src/TGraph2DErrors.cxx	2011-12-02 12:42:07.000000000 +0100
++++ root-5.32.00/hist/hist/src/TGraph2DErrors.cxx	2012-02-11 15:11:23.205768374 +0100
+@@ -71,7 +71,7 @@
+    dte->SetLineColor(kBlue-3);
+    dte->SetLineWidth(2);
+    dte->Draw("err p0");
+-   gPad->SetLogy(1);
++   TVirtualPad::Pad()->SetLogy(1);
+    return c;
+ }
+ End_Macro
+diff -ur root-5.32.00.orig/hist/hist/src/TMultiGraph.cxx root-5.32.00/hist/hist/src/TMultiGraph.cxx
+--- root-5.32.00.orig/hist/hist/src/TMultiGraph.cxx	2011-12-02 12:42:07.000000000 +0100
++++ root-5.32.00/hist/hist/src/TMultiGraph.cxx	2012-02-11 16:23:09.975601997 +0100
+@@ -157,7 +157,7 @@
+    mg->GetYaxis()->SetTitle("Coefficients");
+ 
+    // Change the axis limits
+-   gPad->Modified();
++   TVirtualPad::Pad()->Modified();
+    mg->GetXaxis()->SetLimits(1.5,7.5);
+    mg->SetMinimum(0.);
+    mg->SetMaximum(10.);
+diff -ur root-5.32.00.orig/hist/histpainter/src/TGraphPainter.cxx root-5.32.00/hist/histpainter/src/TGraphPainter.cxx
+--- root-5.32.00.orig/hist/histpainter/src/TGraphPainter.cxx	2011-12-02 12:42:07.000000000 +0100
++++ root-5.32.00/hist/histpainter/src/TGraphPainter.cxx	2012-02-11 15:11:23.242767900 +0100
+@@ -334,8 +334,8 @@
+    float y[]     = {1,4,9};
+    TGraphErrors tg(3,x,y,err_x,err_y);
+    c48->Divide(2,1);
+-   c48->cd(1); gPad->DrawFrame(0,0,4,8); tg.Draw("PC");
+-   c48->cd(2); gPad->DrawFrame(0,0,4,8); tg.Draw("0PC");
++   c48->cd(1); TVirtualPad::Pad()->DrawFrame(0,0,4,8); tg.Draw("PC");
++   c48->cd(2); TVirtualPad::Pad()->DrawFrame(0,0,4,8); tg.Draw("0PC");
+    return c48;
+ }
+ End_Macro
+diff -ur root-5.32.00.orig/hist/histpainter/src/THistPainter.cxx root-5.32.00/hist/histpainter/src/THistPainter.cxx
+--- root-5.32.00.orig/hist/histpainter/src/THistPainter.cxx	2011-12-02 12:42:07.000000000 +0100
++++ root-5.32.00/hist/histpainter/src/THistPainter.cxx	2012-02-11 15:15:38.786479566 +0100
+@@ -665,14 +665,14 @@
+ 
+    // scale hint1 to the pad coordinates
+    Float_t rightmax = 1.1*hint1->GetMaximum();
+-   Float_t scale = gPad->GetUymax()/rightmax;
++   Float_t scale = TVirtualPad::Pad()->GetUymax()/rightmax;
+    hint1->SetLineColor(kRed);
+    hint1->Scale(scale);
+    hint1->Draw("same");
+ 
+    // draw an axis on the right side
+-   TGaxis *axis = new TGaxis(gPad->GetUxmax(),gPad->GetUymin(),
+-   gPad->GetUxmax(), gPad->GetUymax(),0,rightmax,510,"+L");
++   TGaxis *axis = new TGaxis(TVirtualPad::Pad()->GetUxmax(),TVirtualPad::Pad()->GetUymin(),
++   TVirtualPad::Pad()->GetUxmax(), TVirtualPad::Pad()->GetUymax(),0,rightmax,510,"+L");
+    axis->SetLineColor(kRed);
+    axis->SetTextColor(kRed);
+    axis->Draw();
+@@ -2178,7 +2178,7 @@
+ 
+    TMultiGraph *mg;
+    TKey *key;
+-   TIter nextkey(gDirectory->GetListOfKeys());
++   TIter nextkey(TDirectory::CurrentDirectory()->GetListOfKeys());
+    while (key = (TKey*)nextkey()) {
+       obj = key->ReadObj();
+       if (obj->InheritsFrom("TMultiGraph")) {
+diff -ur root-5.32.00.orig/hist/histpainter/src/TPaletteAxis.cxx root-5.32.00/hist/histpainter/src/TPaletteAxis.cxx
+--- root-5.32.00.orig/hist/histpainter/src/TPaletteAxis.cxx	2011-12-02 12:42:07.000000000 +0100
++++ root-5.32.00/hist/histpainter/src/TPaletteAxis.cxx	2012-02-11 16:28:01.762786179 +0100
+@@ -58,7 +58,7 @@
+    }
+    gStyle->SetPalette(1);
+    h2->Draw("COLZ");
+-   gPad->Update();
++   TVirtualPad::Pad()->Update();
+    TPaletteAxis *palette = (TPaletteAxis*)h2->GetListOfFunctions()->FindObject("palette");
+    palette->SetY2NDC(0.7);
+    return c1;
+diff -ur root-5.32.00.orig/tree/treeviewer/src/TParallelCoord.cxx root-5.32.00/tree/treeviewer/src/TParallelCoord.cxx
+--- root-5.32.00.orig/tree/treeviewer/src/TParallelCoord.cxx	2011-12-02 12:42:02.000000000 +0100
++++ root-5.32.00/tree/treeviewer/src/TParallelCoord.cxx	2012-02-11 16:30:34.884789287 +0100
+@@ -78,7 +78,7 @@
+    TFile *f = TFile::Open("$ROOTSYS/tutorials/tree/cernstaff.root");
+    TTree *T = (TTree*)f->Get("T");
+    T->Draw("Age:Grade:Step:Cost:Division:Nation","","para");
+-   TParallelCoord* para = (TParallelCoord*)gPad->GetListOfPrimitives()->FindObject("ParaCoord");
++   TParallelCoord* para = (TParallelCoord*)TVirtualPad::Pad()->GetListOfPrimitives()->FindObject("ParaCoord");
+    TParallelCoordVar* grade = (TParallelCoordVar*)para->GetVarList()->FindObject("Grade");
+    grade->AddRange(new TParallelCoordRange(grade,11.5,14));
+    para->AddSelection("less30");
+diff -ur root-5.32.00.orig/tutorials/graphics/earth.C root-5.32.00/tutorials/graphics/earth.C
+--- root-5.32.00.orig/tutorials/graphics/earth.C	2011-12-02 12:41:50.000000000 +0100
++++ root-5.32.00/tutorials/graphics/earth.C	2012-02-11 16:07:56.025452212 +0100
+@@ -19,7 +19,7 @@
+    TH2F *hs = new TH2F("hs","Sinusoidal",180, -180, 180, 181, -90.5, 90.5);
+    TH2F *hp = new TH2F("hp","Parabolic", 180, -180, 180, 181, -90.5, 90.5);
+ 
+-   TString dat = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
++   TString dat = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
+    dat.ReplaceAll("C","dat");
+    dat.ReplaceAll("/./","/");
+ 
+diff -ur root-5.32.00.orig/tutorials/hist/hbars.C root-5.32.00/tutorials/hist/hbars.C
+--- root-5.32.00.orig/tutorials/hist/hbars.C	2011-12-02 12:41:49.000000000 +0100
++++ root-5.32.00/tutorials/hist/hbars.C	2012-02-11 16:05:25.309365607 +0100
+@@ -1,10 +1,10 @@
+ // Example of bar charts with 1-d histograms
+ // Author: Rene Brun
+ {
+-   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
++   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
+    dir.ReplaceAll("hbars.C","../tree/cernbuild.C");
+    dir.ReplaceAll("/./","/");
+-   if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
++   if (!TInterpreter::Instance()->IsLoaded(dir.Data())) TInterpreter::Instance()->LoadMacro(dir.Data());
+    TFile *f = (TFile*)gROOT->ProcessLineFast("cernbuild(1)");
+    if (!f) return;
+    TTree *T = (TTree*)f->Get("T");
+@@ -14,13 +14,13 @@
+    c1->Divide(1,2);
+    
+    //horizontal bar chart
+-   c1->cd(1); gPad->SetGrid(); gPad->SetLogx(); gPad->SetFrameFillColor(33);
++   c1->cd(1); TVirtualPad::Pad()->SetGrid(); TVirtualPad::Pad()->SetLogx(); TVirtualPad::Pad()->SetFrameFillColor(33);
+    T->Draw("Nation","","hbar2");
+    
+    //vertical bar chart
+-   c1->cd(2); gPad->SetGrid(); gPad->SetFrameFillColor(33);
++   c1->cd(2); TVirtualPad::Pad()->SetGrid(); TVirtualPad::Pad()->SetFrameFillColor(33);
+    T->Draw("Division>>hDiv","","goff");
+-   TH1F *hDiv   = (TH1F*)gDirectory->Get("hDiv");
++   TH1F *hDiv   = (TH1F*)TDirectory::CurrentDirectory()->Get("hDiv");
+    hDiv->SetStats(0);
+    TH1F *hDivFR = (TH1F*)hDiv->Clone("hDivFR");
+    T->Draw("Division>>hDivFR","Nation==\"FR\"","goff");
+diff -ur root-5.32.00.orig/tutorials/hist/hstack.C root-5.32.00/tutorials/hist/hstack.C
+--- root-5.32.00.orig/tutorials/hist/hstack.C	2011-12-02 12:41:49.000000000 +0100
++++ root-5.32.00/tutorials/hist/hstack.C	2012-02-11 16:08:54.067671744 +0100
+@@ -33,18 +33,18 @@
+    // in top right pad, draw the stack in non-stack mode 
+    // and errors option
+    cst->cd(2);
+-   gPad->SetGrid();
++   TVirtualPad::Pad()->SetGrid();
+    hs->Draw("nostack,e1p");
+    //in bottom left, draw in stack mode with "lego1" option
+    cst->cd(3);
+-   gPad->SetFrameFillColor(17);
+-   gPad->SetTheta(3.77);
+-   gPad->SetPhi(2.9);
++   TVirtualPad::Pad()->SetFrameFillColor(17);
++   TVirtualPad::Pad()->SetTheta(3.77);
++   TVirtualPad::Pad()->SetPhi(2.9);
+    hs->Draw("lego1");
+ 
+    cst->cd(4);
+    //create two 2-D histograms and draw them in stack mode
+-   gPad->SetFrameFillColor(17);
++   TVirtualPad::Pad()->SetFrameFillColor(17);
+    THStack *a = new THStack("a","Stacked 2D histograms");
+    TF2 *f1 = new TF2("f1",
+       "xygaus + xygaus(5) + xylandau(10)",-4,4,-4,4);
+diff -ur root-5.32.00.orig/tutorials/hsimple.C root-5.32.00/tutorials/hsimple.C
+--- root-5.32.00.orig/tutorials/hsimple.C	2011-12-02 12:41:50.000000000 +0100
++++ root-5.32.00/tutorials/hsimple.C	2012-02-11 15:11:23.468765021 +0100
+@@ -25,7 +25,7 @@
+ //  write access to this directory, otherwise the file is created in $PWD
+ 
+    TString filename = "hsimple.root";
+-   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
++   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
+    dir.ReplaceAll("hsimple.C","");
+    dir.ReplaceAll("/./","/");
+    TFile *hfile = 0;
+diff -ur root-5.32.00.orig/tutorials/math/chi2test.C root-5.32.00/tutorials/math/chi2test.C
+--- root-5.32.00.orig/tutorials/math/chi2test.C	2011-12-02 12:41:49.000000000 +0100
++++ root-5.32.00/tutorials/math/chi2test.C	2012-02-11 15:11:23.535764169 +0100
+@@ -149,25 +149,25 @@
+ 
+ // Draw Histogramms and Graphs
+   c1->cd(1);
+-  gPad->SetFrameFillColor(21);
++  TVirtualPad::Pad()->SetFrameFillColor(21);
+   h1->SetMarkerColor(4);
+   h1->SetMarkerStyle(20);
+ 
+   h1->Draw("E");
+ 
+   c1->cd(2);
+-  gPad->SetFrameFillColor(21);
++  TVirtualPad::Pad()->SetFrameFillColor(21);
+   h2->Draw("");
+   h2->SetMarkerColor(4);
+   h2->SetMarkerStyle(20);
+ 
+   c1->cd(3);
+-  gPad->SetFrameFillColor(21);
+-  gPad->SetGridy();
++  TVirtualPad::Pad()->SetFrameFillColor(21);
++  TVirtualPad::Pad()->SetGridy();
+   resgr->Draw("APL");
+ 
+   c1->cd(4);
+-  gPad->SetFrameFillColor(21);
++  TVirtualPad::Pad()->SetFrameFillColor(21);
+   qqplot->Draw("AP");
+ 
+   c1->cd(0);
+diff -ur root-5.32.00.orig/tutorials/tree/cernbuild.C root-5.32.00/tutorials/tree/cernbuild.C
+--- root-5.32.00.orig/tutorials/tree/cernbuild.C	2012-02-10 14:59:26.357917020 +0100
++++ root-5.32.00/tutorials/tree/cernbuild.C	2012-02-11 17:52:20.988688923 +0100
+@@ -19,7 +19,7 @@
+    //The input file cern.dat is a copy of the CERN staff data base
+    //from 1988
+    TString filename = "cernstaff.root";
+-   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
++   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
+    dir.ReplaceAll("cernbuild.C","");
+    dir.ReplaceAll("/./","/");
+    FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
+diff -ur root-5.32.00.orig/tutorials/tree/cernstaff.C root-5.32.00/tutorials/tree/cernstaff.C
+--- root-5.32.00.orig/tutorials/tree/cernstaff.C	2011-12-02 12:41:49.000000000 +0100
++++ root-5.32.00/tutorials/tree/cernstaff.C	2012-02-11 16:02:20.534771748 +0100
+@@ -10,17 +10,17 @@
+    c1->SetFillColor(17);
+    c1->Divide(2,2);
+    // make table of number of people per Nation & Division
+-   c1->cd(1); gPad->SetGrid();
++   c1->cd(1); TVirtualPad::Pad()->SetGrid();
+    T->Draw("Nation:Division>>hN","","text");
+-   TH2F *hN = (TH2F*)gDirectory->Get("hN");
++   TH2F *hN = (TH2F*)TDirectory::CurrentDirectory()->Get("hN");
+    hN->SetMarkerSize(1.6);
+    hN->SetStats(0);
+    
+    //make profile of Average cost per Nation
+-   c1->cd(2); gPad->SetGrid();
+-   gPad->SetLeftMargin(0.12);
++   c1->cd(2); TVirtualPad::Pad()->SetGrid();
++   TVirtualPad::Pad()->SetLeftMargin(0.12);
+    T->Draw("Cost:Nation>>hNation","","prof,goff");
+-   TH1F *hNation = (TH1F*)gDirectory->Get("hNation");
++   TH1F *hNation = (TH1F*)TDirectory::CurrentDirectory()->Get("hNation");
+    hNation->SetTitle("Average Cost per Nation");
+    hNation->LabelsOption(">"); //sort by decreasing bin contents
+    hNation->SetMaximum(13000);
+@@ -30,7 +30,7 @@
+    hNation->Draw();
+    
+    //make stacked plot of Nations versus Grade
+-   c1->cd(3); gPad->SetGrid();
++   c1->cd(3); TVirtualPad::Pad()->SetGrid();
+    THStack *hGrades = new THStack("hGrades","Nations versus Grade");
+    TH1F *hFR = new TH1F("hFR","FR",12,3,15);
+     hFR->SetFillColor(kCyan);
+@@ -62,10 +62,10 @@
+    legend->Draw();
+    
+    //make histogram of age distribution
+-   c1->cd(4); gPad->SetGrid();
++   c1->cd(4); TVirtualPad::Pad()->SetGrid();
+    T->Draw("Age");
+    T->Draw("Age>>hRetired","Age>(65-2002+1988)","same");
+-   TH1F *hRetired = (TH1F*)gDirectory->Get("hRetired");
++   TH1F *hRetired = (TH1F*)TDirectory::CurrentDirectory()->Get("hRetired");
+    hRetired->SetFillColor(kRed);
+    hRetired->SetFillStyle(3010);
+    
diff --git a/root-globus-deps.patch b/root-globus-deps.patch
new file mode 100644
index 0000000..fb99c36
--- /dev/null
+++ b/root-globus-deps.patch
@@ -0,0 +1,30 @@
+diff -ur root-5.32.00.orig/config/Makefile.depend root-5.32.00/config/Makefile.depend
+--- root-5.32.00.orig/config/Makefile.depend	2011-12-02 12:42:19.000000000 +0100
++++ root-5.32.00/config/Makefile.depend	2012-02-10 19:42:24.408218116 +0100
+@@ -100,7 +100,7 @@
+ CINTEXLIBDEPM          = $(REFLEXLIB)
+ REFLEXDICTLIBDEPM      = $(REFLEXLIB)
+ RAUTHLIBDEPM           = $(NETLIB) $(IOLIB)
+-GLBSAUTHLIBDEPM        = $(RAUTHLIB)
++GLBSAUTHLIBDEPM        = $(RAUTHLIB) $(NETLIB)
+ KRB5AUTHLIBDEPM        = $(RAUTHLIB) $(NETLIB)
+ SRVAUTHLIBDEPM         = $(NETLIB)
+ QTGSILIBDEPM           = $(GUILIB) $(GPADLIB)
+@@ -366,7 +366,7 @@
+ CINTEXLIBEXTRA          = lib/libReflex.lib
+ REFLEXDICTLIBEXTRA      = lib/libReflex.lib
+ RAUTHLIBEXTRA           = lib/libNet.lib lib/libRIO.lib
+-GLBSAUTHLIBEXTRA        = lib/libRootAuth.lib
++GLBSAUTHLIBEXTRA        = lib/libRootAuth.lib lib/libNet.lib
+ KRB5AUTHLIBEXTRA        = lib/libRootAuth.lib lib/libNet.lib
+ SRVAUTHLIBEXTRA         = lib/libNet.lib
+ QTGSILIBEXTRA           = lib/libGui.lib lib/libGpad.lib
+@@ -498,7 +498,7 @@
+ CINTEXLIBEXTRA          = -Llib -lReflex
+ REFLEXDICTLIBEXTRA      = -Llib -lReflex
+ RAUTHLIBEXTRA           = -Llib -lNet -lRIO
+-GLBSAUTHLIBEXTRA        = -Llib -lRootAuth
++GLBSAUTHLIBEXTRA        = -Llib -lRootAuth -lNet
+ KRB5AUTHLIBEXTRA        = -Llib -lRootAuth -lNet
+ SRVAUTHLIBEXTRA         = -Llib -lNet
+ QTGSILIBEXTRA           = -Llib -lGui -lGpad
diff --git a/root-html.C b/root-html.C
index 413a8d3..8d9633c 100644
--- a/root-html.C
+++ b/root-html.C
@@ -6,10 +6,10 @@
   gSystem->AddIncludePath("-I@PWD@/cint/cint/include");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/stl");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/lib");
-  gInterpreter->AddIncludePath("@PWD@/include");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/include");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/stl");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/lib");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/include");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/include");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/stl");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/lib");
   #include <iostream>
   #include <string>
   #include <RtypesCint.h>
diff --git a/root-includelist b/root-includelist
index 0eccf90..cd7842c 100644
--- a/root-includelist
+++ b/root-includelist
@@ -3,11 +3,9 @@ includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
 	rm -f $$list ; \
 	for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \
-	    if [ "$(MODULE)" = "cint/cint7" ] ; then \
-		sed 's!^include!%{_includedir}/%{name}/cint7!' <<< $$h >> $$list ; \
-	    else \
-		sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
-	    fi ; \
+	    sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
+	done ; \
+	if [ -r $$list ] ; then \
 	    sort -u $$list > $$list.unique ; \
 	    mv $$list.unique $$list ; \
-	done
+	fi
diff --git a/root-rfio.patch b/root-rfio.patch
new file mode 100644
index 0000000..1af3f2f
--- /dev/null
+++ b/root-rfio.patch
@@ -0,0 +1,74 @@
+diff -ur root-5.32.00.orig/configure root-5.32.00/configure
+--- root-5.32.00.orig/configure	2011-12-02 12:42:22.000000000 +0100
++++ root-5.32.00/configure	2012-02-10 17:36:40.090907758 +0100
+@@ -3183,7 +3183,7 @@
+         fi
+     fi
+ 
+-    check_library "librfio libdpm libshift shiftmd shift" "$enable_shared" \
++    check_library "librfio libdpm libcastorrfio libshift shiftmd shift" "$enable_shared" \
+         "$shiftlibdir" \
+         $RFIO ${RFIO:+$RFIO/lib} /cern/pro/lib /cern/new/lib /cern/old/lib \
+         /opt/shift/lib /usr/local/shift/lib /usr/lib/shift \
+@@ -3194,6 +3194,10 @@
+     if test "x$shiftincdir" = "x" || test "x$shiftlib" = "x"; then
+         enable_rfio="no"
+     else
++        case $shiftlib in
++            *dpm)        shiftlib="$shiftlib -llcgdm" ;;
++            *castorrfio) shiftlib="$shiftlib -lcastorcommon" ;;
++        esac
+         case $platform in
+            linux | macosx)
+                 for i in "" -ladns ; do
+@@ -3203,14 +3207,7 @@
+                         break ;
+                     fi
+                 done
+-                # Explicit linking: which libraries are needed to satisfy symbols
+-                # from libshift?
+-                # 2.1.9 has new library layout
+-                shiftlibdep="-lcastorrfio -lcastorclient -lcastorcommon"
+-                check_link "$shiftlib $shiftlibdep" "$shiftlibdir" rfio_fchmod
+-                if test $link_result -eq 1 ; then
+-                    shiftlib="$shiftlib $shiftlibdep"
+-                else
++                if test $link_result -ne 1 ; then
+                     enable_rfio="no"
+                 fi
+                 ;;
+@@ -3280,7 +3277,7 @@
+         fi
+     fi
+ 
+-    check_library "libshift shiftmd shift" "$enable_shared" "$castorlibdir" \
++    check_library "libcastorrfio libshift shiftmd shift" "$enable_shared" "$castorlibdir" \
+         $CASTOR ${CASTOR:+$CASTOR/lib} /cern/pro/lib /cern/new/lib \
+         /cern/old/lib /opt/shift/lib /usr/local/shift/lib /usr/lib/shift \
+         /usr/local/lib/shift /usr/lib /usr/local/lib
+@@ -3290,6 +3287,9 @@
+     if test "x$castorincdir" = "x" || test "x$castorlib" = "x"; then
+         enable_castor="no"
+     else
++        case $castorlib in
++            *castorrfio) castorlib="$castorlib -lcastorclient -lcastorns -lcastorcommon" ;;
++        esac
+         case $platform in
+            linux | macosx)
+                 for i in "" -ladns ; do
+@@ -3299,14 +3299,7 @@
+                         break ;
+                     fi
+                 done
+-                # Explicit linking: which libraries are needed to satisfy symbols
+-                # from libshift?
+-                # 2.1.9 has new library layout
+-                castorlibdep="-lcastorrfio -lcastorclient -lcastorns -lcastorcommon"
+-                check_link "$castorlib $castorlibdep" "$castorlibdir" rfio_fchmod
+-                if test $link_result -eq 1 ; then
+-                    castorlib="$castorlib $castorlibdep"
+-                else
++                if test $link_result -ne 1 ; then
+                     enable_castor="no"
+                 fi
+                 ;;
diff --git a/root-ruby.patch b/root-ruby.patch
new file mode 100644
index 0000000..d616e5b
--- /dev/null
+++ b/root-ruby.patch
@@ -0,0 +1,211 @@
+diff -ur root-5.32.00.orig/bindings/ruby/src/drr.cxx root-5.32.00/bindings/ruby/src/drr.cxx
+--- root-5.32.00.orig/bindings/ruby/src/drr.cxx	2011-12-02 12:41:55.000000000 +0100
++++ root-5.32.00/bindings/ruby/src/drr.cxx	2012-02-12 16:20:46.248535290 +0100
+@@ -24,6 +24,17 @@
+ 
+ #include "ruby.h"
+ 
++// Define macros for old ruby versions
++#ifndef RSTRING_PTR
++#define RSTRING_PTR(s) (RSTRING(s)->ptr)
++#endif
++#ifndef RFLOAT_VALUE
++#define RFLOAT_VALUE(v) (RFLOAT(v)->value)
++#endif
++#ifndef RARRAY_LEN
++#define RARRAY_LEN(s) (RARRAY(s)->len)
++#endif
++
+ #include "rrcommon.h"
+ 
+ /* ROOT's global enums.  */
+@@ -34,7 +45,7 @@
+ #include "dlfcn.h"
+ #endif
+ 
+-#if ((R__RUBY_MAJOR<1) || (R__RUBY_MAJOR==1)&&(R__RUBY_MINOR<=9))
++#if ((R__RUBY_MAJOR<1) || (R__RUBY_MAJOR==1)&&(R__RUBY_MINOR<=8))
+ #  define rb_frame_this_func rb_frame_last_func
+ #endif
+ 
+@@ -158,9 +169,9 @@
+    switch (TYPE(o))
+       {
+       case T_STRING:
+-         return (void *) RSTRING(o)->ptr;
++         return (void *) RSTRING_PTR(o);
+       case T_FLOAT:
+-         return (void *) &RFLOAT(o)->value;
++         return (void *) &RFLOAT_VALUE(o);
+       case T_FIXNUM:
+          /* FIXME: Memory leak until I find the correct way. Until
+           * then please use integers in TTrees with care. --elathan
+@@ -172,8 +183,9 @@
+          RRGRAB(o, void *, res);
+          return res;
+       default:
+-         rb_fatal ("Failed convertion of %d to void *.\n",
+-                   STR2CSTR(CLASS_OF(o)));
++         VALUE tmp = CLASS_OF(o);
++         rb_fatal ("Failed convertion of %d to void *.\n", 
++                   StringValuePtr(tmp));
+          break;
+       }
+ 
+@@ -392,7 +404,7 @@
+       }
+ 
+    VALUE keys = rb_funcall(parms, rb_intern("keys"), 0);
+-   for (int i = 0; i < RARRAY(keys)->len; i++)
++   for (int i = 0; i < RARRAY_LEN(keys); i++)
+       {
+          VALUE key = rb_ary_entry (keys, i);
+          rb_funcall (self, rb_to_id (ameth), 2, key, rb_hash_aref (parms, key));
+@@ -424,7 +436,7 @@
+     * 3. When we want both 1 and 2
+     */
+ 
+-   int nargs = RARRAY(inargs)->len - offset;
++   int nargs = RARRAY_LEN(inargs) - offset;
+    double *arr = NULL;
+    TObject *ptr = NULL;
+    VALUE v = 0;
+@@ -446,7 +458,7 @@
+                if (cproto) strcat(cproto, "double");
+                break;
+             case T_STRING:
+-               if (f) f->SetArg((long) STR2CSTR(arg));
++               if (f) f->SetArg((long) StringValuePtr(arg));
+                if (cproto) strcat(cproto, "char*");
+                break;
+             case T_ARRAY:
+@@ -455,8 +467,8 @@
+                 */
+                if (f)
+                   {
+-                     arr = ALLOC_N (double, RARRAY(arg)->len);
+-                     for (int j = 0; j < RARRAY(arg)->len; j++)
++                     arr = ALLOC_N (double, RARRAY_LEN(arg));
++                     for (int j = 0; j < RARRAY_LEN(arg); j++)
+                         arr[j] = NUM2DBL(rb_ary_entry (arg, j));
+                      f->SetArg((long) arr);
+                   }
+@@ -469,7 +481,8 @@
+                      Data_Get_Struct (v, TObject, ptr);
+                      if (f) f->SetArg((long) ptr);
+                      if (cproto) {
+-                        strcat(cproto, STR2CSTR(rb_iv_get (arg, "__rr_class__")));
++                        VALUE tmp = rb_iv_get (arg, "__rr_class__");
++                        strcat(cproto, StringValuePtr(tmp));
+                         if( ((reference_map>>ntobjects)&0x1) ) {
+                            strcat(cproto, "*");
+                         } else {
+@@ -637,11 +650,11 @@
+    VALUE v;
+ 
+    /* Check if there is a ROOT dict. available.  */
+-   TClass *c = TClass::GetClass(STR2CSTR(klass));
++   TClass *c = TClass::GetClass(StringValuePtr(klass));
+    if (c)
+       {
+          VALUE k;
+-         char *name = STR2CSTR(klass);
++         char *name = StringValuePtr(klass);
+          if (!rb_const_defined (rb_cObject, rb_intern(name)))
+             k = rb_define_class (name, drrAbstractClass);
+          else
+@@ -652,7 +665,7 @@
+          rb_iv_set (v, "__rr_class__", klass);
+       }
+    else
+-      rb_raise( rb_eArgError, "No TClass found for %s. Is this a Root type?", STR2CSTR(klass) );
++      rb_raise( rb_eArgError, "No TClass found for %s. Is this a Root type?", StringValuePtr(klass) );
+ 
+    return v;
+ }
+@@ -671,7 +684,7 @@
+ 
+    /* Call the requested ctor.  */
+ 
+-   if (RARRAY(inargs)->len) {
++   if (RARRAY_LEN(inargs)) {
+       drr_find_method_prototype (&klass, classname, inargs, cproto, 0);
+       drr_set_method_args ( inargs, &func, 0);
+    }
+@@ -767,7 +780,7 @@
+    char * classname = (char *) rb_class2name(self);
+ 	
+    rb_scan_args (argc, argv, "0*", &inargs);
+-   nargs = RARRAY(inargs)->len - 1;
++   nargs = RARRAY_LEN(inargs) - 1;
+ 
+    G__CallFunc *func = new G__CallFunc();
+    G__ClassInfo *klass = new G__ClassInfo (classname);
+@@ -816,12 +829,13 @@
+ 
+    /* Grab method, class and the instance pointer.  */
+    methname = (char*) rb_id2name (rb_to_id(argv[0]));
+-   classname = STR2CSTR(rb_iv_get (self, "__rr_class__"));
++   VALUE tmp = rb_iv_get (self, "__rr_class__");
++   classname = StringValuePtr(tmp);
+    TObject *caller = drr_grab_object (self);
+ 
+    rb_scan_args (argc, argv, "0*", &inargs);
+ 
+-   nargs = RARRAY(inargs)->len - 1;
++   nargs = RARRAY_LEN(inargs) - 1;
+    VALUE rklass = rb_class_of (self);
+ 
+    G__CallFunc *func = new G__CallFunc();
+@@ -890,7 +904,7 @@
+ 
+    rb_scan_args (argc, argv, "0*", &inargs);
+ 
+-   nargs = RARRAY(inargs)->len;
++   nargs = RARRAY_LEN(inargs);
+ 
+    G__CallFunc *func = NULL;
+ 
+diff -ur root-5.32.00.orig/configure root-5.32.00/configure
+--- root-5.32.00.orig/configure	2011-12-02 12:42:22.000000000 +0100
++++ root-5.32.00/configure	2012-02-12 12:11:14.836641595 +0100
+@@ -4171,19 +4171,25 @@
+     # Check for Ruby include and library
+     myruby=`$cwhich ruby 2> /dev/null`
+     if test ! "x$myruby" = "x" && test -x "$myruby" ; then
+-       rubysysincdir=`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`
+-       rubysyslibdir=`ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]'`
++       rubysysincdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["includedir"]'`
++       rubysysarchdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]'`
++       rubysyslibdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["libdir"]'`
++       rubysysarch=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["arch"]'`
+     fi
+-    rubysysincdir2=
++    rubysysarchdir2=
+     if test "x$platform" = "xmacosx" ; then
+-       rubysysincdir2=`echo $rubysysincdir | sed -e 's/powerpc/universal/'`
++       rubysysarchdir2=`echo $rubysysarchdir | sed -e 's/powerpc/universal/'`
+     fi
+     check_header "ruby.h" "$rubyincdir" \
+         $RUBYDIR ${RUBYDIR:+$RUBYDIR/include} \
+-        $rubysysincdir $rubysysincdir2 \
++        $rubysysincdir $rubysysarchdir $rubysysarchdir2 \
+         /usr/local/include/ruby /usr/include/ruby
+     rubyinc=$found_hdr
+     rubyincdir=$found_dir
++    check_header "ruby/config.h" "" $rubysysincdir/$rubysysarch
++    if test "x$found_hdr" != "x" ; then
++        rubyincdir="$rubyincdir $found_dir"
++    fi
+ 
+     if test "x$arch" = "xwin32" || \
+        test "x$enable_shared" = "xno" ; then
+@@ -6754,7 +6760,7 @@
+ 
+ if test ! "x$enable_ruby" = "xno"; then
+    echo "" >> RConfigOptions-out.tmp
+-   ruby -rrbconfig -e 'puts Config::CONFIG["ruby_version"]' | \
++   ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]' | \
+    sed 's/^\([0-9]\)\.\([0-9]\).*$/#define R__RUBY_MAJOR \1@#define R__RUBY_MINOR \2/' | \
+    tr '@' '\n' >> RConfigOptions-out.tmp
+ fi
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 51d4ab4..6352682 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,69 +1,36 @@
-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 @@
-     if test "x$externalxrd" = "xyes"; then
-        buildxrd="no"
-        # Check if bonjour is available for code potentially using it ...
--       if test "x$enable_bonjour" = "xyes"; then
--          check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
--          if test  $found_symbol -eq 0 ; then
--             bjrcomm="External xrootd has no bonjour support: disabling bonjour in XrdProofd"
--             bonjourcppflags=
--          fi
--       fi
-+       ## This test is broken and will always fail.
-+       ##if test "x$enable_bonjour" = "xyes"; then
-+       ##   check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
-+       ##   if test  $found_symbol -eq 0 ; then
-+       ##      bjrcomm="External xrootd has no bonjour support: disabling bonjour in XrdProofd"
-+       ##      bonjourcppflags=
-+       ##   fi
-+       ##fi
-     fi
- else
-     buildxrd="no"
-diff -ur root-5.30.04.orig/proof/proofd/Module.mk root-5.30.04/proof/proofd/Module.mk
---- root-5.30.04.orig/proof/proofd/Module.mk	2011-11-08 14:28:15.000000000 +0100
-+++ root-5.30.04/proof/proofd/Module.mk	2011-11-16 07:29:54.315314349 +0100
-@@ -129,12 +129,10 @@
- XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
- ifeq ($(HASXRDUTILS),no)
+--- 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
  
--XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrdOuc -lXrdNet -lXrdSys \
--                  -lXrdClient -lXrdSut $(DNSSDLIB)
--XPROOFDEXELIBS := $(XROOTDDIRL)/libXrd.a $(XROOTDDIRL)/libXrdClient.a \
--                  $(XROOTDDIRL)/libXrdNet.a \
--                  $(XROOTDDIRL)/libXrdOuc.a \
--                  $(XROOTDDIRL)/libXrdSys.a $(XROOTDDIRL)/libXrdSut.a
-+XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
-+                  -lXrdNet -lXrdOuc -lXrdSys $(DNSSDLIB)
-+XPROOFDEXELIBS := -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
-+                  -lXrdNet -lXrdOuc -lXrdSys
- # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
- # both are needed
- XRDNETUTIL     :=
-@@ -144,8 +142,8 @@
-                           fi)
- endif
- ifeq ($(XRDNETUTIL),yes)
--XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrdNetUtil
--XPROOFDEXELIBS += $(XROOTDDIRL)/libXrdNetUtil.a
-+XPDLIBEXTRA    += -lXrdNetUtil
-+XPROOFDEXELIBS += -lXrdNetUtil
- endif
+-   #
+-   # 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 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
+ fi
  
- else
-@@ -191,10 +189,10 @@
- 		$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \
- 		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
- 
--$(XPROOFDEXE):  $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD) $(RPDCONNO)
-+$(XPROOFDEXE):  $(XPDO) $(XRDPROOFXD) $(RPDCONNO)
- 		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(RPDCONNO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
- 
--$(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(XPROOFDEXELIBS) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
-+$(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libXrdProofd.$(SOEXT) $@ "$(XPDO) $(RPDCONNO)" \
- 		   "$(XPDLIBEXTRA)"
+ check_explicit "$enable_xrootd" "$enable_xrootd_explicit" \
diff --git a/root.spec b/root.spec
index 2faa310..6424f24 100644
--- a/root.spec
+++ b/root.spec
@@ -7,7 +7,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]' 2>/dev/null)}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %($(pkg-config emacs) ; echo $?)
 %global emacs_version 21.4
@@ -18,9 +18,9 @@
 %endif
 
 Name:		root
-Version:	5.30.04
+Version:	5.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -47,10 +47,23 @@ Patch0:		%{name}-ftgl.patch
 Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
-#		Workaround for broken Form() on ppc
-Patch3:		%{name}-cern-ppc.patch
-#		Fixes for external xrootd
-Patch4:		%{name}-xrootd.patch
+#		Fixes for xrootd bonjour
+Patch3:		%{name}-xrootd.patch
+#		Fix rfio configure
+#		https://savannah.cern.ch/bugs/index.php?91460
+Patch4:		%{name}-rfio.patch
+#		Missing globus auth module deps
+#		https://savannah.cern.ch/bugs/index.php?91462
+Patch5:		%{name}-globus-deps.patch
+#		Removed globals
+#		https://savannah.cern.ch/bugs/index.php?91463
+Patch6:		%{name}-globals.patch
+#		Ruby 1.9 configuration
+#		https://savannah.cern.ch/bugs/index.php?91461
+Patch7:		%{name}-ruby.patch
+#		Dictionary generation fails on i686
+#		https://savannah.cern.ch/bugs/index.php?91459
+Patch8:		%{name}-fit.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
@@ -107,6 +120,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
 BuildRequires:	globus-gsi-credential-devel
 BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
@@ -119,6 +133,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)
@@ -299,7 +314,11 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
-requires:	ruby(abi) = 1.8
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+Requires:	ruby(abi) = 1.9.1
+%else
+Requires:	ruby(abi) = 1.8
+%endif
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -1018,13 +1037,17 @@ package to use root with GNU Emacs.
 
 %prep
 %setup -q
-%if %(pkg-config --max-version 2.1.2 ftgl 2>/dev/null && echo 1 || echo 0)
+if pkg-config --max-version 2.1.2 ftgl ; then
 %patch0 -p1
-%endif
+fi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -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 \
@@ -1297,31 +1320,24 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils/pq2/pq2* \
 # Remove some junk
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/*.plist
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/*.xinetd
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/cmsd.rc.d
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/olbd.rc.d
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/xrootd.rc.d
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/README
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/hostcert.conf
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/*.sample
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils
+rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/root.desktop
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/system.plugins-ios
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/svninfo.txt
 %if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
 rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
 %endif
-rm ${RPM_BUILD_ROOT}%{_bindir}/drop_from_path
+rm ${RPM_BUILD_ROOT}%{_bindir}/setxrd*
 rm ${RPM_BUILD_ROOT}%{_bindir}/thisroot*
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/cint.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/cmsd.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/g2rootold.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/makecint.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/olbd.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/proofserva.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/roota.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/setup-pq2.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xprep.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xrd*.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xrootd.1
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.cw
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.pri
@@ -1391,7 +1407,8 @@ mv htmldoc ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/html
 # Create includelist files ...
 for module in `find * -name Module.mk` ; do
     module=`dirname $module`
-    make -f %{SOURCE1} includelist MODULE=$module ROOT_SRCDIR=$PWD
+    make -f %{SOURCE1} includelist MODULE=$module ROOT_SRCDIR=$PWD \
+	HASXRD=yes CRYPTOLIB=yes SSLLIB=yes
 done
 
 # ... and merge some of them
@@ -1707,6 +1724,7 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/class.rules
 %{_datadir}/%{name}/gdb-backtrace.sh
+%{_datadir}/%{name}/Makefile.arch
 %{_datadir}/%{name}/root.mimes
 %{_datadir}/%{name}/system.rootauthrc
 %{_datadir}/%{name}/system.rootdaemonrc
@@ -2137,6 +2155,8 @@ fi
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
 %{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
 %{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
+%{_datadir}/%{name}/plugins/TFile/P130_TAS3File.C
+%{_datadir}/%{name}/plugins/TFile/P140_TGSFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
 %{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
@@ -2286,6 +2306,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
+- Update to 5.32.00
+
 * Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
 - Rebuild against PCRE 8.30
 
diff --git a/sources b/sources
index 27231d4..b8a3ff3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe36a18b07119bdd02527fc5a2d2651  root-5.30.04.tar.gz
+fb81fab8b41c657a12d2dd32ee008521  root-5.32.00.tar.gz

From 530201be85b58d04cd2ff023ea63eb88e2fa44b5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 13 Feb 2012 14:46:44 +0100
Subject: [PATCH 006/344] Update to 5.30.06

---
 root-cern-ppc.patch | 11 -----------
 root-includelist    | 10 ++++------
 root.spec           | 17 +++++++++--------
 sources             |  2 +-
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 root-cern-ppc.patch

diff --git a/root-cern-ppc.patch b/root-cern-ppc.patch
deleted file mode 100644
index dfba748..0000000
--- a/root-cern-ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-5.26.00d.orig/tutorials/tree/cernbuild.C	2010-08-29 10:20:56.069801363 +0200
-+++ root-5.26.00d/tutorials/tree/cernbuild.C	2010-08-29 15:52:51.000000000 +0200
-@@ -22,7 +22,7 @@
-    TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-    dir.ReplaceAll("cernbuild.C","");
-    dir.ReplaceAll("/./","/");
--   FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
-+   FILE *fp = fopen((dir+"cernstaff.dat").Data(),"r");
- 
-    TFile *hfile = 0;
-    if (get) {
diff --git a/root-includelist b/root-includelist
index 0eccf90..cd7842c 100644
--- a/root-includelist
+++ b/root-includelist
@@ -3,11 +3,9 @@ includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
 	rm -f $$list ; \
 	for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \
-	    if [ "$(MODULE)" = "cint/cint7" ] ; then \
-		sed 's!^include!%{_includedir}/%{name}/cint7!' <<< $$h >> $$list ; \
-	    else \
-		sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
-	    fi ; \
+	    sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
+	done ; \
+	if [ -r $$list ] ; then \
 	    sort -u $$list > $$list.unique ; \
 	    mv $$list.unique $$list ; \
-	done
+	fi
diff --git a/root.spec b/root.spec
index fc31e45..07e8df1 100644
--- a/root.spec
+++ b/root.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name:		root
-Version:	5.30.04
+Version:	5.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -48,9 +48,7 @@ Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
 #		Workaround for broken Form() on ppc
-Patch3:		%{name}-cern-ppc.patch
-#		Fixes for external xrootd
-Patch4:		%{name}-xrootd.patch
+Patch3:		%{name}-xrootd.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
@@ -107,6 +105,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
 BuildRequires:	globus-gsi-credential-devel
 BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
@@ -299,7 +298,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
-requires:	ruby(abi) = 1.8
+Requires:	ruby(abi) = 1.8
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -1018,13 +1017,12 @@ package to use root with GNU Emacs.
 
 %prep
 %setup -q
-%if %(pkg-config --max-version 2.1.2 ftgl 2>/dev/null && echo 1 || echo 0)
+if pkg-config --max-version 2.1.2 ftgl ; then
 %patch0 -p1
-%endif
+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 \
@@ -2286,6 +2284,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Feb 13 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.06-1
+- Update to 5.30.06
+
 * Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
 - Update to 5.30.04
 
diff --git a/sources b/sources
index 27231d4..b43c23e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe36a18b07119bdd02527fc5a2d2651  root-5.30.04.tar.gz
+0a0e24e890f33b3606f8983fe8765a09  root-5.30.06.tar.gz

From 0b60ec7d477096efe647706b83c6a04470d2eb4e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 13 Feb 2012 16:18:18 +0100
Subject: [PATCH 007/344] Update to 5.28.00h

---
 root-includelist | 10 ++++------
 root.spec        | 10 +++++++---
 sources          |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/root-includelist b/root-includelist
index 0eccf90..cd7842c 100644
--- a/root-includelist
+++ b/root-includelist
@@ -3,11 +3,9 @@ includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
 	rm -f $$list ; \
 	for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \
-	    if [ "$(MODULE)" = "cint/cint7" ] ; then \
-		sed 's!^include!%{_includedir}/%{name}/cint7!' <<< $$h >> $$list ; \
-	    else \
-		sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
-	    fi ; \
+	    sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
+	done ; \
+	if [ -r $$list ] ; then \
 	    sort -u $$list > $$list.unique ; \
 	    mv $$list.unique $$list ; \
-	done
+	fi
diff --git a/root.spec b/root.spec
index 383e195..572b0f0 100644
--- a/root.spec
+++ b/root.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name:		root
-Version:	5.28.00g
+Version:	5.28.00h
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -108,6 +108,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
 BuildRequires:	globus-gsi-credential-devel
 BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
@@ -1012,9 +1013,9 @@ package to use root with GNU Emacs.
 
 %prep
 %setup -q
-%if %(pkg-config --max-version 2.1.2 ftgl 2>/dev/null && echo 1 || echo 0)
+if pkg-config --max-version 2.1.2 ftgl ; then
 %patch0 -p1
-%endif
+fi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -2270,6 +2271,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Feb 13 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00h-1
+- Update to 5.28.00h
+
 * Wed Sep 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00g-1
 - Update to 5.28.00g
 
diff --git a/sources b/sources
index e136fb6..4b3101a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3db0a2db880f8744e4a01234d3020909  root-5.28.00g.tar.gz
+db8bd261e56ae5dfbce75c1a5ce5e809  root-5.28.00h.tar.gz

From 39bbb48145b8a0bd097d87973bd2d10d62e73a44 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 14 Feb 2012 00:44:37 +0100
Subject: [PATCH 008/344] PPC workaround

---
 root-cern-ppc.patch | 19 +++++++++++++++++--
 root.spec           |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/root-cern-ppc.patch b/root-cern-ppc.patch
index dfba748..dc7a08c 100644
--- a/root-cern-ppc.patch
+++ b/root-cern-ppc.patch
@@ -1,5 +1,20 @@
---- root-5.26.00d.orig/tutorials/tree/cernbuild.C	2010-08-29 10:20:56.069801363 +0200
-+++ root-5.26.00d/tutorials/tree/cernbuild.C	2010-08-29 15:52:51.000000000 +0200
+diff -ur root-5.28.00h.orig/core/base/doc/macros/fonts.C root-5.28.00h/core/base/doc/macros/fonts.C
+--- root-5.28.00h.orig/core/base/doc/macros/fonts.C	2011-11-24 17:12:40.000000000 +0100
++++ root-5.28.00h/core/base/doc/macros/fonts.C	2012-02-14 00:37:48.275434352 +0100
+@@ -16,7 +16,9 @@
+ 
+ void drawtext(double x, double y, int f, char *s)
+ {
+-   TLatex *t = new TLatex(x,y,Form("#font[41]{%d :} %s",f,s));
++   std::stringstream ss;
++   ss << "#font[41]{" << f << " :} " << s;
++   TLatex *t = new TLatex(x,y,ss.str().c_str());
+    t->SetTextFont(f);
+    t->SetTextAlign(12);
+    t->SetTextSize(0.048);
+diff -ur root-5.28.00h.orig/tutorials/tree/cernbuild.C root-5.28.00h/tutorials/tree/cernbuild.C
+--- root-5.28.00h.orig/tutorials/tree/cernbuild.C	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/tutorials/tree/cernbuild.C	2012-02-14 00:38:20.027019394 +0100
 @@ -22,7 +22,7 @@
     TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
     dir.ReplaceAll("cernbuild.C","");
diff --git a/root.spec b/root.spec
index 572b0f0..af5c0b1 100644
--- a/root.spec
+++ b/root.spec
@@ -2178,6 +2178,8 @@ fi
 %{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
 %{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
 %{_datadir}/%{name}/plugins/TProof/P040_TProof.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C

From 4e19fead5cb294f15888b4ae425d1994951c13ab Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 15 Feb 2012 00:21:19 +0100
Subject: [PATCH 009/344] Adapt to new ruby packaging guidelines

---
 root-globals.patch | 270 ---------------------------------------------
 root-html.C        |   9 +-
 root-meta.patch    |  20 ++++
 root.spec          |  33 +++---
 4 files changed, 44 insertions(+), 288 deletions(-)
 delete mode 100644 root-globals.patch
 create mode 100644 root-meta.patch

diff --git a/root-globals.patch b/root-globals.patch
deleted file mode 100644
index 325fa64..0000000
--- a/root-globals.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -ur root-5.32.00.orig/hist/hist/src/TGraph2DErrors.cxx root-5.32.00/hist/hist/src/TGraph2DErrors.cxx
---- root-5.32.00.orig/hist/hist/src/TGraph2DErrors.cxx	2011-12-02 12:42:07.000000000 +0100
-+++ root-5.32.00/hist/hist/src/TGraph2DErrors.cxx	2012-02-11 15:11:23.205768374 +0100
-@@ -71,7 +71,7 @@
-    dte->SetLineColor(kBlue-3);
-    dte->SetLineWidth(2);
-    dte->Draw("err p0");
--   gPad->SetLogy(1);
-+   TVirtualPad::Pad()->SetLogy(1);
-    return c;
- }
- End_Macro
-diff -ur root-5.32.00.orig/hist/hist/src/TMultiGraph.cxx root-5.32.00/hist/hist/src/TMultiGraph.cxx
---- root-5.32.00.orig/hist/hist/src/TMultiGraph.cxx	2011-12-02 12:42:07.000000000 +0100
-+++ root-5.32.00/hist/hist/src/TMultiGraph.cxx	2012-02-11 16:23:09.975601997 +0100
-@@ -157,7 +157,7 @@
-    mg->GetYaxis()->SetTitle("Coefficients");
- 
-    // Change the axis limits
--   gPad->Modified();
-+   TVirtualPad::Pad()->Modified();
-    mg->GetXaxis()->SetLimits(1.5,7.5);
-    mg->SetMinimum(0.);
-    mg->SetMaximum(10.);
-diff -ur root-5.32.00.orig/hist/histpainter/src/TGraphPainter.cxx root-5.32.00/hist/histpainter/src/TGraphPainter.cxx
---- root-5.32.00.orig/hist/histpainter/src/TGraphPainter.cxx	2011-12-02 12:42:07.000000000 +0100
-+++ root-5.32.00/hist/histpainter/src/TGraphPainter.cxx	2012-02-11 15:11:23.242767900 +0100
-@@ -334,8 +334,8 @@
-    float y[]     = {1,4,9};
-    TGraphErrors tg(3,x,y,err_x,err_y);
-    c48->Divide(2,1);
--   c48->cd(1); gPad->DrawFrame(0,0,4,8); tg.Draw("PC");
--   c48->cd(2); gPad->DrawFrame(0,0,4,8); tg.Draw("0PC");
-+   c48->cd(1); TVirtualPad::Pad()->DrawFrame(0,0,4,8); tg.Draw("PC");
-+   c48->cd(2); TVirtualPad::Pad()->DrawFrame(0,0,4,8); tg.Draw("0PC");
-    return c48;
- }
- End_Macro
-diff -ur root-5.32.00.orig/hist/histpainter/src/THistPainter.cxx root-5.32.00/hist/histpainter/src/THistPainter.cxx
---- root-5.32.00.orig/hist/histpainter/src/THistPainter.cxx	2011-12-02 12:42:07.000000000 +0100
-+++ root-5.32.00/hist/histpainter/src/THistPainter.cxx	2012-02-11 15:15:38.786479566 +0100
-@@ -665,14 +665,14 @@
- 
-    // scale hint1 to the pad coordinates
-    Float_t rightmax = 1.1*hint1->GetMaximum();
--   Float_t scale = gPad->GetUymax()/rightmax;
-+   Float_t scale = TVirtualPad::Pad()->GetUymax()/rightmax;
-    hint1->SetLineColor(kRed);
-    hint1->Scale(scale);
-    hint1->Draw("same");
- 
-    // draw an axis on the right side
--   TGaxis *axis = new TGaxis(gPad->GetUxmax(),gPad->GetUymin(),
--   gPad->GetUxmax(), gPad->GetUymax(),0,rightmax,510,"+L");
-+   TGaxis *axis = new TGaxis(TVirtualPad::Pad()->GetUxmax(),TVirtualPad::Pad()->GetUymin(),
-+   TVirtualPad::Pad()->GetUxmax(), TVirtualPad::Pad()->GetUymax(),0,rightmax,510,"+L");
-    axis->SetLineColor(kRed);
-    axis->SetTextColor(kRed);
-    axis->Draw();
-@@ -2178,7 +2178,7 @@
- 
-    TMultiGraph *mg;
-    TKey *key;
--   TIter nextkey(gDirectory->GetListOfKeys());
-+   TIter nextkey(TDirectory::CurrentDirectory()->GetListOfKeys());
-    while (key = (TKey*)nextkey()) {
-       obj = key->ReadObj();
-       if (obj->InheritsFrom("TMultiGraph")) {
-diff -ur root-5.32.00.orig/hist/histpainter/src/TPaletteAxis.cxx root-5.32.00/hist/histpainter/src/TPaletteAxis.cxx
---- root-5.32.00.orig/hist/histpainter/src/TPaletteAxis.cxx	2011-12-02 12:42:07.000000000 +0100
-+++ root-5.32.00/hist/histpainter/src/TPaletteAxis.cxx	2012-02-11 16:28:01.762786179 +0100
-@@ -58,7 +58,7 @@
-    }
-    gStyle->SetPalette(1);
-    h2->Draw("COLZ");
--   gPad->Update();
-+   TVirtualPad::Pad()->Update();
-    TPaletteAxis *palette = (TPaletteAxis*)h2->GetListOfFunctions()->FindObject("palette");
-    palette->SetY2NDC(0.7);
-    return c1;
-diff -ur root-5.32.00.orig/tree/treeviewer/src/TParallelCoord.cxx root-5.32.00/tree/treeviewer/src/TParallelCoord.cxx
---- root-5.32.00.orig/tree/treeviewer/src/TParallelCoord.cxx	2011-12-02 12:42:02.000000000 +0100
-+++ root-5.32.00/tree/treeviewer/src/TParallelCoord.cxx	2012-02-11 16:30:34.884789287 +0100
-@@ -78,7 +78,7 @@
-    TFile *f = TFile::Open("$ROOTSYS/tutorials/tree/cernstaff.root");
-    TTree *T = (TTree*)f->Get("T");
-    T->Draw("Age:Grade:Step:Cost:Division:Nation","","para");
--   TParallelCoord* para = (TParallelCoord*)gPad->GetListOfPrimitives()->FindObject("ParaCoord");
-+   TParallelCoord* para = (TParallelCoord*)TVirtualPad::Pad()->GetListOfPrimitives()->FindObject("ParaCoord");
-    TParallelCoordVar* grade = (TParallelCoordVar*)para->GetVarList()->FindObject("Grade");
-    grade->AddRange(new TParallelCoordRange(grade,11.5,14));
-    para->AddSelection("less30");
-diff -ur root-5.32.00.orig/tutorials/graphics/earth.C root-5.32.00/tutorials/graphics/earth.C
---- root-5.32.00.orig/tutorials/graphics/earth.C	2011-12-02 12:41:50.000000000 +0100
-+++ root-5.32.00/tutorials/graphics/earth.C	2012-02-11 16:07:56.025452212 +0100
-@@ -19,7 +19,7 @@
-    TH2F *hs = new TH2F("hs","Sinusoidal",180, -180, 180, 181, -90.5, 90.5);
-    TH2F *hp = new TH2F("hp","Parabolic", 180, -180, 180, 181, -90.5, 90.5);
- 
--   TString dat = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-+   TString dat = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
-    dat.ReplaceAll("C","dat");
-    dat.ReplaceAll("/./","/");
- 
-diff -ur root-5.32.00.orig/tutorials/hist/hbars.C root-5.32.00/tutorials/hist/hbars.C
---- root-5.32.00.orig/tutorials/hist/hbars.C	2011-12-02 12:41:49.000000000 +0100
-+++ root-5.32.00/tutorials/hist/hbars.C	2012-02-11 16:05:25.309365607 +0100
-@@ -1,10 +1,10 @@
- // Example of bar charts with 1-d histograms
- // Author: Rene Brun
- {
--   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-+   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
-    dir.ReplaceAll("hbars.C","../tree/cernbuild.C");
-    dir.ReplaceAll("/./","/");
--   if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
-+   if (!TInterpreter::Instance()->IsLoaded(dir.Data())) TInterpreter::Instance()->LoadMacro(dir.Data());
-    TFile *f = (TFile*)gROOT->ProcessLineFast("cernbuild(1)");
-    if (!f) return;
-    TTree *T = (TTree*)f->Get("T");
-@@ -14,13 +14,13 @@
-    c1->Divide(1,2);
-    
-    //horizontal bar chart
--   c1->cd(1); gPad->SetGrid(); gPad->SetLogx(); gPad->SetFrameFillColor(33);
-+   c1->cd(1); TVirtualPad::Pad()->SetGrid(); TVirtualPad::Pad()->SetLogx(); TVirtualPad::Pad()->SetFrameFillColor(33);
-    T->Draw("Nation","","hbar2");
-    
-    //vertical bar chart
--   c1->cd(2); gPad->SetGrid(); gPad->SetFrameFillColor(33);
-+   c1->cd(2); TVirtualPad::Pad()->SetGrid(); TVirtualPad::Pad()->SetFrameFillColor(33);
-    T->Draw("Division>>hDiv","","goff");
--   TH1F *hDiv   = (TH1F*)gDirectory->Get("hDiv");
-+   TH1F *hDiv   = (TH1F*)TDirectory::CurrentDirectory()->Get("hDiv");
-    hDiv->SetStats(0);
-    TH1F *hDivFR = (TH1F*)hDiv->Clone("hDivFR");
-    T->Draw("Division>>hDivFR","Nation==\"FR\"","goff");
-diff -ur root-5.32.00.orig/tutorials/hist/hstack.C root-5.32.00/tutorials/hist/hstack.C
---- root-5.32.00.orig/tutorials/hist/hstack.C	2011-12-02 12:41:49.000000000 +0100
-+++ root-5.32.00/tutorials/hist/hstack.C	2012-02-11 16:08:54.067671744 +0100
-@@ -33,18 +33,18 @@
-    // in top right pad, draw the stack in non-stack mode 
-    // and errors option
-    cst->cd(2);
--   gPad->SetGrid();
-+   TVirtualPad::Pad()->SetGrid();
-    hs->Draw("nostack,e1p");
-    //in bottom left, draw in stack mode with "lego1" option
-    cst->cd(3);
--   gPad->SetFrameFillColor(17);
--   gPad->SetTheta(3.77);
--   gPad->SetPhi(2.9);
-+   TVirtualPad::Pad()->SetFrameFillColor(17);
-+   TVirtualPad::Pad()->SetTheta(3.77);
-+   TVirtualPad::Pad()->SetPhi(2.9);
-    hs->Draw("lego1");
- 
-    cst->cd(4);
-    //create two 2-D histograms and draw them in stack mode
--   gPad->SetFrameFillColor(17);
-+   TVirtualPad::Pad()->SetFrameFillColor(17);
-    THStack *a = new THStack("a","Stacked 2D histograms");
-    TF2 *f1 = new TF2("f1",
-       "xygaus + xygaus(5) + xylandau(10)",-4,4,-4,4);
-diff -ur root-5.32.00.orig/tutorials/hsimple.C root-5.32.00/tutorials/hsimple.C
---- root-5.32.00.orig/tutorials/hsimple.C	2011-12-02 12:41:50.000000000 +0100
-+++ root-5.32.00/tutorials/hsimple.C	2012-02-11 15:11:23.468765021 +0100
-@@ -25,7 +25,7 @@
- //  write access to this directory, otherwise the file is created in $PWD
- 
-    TString filename = "hsimple.root";
--   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-+   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
-    dir.ReplaceAll("hsimple.C","");
-    dir.ReplaceAll("/./","/");
-    TFile *hfile = 0;
-diff -ur root-5.32.00.orig/tutorials/math/chi2test.C root-5.32.00/tutorials/math/chi2test.C
---- root-5.32.00.orig/tutorials/math/chi2test.C	2011-12-02 12:41:49.000000000 +0100
-+++ root-5.32.00/tutorials/math/chi2test.C	2012-02-11 15:11:23.535764169 +0100
-@@ -149,25 +149,25 @@
- 
- // Draw Histogramms and Graphs
-   c1->cd(1);
--  gPad->SetFrameFillColor(21);
-+  TVirtualPad::Pad()->SetFrameFillColor(21);
-   h1->SetMarkerColor(4);
-   h1->SetMarkerStyle(20);
- 
-   h1->Draw("E");
- 
-   c1->cd(2);
--  gPad->SetFrameFillColor(21);
-+  TVirtualPad::Pad()->SetFrameFillColor(21);
-   h2->Draw("");
-   h2->SetMarkerColor(4);
-   h2->SetMarkerStyle(20);
- 
-   c1->cd(3);
--  gPad->SetFrameFillColor(21);
--  gPad->SetGridy();
-+  TVirtualPad::Pad()->SetFrameFillColor(21);
-+  TVirtualPad::Pad()->SetGridy();
-   resgr->Draw("APL");
- 
-   c1->cd(4);
--  gPad->SetFrameFillColor(21);
-+  TVirtualPad::Pad()->SetFrameFillColor(21);
-   qqplot->Draw("AP");
- 
-   c1->cd(0);
-diff -ur root-5.32.00.orig/tutorials/tree/cernbuild.C root-5.32.00/tutorials/tree/cernbuild.C
---- root-5.32.00.orig/tutorials/tree/cernbuild.C	2012-02-10 14:59:26.357917020 +0100
-+++ root-5.32.00/tutorials/tree/cernbuild.C	2012-02-11 17:52:20.988688923 +0100
-@@ -19,7 +19,7 @@
-    //The input file cern.dat is a copy of the CERN staff data base
-    //from 1988
-    TString filename = "cernstaff.root";
--   TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-+   TString dir = gSystem->UnixPathName(TInterpreter::Instance()->GetCurrentMacroName());
-    dir.ReplaceAll("cernbuild.C","");
-    dir.ReplaceAll("/./","/");
-    FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
-diff -ur root-5.32.00.orig/tutorials/tree/cernstaff.C root-5.32.00/tutorials/tree/cernstaff.C
---- root-5.32.00.orig/tutorials/tree/cernstaff.C	2011-12-02 12:41:49.000000000 +0100
-+++ root-5.32.00/tutorials/tree/cernstaff.C	2012-02-11 16:02:20.534771748 +0100
-@@ -10,17 +10,17 @@
-    c1->SetFillColor(17);
-    c1->Divide(2,2);
-    // make table of number of people per Nation & Division
--   c1->cd(1); gPad->SetGrid();
-+   c1->cd(1); TVirtualPad::Pad()->SetGrid();
-    T->Draw("Nation:Division>>hN","","text");
--   TH2F *hN = (TH2F*)gDirectory->Get("hN");
-+   TH2F *hN = (TH2F*)TDirectory::CurrentDirectory()->Get("hN");
-    hN->SetMarkerSize(1.6);
-    hN->SetStats(0);
-    
-    //make profile of Average cost per Nation
--   c1->cd(2); gPad->SetGrid();
--   gPad->SetLeftMargin(0.12);
-+   c1->cd(2); TVirtualPad::Pad()->SetGrid();
-+   TVirtualPad::Pad()->SetLeftMargin(0.12);
-    T->Draw("Cost:Nation>>hNation","","prof,goff");
--   TH1F *hNation = (TH1F*)gDirectory->Get("hNation");
-+   TH1F *hNation = (TH1F*)TDirectory::CurrentDirectory()->Get("hNation");
-    hNation->SetTitle("Average Cost per Nation");
-    hNation->LabelsOption(">"); //sort by decreasing bin contents
-    hNation->SetMaximum(13000);
-@@ -30,7 +30,7 @@
-    hNation->Draw();
-    
-    //make stacked plot of Nations versus Grade
--   c1->cd(3); gPad->SetGrid();
-+   c1->cd(3); TVirtualPad::Pad()->SetGrid();
-    THStack *hGrades = new THStack("hGrades","Nations versus Grade");
-    TH1F *hFR = new TH1F("hFR","FR",12,3,15);
-     hFR->SetFillColor(kCyan);
-@@ -62,10 +62,10 @@
-    legend->Draw();
-    
-    //make histogram of age distribution
--   c1->cd(4); gPad->SetGrid();
-+   c1->cd(4); TVirtualPad::Pad()->SetGrid();
-    T->Draw("Age");
-    T->Draw("Age>>hRetired","Age>(65-2002+1988)","same");
--   TH1F *hRetired = (TH1F*)gDirectory->Get("hRetired");
-+   TH1F *hRetired = (TH1F*)TDirectory::CurrentDirectory()->Get("hRetired");
-    hRetired->SetFillColor(kRed);
-    hRetired->SetFillStyle(3010);
-    
diff --git a/root-html.C b/root-html.C
index 8d9633c..ac7f93f 100644
--- a/root-html.C
+++ b/root-html.C
@@ -6,13 +6,12 @@
   gSystem->AddIncludePath("-I@PWD@/cint/cint/include");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/stl");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/lib");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/include");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/include");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/stl");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/lib");
+  gInterpreter->AddIncludePath("@PWD@/include");
+  gInterpreter->AddIncludePath("@PWD@/cint/cint/include");
+  gInterpreter->AddIncludePath("@PWD@/cint/cint/stl");
+  gInterpreter->AddIncludePath("@PWD@/cint/cint/lib");
   #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..819e87e
--- /dev/null
+++ b/root-meta.patch
@@ -0,0 +1,20 @@
+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-14 13:36:39.840687660 +0100
+@@ -322,11 +322,14 @@
+ 
+    TString include;
+    // Add the root include directory to list searched by default
+-#ifndef ROOTINCDIR
+    include = gSystem->Getenv("ROOTSYS");
++#ifndef ROOTINCDIR
+    include.Append("/include");
+ #else
+-   include = ROOTINCDIR;
++   if (include != "")
++     include.Append("/include");
++   else
++     include = ROOTINCDIR;
+ #endif
+   TCint::AddIncludePath(include);
+ 
diff --git a/root.spec b/root.spec
index 6424f24..a308906 100644
--- a/root.spec
+++ b/root.spec
@@ -7,7 +7,15 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
+%{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
+
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%global ruby_installdir %{ruby_vendorarchdir}
+%global ruby_abi 1.9.1
+%else
+%global ruby_installdir %{ruby_sitearchdir}
+%global ruby_abi 1.8
+%endif
 
 %if %($(pkg-config emacs) ; echo $?)
 %global emacs_version 21.4
@@ -20,7 +28,7 @@
 Name:		root
 Version:	5.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -55,9 +63,9 @@ Patch4:		%{name}-rfio.patch
 #		Missing globus auth module deps
 #		https://savannah.cern.ch/bugs/index.php?91462
 Patch5:		%{name}-globus-deps.patch
-#		Removed globals
+#		Fix hardcoded include path
 #		https://savannah.cern.ch/bugs/index.php?91463
-Patch6:		%{name}-globals.patch
+Patch6:		%{name}-meta.patch
 #		Ruby 1.9 configuration
 #		https://savannah.cern.ch/bugs/index.php?91461
 Patch7:		%{name}-ruby.patch
@@ -314,11 +322,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
-%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
-Requires:	ruby(abi) = 1.9.1
-%else
-Requires:	ruby(abi) = 1.8
-%endif
+Requires:	ruby(abi) = %{ruby_abi}
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -1307,10 +1311,10 @@ install -m 644 pyroot26/ROOT.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
 %endif
 
 # Same for the Ruby interface library
-mkdir -p ${RPM_BUILD_ROOT}%{ruby_sitearch}
+mkdir -p ${RPM_BUILD_ROOT}%{ruby_installdir}
 mv ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libRuby.so.%{libversion} \
-   ${RPM_BUILD_ROOT}%{ruby_sitearch}/libRuby.so
-ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_sitearch}`/libRuby.so \
+   ${RPM_BUILD_ROOT}%{ruby_installdir}/libRuby.so
+ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_installdir}`/libRuby.so \
    ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libRuby.so.%{libversion}
 
 # These should be in PATH
@@ -1833,7 +1837,7 @@ fi
 %files ruby -f includelist-bindings-ruby
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRuby.*
-%{ruby_sitearch}/libRuby.*
+%{ruby_installdir}/libRuby.*
 
 %files genetic -f includelist-math-genetic
 %defattr(-,root,root,-)
@@ -2306,6 +2310,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
+- Adapt to new ruby packaging guidelines
+
 * Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
 - Update to 5.32.00
 

From 54830dbb655f1454f2a2019ce18afafd9b66d73e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 28 Feb 2012 13:59:46 -0600
Subject: [PATCH 010/344] - Rebuilt for c++ ABI breakage

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index a308906..d000e32 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2310,6 +2310,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
+- Rebuilt for c++ ABI breakage
+
 * Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
 - Adapt to new ruby packaging guidelines
 

From f53cf6e9e30045aa2532e0b78c7c7670f7e9422d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 3 Mar 2012 10:27:27 +0100
Subject: [PATCH 011/344] Update to 5.32.01

- Drop patches fixed upstream
---
 root-fit.patch         |  75 ---------------
 root-globus-deps.patch |  30 ------
 root-html.C            |   9 +-
 root-meta.patch        |  50 +++++++---
 root-rfio.patch        |  74 ---------------
 root-ruby.patch        | 211 -----------------------------------------
 root.spec              |  27 ++----
 7 files changed, 50 insertions(+), 426 deletions(-)
 delete mode 100644 root-fit.patch
 delete mode 100644 root-globus-deps.patch
 delete mode 100644 root-rfio.patch
 delete mode 100644 root-ruby.patch

diff --git a/root-fit.patch b/root-fit.patch
deleted file mode 100644
index 09a255f..0000000
--- a/root-fit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/Chi2FCN.h root-5.32.00/math/mathcore/inc/Fit/Chi2FCN.h
---- root-5.32.00.orig/math/mathcore/inc/Fit/Chi2FCN.h	2011-12-02 12:41:53.000000000 +0100
-+++ root-5.32.00/math/mathcore/inc/Fit/Chi2FCN.h	2012-02-12 22:45:37.560460921 +0100
-@@ -61,17 +61,14 @@
-    @ingroup  FitMethodFunc   
- */ 
- template<class FunType> 
--class Chi2FCN : public ::ROOT::Math::BasicFitMethodFunction<FunType> {
-+class Chi2FCN : public ROOT::Math::BasicFitMethodFunction<FunType> {
- 
- public: 
-+   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
-+   typedef typename BaseObjFunction::BaseFunction BaseFunction; 
- 
--
--
--   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
--   typedef typename  BaseObjFunction::BaseFunction BaseFunction; 
--
--   //typedef  typename ::ROOT::Math::ParamFunctionTrait<FunType>::PFType IModelFunction;
--   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
-+   //typedef typename ROOT::Math::ParamFunctionTrait<FunType>::PFType IModelFunction;
-+   typedef ROOT::Math::IParamMultiFunction IModelFunction;
-    typedef typename BaseObjFunction::Type_t Type_t;
- 
-    /** 
-diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/LogLikelihoodFCN.h root-5.32.00/math/mathcore/inc/Fit/LogLikelihoodFCN.h
---- root-5.32.00.orig/math/mathcore/inc/Fit/LogLikelihoodFCN.h	2011-12-02 12:41:53.000000000 +0100
-+++ root-5.32.00/math/mathcore/inc/Fit/LogLikelihoodFCN.h	2012-02-12 22:48:57.058092616 +0100
-@@ -50,17 +50,13 @@
-    @ingroup  FitMethodFunc   
- */ 
- template<class FunType> 
--class LogLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction<FunType>  {
-+class LogLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction<FunType>  {
- 
- public: 
-+   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
-+   typedef typename BaseObjFunction::BaseFunction BaseFunction; 
- 
--
--
--   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction; 
--   typedef typename  BaseObjFunction::BaseFunction BaseFunction; 
--
--   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
--
-+   typedef ROOT::Math::IParamMultiFunction IModelFunction;
- 
-    /** 
-       Constructor from unbin data set and model function (pdf)
-diff -ur root-5.32.00.orig/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h root-5.32.00/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h
---- root-5.32.00.orig/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h	2011-12-02 12:41:53.000000000 +0100
-+++ root-5.32.00/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h	2012-02-12 22:48:29.878448447 +0100
-@@ -50,16 +50,13 @@
-    @ingroup  FitMethodFunc
- */
- template<class FunType>
--class PoissonLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction<FunType>  {
-+class PoissonLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction<FunType>  {
- 
- public:
-+   typedef ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
-+   typedef typename BaseObjFunction::BaseFunction BaseFunction;
- 
--
--   typedef  ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
--   typedef typename  BaseObjFunction::BaseFunction BaseFunction;
--
--   typedef  ::ROOT::Math::IParamMultiFunction IModelFunction;
--
-+   typedef ROOT::Math::IParamMultiFunction IModelFunction;
- 
-    /**
-       Constructor from unbin data set and model function (pdf)
diff --git a/root-globus-deps.patch b/root-globus-deps.patch
deleted file mode 100644
index fb99c36..0000000
--- a/root-globus-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-5.32.00.orig/config/Makefile.depend root-5.32.00/config/Makefile.depend
---- root-5.32.00.orig/config/Makefile.depend	2011-12-02 12:42:19.000000000 +0100
-+++ root-5.32.00/config/Makefile.depend	2012-02-10 19:42:24.408218116 +0100
-@@ -100,7 +100,7 @@
- CINTEXLIBDEPM          = $(REFLEXLIB)
- REFLEXDICTLIBDEPM      = $(REFLEXLIB)
- RAUTHLIBDEPM           = $(NETLIB) $(IOLIB)
--GLBSAUTHLIBDEPM        = $(RAUTHLIB)
-+GLBSAUTHLIBDEPM        = $(RAUTHLIB) $(NETLIB)
- KRB5AUTHLIBDEPM        = $(RAUTHLIB) $(NETLIB)
- SRVAUTHLIBDEPM         = $(NETLIB)
- QTGSILIBDEPM           = $(GUILIB) $(GPADLIB)
-@@ -366,7 +366,7 @@
- CINTEXLIBEXTRA          = lib/libReflex.lib
- REFLEXDICTLIBEXTRA      = lib/libReflex.lib
- RAUTHLIBEXTRA           = lib/libNet.lib lib/libRIO.lib
--GLBSAUTHLIBEXTRA        = lib/libRootAuth.lib
-+GLBSAUTHLIBEXTRA        = lib/libRootAuth.lib lib/libNet.lib
- KRB5AUTHLIBEXTRA        = lib/libRootAuth.lib lib/libNet.lib
- SRVAUTHLIBEXTRA         = lib/libNet.lib
- QTGSILIBEXTRA           = lib/libGui.lib lib/libGpad.lib
-@@ -498,7 +498,7 @@
- CINTEXLIBEXTRA          = -Llib -lReflex
- REFLEXDICTLIBEXTRA      = -Llib -lReflex
- RAUTHLIBEXTRA           = -Llib -lNet -lRIO
--GLBSAUTHLIBEXTRA        = -Llib -lRootAuth
-+GLBSAUTHLIBEXTRA        = -Llib -lRootAuth -lNet
- KRB5AUTHLIBEXTRA        = -Llib -lRootAuth -lNet
- SRVAUTHLIBEXTRA         = -Llib -lNet
- QTGSILIBEXTRA           = -Llib -lGui -lGpad
diff --git a/root-html.C b/root-html.C
index ac7f93f..82b0244 100644
--- a/root-html.C
+++ b/root-html.C
@@ -6,10 +6,11 @@
   gSystem->AddIncludePath("-I@PWD@/cint/cint/include");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/stl");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/lib");
-  gInterpreter->AddIncludePath("@PWD@/include");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/include");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/stl");
-  gInterpreter->AddIncludePath("@PWD@/cint/cint/lib");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/include");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/include");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/stl");
+  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/lib");
+  #include <RtypesCint.h>
   #include <iostream>
   #include <string>
   #include <DllImport.h>
diff --git a/root-meta.patch b/root-meta.patch
index 819e87e..6395e3a 100644
--- a/root-meta.patch
+++ b/root-meta.patch
@@ -1,20 +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-14 13:36:39.840687660 +0100
-@@ -322,11 +322,14 @@
++++ 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
--#ifndef ROOTINCDIR
-    include = gSystem->Getenv("ROOTSYS");
-+#ifndef ROOTINCDIR
-    include.Append("/include");
+-   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;
-+   if (include != "")
-+     include.Append("/include");
-+   else
-+     include = ROOTINCDIR;
++      include = ROOTINCDIR;
  #endif
-   TCint::AddIncludePath(include);
+-  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-rfio.patch b/root-rfio.patch
deleted file mode 100644
index 1af3f2f..0000000
--- a/root-rfio.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ur root-5.32.00.orig/configure root-5.32.00/configure
---- root-5.32.00.orig/configure	2011-12-02 12:42:22.000000000 +0100
-+++ root-5.32.00/configure	2012-02-10 17:36:40.090907758 +0100
-@@ -3183,7 +3183,7 @@
-         fi
-     fi
- 
--    check_library "librfio libdpm libshift shiftmd shift" "$enable_shared" \
-+    check_library "librfio libdpm libcastorrfio libshift shiftmd shift" "$enable_shared" \
-         "$shiftlibdir" \
-         $RFIO ${RFIO:+$RFIO/lib} /cern/pro/lib /cern/new/lib /cern/old/lib \
-         /opt/shift/lib /usr/local/shift/lib /usr/lib/shift \
-@@ -3194,6 +3194,10 @@
-     if test "x$shiftincdir" = "x" || test "x$shiftlib" = "x"; then
-         enable_rfio="no"
-     else
-+        case $shiftlib in
-+            *dpm)        shiftlib="$shiftlib -llcgdm" ;;
-+            *castorrfio) shiftlib="$shiftlib -lcastorcommon" ;;
-+        esac
-         case $platform in
-            linux | macosx)
-                 for i in "" -ladns ; do
-@@ -3203,14 +3207,7 @@
-                         break ;
-                     fi
-                 done
--                # Explicit linking: which libraries are needed to satisfy symbols
--                # from libshift?
--                # 2.1.9 has new library layout
--                shiftlibdep="-lcastorrfio -lcastorclient -lcastorcommon"
--                check_link "$shiftlib $shiftlibdep" "$shiftlibdir" rfio_fchmod
--                if test $link_result -eq 1 ; then
--                    shiftlib="$shiftlib $shiftlibdep"
--                else
-+                if test $link_result -ne 1 ; then
-                     enable_rfio="no"
-                 fi
-                 ;;
-@@ -3280,7 +3277,7 @@
-         fi
-     fi
- 
--    check_library "libshift shiftmd shift" "$enable_shared" "$castorlibdir" \
-+    check_library "libcastorrfio libshift shiftmd shift" "$enable_shared" "$castorlibdir" \
-         $CASTOR ${CASTOR:+$CASTOR/lib} /cern/pro/lib /cern/new/lib \
-         /cern/old/lib /opt/shift/lib /usr/local/shift/lib /usr/lib/shift \
-         /usr/local/lib/shift /usr/lib /usr/local/lib
-@@ -3290,6 +3287,9 @@
-     if test "x$castorincdir" = "x" || test "x$castorlib" = "x"; then
-         enable_castor="no"
-     else
-+        case $castorlib in
-+            *castorrfio) castorlib="$castorlib -lcastorclient -lcastorns -lcastorcommon" ;;
-+        esac
-         case $platform in
-            linux | macosx)
-                 for i in "" -ladns ; do
-@@ -3299,14 +3299,7 @@
-                         break ;
-                     fi
-                 done
--                # Explicit linking: which libraries are needed to satisfy symbols
--                # from libshift?
--                # 2.1.9 has new library layout
--                castorlibdep="-lcastorrfio -lcastorclient -lcastorns -lcastorcommon"
--                check_link "$castorlib $castorlibdep" "$castorlibdir" rfio_fchmod
--                if test $link_result -eq 1 ; then
--                    castorlib="$castorlib $castorlibdep"
--                else
-+                if test $link_result -ne 1 ; then
-                     enable_castor="no"
-                 fi
-                 ;;
diff --git a/root-ruby.patch b/root-ruby.patch
deleted file mode 100644
index d616e5b..0000000
--- a/root-ruby.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -ur root-5.32.00.orig/bindings/ruby/src/drr.cxx root-5.32.00/bindings/ruby/src/drr.cxx
---- root-5.32.00.orig/bindings/ruby/src/drr.cxx	2011-12-02 12:41:55.000000000 +0100
-+++ root-5.32.00/bindings/ruby/src/drr.cxx	2012-02-12 16:20:46.248535290 +0100
-@@ -24,6 +24,17 @@
- 
- #include "ruby.h"
- 
-+// Define macros for old ruby versions
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-+#endif
-+#ifndef RFLOAT_VALUE
-+#define RFLOAT_VALUE(v) (RFLOAT(v)->value)
-+#endif
-+#ifndef RARRAY_LEN
-+#define RARRAY_LEN(s) (RARRAY(s)->len)
-+#endif
-+
- #include "rrcommon.h"
- 
- /* ROOT's global enums.  */
-@@ -34,7 +45,7 @@
- #include "dlfcn.h"
- #endif
- 
--#if ((R__RUBY_MAJOR<1) || (R__RUBY_MAJOR==1)&&(R__RUBY_MINOR<=9))
-+#if ((R__RUBY_MAJOR<1) || (R__RUBY_MAJOR==1)&&(R__RUBY_MINOR<=8))
- #  define rb_frame_this_func rb_frame_last_func
- #endif
- 
-@@ -158,9 +169,9 @@
-    switch (TYPE(o))
-       {
-       case T_STRING:
--         return (void *) RSTRING(o)->ptr;
-+         return (void *) RSTRING_PTR(o);
-       case T_FLOAT:
--         return (void *) &RFLOAT(o)->value;
-+         return (void *) &RFLOAT_VALUE(o);
-       case T_FIXNUM:
-          /* FIXME: Memory leak until I find the correct way. Until
-           * then please use integers in TTrees with care. --elathan
-@@ -172,8 +183,9 @@
-          RRGRAB(o, void *, res);
-          return res;
-       default:
--         rb_fatal ("Failed convertion of %d to void *.\n",
--                   STR2CSTR(CLASS_OF(o)));
-+         VALUE tmp = CLASS_OF(o);
-+         rb_fatal ("Failed convertion of %d to void *.\n", 
-+                   StringValuePtr(tmp));
-          break;
-       }
- 
-@@ -392,7 +404,7 @@
-       }
- 
-    VALUE keys = rb_funcall(parms, rb_intern("keys"), 0);
--   for (int i = 0; i < RARRAY(keys)->len; i++)
-+   for (int i = 0; i < RARRAY_LEN(keys); i++)
-       {
-          VALUE key = rb_ary_entry (keys, i);
-          rb_funcall (self, rb_to_id (ameth), 2, key, rb_hash_aref (parms, key));
-@@ -424,7 +436,7 @@
-     * 3. When we want both 1 and 2
-     */
- 
--   int nargs = RARRAY(inargs)->len - offset;
-+   int nargs = RARRAY_LEN(inargs) - offset;
-    double *arr = NULL;
-    TObject *ptr = NULL;
-    VALUE v = 0;
-@@ -446,7 +458,7 @@
-                if (cproto) strcat(cproto, "double");
-                break;
-             case T_STRING:
--               if (f) f->SetArg((long) STR2CSTR(arg));
-+               if (f) f->SetArg((long) StringValuePtr(arg));
-                if (cproto) strcat(cproto, "char*");
-                break;
-             case T_ARRAY:
-@@ -455,8 +467,8 @@
-                 */
-                if (f)
-                   {
--                     arr = ALLOC_N (double, RARRAY(arg)->len);
--                     for (int j = 0; j < RARRAY(arg)->len; j++)
-+                     arr = ALLOC_N (double, RARRAY_LEN(arg));
-+                     for (int j = 0; j < RARRAY_LEN(arg); j++)
-                         arr[j] = NUM2DBL(rb_ary_entry (arg, j));
-                      f->SetArg((long) arr);
-                   }
-@@ -469,7 +481,8 @@
-                      Data_Get_Struct (v, TObject, ptr);
-                      if (f) f->SetArg((long) ptr);
-                      if (cproto) {
--                        strcat(cproto, STR2CSTR(rb_iv_get (arg, "__rr_class__")));
-+                        VALUE tmp = rb_iv_get (arg, "__rr_class__");
-+                        strcat(cproto, StringValuePtr(tmp));
-                         if( ((reference_map>>ntobjects)&0x1) ) {
-                            strcat(cproto, "*");
-                         } else {
-@@ -637,11 +650,11 @@
-    VALUE v;
- 
-    /* Check if there is a ROOT dict. available.  */
--   TClass *c = TClass::GetClass(STR2CSTR(klass));
-+   TClass *c = TClass::GetClass(StringValuePtr(klass));
-    if (c)
-       {
-          VALUE k;
--         char *name = STR2CSTR(klass);
-+         char *name = StringValuePtr(klass);
-          if (!rb_const_defined (rb_cObject, rb_intern(name)))
-             k = rb_define_class (name, drrAbstractClass);
-          else
-@@ -652,7 +665,7 @@
-          rb_iv_set (v, "__rr_class__", klass);
-       }
-    else
--      rb_raise( rb_eArgError, "No TClass found for %s. Is this a Root type?", STR2CSTR(klass) );
-+      rb_raise( rb_eArgError, "No TClass found for %s. Is this a Root type?", StringValuePtr(klass) );
- 
-    return v;
- }
-@@ -671,7 +684,7 @@
- 
-    /* Call the requested ctor.  */
- 
--   if (RARRAY(inargs)->len) {
-+   if (RARRAY_LEN(inargs)) {
-       drr_find_method_prototype (&klass, classname, inargs, cproto, 0);
-       drr_set_method_args ( inargs, &func, 0);
-    }
-@@ -767,7 +780,7 @@
-    char * classname = (char *) rb_class2name(self);
- 	
-    rb_scan_args (argc, argv, "0*", &inargs);
--   nargs = RARRAY(inargs)->len - 1;
-+   nargs = RARRAY_LEN(inargs) - 1;
- 
-    G__CallFunc *func = new G__CallFunc();
-    G__ClassInfo *klass = new G__ClassInfo (classname);
-@@ -816,12 +829,13 @@
- 
-    /* Grab method, class and the instance pointer.  */
-    methname = (char*) rb_id2name (rb_to_id(argv[0]));
--   classname = STR2CSTR(rb_iv_get (self, "__rr_class__"));
-+   VALUE tmp = rb_iv_get (self, "__rr_class__");
-+   classname = StringValuePtr(tmp);
-    TObject *caller = drr_grab_object (self);
- 
-    rb_scan_args (argc, argv, "0*", &inargs);
- 
--   nargs = RARRAY(inargs)->len - 1;
-+   nargs = RARRAY_LEN(inargs) - 1;
-    VALUE rklass = rb_class_of (self);
- 
-    G__CallFunc *func = new G__CallFunc();
-@@ -890,7 +904,7 @@
- 
-    rb_scan_args (argc, argv, "0*", &inargs);
- 
--   nargs = RARRAY(inargs)->len;
-+   nargs = RARRAY_LEN(inargs);
- 
-    G__CallFunc *func = NULL;
- 
-diff -ur root-5.32.00.orig/configure root-5.32.00/configure
---- root-5.32.00.orig/configure	2011-12-02 12:42:22.000000000 +0100
-+++ root-5.32.00/configure	2012-02-12 12:11:14.836641595 +0100
-@@ -4171,19 +4171,25 @@
-     # Check for Ruby include and library
-     myruby=`$cwhich ruby 2> /dev/null`
-     if test ! "x$myruby" = "x" && test -x "$myruby" ; then
--       rubysysincdir=`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`
--       rubysyslibdir=`ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]'`
-+       rubysysincdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["includedir"]'`
-+       rubysysarchdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]'`
-+       rubysyslibdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["libdir"]'`
-+       rubysysarch=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["arch"]'`
-     fi
--    rubysysincdir2=
-+    rubysysarchdir2=
-     if test "x$platform" = "xmacosx" ; then
--       rubysysincdir2=`echo $rubysysincdir | sed -e 's/powerpc/universal/'`
-+       rubysysarchdir2=`echo $rubysysarchdir | sed -e 's/powerpc/universal/'`
-     fi
-     check_header "ruby.h" "$rubyincdir" \
-         $RUBYDIR ${RUBYDIR:+$RUBYDIR/include} \
--        $rubysysincdir $rubysysincdir2 \
-+        $rubysysincdir $rubysysarchdir $rubysysarchdir2 \
-         /usr/local/include/ruby /usr/include/ruby
-     rubyinc=$found_hdr
-     rubyincdir=$found_dir
-+    check_header "ruby/config.h" "" $rubysysincdir/$rubysysarch
-+    if test "x$found_hdr" != "x" ; then
-+        rubyincdir="$rubyincdir $found_dir"
-+    fi
- 
-     if test "x$arch" = "xwin32" || \
-        test "x$enable_shared" = "xno" ; then
-@@ -6754,7 +6760,7 @@
- 
- if test ! "x$enable_ruby" = "xno"; then
-    echo "" >> RConfigOptions-out.tmp
--   ruby -rrbconfig -e 'puts Config::CONFIG["ruby_version"]' | \
-+   ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]' | \
-    sed 's/^\([0-9]\)\.\([0-9]\).*$/#define R__RUBY_MAJOR \1@#define R__RUBY_MINOR \2/' | \
-    tr '@' '\n' >> RConfigOptions-out.tmp
- fi
diff --git a/root.spec b/root.spec
index d000e32..0cb05e4 100644
--- a/root.spec
+++ b/root.spec
@@ -26,9 +26,9 @@
 %endif
 
 Name:		root
-Version:	5.32.00
+Version:	5.32.01
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -57,21 +57,9 @@ Patch1:		%{name}-fontconfig.patch
 Patch2:		%{name}-unuran.patch
 #		Fixes for xrootd bonjour
 Patch3:		%{name}-xrootd.patch
-#		Fix rfio configure
-#		https://savannah.cern.ch/bugs/index.php?91460
-Patch4:		%{name}-rfio.patch
-#		Missing globus auth module deps
-#		https://savannah.cern.ch/bugs/index.php?91462
-Patch5:		%{name}-globus-deps.patch
 #		Fix hardcoded include path
 #		https://savannah.cern.ch/bugs/index.php?91463
-Patch6:		%{name}-meta.patch
-#		Ruby 1.9 configuration
-#		https://savannah.cern.ch/bugs/index.php?91461
-Patch7:		%{name}-ruby.patch
-#		Dictionary generation fails on i686
-#		https://savannah.cern.ch/bugs/index.php?91459
-Patch8:		%{name}-fit.patch
+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
@@ -1048,10 +1036,6 @@ fi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -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 \
@@ -1400,6 +1384,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
@@ -2310,6 +2295,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
+- Update to 5.32.01
+- Drop patches fixed upstream
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
 - Rebuilt for c++ ABI breakage
 

From 9ba71e4342eeaab5dc98ae8766bb8c03c3b503c1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 3 Mar 2012 11:02:07 +0100
Subject: [PATCH 012/344] Update sources file

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index b8a3ff3..72f1ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb81fab8b41c657a12d2dd32ee008521  root-5.32.00.tar.gz
+b6c7368e756f912f619d18883cb10c70  root-5.32.01.tar.gz

From 0bed893234065bfddc9122e2c8475bc3e1cad50d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 17 Mar 2012 15:43:52 +0100
Subject: [PATCH 013/344] 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@fysast.uu.se> - 5.32.01-2
+- Rebuild for xrootd 3.1.1
+
 * Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
 - Update to 5.32.01
 - Drop patches fixed upstream

From 782c9c4d89d741220736371ee648d471c80439a8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 17 Mar 2012 19:23:08 +0100
Subject: [PATCH 014/344] 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(-)
 create mode 100644 root-meta.patch

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@fysast.uu.se> - 5.30.06-2
+- Rebuild for xrootd 3.1.1
+
 * Mon Feb 13 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.06-1
 - Update to 5.30.06
 

From f84df07c3fe2dc6ce4b0a092c67bc1da397207ba Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 29 Mar 2012 15:43:46 +0200
Subject: [PATCH 015/344] Update to 5.32.02

---
 root.spec | 7 +++++--
 sources   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 1b54ff0..72ddb6f 100644
--- a/root.spec
+++ b/root.spec
@@ -26,9 +26,9 @@
 %endif
 
 Name:		root
-Version:	5.32.01
+Version:	5.32.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2295,6 +2295,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
+- Update to 5.32.02
+
 * Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-2
 - Rebuild for xrootd 3.1.1
 
diff --git a/sources b/sources
index 72f1ee7..de28ff4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6c7368e756f912f619d18883cb10c70  root-5.32.01.tar.gz
+035fcd656489aa0cc7ee6b7a98d4eece  root-5.32.02.tar.gz

From ce9d3642b5bdfef8f88e74ec2a01202dbff06dfc Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 17 May 2012 21:02:22 +0200
Subject: [PATCH 016/344] Update to 5.32.03

---
 root.spec | 5 ++++-
 sources   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 72ddb6f..44d4ab2 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:		root
-Version:	5.32.02
+Version:	5.32.03
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -2295,6 +2295,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
+- Update to 5.32.03
+
 * Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
 - Update to 5.32.02
 
diff --git a/sources b/sources
index de28ff4..94d2889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-035fcd656489aa0cc7ee6b7a98d4eece  root-5.32.02.tar.gz
+18a3b912155d2ec6e493d335a23d7abe  root-5.32.03.tar.gz

From f9dd6d5cb9ae45d30b37b39598cb02732470b214 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sun, 10 Jun 2012 17:15:48 +0200
Subject: [PATCH 017/344] Update to 5.34.00

- New sub-package: root-io-gfal
---
 root-fontconfig.patch | 62 +++++++++++++++++++++----------------------
 root-glibc.patch      | 44 ++++++++++++++++++++++++++++++
 root.spec             | 37 +++++++++++++++++++++-----
 sources               |  2 +-
 4 files changed, 107 insertions(+), 38 deletions(-)
 create mode 100644 root-glibc.patch

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index ac4e5a4..6609c76 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.30.01.orig/core/base/src/TApplication.cxx root-5.30.01/core/base/src/TApplication.cxx
---- root-5.30.01.orig/core/base/src/TApplication.cxx	2011-08-18 16:45:43.000000000 +0200
-+++ root-5.30.01/core/base/src/TApplication.cxx	2011-08-18 19:28:45.079497320 +0200
-@@ -252,20 +252,9 @@
+diff -ur root-5.34.00.orig/core/base/src/TApplication.cxx root-5.34.00/core/base/src/TApplication.cxx
+--- root-5.34.00.orig/core/base/src/TApplication.cxx	2012-06-05 15:31:18.000000000 +0200
++++ root-5.34.00/core/base/src/TApplication.cxx	2012-06-09 16:01:50.212196155 +0200
+@@ -239,20 +239,9 @@
     // Try to load TrueType font renderer. Only try to load if not in batch
     // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
     // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
@@ -23,7 +23,7 @@ diff -ur root-5.30.01.orig/core/base/src/TApplication.cxx root-5.30.01/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -279,7 +268,6 @@
+@@ -266,7 +255,6 @@
        }
     }
  #endif
@@ -31,9 +31,9 @@ diff -ur root-5.30.01.orig/core/base/src/TApplication.cxx root-5.30.01/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.30.01.orig/graf2d/graf/Module.mk root-5.30.01/graf2d/graf/Module.mk
---- root-5.30.01.orig/graf2d/graf/Module.mk	2011-08-18 16:46:08.000000000 +0200
-+++ root-5.30.01/graf2d/graf/Module.mk	2011-08-18 19:28:45.086497316 +0200
+diff -ur root-5.34.00.orig/graf2d/graf/Module.mk root-5.34.00/graf2d/graf/Module.mk
+--- root-5.34.00.orig/graf2d/graf/Module.mk	2012-06-05 15:31:46.000000000 +0200
++++ root-5.34.00/graf2d/graf/Module.mk	2012-06-09 16:01:50.212196155 +0200
 @@ -45,7 +45,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -43,9 +43,9 @@ diff -ur root-5.30.01.orig/graf2d/graf/Module.mk root-5.30.01/graf2d/graf/Module
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.30.01.orig/graf2d/graf/src/TTF.cxx root-5.30.01/graf2d/graf/src/TTF.cxx
---- root-5.30.01.orig/graf2d/graf/src/TTF.cxx	2011-08-18 16:46:08.000000000 +0200
-+++ root-5.30.01/graf2d/graf/src/TTF.cxx	2011-08-18 19:28:45.130497322 +0200
+diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/TTF.cxx
+--- root-5.34.00.orig/graf2d/graf/src/TTF.cxx	2012-06-05 15:31:46.000000000 +0200
++++ root-5.34.00/graf2d/graf/src/TTF.cxx	2012-06-09 16:01:50.261196568 +0200
 @@ -26,6 +26,7 @@
  #include "TMath.h"
  #include "TError.h"
@@ -239,9 +239,9 @@ diff -ur root-5.30.01.orig/graf2d/graf/src/TTF.cxx root-5.30.01/graf2d/graf/src/
  }
  
  //______________________________________________________________________________
-diff -ur root-5.30.01.orig/graf3d/gl/Module.mk root-5.30.01/graf3d/gl/Module.mk
---- root-5.30.01.orig/graf3d/gl/Module.mk	2011-08-18 16:45:57.000000000 +0200
-+++ root-5.30.01/graf3d/gl/Module.mk	2011-08-18 19:30:30.171500251 +0200
+diff -ur root-5.34.00.orig/graf3d/gl/Module.mk root-5.34.00/graf3d/gl/Module.mk
+--- root-5.34.00.orig/graf3d/gl/Module.mk	2012-06-05 15:31:34.000000000 +0200
++++ root-5.34.00/graf3d/gl/Module.mk	2012-06-09 16:01:50.311196992 +0200
 @@ -70,7 +70,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -251,9 +251,9 @@ diff -ur root-5.30.01.orig/graf3d/gl/Module.mk root-5.30.01/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.30.01.orig/graf3d/gl/src/TGLFontManager.cxx root-5.30.01/graf3d/gl/src/TGLFontManager.cxx
---- root-5.30.01.orig/graf3d/gl/src/TGLFontManager.cxx	2011-08-18 16:45:57.000000000 +0200
-+++ root-5.30.01/graf3d/gl/src/TGLFontManager.cxx	2011-08-18 19:28:45.153497322 +0200
+diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx	2012-06-05 15:31:34.000000000 +0200
++++ root-5.34.00/graf3d/gl/src/TGLFontManager.cxx	2012-06-09 16:01:50.311196992 +0200
 @@ -37,6 +37,8 @@
  #endif
  
@@ -379,9 +379,9 @@ diff -ur root-5.30.01.orig/graf3d/gl/src/TGLFontManager.cxx root-5.30.01/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-diff -ur root-5.30.01.orig/graf3d/gl/src/TGLText.cxx root-5.30.01/graf3d/gl/src/TGLText.cxx
---- root-5.30.01.orig/graf3d/gl/src/TGLText.cxx	2011-08-18 16:45:57.000000000 +0200
-+++ root-5.30.01/graf3d/gl/src/TGLText.cxx	2011-08-18 19:28:45.162497322 +0200
+diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/TGLText.cxx
+--- root-5.34.00.orig/graf3d/gl/src/TGLText.cxx	2012-06-05 15:31:34.000000000 +0200
++++ root-5.34.00/graf3d/gl/src/TGLText.cxx	2012-06-09 16:01:50.320197065 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -498,9 +498,9 @@ diff -ur root-5.30.01.orig/graf3d/gl/src/TGLText.cxx root-5.30.01/graf3d/gl/src/
 +   FcPatternDestroy (match);
 +   FcPatternDestroy (pat);
  }
-diff -ur root-5.30.01.orig/gui/gui/src/TGApplication.cxx root-5.30.01/gui/gui/src/TGApplication.cxx
---- root-5.30.01.orig/gui/gui/src/TGApplication.cxx	2011-08-18 16:46:02.000000000 +0200
-+++ root-5.30.01/gui/gui/src/TGApplication.cxx	2011-08-18 19:28:45.169497323 +0200
+diff -ur root-5.34.00.orig/gui/gui/src/TGApplication.cxx root-5.34.00/gui/gui/src/TGApplication.cxx
+--- root-5.34.00.orig/gui/gui/src/TGApplication.cxx	2012-06-05 15:31:42.000000000 +0200
++++ root-5.34.00/gui/gui/src/TGApplication.cxx	2012-06-09 16:01:50.327197123 +0200
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -528,10 +528,10 @@ diff -ur root-5.30.01.orig/gui/gui/src/TGApplication.cxx root-5.30.01/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.30.01.orig/gui/gui/src/TGSpeedo.cxx root-5.30.01/gui/gui/src/TGSpeedo.cxx
---- root-5.30.01.orig/gui/gui/src/TGSpeedo.cxx	2011-08-18 16:46:02.000000000 +0200
-+++ root-5.30.01/gui/gui/src/TGSpeedo.cxx	2011-08-18 19:28:45.170497323 +0200
-@@ -117,8 +117,7 @@
+diff -ur root-5.34.00.orig/gui/gui/src/TGSpeedo.cxx root-5.34.00/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.00.orig/gui/gui/src/TGSpeedo.cxx	2012-06-05 15:31:42.000000000 +0200
++++ root-5.34.00/gui/gui/src/TGSpeedo.cxx	2012-06-09 16:03:08.260851587 +0200
+@@ -119,8 +119,7 @@
  
     TString sc;
     Float_t step, mark[5];
@@ -541,20 +541,20 @@ diff -ur root-5.30.01.orig/gui/gui/src/TGSpeedo.cxx root-5.30.01/gui/gui/src/TGS
     Int_t i, nexe, offset;
  
     const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -521,8 +520,7 @@
-       if (fImage2 && fImage2->IsValid())
+@@ -528,8 +527,7 @@
           delete fImage2;
        fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
 -      TString fp = gEnv->GetValue("Root.TTFontPath", "");
 -      TString ar = fp + "/arialbd.ttf";
 +      TString ar = "arialbd.ttf";
        // format counter value
        Int_t nexe = 0;
        Int_t ww = fCounter;
-@@ -601,8 +599,7 @@
-       if (fImage2 && fImage2->IsValid())
+@@ -609,8 +607,7 @@
           delete fImage2;
        fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
 -      TString fp = gEnv->GetValue("Root.TTFontPath", "");
 -      TString ar = fp + "/arialbd.ttf";
 +      TString ar = "arialbd.ttf";
diff --git a/root-glibc.patch b/root-glibc.patch
new file mode 100644
index 0000000..58b9afd
--- /dev/null
+++ b/root-glibc.patch
@@ -0,0 +1,44 @@
+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)
+@@ -60,7 +60,7 @@
+ #  endif
+ # elif defined(__CYGWIN__)
+ extern int fchmod(int, mode_t);
+-#else
++# else
+ 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>
+ #if !defined(MAC_OS_X_VERSION_10_4)
+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
+@@ -98,6 +98,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <errno.h>
++#include <sys/resource.h>
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <sys/time.h>
diff --git a/root.spec b/root.spec
index 44d4ab2..f11b43d 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:		root
-Version:	5.32.03
+Version:	5.34.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -60,6 +60,8 @@ Patch3:		%{name}-xrootd.patch
 #		Fix hardcoded include path
 #		https://savannah.cern.ch/bugs/index.php?91463
 Patch4:		%{name}-meta.patch
+#		Fixes for latest glibc headers
+Patch5:		%{name}-glibc.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
@@ -122,6 +124,8 @@ BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
 BuildRequires:	xrootd-devel
 BuildRequires:	cfitsio-devel
+BuildRequires:	gfal-devel
+BuildRequires:	srm-ifce-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
@@ -565,6 +569,13 @@ Group:		Applications/Engineering
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
+%package io-gfal
+Summary:	Grid File Access Library input/output library for ROOT
+Group:		Applications/Engineering
+
+%description io-gfal
+This package contains the Grid File Access Library extension for ROOT.
+
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
 Group:		Applications/Engineering
@@ -1036,6 +1047,7 @@ fi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -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 \
@@ -1138,11 +1150,13 @@ unset QTINC
 	    --enable-bonjour \
 	    --enable-clarens \
 	    --enable-dcache \
-	    --enable-exceptions \
 	    --enable-explicitlink \
 	    --enable-fftw3 \
 	    --enable-fitsio \
 	    --enable-gdml \
+	    --enable-gfal \
+	      --with-gfal-incdir=%{_includedir} \
+	      --with-gfal-libdir=%{_libdir} \
 	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
@@ -1179,8 +1193,8 @@ unset QTINC
 	    --enable-tmva \
 	    --enable-unuran \
 	    --enable-x11 \
-	    --enable-xml \
 	    --enable-xft \
+	    --enable-xml \
 	    --enable-xrootd \
 	      --with-xrootd-incdir=%{_includedir}/xrootd \
 	      --with-xrootd-libdir=%{_libdir} \
@@ -1196,7 +1210,7 @@ unset QTINC
 	    --disable-castor \
 	    --disable-chirp \
 	    --disable-cling \
-	    --disable-gfal \
+	    --disable-cxx11 \
 	    --disable-glite \
 	    --disable-hdfs \
 	    --disable-monalisa \
@@ -1349,7 +1363,6 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins
 rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TFile/P030_TCastorFile.C
-rm TFile/P050_TGFALFile.C
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
 rm TFile/P110_THDFSFile.C
@@ -1371,6 +1384,7 @@ rm TVirtualX/P030_TGWin32.C
 %if %{?fedora}%{!?fedora:0} < 9 && %{?rhel}%{!?rhel:0} < 6
 rm TVirtualX/P040_TGQt.C
 %endif
+rm TVirtualX/P050_TGQuartz.C
 rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
@@ -1401,7 +1415,7 @@ for module in `find * -name Module.mk` ; do
 done
 
 # ... and merge some of them
-cat includelist-core-[^w]* > includelist-core
+cat includelist-core-{[^mw],m[^a]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
 cat includelist-roofit-roo* > includelist-roofit
 cat includelist-gui-qt* > includelist-gui-qt
@@ -1584,6 +1598,8 @@ fi
 %postun io -p /sbin/ldconfig
 %post io-dcache -p /sbin/ldconfig
 %postun io-dcache -p /sbin/ldconfig
+%post io-gfal -p /sbin/ldconfig
+%postun io-gfal -p /sbin/ldconfig
 %post io-rfio -p /sbin/ldconfig
 %postun io-rfio -p /sbin/ldconfig
 %post io-sql -p /sbin/ldconfig
@@ -2013,6 +2029,11 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
+%files io-gfal -f includelist-io-gfal
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libGFAL.*
+%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+
 %files io-rfio -f includelist-io-rfio
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRFIO.*
@@ -2295,6 +2316,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
+- Update to 5.34.00
+- New sub-package: root-io-gfal
+
 * Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
 - Update to 5.32.03
 
diff --git a/sources b/sources
index 94d2889..71bafd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18a3b912155d2ec6e493d335a23d7abe  root-5.32.03.tar.gz
+a2b2be237fbb8f3aed72c00b8d2aeee6  root-5.34.00.tar.gz

From 380269c3e75c333b9cdde00a5ced7e8cbf2deb5d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 29 Jun 2012 06:51:04 +0200
Subject: [PATCH 018/344] Backport fixes for using aclic with versioned
 libraries

- New sub-package: root-io-gfal
---
 root-aclic-versioned-libs.patch | 82 +++++++++++++++++++++++++++++++++
 root.spec                       | 32 +++++++++++--
 2 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 root-aclic-versioned-libs.patch

diff --git a/root-aclic-versioned-libs.patch b/root-aclic-versioned-libs.patch
new file mode 100644
index 0000000..935bf49
--- /dev/null
+++ b/root-aclic-versioned-libs.patch
@@ -0,0 +1,82 @@
+diff -ur root-5.30.06.orig/core/unix/src/TUnixSystem.cxx root-5.30.06/core/unix/src/TUnixSystem.cxx
+--- root-5.30.06.orig/core/unix/src/TUnixSystem.cxx	2012-01-10 16:14:31.000000000 +0100
++++ root-5.30.06/core/unix/src/TUnixSystem.cxx	2012-06-29 06:29:42.030017840 +0200
+@@ -440,6 +440,9 @@
+ 
+    TString lib = _dyld_get_image_name(i++);
+ 
++   TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
++   TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
++
+ #ifndef ROOTPREFIX
+ #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+    // first loaded is the app so set ROOTSYS to app bundle
+@@ -454,7 +457,8 @@
+       }
+    }
+ #else
+-   if (lib.EndsWith("libCore.dylib") || lib.EndsWith("libCore.so")) {
++   if (lib.EndsWith("libCore.dylib") || lib.EndsWith("libCore.so") ||
++       lib.Index(sovers) != kNPOS    || lib.Index(dyvers) != kNPOS) {
+       char respath[kMAXPATHLEN];
+       if (!realpath(lib, respath)) {
+          if (!gSystem->Getenv("ROOTSYS"))
+@@ -476,9 +480,23 @@
+ 
+    // add all libs loaded before libSystem.B.dylib
+    if (!gotFirstSo && (lib.EndsWith(".dylib") || lib.EndsWith(".so"))) {
+-      if (linkedDylibs.Length())
+-         linkedDylibs += " ";
+-      linkedDylibs += lib;
++      sovers = "\\.[0-9]+\\.*[0-9]*\\.so";
++      Ssiz_t idx = lib.Index(sovers);
++      if (idx != kNPOS) {
++         lib.Remove(idx);
++         lib += ".so";
++      }
++      dyvers = "\\.[0-9]+\\.*[0-9]*\\.dylib";
++      idx = lib.Index(dyvers);
++      if (idx != kNPOS) {
++         lib.Remove(idx);
++         lib += ".dylib";
++      }
++      if (!gSystem->AccessPathName(lib, kReadPermission)) {
++         if (linkedDylibs.Length())
++            linkedDylibs += " ";
++         linkedDylibs += lib;
++      }
+    }
+ }
+ #endif
+@@ -2838,9 +2856,11 @@
+       delete [] exe;
+       exe = longerexe;
+    }
++   TRegexp sovers = "\\.so\\.[0-9]+";
+ #else
+    const char *cLDD="ldd";
+    const char *cSOEXT=".so";
++   TRegexp sovers = "\\.so\\.[0-9]+";
+ #endif
+    FILE *p = OpenPipe(TString::Format("%s %s", cLDD, exe), "r");
+    TString ldd;
+@@ -2858,10 +2878,15 @@
+       }
+       if (solibName) {
+          TString solib = solibName->String();
+-         if (solib.EndsWith(cSOEXT)) {
+-            if (!linkedLibs.IsNull())
+-               linkedLibs += " ";
+-            linkedLibs += solib;
++         Ssiz_t idx = solib.Index(sovers);
++         if (solib.EndsWith(cSOEXT) || idx != kNPOS) {
++            if (idx != kNPOS)
++               solib.Remove(idx+3);
++            if (!AccessPathName(solib, kReadPermission)) {
++               if (!linkedLibs.IsNull())
++                  linkedLibs += " ";
++               linkedLibs += solib;
++            }
+          }
+       }
+       delete tok;
diff --git a/root.spec b/root.spec
index 35271e2..89f6964 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:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -52,6 +52,8 @@ Patch3:		%{name}-xrootd.patch
 #		Fix hardcoded include path
 #		https://savannah.cern.ch/bugs/index.php?91463
 Patch4:		%{name}-meta.patch
+#		Backport fixes for using aclic with versioned libraries
+Patch5:		%{name}-aclic-versioned-libs.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
@@ -114,6 +116,8 @@ BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
 BuildRequires:	xrootd-devel
 BuildRequires:	cfitsio-devel
+BuildRequires:	gfal-devel
+BuildRequires:	srm-ifce-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
@@ -557,6 +561,13 @@ Group:		Applications/Engineering
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
+%package io-gfal
+Summary:	Grid File Access Library input/output library for ROOT
+Group:		Applications/Engineering
+
+%description io-gfal
+This package contains the Grid File Access Library extension for ROOT.
+
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
 Group:		Applications/Engineering
@@ -1028,6 +1039,7 @@ fi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -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 \
@@ -1135,6 +1147,9 @@ unset QTINC
 	    --enable-fftw3 \
 	    --enable-fitsio \
 	    --enable-gdml \
+	    --enable-gfal \
+	      --with-gfal-incdir=%{_includedir} \
+	      --with-gfal-libdir=%{_libdir} \
 	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
@@ -1171,8 +1186,8 @@ unset QTINC
 	    --enable-tmva \
 	    --enable-unuran \
 	    --enable-x11 \
-	    --enable-xml \
 	    --enable-xft \
+	    --enable-xml \
 	    --enable-xrootd \
 	      --with-xrootd-incdir=%{_includedir}/xrootd \
 	      --with-xrootd-libdir=%{_libdir} \
@@ -1188,7 +1203,6 @@ unset QTINC
 	    --disable-castor \
 	    --disable-chirp \
 	    --disable-cling \
-	    --disable-gfal \
 	    --disable-glite \
 	    --disable-hdfs \
 	    --disable-monalisa \
@@ -1348,7 +1362,6 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins
 rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TFile/P030_TCastorFile.C
-rm TFile/P050_TGFALFile.C
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
 rm TFile/P110_THDFSFile.C
@@ -1582,6 +1595,8 @@ fi
 %postun io -p /sbin/ldconfig
 %post io-dcache -p /sbin/ldconfig
 %postun io-dcache -p /sbin/ldconfig
+%post io-gfal -p /sbin/ldconfig
+%postun io-gfal -p /sbin/ldconfig
 %post io-rfio -p /sbin/ldconfig
 %postun io-rfio -p /sbin/ldconfig
 %post io-sql -p /sbin/ldconfig
@@ -2010,6 +2025,11 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
+%files io-gfal -f includelist-io-gfal
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libGFAL.*
+%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+
 %files io-rfio -f includelist-io-rfio
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRFIO.*
@@ -2290,6 +2310,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Jun 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.06-3
+- Backport fixes for using aclic with versioned libraries
+- New sub-package: root-io-gfal
+
 * Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.06-2
 - Rebuild for xrootd 3.1.1
 

From bb8ff47db553badef7357648a282bab82045662c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 29 Jun 2012 07:42:58 +0200
Subject: [PATCH 019/344] Backport fixes for using aclic with versioned
 libraries

- New sub-package: root-io-gfal
---
 root-aclic-versioned-libs.patch | 82 +++++++++++++++++++++++++++++++++
 root-html.C                     |  2 +-
 root-meta.patch                 | 44 ++++++++++++++++++
 root.spec                       | 62 +++++++++++++++++++++++--
 4 files changed, 185 insertions(+), 5 deletions(-)
 create mode 100644 root-aclic-versioned-libs.patch
 create mode 100644 root-meta.patch

diff --git a/root-aclic-versioned-libs.patch b/root-aclic-versioned-libs.patch
new file mode 100644
index 0000000..6582c7d
--- /dev/null
+++ b/root-aclic-versioned-libs.patch
@@ -0,0 +1,82 @@
+diff -ur root-5.28.00h.orig/core/unix/src/TUnixSystem.cxx root-5.28.00h/core/unix/src/TUnixSystem.cxx
+--- root-5.28.00h.orig/core/unix/src/TUnixSystem.cxx	2011-11-24 17:12:39.000000000 +0100
++++ root-5.28.00h/core/unix/src/TUnixSystem.cxx	2012-06-29 07:13:37.055012978 +0200
+@@ -425,6 +425,9 @@
+ 
+    TString lib = _dyld_get_image_name(i++);
+ 
++   TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
++   TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
++
+ #ifndef ROOTPREFIX
+ #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+    // first loaded is the app so set ROOTSYS to app bundle
+@@ -440,7 +443,8 @@
+       }
+    }
+ #else
+-   if (lib.EndsWith("libCore.dylib") || lib.EndsWith("libCore.so")) {
++   if (lib.EndsWith("libCore.dylib") || lib.EndsWith("libCore.so") ||
++       lib.Index(sovers) != kNPOS    || lib.Index(dyvers) != kNPOS) {
+       char respath[kMAXPATHLEN];
+       if (!realpath(lib, respath)) {
+          if (!gSystem->Getenv("ROOTSYS"))
+@@ -462,9 +466,23 @@
+ 
+    // add all libs loaded before libSystem.B.dylib
+    if (!gotFirstSo && (lib.EndsWith(".dylib") || lib.EndsWith(".so"))) {
+-      if (linkedDylibs.Length())
+-         linkedDylibs += " ";
+-      linkedDylibs += lib;
++      sovers = "\\.[0-9]+\\.*[0-9]*\\.so";
++      Ssiz_t idx = lib.Index(sovers);
++      if (idx != kNPOS) {
++         lib.Remove(idx);
++         lib += ".so";
++      }
++      dyvers = "\\.[0-9]+\\.*[0-9]*\\.dylib";
++      idx = lib.Index(dyvers);
++      if (idx != kNPOS) {
++         lib.Remove(idx);
++         lib += ".dylib";
++      }
++      if (!gSystem->AccessPathName(lib, kReadPermission)) {
++         if (linkedDylibs.Length())
++            linkedDylibs += " ";
++         linkedDylibs += lib;
++      }
+    }
+ }
+ #endif
+@@ -2799,9 +2817,11 @@
+       delete [] exe;
+       exe = longerexe;
+    }
++   TRegexp sovers = "\\.so\\.[0-9]+";
+ #else
+    const char *cLDD="ldd";
+    const char *cSOEXT=".so";
++   TRegexp sovers = "\\.so\\.[0-9]+";
+ #endif
+    FILE *p = OpenPipe(TString::Format("%s %s", cLDD, exe), "r");
+    TString ldd;
+@@ -2819,10 +2839,15 @@
+       }
+       if (solibName) {
+          TString solib = solibName->String();
+-         if (solib.EndsWith(cSOEXT)) {
+-            if (!linkedLibs.IsNull())
+-               linkedLibs += " ";
+-            linkedLibs += solib;
++         Ssiz_t idx = solib.Index(sovers);
++         if (solib.EndsWith(cSOEXT) || idx != kNPOS) {
++            if (idx != kNPOS)
++               solib.Remove(idx+3);
++            if (!AccessPathName(solib, kReadPermission)) {
++               if (!linkedLibs.IsNull())
++                  linkedLibs += " ";
++               linkedLibs += solib;
++            }
+          }
+       }
+       delete tok;
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.spec b/root.spec
index af5c0b1..1afafdf 100644
--- a/root.spec
+++ b/root.spec
@@ -7,6 +7,16 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
+%if "%{?rhel}" == "5"
+%ifarch ppc
+%global gfal 0
+%else
+%global gfal 1
+%endif
+%else
+%global gfal 1
+%endif
+
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %($(pkg-config emacs) ; echo $?)
@@ -20,7 +30,7 @@
 Name:		root
 Version:	5.28.00h
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -53,6 +63,11 @@ Patch3:		%{name}-cern-ppc.patch
 Patch4:		%{name}-listbox-height.patch
 #		Fixes for external xrootd
 Patch5:		%{name}-xrootd.patch
+#		Fix hardcoded include path
+#		https://savannah.cern.ch/bugs/index.php?91463
+Patch6:		%{name}-meta.patch
+#		Backport fixes for using aclic with versioned libraries
+Patch7:		%{name}-aclic-versioned-libs.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
@@ -114,6 +129,10 @@ BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
 BuildRequires:	xrootd-devel
 BuildRequires:	cfitsio-devel
+%if %{gfal}
+BuildRequires:	gfal-devel
+BuildRequires:	srm-ifce-devel
+%endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
@@ -301,7 +320,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
-requires:	ruby(abi) = 1.8
+Requires:	ruby(abi) = 1.8
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -556,6 +575,15 @@ Group:		Applications/Engineering
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
+%if %{gfal}
+%package io-gfal
+Summary:	Grid File Access Library input/output library for ROOT
+Group:		Applications/Engineering
+
+%description io-gfal
+This package contains the Grid File Access Library extension for ROOT.
+%endif
+
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
 Group:		Applications/Engineering
@@ -1021,6 +1049,8 @@ fi
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -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 \
@@ -1126,6 +1156,13 @@ unset QTINC
 	    --enable-fftw3 \
 	    --enable-fitsio \
 	    --enable-gdml \
+%if %{gfal}
+	    --enable-gfal \
+	      --with-gfal-incdir=%{_includedir} \
+	      --with-gfal-libdir=%{_libdir} \
+%else
+	    --disable-gfal \
+%endif
 	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
@@ -1162,8 +1199,8 @@ unset QTINC
 	    --enable-tmva \
 	    --enable-unuran \
 	    --enable-x11 \
-	    --enable-xml \
 	    --enable-xft \
+	    --enable-xml \
 	    --enable-xrootd \
 	      --with-xrootd-incdir=%{_includedir}/xrootd \
 	      --with-xrootd-libdir=%{_libdir} \
@@ -1179,7 +1216,6 @@ unset QTINC
 	    --disable-castor \
 	    --disable-chirp \
 	    --disable-cling \
-	    --disable-gfal \
 	    --disable-glite \
 	    --disable-hdfs \
 	    --disable-monalisa \
@@ -1338,7 +1374,9 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins
 rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TFile/P030_TCastorFile.C
+%if "%{gfal}" == "0"
 rm TFile/P050_TGFALFile.C
+%endif
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
 rm TFile/P110_THDFSFile.C
@@ -1373,6 +1411,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
@@ -1571,6 +1610,10 @@ fi
 %postun io -p /sbin/ldconfig
 %post io-dcache -p /sbin/ldconfig
 %postun io-dcache -p /sbin/ldconfig
+%if %{gfal}
+%post io-gfal -p /sbin/ldconfig
+%postun io-gfal -p /sbin/ldconfig
+%endif
 %post io-rfio -p /sbin/ldconfig
 %postun io-rfio -p /sbin/ldconfig
 %post io-sql -p /sbin/ldconfig
@@ -1998,6 +2041,13 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
+%if %{gfal}
+%files io-gfal -f includelist-io-gfal
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libGFAL.*
+%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+%endif
+
 %files io-rfio -f includelist-io-rfio
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRFIO.*
@@ -2273,6 +2323,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Jun 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00h-2
+- Backport fixes for using aclic with versioned libraries
+- New sub-package: root-io-gfal
+
 * Mon Feb 13 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00h-1
 - Update to 5.28.00h
 

From 13ab762d36110c994f825c9b1474b97d1c0a5caf Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 5 Jul 2012 22:22:04 +0200
Subject: [PATCH 020/344] 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@fysast.uu.se> - 5.34.00-2
+- Do the glibc 2.16 patch properly
+
 * Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
 - Update to 5.34.00
 - New sub-package: root-io-gfal

From da06ad6977934a9a0a4cbcd3ad782bf6d96a5fb8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 18 Jul 2012 10:01:47 +0200
Subject: [PATCH 021/344] Update to 5.34.01

- Remove sub-packages root-clarens and root-peac (dropped by upstream)
---
 root.spec | 54 ++++++++++--------------------------------------------
 sources   |  2 +-
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/root.spec b/root.spec
index ea9bdfd..b657696 100644
--- a/root.spec
+++ b/root.spec
@@ -26,9 +26,9 @@
 %endif
 
 Name:		root
-Version:	5.34.00
+Version:	5.34.01
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -89,7 +89,6 @@ BuildRequires:	libtiff-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	avahi-devel
-BuildRequires:	xmlrpc-c-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
@@ -855,6 +854,8 @@ the xrootd server.
 %package proof
 Summary:	PROOF extension for ROOT
 Group:		Applications/Engineering
+Obsoletes:	%{name}-clarens < 5.34.01
+Obsoletes:	%{name}-peac < 5.34.01
 
 %description proof
 This package contains the proof extension for ROOT. This provides a
@@ -882,31 +883,6 @@ Group:		Applications/Engineering
 This package contains a library for browsing an interactive PROOF
 session in ROOT.
 
-%package clarens
-Summary:	Clarens extension for ROOT
-Group:		Applications/Engineering
-
-%description clarens
-This package contains the Clarens extension for ROOT, for use in a
-GRID enabled analysis environment.
-
-The Clarens Grid-Enabled Web Services Framework is an open source,
-secure, high-performance "portal" for ubiquitous access to data and
-computational resources provided by computing grids.
-
-%package peac
-Summary:	PEAC extension for ROOT - run-time libraries
-Group:		Applications/Engineering
-
-%description peac
-This package contains the PEAC (Proof Enabled Analysis Center)
-extension for ROOT.
-
-PEAC is an interactive distributed analysis framework that uses
-Clarens as a "glue" protocol to advertise and communicate amongst
-SAM, Global Manager (GM), Local Manager (LM), DCache, and PROOF
-services.
-
 %package xproof
 Summary:	XPROOF extension for ROOT
 Group:		Applications/Engineering
@@ -1148,7 +1124,6 @@ unset QTINC
 	    --enable-asimage \
 	    --enable-astiff \
 	    --enable-bonjour \
-	    --enable-clarens \
 	    --enable-dcache \
 	    --enable-explicitlink \
 	    --enable-fftw3 \
@@ -1169,7 +1144,6 @@ unset QTINC
 	    --enable-mysql \
 	    --enable-odbc \
 	    --enable-opengl \
-	    --enable-peac \
 	    --enable-pgsql \
 	    --enable-python \
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
@@ -1664,10 +1638,6 @@ fi
 %postun proof -p /sbin/ldconfig
 %post proof-sessionviewer -p /sbin/ldconfig
 %postun proof-sessionviewer -p /sbin/ldconfig
-%post clarens -p /sbin/ldconfig
-%postun clarens -p /sbin/ldconfig
-%post peac -p /sbin/ldconfig
-%postun peac -p /sbin/ldconfig
 %post xproof -p /sbin/ldconfig
 %postun xproof -p /sbin/ldconfig
 %post roofit -p /sbin/ldconfig
@@ -1735,6 +1705,8 @@ fi
 %{_datadir}/%{name}/system.rootdaemonrc
 %{_datadir}/%{name}/system.rootrc
 %{_mandir}/man1/system.rootdaemonrc.1*
+%dir %{_datadir}/%{name}/cmake
+%{_datadir}/%{name}/cmake/FindROOT.cmake
 %dir %{_datadir}/%{name}/macros
 %{_datadir}/%{name}/macros/Dialogs.C
 %dir %{_datadir}/%{name}/plugins
@@ -2244,16 +2216,6 @@ fi
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
-%files clarens -f includelist-proof-clarens
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/libClarens.*
-
-%files peac -f includelist-proof-peac
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/libPeac.*
-%{_libdir}/%{name}/libPeacGui.*
-%{_datadir}/%{name}/plugins/TProof/P030_TProofPEAC.C
-
 %files xproof -f includelist-proof-proofx
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libProofx.*
@@ -2316,6 +2278,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
+- Update to 5.34.01
+- Remove sub-packages root-clarens and root-peac (dropped by upstream)
+
 * Thu Jul 05 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-2
 - Do the glibc 2.16 patch properly
 
diff --git a/sources b/sources
index 71bafd6..68f7a0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2b2be237fbb8f3aed72c00b8d2aeee6  root-5.34.00.tar.gz
+4e0aae9ef9c21985973fca3dadaec9b8  root-5.34.01.tar.gz

From 5f695dcd1adf6805085adb687efef7a6f50ac726 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 28 Jul 2012 23:52:02 +0200
Subject: [PATCH 022/344] Rebuild for glew 1.7

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b657696..dd0db24 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.34.01
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2278,6 +2278,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
+- Rebuild for glew 1.7
+
 * Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
 - Update to 5.34.01
 - Remove sub-packages root-clarens and root-peac (dropped by upstream)

From 03af99697dc20a1a0b71803273d2f3f574cd07e8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 12 Oct 2012 16:19:27 +0200
Subject: [PATCH 023/344] Update to 5.34.02

---
 root.spec | 7 +++++--
 sources   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index dd0db24..98aa869 100644
--- a/root.spec
+++ b/root.spec
@@ -26,9 +26,9 @@
 %endif
 
 Name:		root
-Version:	5.34.01
+Version:	5.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2278,6 +2278,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
+- Update to 5.34.02
+
 * Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
 - Rebuild for glew 1.7
 
diff --git a/sources b/sources
index 68f7a0a..49f0898 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e0aae9ef9c21985973fca3dadaec9b8  root-5.34.01.tar.gz
+cf47c9e9f2b0b6b77eb2ded0f6acba94  root-5.34.02.tar.gz

From 24a64f44438ac75a5726f9b66864a598d50fdb05 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 13 Oct 2012 16:45:40 +0200
Subject: [PATCH 024/344] Compilation and documentation fixes

---
 root-gfal-bits.patch    | 15 +++++++++++++++
 root-tclass-fix.patch   | 24 ++++++++++++++++++++++++
 root-thtml-revert.patch | 18 ++++++++++++++++++
 root.spec               |  9 +++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 root-gfal-bits.patch
 create mode 100644 root-tclass-fix.patch
 create mode 100644 root-thtml-revert.patch

diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
new file mode 100644
index 0000000..ab7afff
--- /dev/null
+++ b/root-gfal-bits.patch
@@ -0,0 +1,15 @@
+diff -ur root-5.34.02.orig/io/gfal/src/TGFALFile.cxx root-5.34.02/io/gfal/src/TGFALFile.cxx
+--- root-5.34.02.orig/io/gfal/src/TGFALFile.cxx	2012-09-21 16:29:07.000000000 +0200
++++ root-5.34.02/io/gfal/src/TGFALFile.cxx	2012-10-12 22:59:42.785689152 +0200
+@@ -60,6 +60,11 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
++#ifdef _FILE_OFFSET_BITS
++#undef _FILE_OFFSET_BITS
++#endif
++#define _FILE_OFFSET_BITS 64
++
+ #include "TGFALFile.h"
+ #include "TROOT.h"
+ #include "TUrl.h"
diff --git a/root-tclass-fix.patch b/root-tclass-fix.patch
new file mode 100644
index 0000000..98c11bf
--- /dev/null
+++ b/root-tclass-fix.patch
@@ -0,0 +1,24 @@
+--- v5-34-00-patches/core/meta/src/TClass.cxx	2012/08/24 14:30:19	45695
++++ v5-34-00-patches/core/meta/src/TClass.cxx	2012/10/05 21:03:30	46365
+@@ -2544,7 +2544,10 @@
+          if (objType) {
+             const char *typdfName = objType->GetTypeName();
+             if (typdfName && strcmp(typdfName, name)) {
+-               cl = TClass::GetClass(typdfName, load);
++               TString alternateName(typdfName);
++               // TClass::GetClass might get call GetTypeName and thus
++               // re-use the static storage use by GetTypeName!
++               cl = TClass::GetClass(alternateName, load);
+                return cl;
+             }
+          }
+@@ -3206,9 +3209,6 @@
+          fRealData->Delete();
+       delete fRealData;  fRealData=0;
+       
+-      if (fStreamerInfo)
+-         fStreamerInfo->Delete();
+-      delete fStreamerInfo; fStreamerInfo=0;
+    }
+ }
+ 
diff --git a/root-thtml-revert.patch b/root-thtml-revert.patch
new file mode 100644
index 0000000..a1d1960
--- /dev/null
+++ b/root-thtml-revert.patch
@@ -0,0 +1,18 @@
+--- v5-34-00-patches/html/src/THtml.cxx	2012/08/29 09:33:39	45728
++++ v5-34-00-patches/html/src/THtml.cxx	2012/05/08 15:21:21	44178
+@@ -310,13 +310,11 @@
+          if (!filename.EndsWith(fsentry->GetName()))
+             continue;
+          fsentry->GetFullName(filesysname, kTRUE); // get the short version
+-         filename = filesysname;
+          if (!filename.EndsWith(filesysname)) {
+-            // It's something - let's see whether we find something better
+-            // else leave it as plan B. This helps finding Reflex sources.
+-            //filesysname = "";
++            filesysname = "";
+             continue;
+          }
++         filename = filesysname;
+          fsentry->GetFullName(filesysname, kFALSE); // get the long version
+          if (fse) *fse = fsentry;
+          break;
diff --git a/root.spec b/root.spec
index 98aa869..b7368b8 100644
--- a/root.spec
+++ b/root.spec
@@ -62,6 +62,12 @@ Patch3:		%{name}-xrootd.patch
 Patch4:		%{name}-meta.patch
 #		Fixes for latest glibc headers
 Patch5:		%{name}-glibc.patch
+#		Missing Include
+Patch6:		%{name}-gfal-bits.patch
+#		Backport meta fixes
+Patch7:		%{name}-tclass-fix.patch
+#		Revert THtml change
+Patch8:		%{name}-thtml-revert.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
@@ -1024,6 +1030,9 @@ fi
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -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 \

From 3f94641dcd0526f2d121e355c9ae196d6f3b12cf Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2012 13:41:05 -0500
Subject: [PATCH 025/344] Rebuild for glew 1.9.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b7368b8..b1f1191 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2287,6 +2287,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
+- Rebuild for glew 1.9.0
+
 * Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
 - Update to 5.34.02
 

From acb5cf4e3f9e1f211a2ff1c25f3119a67abf3093 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 15:47:52 -0600
Subject: [PATCH 026/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b1f1191..521b261 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2287,6 +2287,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
 - Rebuild for glew 1.9.0
 

From 86f1cc80eeec0145ac1b9f70fa798ebe38c3e4b5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 8 Mar 2013 07:10:26 +0100
Subject: [PATCH 027/344] Update to 5.34.05

- Rebuild for xrootd 3.3
- Patch for latest graphviz (libcgraph)
- Drop patches root-glibc.patch and root-tclass-fix.patch
---
 root-fontconfig.patch       | 1001 ++++++++++++++++++++++++++++++-----
 root-gfal-bits.patch        |   24 +-
 root-glibc.patch            |   35 --
 root-gviz.patch             |  116 ++++
 root-no-extra-formats.patch |   20 +
 root-rev48681.patch         |  199 +++++++
 root-rev48831.patch         |  619 ++++++++++++++++++++++
 root-tclass-fix.patch       |   24 -
 root.spec                   |   83 ++-
 sources                     |    2 +-
 10 files changed, 1889 insertions(+), 234 deletions(-)
 delete mode 100644 root-glibc.patch
 create mode 100644 root-gviz.patch
 create mode 100644 root-no-extra-formats.patch
 create mode 100644 root-rev48681.patch
 create mode 100644 root-rev48831.patch
 delete mode 100644 root-tclass-fix.patch

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 6609c76..4c333e9 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,9 +1,12 @@
-diff -ur root-5.34.00.orig/core/base/src/TApplication.cxx root-5.34.00/core/base/src/TApplication.cxx
---- root-5.34.00.orig/core/base/src/TApplication.cxx	2012-06-05 15:31:18.000000000 +0200
-+++ root-5.34.00/core/base/src/TApplication.cxx	2012-06-09 16:01:50.212196155 +0200
-@@ -239,20 +239,9 @@
+diff -ur root-5.34.05.orig/core/base/src/TApplication.cxx root-5.34.05/core/base/src/TApplication.cxx
+--- root-5.34.05.orig/core/base/src/TApplication.cxx	2013-02-14 23:27:37.000000000 +0100
++++ root-5.34.05/core/base/src/TApplication.cxx	2013-02-26 19:27:54.452632349 +0100
+@@ -237,22 +237,11 @@
+    LoadGraphicsLibs();
+ 
     // Try to load TrueType font renderer. Only try to load if not in batch
-    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
+-   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
++   // mode and Root.UseTTFonts is true. Abort silently
     // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -#ifdef TTFFONTDIR
@@ -31,22 +34,45 @@ diff -ur root-5.34.00.orig/core/base/src/TApplication.cxx root-5.34.00/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.00.orig/graf2d/graf/Module.mk root-5.34.00/graf2d/graf/Module.mk
---- root-5.34.00.orig/graf2d/graf/Module.mk	2012-06-05 15:31:46.000000000 +0200
-+++ root-5.34.00/graf2d/graf/Module.mk	2012-06-09 16:01:50.212196155 +0200
-@@ -45,7 +45,7 @@
+diff -ur root-5.34.05.orig/graf2d/graf/inc/TTF.h root-5.34.05/graf2d/graf/inc/TTF.h
+--- root-5.34.05.orig/graf2d/graf/inc/TTF.h	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/graf/inc/TTF.h	2013-02-26 19:27:54.452632349 +0100
+@@ -71,9 +71,8 @@
+    static FT_BBox     fgCBox;                  // string control box
+    static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
+    static Int_t       fgCurFontIdx;            // current font index
+-   static Int_t       fgSymbItaFontIdx;        // Symbol italic font index
+    static Int_t       fgFontCount;             // number of fonts loaded
+-   static char       *fgFontName[kTTMaxFonts]; // font name
++   static Int_t       fgFontID[kTTMaxFonts];   // font ID
+    static FT_Face     fgFace[kTTMaxFonts];     // font face
+    static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
+    static Bool_t      fgHinting;               // use hinting (true by default)
+diff -ur root-5.34.05.orig/graf2d/graf/Module.mk root-5.34.05/graf2d/graf/Module.mk
+--- root-5.34.05.orig/graf2d/graf/Module.mk	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/graf/Module.mk	2013-02-26 19:27:54.452632349 +0100
+@@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
  		   "$(GRAFO) $(GRAFDO)" \
--		   "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GRAFLIBEXTRA)"
-+		   "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GRAFLIBEXTRA) -lfontconfig"
+-		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/TTF.cxx
---- root-5.34.00.orig/graf2d/graf/src/TTF.cxx	2012-06-05 15:31:46.000000000 +0200
-+++ root-5.34.00/graf2d/graf/src/TTF.cxx	2012-06-09 16:01:50.261196568 +0200
-@@ -26,6 +26,7 @@
+diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/TTF.cxx
+--- root-5.34.05.orig/graf2d/graf/src/TTF.cxx	2013-02-14 23:27:52.000000000 +0100
++++ root-5.34.05/graf2d/graf/src/TTF.cxx	2013-02-26 19:36:07.971088035 +0100
+@@ -17,15 +17,13 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
+-// RConfigure.h is needed for TTFFONTDIR
+-#include "RConfigure.h"
+-
+ #include "TTF.h"
+ #include "TSystem.h"
+ #include "TEnv.h"
  #include "TMath.h"
  #include "TError.h"
  
@@ -54,24 +80,216 @@ diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/
  
  // to scale fonts to the same size as the old TT version
  const Float_t kScale = 0.93376068;
-@@ -112,10 +113,13 @@
+@@ -40,10 +38,9 @@
+ Int_t       TTF::fgWidth          = 0;
+ Int_t       TTF::fgAscent         = 0;
+ Int_t       TTF::fgCurFontIdx     = -1;
+-Int_t       TTF::fgSymbItaFontIdx = -1;
+ Int_t       TTF::fgFontCount      = 0;
+ Int_t       TTF::fgNumGlyphs      = 0;
+-char       *TTF::fgFontName[kTTMaxFonts];
++Int_t       TTF::fgFontID[kTTMaxFonts];
+ FT_Matrix  *TTF::fgRotMatrix;
+ FT_Library  TTF::fgLibrary;
+ FT_BBox     TTF::fgCBox;
+@@ -87,7 +84,6 @@
+    if (!fgInit) return;
+ 
+    for (int i = 0; i < fgFontCount; i++) {
+-      delete [] fgFontName[i];
+       FT_Done_Face(fgFace[i]);
+    }
+    if (fgRotMatrix) delete fgRotMatrix;
+@@ -112,12 +108,15 @@
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
 -         if ((platform == 3 && encoding == 1) ||
 +         if ((platform == 3 && encoding == 1 &&
-+              strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")) ||
++              (fgFontID[fgCurFontIdx] != 12 && fgFontID[fgCurFontIdx] != 15)) ||
               (platform == 0 && encoding == 0) ||
               (platform == 1 && encoding == 0 &&
-               !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
+-              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
++              fgFontID[fgCurFontIdx] == 14) ||
 +             (platform == 7 && encoding == 2 &&
-+              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")) ||
++              (fgFontID[fgCurFontIdx] == 12 || fgFontID[fgCurFontIdx] == 15)) ||
               (platform == 1 && encoding == 0 &&
-               !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
+-              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
++              (fgFontID[fgCurFontIdx] == 12 || fgFontID[fgCurFontIdx] == 15)))
           {
-@@ -360,19 +364,86 @@
+             fgCharMap[fgCurFontIdx] = charmap;
+             if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
+@@ -381,27 +380,147 @@
+ 
+    if (!fontname || !fontname[0]) {
+       Warning("TTF::SetTextFont",
+-              "no font name specified, using default font %s", fgFontName[0]);
++              "no font name specified, using default font");
+       fgCurFontIdx = 0;
        return 0;
     }
+    const char *basename = gSystem->BaseName(fontname);
+ 
++   if (strcmp(basename, "timesi.ttf") == 0 ||
++       strcmp(basename, "FreeSerifItalic.otf") == 0) {
++      SetTextFont(12);
++   }
++   else if (strcmp(basename, "timesbd.ttf") == 0 ||
++	    strcmp(basename, "FreeSerifBold.otf") == 0) {
++      SetTextFont(22);
++   }
++   else if (strcmp(basename, "timesbi.ttf") == 0 ||
++	    strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++      SetTextFont(32);
++   }
++   else if (strcmp(basename, "arial.ttf") == 0 ||
++	    strcmp(basename, "FreeSans.otf") == 0) {
++      SetTextFont(42);
++   }
++   else if (strcmp(basename, "ariali.ttf") == 0 ||
++	    strcmp(basename, "FreeSansOblique.otf") == 0) {
++      SetTextFont(52);
++   }
++   else if (strcmp(basename, "arialbd.ttf") == 0 ||
++	    strcmp(basename, "FreeSansBold.otf") == 0) {
++      SetTextFont(62);
++   }
++   else if (strcmp(basename, "arialbi.ttf") == 0 ||
++	    strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++      SetTextFont(72);
++   }
++   else if (strcmp(basename, "cour.ttf") == 0 ||
++	    strcmp(basename, "FreeMono.otf") == 0) {
++      SetTextFont(82);
++   }
++   else if (strcmp(basename, "couri.ttf") == 0 ||
++	    strcmp(basename, "FreeMonoOblique.otf") == 0) {
++      SetTextFont(92);
++   }
++   else if (strcmp(basename, "courbd.ttf") == 0 ||
++	    strcmp(basename, "FreeMonoBold.otf") == 0) {
++      SetTextFont(102);
++   }
++   else if (strcmp(basename, "courbi.ttf") == 0 ||
++	    strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++      SetTextFont(112);
++   }
++   else if (strcmp(basename, "symbol.ttf") == 0) {
++      if (italic)
++	 SetTextFont(152);
++      else
++	 SetTextFont(122);
++   }
++   else if (strcmp(basename, "times.ttf") == 0 ||
++	    strcmp(basename, "FreeSerif.otf") == 0) {
++      SetTextFont(132);
++   }
++   else if (strcmp(basename, "wingding.ttf") == 0) {
++      SetTextFont(142);
++   }
++   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
++      SetTextFont(162);
++   }
++   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
++      SetTextFont(172);
++   }
++   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
++      SetTextFont(182);
++   }
++   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
++      SetTextFont(192);
++   }
++   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
++      SetTextFont(202);
++   }
++   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
++      SetTextFont(212);
++   }
++   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
++      SetTextFont(222);
++   }
++   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
++      SetTextFont(232);
++   }
++   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
++      SetTextFont(242);
++   }
++   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
++      SetTextFont(252);
++   }
++   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
++      SetTextFont(262);
++   }
++   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
++      SetTextFont(272);
++   }
++   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
++      SetTextFont(282);
++   }
++   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
++      SetTextFont(292);
++   }
++   else {
++      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
++      if (fgFontCount) {
++         Warning("TTF::SetTextFont", "using default font");
++         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++         return 0;
++      } else {
++         return 1;
++      }
++   }
++
++   return 0;
++}
++
++//______________________________________________________________________________
++void TTF::SetTextFont(Font_t fontnumber)
++{
++   int fontid = fontnumber / 10;
++   if (fontid < 0 || fontid > 31) fontid = 0;
++
++   Int_t italic = 0;
++   if (fontid==15) italic = 1;
++
++   if (!fgInit) Init();
++
++   if (fontid == 0) {
++     fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
++     return;
++   }
++
+    // check if font is in cache
+    int i;
+    for (i = 0; i < fgFontCount; i++) {
+-      if (!strcmp(fgFontName[i], basename)) {
+-         if (italic) {
+-            if (i==fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         } else {
+-            if (i!=fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         }
++      if (fgFontID[i] == fontid) {
++         fgCurFontIdx = i;
++         return;
+       }
+    }
+ 
+@@ -409,161 +528,228 @@
+    if (fgFontCount >= kTTMaxFonts) {
+       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
+             kTTMaxFonts);
+-      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
++      Warning("TTF::SetTextFont", "using default font");
+       fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-      return 0;
++      return;
+    }
  
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
@@ -86,91 +304,191 @@ diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/
 -
 -   if (!ttfont) {
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-         return 0;
+-      } else {
+-         return 1;
+-      }
 +   FcPattern *pat, *match;
++   FcCharSet *set = NULL;
 +   FcResult result;
 +   char *ttfont;
 +   int ttindex;
 +
 +   pat = FcPatternCreate ();
 +
-+   if (strcmp(basename, /* 13 */ "times.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 1 */ "timesi.ttf") == 0) {
++   switch (fontid) {
++   case 1:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 2 */ "timesbd.ttf") == 0) {
++      break;
++   case 2:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 3 */ "timesbi.ttf") == 0) {
++      break;
++   case 3:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 4 */ "arial.ttf") == 0) {
++      break;
++   case 4:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 5 */ "ariali.ttf") == 0) {
++      break;
++   case 5:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 6 and 0 */ "arialbd.ttf") == 0) {
++      break;
++   case 6:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 7 */ "arialbi.ttf") == 0) {
++      break;
++   case 7:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 8 */ "cour.ttf") == 0) {
++      break;
++   case 8:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 9 */ "couri.ttf") == 0) {
++      break;
++   case 9:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 10 */ "courbd.ttf") == 0) {
++      break;
++   case 10:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 11 */ "courbi.ttf") == 0) {
++      break;
++   case 11:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, /* 12 and 15 */ "symbol.ttf") == 0) {
++      break;
++   case 12:
++   case 15:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, /* 14 */ "wingding.ttf") == 0) {
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else {
-+      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
++      break;
++   case 16:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 17:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 18:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 19:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 20:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      // set = FcCharSetCreate ();
++      // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++      // FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   case 21:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      // set = FcCharSetCreate ();
++      // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++      // FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   case 22:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 23:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 24:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 25:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 26:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 27:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 28:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 29:
++   case 30:
++   case 31:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      set = FcCharSetCreate ();
++      FcCharSetAddChar (set, 0x0410); // Cyrillic
++      FcCharSetAddChar (set, 0x4e00); // CJK
++      FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   default:
++      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
 +      FcPatternDestroy (pat);
-       if (fgFontCount) {
-          Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-          fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-@@ -382,11 +453,18 @@
-       }
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++      return;
++      break;
     }
  
 +   FcConfigSubstitute (NULL, pat, FcMatchPattern);
@@ -188,28 +506,113 @@ diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/
 +      FcPatternDestroy (match);
 +      FcPatternDestroy (pat);
        if (tface) FT_Done_Face(tface);
-       if (fgFontCount) {
-          Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-@@ -397,7 +475,8 @@
-       }
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;
+-         return 0;
+-      } else {
+-         return 1;
+-      }
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;
++      return;
     }
  
 -   delete [] ttfont;
 +   FcPatternDestroy (match);
 +   FcPatternDestroy (pat);
  
-    fgFontName[fgFontCount] = StrDup(basename);
+-   fgFontName[fgFontCount] = StrDup(basename);
++   if (set) FcCharSetDestroy (set);
++
++   fgFontID[fgFontCount]   = fontid;
     fgCurFontIdx            = fgFontCount;
-@@ -464,37 +543,12 @@
-       /*15 */ { "symbol.ttf",    "symbol.ttf"              }
-    };
+    fgFace[fgCurFontIdx]    = tface;
+    fgCharMap[fgCurFontIdx] = 0;
+    fgFontCount++;
  
+-   if (italic) {
+-      fgSymbItaFontIdx = fgCurFontIdx;
++   if (fontid == 15) {
+       FT_Matrix slantMat;
+       slantMat.xx = (1 << 16);
+       slantMat.xy = ((1 << 16) >> 2);
+       slantMat.yx = 0;
+       slantMat.yy = (1 << 16);
+-      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
+    }
+-
+-   return 0;
+-}
+-
+-//______________________________________________________________________________
+-void TTF::SetTextFont(Font_t fontnumber)
+-{
+-   // Set specified font.
+-   // List of the currently supported fonts (screen and PostScript)
+-   // =============================================================
+-   //   Font ID       X11                        TTF
+-   //        1 : times-medium-i-normal       timesi.ttf
+-   //        2 : times-bold-r-normal         timesbd.ttf
+-   //        3 : times-bold-i-normal         timesi.ttf
+-   //        4 : helvetica-medium-r-normal   arial.ttf
+-   //        5 : helvetica-medium-o-normal   ariali.ttf
+-   //        6 : helvetica-bold-r-normal     arialbd.ttf
+-   //        7 : helvetica-bold-o-normal     arialbi.ttf
+-   //        8 : courier-medium-r-normal     cour.ttf
+-   //        9 : courier-medium-o-normal     couri.ttf
+-   //       10 : courier-bold-r-normal       courbd.ttf
+-   //       11 : courier-bold-o-normal       courbi.ttf
+-   //       12 : symbol-medium-r-normal      symbol.ttf
+-   //       13 : times-medium-r-normal       times.ttf
+-   //       14 :                             wingding.ttf
+-   //       15 : symbol oblique is emulated from symbol.ttf
+-
+-   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
+-   // Table of Microsoft and (for non-MSFT operating systems) backup
+-   // FreeFont TTF fonts.
+-   static const char *fonttable[][2] = {
+-	  { "Root.TTFont.0", "FreeSansBold.otf" },
+-	  { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-	  { "Root.TTFont.2", "FreeSerifBold.otf" },
+-	  { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-	  { "Root.TTFont.4", "FreeSans.otf" },
+-	  { "Root.TTFont.5", "FreeSansOblique.otf" },
+-	  { "Root.TTFont.6", "FreeSansBold.otf" },
+-	  { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-	  { "Root.TTFont.8", "FreeMono.otf" },
+-	  { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-	  { "Root.TTFont.10", "FreeMonoBold.otf" },
+-	  { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-	  { "Root.TTFont.12", "symbol.ttf" },
+-	  { "Root.TTFont.13", "FreeSerif.otf" },
+-	  { "Root.TTFont.14", "wingding.ttf" },
+-	  { "Root.TTFont.15", "symbol.ttf" },
+-	  { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-	  { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-	  { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-	  { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-	  { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-	  { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-	  { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-	  { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-	  { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-	  { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-	  { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-	  { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-	  { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-	  { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-	  { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-	  { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
+-   };
+-
 -   static int fontset = -1;
 -   int        thisset = fontset;
 -
-    int fontid = fontnumber / 10;
-    if (fontid < 0 || fontid > 15) fontid = 0;
- 
+-   int fontid = fontnumber / 10;
+-   if (fontid < 0 || fontid > 31) fontid = 0;
+-
 -   if (thisset == -1) {
 -      // try to load font (font must be in Root.TTFontPath resource)
 -      // to see which fontset we have available
@@ -220,7 +623,7 @@ diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/
 -                                          "$(ROOTSYS)/fonts"
 -#endif
 -                                         );
--      char *ttfont = gSystem->Which(ttpath, fonttable[fontid][0], kReadPermission);
+-      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
 -      if (ttfont) {
 -         delete [] ttfont;
 -         thisset = 0;
@@ -229,20 +632,318 @@ diff -ur root-5.34.00.orig/graf2d/graf/src/TTF.cxx root-5.34.00/graf2d/graf/src/
 -         thisset = 1;
 -      }
 -   }
-    Int_t italic = 0;
-    if (fontid==15) italic = 1;
--   int ret = SetTextFont(fonttable[fontid][thisset], italic);
+-   Int_t italic = 0;
+-   if (fontid==15) italic = 1;
+-   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
 -   // Do not define font set is we're loading the symbol.ttf - it's
 -   // the same in both cases.
 -   if (ret == 0 && fontid != 12) fontset = thisset;
-+   SetTextFont(fonttable[fontid][0], italic);
  }
  
  //______________________________________________________________________________
-diff -ur root-5.34.00.orig/graf3d/gl/Module.mk root-5.34.00/graf3d/gl/Module.mk
---- root-5.34.00.orig/graf3d/gl/Module.mk	2012-06-05 15:31:34.000000000 +0200
-+++ root-5.34.00/graf3d/gl/Module.mk	2012-06-09 16:01:50.311196992 +0200
-@@ -70,7 +70,7 @@
+diff -ur root-5.34.05.orig/graf2d/postscript/Module.mk root-5.34.05/graf2d/postscript/Module.mk
+--- root-5.34.05.orig/graf2d/postscript/Module.mk	2013-02-14 23:27:54.000000000 +0100
++++ root-5.34.05/graf2d/postscript/Module.mk	2013-02-26 19:27:54.453632355 +0100
+@@ -50,7 +50,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
+ 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
+-		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
+ 
+ $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)
+diff -ur root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.05/graf2d/postscript/src/TPostScript.cxx
+--- root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx	2013-02-14 23:27:54.000000000 +0100
++++ root-5.34.05/graf2d/postscript/src/TPostScript.cxx	2013-02-26 19:45:18.377106631 +0100
+@@ -238,6 +238,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <wchar.h>
++#include <fontconfig/fontconfig.h>
+ 
+ #include "Riostream.h"
+ #include "Byteswap.h"
+@@ -1511,78 +1512,206 @@
+ {
+    // Embed font in PS file.
+ 
+-   static const char *fonttable[32][2] = {
+-	   { "Root.TTFont.0", "FreeSansBold.otf" },
+-	   { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-	   { "Root.TTFont.2", "FreeSerifBold.otf" },
+-	   { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-	   { "Root.TTFont.4", "FreeSans.otf" },
+-	   { "Root.TTFont.5", "FreeSansOblique.otf" },
+-	   { "Root.TTFont.6", "FreeSansBold.otf" },
+-	   { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-	   { "Root.TTFont.8", "FreeMono.otf" },
+-	   { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-	   { "Root.TTFont.10", "FreeMonoBold.otf" },
+-	   { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-	   { "Root.TTFont.12", "symbol.ttf" },
+-	   { "Root.TTFont.13", "FreeSerif.otf" },
+-	   { "Root.TTFont.14", "wingding.ttf" },
+-	   { "Root.TTFont.15", "symbol.ttf" },
+-	   { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-	   { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-	   { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-	   { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-	   { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-	   { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-	   { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-	   { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-	   { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-	   { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-	   { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-	   { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-	   { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-	   { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-	   { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-	   { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
+-   };
+-
+    PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
+ 
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-									   TTFFONTDIR
+-#else // TTFFONTDIR
+-									   "$(ROOTSYS)/fonts"
+-#endif // TTFFONTDIR
+-									   );
+-
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+-		if (fontid != 15) {
+-			const char *filename = gEnv->GetValue(
+-				fonttable[fontid][0], fonttable[fontid][1]);
+-			char *ttfont = gSystem->Which(ttpath, filename,
+-										  kReadPermission);
+-
+-			if(!ttfont) {
+-				Error("TPostScript::FontEmbed",
+-					  "font %d (filename `%s') not found in path",
+-					  fontid, filename);
+-			} else {
+-				if (FontEmbedType2(ttfont)) {
+-					// nothing
+-				} else if(FontEmbedType1(ttfont)) {
+-					// nothing
+-				} else if(FontEmbedType42(ttfont)) {
+-					// nothing
+-				} else {
+-					Error("TPostScript::FontEmbed",
+-						  "failed to embed font %d (filename `%s')",
+-						  fontid, filename);
+-				}
+-				delete [] ttfont;
+-			}
+-		}
++      if (fontid != 15) {
++
++	 FcPattern *pat, *match;
++	 FcCharSet *set = NULL;
++	 FcResult result;
++	 char *ttfont;
++
++	 pat = FcPatternCreate ();
++
++	 switch (fontid) {
++	 case 1:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 2:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 3:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 4:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 5:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 6:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 7:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 8:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 9:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 10:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 11:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 12:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 13:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 14:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 16:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 17:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 18:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 19:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	    break;
++	 case 20:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    // set = FcCharSetCreate ();
++	    // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	    // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	    break;
++	 case 21:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    // set = FcCharSetCreate ();
++	    // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	    // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	    break;
++	 case 22:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 23:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 24:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 25:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 26:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 27:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 28:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    break;
++	 case 29:
++	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	    set = FcCharSetCreate ();
++	    FcCharSetAddChar (set, 0x0410); // Cyrillic
++	    FcCharSetAddChar (set, 0x4e00); // CJK
++	    FcPatternAddCharSet (pat, FC_CHARSET, set);
++	    break;
++	 }
++
++	 FcConfigSubstitute (NULL, pat, FcMatchPattern);
++	 FcDefaultSubstitute (pat);
++	 match = FcFontMatch (NULL, pat, &result);
++	 FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
++
++	 if(!ttfont) {
++	    Error("TPostScript::FontEmbed", "font %d not found in path",
++		  fontid);
++	 } else {
++	    if (FontEmbedType2(ttfont)) {
++	       // nothing
++	    } else if(FontEmbedType1(ttfont)) {
++	       // nothing
++	    } else if(FontEmbedType42(ttfont)) {
++	       // nothing
++	    } else {
++	       Error("TPostScript::FontEmbed", "failed to embed font %d)",
++		     fontid);
++	    }
++	 }
++
++	 FcPatternDestroy (match);
++	 FcPatternDestroy (pat);
++
++	 if (set) FcCharSetDestroy (set);
++      }
+    }
+    PrintStr("%%IncludeResource: font Times-Roman@");
+    PrintStr("%%IncludeResource: font Times-Italic@");
+diff -ur root-5.34.05.orig/graf3d/gl/Module.mk root-5.34.05/graf3d/gl/Module.mk
+--- root-5.34.05.orig/graf3d/gl/Module.mk	2013-02-14 23:27:47.000000000 +0100
++++ root-5.34.05/graf3d/gl/Module.mk	2013-02-26 19:27:54.454632361 +0100
+@@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
  		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
@@ -251,19 +952,18 @@ diff -ur root-5.34.00.orig/graf3d/gl/Module.mk root-5.34.00/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx	2012-06-05 15:31:34.000000000 +0200
-+++ root-5.34.00/graf3d/gl/src/TGLFontManager.cxx	2012-06-09 16:01:50.311196992 +0200
-@@ -37,6 +37,8 @@
+diff -ur root-5.34.05.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.05/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.05.orig/graf3d/gl/src/TGLFontManager.cxx	2013-02-14 23:27:47.000000000 +0100
++++ root-5.34.05/graf3d/gl/src/TGLFontManager.cxx	2013-02-26 19:27:54.454632361 +0100
+@@ -36,6 +36,7 @@
+ # include "FTGLBitmapFont.h"
  #endif
  
- 
 +#include <fontconfig/fontconfig.h>
-+
+ 
  //______________________________________________________________________________
  // TGLFont
- //
-@@ -391,17 +393,91 @@
+@@ -391,17 +392,91 @@
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -286,12 +986,7 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/
 +
 +      pat = FcPatternCreate ();
 +
-+      if (strcmp(fontname, /* 13 */ "times") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 1 */ "timesi") == 0) {
++      if (strcmp(fontname, /* 1 */ "timesi") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
@@ -316,16 +1011,16 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      }
-+      else if (strcmp(fontname, /* 6 and 0 */ "arialbd") == 0) {
++      else if (strcmp(fontname, /* 6 */ "arialbd") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-       }
++      }
 +      else if (strcmp(fontname, /* 7 */ "arialbi") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
+       }
 +      else if (strcmp(fontname, /* 8 */ "cour") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
@@ -346,11 +1041,16 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      }
-+      else if (strcmp(fontname, /* 12 and 15 */ "symbol") == 0) {
++      else if (strcmp(fontname, /* 12 */ "symbol") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      }
++      else if (strcmp(fontname, /* 13 */ "times") == 0) {
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      }
 +      else if (strcmp(fontname, /* 14 */ "wingding") == 0) {
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
@@ -365,7 +1065,7 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/
  
        FTFont* ftfont = 0;
        switch (mode)
-@@ -427,9 +503,13 @@
+@@ -427,9 +502,13 @@
              break;
           default:
              Error("TGLFontManager::GetFont", "invalid FTGL type");
@@ -379,9 +1079,9 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.00/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/TGLText.cxx
---- root-5.34.00.orig/graf3d/gl/src/TGLText.cxx	2012-06-05 15:31:34.000000000 +0200
-+++ root-5.34.00/graf3d/gl/src/TGLText.cxx	2012-06-09 16:01:50.320197065 +0200
+diff -ur root-5.34.05.orig/graf3d/gl/src/TGLText.cxx root-5.34.05/graf3d/gl/src/TGLText.cxx
+--- root-5.34.05.orig/graf3d/gl/src/TGLText.cxx	2013-02-14 23:27:47.000000000 +0100
++++ root-5.34.05/graf3d/gl/src/TGLText.cxx	2013-02-26 19:27:54.455632367 +0100
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -391,10 +1091,27 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -190,16 +192,89 @@
-    if (fontid == 13) fontname = "times.ttf";
-    if (fontid == 14) fontname = "wingding.ttf";
+@@ -173,33 +175,91 @@
+ {
+    int fontid = fontnumber / 10;
  
+-   const char *fontname=0;
+-   if (fontid == 0)  fontname = "arialbd.ttf";
+-   if (fontid == 1)  fontname = "timesi.ttf";
+-   if (fontid == 2)  fontname = "timesbd.ttf";
+-   if (fontid == 3)  fontname = "timesbi.ttf";
+-   if (fontid == 4)  fontname = "arial.ttf";
+-   if (fontid == 5)  fontname = "ariali.ttf";
+-   if (fontid == 6)  fontname = "arialbd.ttf";
+-   if (fontid == 7)  fontname = "arialbi.ttf";
+-   if (fontid == 8)  fontname = "cour.ttf";
+-   if (fontid == 9)  fontname = "couri.ttf";
+-   if (fontid == 10) fontname = "courbd.ttf";
+-   if (fontid == 11) fontname = "courbi.ttf";
+-   if (fontid == 12) fontname = "symbol.ttf";
+-   if (fontid == 13) fontname = "times.ttf";
+-   if (fontid == 14) fontname = "wingding.ttf";
+-
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -# ifdef TTFFONTDIR
@@ -410,75 +1127,77 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/
 +
 +   pat = FcPatternCreate ();
 +
-+   if (strcmp(fontname, /* 13 */ "times.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 1 */ "timesi.ttf") == 0) {
++   switch (fontid) {
++   case 1:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 2 */ "timesbd.ttf") == 0) {
++      break;
++   case 2:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 3 */ "timesbi.ttf") == 0) {
++      break;
++   case 3:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 4 */ "arial.ttf") == 0) {
++      break;
++   case 4:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 5 */ "ariali.ttf") == 0) {
++      break;
++   case 5:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 6 and 0 */ "arialbd.ttf") == 0) {
++      break;
++   case 6:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 7 */ "arialbi.ttf") == 0) {
++      break;
++   case 7:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 8 */ "cour.ttf") == 0) {
++      break;
++   case 8:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 9 */ "couri.ttf") == 0) {
++      break;
++   case 9:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 10 */ "courbd.ttf") == 0) {
++      break;
++   case 10:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 11 */ "courbi.ttf") == 0) {
++      break;
++   case 11:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(fontname, /* 12 */ "symbol.ttf") == 0) {
++      break;
++   case 12:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(fontname, /* 14 */ "wingding.ttf") == 0) {
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
 +      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
 +   }
  
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
@@ -490,7 +1209,7 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -209,5 +284,6 @@
+@@ -209,5 +269,6 @@
  
     if (!fGLTextFont->FaceSize(1))
        Error("SetGLTextFont","Cannot set FTGL::FaceSize"),
@@ -498,9 +1217,9 @@ diff -ur root-5.34.00.orig/graf3d/gl/src/TGLText.cxx root-5.34.00/graf3d/gl/src/
 +   FcPatternDestroy (match);
 +   FcPatternDestroy (pat);
  }
-diff -ur root-5.34.00.orig/gui/gui/src/TGApplication.cxx root-5.34.00/gui/gui/src/TGApplication.cxx
---- root-5.34.00.orig/gui/gui/src/TGApplication.cxx	2012-06-05 15:31:42.000000000 +0200
-+++ root-5.34.00/gui/gui/src/TGApplication.cxx	2012-06-09 16:01:50.327197123 +0200
+diff -ur root-5.34.05.orig/gui/gui/src/TGApplication.cxx root-5.34.05/gui/gui/src/TGApplication.cxx
+--- root-5.34.05.orig/gui/gui/src/TGApplication.cxx	2013-02-14 23:27:51.000000000 +0100
++++ root-5.34.05/gui/gui/src/TGApplication.cxx	2013-02-26 19:27:54.455632367 +0100
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -528,9 +1247,9 @@ diff -ur root-5.34.00.orig/gui/gui/src/TGApplication.cxx root-5.34.00/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.00.orig/gui/gui/src/TGSpeedo.cxx root-5.34.00/gui/gui/src/TGSpeedo.cxx
---- root-5.34.00.orig/gui/gui/src/TGSpeedo.cxx	2012-06-05 15:31:42.000000000 +0200
-+++ root-5.34.00/gui/gui/src/TGSpeedo.cxx	2012-06-09 16:03:08.260851587 +0200
+diff -ur root-5.34.05.orig/gui/gui/src/TGSpeedo.cxx root-5.34.05/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.05.orig/gui/gui/src/TGSpeedo.cxx	2013-02-14 23:27:51.000000000 +0100
++++ root-5.34.05/gui/gui/src/TGSpeedo.cxx	2013-02-26 19:27:54.455632367 +0100
 @@ -119,8 +119,7 @@
  
     TString sc;
diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
index ab7afff..edf424e 100644
--- a/root-gfal-bits.patch
+++ b/root-gfal-bits.patch
@@ -1,15 +1,9 @@
-diff -ur root-5.34.02.orig/io/gfal/src/TGFALFile.cxx root-5.34.02/io/gfal/src/TGFALFile.cxx
---- root-5.34.02.orig/io/gfal/src/TGFALFile.cxx	2012-09-21 16:29:07.000000000 +0200
-+++ root-5.34.02/io/gfal/src/TGFALFile.cxx	2012-10-12 22:59:42.785689152 +0200
-@@ -60,6 +60,11 @@
- //                                                                      //
- //////////////////////////////////////////////////////////////////////////
- 
-+#ifdef _FILE_OFFSET_BITS
-+#undef _FILE_OFFSET_BITS
-+#endif
-+#define _FILE_OFFSET_BITS 64
-+
- #include "TGFALFile.h"
- #include "TROOT.h"
- #include "TUrl.h"
+diff -ur root-5.34.05.orig/io/gfal/Module.mk root-5.34.05/io/gfal/Module.mk
+--- root-5.34.05.orig/io/gfal/Module.mk	2013-02-14 23:27:54.000000000 +0100
++++ root-5.34.05/io/gfal/Module.mk	2013-02-26 20:58:00.150088502 +0100
+@@ -71,3 +71,5 @@
+ $(GFALO) $(GFALDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS))
+ $(GFALO): CXXFLAGS += $(GFALINCDIR:%=-I%)
+ $(GFALO): CXXFLAGS += $(SRMIFCEINCDIR:%=-I%)
++$(GFALO): CXXFLAGS += $(shell pkg-config --cflags glib-2.0)
++$(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/root-glibc.patch b/root-glibc.patch
deleted file mode 100644
index b2da159..0000000
--- a/root-glibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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-07-05 20:42:58.938953353 +0200
-@@ -60,7 +60,7 @@
- #  endif
- # elif defined(__CYGWIN__)
- extern int fchmod(int, mode_t);
--#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-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-07-05 20:29:29.969242837 +0200
-@@ -98,6 +98,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#include <sys/resource.h>
- #include <sys/wait.h>
- #include <time.h>
- #include <sys/time.h>
diff --git a/root-gviz.patch b/root-gviz.patch
new file mode 100644
index 0000000..8631327
--- /dev/null
+++ b/root-gviz.patch
@@ -0,0 +1,116 @@
+diff -ur root-5.34.05.orig/configure root-5.34.05/configure
+--- root-5.34.05.orig/configure	2013-02-14 23:27:56.000000000 +0100
++++ root-5.34.05/configure	2013-03-07 19:40:36.108220359 +0100
+@@ -3639,7 +3639,7 @@
+     gvizlib1=$found_lib
+     gvizlib1raw=$found_raw_lib
+     gvizlibir=$found_dir
+-    check_library "libgraph graph" "no" "$gvizlibdir" \
++    check_library "libgraph graph libcgraph cgraph" "no" "$gvizlibdir" \
+         $GVIZ ${GVIZ:+$GVIZ/lib/graphviz} ${GVIZ:+$GVIZ/lib} ${GVIZ:+$GVIZ/.libs} \
+         ${finkdir:+$finkdir/lib} \
+         /usr/local/lib /usr/lib
+diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphEdge.h root-5.34.05/graf2d/gviz/inc/TGraphEdge.h
+--- root-5.34.05.orig/graf2d/gviz/inc/TGraphEdge.h	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/inc/TGraphEdge.h	2013-03-07 19:35:10.936220359 +0100
+@@ -20,8 +20,13 @@
+ #include "TAttLine.h"
+ #endif
+ 
++#if !defined(__CINT__)
++#include <types.h>
++#else
+ struct Agraph_t;
+ struct Agedge_t;
++#endif
++
+ class  TGraphNode;
+ 
+ //////////////////////////////////////////////////////////////////////////
+diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphNode.h root-5.34.05/graf2d/gviz/inc/TGraphNode.h
+--- root-5.34.05.orig/graf2d/gviz/inc/TGraphNode.h	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/inc/TGraphNode.h	2013-03-07 19:35:10.946220359 +0100
+@@ -28,9 +28,12 @@
+ #include "TAttLine.h"
+ #endif
+ 
++#if !defined(__CINT__)
++#include <types.h>
++#else
+ struct Agraph_t;
+ struct Agnode_t;
+-
++#endif
+ 
+ //////////////////////////////////////////////////////////////////////////
+ //                                                                      //
+diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphStruct.h root-5.34.05/graf2d/gviz/inc/TGraphStruct.h
+--- root-5.34.05.orig/graf2d/gviz/inc/TGraphStruct.h	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/inc/TGraphStruct.h	2013-03-07 19:35:10.954220359 +0100
+@@ -25,7 +25,12 @@
+ #include "TList.h"
+ #endif
+ 
++#if !defined(__CINT__)
++#include <types.h>
++#else
+ struct Agraph_t;
++#endif
++
+ struct GVC_s;
+ 
+ //////////////////////////////////////////////////////////////////////////
+diff -ur root-5.34.05.orig/graf2d/gviz/Module.mk root-5.34.05/graf2d/gviz/Module.mk
+--- root-5.34.05.orig/graf2d/gviz/Module.mk	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/Module.mk	2013-03-07 19:35:10.921220359 +0100
+@@ -68,4 +68,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-$(GVIZO): CXXFLAGS += $(GRAPHVIZINCDIR:%=-I%) $(GRAPHVIZCFLAGS)
++$(GVIZO) $(GVIZDO): CXXFLAGS += $(GRAPHVIZINCDIR:%=-I%) $(GRAPHVIZCFLAGS)
+diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphEdge.cxx root-5.34.05/graf2d/gviz/src/TGraphEdge.cxx
+--- root-5.34.05.orig/graf2d/gviz/src/TGraphEdge.cxx	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/src/TGraphEdge.cxx	2013-03-07 19:35:10.892220359 +0100
+@@ -81,7 +81,11 @@
+    if (gv) {
+       Agnode_t *n1 = fNode1->GetGVNode();
+       Agnode_t *n2 = fNode2->GetGVNode();
++#ifdef WITH_CGRAPH
++      fGVEdge = agedge(gv, n1, n2, NULL, 1);
++#else
+       fGVEdge = agedge(gv, n1, n2);
++#endif
+    } else {
+       Error("CreateGVEdge","Invalid graphviz graph");
+    }
+diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphNode.cxx root-5.34.05/graf2d/gviz/src/TGraphNode.cxx
+--- root-5.34.05.orig/graf2d/gviz/src/TGraphNode.cxx	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/src/TGraphNode.cxx	2013-03-07 19:35:10.904220359 +0100
+@@ -65,7 +65,11 @@
+    // Create the GraphViz node into the GraphViz data structure gv.
+ 
+    if (gv) {
++#ifdef WITH_CGRAPH
++      fGVNode = agnode(gv, (char *)GetName(), 1);
++#else
+       fGVNode = agnode(gv, (char *)GetName());
++#endif
+    } else {
+       Error("CreateGVNode","Invalid graphviz graph");
+    }
+diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphStruct.cxx root-5.34.05/graf2d/gviz/src/TGraphStruct.cxx
+--- root-5.34.05.orig/graf2d/gviz/src/TGraphStruct.cxx	2013-02-14 23:27:53.000000000 +0100
++++ root-5.34.05/graf2d/gviz/src/TGraphStruct.cxx	2013-03-07 19:35:10.913220359 +0100
+@@ -226,7 +226,11 @@
+       gvFreeLayout(fGVC,fGVGraph);
+       agclose(fGVGraph);
+    }
++#ifdef WITH_CGRAPH
++   fGVGraph = agopen((char*)"GVGraph", Agdirected, 0);
++#else
+    fGVGraph = agopen((char*)"GVGraph", AGDIGRAPH);
++#endif
+ 
+    // Put the GV nodes into the GV graph
+    if (fNodes) {
diff --git a/root-no-extra-formats.patch b/root-no-extra-formats.patch
new file mode 100644
index 0000000..a3924f4
--- /dev/null
+++ b/root-no-extra-formats.patch
@@ -0,0 +1,20 @@
+diff -ur root-5.34.05.orig/tutorials/graphics/tmathtext.C root-5.34.05/tutorials/graphics/tmathtext.C
+--- root-5.34.05.orig/tutorials/graphics/tmathtext.C	2013-02-14 23:27:35.000000000 +0100
++++ root-5.34.05/tutorials/graphics/tmathtext.C	2013-03-01 19:00:01.437565765 +0100
+@@ -17,11 +17,11 @@
+    l.DrawMathText(0.27, 0.110, "\\mathbb{N} \\subset \\mathbb{R}");
+    l.DrawMathText(0.63, 0.100, "\\hbox{RHIC スピン物理 Нью-Йорк}");
+ 
+-   c1->Print("c1.gif");
+-   c1->Print("c1.jpg");
+-   c1->Print("c1.png");
+-   c1->Print("c1.ps");
+-   c1->Print("c1.eps");
++   //   c1->Print("c1.gif");
++   //   c1->Print("c1.jpg");
++   //   c1->Print("c1.png");
++   //   c1->Print("c1.ps");
++   //   c1->Print("c1.eps");
+    
+    return c1;
+ }
diff --git a/root-rev48681.patch b/root-rev48681.patch
new file mode 100644
index 0000000..409ae83
--- /dev/null
+++ b/root-rev48681.patch
@@ -0,0 +1,199 @@
+Index: proof/proofd/src/XrdProofdProofServMgr.cxx
+===================================================================
+--- proof/proofd/src/XrdProofdProofServMgr.cxx	(revision 48680)
++++ proof/proofd/src/XrdProofdProofServMgr.cxx	(revision 48681)
+@@ -32,8 +32,7 @@
+ #include "XrdOuc/XrdOucRash.hh"
+ #include "XrdOuc/XrdOucStream.hh"
+ #include "XrdSys/XrdSysPriv.hh"
+-#include "XrdSut/XrdSutAux.hh"
+-
++#include "XrdSys/XrdSysPlugin.hh"
+ #include "XrdProofdClient.h"
+ #include "XrdProofdClientMgr.h"
+ #include "XrdProofdManager.h"
+@@ -287,6 +286,8 @@
+    fCurrentSessions = 0;
+ 
+    fSeqSessionN = 0;
++   
++   fCredsSaver = 0;
+ 
+    // Defaults can be changed via 'proofservmgr'
+    fCheckFrequency = 30;
+@@ -3091,22 +3092,13 @@
+          ev[len] = 0;
+          putenv(ev);
+          TRACE(DBG, "XrdSecCREDS set");
+-
+-         // If 'pwd', save AFS key, if any
+-         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
++         if (fCredsSaver) {
+             XrdOucString credsdir = udir;
+             credsdir += "/.creds";
+             // Make sure the directory exists
+             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
+-               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
+-                  len = strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2;
+-                  ev = new char[len];
+-                  snprintf(ev, len, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
+-                  putenv(ev);
+-                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
+-                  TRACE(DBG, ev);
+-               } else {
+-                  TRACE(DBG, "problems in saving AFS key");
++               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
++                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
+                }
+             } else {
+                TRACE(XERR, "unable to create creds dir: "<<credsdir);
+@@ -3114,6 +3106,7 @@
+                return -1;
+             }
+          }
++         fclose(fenv);
+       }
+    }
+ 
+@@ -3568,21 +3561,13 @@
+          PutEnv(ev, in->fOld);
+          TRACE(DBG, "XrdSecCREDS set");
+ 
+-         // If 'pwd', save AFS key, if any
+-         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
++         if (fCredsSaver) {
+             XrdOucString credsdir = p->Client()->Sandbox()->Dir();
+             credsdir += "/.creds";
+             // Make sure the directory exists
+             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
+-               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
+-                  len = strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2;
+-                  ev = new char[len];
+-                  snprintf(ev, len, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
+-                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
+-                  TRACE(DBG, ev);
+-                  PutEnv(ev, in->fOld);
+-               } else {
+-                  TRACE(DBG, "problems in saving AFS key");
++               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
++                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
+                }
+             } else {
+                TRACE(XERR, "unable to create creds dir: "<<credsdir);
+@@ -3590,6 +3575,7 @@
+                return -1;
+             }
+          }
++         fclose(fenv);
+       }
+    }
+ 
+@@ -4582,76 +4568,6 @@
+    return 0;
+ }
+ 
+-//______________________________________________________________________________
+-int XrdProofdProofServMgr::SaveAFSkey(XrdSecCredentials *c,
+-                                      const char *dir, XrdProofUI ui)
+-{
+-   // Save the AFS key, if any, for usage in proofserv in file 'dir'/.afs .
+-   // Return 0 on success, -1 on error.
+-   XPDLOC(SMGR, "ProofServMgr::SaveAFSkey")
+-
+-   // Check file name
+-   if (!dir || strlen(dir) <= 0) {
+-      TRACE(XERR, "dir name undefined");
+-      return -1;
+-   }
+-
+-   // Check credentials
+-   if (!c) {
+-      TRACE(XERR, "credentials undefined");
+-      return -1;
+-   }
+-   TRACE(REQ, "dir: "<<dir);
+-
+-   // Decode credentials
+-   int lout = 0;
+-   char *out = new char[c->size];
+-   if (XrdSutFromHex(c->buffer, out, lout) != 0) {
+-      TRACE(XERR, "problems unparsing hex string");
+-      delete [] out;
+-      return -1;
+-   }
+-
+-   // Locate the key
+-   char *key = out + 5;
+-   if (strncmp(key, "afs:", 4)) {
+-      TRACE(DBG, "string does not contain an AFS key");
+-      delete [] out;
+-      return 0;
+-   }
+-   key += 4;
+-
+-   // Save to file, if not existing already
+-   XrdOucString fn = dir;
+-   fn += "/.afs";
+-   int rc = 0;
+-
+-   // Open the file, truncating if already existing
+-   int fd = open(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+-   if (fd < 0) {
+-      TRACE(XERR, "problems creating file - errno: " << errno);
+-      delete [] out;
+-      return -1;
+-   }
+-   // Write out the key
+-   int lkey = lout - 9;
+-   if (XrdProofdAux::Write(fd, key, lkey) != lkey) {
+-      TRACE(XERR, "problems writing to file - errno: " << errno);
+-      rc = -1;
+-   }
+-
+-   // Cleanup
+-   delete [] out;
+-   close(fd);
+-
+-   // Make sure the file is owned by the user
+-   if (XrdProofdAux::ChangeOwn(fn.c_str(), ui) != 0) {
+-      TRACE(XERR, "can't change ownership of "<<fn);
+-   }
+-
+-   return rc;
+-}
+-
+ //__________________________________________________________________________
+ XrdProofdProofServ *XrdProofdProofServMgr::GetActiveSession(int pid)
+ {
+Index: proof/proofd/inc/XrdProofdProofServMgr.h
+===================================================================
+--- proof/proofd/inc/XrdProofdProofServMgr.h	(revision 48680)
++++ proof/proofd/inc/XrdProofdProofServMgr.h	(revision 48681)
+@@ -42,6 +42,9 @@
+ #define PSMMAXCNTS  3
+ #define PSMCNTOK(t) (t >= 0 && t < PSMMAXCNTS)
+ 
++// Security handle
++typedef int (*XrdSecCredsSaver_t)(XrdSecCredentials *, const char *fn, const XrdProofUI &ui);
++
+ // Aux structure for session set env inputs
+ typedef struct {
+    XrdProofdProofServ *fPS;
+@@ -161,6 +164,8 @@
+ 
+    std::map<XrdProofdProtocol*,int> fDestroyTimes; // Tracks destroyed sessions
+    
++   XrdSecCredsSaver_t fCredsSaver; // If defined, function to be used to save the credentials
++
+    int                DoDirectiveProofServMgr(char *, XrdOucStream *, bool);
+    int                DoDirectivePutEnv(char *, XrdOucStream *, bool);
+    int                DoDirectivePutRc(char *, XrdOucStream *, bool);
+@@ -268,8 +273,6 @@
+ 
+    int               SetProofServEnv(XrdProofdProtocol *p, void *in);
+    int               SetProofServEnvOld(XrdProofdProtocol *p, void *in);
+-
+-   int               SaveAFSkey(XrdSecCredentials *c, const char *fn, XrdProofUI ui);
+    int               SetUserEnvironment(XrdProofdProtocol *p);
+ 
+    static int        SetProofServEnv(XrdProofdManager *m, XrdROOT *r);
diff --git a/root-rev48831.patch b/root-rev48831.patch
new file mode 100644
index 0000000..2b016c3
--- /dev/null
+++ b/root-rev48831.patch
@@ -0,0 +1,619 @@
+Index: cmake/modules/FindXROOTD.cmake
+===================================================================
+--- cmake/modules/FindXROOTD.cmake	(revision 48830)
++++ cmake/modules/FindXROOTD.cmake	(revision 48831)
+@@ -28,32 +28,37 @@
+ )
+ 
+ if (XROOTD_INCLUDE_DIR)
+-  file(STRINGS ${XROOTD_INCLUDE_DIR}/XrdVersion.hh xrdvers REGEX "^#define XrdVERSION")
++  file(STRINGS ${XROOTD_INCLUDE_DIR}/XrdVersion.hh xrdvers REGEX "^#define XrdVERSION ")
+   string(REGEX REPLACE "#define[ ]+XrdVERSION[ ]+" "" xrdvers ${xrdvers})
+   string(REGEX REPLACE "[^v\\.]+" "" xrdversdots ${xrdvers})
+   if (${xrdversdots} STREQUAL "v..")
+     # Regular version string; parse it out
+     string(REGEX MATCH "[0-9\\.]+" xrdvers ${xrdvers})
+-    string(REGEX MATCH "[0-9]" xrdversmajor ${xrdvers})
+-    string(REPLACE "${xrdversmajor}." "" xrdversminor ${xrdvers})
+-    string(REGEX MATCH "[0-9]" xrdversminor ${xrdversminor})
+-    string(REPLACE "${xrdversmajor}.${xrdversminor}." "" xrdverspatch ${xrdvers})
+-    string(REGEX MATCH "[0-9]+" xrdverspatch ${xrdverspatch})
++    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\1" xrdversmajor ${xrdvers})
++    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\2" xrdversminor ${xrdvers})
++    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\3" xrdverspatch ${xrdvers})
+     math(EXPR xrdversnum ${xrdversmajor}*100000000+${xrdversminor}*10000+${xrdverspatch})
+   else ()
+     # Old version string: we keep only the first numerics, i.e. the date
+     string(REGEX REPLACE "[v\"]" "" xrdvers ${xrdvers})
+-    message(STATUS "Found Xrootd version ${xrdvers}")
+-    string(REGEX REPLACE "[^0-9-]+" " " xrdvers ${xrdvers})
+     string(SUBSTRING ${xrdvers} 0 8 xrdversnum)
+   endif ()
++  if ( ${xrdversnum} EQUAL 300030000 )
++     SET(XROOTD_FOUND FALSE)
++     message(WARNING " >>> Cannot build with XRootD version 3.3.0: please install >=3.3.1 or <= 3.2.x")
++  else()
++     SET(XROOTD_FOUND TRUE)
++  endif ()
++endif()
++
++if(XROOTD_FOUND)
+   # This we used as a compiler macro variable
+   if(NOT XROOTD_FIND_QUIETLY )
+-    message(STATUS "Found Xrootd version num: ${xrdvers}")
++    message(STATUS "Found Xrootd version num: ${xrdvers} (setting -DROOTXRDVERS=${xrdversnum})")
+   endif()
+   SET(XROOTD_CFLAGS "-DROOTXRDVERS=${xrdversnum}")
+ 
+-  if ( ${xrdversnum} LESS 300010000 )
++  if ( ${xrdversnum} LESS 300010000 AND ${xrdversnum} LESS 20111022)
+      SET(XROOTD_OLDPACK TRUE)
+      message(STATUS "Setting OLDPACK TRUE")
+   else()
+@@ -72,14 +77,16 @@
+         XrdOuc/XrdOucPthread.hh
+         XrdOuc/XrdOucSemWait.hh
+         XrdOuc/XrdOucTimer.hh
++        PATHS 
+         ${XROOTD_INCLUDE_DIR}
+      )
+   else()
+-     if ( ${xrdversnum} LESS 300010000 )
++     if ( ${xrdversnum} LESS 300010000 AND ${xrdversnum} LESS 20111022)
+         # DNS stuff was under XrdNet
+         find_path(XROOTD_INCLUDE_DIR
+            NAMES
+            XrdNet/XrdNetDNS.hh
++           PATHS 
+            ${XROOTD_INCLUDE_DIR}
+         )
+      else ()
+@@ -87,6 +94,7 @@
+         find_path(XROOTD_INCLUDE_DIR
+            NAMES
+            XrdSys/XrdSysDNS.hh
++           PATHS 
+            ${XROOTD_INCLUDE_DIR}
+         )
+      endif ()
+@@ -101,9 +109,20 @@
+             XrdSys/XrdSysPthread.hh
+             XrdSys/XrdSysSemWait.hh
+             XrdSys/XrdSysTimer.hh
++            PATHS 
+             ${XROOTD_INCLUDE_DIR}
+         )
+      endif()
++     
++     if (XROOTD_INCLUDE_DIR)
++        # Check for additional headers in new directories
++        find_path(XROOTD_PRIVATE_INCLUDE_DIR
++            NAMES
++            XrdSys/XrdSysPriv.hh
++            PATHS 
++            ${XROOTD_INCLUDE_DIR}/private
++        )
++     endif()
+   endif()
+   if (XROOTD_INCLUDE_DIR)
+      SET(XROOTD_FOUND TRUE)
+@@ -152,7 +171,7 @@
+   if(XROOTD_LIBRARIES)
+     set(XROOTD_FOUND TRUE)
+     if(NOT XROOTD_FIND_QUIETLY )
+-      message(STATUS "             include_dir: ${XROOTD_INCLUDE_DIR}")
++      message(STATUS "             include_dir: ${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR}")
+       message(STATUS "             libraries: ${XROOTD_LIBRARIES}")
+     endif() 
+   else ()
+@@ -160,7 +179,8 @@
+   endif ()
+ endif()
+ 
+-mark_as_advanced(XROOTD_INCLUDE_DIR 
++mark_as_advanced(XROOTD_INCLUDE_DIR
++                 XROOTD_PRIVATE_INCLUDE_DIR
+                  XROOTD_XrdMain_LIBRARY
+                  XROOTD_XrdUtils_LIBRARY
+                  XROOTD_XrdClient_LIBRARY
+Index: configure
+===================================================================
+--- configure	(revision 48830)
++++ configure	(revision 48831)
+@@ -4577,9 +4577,16 @@
+ 	 fi
+       fi
+    fi
+-   echo "$xrdver"
++   # Protect against 3.3.0, first version with 'include/xrootd/private'
++   if [ $decver -eq 300030000 ] ; then
++      echo "Cannot build against version $xrdver (missing headers)"
++      enable_xrootd="no"
++   else
++      echo "$xrdver"
++   fi
+ fi
+ 
++xrdincprivate="no"
+ if test "x$enable_xrootd" = "xyes" ; then
+ 
+    extraxrdflags="-DROOTXRDVERS=$decver"
+@@ -4635,6 +4642,15 @@
+    fi
+ 
+    #
++   # Check also if 'include/private' exists: we need to signal this to the build modules
++   # for correct location of some headers available form the dlevel packages for version >= 3.3.x
++   if test "x$enable_xrootd" = "xyes"; then
++      if test -d "$xrdincdir/private"; then
++         xrdincprivate="yes"
++      fi
++   fi
++
++   #
+    # Check if bonjour is available for code potentially using it ...
+    if test "x$enable_xrootd" = "xyes"; then
+       xrdlibdir="$tmpxrdlibdir"
+@@ -6730,6 +6746,7 @@
+     -e "s|@xpmlibdir@|$xpmlibdir|"              \
+     -e "s|@xrdlibdir@|$xrdlibdir|"              \
+     -e "s|@xrdincdir@|$xrdincdir|"              \
++    -e "s|@xrdincprivate@|$xrdincprivate|"      \
+     -e "s|@xrdversion@|$decver|"                \
+     -e "s|@hasxrdutils@|$hasxrdutils|"          \
+     -e "s|@cfitsioincdir@|$cfitsioincdir|"      \
+Index: proof/proofd/src/XrdProofConn.cxx
+===================================================================
+--- proof/proofd/src/XrdProofConn.cxx	(revision 48830)
++++ proof/proofd/src/XrdProofConn.cxx	(revision 48831)
+@@ -32,7 +32,6 @@
+ 
+ #include "XrdClient/XrdClientConnMgr.hh"
+ #include "XrdClient/XrdClientConst.hh"
+-#include "XrdClient/XrdClientDebug.hh"
+ #include "XrdClient/XrdClientEnv.hh"
+ #include "XrdClient/XrdClientLogConnection.hh"
+ #include "XrdClient/XrdClientPhyConnection.hh"
+@@ -41,6 +40,7 @@
+ #include "XrdOuc/XrdOucErrInfo.hh"
+ #include "XrdOuc/XrdOucString.hh"
+ #include "XrdSec/XrdSecInterface.hh"
++#include "XrdSys/XrdSysLogger.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+ // Dynamic libs
+Index: proof/proofd/src/XpdObject.cxx
+===================================================================
+--- proof/proofd/src/XpdObject.cxx	(revision 0)
++++ proof/proofd/src/XpdObject.cxx	(revision 48831)
+@@ -0,0 +1,125 @@
++// @(#)root/proofd:$Id$
++// Author: Gerardo Ganis  Feb 2013
++
++/*************************************************************************
++ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
++ * All rights reserved.                                                  *
++ *                                                                       *
++ * For the licensing terms see $ROOTSYS/LICENSE.                         *
++ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
++ *************************************************************************/
++
++//////////////////////////////////////////////////////////////////////////
++//                                                                      //
++// XpdObject                                                            //
++//                                                                      //
++// Authors: G. Ganis, CERN, 2013                                        //
++//                                                                      //
++// Auxilliary class to stack protocols.                                 //
++//                                                                      //
++//////////////////////////////////////////////////////////////////////////
++
++#include "XpdObject.h"
++#include "XrdProofdAux.h"
++#include "XrdProofdProtocol.h"
++#include "Xrd/XrdScheduler.hh"
++#include "XrdOuc/XrdOucTrace.hh"
++
++//_______________________________________________________________________
++XrdProofdProtocol *XpdObjectQ::Pop()
++{
++   // Pop up a protocol object 
++
++   XpdObject *node;
++   fQMutex.Lock();
++   if ((node = fFirst)) {
++      fFirst = fFirst->fNext;
++      fCount--;
++   }
++   fQMutex.UnLock();
++   if (node) return node->fItem;
++   return (XrdProofdProtocol *)0;
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::Push(XpdObject *node)
++{
++   // Push back a protocol
++
++   node->fQTime = fCurage;
++   fQMutex.Lock();
++   if (fCount >= fMaxinQ) {
++      delete node->fItem;
++   } else {
++      node->fNext = fFirst;
++      fFirst = node;
++      fCount++;
++   }
++   fQMutex.UnLock();
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::Set(int inQMax, time_t agemax)
++{
++   // Lock the data area and set the values
++
++   fQMutex.Lock();
++   fMaxinQ = inQMax; fMaxage = agemax;
++   if (!(fMininQ = inQMax/2)) fMininQ = 1;
++   fQMutex.UnLock();
++
++   // Schedule ourselves using the new values
++   if (agemax > 0)
++      fSched->Schedule((XrdJob *)this, agemax + time(0));
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::DoIt()
++{
++   // Process method
++
++   XpdObject *pp, *p;
++   int oldcnt, agemax;
++
++   // Lock the anchor and see if we met the threshold for deletion
++   //
++   fQMutex.Lock();
++   agemax = fMaxage;
++   if ((oldcnt = fCount) > fMininQ) {
++
++      // Prepare to scan down the queue.
++      if ((pp = fFirst)) {
++         p = pp->fNext;
++      } else { p = 0; }
++
++      // Find the first object that's been idle for too long
++      while(p && (p->fQTime >= fCurage)) { pp = p; p = p->fNext;}
++
++      // Now delete half of the idle objects. The object queue element must be
++      // part of the actual object being deleted for this to properly work.
++      if (pp) {
++         while (p) {
++            pp->fNext = p->fNext;
++            delete p->fItem;
++            fCount--;
++            p = ((pp = pp->fNext) ? pp->fNext : 0);
++         }
++      }
++   }
++
++   // Increase the age and unlock the queue
++   fCurage++;
++   fQMutex.UnLock();
++
++   // Trace as needed
++   if (fTraceON && fTrace->Tracing(fTraceON))
++      {fTrace->Beg(fTraceID);
++       cerr <<Comment <<" trim done; " <<fCount <<" of " <<oldcnt <<" kept";
++       fTrace->End();
++      }
++
++   // Reschedule ourselves if we must do so
++   if (agemax > 0)
++      fSched->Schedule((XrdJob *)this, agemax+time(0));
++}
++
+
+Egenskapsändringar för: proof/proofd/src/XpdObject.cxx
+___________________________________________________________________
+Added: svn:eol-style
+## -0,0 +1 ##
++LF
+\ No newline at end of property
+Added: svn:keywords
+## -0,0 +1 ##
++Id
+\ No newline at end of property
+Index: proof/proofd/src/XrdProofdProtocol.cxx
+===================================================================
+--- proof/proofd/src/XrdProofdProtocol.cxx	(revision 48830)
++++ proof/proofd/src/XrdProofdProtocol.cxx	(revision 48831)
+@@ -29,6 +29,7 @@
+ 
+ #include "XrdVersion.hh"
+ #include "Xrd/XrdBuffer.hh"
++#include "Xrd/XrdScheduler.hh"
+ 
+ #include "XrdProofdClient.h"
+ #include "XrdProofdClientMgr.h"
+@@ -54,8 +55,7 @@
+ //
+ // Static area: general protocol managing section
+ int                   XrdProofdProtocol::fgCount    = 0;
+-XrdObjectQ<XrdProofdProtocol>
+-                      XrdProofdProtocol::fgProtStack("ProtStack",
++XpdObjectQ            XrdProofdProtocol::fgProtStack("ProtStack",
+                                                      "xproofd protocol anchor");
+ XrdSysRecMutex        XrdProofdProtocol::fgBMutex;    // Buffer management mutex
+ XrdBuffManager       *XrdProofdProtocol::fgBPool    = 0;
+@@ -542,8 +542,12 @@
+    // Schedule protocol object cleanup; the maximum number of objects
+    // and the max age are taken from XrdXrootdProtocol: this may need
+    // some optimization in the future.
++#if 1
+    fgProtStack.Set(pi->Sched, XrdProofdTrace, TRACE_MEM);
+    fgProtStack.Set((pi->ConnMax/3 ? pi->ConnMax/3 : 30), 60*60);
++#else
++   fgProtStack.Set(pi->Sched, 3600);
++#endif
+ 
+    // Default tracing options: always trace logins and errors for all
+    // domains; if the '-d' option was specified on the command line then
+@@ -789,6 +793,13 @@
+ 
+    // Push ourselves on the stack
+    fgProtStack.Push(&fProtLink);
++#if 0
++   if(fgProtStack.Push(&fProtLink) != 0) {
++      XrdProofdProtocol *xp = fProtLink.objectItem();
++      fProtLink.setItem(0);
++      delete xp;
++   }
++#endif
+ }
+ 
+ //______________________________________________________________________________
+Index: proof/proofd/inc/XrdProofdProtocol.h
+===================================================================
+--- proof/proofd/inc/XrdProofdProtocol.h	(revision 48830)
++++ proof/proofd/inc/XrdProofdProtocol.h	(revision 48831)
+@@ -38,10 +38,10 @@
+ #include "XpdSysPthread.h"
+ 
+ #include "Xrd/XrdLink.hh"
+-#include "Xrd/XrdObject.hh"
+ #include "Xrd/XrdProtocol.hh"
+ #include "XrdOuc/XrdOucString.hh"
+ #include "XrdSec/XrdSecInterface.hh"
++#include "XpdObject.h"
+ #include "XProofProtocol.h"
+ 
+ class XrdBuffer;
+@@ -131,7 +131,7 @@
+    //
+    // Protocol variables
+ 
+-   XrdObject<XrdProofdProtocol>  fProtLink;
++   XpdObject                     fProtLink;
+    XrdBuffer                    *fArgp;
+ 
+    XrdLink                      *fLink;
+@@ -176,7 +176,7 @@
+    //
+    static bool                   fgConfigDone;
+    static int                    fgCount;
+-   static XrdObjectQ<XrdProofdProtocol> fgProtStack;
++   static XpdObjectQ             fgProtStack;
+    static XrdBuffManager        *fgBPool;        // Buffer manager
+    static int                    fgMaxBuffsz;    // Maximum buffer size we can have
+    static XrdSysRecMutex         fgBMutex;       // Buffer management mutex
+Index: proof/proofd/inc/XpdObject.h
+===================================================================
+--- proof/proofd/inc/XpdObject.h	(revision 0)
++++ proof/proofd/inc/XpdObject.h	(revision 48831)
+@@ -0,0 +1,100 @@
++// @(#)root/proofd:$Id$
++// Author: Gerardo Ganis  Feb 2013
++
++/*************************************************************************
++ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
++ * All rights reserved.                                                  *
++ *                                                                       *
++ * For the licensing terms see $ROOTSYS/LICENSE.                         *
++ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
++ *************************************************************************/
++
++//////////////////////////////////////////////////////////////////////////
++//                                                                      //
++// XpdObject                                                            //
++//                                                                      //
++// Authors: G. Ganis, CERN, 2013                                        //
++//                                                                      //
++// Auxilliary class to stack protocols.                                 //
++// Adapted version of XrdObject.                                        //
++//                                                                      //
++//////////////////////////////////////////////////////////////////////////
++
++#ifndef ROOT_XpdObject
++#define ROOT_XpdObject
++
++#include <string.h>
++#include <strings.h>
++#include <time.h>
++#include <sys/types.h>
++#include "Xrd/XrdJob.hh"
++#include "XrdOuc/XrdOucTrace.hh"
++#include "XrdSys/XrdSysPthread.hh"
++
++class XpdObjectQ;
++class XrdProofdProtocol;
++class XrdScheduler;
++  
++class XpdObject {
++public:
++   friend class XpdObjectQ;
++
++   // Item() supplies the item value associated with itself (used with Next()).
++   XrdProofdProtocol  *objectItem() { return fItem; }
++
++   // Next() supplies the next list node.
++   XpdObject          *nextObject() { return fNext; }
++
++   // Set the item pointer
++   void                setItem(XrdProofdProtocol *ival) { fItem = ival; }
++
++   XpdObject(XrdProofdProtocol *ival=0) { fNext = 0; fItem = ival; fQTime = 0; }
++   ~XpdObject() {}
++
++private:
++   XpdObject         *fNext;
++   XrdProofdProtocol *fItem;
++   time_t             fQTime;  // Only used for time-managed objects
++};
++
++/******************************************************************************/
++/*                           x r d _ O b j e c t Q                            */
++/******************************************************************************/
++  
++// Note to properly cleanup this type of queue you must call Set() at least
++// once to cause the time element to be sceduled.
++
++class XrdOucTrace;
++  
++class XpdObjectQ : public XrdJob {
++public:
++
++   XrdProofdProtocol *Pop();
++   void Push(XpdObject *Node);
++   void Set(int inQMax, time_t agemax=1800);
++   void Set(XrdScheduler *sp, XrdOucTrace *tp, int traceChk = 0)
++            {fSched = sp; fTrace = tp; fTraceON = traceChk;}
++   void DoIt();
++
++   XpdObjectQ(const char *id, const char *desc) : XrdJob(desc) 
++          {fCurage = fCount = 0; fMaxage = 0; fTraceID = id;
++           fMaxinQ = 32; fMininQ = 16; fFirst = 0; }
++
++   ~XpdObjectQ() {}
++
++private:
++
++   XrdSysMutex    fQMutex;
++   XpdObject     *fFirst;
++   int            fCount;
++   int            fCurage;
++   int            fMininQ;
++   int            fMaxinQ;
++   time_t         fMaxage;
++   XrdOucTrace   *fTrace;
++   XrdScheduler  *fSched;
++   int            fTraceON;
++   const char    *fTraceID;
++};
++
++#endif
+
+Egenskapsändringar för: proof/proofd/inc/XpdObject.h
+___________________________________________________________________
+Added: svn:keywords
+## -0,0 +1 ##
++Id
+\ No newline at end of property
+Added: svn:eol-style
+## -0,0 +1 ##
++LF
+\ No newline at end of property
+Index: proof/proofd/Module.mk
+===================================================================
+--- proof/proofd/Module.mk	(revision 48830)
++++ proof/proofd/Module.mk	(revision 48831)
+@@ -127,7 +127,11 @@
+ ifeq ($(HASXRD),yes)
+ XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
+ XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
++ifeq ($(XRDINCPRIVATE),yes)
++XPDINCEXTRA    += -I$(XRDINCDIR)/private
++endif
+ 
++
+ ifeq ($(HASXRDUTILS),no)
+ 
+ XPDLIBEXTRA    += $(XROOTDDIRL) -lXrdClient -lXrdNet -lXrdOuc \
+Index: proof/proofd/CMakeLists.txt
+===================================================================
+--- proof/proofd/CMakeLists.txt	(revision 48830)
++++ proof/proofd/CMakeLists.txt	(revision 48831)
+@@ -7,7 +7,7 @@
+ ROOT_USE_PACKAGE(net/rpdutils)
+ ROOT_USE_PACKAGE(net/auth)
+ 
+-include_directories(${XROOTD_INCLUDE_DIR})
++include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ 
+ if(WIN32)
+Index: proof/proofx/Module.mk
+===================================================================
+--- proof/proofx/Module.mk	(revision 48830)
++++ proof/proofx/Module.mk	(revision 48831)
+@@ -63,6 +63,9 @@
+ PROOFXINCEXTRA := $(PROOFXDIRI:%=-I%)
+ PROOFXINCEXTRA += $(XROOTDDIRI:%=-I%)
+ PROOFXINCEXTRA += $(PROOFDDIRI:%=-I%)
++ifeq ($(XRDINCPRIVATE),yes)
++PROOFXINCEXTRA += -I$(XRDINCDIR)/private
++endif
+ 
+ # Xrootd client libs
+ ifeq ($(PLATFORM),win32)
+Index: proof/proofx/CMakeLists.txt
+===================================================================
+--- proof/proofx/CMakeLists.txt	(revision 48830)
++++ proof/proofx/CMakeLists.txt	(revision 48831)
+@@ -16,7 +16,7 @@
+   ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
+ endif()
+ 
+-include_directories(${XROOTD_INCLUDE_DIR})
++include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
+ link_directories(${XROOTD_LIBRARY_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ 
+Index: net/netx/Module.mk
+===================================================================
+--- net/netx/Module.mk	(revision 48830)
++++ net/netx/Module.mk	(revision 48831)
+@@ -55,6 +55,9 @@
+ ifneq ($(EXTRA_XRDFLAGS),)
+ NETXINCEXTRA += -I$(ROOT_SRCDIR)/proof/proofd/inc
+ endif
++ifeq ($(XRDINCPRIVATE),yes)
++NETXINCEXTRA += -I$(XRDINCDIR)/private
++endif
+ 
+ # Xrootd client libs
+ ifeq ($(PLATFORM),win32)
+Index: net/netx/CMakeLists.txt
+===================================================================
+--- net/netx/CMakeLists.txt	(revision 48830)
++++ net/netx/CMakeLists.txt	(revision 48831)
+@@ -6,7 +6,7 @@
+ ROOT_USE_PACKAGE(net/net)
+ ROOT_USE_PACKAGE(proof/proofd)
+ 
+-include_directories(${XROOTD_INCLUDE_DIR})
++include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ #---------------------------------------------------------------------------
+ 
+Index: config/Makefile.in
+===================================================================
+--- config/Makefile.in	(revision 48830)
++++ config/Makefile.in	(revision 48831)
+@@ -255,6 +255,7 @@
+ EXTRA_XRDFLAGS := @extraxrdflags@
+ XRDVERSION     := @xrdversion@
+ HASXRDUTILS    := @hasxrdutils@
++XRDINCPRIVATE  := @xrdincprivate@
+ 
+ SRPLIBDIR      := @srplibdir@
+ SRPLIB         := @srplib@
diff --git a/root-tclass-fix.patch b/root-tclass-fix.patch
deleted file mode 100644
index 98c11bf..0000000
--- a/root-tclass-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- v5-34-00-patches/core/meta/src/TClass.cxx	2012/08/24 14:30:19	45695
-+++ v5-34-00-patches/core/meta/src/TClass.cxx	2012/10/05 21:03:30	46365
-@@ -2544,7 +2544,10 @@
-          if (objType) {
-             const char *typdfName = objType->GetTypeName();
-             if (typdfName && strcmp(typdfName, name)) {
--               cl = TClass::GetClass(typdfName, load);
-+               TString alternateName(typdfName);
-+               // TClass::GetClass might get call GetTypeName and thus
-+               // re-use the static storage use by GetTypeName!
-+               cl = TClass::GetClass(alternateName, load);
-                return cl;
-             }
-          }
-@@ -3206,9 +3209,6 @@
-          fRealData->Delete();
-       delete fRealData;  fRealData=0;
-       
--      if (fStreamerInfo)
--         fStreamerInfo->Delete();
--      delete fStreamerInfo; fStreamerInfo=0;
-    }
- }
- 
diff --git a/root.spec b/root.spec
index 521b261..766711b 100644
--- a/root.spec
+++ b/root.spec
@@ -26,9 +26,9 @@
 %endif
 
 Name:		root
-Version:	5.34.02
+Version:	5.34.05
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -55,19 +55,22 @@ Patch0:		%{name}-ftgl.patch
 Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
-#		Fixes for xrootd bonjour
+#		Remove broken xrootd test:
 Patch3:		%{name}-xrootd.patch
-#		Fix hardcoded include path
+#		Fix hardcoded include path:
 #		https://savannah.cern.ch/bugs/index.php?91463
 Patch4:		%{name}-meta.patch
-#		Fixes for latest glibc headers
-Patch5:		%{name}-glibc.patch
-#		Missing Include
-Patch6:		%{name}-gfal-bits.patch
-#		Backport meta fixes
-Patch7:		%{name}-tclass-fix.patch
-#		Revert THtml change
-Patch8:		%{name}-thtml-revert.patch
+#		Missing include path:
+Patch5:		%{name}-gfal-bits.patch
+#		Revert THtml change:
+Patch6:		%{name}-thtml-revert.patch
+#		Don't save in all image formats:
+Patch7:		%{name}-no-extra-formats.patch
+#		Graphviz libgraph deprecated:
+Patch8:		%%{name}-gviz.patch
+#		Backport xrootd 3.3 support:
+Patch9:		%{name}-rev48681.patch
+Patch10:	%{name}-rev48831.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
@@ -113,9 +116,6 @@ BuildRequires:	python26-devel
 %endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	qt4-devel
-%if %{?fedora}%{!?fedora:0} >= 14
-BuildRequires:	qt4-webkit-devel
-%endif
 %endif
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
@@ -127,7 +127,8 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
-BuildRequires:	xrootd-devel
+BuildRequires:	xrootd-client-devel
+BuildRequires:	xrootd-private-devel
 BuildRequires:	cfitsio-devel
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
@@ -148,6 +149,22 @@ BuildRequires:	liberation-fonts
 %endif
 #		This contains a Symbol font that can be used by fontconfig
 BuildRequires:	urw-fonts
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	font(droidsansfallback)
+%endif
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires:	font(stix)
+%else
+%if %{?fedora}%{!?fedora:0} >= 14
+BuildRequires:	font(stixgeneral)
+BuildRequires:	font(stixsizeonesym)
+%else
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	font(stixgeneral)
+BuildRequires:	font(stixsize1)
+%endif
+%endif
+%endif
 Requires:	hicolor-icon-theme
 
 %description
@@ -227,6 +244,22 @@ Requires:	liberation-fonts
 %endif
 #		This contains a Symbol font that can be used by fontconfig
 Requires:	urw-fonts
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+Requires:	font(droidsansfallback)
+%endif
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+Requires:	font(stix)
+%else
+%if %{?fedora}%{!?fedora:0} >= 14
+Requires:	font(stixgeneral)
+Requires:	font(stixsizeonesym)
+%else
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+Requires:	font(stixgeneral)
+Requires:	font(stixsize1)
+%endif
+%endif
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -1033,6 +1066,8 @@ fi
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p0
+%patch10 -p0
 
 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 \
@@ -1107,7 +1142,8 @@ sed s/c1/c1simp/g -i tutorials/hsimple.C
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 cp -pr bindings/pyroot bindings/pyroot26
-sed 's/python /python26 /' -i bindings/pyroot26/Module.mk
+sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
+    -i bindings/pyroot26/Module.mk
 %endif
 
 %build
@@ -1138,10 +1174,10 @@ unset QTINC
 	    --enable-fftw3 \
 	    --enable-fitsio \
 	    --enable-gdml \
+	    --enable-genvector \
 	    --enable-gfal \
 	      --with-gfal-incdir=%{_includedir} \
 	      --with-gfal-libdir=%{_libdir} \
-	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
@@ -1315,6 +1351,7 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/svninfo.txt
 %if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
 rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
 %endif
+rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libmathtext.a
 rm ${RPM_BUILD_ROOT}%{_bindir}/setxrd*
 rm ${RPM_BUILD_ROOT}%{_bindir}/thisroot*
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/cint.1
@@ -1345,6 +1382,7 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/macros/fileopen.C
 pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins
 rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
+rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
@@ -1403,6 +1441,7 @@ cat includelist-geom-geom* > includelist-geom
 cat includelist-roofit-roo* > includelist-roofit
 cat includelist-gui-qt* > includelist-gui-qt
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
+cat includelist-graf2d-mathtext >> includelist-graf2d-x11
 cat includelist-gui-guihtml >> includelist-gui-gui
 cat includelist-io-xmlparser >> includelist-io-xml
 cat includelist-proof-proofplayer >> includelist-proof-proof
@@ -1781,9 +1820,11 @@ fi
 %{_bindir}/proofserv
 %{_bindir}/proofserv.exe
 %{_bindir}/xproofd
+%{_bindir}/xpdtest
 %{_mandir}/man1/proofd.1*
 %{_mandir}/man1/proofserv.1*
 %{_mandir}/man1/xproofd.1*
+%{_mandir}/man1/xpdtest.1*
 %{_initrddir}/proofd
 
 %files rootd
@@ -2287,6 +2328,12 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
+- Update to 5.34.05
+- Rebuild for xrootd 3.3
+- Patch for latest graphviz (libcgraph)
+- Drop patches root-glibc.patch and root-tclass-fix.patch
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 49f0898..b0b813c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf47c9e9f2b0b6b77eb2ded0f6acba94  root-5.34.02.tar.gz
+0dd415d539f5bb8ec21c9f49b2f9c5fd  root-5.34.05.tar.gz

From 8faae32f8201773d80c165f7556a0e4b470123dd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 8 Mar 2013 13:20:42 +0100
Subject: [PATCH 028/344] Rebuild for xrootd 3.3

- Backport gfal fixes
---
 root-gfal-bits.patch |   61 ++
 root-qt.patch        |   25 +
 root-xrootd.patch    | 1322 +++++++++++++++++++++++++++++++++++++++++-
 root.spec            |   33 +-
 4 files changed, 1397 insertions(+), 44 deletions(-)
 create mode 100644 root-gfal-bits.patch
 create mode 100644 root-qt.patch

diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
new file mode 100644
index 0000000..050e522
--- /dev/null
+++ b/root-gfal-bits.patch
@@ -0,0 +1,61 @@
+diff -ur root-5.28.00h.orig/config/Makefile.in root-5.28.00h/config/Makefile.in
+--- root-5.28.00h.orig/config/Makefile.in	2011-11-24 17:12:55.000000000 +0100
++++ root-5.28.00h/config/Makefile.in	2013-03-02 08:09:02.230002472 +0100
+@@ -154,6 +154,7 @@
+ GFALLIBDIR     := @gfallibdir@
+ GFALCLILIB     := @gfallib@
+ GFALINCDIR     := $(filter-out /usr/include, @gfalincdir@)
++SRMIFCEINCDIR  := $(filter-out /usr/include, @srmifceincdir@)
+ 
+ BUILDGLITE     := @buildglite@
+ GLITELIBDIR    := @glitelibdir@
+diff -ur root-5.28.00h.orig/configure root-5.28.00h/configure
+--- root-5.28.00h.orig/configure	2011-11-24 17:12:57.000000000 +0100
++++ root-5.28.00h/configure	2013-03-02 08:10:33.684863607 +0100
+@@ -1426,6 +1426,7 @@
+   gviz-incdir        Graphviz support, location of gvc.h
+   gviz-libdir        Graphviz support, location of libgvplugin_core
+   gfal-incdir        GFAL support, location of gfal_api.h
++  srm-ifce-incdir    GFAL support, location of gfal_srm_ifce_types.h
+   gfal-libdir        GFAL support, location of libgfal
+   glew-incdir        GLEW support, location of glew.h
+   glew-libdir        GLEW support, location of libGLEW
+@@ -1733,6 +1734,7 @@
+       --with-gviz-libdir=*)    gvizlibdir=$optarg    ; enable_gviz="yes"    ;;
+       --with-gfal-incdir=*)    gfalincdir=$optarg    ; enable_gfal="yes"    ;;
+       --with-gfal-libdir=*)    gfallibdir=$optarg    ; enable_gfal="yes"    ;;
++      --with-srm-ifce-incdir=*) srmifceincdir=$optarg;;
+       --with-glew-incdir=*)    glewincdir=$optarg    ; enable_builtin_glew=no;;
+       --with-glew-libdir=*)    glewlibdir=$optarg    ; enable_builtin_glew=no;;
+       --with-gsl-incdir=*)     gslincdir=$optarg     ; enable_gsl="yes"     ;;
+@@ -3199,6 +3201,12 @@
+     gfallib=$found_lib
+     gfallibdir=$found_dir
+ 
++    check_header "gfal_srm_ifce_types.h" "$srmifceincdir" \
++        /opt/lcg/include /opt/srm-ifce/include /usr/local/lcg/include \
++        /usr/local/srm-ifce/include
++    srmifceinc=$found_hdr
++    srmifceincdir=$found_dir
++
+     if test "x$gfalincdir" = "x" || test "x$gfallib" = "x"; then
+         enable_gfal="no"
+     fi
+@@ -6341,6 +6349,7 @@
+     -e "s|@exceptions@|$enable_exceptions|"     \
+     -e "s|@explicitlink@|$enable_explicitlink|" \
+     -e "s|@gfalincdir@|$gfalincdir|"            \
++    -e "s|@srmifceincdir@|$srmifceincdir|"      \
+     -e "s|@gfallib@|$gfallib|"                  \
+     -e "s|@gfallibdir@|$gfallibdir|"            \
+     -e "s|@enable_xft@|$enable_xft|"            \
+diff -ur root-5.28.00h.orig/io/gfal/Module.mk root-5.28.00h/io/gfal/Module.mk
+--- root-5.28.00h.orig/io/gfal/Module.mk	2011-11-24 17:12:56.000000000 +0100
++++ root-5.28.00h/io/gfal/Module.mk	2013-03-02 08:04:00.349761906 +0100
+@@ -70,3 +70,6 @@
+ ##### extra rules ######
+ $(GFALO) $(GFALDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS))
+ $(GFALO): CXXFLAGS += $(GFALINCDIR:%=-I%)
++$(GFALO): CXXFLAGS += $(SRMIFCEINCDIR:%=-I%)
++$(GFALO): CXXFLAGS += $(shell pkg-config --cflags glib-2.0)
++$(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/root-qt.patch b/root-qt.patch
new file mode 100644
index 0000000..353b6fb
--- /dev/null
+++ b/root-qt.patch
@@ -0,0 +1,25 @@
+diff -ur root-5.28.00h.orig/configure root-5.28.00h/configure
+--- root-5.28.00h.orig/configure	2011-11-24 17:12:57.000000000 +0100
++++ root-5.28.00h/configure	2013-03-02 12:52:21.823338782 +0100
+@@ -2955,21 +2955,6 @@
+             check_library "libQt3Support Qt3Support Qt3Support$qt4suffix Qt3Support4" \
+                 "$enable_shared" "$found_raw_dir" ""
+             qtlib="$qtlib $found_lib"
+-            check_library "libQtOpenGL QtOpenGL QtOpenGL$qt4suffix QtOpenGL4" \
+-                "$enable_shared" "$found_raw_dir" ""
+-            qtlib="$qtlib $found_lib"
+-            check_library "libQtSvg QtSvg QtSvg$qt4suffix QtSvg4" \
+-                "$enable_shared" "$found_raw_dir" ""
+-            qtlib="$qtlib $found_lib"
+-            check_library "libQtXml QtXml QtXml$qt4suffix QtXml4" \
+-                "$enable_shared" "$found_raw_dir" ""
+-            qtlib="$qtlib $found_lib"
+-            check_library "libQtWebKit QtWebKit QtWebKit$qt4suffix QtWebKit4" \
+-                "$enable_shared" "$found_raw_dir" ""
+-            qtlib="$qtlib $found_lib"
+-            check_library "libQtNetwork QtNetwork QtNetwork$qt4suffix QtNetwork4" \
+-                "$enable_shared" "$found_raw_dir" ""
+-            qtlib="$qtlib $found_lib"
+         else
+             qtinc=
+             qtmainincdir=
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 7e02e05..77bded2 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,10 +1,402 @@
-diff -ur root-5.28.00c.orig/configure root-5.28.00c/configure
---- root-5.28.00c.orig/configure	2011-04-15 17:34:20.000000000 +0200
-+++ root-5.28.00c/configure	2011-04-23 13:02:29.385052080 +0200
-@@ -4307,13 +4307,14 @@
-     if test "x$externalxrd" = "xyes"; then
-        buildxrd="no"
-        # Check if bonjour is available for code potentially using it ...
+diff -Nur root-5.28.00h.orig/config/Makefile.in root-5.28.00h/config/Makefile.in
+--- root-5.28.00h.orig/config/Makefile.in	2011-11-24 17:12:55.000000000 +0100
++++ root-5.28.00h/config/Makefile.in	2013-03-08 11:54:45.058375695 +0100
+@@ -241,12 +241,12 @@
+ XMLINCDIR      := $(filter-out /usr/include, @xmlincdir@)
+ 
+ HASXRD         := @hasxrd@
+-BUILDXRD       := @buildxrd@
+ XRDINCDIR      := @xrdincdir@
+ XRDLIBDIR      := @xrdlibdir@
+-XRDADDOPTS     := @xrdaddopts@
+ EXTRA_XRDFLAGS := @extraxrdflags@
+ XRDVERSION     := @xrdversion@
++HASXRDUTILS    := @hasxrdutils@
++XRDINCPRIVATE  := @xrdincprivate@
+ 
+ SRPLIBDIR      := @srplibdir@
+ SRPLIB         := @srplib@
+@@ -284,7 +284,6 @@
+ GLOBUSLIB      := @globuslib@
+ GLOBUSLIBDIR   := @globuslibdir@
+ GLOBUSINCDIR   := $(filter-out /usr/include, @globusincdir@)
+-BUILDXRDGSI    := @buildxrdgsi@
+ 
+ BUILDMONALISA  := @buildmonalisa@
+ MONALISALIBDIR := @monalisalibdir@
+diff -Nur root-5.28.00h.orig/configure root-5.28.00h/configure
+--- root-5.28.00h.orig/configure	2011-11-24 17:12:57.000000000 +0100
++++ root-5.28.00h/configure	2013-03-08 11:54:41.987349372 +0100
+@@ -1385,7 +1385,7 @@
+   winrtdebug         Link against the Windows debug runtime library
+   x11                X11 support
+   xml                XML parser interface
+-  xrootd             Build xrootd file server and its client (if supported)
++  xrootd             Build xrootd-dependent plugins for remote file access and PROOF (if supported)
+   xft                Xft support (X11 antialiased fonts)
+ 
+ minimal set of libraries, can be combined with above --enable-... options
+@@ -1484,10 +1484,9 @@
+   xpm-libdir         XPM support, path to libXpm
+   xft-libdir         Xft support, path to libXft
+   xext-libdir        Xext support, path to libXext
+-  xrootd             XROOTD support, path to external XROOTD distribution
+-  xrootd-incdir      XROOTD support, path to external XROOTD header files (XrdVersion.hh, ...)
+-  xrootd-libdir      XROOTD support, path to external XROOTD libraries
+-  xrootd-opts        XROOTD support, additional options to be passed to XROOTD-configure
++  xrootd             XROOTD support, path to XROOTD distribution
++  xrootd-incdir      XROOTD support, path to XROOTD header files (XrdVersion.hh, ...)
++  xrootd-libdir      XROOTD support, path to XROOTD libraries (libXrdClient, ...)
+ 
+ with compiler options, prefix with --with-, overrides default value
+ 
+@@ -1792,7 +1791,6 @@
+       --with-xft-libdir=*)     xftlibdir=$optarg     ;;
+       --with-xext-libdir=*)    xextlibdir=$optarg    ;;
+       --with-xrootd=*)         xrootddir=$optarg     ; enable_xrootd="yes"  ;;
+-      --with-xrootd-opts=*)    xrdaddopts=$optarg    ; enable_xrootd="yes"  ;;
+       --with-xrootd-incdir=*)  xrdincdir=$optarg     ; enable_xrootd="yes"  ;;
+       --with-xrootd-libdir=*)  xrdlibdir=$optarg     ; enable_xrootd="yes"  ;;
+       --with-cc=*)             altcc=$optarg         ;;
+@@ -4138,81 +4136,97 @@
+ #
+ ### echo %%% Check for xrootd support
+ #
+-message "Checking whether to build xrootd"
+-xrdcomm=""
+-vercomm=
+-
+-# If we are required to use an external XROOTD distribution
+-# we just define the pointers
+-extraxrdflags="-DUSENEWHDRS"
+-
+-# Check if we are asked to use an external XROOTD; priority to specific
+-# inc and lib settings
+-externalxrd="no"
+-if test ! "x$xrdlibdir" = "x" && test ! "x$xrdincdir" = "x"; then
+-   externalxrd="yes"
+-   xrdcomm="no, using xrootd at $xrdlibdir, $xrdincdir"
+-   if test ! -f "$xrdincdir/XrdVersion.hh" ; then
+-      enable_xrootd="no"
+-      xrdcomm="no, asked to use installation at $xrdincdir, but version file missing: disabling"
+-      xrdincdir=""
+-      xrdlibdir=""
+-   fi
+-elif test ! "x$xrootddir" = "x"; then
+-   externalxrd="yes"
++if test "x$enable_xrootd" = "xyes" ; then
++   xrdcomm=""
++   vercomm=""
++   extraxrdflags=""
++   
++   # Localize the version header; priority to specific inc and lib settings,
++   # followed by global dir setting and standard paths
++   xrdincone=""
++   xrdinctwoa=""
++   xrdinctwob=""
++   xrdinctmp=""
+    if test ! "x$xrdlibdir" = "x" && test ! "x$xrdincdir" = "x"; then
+-      xrdcomm="no, using xrootd at $xrdlibdir, $xrdincdir"
+-      if test ! -f "$xrdincdir/XrdVersion.hh" ; then
+-         enable_xrootd="no"
+-         xrdcomm="no, asked to use installation at $xrdincdir, but version file missing: disabling"
+-         xrdincdir=""
+-         xrdlibdir=""
+-      fi
++      xrdincone="$xrdincdir/XrdVersion.hh"
++      xrdlibone="$xrdlibdir"
++      xrdinctmp="$xrdincdir $xrdinctmp"
+    elif test ! "x$xrootddir" = "x"; then
+-      xrdlibdir="$xrootddir/lib"
+-      xrdcomm="no, using xrootd at $xrootddir"
+-      if test -f "$xrootddir/include/xrootd/XrdVersion.hh" ; then
+-         xrdincdir="$xrootddir/include/xrootd"
+-      elif test -f "$xrootddir/src/XrdVersion.hh" ; then
+-         xrdincdir="$xrootddir/src"
++      xrdlibtwo="$xrootddir"
++      xrdinctwoa="$xrootddir/include/xrootd/XrdVersion.hh"
++      xrdinctwob="$xrootddir/src/XrdVersion.hh"
++      xrdinctmp="$xrootddir/include/xrootd $xrootddir/src $xrdinctmp"
++   else
++      # Standard paths
++      xrdpaths="$XRDSYS /opt/xrootd /usr/local /usr"
++      for stdp in $xrdpaths ; do
++         if test -d "$stdp/lib" || test -d "$stdp/lib64" ; then
++            xrdlibthree="$xrdlibthree $stdp/lib"
++            xrdinctmp="$xrdinctmp $stdp/include/xrootd $stdp/include"
++         fi
++      done
++   fi
++   # Run the search now
++   check_header "XrdVersion.hh" "" "$xrdinctmp"
++   if test ! "x$found_hdr" = "x" ; then
++      xrdinc="$found_dir/$found_hdr"
++      # Find out which path was the good one
++      if test "x$xrdinc" = "x$xrdincone" ; then 
++         xrdincdir="$found_dir"
++         xrdlibdir="$xrdlibone"
++      elif test "x$xrdinc" = "x$xrdinctwoa" ; then 
++         xrdincdir="$xrdlibtwo/include/xrootd"
++         xrdlibdir="$xrdlibtwo/lib"
++      elif test "x$xrdinc" = "x$xrdinctwob" ; then 
++         xrdincdir="$xrdlibtwo/src"
++         xrdlibdir="$xrdlibtwo/lib"
+       else
+-         enable_xrootd="no"
+-         xrdcomm="no, asked to use installation at $xrootddir, but version file missing: disabling"
+-         xrdincdir=""
+-         xrdlibdir=""
++         for ll in $xrdlibthree ; do
++            rdir=`dirname $ll`
++            xinca="$rdir/include/xrootd/XrdVersion.hh"
++            xincb="$rdir/include/XrdVersion.hh"
++            if test "x$xrdinc" = "x$xinca" ; then 
++               xrdincdir="$rdir/include/xrootd"
++               xrdlibdir="$ll"
++            elif test "x$xrdinc" = "x$xincb" ; then 
++               xrdincdir="$rdir/include"
++               xrdlibdir="$ll"
++            fi
++            if test ! "x$xrdincdir" = "x" ; then
++               break
++            fi
++         done
++         # Only here if something inconsistent was found
++         if test "x$xrdincdir" = "x" ; then
++            enable_xrootd="no"
++            xrdincdir=""
++            xrdlibdir=""
++         fi
+       fi
++   else
++      enable_xrootd="no"
++      xrdincdir=""
++      xrdlibdir=""
+    fi
+ fi
++
+ # Decode version
+ xrdver=
+ decver=0
+-if test ! "x$enable_xrootd" = "xno" ; then
++if test "x$enable_xrootd" = "xyes" ; then
+ 
+-   newver="no"
+-   if test "x$externalxrd" = "xyes"; then
+-      verh=$xrdincdir/XrdVersion.hh
+-   else
+-      newver="yes"
+-      verh=$top_srcdir/net/xrootd/src/xrootd/VERSION_INFO
+-      if test ! -f $verh ; then
+-         newver="no"
+-         verh=$top_srcdir/net/xrootd/src/xrootd/src/XrdVersion.hh
+-      fi
+-   fi
+-   xrdver="unknown"
+-   if test "x$newver" = "xyes" ; then
+-      xrdver=`grep RefNames $verh`
+-      if test $? -eq 0 ; then
+-         set $xrdver
+-         xrdver=`echo $4 | sed -e 's|,||'`
+-      fi
++   message "Checking for xrootd version"
++
++   verh=$xrdincdir/XrdVersion.hh
++
++   xrdver=`grep XrdVERSION $verh`
++   if test $? -eq 0 ; then
++      set $xrdver
++      xrdver=$3
+    else
+-      xrdver=`grep XrdVERSION $verh`
+-      if test $? -eq 0 ; then
+-         set $xrdver
+-         xrdver=$3
+-      fi
++      xrdver="unknown"
+    fi
++
+    if test ! "x$xrdver" = "xunknown"; then
+       tmpver=`echo $xrdver | sed -e 's|"\(.*\)"|\1|' -e 's|^v||' -e 's|-.*||'`
+       if test "x$tmpver" = "xuntagged" ; then
+@@ -4241,117 +4255,96 @@
+ 	 fi
+       fi
+    fi
++   # Protect against 3.3.0, first version with 'include/xrootd/private'
++   if [ $decver -eq 300030000 ] ; then
++      echo "Cannot build against version $xrdver (missing headers)"
++      enable_xrootd="no"
++   else
++      echo "$xrdver"
++   fi
+ fi
+-bjrcomm=
+-if test "x$enable_xrootd" = "xyes" && test "x$externalxrd" = "xyes"; then
+ 
+-   if test "x$enable_xrootd" = "xyes" ; then
++xrdincprivate="no"
++if test "x$enable_xrootd" = "xyes" ; then
+ 
+-      # Check version
+-      decrefone=20070628
+-      decreftwo=20070723
+-      decrefthree=20071004
+-      if [ $decver -gt $decrefone ] ; then
+-         if [ $decver -gt $decrefthree ] ; then
+-            xrdcomm="$xrdcomm"
+-            extraxrdflags="$extraxrdflags"
+-         elif [ $decver -gt $decreftwo ] ; then
+-            vercomm=" (>$decreftwo, <=$decrefthree: setting -DOLDXRDLOCATE)"
+-            extraxrdflags="-DOLDXRDLOCATE $extraxrdflags"
+-         else
+-            vercomm=" (>$decrefone, <=$decreftwo: setting -DOLDXRDLOCATE -DOLDXRDOUC)"
+-            extraxrdflags="-DOLDXRDOUC -DOLDXRDLOCATE $extraxrdflags"
+-         fi
++   extraxrdflags="-DROOTXRDVERS=$decver"
++   vercomm="setting $extraxrdflags"
++
++   #
++   # Check libraries now
++   hasxrdutils="no"
++   libxrdoucbjr=""
++   # 
++   # Release date of version 3.1.0 containing the new lib packaging
++   decreftre=300000000
++   decrefutils=300010000
++   if [ $decver -lt $decreftre ] ; then
++      decrefutils=20111021
++   fi
++   decrefnetut=20100729
++   if [ $decver -ge $decrefutils ] ; then
++      xrdlibs="libXrdMain libXrdUtils libXrdClient" 
++      hasxrdutils="yes"
++   elif [ $decver -ge $decrefnetut ] ; then
++      xrdlibs="libXrdNet libXrdNetUtil libXrdOuc libXrdSys libXrdClient libXrd" 
++   else
++      xrdlibs="libXrdNet libXrdOuc libXrdSys libXrdClient libXrd" 
++   fi
++   tmpxrdlibdir=""
++   xrdlibext=""
++   for ll in $xrdlibs ; do 
++      #
++      # Check if packaging has libXrdUtils or the old libXrdOuc, libXrdSys, ...
++      check_library $ll "$enable_shared" "$xrdlibdir" "$xrdlibdir"
++      if test "x$found_lib" = "x" ; then
++         enable_xrootd="no"
++         xrdincdir=""
++         xrdlibdir=""
++         break
+       else
+-         vercomm=" (<= $decrefone: setting -DOLDXRDLOCATE -DOLDXRDOUC -DOLDXRCPHYCONN)"
+-         extraxrdflags="-DOLDXRCPHYCONN -DOLDXRDOUC -DOLDXRDLOCATE $extraxrdflags"
++         xrdlibext="$found_ext"
++         tmpxrdlibdir="$found_dir"
++         if test "x$ll" = "xlibXrdUtils" || test "x$ll" = "xlibXrdOuc"; then
++            libxrdoucbjr="$found_lib"
++         fi
+       fi
++   done
++
++   #
++   # If not 'so' or 'a', comunicate the extension for the library loadings
++   # in XrdProofd. This may be temporary, as xrootd may do it automatically,
++   # one day ...
++   if test ! "x$xrdlibext" = "x" && test ! "x$xrdlibext" = "xso" && test ! "x$xrdlibext" = "xa"; then
++      # The \'s are needed to produce -DLT_MODULE_EXT=\".ext\" in Makefile.config
++      extraxrdflags="$extraxrdflags -DLT_MODULE_EXT=\\\\\".$xrdlibext\\\\\""
+    fi
+ 
+-else
+-   if test "x$enable_xrootd" = "x" && test "x$DEFAULTENABLE" = "xno"; then
+-       enable_xrootd="no"
+-       xrdincdir=""
+-       xrdlibdir=""
+-   else
+-       # Xrootd and its client need thread support
+-       if test "x$enable_thread" = "xyes"; then
+-           # Ok, now check the architecture
+-           case $arch in
+-           # xrootd does not build on all platforms yet
+-           linux*)
+-               if test "x$enable_xrootd" = "x"; then
+-                   enable_xrootd="yes"
+-               fi
+-               ;;
+-           macos*)
+-               if test "x$enable_xrootd" = "x"; then
+-                   enable_xrootd="yes"
+-               fi
+-               ;;
+-           solaris*)
+-               if test "x$enable_xrootd" = "x"; then
+-                   enable_xrootd="yes"
+-               fi
+-               ;;
+-           win32)
+-               if test "x$enable_xrootd" = "x"; then
+-                   enable_xrootd="yes"
+-               fi
+-               ;;
+-           *)
+-               if test "x$enable_xrootd" = "xyes"; then
+-                   enable_xrootd="yes"
+-                   xrdcomm=", but not officially supported"
+-               else
+-                   enable_xrootd="no"
+-               fi
+-               xrdincdir=""
+-               xrdlibdir=""
+-               ;;
+-           esac
+-       else
+-           if test "x$enable_xrootd" = "xyes"; then
+-               enable_xrootd="no"
+-               xrdcomm=", needs thread support (make sure pthread lib is found)"
+-           else
+-               enable_xrootd="no"
+-           fi
+-           xrdincdir=""
+-           xrdlibdir=""
+-       fi
++   #
++   # Check also if 'include/private' exists: we need to signal this to the build modules
++   # for correct location of some headers available form the dlevel packages for version >= 3.3.x
++   if test "x$enable_xrootd" = "xyes"; then
++      if test -d "$xrdincdir/private"; then
++         xrdincprivate="yes"
++      fi
+    fi
+ 
+-   xrdcomm="$enable_xrootd$xrdcomm"
++   #
++   # 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
++         # 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
+ 
+-xrdcomm="$xrdcomm"
+-result $xrdcomm
+-if test "x$enable_xrootd" = "xyes"; then
+-    hasxrd=""
+-    hasnotxrd="#"
+-    message "Checking for xrootd version"
+-    result "$xrdver $vercomm"
+-    buildxrd="yes"
+-    if test "x$externalxrd" = "xyes"; then
+-       buildxrd="no"
+-       # Check if bonjour is available for code potentially using it ...
 -       if test "x$enable_bonjour" = "xyes"; then
 -          check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
 -          if test  $found_symbol -eq 0 ; then
@@ -12,21 +404,291 @@ diff -ur root-5.28.00c.orig/configure root-5.28.00c/configure
 -             bonjourcppflags=
 -          fi
 -       fi
-+       ## This test is broken and will always fail.
-+       ##if test "x$enable_bonjour" = "xyes"; then
-+       ##   check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
-+       ##   if test  $found_symbol -eq 0 ; then
-+       ##      bjrcomm="External xrootd has no bonjour support: disabling bonjour in XrdProofd"
-+       ##      bonjourcppflags=
-+       ##   fi
-+       ##fi
-     fi
+-    fi
+-else
+-    buildxrd="no"
+-    hasxrd="#"
+-    hasnotxrd=""
+-fi
+-if test ! "x$bjrcomm" = "x"; then
+-   echo "$bjrcomm"
+-fi
+ check_explicit "$enable_xrootd" "$enable_xrootd_explicit" \
+      "Explicitly required Xrootd dependencies not fulfilled"
+ 
+@@ -4364,11 +4357,6 @@
+ # If the user has set the flags "--disable-globus", we don't check for
+ # Globus at all.
+ #
+-# By default, always try to build the XRD GSI plug-in; this can be
+-# disabled with
+-#                  --with-xrootd-opts="--disable-gsi"
+-buildxrdgsi="yes"
+-#
+ glbextracflags=""
+ glbpatchcflags=""
+ haveglobus=""
+@@ -6282,7 +6270,6 @@
+     -e "s|@buildglew@|$enable_builtin_glew|"    \
+     -e "s|@builtinfreetype@|$enable_builtin_freetype|"      \
+     -e "s|@builtinpcre@|$enable_builtin_pcre|"  \
+-    -e "s|@buildxrd@|$buildxrd|"                \
+     -e "s|@hasxrd@|$enable_xrootd|"             \
+     -e "s|@castorincdir@|$castorincdir|"        \
+     -e "s|@castorlib@|$castorlib|"              \
+@@ -6467,10 +6454,11 @@
+     -e "s|@x11libdir@|$x11libdir|"              \
+     -e "s|@xpmlib@|$xpmlib|"                    \
+     -e "s|@xpmlibdir@|$xpmlibdir|"              \
+-    -e "s|@xrdaddopts@|$xrdaddopts|"            \
+     -e "s|@xrdlibdir@|$xrdlibdir|"              \
+     -e "s|@xrdincdir@|$xrdincdir|"              \
++    -e "s|@xrdincprivate@|$xrdincprivate|"      \
+     -e "s|@xrdversion@|$decver|"                \
++    -e "s|@hasxrdutils@|$hasxrdutils|"          \
+     -e "s|@cursesincdir@|$cursesincdir|"        \
+     -e "s|@curseshdr@|$curseshdr|"              \
+     -e "s|@curseslib@|$curseslib|"              \
+@@ -6508,7 +6496,6 @@
+     -e "s|@buildsrputil@|$enable_srputil|"      \
+     -e "s|@buildkrb5@|$enable_krb5|"            \
+     -e "s|@buildglobus@|$enable_globus|"        \
+-    -e "s|@buildxrdgsi@|$buildxrdgsi|"          \
+     -e "s|@buildclarens@|$enable_clarens|"      \
+     -e "s|@buildpeac@|$buildpeac|"              \
+     -e "s|@buildafdsmgrd@|$enable_afdsmgrd|"    \
+diff -Nur root-5.28.00h.orig/net/netx/Module.mk root-5.28.00h/net/netx/Module.mk
+--- root-5.28.00h.orig/net/netx/Module.mk	2011-11-24 17:12:53.000000000 +0100
++++ root-5.28.00h/net/netx/Module.mk	2013-03-08 11:54:43.607363254 +0100
+@@ -51,15 +51,21 @@
+ # Xrootd includes
+ NETXINCEXTRA := $(XROOTDDIRI:%=-I%)
+ ifneq ($(EXTRA_XRDFLAGS),)
+-NETXINCEXTRA += -Iproof/proofd/inc
++NETXINCEXTRA += -I$(ROOT_SRCDIR)/proof/proofd/inc
++endif
++ifeq ($(XRDINCPRIVATE),yes)
++NETXINCEXTRA += -I$(XRDINCDIR)/private
+ endif
+ 
+ # Xrootd client libs
+ ifeq ($(PLATFORM),win32)
+ NETXLIBEXTRA += $(XROOTDDIRL)/libXrdClient.lib
  else
-     buildxrd="no"
-diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Module.mk
---- root-5.28.00c.orig/proof/proofd/Module.mk	2011-04-15 17:33:43.000000000 +0200
-+++ root-5.28.00c/proof/proofd/Module.mk	2011-04-23 13:51:01.294607207 +0200
-@@ -115,12 +115,10 @@
+-NETXLIBEXTRA += -L$(XROOTDDIRL) -lXrdOuc -lXrdSys \
+-                -lXrdClient
++ifeq ($(HASXRDUTILS),no)
++NETXLIBEXTRA += $(XROOTDDIRL) -lXrdOuc -lXrdSys -lXrdClient
++else
++NETXLIBEXTRA += $(XROOTDDIRL) -lXrdUtils -lXrdClient
++endif
+ endif
+ 
+ ##### local rules #####
+diff -Nur root-5.28.00h.orig/net/netx/src/TXNetFile.cxx root-5.28.00h/net/netx/src/TXNetFile.cxx
+--- root-5.28.00h.orig/net/netx/src/TXNetFile.cxx	2011-11-24 17:12:53.000000000 +0100
++++ root-5.28.00h/net/netx/src/TXNetFile.cxx	2013-03-08 11:54:22.638183476 +0100
+@@ -56,6 +56,7 @@
+ #include "TVirtualPerfStats.h"
+ 
+ #include <XrdClient/XrdClient.hh>
++#include <XrdClient/XrdClientConn.hh>
+ #include <XrdClient/XrdClientConst.hh>
+ #include <XrdClient/XrdClientEnv.hh>
+ #include <XProtocol/XProtocol.hh>
+diff -Nur root-5.28.00h.orig/proof/proofd/inc/XpdObject.h root-5.28.00h/proof/proofd/inc/XpdObject.h
+--- root-5.28.00h.orig/proof/proofd/inc/XpdObject.h	1970-01-01 01:00:00.000000000 +0100
++++ root-5.28.00h/proof/proofd/inc/XpdObject.h	2013-03-08 11:54:41.991349396 +0100
+@@ -0,0 +1,100 @@
++// @(#)root/proofd:$Id$
++// Author: Gerardo Ganis  Feb 2013
++
++/*************************************************************************
++ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
++ * All rights reserved.                                                  *
++ *                                                                       *
++ * For the licensing terms see $ROOTSYS/LICENSE.                         *
++ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
++ *************************************************************************/
++
++//////////////////////////////////////////////////////////////////////////
++//                                                                      //
++// XpdObject                                                            //
++//                                                                      //
++// Authors: G. Ganis, CERN, 2013                                        //
++//                                                                      //
++// Auxilliary class to stack protocols.                                 //
++// Adapted version of XrdObject.                                        //
++//                                                                      //
++//////////////////////////////////////////////////////////////////////////
++
++#ifndef ROOT_XpdObject
++#define ROOT_XpdObject
++
++#include <string.h>
++#include <strings.h>
++#include <time.h>
++#include <sys/types.h>
++#include "Xrd/XrdJob.hh"
++#include "XrdOuc/XrdOucTrace.hh"
++#include "XrdSys/XrdSysPthread.hh"
++
++class XpdObjectQ;
++class XrdProofdProtocol;
++class XrdScheduler;
++  
++class XpdObject {
++public:
++   friend class XpdObjectQ;
++
++   // Item() supplies the item value associated with itself (used with Next()).
++   XrdProofdProtocol  *objectItem() { return fItem; }
++
++   // Next() supplies the next list node.
++   XpdObject          *nextObject() { return fNext; }
++
++   // Set the item pointer
++   void                setItem(XrdProofdProtocol *ival) { fItem = ival; }
++
++   XpdObject(XrdProofdProtocol *ival=0) { fNext = 0; fItem = ival; fQTime = 0; }
++   ~XpdObject() {}
++
++private:
++   XpdObject         *fNext;
++   XrdProofdProtocol *fItem;
++   time_t             fQTime;  // Only used for time-managed objects
++};
++
++/******************************************************************************/
++/*                           x r d _ O b j e c t Q                            */
++/******************************************************************************/
++  
++// Note to properly cleanup this type of queue you must call Set() at least
++// once to cause the time element to be sceduled.
++
++class XrdOucTrace;
++  
++class XpdObjectQ : public XrdJob {
++public:
++
++   XrdProofdProtocol *Pop();
++   void Push(XpdObject *Node);
++   void Set(int inQMax, time_t agemax=1800);
++   void Set(XrdScheduler *sp, XrdOucTrace *tp, int traceChk = 0)
++            {fSched = sp; fTrace = tp; fTraceON = traceChk;}
++   void DoIt();
++
++   XpdObjectQ(const char *id, const char *desc) : XrdJob(desc) 
++          {fCurage = fCount = 0; fMaxage = 0; fTraceID = id;
++           fMaxinQ = 32; fMininQ = 16; fFirst = 0; }
++
++   ~XpdObjectQ() {}
++
++private:
++
++   XrdSysMutex    fQMutex;
++   XpdObject     *fFirst;
++   int            fCount;
++   int            fCurage;
++   int            fMininQ;
++   int            fMaxinQ;
++   time_t         fMaxage;
++   XrdOucTrace   *fTrace;
++   XrdScheduler  *fSched;
++   int            fTraceON;
++   const char    *fTraceID;
++};
++
++#endif
+diff -Nur root-5.28.00h.orig/proof/proofd/inc/XrdProofdProofServMgr.h root-5.28.00h/proof/proofd/inc/XrdProofdProofServMgr.h
+--- root-5.28.00h.orig/proof/proofd/inc/XrdProofdProofServMgr.h	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/inc/XrdProofdProofServMgr.h	2013-03-08 11:54:29.736244390 +0100
+@@ -46,6 +46,9 @@
+ #define PSMMAXCNTS  3
+ #define PSMCNTOK(t) (t >= 0 && t < PSMMAXCNTS)
+ 
++// Security handle
++typedef int (*XrdSecCredsSaver_t)(XrdSecCredentials *, const char *fn, const XrdProofUI &ui);
++
+ // Aux structure for session set env inputs
+ typedef struct {
+    XrdProofdProofServ *fPS;
+@@ -159,6 +162,8 @@
+    std::list<XrdProofdProofServ *> fActiveSessions;     // List of active sessions (non-idle)
+    std::list<XpdClientSessions *> *fRecoverClients; // List of client potentially recovering
+ 
++   XrdSecCredsSaver_t fCredsSaver; // If defined, function to be used to save the credentials
++
+    int                DoDirectiveProofServMgr(char *, XrdOucStream *, bool);
+    int                DoDirectivePutEnv(char *, XrdOucStream *, bool);
+    int                DoDirectivePutRc(char *, XrdOucStream *, bool);
+@@ -252,8 +257,6 @@
+ 
+    int               SetProofServEnv(XrdProofdProtocol *p, void *in);
+    int               SetProofServEnvOld(XrdProofdProtocol *p, void *in);
+-
+-   int               SaveAFSkey(XrdSecCredentials *c, const char *fn, XrdProofUI ui);
+    int               SetUserEnvironment(XrdProofdProtocol *p);
+ 
+    static int        SetProofServEnv(XrdProofdManager *m, XrdROOT *r);
+diff -Nur root-5.28.00h.orig/proof/proofd/inc/XrdProofdProtocol.h root-5.28.00h/proof/proofd/inc/XrdProofdProtocol.h
+--- root-5.28.00h.orig/proof/proofd/inc/XrdProofdProtocol.h	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/inc/XrdProofdProtocol.h	2013-03-08 11:54:41.991349396 +0100
+@@ -41,10 +41,10 @@
+ #  include "XrdSys/XrdSysPthread.hh"
+ #endif
+ #include "Xrd/XrdLink.hh"
+-#include "Xrd/XrdObject.hh"
+ #include "Xrd/XrdProtocol.hh"
+ #include "XrdOuc/XrdOucString.hh"
+ #include "XrdSec/XrdSecInterface.hh"
++#include "XpdObject.h"
+ #include "XProofProtocol.h"
+ 
+ class XrdBuffer;
+@@ -133,7 +133,7 @@
+    //
+    // Protocol variables
+ 
+-   XrdObject<XrdProofdProtocol>  fProtLink;
++   XpdObject                     fProtLink;
+    XrdBuffer                    *fArgp;
+ 
+    XrdLink                      *fLink;
+@@ -178,7 +178,7 @@
+    //
+    static bool                   fgConfigDone;
+    static int                    fgCount;
+-   static XrdObjectQ<XrdProofdProtocol> fgProtStack;
++   static XpdObjectQ             fgProtStack;
+    static XrdBuffManager        *fgBPool;        // Buffer manager
+    static int                    fgMaxBuffsz;    // Maximum buffer size we can have
+    static XrdSysRecMutex         fgBMutex;       // Buffer management mutex
+diff -Nur root-5.28.00h.orig/proof/proofd/Module.mk root-5.28.00h/proof/proofd/Module.mk
+--- root-5.28.00h.orig/proof/proofd/Module.mk	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/Module.mk	2013-03-08 11:54:41.992349404 +0100
+@@ -46,10 +46,10 @@
+ XPDLIB       := $(LPATH)/libXrdProofd.$(SOEXT)
+ 
+ # Extra include paths and libs
+-XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
+-XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
++XPDINCEXTRA  := $(XROOTDDIRI:%=-I%)
++XPDINCEXTRA  += $(PROOFDDIRI:%=-I%)
+ 
+-XPDLIBEXTRA  += $(XROOTDDIRL)/libXrdClient.lib
++XPDLIBEXTRA  := $(XROOTDDIRL)/libXrdClient.lib
+ 
+ # used in the main Makefile
+ PROOFDEXEH   := $(MODDIRI)/proofdp.h
+@@ -110,18 +110,24 @@
+ 
+ # Extra include paths and libs
+ XPROOFDEXELIBS :=
+-XPROOFDEXESYSLIBS := $(DNSSDLIB)
+-XPROOFDEXE     :=
++XPROOFDEXESYSLIBS :=
++XPROOFDEXE     := bin/xproofd
  ifeq ($(HASXRD),yes)
  XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
  XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
@@ -36,14 +698,24 @@ diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Mo
 -                  $(XROOTDDIRL)/libXrdNet.a \
 -                  $(XROOTDDIRL)/libXrdOuc.a \
 -                  $(XROOTDDIRL)/libXrdSys.a $(XROOTDDIRL)/libXrdSut.a
-+XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
-+                  -lXrdNet -lXrdOuc -lXrdSys $(DNSSDLIB)
-+XPROOFDEXELIBS := -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
-+                  -lXrdNet -lXrdOuc -lXrdSys
- # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
+-# Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
++ifeq ($(XRDINCPRIVATE),yes)
++XPDINCEXTRA    += -I$(XRDINCDIR)/private
++endif
++
++
++ifeq ($(HASXRDUTILS),no)
++
++XPDLIBEXTRA    += $(XROOTDDIRL) -lXrdClient -lXrdNet -lXrdOuc \
++                  -lXrdSys -lXrdSut
++XPROOFDEXELIBS := $(XROOTDDIRL) -lXrd -lXrdClient -lXrdNet -lXrdOuc \
++                  -lXrdSys -lXrdSut
++# Starting from Jul 2010 XrdNet has been split in two libs:
++#    XrdNet and XrdNetUtil
  # both are needed
  XRDNETUTIL     :=
-@@ -130,8 +128,8 @@
+ ifneq ($(XRDVERSION),)
+@@ -130,15 +136,22 @@
                            fi)
  endif
  ifeq ($(XRDNETUTIL),yes)
@@ -51,15 +723,601 @@ diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Mo
 -XPROOFDEXELIBS += $(XROOTDDIRL)/libXrdNetUtil.a
 +XPDLIBEXTRA    += -lXrdNetUtil
 +XPROOFDEXELIBS += -lXrdNetUtil
++endif
++
++else
++
++XPDLIBEXTRA    += $(XROOTDDIRL) -lXrdClient -lXrdUtils
++XPROOFDEXELIBS := $(XROOTDDIRL) -lXrdMain -lXrdClient -lXrdUtils
++
  endif
  XPDLIBEXTRA    +=  $(DNSSDLIB)
++XPROOFDEXELIBS +=  $(DNSSDLIB)
  
-@@ -166,7 +164,7 @@
+ ifeq ($(PLATFORM),solaris)
+ XPROOFDEXESYSLIBS := -lsendfile
+ endif
+-XPROOFDEXE     := bin/xproofd
+ endif
+ 
+ # used in the main Makefile
+@@ -162,12 +175,15 @@
+ include/%.h:    $(PROOFDDIRI)/%.h
+ 		cp $< $@
+ 
+-$(PROOFDEXE):   $(PROOFDEXEO) $(RSAO) $(SNPRINTFO) $(GLBPATCHO) $(RPDUTILO) $(STRLCPYO)
++$(PROOFDEXE):   $(PROOFDEXEO) $(RSAO) $(SNPRINTFO) $(GLBPATCHO) $(RPDUTILO) \
++                $(STRLCPYO)
  		$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \
- 		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
+-		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
++		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) \
++		   $(SYSLIBS)
  
--$(XPROOFDEXE):  $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD)
-+$(XPROOFDEXE):  $(XPDO) $(XRDPROOFXD)
- 		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
+ $(XPROOFDEXE):  $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD)
+-		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
++		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) \
++		   $(SYSLIBS) $(XPROOFDEXESYSLIBS)
  
  $(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+@@ -182,7 +198,8 @@
+ clean::         clean-$(MODNAME)
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+-		@rm -f $(PROOFDDEP) $(PROOFDEXE) $(XPROOFDEXE) $(XPDDEP) $(XPDLIB)
++		@rm -f $(PROOFDDEP) $(PROOFDEXE) $(XPROOFDEXE) $(XPDDEP) \
++		  $(XPDLIB)
+ 
+ distclean::     distclean-$(MODNAME)
+ 
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XpdObject.cxx root-5.28.00h/proof/proofd/src/XpdObject.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XpdObject.cxx	1970-01-01 01:00:00.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XpdObject.cxx	2013-03-08 11:54:41.989349384 +0100
+@@ -0,0 +1,125 @@
++// @(#)root/proofd:$Id$
++// Author: Gerardo Ganis  Feb 2013
++
++/*************************************************************************
++ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
++ * All rights reserved.                                                  *
++ *                                                                       *
++ * For the licensing terms see $ROOTSYS/LICENSE.                         *
++ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
++ *************************************************************************/
++
++//////////////////////////////////////////////////////////////////////////
++//                                                                      //
++// XpdObject                                                            //
++//                                                                      //
++// Authors: G. Ganis, CERN, 2013                                        //
++//                                                                      //
++// Auxilliary class to stack protocols.                                 //
++//                                                                      //
++//////////////////////////////////////////////////////////////////////////
++
++#include "XpdObject.h"
++#include "XrdProofdAux.h"
++#include "XrdProofdProtocol.h"
++#include "Xrd/XrdScheduler.hh"
++#include "XrdOuc/XrdOucTrace.hh"
++
++//_______________________________________________________________________
++XrdProofdProtocol *XpdObjectQ::Pop()
++{
++   // Pop up a protocol object 
++
++   XpdObject *node;
++   fQMutex.Lock();
++   if ((node = fFirst)) {
++      fFirst = fFirst->fNext;
++      fCount--;
++   }
++   fQMutex.UnLock();
++   if (node) return node->fItem;
++   return (XrdProofdProtocol *)0;
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::Push(XpdObject *node)
++{
++   // Push back a protocol
++
++   node->fQTime = fCurage;
++   fQMutex.Lock();
++   if (fCount >= fMaxinQ) {
++      delete node->fItem;
++   } else {
++      node->fNext = fFirst;
++      fFirst = node;
++      fCount++;
++   }
++   fQMutex.UnLock();
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::Set(int inQMax, time_t agemax)
++{
++   // Lock the data area and set the values
++
++   fQMutex.Lock();
++   fMaxinQ = inQMax; fMaxage = agemax;
++   if (!(fMininQ = inQMax/2)) fMininQ = 1;
++   fQMutex.UnLock();
++
++   // Schedule ourselves using the new values
++   if (agemax > 0)
++      fSched->Schedule((XrdJob *)this, agemax + time(0));
++}
++
++//_______________________________________________________________________
++void XpdObjectQ::DoIt()
++{
++   // Process method
++
++   XpdObject *pp, *p;
++   int oldcnt, agemax;
++
++   // Lock the anchor and see if we met the threshold for deletion
++   //
++   fQMutex.Lock();
++   agemax = fMaxage;
++   if ((oldcnt = fCount) > fMininQ) {
++
++      // Prepare to scan down the queue.
++      if ((pp = fFirst)) {
++         p = pp->fNext;
++      } else { p = 0; }
++
++      // Find the first object that's been idle for too long
++      while(p && (p->fQTime >= fCurage)) { pp = p; p = p->fNext;}
++
++      // Now delete half of the idle objects. The object queue element must be
++      // part of the actual object being deleted for this to properly work.
++      if (pp) {
++         while (p) {
++            pp->fNext = p->fNext;
++            delete p->fItem;
++            fCount--;
++            p = ((pp = pp->fNext) ? pp->fNext : 0);
++         }
++      }
++   }
++
++   // Increase the age and unlock the queue
++   fCurage++;
++   fQMutex.UnLock();
++
++   // Trace as needed
++   if (fTraceON && fTrace->Tracing(fTraceON))
++      {fTrace->Beg(fTraceID);
++       cerr <<Comment <<" trim done; " <<fCount <<" of " <<oldcnt <<" kept";
++       fTrace->End();
++      }
++
++   // Reschedule ourselves if we must do so
++   if (agemax > 0)
++      fSched->Schedule((XrdJob *)this, agemax+time(0));
++}
++
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofConn.cxx root-5.28.00h/proof/proofd/src/XrdProofConn.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofConn.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofConn.cxx	2013-03-08 11:55:39.849845443 +0100
+@@ -35,16 +35,16 @@
+ 
+ #include "XrdClient/XrdClientConnMgr.hh"
+ #include "XrdClient/XrdClientConst.hh"
+-#include "XrdClient/XrdClientDebug.hh"
+ #include "XrdClient/XrdClientEnv.hh"
+ #include "XrdClient/XrdClientLogConnection.hh"
+ #include "XrdClient/XrdClientPhyConnection.hh"
+ #include "XrdClient/XrdClientMessage.hh"
+ #include "XrdClient/XrdClientUrlInfo.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdOuc/XrdOucErrInfo.hh"
+ #include "XrdOuc/XrdOucString.hh"
+ #include "XrdSec/XrdSecInterface.hh"
++#include "XrdSys/XrdSysLogger.hh"
+ 
+ // Dynamic libs
+ // Bypass Solaris ELF madness
+@@ -334,7 +334,7 @@
+ 
+    // Resolve the DNS information
+    char *haddr[10] = {0}, *hname[10] = {0};
+-   int naddr = XrdNetDNS::getAddrName(fUrl.Host.c_str(), 10, haddr, hname);
++   int naddr = XrdSysDNS::getAddrName(fUrl.Host.c_str(), 10, haddr, hname);
+ 
+    int i = 0;
+    for (; i < naddr; i++ ) {
+@@ -1223,7 +1223,7 @@
+    // for the authentication.
+    struct sockaddr_in netaddr;
+    char **hosterrmsg = 0;
+-   if (XrdNetDNS::getHostAddr((char *)fUrl.HostAddr.c_str(),
++   if (XrdSysDNS::getHostAddr((char *)fUrl.HostAddr.c_str(),
+                                 (struct sockaddr &)netaddr, hosterrmsg) <= 0) {
+       TRACE(XERR, "getHostAddr: "<< *hosterrmsg);
+       return protocol;
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofdConfig.cxx root-5.28.00h/proof/proofd/src/XrdProofdConfig.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofdConfig.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofdConfig.cxx	2013-03-08 11:54:22.639183484 +0100
+@@ -28,7 +28,7 @@
+ #  include "XrdSys/XrdSysError.hh"
+ #  include "XrdSys/XrdSysLogger.hh"
+ #endif
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdOuc/XrdOucEnv.hh"
+ #include "XrdOuc/XrdOucStream.hh"
+ #include "XrdOuc/XrdOucString.hh"
+@@ -115,7 +115,7 @@
+ 
+    // Local FQDN
+    if (fgHost.length() <= 0) {
+-      char *host = XrdNetDNS::getHostName();
++      char *host = XrdSysDNS::getHostName();
+       fgHost = host ? host : "";
+       SafeFree(host);
+    }
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofdManager.cxx root-5.28.00h/proof/proofd/src/XrdProofdManager.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofdManager.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofdManager.cxx	2013-03-08 11:54:22.640183493 +0100
+@@ -32,7 +32,7 @@
+ #  include "XrdSys/XrdSysPlugin.hh"
+ #  include "XrdSys/XrdSysTimer.hh"
+ #endif
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdOuc/XrdOucEnv.hh"
+ #include "XrdOuc/XrdOucStream.hh"
+ #include "XrdSys/XrdSysPriv.hh"
+@@ -653,7 +653,7 @@
+       }
+ 
+       // Local FQDN
+-      char *host = XrdNetDNS::getHostName();
++      char *host = XrdSysDNS::getHostName();
+       fHost = host ? host : "";
+       SafeFree(host);
+ 
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofdNetMgr.cxx root-5.28.00h/proof/proofd/src/XrdProofdNetMgr.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofdNetMgr.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofdNetMgr.cxx	2013-03-08 11:54:22.642183510 +0100
+@@ -27,7 +27,7 @@
+ #include "XrdClient/XrdClientEnv.hh"
+ #include "XrdClient/XrdClientMessage.hh"
+ #include "XrdClient/XrdClientUrlInfo.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdOuc/XrdOucStream.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+@@ -77,7 +77,7 @@
+    fRequestTO = 30;
+    fBonjourEnabled = false;
+ #if defined(BUILD_BONJOUR)
+-   char *host = XrdNetDNS::getHostName();
++   char *host = XrdSysDNS::getHostName();
+    fBonjourName = host ? host : "";
+    SafeFree(host);
+    fBonjourCores = XrdProofdAux::GetNumCPUs();
+@@ -1042,7 +1042,7 @@
+       XrdClientUrlInfo uu(host);
+       if (uu.Port <= 0) uu.Port = 1093;
+       // Fully qualified name
+-      char *fqn = XrdNetDNS::getHostName(uu.Host.c_str());
++      char *fqn = XrdSysDNS::getHostName(uu.Host.c_str());
+       if (fqn && (strstr(fqn, "localhost") || !strcmp(fqn, "127.0.0.1") ||
+                   !strcmp(fMgr->Host(), fqn))) {
+          if (!checkport || (uu.Port == fMgr->Port()))
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofdProofServMgr.cxx root-5.28.00h/proof/proofd/src/XrdProofdProofServMgr.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofdProofServMgr.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofdProofServMgr.cxx	2013-03-08 11:54:29.740244376 +0100
+@@ -32,13 +32,12 @@
+ #include "Xrd/XrdPoll.hh"
+ #include "Xrd/XrdScheduler.hh"
+ #include "XrdNet/XrdNet.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdNet/XrdNetPeer.hh"
+ #include "XrdOuc/XrdOucRash.hh"
+ #include "XrdOuc/XrdOucStream.hh"
+ #include "XrdSys/XrdSysPriv.hh"
+-#include "XrdSut/XrdSutAux.hh"
+-
++#include "XrdSys/XrdSysPlugin.hh"
+ #include "XrdProofdClient.h"
+ #include "XrdProofdClientMgr.h"
+ #include "XrdProofdManager.h"
+@@ -297,6 +296,8 @@
+       fCounters[i] = 0;
+    }
+    fCurrentSessions = 0;
++   
++   fCredsSaver = 0;
+ 
+    // Defaults can be changed via 'proofservmgr'
+    fCheckFrequency = 30;
+@@ -2414,7 +2415,7 @@
+    // Make sure we have the full host name
+    if (peerpsrv.InetName) {
+       char *ptmp = peerpsrv.InetName;
+-      peerpsrv.InetName = XrdNetDNS::getHostName("localhost");
++      peerpsrv.InetName = XrdSysDNS::getHostName("localhost");
+       free(ptmp);
+    }
+ 
+@@ -2681,27 +2682,20 @@
+          ev[lev] = 0;
+          putenv(ev);
+          TRACE(DBG, "XrdSecCREDS set");
+-
+-         // If 'pwd', save AFS key, if any
+-         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
++         if (fCredsSaver) {
+             XrdOucString credsdir = udir;
+             credsdir += "/.creds";
+             // Make sure the directory exists
+             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
+-               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
+-                  ev = new char[strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2];
+-                  sprintf(ev, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
+-                  putenv(ev);
+-                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
+-                  TRACE(DBG, ev);
+-               } else {
+-                  TRACE(DBG, "problems in saving AFS key");
++               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
++                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
+                }
+             } else {
+                TRACE(XERR, "unable to create creds dir: "<<credsdir);
+                return -1;
+             }
+          }
++         fclose(fenv);
+       }
+    }
+ 
+@@ -3298,26 +3292,20 @@
+          putenv(ev);
+          TRACE(DBG, "XrdSecCREDS set");
+ 
+-         // If 'pwd', save AFS key, if any
+-         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
++         if (fCredsSaver) {
+             XrdOucString credsdir = udir;
+             credsdir += "/.creds";
+             // Make sure the directory exists
+             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
+-               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
+-                  ev = new char[strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2];
+-                  sprintf(ev, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
+-                  putenv(ev);
+-                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
+-                  TRACE(DBG, ev);
+-               } else {
+-                  TRACE(DBG, "problems in saving AFS key");
++               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
++                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
+                }
+             } else {
+                TRACE(XERR, "unable to create creds dir: "<<credsdir);
+                return -1;
+             }
+          }
++         fclose(fenv);
+       }
+    }
+ 
+@@ -4040,84 +4028,6 @@
+    return 0;
+ }
+ 
+-//______________________________________________________________________________
+-int XrdProofdProofServMgr::SaveAFSkey(XrdSecCredentials *c,
+-                                      const char *dir, XrdProofUI ui)
+-{
+-   // Save the AFS key, if any, for usage in proofserv in file 'dir'/.afs .
+-   // Return 0 on success, -1 on error.
+-   XPDLOC(SMGR, "ProofServMgr::SaveAFSkey")
+-
+-   // Check file name
+-   if (!dir || strlen(dir) <= 0) {
+-      TRACE(XERR, "dir name undefined");
+-      return -1;
+-   }
+-
+-   // Check credentials
+-   if (!c) {
+-      TRACE(XERR, "credentials undefined");
+-      return -1;
+-   }
+-   TRACE(REQ, "dir: "<<dir);
+-
+-   // Decode credentials
+-   int lout = 0;
+-   char *out = new char[c->size];
+-   if (XrdSutFromHex(c->buffer, out, lout) != 0) {
+-      TRACE(XERR, "problems unparsing hex string");
+-      delete [] out;
+-      return -1;
+-   }
+-
+-   // Locate the key
+-   char *key = out + 5;
+-   if (strncmp(key, "afs:", 4)) {
+-      TRACE(DBG, "string does not contain an AFS key");
+-      delete [] out;
+-      return 0;
+-   }
+-   key += 4;
+-
+-   // Save to file, if not existing already
+-   XrdOucString fn = dir;
+-   fn += "/.afs";
+-
+-   int rc = 0;
+-   struct stat st;
+-   if (stat(fn.c_str(), &st) != 0 && errno == ENOENT) {
+-
+-      // Open the file, truncating if already existing
+-      int fd = open(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+-      if (fd <= 0) {
+-         TRACE(XERR, "problems creating file - errno: " << errno);
+-         delete [] out;
+-         return -1;
+-      }
+-      // Write out the key
+-      int lkey = lout - 9;
+-      if (XrdProofdAux::Write(fd, key, lkey) != lkey) {
+-         TRACE(XERR, "problems writing to file - errno: " << errno);
+-         rc = -1;
+-      }
+-
+-      // Cleanup
+-      delete [] out;
+-      close(fd);
+-   } else {
+-      TRACE(XERR, "cannot stat existing file "<<fn<<" - errno: " << errno);
+-      delete [] out;
+-      return -1;
+-   }
+-
+-   // Make sure the file is owned by the user
+-   if (XrdProofdAux::ChangeOwn(fn.c_str(), ui) != 0) {
+-      TRACE(XERR, "can't change ownership of "<<fn);
+-   }
+-
+-   return rc;
+-}
+-
+ //__________________________________________________________________________
+ XrdProofdProofServ *XrdProofdProofServMgr::GetActiveSession(int pid)
+ {
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofdProtocol.cxx root-5.28.00h/proof/proofd/src/XrdProofdProtocol.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofdProtocol.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofdProtocol.cxx	2013-03-08 11:56:59.867531468 +0100
+@@ -33,7 +33,7 @@
+ 
+ #include "XrdVersion.hh"
+ #include "Xrd/XrdBuffer.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "Xrd/XrdScheduler.hh"
+ 
+ #include "XrdProofdClient.h"
+ #include "XrdProofdClientMgr.h"
+@@ -57,8 +57,7 @@
+ //
+ // Static area: general protocol managing section
+ int                   XrdProofdProtocol::fgCount    = 0;
+-XrdObjectQ<XrdProofdProtocol>
+-                      XrdProofdProtocol::fgProtStack("ProtStack",
++XpdObjectQ            XrdProofdProtocol::fgProtStack("ProtStack",
+                                                      "xproofd protocol anchor");
+ XrdSysRecMutex        XrdProofdProtocol::fgBMutex;    // Buffer management mutex
+ XrdBuffManager       *XrdProofdProtocol::fgBPool    = 0;
+@@ -460,8 +459,12 @@
+    // Schedule protocol object cleanup; the maximum number of objects
+    // and the max age are taken from XrdXrootdProtocol: this may need
+    // some optimization in the future.
++#if 1
+    fgProtStack.Set(pi->Sched, XrdProofdTrace, TRACE_MEM);
+    fgProtStack.Set((pi->ConnMax/3 ? pi->ConnMax/3 : 30), 60*60);
++#else
++   fgProtStack.Set(pi->Sched, 3600);
++#endif
+ 
+    // Default tracing options: always trace logins and errors for all
+    // domains; if the '-d' option was specified on the command line then
+@@ -683,6 +686,13 @@
+ 
+    // Push ourselves on the stack
+    fgProtStack.Push(&fProtLink);
++#if 0
++   if(fgProtStack.Push(&fProtLink) != 0) {
++      XrdProofdProtocol *xp = fProtLink.objectItem();
++      fProtLink.setItem(0);
++      delete xp;
++   }
++#endif
+ }
+ 
+ //______________________________________________________________________________
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofPhyConn.cxx root-5.28.00h/proof/proofd/src/XrdProofPhyConn.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofPhyConn.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofPhyConn.cxx	2013-03-08 11:54:22.645183535 +0100
+@@ -27,7 +27,7 @@
+ #include "XrdClient/XrdClientConst.hh"
+ #include "XrdClient/XrdClientLogConnection.hh"
+ #include "XrdClient/XrdClientMessage.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XrdSec/XrdSecInterface.hh"
+ 
+ #ifndef WIN32
+@@ -91,7 +91,7 @@
+ 
+    // Host and Port
+    if (!fTcp) {
+-      fHost = XrdNetDNS::getHostName(((fUrl.Host.length() > 0) ?
++      fHost = XrdSysDNS::getHostName(((fUrl.Host.length() > 0) ?
+                                        fUrl.Host.c_str() : "localhost"));
+       fPort = -1;
+       fUrl.Host = "";
+diff -Nur root-5.28.00h.orig/proof/proofd/src/XrdProofWorker.cxx root-5.28.00h/proof/proofd/src/XrdProofWorker.cxx
+--- root-5.28.00h.orig/proof/proofd/src/XrdProofWorker.cxx	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofd/src/XrdProofWorker.cxx	2013-03-08 11:54:22.645183535 +0100
+@@ -27,7 +27,7 @@
+ #include "XrdProofWorker.h"
+ #include "XrdProofdProofServ.h"
+ #include "XrdClient/XrdClientUrlInfo.hh"
+-#include "XrdNet/XrdNetDNS.hh"
++#include "XrdSys/XrdSysDNS.hh"
+ #include "XProofProtocol.h"
+ 
+ // Tracing utilities
+@@ -99,7 +99,7 @@
+    // Take the user name, if specified
+    fUser = ui.User;
+    char *err;
+-   char *fullHostName = XrdNetDNS::getHostName((char *)ui.Host.c_str(), &err);
++   char *fullHostName = XrdSysDNS::getHostName((char *)ui.Host.c_str(), &err);
+    if (!fullHostName || !strcmp(fullHostName, "0.0.0.0")) {
+       TRACE(XERR, "DNS could not resolve '" << ui.Host << "'");
+       return;
+diff -Nur root-5.28.00h.orig/proof/proofx/Module.mk root-5.28.00h/proof/proofx/Module.mk
+--- root-5.28.00h.orig/proof/proofx/Module.mk	2011-11-24 17:12:38.000000000 +0100
++++ root-5.28.00h/proof/proofx/Module.mk	2013-03-08 11:54:42.795356301 +0100
+@@ -61,13 +61,18 @@
+ PROOFXINCEXTRA := $(PROOFXDIRI:%=-I%)
+ PROOFXINCEXTRA += $(XROOTDDIRI:%=-I%)
+ PROOFXINCEXTRA += $(PROOFDDIRI:%=-I%)
++ifeq ($(XRDINCPRIVATE),yes)
++PROOFXINCEXTRA += -I$(XRDINCDIR)/private
++endif
+ 
+ # Xrootd client libs
+ ifeq ($(PLATFORM),win32)
+ PROOFXLIBEXTRA += $(XROOTDDIRL)/libXrdClient.lib
+ else
+-PROOFXLIBEXTRA += -L$(XROOTDDIRL) -lXrdOuc -lXrdSys -lXrdNet -lXrdClient
+-# Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
++ifeq ($(HASXRDUTILS),no)
++PROOFXLIBEXTRA += $(XROOTDDIRL) -lXrdOuc -lXrdSys -lXrdNet -lXrdClient
++# Starting from Jul 2010 XrdNet has been split in two libs:
++#    XrdNet and XrdNetUtil
+ # both are needed
+ XRDNETUTIL     :=
+ ifneq ($(XRDVERSION),)
+@@ -78,6 +83,9 @@
+ ifeq ($(XRDNETUTIL),yes)
+ PROOFXLIBEXTRA += -lXrdNetUtil
+ endif
++else
++PROOFXLIBEXTRA += $(XROOTDDIRL) -lXrdUtils -lXrdClient
++endif
+ endif
+ 
+ ##### local rules #####
diff --git a/root.spec b/root.spec
index 1afafdf..23ebeb0 100644
--- a/root.spec
+++ b/root.spec
@@ -30,7 +30,7 @@
 Name:		root
 Version:	5.28.00h
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -57,17 +57,21 @@ Patch0:		%{name}-ftgl.patch
 Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
-#		Workaround for broken Form() on ppc
+#		Workaround for broken Form() on ppc:
 Patch3:		%{name}-cern-ppc.patch
-#		Fix an issue with the TGListBox height (backported from trunk)
+#		Fix an issue with the TGListBox height (backported from trunk):
 Patch4:		%{name}-listbox-height.patch
-#		Fixes for external xrootd
+#		Fixes for new xrootd (backported from trunk):
 Patch5:		%{name}-xrootd.patch
-#		Fix hardcoded include path
+#		Fix hardcoded include path:
 #		https://savannah.cern.ch/bugs/index.php?91463
 Patch6:		%{name}-meta.patch
-#		Backport fixes for using aclic with versioned libraries
+#		Backport fixes for using aclic with versioned libraries:
 Patch7:		%{name}-aclic-versioned-libs.patch
+#		Fixes for gfal (mostly backported from trunk):
+Patch8:		%{name}-gfal-bits.patch
+#		Remove unnecessary Qt linkage (backported from trunk):
+Patch9:		%{name}-qt.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
@@ -113,9 +117,6 @@ BuildRequires:	python26-devel
 %endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	qt4-devel
-%if %{?fedora}%{!?fedora:0} >= 14
-BuildRequires:	qt4-webkit-devel
-%endif
 %endif
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
@@ -127,7 +128,8 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
-BuildRequires:	xrootd-devel
+BuildRequires:	xrootd-client-devel
+BuildRequires:	xrootd-private-devel
 BuildRequires:	cfitsio-devel
 %if %{gfal}
 BuildRequires:	gfal-devel
@@ -1051,6 +1053,8 @@ fi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -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 \
@@ -1123,7 +1127,8 @@ sed s/c1/c1simp/g -i tutorials/hsimple.C
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 cp -pr bindings/pyroot bindings/pyroot26
-sed 's/python /python26 /' -i bindings/pyroot26/Module.mk
+sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
+    -i bindings/pyroot26/Module.mk
 %endif
 
 %build
@@ -1156,6 +1161,7 @@ unset QTINC
 	    --enable-fftw3 \
 	    --enable-fitsio \
 	    --enable-gdml \
+	    --enable-genvector \
 %if %{gfal}
 	    --enable-gfal \
 	      --with-gfal-incdir=%{_includedir} \
@@ -1163,7 +1169,6 @@ unset QTINC
 %else
 	    --disable-gfal \
 %endif
-	    --enable-genvector \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
@@ -2323,6 +2328,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Mar 02 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00h-3
+- Rebuild for xrootd 3.3
+- Backport gfal fixes
+
 * Fri Jun 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00h-2
 - Backport fixes for using aclic with versioned libraries
 - New sub-package: root-io-gfal

From d7c587d5ba73299b8574a86e2e20ae9605df5a04 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 23 Mar 2013 04:20:57 +0100
Subject: [PATCH 029/344] Rebuild for ruby 2.0

- Rebuild for cfitsio 3.330
---
 root-fontconfig.patch   |  3 +-
 root-ruby-version.patch | 69 +++++++++++++++++++++++++++++++++++++++++
 root.spec               | 25 +++++++++++----
 3 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 root-ruby-version.patch

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 4c333e9..56604c0 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -531,9 +531,8 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
     fgCharMap[fgCurFontIdx] = 0;
     fgFontCount++;
  
--   if (italic) {
+    if (italic) {
 -      fgSymbItaFontIdx = fgCurFontIdx;
-+   if (fontid == 15) {
        FT_Matrix slantMat;
        slantMat.xx = (1 << 16);
        slantMat.xy = ((1 << 16) >> 2);
diff --git a/root-ruby-version.patch b/root-ruby-version.patch
new file mode 100644
index 0000000..ffc8b5a
--- /dev/null
+++ b/root-ruby-version.patch
@@ -0,0 +1,69 @@
+diff -ur root-5.34.05.orig/bindings/ruby/src/drr.cxx root-5.34.05/bindings/ruby/src/drr.cxx
+--- root-5.34.05.orig/bindings/ruby/src/drr.cxx	2013-02-14 23:27:40.000000000 +0100
++++ root-5.34.05/bindings/ruby/src/drr.cxx	2013-03-22 17:06:56.516498395 +0100
+@@ -163,36 +163,6 @@
+    return arr;
+ }
+ 
+-void * rr_parse_void (VALUE o)
+-{
+-   VALUE *i;
+-
+-   switch (TYPE(o))
+-      {
+-      case T_STRING:
+-         return (void *) RSTRING_PTR(o);
+-      case T_FLOAT:
+-         return (void *) &RFLOAT_VALUE(o);
+-      case T_FIXNUM:
+-         /* FIXME: Memory leak until I find the correct way. Until
+-          * then please use integers in TTrees with care. --elathan
+-          */
+-         i = (VALUE*) malloc (sizeof(VALUE));
+-         *i = (int) (o>>1);
+-         return (void *) i;
+-      case T_OBJECT:
+-         RRGRAB(o, void *, res);
+-         return res;
+-      default:
+-         VALUE tmp = CLASS_OF(o);
+-         rb_fatal ("Failed convertion of %d to void *.\n", 
+-                   StringValuePtr(tmp));
+-         break;
+-      }
+-
+-   return (void *) NULL;
+-}
+-
+ VALUE rr_bool (Bool_t q)
+ {
+    VALUE res = Qnil;
+diff -ur root-5.34.05.orig/bindings/ruby/src/rrcommon.h root-5.34.05/bindings/ruby/src/rrcommon.h
+--- root-5.34.05.orig/bindings/ruby/src/rrcommon.h	2013-02-14 23:27:40.000000000 +0100
++++ root-5.34.05/bindings/ruby/src/rrcommon.h	2013-03-22 17:06:25.969498395 +0100
+@@ -97,8 +97,6 @@
+ VALUE rr_arrayd_new (const TArrayD *a);
+ VALUE rr_seqcollection_new (TSeqCollection *sc);
+ 
+-void * rr_parse_void (VALUE o);
+-
+ /* mod convertions */
+ void rr_tattfill_conv(void **ptr, VALUE klass);
+ void rr_tattline_conv(void **ptr, VALUE klass);
+diff -ur root-5.34.05.orig/configure root-5.34.05/configure
+--- root-5.34.05.orig/configure	2013-02-14 23:27:56.000000000 +0100
++++ root-5.34.05/configure	2013-03-22 17:05:56.299498395 +0100
+@@ -6850,9 +6850,10 @@
+ 
+ if test ! "x$enable_ruby" = "xno"; then
+    echo "" >> RConfigOptions-out.tmp
+-   ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]' | \
+-   sed 's/^\([0-9]\)\.\([0-9]\).*$/#define R__RUBY_MAJOR \1@#define R__RUBY_MINOR \2/' | \
+-   tr '@' '\n' >> RConfigOptions-out.tmp
++   RUBY_MAJOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MAJOR"]'`
++   RUBY_MINOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MINOR"]'`
++   echo "#define R__RUBY_MAJOR $RUBY_MAJOR" >> RConfigOptions-out.tmp
++   echo "#define R__RUBY_MINOR $RUBY_MINOR" >> RConfigOptions-out.tmp
+ fi
+ 
+ # only update $CONFIGOPTOUT when different
diff --git a/root.spec b/root.spec
index 766711b..4fe1b99 100644
--- a/root.spec
+++ b/root.spec
@@ -9,13 +9,17 @@
 
 %{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
-%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
+%global ruby_installdir %{ruby_vendorarchdir}
+%else
+%if %{?fedora}%{!?fedora:0} >= 17
 %global ruby_installdir %{ruby_vendorarchdir}
 %global ruby_abi 1.9.1
 %else
 %global ruby_installdir %{ruby_sitearchdir}
 %global ruby_abi 1.8
 %endif
+%endif
 
 %if %($(pkg-config emacs) ; echo $?)
 %global emacs_version 21.4
@@ -28,7 +32,7 @@
 Name:		root
 Version:	5.34.05
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -67,10 +71,12 @@ Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
 Patch7:		%{name}-no-extra-formats.patch
 #		Graphviz libgraph deprecated:
-Patch8:		%%{name}-gviz.patch
+Patch8:		%{name}-gviz.patch
+#		Don't use ruby_version - it is not portable 
+Patch9:		%{name}-ruby-version.patch
 #		Backport xrootd 3.3 support:
-Patch9:		%{name}-rev48681.patch
-Patch10:	%{name}-rev48831.patch
+Patch10:	%{name}-rev48681.patch
+Patch11:	%{name}-rev48831.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
@@ -352,7 +358,9 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
+%if %{?ruby_abi:1}%{!?ruby_abi:0}
 Requires:	ruby(abi) = %{ruby_abi}
+%endif
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -1066,8 +1074,9 @@ fi
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p0
+%patch9 -p1
 %patch10 -p0
+%patch11 -p0
 
 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 \
@@ -2328,6 +2337,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
+- Rebuild for ruby 2.0
+- Rebuild for cfitsio 3.330
+
 * Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
 - Update to 5.34.05
 - Rebuild for xrootd 3.3

From 9820501d6a042cd272a86e77bcbaa1cf53d8096f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 27 Apr 2013 15:14:01 +0200
Subject: [PATCH 030/344] Update to 5.34.06

- Drop patches root-gviz.patch, root-ruby-version.patch,
  root-rev48681.patch and root-rev48831.patch
---
 root-gfal-bits.patch    |   4 +-
 root-gviz.patch         | 116 --------
 root-rev48681.patch     | 199 -------------
 root-rev48831.patch     | 619 ----------------------------------------
 root-ruby-version.patch |  69 -----
 root.spec               |  27 +-
 sources                 |   2 +-
 7 files changed, 15 insertions(+), 1021 deletions(-)
 delete mode 100644 root-gviz.patch
 delete mode 100644 root-rev48681.patch
 delete mode 100644 root-rev48831.patch
 delete mode 100644 root-ruby-version.patch

diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
index edf424e..73df8c0 100644
--- a/root-gfal-bits.patch
+++ b/root-gfal-bits.patch
@@ -1,9 +1,9 @@
 diff -ur root-5.34.05.orig/io/gfal/Module.mk root-5.34.05/io/gfal/Module.mk
 --- root-5.34.05.orig/io/gfal/Module.mk	2013-02-14 23:27:54.000000000 +0100
 +++ root-5.34.05/io/gfal/Module.mk	2013-02-26 20:58:00.150088502 +0100
-@@ -71,3 +71,5 @@
+@@ -71,4 +71,5 @@
  $(GFALO) $(GFALDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS))
  $(GFALO): CXXFLAGS += $(GFALINCDIR:%=-I%)
  $(GFALO): CXXFLAGS += $(SRMIFCEINCDIR:%=-I%)
 +$(GFALO): CXXFLAGS += $(shell pkg-config --cflags glib-2.0)
-+$(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
+ $(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/root-gviz.patch b/root-gviz.patch
deleted file mode 100644
index 8631327..0000000
--- a/root-gviz.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ur root-5.34.05.orig/configure root-5.34.05/configure
---- root-5.34.05.orig/configure	2013-02-14 23:27:56.000000000 +0100
-+++ root-5.34.05/configure	2013-03-07 19:40:36.108220359 +0100
-@@ -3639,7 +3639,7 @@
-     gvizlib1=$found_lib
-     gvizlib1raw=$found_raw_lib
-     gvizlibir=$found_dir
--    check_library "libgraph graph" "no" "$gvizlibdir" \
-+    check_library "libgraph graph libcgraph cgraph" "no" "$gvizlibdir" \
-         $GVIZ ${GVIZ:+$GVIZ/lib/graphviz} ${GVIZ:+$GVIZ/lib} ${GVIZ:+$GVIZ/.libs} \
-         ${finkdir:+$finkdir/lib} \
-         /usr/local/lib /usr/lib
-diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphEdge.h root-5.34.05/graf2d/gviz/inc/TGraphEdge.h
---- root-5.34.05.orig/graf2d/gviz/inc/TGraphEdge.h	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/inc/TGraphEdge.h	2013-03-07 19:35:10.936220359 +0100
-@@ -20,8 +20,13 @@
- #include "TAttLine.h"
- #endif
- 
-+#if !defined(__CINT__)
-+#include <types.h>
-+#else
- struct Agraph_t;
- struct Agedge_t;
-+#endif
-+
- class  TGraphNode;
- 
- //////////////////////////////////////////////////////////////////////////
-diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphNode.h root-5.34.05/graf2d/gviz/inc/TGraphNode.h
---- root-5.34.05.orig/graf2d/gviz/inc/TGraphNode.h	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/inc/TGraphNode.h	2013-03-07 19:35:10.946220359 +0100
-@@ -28,9 +28,12 @@
- #include "TAttLine.h"
- #endif
- 
-+#if !defined(__CINT__)
-+#include <types.h>
-+#else
- struct Agraph_t;
- struct Agnode_t;
--
-+#endif
- 
- //////////////////////////////////////////////////////////////////////////
- //                                                                      //
-diff -ur root-5.34.05.orig/graf2d/gviz/inc/TGraphStruct.h root-5.34.05/graf2d/gviz/inc/TGraphStruct.h
---- root-5.34.05.orig/graf2d/gviz/inc/TGraphStruct.h	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/inc/TGraphStruct.h	2013-03-07 19:35:10.954220359 +0100
-@@ -25,7 +25,12 @@
- #include "TList.h"
- #endif
- 
-+#if !defined(__CINT__)
-+#include <types.h>
-+#else
- struct Agraph_t;
-+#endif
-+
- struct GVC_s;
- 
- //////////////////////////////////////////////////////////////////////////
-diff -ur root-5.34.05.orig/graf2d/gviz/Module.mk root-5.34.05/graf2d/gviz/Module.mk
---- root-5.34.05.orig/graf2d/gviz/Module.mk	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/Module.mk	2013-03-07 19:35:10.921220359 +0100
-@@ -68,4 +68,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--$(GVIZO): CXXFLAGS += $(GRAPHVIZINCDIR:%=-I%) $(GRAPHVIZCFLAGS)
-+$(GVIZO) $(GVIZDO): CXXFLAGS += $(GRAPHVIZINCDIR:%=-I%) $(GRAPHVIZCFLAGS)
-diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphEdge.cxx root-5.34.05/graf2d/gviz/src/TGraphEdge.cxx
---- root-5.34.05.orig/graf2d/gviz/src/TGraphEdge.cxx	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/src/TGraphEdge.cxx	2013-03-07 19:35:10.892220359 +0100
-@@ -81,7 +81,11 @@
-    if (gv) {
-       Agnode_t *n1 = fNode1->GetGVNode();
-       Agnode_t *n2 = fNode2->GetGVNode();
-+#ifdef WITH_CGRAPH
-+      fGVEdge = agedge(gv, n1, n2, NULL, 1);
-+#else
-       fGVEdge = agedge(gv, n1, n2);
-+#endif
-    } else {
-       Error("CreateGVEdge","Invalid graphviz graph");
-    }
-diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphNode.cxx root-5.34.05/graf2d/gviz/src/TGraphNode.cxx
---- root-5.34.05.orig/graf2d/gviz/src/TGraphNode.cxx	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/src/TGraphNode.cxx	2013-03-07 19:35:10.904220359 +0100
-@@ -65,7 +65,11 @@
-    // Create the GraphViz node into the GraphViz data structure gv.
- 
-    if (gv) {
-+#ifdef WITH_CGRAPH
-+      fGVNode = agnode(gv, (char *)GetName(), 1);
-+#else
-       fGVNode = agnode(gv, (char *)GetName());
-+#endif
-    } else {
-       Error("CreateGVNode","Invalid graphviz graph");
-    }
-diff -ur root-5.34.05.orig/graf2d/gviz/src/TGraphStruct.cxx root-5.34.05/graf2d/gviz/src/TGraphStruct.cxx
---- root-5.34.05.orig/graf2d/gviz/src/TGraphStruct.cxx	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/gviz/src/TGraphStruct.cxx	2013-03-07 19:35:10.913220359 +0100
-@@ -226,7 +226,11 @@
-       gvFreeLayout(fGVC,fGVGraph);
-       agclose(fGVGraph);
-    }
-+#ifdef WITH_CGRAPH
-+   fGVGraph = agopen((char*)"GVGraph", Agdirected, 0);
-+#else
-    fGVGraph = agopen((char*)"GVGraph", AGDIGRAPH);
-+#endif
- 
-    // Put the GV nodes into the GV graph
-    if (fNodes) {
diff --git a/root-rev48681.patch b/root-rev48681.patch
deleted file mode 100644
index 409ae83..0000000
--- a/root-rev48681.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Index: proof/proofd/src/XrdProofdProofServMgr.cxx
-===================================================================
---- proof/proofd/src/XrdProofdProofServMgr.cxx	(revision 48680)
-+++ proof/proofd/src/XrdProofdProofServMgr.cxx	(revision 48681)
-@@ -32,8 +32,7 @@
- #include "XrdOuc/XrdOucRash.hh"
- #include "XrdOuc/XrdOucStream.hh"
- #include "XrdSys/XrdSysPriv.hh"
--#include "XrdSut/XrdSutAux.hh"
--
-+#include "XrdSys/XrdSysPlugin.hh"
- #include "XrdProofdClient.h"
- #include "XrdProofdClientMgr.h"
- #include "XrdProofdManager.h"
-@@ -287,6 +286,8 @@
-    fCurrentSessions = 0;
- 
-    fSeqSessionN = 0;
-+   
-+   fCredsSaver = 0;
- 
-    // Defaults can be changed via 'proofservmgr'
-    fCheckFrequency = 30;
-@@ -3091,22 +3092,13 @@
-          ev[len] = 0;
-          putenv(ev);
-          TRACE(DBG, "XrdSecCREDS set");
--
--         // If 'pwd', save AFS key, if any
--         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
-+         if (fCredsSaver) {
-             XrdOucString credsdir = udir;
-             credsdir += "/.creds";
-             // Make sure the directory exists
-             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
--               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
--                  len = strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2;
--                  ev = new char[len];
--                  snprintf(ev, len, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
--                  putenv(ev);
--                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
--                  TRACE(DBG, ev);
--               } else {
--                  TRACE(DBG, "problems in saving AFS key");
-+               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
-+                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
-                }
-             } else {
-                TRACE(XERR, "unable to create creds dir: "<<credsdir);
-@@ -3114,6 +3106,7 @@
-                return -1;
-             }
-          }
-+         fclose(fenv);
-       }
-    }
- 
-@@ -3568,21 +3561,13 @@
-          PutEnv(ev, in->fOld);
-          TRACE(DBG, "XrdSecCREDS set");
- 
--         // If 'pwd', save AFS key, if any
--         if (!strncmp(p->AuthProt()->Entity.prot, "pwd", 3)) {
-+         if (fCredsSaver) {
-             XrdOucString credsdir = p->Client()->Sandbox()->Dir();
-             credsdir += "/.creds";
-             // Make sure the directory exists
-             if (!XrdProofdAux::AssertDir(credsdir.c_str(), p->Client()->UI(), fMgr->ChangeOwn())) {
--               if (SaveAFSkey(creds, credsdir.c_str(), p->Client()->UI()) == 0) {
--                  len = strlen("ROOTPROOFAFSCREDS=")+credsdir.length()+strlen("/.afs")+2;
--                  ev = new char[len];
--                  snprintf(ev, len, "ROOTPROOFAFSCREDS=%s/.afs", credsdir.c_str());
--                  fprintf(fenv, "ROOTPROOFAFSCREDS has been set\n");
--                  TRACE(DBG, ev);
--                  PutEnv(ev, in->fOld);
--               } else {
--                  TRACE(DBG, "problems in saving AFS key");
-+               if ((*fCredsSaver)(creds, credsdir.c_str(), p->Client()->UI()) != 0) {
-+                  TRACE(DBG, "problems in saving authentication creds under "<<credsdir);
-                }
-             } else {
-                TRACE(XERR, "unable to create creds dir: "<<credsdir);
-@@ -3590,6 +3575,7 @@
-                return -1;
-             }
-          }
-+         fclose(fenv);
-       }
-    }
- 
-@@ -4582,76 +4568,6 @@
-    return 0;
- }
- 
--//______________________________________________________________________________
--int XrdProofdProofServMgr::SaveAFSkey(XrdSecCredentials *c,
--                                      const char *dir, XrdProofUI ui)
--{
--   // Save the AFS key, if any, for usage in proofserv in file 'dir'/.afs .
--   // Return 0 on success, -1 on error.
--   XPDLOC(SMGR, "ProofServMgr::SaveAFSkey")
--
--   // Check file name
--   if (!dir || strlen(dir) <= 0) {
--      TRACE(XERR, "dir name undefined");
--      return -1;
--   }
--
--   // Check credentials
--   if (!c) {
--      TRACE(XERR, "credentials undefined");
--      return -1;
--   }
--   TRACE(REQ, "dir: "<<dir);
--
--   // Decode credentials
--   int lout = 0;
--   char *out = new char[c->size];
--   if (XrdSutFromHex(c->buffer, out, lout) != 0) {
--      TRACE(XERR, "problems unparsing hex string");
--      delete [] out;
--      return -1;
--   }
--
--   // Locate the key
--   char *key = out + 5;
--   if (strncmp(key, "afs:", 4)) {
--      TRACE(DBG, "string does not contain an AFS key");
--      delete [] out;
--      return 0;
--   }
--   key += 4;
--
--   // Save to file, if not existing already
--   XrdOucString fn = dir;
--   fn += "/.afs";
--   int rc = 0;
--
--   // Open the file, truncating if already existing
--   int fd = open(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
--   if (fd < 0) {
--      TRACE(XERR, "problems creating file - errno: " << errno);
--      delete [] out;
--      return -1;
--   }
--   // Write out the key
--   int lkey = lout - 9;
--   if (XrdProofdAux::Write(fd, key, lkey) != lkey) {
--      TRACE(XERR, "problems writing to file - errno: " << errno);
--      rc = -1;
--   }
--
--   // Cleanup
--   delete [] out;
--   close(fd);
--
--   // Make sure the file is owned by the user
--   if (XrdProofdAux::ChangeOwn(fn.c_str(), ui) != 0) {
--      TRACE(XERR, "can't change ownership of "<<fn);
--   }
--
--   return rc;
--}
--
- //__________________________________________________________________________
- XrdProofdProofServ *XrdProofdProofServMgr::GetActiveSession(int pid)
- {
-Index: proof/proofd/inc/XrdProofdProofServMgr.h
-===================================================================
---- proof/proofd/inc/XrdProofdProofServMgr.h	(revision 48680)
-+++ proof/proofd/inc/XrdProofdProofServMgr.h	(revision 48681)
-@@ -42,6 +42,9 @@
- #define PSMMAXCNTS  3
- #define PSMCNTOK(t) (t >= 0 && t < PSMMAXCNTS)
- 
-+// Security handle
-+typedef int (*XrdSecCredsSaver_t)(XrdSecCredentials *, const char *fn, const XrdProofUI &ui);
-+
- // Aux structure for session set env inputs
- typedef struct {
-    XrdProofdProofServ *fPS;
-@@ -161,6 +164,8 @@
- 
-    std::map<XrdProofdProtocol*,int> fDestroyTimes; // Tracks destroyed sessions
-    
-+   XrdSecCredsSaver_t fCredsSaver; // If defined, function to be used to save the credentials
-+
-    int                DoDirectiveProofServMgr(char *, XrdOucStream *, bool);
-    int                DoDirectivePutEnv(char *, XrdOucStream *, bool);
-    int                DoDirectivePutRc(char *, XrdOucStream *, bool);
-@@ -268,8 +273,6 @@
- 
-    int               SetProofServEnv(XrdProofdProtocol *p, void *in);
-    int               SetProofServEnvOld(XrdProofdProtocol *p, void *in);
--
--   int               SaveAFSkey(XrdSecCredentials *c, const char *fn, XrdProofUI ui);
-    int               SetUserEnvironment(XrdProofdProtocol *p);
- 
-    static int        SetProofServEnv(XrdProofdManager *m, XrdROOT *r);
diff --git a/root-rev48831.patch b/root-rev48831.patch
deleted file mode 100644
index 2b016c3..0000000
--- a/root-rev48831.patch
+++ /dev/null
@@ -1,619 +0,0 @@
-Index: cmake/modules/FindXROOTD.cmake
-===================================================================
---- cmake/modules/FindXROOTD.cmake	(revision 48830)
-+++ cmake/modules/FindXROOTD.cmake	(revision 48831)
-@@ -28,32 +28,37 @@
- )
- 
- if (XROOTD_INCLUDE_DIR)
--  file(STRINGS ${XROOTD_INCLUDE_DIR}/XrdVersion.hh xrdvers REGEX "^#define XrdVERSION")
-+  file(STRINGS ${XROOTD_INCLUDE_DIR}/XrdVersion.hh xrdvers REGEX "^#define XrdVERSION ")
-   string(REGEX REPLACE "#define[ ]+XrdVERSION[ ]+" "" xrdvers ${xrdvers})
-   string(REGEX REPLACE "[^v\\.]+" "" xrdversdots ${xrdvers})
-   if (${xrdversdots} STREQUAL "v..")
-     # Regular version string; parse it out
-     string(REGEX MATCH "[0-9\\.]+" xrdvers ${xrdvers})
--    string(REGEX MATCH "[0-9]" xrdversmajor ${xrdvers})
--    string(REPLACE "${xrdversmajor}." "" xrdversminor ${xrdvers})
--    string(REGEX MATCH "[0-9]" xrdversminor ${xrdversminor})
--    string(REPLACE "${xrdversmajor}.${xrdversminor}." "" xrdverspatch ${xrdvers})
--    string(REGEX MATCH "[0-9]+" xrdverspatch ${xrdverspatch})
-+    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\1" xrdversmajor ${xrdvers})
-+    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\2" xrdversminor ${xrdvers})
-+    string(REGEX REPLACE "^([^.]*)\\.(.*)\\.(.*)" "\\3" xrdverspatch ${xrdvers})
-     math(EXPR xrdversnum ${xrdversmajor}*100000000+${xrdversminor}*10000+${xrdverspatch})
-   else ()
-     # Old version string: we keep only the first numerics, i.e. the date
-     string(REGEX REPLACE "[v\"]" "" xrdvers ${xrdvers})
--    message(STATUS "Found Xrootd version ${xrdvers}")
--    string(REGEX REPLACE "[^0-9-]+" " " xrdvers ${xrdvers})
-     string(SUBSTRING ${xrdvers} 0 8 xrdversnum)
-   endif ()
-+  if ( ${xrdversnum} EQUAL 300030000 )
-+     SET(XROOTD_FOUND FALSE)
-+     message(WARNING " >>> Cannot build with XRootD version 3.3.0: please install >=3.3.1 or <= 3.2.x")
-+  else()
-+     SET(XROOTD_FOUND TRUE)
-+  endif ()
-+endif()
-+
-+if(XROOTD_FOUND)
-   # This we used as a compiler macro variable
-   if(NOT XROOTD_FIND_QUIETLY )
--    message(STATUS "Found Xrootd version num: ${xrdvers}")
-+    message(STATUS "Found Xrootd version num: ${xrdvers} (setting -DROOTXRDVERS=${xrdversnum})")
-   endif()
-   SET(XROOTD_CFLAGS "-DROOTXRDVERS=${xrdversnum}")
- 
--  if ( ${xrdversnum} LESS 300010000 )
-+  if ( ${xrdversnum} LESS 300010000 AND ${xrdversnum} LESS 20111022)
-      SET(XROOTD_OLDPACK TRUE)
-      message(STATUS "Setting OLDPACK TRUE")
-   else()
-@@ -72,14 +77,16 @@
-         XrdOuc/XrdOucPthread.hh
-         XrdOuc/XrdOucSemWait.hh
-         XrdOuc/XrdOucTimer.hh
-+        PATHS 
-         ${XROOTD_INCLUDE_DIR}
-      )
-   else()
--     if ( ${xrdversnum} LESS 300010000 )
-+     if ( ${xrdversnum} LESS 300010000 AND ${xrdversnum} LESS 20111022)
-         # DNS stuff was under XrdNet
-         find_path(XROOTD_INCLUDE_DIR
-            NAMES
-            XrdNet/XrdNetDNS.hh
-+           PATHS 
-            ${XROOTD_INCLUDE_DIR}
-         )
-      else ()
-@@ -87,6 +94,7 @@
-         find_path(XROOTD_INCLUDE_DIR
-            NAMES
-            XrdSys/XrdSysDNS.hh
-+           PATHS 
-            ${XROOTD_INCLUDE_DIR}
-         )
-      endif ()
-@@ -101,9 +109,20 @@
-             XrdSys/XrdSysPthread.hh
-             XrdSys/XrdSysSemWait.hh
-             XrdSys/XrdSysTimer.hh
-+            PATHS 
-             ${XROOTD_INCLUDE_DIR}
-         )
-      endif()
-+     
-+     if (XROOTD_INCLUDE_DIR)
-+        # Check for additional headers in new directories
-+        find_path(XROOTD_PRIVATE_INCLUDE_DIR
-+            NAMES
-+            XrdSys/XrdSysPriv.hh
-+            PATHS 
-+            ${XROOTD_INCLUDE_DIR}/private
-+        )
-+     endif()
-   endif()
-   if (XROOTD_INCLUDE_DIR)
-      SET(XROOTD_FOUND TRUE)
-@@ -152,7 +171,7 @@
-   if(XROOTD_LIBRARIES)
-     set(XROOTD_FOUND TRUE)
-     if(NOT XROOTD_FIND_QUIETLY )
--      message(STATUS "             include_dir: ${XROOTD_INCLUDE_DIR}")
-+      message(STATUS "             include_dir: ${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR}")
-       message(STATUS "             libraries: ${XROOTD_LIBRARIES}")
-     endif() 
-   else ()
-@@ -160,7 +179,8 @@
-   endif ()
- endif()
- 
--mark_as_advanced(XROOTD_INCLUDE_DIR 
-+mark_as_advanced(XROOTD_INCLUDE_DIR
-+                 XROOTD_PRIVATE_INCLUDE_DIR
-                  XROOTD_XrdMain_LIBRARY
-                  XROOTD_XrdUtils_LIBRARY
-                  XROOTD_XrdClient_LIBRARY
-Index: configure
-===================================================================
---- configure	(revision 48830)
-+++ configure	(revision 48831)
-@@ -4577,9 +4577,16 @@
- 	 fi
-       fi
-    fi
--   echo "$xrdver"
-+   # Protect against 3.3.0, first version with 'include/xrootd/private'
-+   if [ $decver -eq 300030000 ] ; then
-+      echo "Cannot build against version $xrdver (missing headers)"
-+      enable_xrootd="no"
-+   else
-+      echo "$xrdver"
-+   fi
- fi
- 
-+xrdincprivate="no"
- if test "x$enable_xrootd" = "xyes" ; then
- 
-    extraxrdflags="-DROOTXRDVERS=$decver"
-@@ -4635,6 +4642,15 @@
-    fi
- 
-    #
-+   # Check also if 'include/private' exists: we need to signal this to the build modules
-+   # for correct location of some headers available form the dlevel packages for version >= 3.3.x
-+   if test "x$enable_xrootd" = "xyes"; then
-+      if test -d "$xrdincdir/private"; then
-+         xrdincprivate="yes"
-+      fi
-+   fi
-+
-+   #
-    # Check if bonjour is available for code potentially using it ...
-    if test "x$enable_xrootd" = "xyes"; then
-       xrdlibdir="$tmpxrdlibdir"
-@@ -6730,6 +6746,7 @@
-     -e "s|@xpmlibdir@|$xpmlibdir|"              \
-     -e "s|@xrdlibdir@|$xrdlibdir|"              \
-     -e "s|@xrdincdir@|$xrdincdir|"              \
-+    -e "s|@xrdincprivate@|$xrdincprivate|"      \
-     -e "s|@xrdversion@|$decver|"                \
-     -e "s|@hasxrdutils@|$hasxrdutils|"          \
-     -e "s|@cfitsioincdir@|$cfitsioincdir|"      \
-Index: proof/proofd/src/XrdProofConn.cxx
-===================================================================
---- proof/proofd/src/XrdProofConn.cxx	(revision 48830)
-+++ proof/proofd/src/XrdProofConn.cxx	(revision 48831)
-@@ -32,7 +32,6 @@
- 
- #include "XrdClient/XrdClientConnMgr.hh"
- #include "XrdClient/XrdClientConst.hh"
--#include "XrdClient/XrdClientDebug.hh"
- #include "XrdClient/XrdClientEnv.hh"
- #include "XrdClient/XrdClientLogConnection.hh"
- #include "XrdClient/XrdClientPhyConnection.hh"
-@@ -41,6 +40,7 @@
- #include "XrdOuc/XrdOucErrInfo.hh"
- #include "XrdOuc/XrdOucString.hh"
- #include "XrdSec/XrdSecInterface.hh"
-+#include "XrdSys/XrdSysLogger.hh"
- #include "XrdSys/XrdSysPlatform.hh"
- 
- // Dynamic libs
-Index: proof/proofd/src/XpdObject.cxx
-===================================================================
---- proof/proofd/src/XpdObject.cxx	(revision 0)
-+++ proof/proofd/src/XpdObject.cxx	(revision 48831)
-@@ -0,0 +1,125 @@
-+// @(#)root/proofd:$Id$
-+// Author: Gerardo Ganis  Feb 2013
-+
-+/*************************************************************************
-+ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
-+ * All rights reserved.                                                  *
-+ *                                                                       *
-+ * For the licensing terms see $ROOTSYS/LICENSE.                         *
-+ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-+ *************************************************************************/
-+
-+//////////////////////////////////////////////////////////////////////////
-+//                                                                      //
-+// XpdObject                                                            //
-+//                                                                      //
-+// Authors: G. Ganis, CERN, 2013                                        //
-+//                                                                      //
-+// Auxilliary class to stack protocols.                                 //
-+//                                                                      //
-+//////////////////////////////////////////////////////////////////////////
-+
-+#include "XpdObject.h"
-+#include "XrdProofdAux.h"
-+#include "XrdProofdProtocol.h"
-+#include "Xrd/XrdScheduler.hh"
-+#include "XrdOuc/XrdOucTrace.hh"
-+
-+//_______________________________________________________________________
-+XrdProofdProtocol *XpdObjectQ::Pop()
-+{
-+   // Pop up a protocol object 
-+
-+   XpdObject *node;
-+   fQMutex.Lock();
-+   if ((node = fFirst)) {
-+      fFirst = fFirst->fNext;
-+      fCount--;
-+   }
-+   fQMutex.UnLock();
-+   if (node) return node->fItem;
-+   return (XrdProofdProtocol *)0;
-+}
-+
-+//_______________________________________________________________________
-+void XpdObjectQ::Push(XpdObject *node)
-+{
-+   // Push back a protocol
-+
-+   node->fQTime = fCurage;
-+   fQMutex.Lock();
-+   if (fCount >= fMaxinQ) {
-+      delete node->fItem;
-+   } else {
-+      node->fNext = fFirst;
-+      fFirst = node;
-+      fCount++;
-+   }
-+   fQMutex.UnLock();
-+}
-+
-+//_______________________________________________________________________
-+void XpdObjectQ::Set(int inQMax, time_t agemax)
-+{
-+   // Lock the data area and set the values
-+
-+   fQMutex.Lock();
-+   fMaxinQ = inQMax; fMaxage = agemax;
-+   if (!(fMininQ = inQMax/2)) fMininQ = 1;
-+   fQMutex.UnLock();
-+
-+   // Schedule ourselves using the new values
-+   if (agemax > 0)
-+      fSched->Schedule((XrdJob *)this, agemax + time(0));
-+}
-+
-+//_______________________________________________________________________
-+void XpdObjectQ::DoIt()
-+{
-+   // Process method
-+
-+   XpdObject *pp, *p;
-+   int oldcnt, agemax;
-+
-+   // Lock the anchor and see if we met the threshold for deletion
-+   //
-+   fQMutex.Lock();
-+   agemax = fMaxage;
-+   if ((oldcnt = fCount) > fMininQ) {
-+
-+      // Prepare to scan down the queue.
-+      if ((pp = fFirst)) {
-+         p = pp->fNext;
-+      } else { p = 0; }
-+
-+      // Find the first object that's been idle for too long
-+      while(p && (p->fQTime >= fCurage)) { pp = p; p = p->fNext;}
-+
-+      // Now delete half of the idle objects. The object queue element must be
-+      // part of the actual object being deleted for this to properly work.
-+      if (pp) {
-+         while (p) {
-+            pp->fNext = p->fNext;
-+            delete p->fItem;
-+            fCount--;
-+            p = ((pp = pp->fNext) ? pp->fNext : 0);
-+         }
-+      }
-+   }
-+
-+   // Increase the age and unlock the queue
-+   fCurage++;
-+   fQMutex.UnLock();
-+
-+   // Trace as needed
-+   if (fTraceON && fTrace->Tracing(fTraceON))
-+      {fTrace->Beg(fTraceID);
-+       cerr <<Comment <<" trim done; " <<fCount <<" of " <<oldcnt <<" kept";
-+       fTrace->End();
-+      }
-+
-+   // Reschedule ourselves if we must do so
-+   if (agemax > 0)
-+      fSched->Schedule((XrdJob *)this, agemax+time(0));
-+}
-+
-
-Egenskapsändringar för: proof/proofd/src/XpdObject.cxx
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+LF
-\ No newline at end of property
-Added: svn:keywords
-## -0,0 +1 ##
-+Id
-\ No newline at end of property
-Index: proof/proofd/src/XrdProofdProtocol.cxx
-===================================================================
---- proof/proofd/src/XrdProofdProtocol.cxx	(revision 48830)
-+++ proof/proofd/src/XrdProofdProtocol.cxx	(revision 48831)
-@@ -29,6 +29,7 @@
- 
- #include "XrdVersion.hh"
- #include "Xrd/XrdBuffer.hh"
-+#include "Xrd/XrdScheduler.hh"
- 
- #include "XrdProofdClient.h"
- #include "XrdProofdClientMgr.h"
-@@ -54,8 +55,7 @@
- //
- // Static area: general protocol managing section
- int                   XrdProofdProtocol::fgCount    = 0;
--XrdObjectQ<XrdProofdProtocol>
--                      XrdProofdProtocol::fgProtStack("ProtStack",
-+XpdObjectQ            XrdProofdProtocol::fgProtStack("ProtStack",
-                                                      "xproofd protocol anchor");
- XrdSysRecMutex        XrdProofdProtocol::fgBMutex;    // Buffer management mutex
- XrdBuffManager       *XrdProofdProtocol::fgBPool    = 0;
-@@ -542,8 +542,12 @@
-    // Schedule protocol object cleanup; the maximum number of objects
-    // and the max age are taken from XrdXrootdProtocol: this may need
-    // some optimization in the future.
-+#if 1
-    fgProtStack.Set(pi->Sched, XrdProofdTrace, TRACE_MEM);
-    fgProtStack.Set((pi->ConnMax/3 ? pi->ConnMax/3 : 30), 60*60);
-+#else
-+   fgProtStack.Set(pi->Sched, 3600);
-+#endif
- 
-    // Default tracing options: always trace logins and errors for all
-    // domains; if the '-d' option was specified on the command line then
-@@ -789,6 +793,13 @@
- 
-    // Push ourselves on the stack
-    fgProtStack.Push(&fProtLink);
-+#if 0
-+   if(fgProtStack.Push(&fProtLink) != 0) {
-+      XrdProofdProtocol *xp = fProtLink.objectItem();
-+      fProtLink.setItem(0);
-+      delete xp;
-+   }
-+#endif
- }
- 
- //______________________________________________________________________________
-Index: proof/proofd/inc/XrdProofdProtocol.h
-===================================================================
---- proof/proofd/inc/XrdProofdProtocol.h	(revision 48830)
-+++ proof/proofd/inc/XrdProofdProtocol.h	(revision 48831)
-@@ -38,10 +38,10 @@
- #include "XpdSysPthread.h"
- 
- #include "Xrd/XrdLink.hh"
--#include "Xrd/XrdObject.hh"
- #include "Xrd/XrdProtocol.hh"
- #include "XrdOuc/XrdOucString.hh"
- #include "XrdSec/XrdSecInterface.hh"
-+#include "XpdObject.h"
- #include "XProofProtocol.h"
- 
- class XrdBuffer;
-@@ -131,7 +131,7 @@
-    //
-    // Protocol variables
- 
--   XrdObject<XrdProofdProtocol>  fProtLink;
-+   XpdObject                     fProtLink;
-    XrdBuffer                    *fArgp;
- 
-    XrdLink                      *fLink;
-@@ -176,7 +176,7 @@
-    //
-    static bool                   fgConfigDone;
-    static int                    fgCount;
--   static XrdObjectQ<XrdProofdProtocol> fgProtStack;
-+   static XpdObjectQ             fgProtStack;
-    static XrdBuffManager        *fgBPool;        // Buffer manager
-    static int                    fgMaxBuffsz;    // Maximum buffer size we can have
-    static XrdSysRecMutex         fgBMutex;       // Buffer management mutex
-Index: proof/proofd/inc/XpdObject.h
-===================================================================
---- proof/proofd/inc/XpdObject.h	(revision 0)
-+++ proof/proofd/inc/XpdObject.h	(revision 48831)
-@@ -0,0 +1,100 @@
-+// @(#)root/proofd:$Id$
-+// Author: Gerardo Ganis  Feb 2013
-+
-+/*************************************************************************
-+ * Copyright (C) 1995-2005, Rene Brun and Fons Rademakers.               *
-+ * All rights reserved.                                                  *
-+ *                                                                       *
-+ * For the licensing terms see $ROOTSYS/LICENSE.                         *
-+ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-+ *************************************************************************/
-+
-+//////////////////////////////////////////////////////////////////////////
-+//                                                                      //
-+// XpdObject                                                            //
-+//                                                                      //
-+// Authors: G. Ganis, CERN, 2013                                        //
-+//                                                                      //
-+// Auxilliary class to stack protocols.                                 //
-+// Adapted version of XrdObject.                                        //
-+//                                                                      //
-+//////////////////////////////////////////////////////////////////////////
-+
-+#ifndef ROOT_XpdObject
-+#define ROOT_XpdObject
-+
-+#include <string.h>
-+#include <strings.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include "Xrd/XrdJob.hh"
-+#include "XrdOuc/XrdOucTrace.hh"
-+#include "XrdSys/XrdSysPthread.hh"
-+
-+class XpdObjectQ;
-+class XrdProofdProtocol;
-+class XrdScheduler;
-+  
-+class XpdObject {
-+public:
-+   friend class XpdObjectQ;
-+
-+   // Item() supplies the item value associated with itself (used with Next()).
-+   XrdProofdProtocol  *objectItem() { return fItem; }
-+
-+   // Next() supplies the next list node.
-+   XpdObject          *nextObject() { return fNext; }
-+
-+   // Set the item pointer
-+   void                setItem(XrdProofdProtocol *ival) { fItem = ival; }
-+
-+   XpdObject(XrdProofdProtocol *ival=0) { fNext = 0; fItem = ival; fQTime = 0; }
-+   ~XpdObject() {}
-+
-+private:
-+   XpdObject         *fNext;
-+   XrdProofdProtocol *fItem;
-+   time_t             fQTime;  // Only used for time-managed objects
-+};
-+
-+/******************************************************************************/
-+/*                           x r d _ O b j e c t Q                            */
-+/******************************************************************************/
-+  
-+// Note to properly cleanup this type of queue you must call Set() at least
-+// once to cause the time element to be sceduled.
-+
-+class XrdOucTrace;
-+  
-+class XpdObjectQ : public XrdJob {
-+public:
-+
-+   XrdProofdProtocol *Pop();
-+   void Push(XpdObject *Node);
-+   void Set(int inQMax, time_t agemax=1800);
-+   void Set(XrdScheduler *sp, XrdOucTrace *tp, int traceChk = 0)
-+            {fSched = sp; fTrace = tp; fTraceON = traceChk;}
-+   void DoIt();
-+
-+   XpdObjectQ(const char *id, const char *desc) : XrdJob(desc) 
-+          {fCurage = fCount = 0; fMaxage = 0; fTraceID = id;
-+           fMaxinQ = 32; fMininQ = 16; fFirst = 0; }
-+
-+   ~XpdObjectQ() {}
-+
-+private:
-+
-+   XrdSysMutex    fQMutex;
-+   XpdObject     *fFirst;
-+   int            fCount;
-+   int            fCurage;
-+   int            fMininQ;
-+   int            fMaxinQ;
-+   time_t         fMaxage;
-+   XrdOucTrace   *fTrace;
-+   XrdScheduler  *fSched;
-+   int            fTraceON;
-+   const char    *fTraceID;
-+};
-+
-+#endif
-
-Egenskapsändringar för: proof/proofd/inc/XpdObject.h
-___________________________________________________________________
-Added: svn:keywords
-## -0,0 +1 ##
-+Id
-\ No newline at end of property
-Added: svn:eol-style
-## -0,0 +1 ##
-+LF
-\ No newline at end of property
-Index: proof/proofd/Module.mk
-===================================================================
---- proof/proofd/Module.mk	(revision 48830)
-+++ proof/proofd/Module.mk	(revision 48831)
-@@ -127,7 +127,11 @@
- ifeq ($(HASXRD),yes)
- XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
- XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
-+ifeq ($(XRDINCPRIVATE),yes)
-+XPDINCEXTRA    += -I$(XRDINCDIR)/private
-+endif
- 
-+
- ifeq ($(HASXRDUTILS),no)
- 
- XPDLIBEXTRA    += $(XROOTDDIRL) -lXrdClient -lXrdNet -lXrdOuc \
-Index: proof/proofd/CMakeLists.txt
-===================================================================
---- proof/proofd/CMakeLists.txt	(revision 48830)
-+++ proof/proofd/CMakeLists.txt	(revision 48831)
-@@ -7,7 +7,7 @@
- ROOT_USE_PACKAGE(net/rpdutils)
- ROOT_USE_PACKAGE(net/auth)
- 
--include_directories(${XROOTD_INCLUDE_DIR})
-+include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
- add_definitions(${XROOTD_CFLAGS})
- 
- if(WIN32)
-Index: proof/proofx/Module.mk
-===================================================================
---- proof/proofx/Module.mk	(revision 48830)
-+++ proof/proofx/Module.mk	(revision 48831)
-@@ -63,6 +63,9 @@
- PROOFXINCEXTRA := $(PROOFXDIRI:%=-I%)
- PROOFXINCEXTRA += $(XROOTDDIRI:%=-I%)
- PROOFXINCEXTRA += $(PROOFDDIRI:%=-I%)
-+ifeq ($(XRDINCPRIVATE),yes)
-+PROOFXINCEXTRA += -I$(XRDINCDIR)/private
-+endif
- 
- # Xrootd client libs
- ifeq ($(PLATFORM),win32)
-Index: proof/proofx/CMakeLists.txt
-===================================================================
---- proof/proofx/CMakeLists.txt	(revision 48830)
-+++ proof/proofx/CMakeLists.txt	(revision 48831)
-@@ -16,7 +16,7 @@
-   ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
- endif()
- 
--include_directories(${XROOTD_INCLUDE_DIR})
-+include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
- link_directories(${XROOTD_LIBRARY_DIR})
- add_definitions(${XROOTD_CFLAGS})
- 
-Index: net/netx/Module.mk
-===================================================================
---- net/netx/Module.mk	(revision 48830)
-+++ net/netx/Module.mk	(revision 48831)
-@@ -55,6 +55,9 @@
- ifneq ($(EXTRA_XRDFLAGS),)
- NETXINCEXTRA += -I$(ROOT_SRCDIR)/proof/proofd/inc
- endif
-+ifeq ($(XRDINCPRIVATE),yes)
-+NETXINCEXTRA += -I$(XRDINCDIR)/private
-+endif
- 
- # Xrootd client libs
- ifeq ($(PLATFORM),win32)
-Index: net/netx/CMakeLists.txt
-===================================================================
---- net/netx/CMakeLists.txt	(revision 48830)
-+++ net/netx/CMakeLists.txt	(revision 48831)
-@@ -6,7 +6,7 @@
- ROOT_USE_PACKAGE(net/net)
- ROOT_USE_PACKAGE(proof/proofd)
- 
--include_directories(${XROOTD_INCLUDE_DIR})
-+include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
- add_definitions(${XROOTD_CFLAGS})
- #---------------------------------------------------------------------------
- 
-Index: config/Makefile.in
-===================================================================
---- config/Makefile.in	(revision 48830)
-+++ config/Makefile.in	(revision 48831)
-@@ -255,6 +255,7 @@
- EXTRA_XRDFLAGS := @extraxrdflags@
- XRDVERSION     := @xrdversion@
- HASXRDUTILS    := @hasxrdutils@
-+XRDINCPRIVATE  := @xrdincprivate@
- 
- SRPLIBDIR      := @srplibdir@
- SRPLIB         := @srplib@
diff --git a/root-ruby-version.patch b/root-ruby-version.patch
deleted file mode 100644
index ffc8b5a..0000000
--- a/root-ruby-version.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur root-5.34.05.orig/bindings/ruby/src/drr.cxx root-5.34.05/bindings/ruby/src/drr.cxx
---- root-5.34.05.orig/bindings/ruby/src/drr.cxx	2013-02-14 23:27:40.000000000 +0100
-+++ root-5.34.05/bindings/ruby/src/drr.cxx	2013-03-22 17:06:56.516498395 +0100
-@@ -163,36 +163,6 @@
-    return arr;
- }
- 
--void * rr_parse_void (VALUE o)
--{
--   VALUE *i;
--
--   switch (TYPE(o))
--      {
--      case T_STRING:
--         return (void *) RSTRING_PTR(o);
--      case T_FLOAT:
--         return (void *) &RFLOAT_VALUE(o);
--      case T_FIXNUM:
--         /* FIXME: Memory leak until I find the correct way. Until
--          * then please use integers in TTrees with care. --elathan
--          */
--         i = (VALUE*) malloc (sizeof(VALUE));
--         *i = (int) (o>>1);
--         return (void *) i;
--      case T_OBJECT:
--         RRGRAB(o, void *, res);
--         return res;
--      default:
--         VALUE tmp = CLASS_OF(o);
--         rb_fatal ("Failed convertion of %d to void *.\n", 
--                   StringValuePtr(tmp));
--         break;
--      }
--
--   return (void *) NULL;
--}
--
- VALUE rr_bool (Bool_t q)
- {
-    VALUE res = Qnil;
-diff -ur root-5.34.05.orig/bindings/ruby/src/rrcommon.h root-5.34.05/bindings/ruby/src/rrcommon.h
---- root-5.34.05.orig/bindings/ruby/src/rrcommon.h	2013-02-14 23:27:40.000000000 +0100
-+++ root-5.34.05/bindings/ruby/src/rrcommon.h	2013-03-22 17:06:25.969498395 +0100
-@@ -97,8 +97,6 @@
- VALUE rr_arrayd_new (const TArrayD *a);
- VALUE rr_seqcollection_new (TSeqCollection *sc);
- 
--void * rr_parse_void (VALUE o);
--
- /* mod convertions */
- void rr_tattfill_conv(void **ptr, VALUE klass);
- void rr_tattline_conv(void **ptr, VALUE klass);
-diff -ur root-5.34.05.orig/configure root-5.34.05/configure
---- root-5.34.05.orig/configure	2013-02-14 23:27:56.000000000 +0100
-+++ root-5.34.05/configure	2013-03-22 17:05:56.299498395 +0100
-@@ -6850,9 +6850,10 @@
- 
- if test ! "x$enable_ruby" = "xno"; then
-    echo "" >> RConfigOptions-out.tmp
--   ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]' | \
--   sed 's/^\([0-9]\)\.\([0-9]\).*$/#define R__RUBY_MAJOR \1@#define R__RUBY_MINOR \2/' | \
--   tr '@' '\n' >> RConfigOptions-out.tmp
-+   RUBY_MAJOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MAJOR"]'`
-+   RUBY_MINOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MINOR"]'`
-+   echo "#define R__RUBY_MAJOR $RUBY_MAJOR" >> RConfigOptions-out.tmp
-+   echo "#define R__RUBY_MINOR $RUBY_MINOR" >> RConfigOptions-out.tmp
- fi
- 
- # only update $CONFIGOPTOUT when different
diff --git a/root.spec b/root.spec
index 4fe1b99..fc869dc 100644
--- a/root.spec
+++ b/root.spec
@@ -30,9 +30,9 @@
 %endif
 
 Name:		root
-Version:	5.34.05
+Version:	5.34.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -70,13 +70,6 @@ Patch5:		%{name}-gfal-bits.patch
 Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
 Patch7:		%{name}-no-extra-formats.patch
-#		Graphviz libgraph deprecated:
-Patch8:		%{name}-gviz.patch
-#		Don't use ruby_version - it is not portable 
-Patch9:		%{name}-ruby-version.patch
-#		Backport xrootd 3.3 support:
-Patch10:	%{name}-rev48681.patch
-Patch11:	%{name}-rev48831.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
@@ -1073,10 +1066,10 @@ fi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p0
-%patch11 -p0
+#%patch8 -p1
+#%patch9 -p1
+#%patch10 -p0
+#%patch11 -p0
 
 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 \
@@ -2196,8 +2189,7 @@ fi
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
 %{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
 %{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
-%{_datadir}/%{name}/plugins/TFile/P130_TAS3File.C
-%{_datadir}/%{name}/plugins/TFile/P140_TGSFile.C
+%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
 %{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
@@ -2337,6 +2329,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
+- Update to 5.34.06
+- Drop patches root-gviz.patch, root-ruby-version.patch,
+  root-rev48681.patch and root-rev48831.patch
+
 * Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
 - Rebuild for ruby 2.0
 - Rebuild for cfitsio 3.330
diff --git a/sources b/sources
index b0b813c..e1416ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dd415d539f5bb8ec21c9f49b2f9c5fd  root-5.34.05.tar.gz
+16c6a60c4a5361cf7ee6dfa4598dd3e8  root-5.34.06.tar.gz

From 09aa067334e72f2a94753b7af90b8b6ffa1078e0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 27 Apr 2013 20:42:11 +0200
Subject: [PATCH 031/344] Update to 5.34.07

---
 root.spec | 9 ++++-----
 sources   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/root.spec b/root.spec
index fc869dc..dc73661 100644
--- a/root.spec
+++ b/root.spec
@@ -30,7 +30,7 @@
 %endif
 
 Name:		root
-Version:	5.34.06
+Version:	5.34.07
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -1066,10 +1066,6 @@ fi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p0
-#%patch11 -p0
 
 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 \
@@ -2329,6 +2325,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
+- Update to 5.34.07
+
 * Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
 - Update to 5.34.06
 - Drop patches root-gviz.patch, root-ruby-version.patch,
diff --git a/sources b/sources
index e1416ca..c5fddbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16c6a60c4a5361cf7ee6dfa4598dd3e8  root-5.34.06.tar.gz
+6fda5e6b48dadf4eda1498cdfa3d8637  root-5.34.07.tar.gz

From 5546392862f1e703499657afa1fec7b0cb345dc4 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 28 Jun 2013 06:29:03 +0200
Subject: [PATCH 032/344] Disable gfal support for EPEL 5 ppc

---
 root.spec | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/root.spec b/root.spec
index dc73661..cb3d355 100644
--- a/root.spec
+++ b/root.spec
@@ -7,6 +7,16 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
+%if "%{?rhel}" == "5"
+%ifarch ppc
+%global gfal 0
+%else
+%global gfal 1
+%endif
+%else
+%global gfal 1
+%endif
+
 %{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
@@ -129,8 +139,10 @@ BuildRequires:	dpm-devel
 BuildRequires:	xrootd-client-devel
 BuildRequires:	xrootd-private-devel
 BuildRequires:	cfitsio-devel
+%if %{gfal}
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
+%endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
@@ -608,12 +620,14 @@ Group:		Applications/Engineering
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
+%if %{gfal}
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
 Group:		Applications/Engineering
 
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
+%endif
 
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
@@ -1173,9 +1187,13 @@ unset QTINC
 	    --enable-fitsio \
 	    --enable-gdml \
 	    --enable-genvector \
+%if %{gfal}
 	    --enable-gfal \
 	      --with-gfal-incdir=%{_includedir} \
 	      --with-gfal-libdir=%{_libdir} \
+%else
+	    --disable-gfal \
+%endif
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
@@ -1382,6 +1400,9 @@ rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
+%if "%{gfal}" == "0"
+rm TFile/P050_TGFALFile.C
+%endif
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
 rm TFile/P110_THDFSFile.C
@@ -1618,8 +1639,10 @@ fi
 %postun io -p /sbin/ldconfig
 %post io-dcache -p /sbin/ldconfig
 %postun io-dcache -p /sbin/ldconfig
+%if %{gfal}
 %post io-gfal -p /sbin/ldconfig
 %postun io-gfal -p /sbin/ldconfig
+%endif
 %post io-rfio -p /sbin/ldconfig
 %postun io-rfio -p /sbin/ldconfig
 %post io-sql -p /sbin/ldconfig
@@ -2049,10 +2072,12 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
+%if %{gfal}
 %files io-gfal -f includelist-io-gfal
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libGFAL.*
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+%endif
 
 %files io-rfio -f includelist-io-rfio
 %defattr(-,root,root,-)

From 4bec959a0d4fec25aaf563622ec0501abf388e22 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 28 Jun 2013 08:21:44 +0200
Subject: [PATCH 033/344] Update to 5.34.09

- New sub-package: root-montecarlo-pythia8
- Drop patch root-gfal-bits.patch
- Use xz compression for source tarfile
- Update ancient root version in EPEL
---
 .gitignore           |  1 +
 root-doc-latex.patch | 66 ++++++++++++++++++++++++++++++++++++
 root-gfal-bits.patch |  9 -----
 root.spec            | 79 +++++++++++++++++++++++++++++++++++++++-----
 sources              |  2 +-
 5 files changed, 138 insertions(+), 19 deletions(-)
 create mode 100644 root-doc-latex.patch
 delete mode 100644 root-gfal-bits.patch

diff --git a/.gitignore b/.gitignore
index f6a3a77..5c35620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /*.tar.gz
+/*.tar.xz
diff --git a/root-doc-latex.patch b/root-doc-latex.patch
new file mode 100644
index 0000000..c3150a0
--- /dev/null
+++ b/root-doc-latex.patch
@@ -0,0 +1,66 @@
+diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/src/TEfficiency.cxx
+--- root-5.34.09.orig/hist/hist/src/TEfficiency.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/hist/hist/src/TEfficiency.cxx	2013-06-27 07:06:03.769693346 +0200
+@@ -2498,7 +2498,7 @@
+    //the same process.
+    //
+    //The new weight is set according to:
+-   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex 
++   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex 
+    
+    if(!pList->IsEmpty()) {   
+       TIter next(pList);
+@@ -2558,7 +2558,7 @@
+    //calculates a new weight:
+    //current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex
+    //weight of rhs = Begin_Latex w_{2} End_Latex
+-   //Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex
++   //Begin_Latex w_{new} = #frac{w_{1} #times w_{2}}{w_{1} + w_{2}}End_Latex
+    
+ 
+    if (fTotalHistogram == 0 && fPassedHistogram == 0) { 
+@@ -2971,11 +2971,11 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaAlpha(Double_t alpha)
+ {
+-   //sets the shape parameter Begin_Latex \alpha End_Latex
++   //sets the shape parameter Begin_Latex #alpha End_Latex
+    //
+    //The prior probability of the efficiency is given by the beta distribution:
+    //Begin_Latex
+-   // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++   // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+    //End_Latex
+    //
+    //Note: - both shape parameters have to be positive (i.e. > 0)
+@@ -2989,11 +2989,11 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaBeta(Double_t beta)
+ {   
+-   //sets the shape parameter Begin_Latex \beta End_Latex
++   //sets the shape parameter Begin_Latex #beta End_Latex
+    //
+    //The prior probability of the efficiency is given by the beta distribution:
+    //Begin_Latex
+-   // f(\varepsilon;\alpha,\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++   // f(#varepsilon;#alpha,#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+    //End_Latex
+    //
+    //Note: - both shape parameters have to be positive (i.e. > 0)
+@@ -3007,12 +3007,12 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
+ {
+-   //sets different  shape parameter Begin_Latex \alpha and \beta End_Latex
+-   // for the prior distribution for each bin. By default the global parameter are used if they are not set 
+-   // for the specific bin 
++   //sets different shape parameter Begin_Latex #alpha and #beta End_Latex
++   //for the prior distribution for each bin. By default the global parameter are used if they are not set 
++   //for the specific bin 
+    //The prior probability of the efficiency is given by the beta distribution:
+    //Begin_Latex
+-   // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++   // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+    //End_Latex
+    //
+    //Note: - both shape parameters have to be positive (i.e. > 0)
diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
deleted file mode 100644
index 73df8c0..0000000
--- a/root-gfal-bits.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur root-5.34.05.orig/io/gfal/Module.mk root-5.34.05/io/gfal/Module.mk
---- root-5.34.05.orig/io/gfal/Module.mk	2013-02-14 23:27:54.000000000 +0100
-+++ root-5.34.05/io/gfal/Module.mk	2013-02-26 20:58:00.150088502 +0100
-@@ -71,4 +71,5 @@
- $(GFALO) $(GFALDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS))
- $(GFALO): CXXFLAGS += $(GFALINCDIR:%=-I%)
- $(GFALO): CXXFLAGS += $(SRMIFCEINCDIR:%=-I%)
-+$(GFALO): CXXFLAGS += $(shell pkg-config --cflags glib-2.0)
- $(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/root.spec b/root.spec
index cb3d355..525b975 100644
--- a/root.spec
+++ b/root.spec
@@ -40,7 +40,7 @@
 %endif
 
 Name:		root
-Version:	5.34.07
+Version:	5.34.09
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -53,8 +53,8 @@ URL:		http://root.cern.ch/
 #		tar -z -x -f root_v%{version}.source.tar.gz
 #		rm -rf root/fonts
 #		mv root root-%{version}
-#		tar -z -c -f root-%{version}.tar.gz root-%{version}
-Source0:	%{name}-%{version}.tar.gz
+#		tar -J -c -f root-%{version}.tar.xz root-%{version}
+Source0:	%{name}-%{version}.tar.xz
 #		Script to extract the list of include files in a subpackage
 Source1:	root-includelist
 #		Documentation generation script
@@ -74,8 +74,8 @@ Patch3:		%{name}-xrootd.patch
 #		Fix hardcoded include path:
 #		https://savannah.cern.ch/bugs/index.php?91463
 Patch4:		%{name}-meta.patch
-#		Missing include path:
-Patch5:		%{name}-gfal-bits.patch
+#		Use TLatex in doc generation:
+Patch5:		%{name}-doc-latex.patch
 #		Revert THtml change:
 Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
@@ -151,6 +151,9 @@ BuildRequires:	graphviz-devel
 BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	expat-devel
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+BuildRequires:	pythia8-devel
+%endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	font(liberationsans)
 BuildRequires:	font(liberationserif)
@@ -158,8 +161,20 @@ BuildRequires:	font(liberationmono)
 %else
 BuildRequires:	liberation-fonts
 %endif
-#		This contains a Symbol font that can be used by fontconfig
+%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
+%ifarch %{ix86} x86_64
+BuildRequires:	font(symbol)
+%else
 BuildRequires:	urw-fonts
+%endif
+%else
+BuildRequires:	urw-fonts
+%endif
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%ifarch %{ix86} x86_64
+BuildRequires:	font(wingdings)
+%endif
+%endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	font(droidsansfallback)
 %endif
@@ -253,8 +268,20 @@ Requires:	font(liberationmono)
 %else
 Requires:	liberation-fonts
 %endif
-#		This contains a Symbol font that can be used by fontconfig
+%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
+%ifarch %{ix86} x86_64
+Requires:	font(symbol)
+%else
 Requires:	urw-fonts
+%endif
+%else
+Requires:	urw-fonts
+%endif
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%ifarch %{ix86} x86_64
+Requires:	font(wingdings)
+%endif
+%endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 Requires:	font(droidsansfallback)
 %endif
@@ -836,6 +863,18 @@ Group:		Applications/Engineering
 %description montecarlo-eg
 This package contains an event generator library for ROOT.
 
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%package montecarlo-pythia8
+Summary:	Pythia version 8 plugin for ROOT
+Group:		Applications/Engineering
+
+%description montecarlo-pythia8
+This package contains the Pythia version 8 plug-in for ROOT. This
+package provide the ROOT user with transparent interface to the Pythia
+(version 8) event generators for hadronic interactions. If the term
+"hadronic" does not ring any bells, this package is not for you.
+%endif
+
 %package montecarlo-vmc
 Summary:	Virtual Monte-Carlo (simulation) library for ROOT
 Group:		Applications/Engineering
@@ -1207,6 +1246,12 @@ unset QTINC
 	    --enable-opengl \
 	    --enable-pgsql \
 	    --enable-python \
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+	    --enable-pythia8 \
+	      --with-pythia8-incdir=%{_includedir}/pythia8 \
+%else
+	    --disable-pythia8 \
+%endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 	    --enable-qt \
 	    --enable-qtgsi \
@@ -1251,7 +1296,6 @@ unset QTINC
 	    --disable-monalisa \
 	    --disable-oracle \
 	    --disable-pythia6 \
-	    --disable-pythia8 \
 	    --disable-rpath \
 	    --disable-sapdb \
 	    --disable-srp \
@@ -1363,7 +1407,7 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/*.sample
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/root.desktop
 rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/system.plugins-ios
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/svninfo.txt
+rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gitinfo.txt
 %if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
 rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
 %endif
@@ -1685,6 +1729,10 @@ fi
 %postun table -p /sbin/ldconfig
 %post montecarlo-eg -p /sbin/ldconfig
 %postun montecarlo-eg -p /sbin/ldconfig
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%post montecarlo-pythia8 -p /sbin/ldconfig
+%postun montecarlo-pythia8 -p /sbin/ldconfig
+%endif
 %post montecarlo-vmc -p /sbin/ldconfig
 %postun montecarlo-vmc -p /sbin/ldconfig
 %post net -p /sbin/ldconfig
@@ -2198,6 +2246,12 @@ fi
 %{_datadir}/%{name}/pdg_table.txt
 %doc %{_defaultdocdir}/%{name}-%{version}/cfortran.doc
 
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libEGPythia8.*
+%endif
+
 %files montecarlo-vmc -f includelist-montecarlo-vmc
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libVMC.*
@@ -2350,6 +2404,13 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
+- Update to 5.34.09
+- New sub-package: root-montecarlo-pythia8
+- Drop patch root-gfal-bits.patch
+- Use xz compression for source tarfile
+- Update ancient root version in EPEL
+
 * Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
 - Update to 5.34.07
 
diff --git a/sources b/sources
index c5fddbd..1d7209e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6fda5e6b48dadf4eda1498cdfa3d8637  root-5.34.07.tar.gz
+63fd002819184001cd4293aaf04b0ab5  root-5.34.09.tar.xz

From 730ad008c2b34c60596ebf7c067b8ef6824fc176 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 16 Jul 2013 07:15:02 +0200
Subject: [PATCH 034/344] Rebuild for cfitsio 3.350

---
 root.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 525b975..c75a62e 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 Name:		root
 Version:	5.34.09
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2404,6 +2404,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
+- Rebuild for cfitsio 3.350
+
 * Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
 - Update to 5.34.09
 - New sub-package: root-montecarlo-pythia8
@@ -2421,7 +2424,7 @@ fi
 
 * Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
 - Rebuild for ruby 2.0
-- Rebuild for cfitsio 3.330
+- Rebuild for cfitsio 3.340
 
 * Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
 - Update to 5.34.05

From 1904e06a34d1b2da04f57b67ec668d3a3c35f391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 18 Jul 2013 03:48:46 +0200
Subject: [PATCH 035/344] Perl 5.18 rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index c75a62e..80fc04e 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 Name:		root
 Version:	5.34.09
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2404,6 +2404,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
+- Perl 5.18 rebuild
+
 * Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
 - Rebuild for cfitsio 3.350
 

From ab6ed3ddb5182ed2d514ec0d1976c8bc7ec27bdd Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 07:50:39 -0500
Subject: [PATCH 036/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 80fc04e..0930527 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 Name:		root
 Version:	5.34.09
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2404,6 +2404,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
 - Perl 5.18 rebuild
 

From e2dd5b281835b2cbef4bea80061c84e5d67cc388 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 8 Aug 2013 07:58:04 +0200
Subject: [PATCH 037/344] Exclude armv7hl - cint is not working

- Use _pkgdocdir when defined
- Use texlive-stix
---
 root-fontconfig.patch | 925 ++++++++++++++++++++++++------------------
 root.spec             |  68 ++--
 2 files changed, 564 insertions(+), 429 deletions(-)

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 56604c0..98db311 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-5.34.05.orig/core/base/src/TApplication.cxx root-5.34.05/core/base/src/TApplication.cxx
---- root-5.34.05.orig/core/base/src/TApplication.cxx	2013-02-14 23:27:37.000000000 +0100
-+++ root-5.34.05/core/base/src/TApplication.cxx	2013-02-26 19:27:54.452632349 +0100
+diff -ur root-5.34.09.orig/core/base/src/TApplication.cxx root-5.34.09/core/base/src/TApplication.cxx
+--- root-5.34.09.orig/core/base/src/TApplication.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/core/base/src/TApplication.cxx	2013-08-08 07:35:32.435919608 +0200
 @@ -237,22 +237,11 @@
     LoadGraphicsLibs();
  
@@ -34,9 +34,9 @@ diff -ur root-5.34.05.orig/core/base/src/TApplication.cxx root-5.34.05/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.05.orig/graf2d/graf/inc/TTF.h root-5.34.05/graf2d/graf/inc/TTF.h
---- root-5.34.05.orig/graf2d/graf/inc/TTF.h	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/graf/inc/TTF.h	2013-02-26 19:27:54.452632349 +0100
+diff -ur root-5.34.09.orig/graf2d/graf/inc/TTF.h root-5.34.09/graf2d/graf/inc/TTF.h
+--- root-5.34.09.orig/graf2d/graf/inc/TTF.h	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf2d/graf/inc/TTF.h	2013-08-08 07:35:32.435919608 +0200
 @@ -71,9 +71,8 @@
     static FT_BBox     fgCBox;                  // string control box
     static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
@@ -48,9 +48,9 @@ diff -ur root-5.34.05.orig/graf2d/graf/inc/TTF.h root-5.34.05/graf2d/graf/inc/TT
     static FT_Face     fgFace[kTTMaxFonts];     // font face
     static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
     static Bool_t      fgHinting;               // use hinting (true by default)
-diff -ur root-5.34.05.orig/graf2d/graf/Module.mk root-5.34.05/graf2d/graf/Module.mk
---- root-5.34.05.orig/graf2d/graf/Module.mk	2013-02-14 23:27:53.000000000 +0100
-+++ root-5.34.05/graf2d/graf/Module.mk	2013-02-26 19:27:54.452632349 +0100
+diff -ur root-5.34.09.orig/graf2d/graf/Module.mk root-5.34.09/graf2d/graf/Module.mk
+--- root-5.34.09.orig/graf2d/graf/Module.mk	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf2d/graf/Module.mk	2013-08-08 07:35:32.435919608 +0200
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -60,9 +60,9 @@ diff -ur root-5.34.05.orig/graf2d/graf/Module.mk root-5.34.05/graf2d/graf/Module
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/TTF.cxx
---- root-5.34.05.orig/graf2d/graf/src/TTF.cxx	2013-02-14 23:27:52.000000000 +0100
-+++ root-5.34.05/graf2d/graf/src/TTF.cxx	2013-02-26 19:36:07.971088035 +0100
+diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/TTF.cxx
+--- root-5.34.09.orig/graf2d/graf/src/TTF.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf2d/graf/src/TTF.cxx	2013-08-08 07:35:32.437919624 +0200
 @@ -17,15 +17,13 @@
  //                                                                      //
  //////////////////////////////////////////////////////////////////////////
@@ -280,7 +280,7 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
        }
     }
  
-@@ -409,161 +528,228 @@
+@@ -409,161 +528,280 @@
     if (fgFontCount >= kTTMaxFonts) {
        Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
              kTTMaxFonts);
@@ -299,10 +299,59 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
 -                                       "$(ROOTSYS)/fonts"
 -# endif
 -                                      );
--
++   char *ttfont = NULL;
++   int ttindex = 0;
+ 
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
--
--   if (!ttfont) {
++   if (fontid >= 16 && fontid <= 28) {
++      // Use the texlive-stix fonts if they exist
++      // Texlive-stix not packaged correctly - can not be found through fontconfig
++      // Use hardcoded path
++      const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
++      switch (fontid) {
++      case 16:
++	 ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
++	 break;
++      case 17:
++	 ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
++	 break;
++      case 18:
++	 ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
++	 break;
++      case 19:
++	 ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
++	 break;
++      case 20:
++	 ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
++	 break;
++      case 21:
++	 ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
++	 break;
++      case 22:
++	 ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
++	 break;
++      case 23:
++         ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
++	 break;
++      case 24:
++	 ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
++	 break;
++      case 25:
++	 ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
++	 break;
++      case 26:
++	 ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
++	 break;
++      case 27:
++	 ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
++	 break;
++      case 28:
++	 ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
++	 break;
++      }
++   }
+ 
+    if (!ttfont) {
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
 -      if (fgFontCount) {
 -         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
@@ -310,201 +359,202 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
 -         return 0;
 -      } else {
 -         return 1;
--      }
-+   FcPattern *pat, *match;
-+   FcCharSet *set = NULL;
-+   FcResult result;
-+   char *ttfont;
-+   int ttindex;
++      FcPattern *pat, *match;
++      FcCharSet *set = NULL;
++      FcResult result;
 +
-+   pat = FcPatternCreate ();
++      pat = FcPatternCreate ();
 +
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 16:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 17:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 18:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 19:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 20:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      // set = FcCharSetCreate ();
-+      // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+      // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   case 21:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      // set = FcCharSetCreate ();
-+      // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+      // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   case 22:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 23:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 24:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 25:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 26:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 27:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 28:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 29:
-+   case 30:
-+   case 31:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      set = FcCharSetCreate ();
-+      FcCharSetAddChar (set, 0x0410); // Cyrillic
-+      FcCharSetAddChar (set, 0x4e00); // CJK
-+      FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   default:
-+      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
++      switch (fontid) {
++      case 1:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 2:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 3:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 4:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 5:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 6:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 7:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 8:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 9:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 10:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 11:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 12:
++      case 15:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 13:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 14:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 16:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 17:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 18:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 19:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	 break;
++      case 20:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 // set = FcCharSetCreate ();
++	 // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	 // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	 break;
++      case 21:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 // set = FcCharSetCreate ();
++	 // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	 // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	 break;
++      case 22:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 23:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 24:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 25:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 26:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 27:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 28:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 break;
++      case 29:
++      case 30:
++      case 31:
++	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	 set = FcCharSetCreate ();
++	 FcCharSetAddChar (set, 0x0410); // Cyrillic
++	 FcCharSetAddChar (set, 0x4e00); // CJK
++	 FcPatternAddCharSet (pat, FC_CHARSET, set);
++	 break;
++      default:
++	 Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
++	 FcPatternDestroy (pat);
++	 Warning("TTF::SetTextFont", "using default font");
++	 fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++	 return;
++	 break;
+       }
++
++      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (NULL, pat, &result);
++      char* ttfnt;
++      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++      ttfont = StrDup(ttfnt);
++      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++      FcPatternDestroy (match);
 +      FcPatternDestroy (pat);
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+      return;
-+      break;
++      if (set) FcCharSetDestroy (set);
     }
  
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+
     FT_Face  tface = 0;
  
 -   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
 +   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
        Error("TTF::SetTextFont", "error loading font %s", ttfont);
--      delete [] ttfont;
-+      FcPatternDestroy (match);
-+      FcPatternDestroy (pat);
+       delete [] ttfont;
        if (tface) FT_Done_Face(tface);
 -      if (fgFontCount) {
 -         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
@@ -518,13 +568,9 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
 +      return;
     }
  
--   delete [] ttfont;
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
+    delete [] ttfont;
  
 -   fgFontName[fgFontCount] = StrDup(basename);
-+   if (set) FcCharSetDestroy (set);
-+
 +   fgFontID[fgFontCount]   = fontid;
     fgCurFontIdx            = fgFontCount;
     fgFace[fgCurFontIdx]    = tface;
@@ -539,8 +585,7 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
        slantMat.yx = 0;
        slantMat.yy = (1 << 16);
 -      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
-    }
+-   }
 -
 -   return 0;
 -}
@@ -630,7 +675,8 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
 -         // try backup free font
 -         thisset = 1;
 -      }
--   }
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
+    }
 -   Int_t italic = 0;
 -   if (fontid==15) italic = 1;
 -   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
@@ -640,9 +686,9 @@ diff -ur root-5.34.05.orig/graf2d/graf/src/TTF.cxx root-5.34.05/graf2d/graf/src/
  }
  
  //______________________________________________________________________________
-diff -ur root-5.34.05.orig/graf2d/postscript/Module.mk root-5.34.05/graf2d/postscript/Module.mk
---- root-5.34.05.orig/graf2d/postscript/Module.mk	2013-02-14 23:27:54.000000000 +0100
-+++ root-5.34.05/graf2d/postscript/Module.mk	2013-02-26 19:27:54.453632355 +0100
+diff -ur root-5.34.09.orig/graf2d/postscript/Module.mk root-5.34.09/graf2d/postscript/Module.mk
+--- root-5.34.09.orig/graf2d/postscript/Module.mk	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf2d/postscript/Module.mk	2013-08-08 07:35:32.437919624 +0200
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -652,9 +698,9 @@ diff -ur root-5.34.05.orig/graf2d/postscript/Module.mk root-5.34.05/graf2d/posts
  
  $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.05/graf2d/postscript/src/TPostScript.cxx
---- root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx	2013-02-14 23:27:54.000000000 +0100
-+++ root-5.34.05/graf2d/postscript/src/TPostScript.cxx	2013-02-26 19:45:18.377106631 +0100
+diff -ur root-5.34.09.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.09/graf2d/postscript/src/TPostScript.cxx
+--- root-5.34.09.orig/graf2d/postscript/src/TPostScript.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf2d/postscript/src/TPostScript.cxx	2013-08-08 07:36:53.709607143 +0200
 @@ -238,6 +238,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -663,7 +709,7 @@ diff -ur root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.05/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1511,78 +1512,206 @@
+@@ -1511,78 +1512,258 @@
  {
     // Embed font in PS file.
  
@@ -741,179 +787,235 @@ diff -ur root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.05/gr
 -		}
 +      if (fontid != 15) {
 +
-+	 FcPattern *pat, *match;
-+	 FcCharSet *set = NULL;
-+	 FcResult result;
-+	 char *ttfont;
++	 char *ttfont = NULL;
 +
-+	 pat = FcPatternCreate ();
-+
-+	 switch (fontid) {
-+	 case 1:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 2:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 3:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 4:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 5:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 6:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 7:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 8:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 9:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 10:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 11:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 12:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 13:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 14:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 16:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 17:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 18:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 19:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	    break;
-+	 case 20:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    // set = FcCharSetCreate ();
-+	    // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	    // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	    break;
-+	 case 21:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    // set = FcCharSetCreate ();
-+	    // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	    // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	    break;
-+	 case 22:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 23:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 24:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 25:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 26:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 27:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 28:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    break;
-+	 case 29:
-+	    FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+	    FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	    FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	    set = FcCharSetCreate ();
-+	    FcCharSetAddChar (set, 0x0410); // Cyrillic
-+	    FcCharSetAddChar (set, 0x4e00); // CJK
-+	    FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	    break;
++	 if (fontid >= 16 && fontid <= 28) {
++	    // Use the texlive-stix fonts if they exist
++	    // Texlive-stix not packaged correctly - can not be found through fontconfig
++	    // Use hardcoded path
++	    const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
++	    switch (fontid) {
++	    case 16:
++	       ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
++	       break;
++	    case 17:
++	       ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
++	       break;
++	    case 18:
++	       ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
++	       break;
++	    case 19:
++	       ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
++	       break;
++	    case 20:
++	       ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
++	       break;
++	    case 21:
++	       ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
++	       break;
++	    case 22:
++	       ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
++	       break;
++	    case 23:
++	       ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
++	       break;
++	    case 24:
++	       ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
++	       break;
++	    case 25:
++	       ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
++	       break;
++	    case 26:
++	       ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
++	       break;
++	    case 27:
++	       ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
++	       break;
++	    case 28:
++	       ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
++	       break;
++	    }
 +	 }
 +
-+	 FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+	 FcDefaultSubstitute (pat);
-+	 match = FcFontMatch (NULL, pat, &result);
-+	 FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
++	 if (!ttfont) {
++	    FcPattern *pat, *match;
++	    FcCharSet *set = NULL;
++	    FcResult result;
++
++	    pat = FcPatternCreate ();
++
++	    switch (fontid) {
++	    case 1:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 2:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 3:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 4:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 5:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 6:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 7:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 8:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 9:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 10:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 11:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 12:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 13:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 14:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 16:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 17:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 18:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 19:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++	       break;
++	    case 20:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       // set = FcCharSetCreate ();
++	       // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	       // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	       break;
++	    case 21:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       // set = FcCharSetCreate ();
++	       // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++	       // FcPatternAddCharSet (pat, FC_CHARSET, set);
++	       break;
++	    case 22:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 23:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 24:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 25:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 26:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 27:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 28:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       break;
++	    case 29:
++	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++	       set = FcCharSetCreate ();
++	       FcCharSetAddChar (set, 0x0410); // Cyrillic
++	       FcCharSetAddChar (set, 0x4e00); // CJK
++	       FcPatternAddCharSet (pat, FC_CHARSET, set);
++	       break;
++	    }
++
++	    FcConfigSubstitute (NULL, pat, FcMatchPattern);
++	    FcDefaultSubstitute (pat);
++	    match = FcFontMatch (NULL, pat, &result);
++	    char *ttfnt;
++	    FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++	    ttfont = StrDup(ttfnt);
++	    FcPatternDestroy (match);
++	    FcPatternDestroy (pat);
++	    if (set) FcCharSetDestroy (set);
++	 }
 +
 +	 if(!ttfont) {
 +	    Error("TPostScript::FontEmbed", "font %d not found in path",
@@ -929,19 +1031,30 @@ diff -ur root-5.34.05.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.05/gr
 +	       Error("TPostScript::FontEmbed", "failed to embed font %d)",
 +		     fontid);
 +	    }
++	    delete [] ttfont;
 +	 }
-+
-+	 FcPatternDestroy (match);
-+	 FcPatternDestroy (pat);
-+
-+	 if (set) FcCharSetDestroy (set);
 +      }
     }
     PrintStr("%%IncludeResource: font Times-Roman@");
     PrintStr("%%IncludeResource: font Times-Italic@");
-diff -ur root-5.34.05.orig/graf3d/gl/Module.mk root-5.34.05/graf3d/gl/Module.mk
---- root-5.34.05.orig/graf3d/gl/Module.mk	2013-02-14 23:27:47.000000000 +0100
-+++ root-5.34.05/graf3d/gl/Module.mk	2013-02-26 19:27:54.454632361 +0100
+@@ -2571,10 +2752,10 @@
+ 	   { "Root.PSFont.5",             "/Helvetica-Oblique" },
+ 	   { "Root.PSFont.6",             "/Helvetica-Bold" },
+ 	   { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
+-	   { "Root.PSFont.8",             "/Courrier" },
+-	   { "Root.PSFont.9",             "/Courrier-Oblique" },
+-	   { "Root.PSFont.10",            "/Courrier-Bold" },
+-	   { "Root.PSFont.11",            "/Courrier-BoldOblique" },
++	   { "Root.PSFont.8",             "/Courier" },
++	   { "Root.PSFont.9",             "/Courier-Oblique" },
++	   { "Root.PSFont.10",            "/Courier-Bold" },
++	   { "Root.PSFont.11",            "/Courier-BoldOblique" },
+ 	   { "Root.PSFont.12",            "/Symbol" },
+ 	   { "Root.PSFont.13",            "/Times-Roman" },
+ 	   { "Root.PSFont.14",            "/ZapfDingbats" },
+diff -ur root-5.34.09.orig/graf3d/gl/Module.mk root-5.34.09/graf3d/gl/Module.mk
+--- root-5.34.09.orig/graf3d/gl/Module.mk	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf3d/gl/Module.mk	2013-08-08 07:35:32.439919641 +0200
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -951,9 +1064,9 @@ diff -ur root-5.34.05.orig/graf3d/gl/Module.mk root-5.34.05/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.05.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.05/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.05.orig/graf3d/gl/src/TGLFontManager.cxx	2013-02-14 23:27:47.000000000 +0100
-+++ root-5.34.05/graf3d/gl/src/TGLFontManager.cxx	2013-02-26 19:27:54.454632361 +0100
+diff -ur root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.09/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf3d/gl/src/TGLFontManager.cxx	2013-08-08 07:35:32.440919650 +0200
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1078,9 +1191,9 @@ diff -ur root-5.34.05.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.05/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-diff -ur root-5.34.05.orig/graf3d/gl/src/TGLText.cxx root-5.34.05/graf3d/gl/src/TGLText.cxx
---- root-5.34.05.orig/graf3d/gl/src/TGLText.cxx	2013-02-14 23:27:47.000000000 +0100
-+++ root-5.34.05/graf3d/gl/src/TGLText.cxx	2013-02-26 19:27:54.455632367 +0100
+diff -ur root-5.34.09.orig/graf3d/gl/src/TGLText.cxx root-5.34.09/graf3d/gl/src/TGLText.cxx
+--- root-5.34.09.orig/graf3d/gl/src/TGLText.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/graf3d/gl/src/TGLText.cxx	2013-08-08 07:35:32.441919658 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1216,9 +1329,9 @@ diff -ur root-5.34.05.orig/graf3d/gl/src/TGLText.cxx root-5.34.05/graf3d/gl/src/
 +   FcPatternDestroy (match);
 +   FcPatternDestroy (pat);
  }
-diff -ur root-5.34.05.orig/gui/gui/src/TGApplication.cxx root-5.34.05/gui/gui/src/TGApplication.cxx
---- root-5.34.05.orig/gui/gui/src/TGApplication.cxx	2013-02-14 23:27:51.000000000 +0100
-+++ root-5.34.05/gui/gui/src/TGApplication.cxx	2013-02-26 19:27:54.455632367 +0100
+diff -ur root-5.34.09.orig/gui/gui/src/TGApplication.cxx root-5.34.09/gui/gui/src/TGApplication.cxx
+--- root-5.34.09.orig/gui/gui/src/TGApplication.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/gui/gui/src/TGApplication.cxx	2013-08-08 07:35:32.442919667 +0200
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1246,9 +1359,9 @@ diff -ur root-5.34.05.orig/gui/gui/src/TGApplication.cxx root-5.34.05/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.05.orig/gui/gui/src/TGSpeedo.cxx root-5.34.05/gui/gui/src/TGSpeedo.cxx
---- root-5.34.05.orig/gui/gui/src/TGSpeedo.cxx	2013-02-14 23:27:51.000000000 +0100
-+++ root-5.34.05/gui/gui/src/TGSpeedo.cxx	2013-02-26 19:27:54.455632367 +0100
+diff -ur root-5.34.09.orig/gui/gui/src/TGSpeedo.cxx root-5.34.09/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.09.orig/gui/gui/src/TGSpeedo.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/gui/gui/src/TGSpeedo.cxx	2013-08-08 07:35:32.442919667 +0200
 @@ -119,8 +119,7 @@
  
     TString sc;
diff --git a/root.spec b/root.spec
index 0930527..0c2c4b9 100644
--- a/root.spec
+++ b/root.spec
@@ -39,10 +39,12 @@
 %global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		root
 Version:	5.34.09
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -84,6 +86,10 @@ 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
 ExcludeArch:	ppc64
+#		The cint interpreter is not fully ported to arm
+#		https://sft.its.cern.ch/jira/browse/ROOT-5398
+#		https://sft.its.cern.ch/jira/browse/ROOT-5399
+ExcludeArch:	armv7hl
 
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
@@ -179,13 +185,17 @@ BuildRequires:	font(wingdings)
 BuildRequires:	font(droidsansfallback)
 %endif
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
-BuildRequires:	font(stix)
+# STIX font version 1.1 - not backwards compatible with earlier versions
+# We use the texlive supplied version 1.0 instead of font(stix)
+BuildRequires:	texlive-stix
 %else
 %if %{?fedora}%{!?fedora:0} >= 14
+# STIX font version 1.0
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsizeonesym)
 %else
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+# STIX font version 0.9
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsize1)
 %endif
@@ -286,13 +296,17 @@ Requires:	font(wingdings)
 Requires:	font(droidsansfallback)
 %endif
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
-Requires:	font(stix)
+# STIX font version 1.1 - not backwards compatible with earlier versions
+# We use the texlive supplied version 1.0 instead of font(stix)
+Requires:	texlive-stix
 %else
 %if %{?fedora}%{!?fedora:0} >= 14
+# STIX font version 1.0
 Requires:	font(stixgeneral)
 Requires:	font(stixsizeonesym)
 %else
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+# STIX font version 0.9
 Requires:	font(stixgeneral)
 Requires:	font(stixsize1)
 %endif
@@ -1190,6 +1204,9 @@ sed s/c1/c1c/g -i tutorials/graphics/earth.C
 sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
 sed s/c1/c1simp/g -i tutorials/hsimple.C
 
+# Directory lost in svn-git conversion - needed for THtml doc generation
+mkdir graf2d/gviz/doc
+
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 cp -pr bindings/pyroot bindings/pyroot26
@@ -1204,7 +1221,7 @@ unset QTINC
 ./configure --prefix=%{_prefix} \
 	    --libdir=%{_libdir}/%{name} \
 	    --etcdir=%{_datadir}/%{name} \
-	    --docdir=%{_defaultdocdir}/%{name}-%{version} \
+	    --docdir=%{_pkgdocdir} \
 	    --elispdir=%{emacs_lispdir}/%{name} \
 %if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
 	    --disable-builtin-afterimage \
@@ -1426,11 +1443,11 @@ rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.pri
 %endif
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/proofdp.h
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/rootdp.h
-rm ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/BUILDSYSTEM
-rm ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/ChangeLog-2-24
-rm ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/INSTALL
-rm ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/README.ALIEN
-rm ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/README.MONALISA
+rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/BUILDSYSTEM
+rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/ChangeLog-2-24
+rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/INSTALL
+rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/README.ALIEN
+rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/README.MONALISA
 
 # Remove cintdll sources - keep the prec_stl directory
 rm -rf ${RPM_BUILD_ROOT}%{_libdir}/%{name}/cint/cint/lib/{[^p],p[^r]}*
@@ -1489,7 +1506,7 @@ sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
-mv htmldoc ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/html
+mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
 
 # Create includelist files ...
 for module in `find * -name Module.mk` ; do
@@ -1834,9 +1851,9 @@ fi
 %{_includedir}/%{name}/rmain.cxx
 %dir %{_includedir}/%{name}/Math
 %{_datadir}/aclocal/root.m4
-%doc %{_defaultdocdir}/%{name}-%{version}/CREDITS
-%doc %{_defaultdocdir}/%{name}-%{version}/LICENSE
-%doc %{_defaultdocdir}/%{name}-%{version}/README
+%doc %{_pkgdocdir}/CREDITS
+%doc %{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
 
 %files cint -f includelist-cint-cint
 %defattr(-,root,root,-)
@@ -1847,8 +1864,8 @@ fi
 %{_libdir}/%{name}/cint
 %dir %{_includedir}/%{name}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%doc %dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/COPYING.CINT
+%doc %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/COPYING.CINT
 
 %ifarch %{ix86} x86_64
 %files cintex -f includelist-cint-cintex
@@ -1875,12 +1892,12 @@ fi
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}/html
+%doc %{_pkgdocdir}/html
 
 %files tutorial
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}/test
-%doc %{_defaultdocdir}/%{name}-%{version}/tutorials
+%doc %{_pkgdocdir}/test
+%doc %{_pkgdocdir}/tutorials
 
 %files proofd
 %defattr(-,root,root,-)
@@ -2244,7 +2261,7 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libEG.*
 %{_datadir}/%{name}/pdg_table.txt
-%doc %{_defaultdocdir}/%{name}-%{version}/cfortran.doc
+%doc %{_pkgdocdir}/cfortran.doc
 
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
@@ -2282,12 +2299,12 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRootAuth.*
 %{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
-%doc %{_defaultdocdir}/%{name}-%{version}/README.AUTH
+%doc %{_pkgdocdir}/README.AUTH
 
 %files net-globus
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libGlobusAuth.*
-%doc %{_defaultdocdir}/%{name}-%{version}/README.GLOBUS
+%doc %{_pkgdocdir}/README.GLOBUS
 
 %files net-krb5 -f includelist-net-krb5auth
 %defattr(-,root,root,-)
@@ -2323,7 +2340,7 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
 %{_datadir}/%{name}/valgrind-root.supp
-%doc %{_defaultdocdir}/%{name}-%{version}/README.PROOF
+%doc %{_pkgdocdir}/README.PROOF
 
 %files proof-bench -f includelist-proof-proofbench
 %defattr(-,root,root,-)
@@ -2381,7 +2398,7 @@ fi
 %files tree -f includelist-tree-tree
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libTree.*
-%doc %{_defaultdocdir}/%{name}-%{version}/README.SELECTOR
+%doc %{_pkgdocdir}/README.SELECTOR
 
 %files tree-player -f includelist-tree-treeplayer
 %defattr(-,root,root,-)
@@ -2404,6 +2421,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
+- Exclude armv7hl - cint is not working
+- Use _pkgdocdir when defined
+- Use texlive-stix
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 530418d5efa097e962f9c7b100b6d102433f2635 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 10 Sep 2013 09:13:21 +0200
Subject: [PATCH 038/344] Update to 5.34.09

- New sub-package: root-io-hdfs (Fedora 20+)
- New sub-package: root-sql-sqlite
---
 root-hdfs.patch | 129 ++++++++++++++++++++++++++++++++++++++++++++++++
 root.spec       |  79 +++++++++++++++++++++++++----
 2 files changed, 199 insertions(+), 9 deletions(-)
 create mode 100644 root-hdfs.patch

diff --git a/root-hdfs.patch b/root-hdfs.patch
new file mode 100644
index 0000000..cf9d5f1
--- /dev/null
+++ b/root-hdfs.patch
@@ -0,0 +1,129 @@
+diff -ur root-5.34.09.orig/io/hdfs/src/THDFSFile.cxx root-5.34.09/io/hdfs/src/THDFSFile.cxx
+--- root-5.34.09.orig/io/hdfs/src/THDFSFile.cxx	2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/io/hdfs/src/THDFSFile.cxx	2013-08-31 03:00:10.323742733 +0200
+@@ -40,6 +40,7 @@
+ 
+ #include "syslog.h"
+ #include "assert.h"
++#include "stdlib.h"
+ 
+ #include "THDFSFile.h"
+ #include "TError.h"
+@@ -93,8 +94,7 @@
+    if (has_authn) {
+       UserGroup_t *ugi = gSystem->GetUserInfo(0);
+       const char *user = (ugi->fUser).Data();
+-      const char * groups[1] = {(ugi->fGroup.Data())};
+-      fFS = hdfsConnectAsUser("default", 0, user, groups, 1);
++      fFS = hdfsConnectAsUser("default", 0, user);
+       delete ugi;
+    } else {
+       fFS = hdfsConnect("default", 0);
+@@ -167,7 +167,7 @@
+    // See documentation for TFile::SysRead().
+ 
+    TRACE("READ")
+-   tSize num_read = hdfsPread(fFS, (hdfsFile)fHdfsFH, fSysOffset, buf, len);
++   tSize num_read = hdfsPread((hdfsFS)fFS, (hdfsFile)fHdfsFH, fSysOffset, buf, len);
+    fSysOffset += len;
+    if (num_read < 0) {
+       gSystem->SetErrorStr(strerror(errno));
+@@ -192,7 +192,7 @@
+          return -1;
+       }
+       if (fSize == -1) {
+-         hdfsFileInfo *info = hdfsGetPathInfo(fFS, fPath);
++         hdfsFileInfo *info = hdfsGetPathInfo((hdfsFS)fFS, fPath);
+          if (info != 0) {
+             fSize = info->mSize;
+             free(info);
+@@ -224,7 +224,7 @@
+       SysError("THDFSFile", "Unable to allocate memory for path.");
+    }
+    strlcpy(fPath, file,path_size+1);
+-   if ((fHdfsFH = hdfsOpenFile(fFS, fPath, flags, 0, 0, 0)) == 0) {
++   if ((fHdfsFH = hdfsOpenFile((hdfsFS)fFS, fPath, flags, 0, 0, 0)) == 0) {
+       SysError("THDFSFile", "Unable to open file %s in HDFS", pathname);
+       return -1;
+    }
+@@ -236,7 +236,7 @@
+ {
+    // Close the file in HDFS.
+ 
+-   int result = hdfsCloseFile(fFS, (hdfsFile)fHdfsFH);
++   int result = hdfsCloseFile((hdfsFS)fFS, (hdfsFile)fHdfsFH);
+    fFS = 0;
+    fHdfsFH = 0;
+    return result;
+@@ -258,7 +258,7 @@
+ 
+    *id = ::Hash(fPath);
+ 
+-   hdfsFileInfo *info = hdfsGetPathInfo(fFS, fPath);
++   hdfsFileInfo *info = hdfsGetPathInfo((hdfsFS)fFS, fPath);
+    if (info != 0) {
+       fSize = info->mSize;
+       *size = fSize;
+@@ -306,8 +306,7 @@
+    if (has_authn) {
+       UserGroup_t *ugi = gSystem->GetUserInfo(0);
+       const char *user = (ugi->fUser).Data();
+-      const char * groups[1] = {(ugi->fGroup.Data())};
+-      fFH = hdfsConnectAsUser("default", 0, user, groups, 1);
++      fFH = hdfsConnectAsUser("default", 0, user);
+       delete ugi;
+    } else {
+       fFH = hdfsConnect("default", 0);
+@@ -339,7 +338,7 @@
+    }
+ 
+    if (R__HDFS_ALLOW_CHANGES == kTRUE) {
+-      return hdfsCreateDirectory(fFH, path);
++      return hdfsCreateDirectory((hdfsFS)fFH, path);
+    } else {
+       return -1;
+    }
+@@ -366,14 +365,14 @@
+ */
+ 
+    hdfsFileInfo * dir = 0;
+-   if ((dir = hdfsGetPathInfo(fFH, path)) == 0) {
++   if ((dir = hdfsGetPathInfo((hdfsFS)fFH, path)) == 0) {
+       return 0;
+    }
+    if (dir->mKind != kObjectKindDirectory) {
+       return 0;
+    }
+ 
+-   fDirp = (void *)hdfsListDirectory(fFH, path, &fDirEntries);
++   fDirp = (void *)hdfsListDirectory((hdfsFS)fFH, path, &fDirEntries);
+    fDirCtr = 0;
+ 
+    fUrlp = new TUrl[fDirEntries];
+@@ -449,7 +448,7 @@
+       Error("GetPathInfo", "No filesystem handle (should never happen)");
+       return 1;
+    }
+-   hdfsFileInfo *fileInfo = hdfsGetPathInfo(fFH, path);
++   hdfsFileInfo *fileInfo = hdfsGetPathInfo((hdfsFS)fFH, path);
+ 
+    if (fileInfo == 0)
+       return 1;
+@@ -481,7 +480,7 @@
+       return kTRUE;
+    }
+ 
+-   if (hdfsExists(fFH, path) == 0)
++   if (hdfsExists((hdfsFS)fFH, path) == 0)
+       return kFALSE;
+    else
+       return kTRUE;
+@@ -499,7 +498,7 @@
+    }
+ 
+    if (R__HDFS_ALLOW_CHANGES == kTRUE) {
+-      return hdfsDelete(fFH, path);
++      return hdfsDelete((hdfsFS)fFH, path, 1);
+    } else {
+       return -1;
+    }
diff --git a/root.spec b/root.spec
index 0c2c4b9..124ee7e 100644
--- a/root.spec
+++ b/root.spec
@@ -42,9 +42,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.09
+Version:	5.34.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -82,6 +82,8 @@ Patch5:		%{name}-doc-latex.patch
 Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
 Patch7:		%{name}-no-extra-formats.patch
+#		Fixes for HDFS module
+Patch8:		%{name}-hdfs.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
@@ -89,7 +91,7 @@ ExcludeArch:	ppc64
 #		The cint interpreter is not fully ported to arm
 #		https://sft.its.cern.ch/jira/browse/ROOT-5398
 #		https://sft.its.cern.ch/jira/browse/ROOT-5399
-ExcludeArch:	armv7hl
+ExcludeArch:	%{arm}
 
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
@@ -121,6 +123,7 @@ BuildRequires:	krb5-devel
 BuildRequires:	krb5-workstation
 BuildRequires:	openldap-devel
 BuildRequires:	mysql-devel
+BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
@@ -149,6 +152,10 @@ BuildRequires:	cfitsio-devel
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
 %endif
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires:	hadoop-devel
+BuildRequires:	java-devel
+%endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
@@ -670,6 +677,15 @@ Group:		Applications/Engineering
 This package contains the Grid File Access Library extension for ROOT.
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%package io-hdfs
+Summary:	Hadoop File System input/output library for ROOT
+Group:		Applications/Engineering
+
+%description io-hdfs
+This package contains the Hadoop File System extension for ROOT.
+%endif
+
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
 Group:		Applications/Engineering
@@ -1035,6 +1051,16 @@ This package contains the ODBC (Open DataBase Connectivity) plugin
 for ROOT, that allows transparent access to any kind of database that
 supports the ODBC protocol.
 
+%package sql-sqlite
+Summary:	Sqlite client plugin for ROOT
+Group:		Applications/Engineering
+
+%description sql-sqlite
+This package contains the sqlite plugin for ROOT. This plugin
+provides a thin client (interface) to sqlite servers. Using this
+client, one can obtain information from a sqlite database into the
+ROOT environment.
+
 %package sql-pgsql
 Summary:	PostgreSQL client plugin for ROOT
 Group:		Applications/Engineering
@@ -1133,6 +1159,7 @@ fi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -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 \
@@ -1204,9 +1231,6 @@ sed s/c1/c1c/g -i tutorials/graphics/earth.C
 sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
 sed s/c1/c1simp/g -i tutorials/hsimple.C
 
-# Directory lost in svn-git conversion - needed for THtml doc generation
-mkdir graf2d/gviz/doc
-
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 cp -pr bindings/pyroot bindings/pyroot26
@@ -1218,6 +1242,7 @@ sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
 unset QTDIR
 unset QTLIB
 unset QTINC
+export JAVA_HOME=/usr/lib/jvm/java
 ./configure --prefix=%{_prefix} \
 	    --libdir=%{_libdir}/%{name} \
 	    --etcdir=%{_datadir}/%{name} \
@@ -1253,6 +1278,13 @@ unset QTINC
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+	    --enable-hdfs \
+	      --with-hdfs-incdir=%{_includedir}/hadoop \
+	      --with-hdfs-libdir=%{_libdir}/hadoop \
+%else
+	    --disable-hdfs \
+%endif
 	    --enable-krb5 \
 	    --enable-ldap \
 	    --enable-mathmore \
@@ -1282,9 +1314,10 @@ unset QTINC
 	      --with-rfio-libdir=%{_libdir} \
 	    --enable-roofit \
 	    --enable-ruby \
-	    --enable-soversion \
 	    --enable-shadowpw \
 	    --enable-shared \
+	    --enable-soversion \
+	    --enable-sqlite \
 	    --enable-ssl \
 	    --enable-table \
 	    --enable-tmva \
@@ -1309,7 +1342,6 @@ unset QTINC
 	    --disable-cling \
 	    --disable-cxx11 \
 	    --disable-glite \
-	    --disable-hdfs \
 	    --disable-monalisa \
 	    --disable-oracle \
 	    --disable-pythia6 \
@@ -1466,7 +1498,9 @@ rm TFile/P050_TGFALFile.C
 %endif
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
+%if %{?fedora}%{!?fedora:0} < 20 && %{?rhel}%{!?rhel:0} < 7
 rm TFile/P110_THDFSFile.C
+%endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGrid/P010_TAlien.C
 rm TGrid/P020_TGLite.C
@@ -1477,7 +1511,9 @@ rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
+%if %{?fedora}%{!?fedora:0} < 20 && %{?rhel}%{!?rhel:0} < 7
 rm TSystem/P060_THDFSSystem.C
+%endif
 rm TViewerX3D/P020_TQtViewerX3D.C
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
@@ -1503,7 +1539,7 @@ 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
-LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
+LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl:%{_libdir}/hadoop:/usr/lib/jvm/jre/lib/amd64/server:/usr/lib/jvm/jre/lib/i386/server \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
 mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
@@ -1704,6 +1740,10 @@ fi
 %post io-gfal -p /sbin/ldconfig
 %postun io-gfal -p /sbin/ldconfig
 %endif
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%post io-hdfs -p /sbin/ldconfig
+%postun io-hdfs -p /sbin/ldconfig
+%endif
 %post io-rfio -p /sbin/ldconfig
 %postun io-rfio -p /sbin/ldconfig
 %post io-sql -p /sbin/ldconfig
@@ -1780,6 +1820,8 @@ fi
 %postun sql-mysql -p /sbin/ldconfig
 %post sql-odbc -p /sbin/ldconfig
 %postun sql-odbc -p /sbin/ldconfig
+%post sql-sqlite -p /sbin/ldconfig
+%postun sql-sqlite -p /sbin/ldconfig
 %post sql-pgsql -p /sbin/ldconfig
 %postun sql-pgsql -p /sbin/ldconfig
 %post tmva -p /sbin/ldconfig
@@ -2000,6 +2042,7 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
 
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %files graf-qt -f includelist-graf2d-qt
@@ -2144,6 +2187,14 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%files io-hdfs -f includelist-io-hdfs
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libHDFS.*
+%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
+%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
+%endif
+
 %files io-rfio -f includelist-io-rfio
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libRFIO.*
@@ -2384,6 +2435,11 @@ fi
 %{_libdir}/%{name}/libRODBC.*
 %{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
 
+%files sql-sqlite -f includelist-sql-sqlite
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libSQLite.*
+%{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
+
 %files sql-pgsql -f includelist-sql-pgsql
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libPgSQL.*
@@ -2421,6 +2477,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
+- Update to 5.34.09
+- New sub-package: root-io-hdfs (Fedora 20+)
+- New sub-package: root-sql-sqlite
+
 * Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
 - Exclude armv7hl - cint is not working
 - Use _pkgdocdir when defined

From de04a944e2044cc941001ab81aa5678111b1a810 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 10 Sep 2013 09:27:03 +0200
Subject: [PATCH 039/344] Update sources file

---
 root.spec | 2 +-
 sources   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 124ee7e..ab0a390 100644
--- a/root.spec
+++ b/root.spec
@@ -2478,7 +2478,7 @@ fi
 
 %changelog
 * Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
-- Update to 5.34.09
+- Update to 5.34.10
 - New sub-package: root-io-hdfs (Fedora 20+)
 - New sub-package: root-sql-sqlite
 
diff --git a/sources b/sources
index 1d7209e..8a18003 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63fd002819184001cd4293aaf04b0ab5  root-5.34.09.tar.xz
+144ea7c3f9b3aea96445701956e3bc81  root-5.34.10.tar.xz

From e63c9362253813acfc209e68aea51ff509416337 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 18 Nov 2013 10:52:55 +1000
Subject: [PATCH 040/344] rebuilt for GLEW 1.10

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index ab0a390..7bbf413 100644
--- a/root.spec
+++ b/root.spec
@@ -44,7 +44,7 @@
 Name:		root
 Version:	5.34.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2477,6 +2477,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
+- rebuilt for GLEW 1.10
+
 * Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
 - Update to 5.34.10
 - New sub-package: root-io-hdfs (Fedora 20+)

From 5d41d25f4710ef7571ad0674b377673d67e585cd Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 25 Nov 2013 23:25:50 -0700
Subject: [PATCH 041/344] Fix hadoop lib location

---
 root.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 7bbf413..52525a7 100644
--- a/root.spec
+++ b/root.spec
@@ -44,7 +44,7 @@
 Name:		root
 Version:	5.34.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -1281,7 +1281,7 @@ export JAVA_HOME=/usr/lib/jvm/java
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 	    --enable-hdfs \
 	      --with-hdfs-incdir=%{_includedir}/hadoop \
-	      --with-hdfs-libdir=%{_libdir}/hadoop \
+	      --with-hdfs-libdir=%{_libdir} \
 %else
 	    --disable-hdfs \
 %endif
@@ -1539,7 +1539,7 @@ 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
-LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl:%{_libdir}/hadoop:/usr/lib/jvm/jre/lib/amd64/server:/usr/lib/jvm/jre/lib/i386/server \
+LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl:/usr/lib/jvm/jre/lib/amd64/server:/usr/lib/jvm/jre/lib/i386/server \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
 mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
@@ -2477,6 +2477,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
+- Fix hadoop lib location
+
 * Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
 - rebuilt for GLEW 1.10
 

From 1c00eef2cf8d2218bf84c428f25f00326261e0fe Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 4 Dec 2013 20:18:36 +0100
Subject: [PATCH 042/344] Update to 5.34.13

- Remove java-devel build dependency (not needed with Fedora's libhdfs)
- Adapt to pythia8 >= 8.1.80
---
 root-dont-link-jvm.patch  | 123 ++++++++++++++++++++++++++++++++++++++
 root-pythia8-incdir.patch |  24 ++++++++
 root-unuran.patch         |  18 +++---
 root.spec                 |  31 +++++++---
 sources                   |   2 +-
 5 files changed, 179 insertions(+), 19 deletions(-)
 create mode 100644 root-dont-link-jvm.patch
 create mode 100644 root-pythia8-incdir.patch

diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
new file mode 100644
index 0000000..594d7c3
--- /dev/null
+++ b/root-dont-link-jvm.patch
@@ -0,0 +1,123 @@
+diff -ur root-5.34.11.orig/cmake/modules/RootConfiguration.cmake root-5.34.11/cmake/modules/RootConfiguration.cmake
+--- root-5.34.11.orig/cmake/modules/RootConfiguration.cmake	2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/cmake/modules/RootConfiguration.cmake	2013-11-06 09:43:56.008974184 +0100
+@@ -167,10 +167,6 @@
+ set(hdfslib ${HDFS_LIBRARY})
+ set(hdfsincdir ${HDFS_INCLUDE_DIR})
+ 
+-set(jniincdir ${Java_INCLUDE_DIRS})
+-set(jvmlib ${Java_LIBRARIES})
+-set(jvmlibdir ${Java_LIBRARY_DIR})
+-
+ set(buildalien ${value${alien}})
+ set(alienlibdir ${ALIEN_LIBRARY_DIR})
+ set(alienlib ${ALIEN_LIBRARY})
+diff -ur root-5.34.11.orig/config/Makefile.in root-5.34.11/config/Makefile.in
+--- root-5.34.11.orig/config/Makefile.in	2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/config/Makefile.in	2013-11-06 09:41:09.145976839 +0100
+@@ -198,9 +198,6 @@
+ HDFSLIBDIR     := @hdfslibdir@
+ HDFSCLILIB     := @hdfslib@
+ HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
+-JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
+-JVMCLILIB      := @jvmlib@
+-JVMLIBDIR      := @jvmlibdir@
+ 
+ BUILDALIEN     := @buildalien@
+ ALIENLIBDIR    := @alienlibdir@
+diff -ur root-5.34.11.orig/configure root-5.34.11/configure
+--- root-5.34.11.orig/configure	2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/configure	2013-11-06 09:39:57.651833708 +0100
+@@ -1682,8 +1682,6 @@
+   hdfs-incdir        HDFS support, location of hdfs.h
+   hdfs-libdir        HDFS support, location of libhdfs
+   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
+-  jni-incdir         HDFS support, location of JNI headers
+-  jvm-libdir         HDFS support, location of JVM library
+   krb5               Kerberos5 support, location of Kerberos distribution
+   krb5-incdir        Kerberos5 support, location of krb5.h
+   krb5-libdir        Kerberos5 support, location of libkrb5
+@@ -2047,8 +2045,6 @@
+       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-iosvers=*)        iosvers=$optarg       ;;
+-      --with-jni-incdir=*)     jniincdir=$optarg     ;;
+-      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
+       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
+       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
+       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
+@@ -4082,17 +4078,6 @@
+     hdfsinc=$found_hdr
+     hdfsincdir=$found_dir
+ 
+-    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
+-       JAVA_HOME=`/usr/libexec/java_home`
+-    fi
+-
+-    keepincdir=$jniincdir
+-    check_header "jni.h" "$jniincdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/include} \
+-        /usr/java/default/include /usr/include /usr/local/include
+-    jniinc=$found_hdr
+-    jniincdir=$found_dir
+-
+     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
+         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
+         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
+@@ -4100,26 +4085,12 @@
+     hdfslib=$found_lib
+     hdfslibdir=$found_dir
+ 
+-    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
+-        /usr/java/default/jre/lib/amd64/server \
+-        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
+-    jvmlib=$found_lib
+-    jvmlibdir=$found_dir
+-
+-    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
++    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
+         enable_hdfs="no"
+     else
+         case $platform in
+             linux)
+-                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
+-                if test $link_result -eq 0 ; then
+-                    enable_hdfs="no"
+-                fi
+-
+-                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
++                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
+                 if test $link_result -eq 0 ; then
+                     enable_hdfs="no"
+                 fi
+@@ -6843,9 +6814,6 @@
+     -e "s|@iosvers@|$iosvers|"                  \
+     -e "s|@iconpath@|$iconpath|"                \
+     -e "s|@incdir@|$incdir|"                    \
+-    -e "s|@jniincdir@|$jniincdir|g"             \
+-    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
+-    -e "s|@jvmlib@|$jvmlib|g"                   \
+     -e "s|@krb5incdir@|$krb5incdir|"            \
+     -e "s|@krb5lib@|$krb5lib|"                  \
+     -e "s|@krb5libdir@|$krb5libdir|"            \
+diff -ur root-5.34.11.orig/io/hdfs/Module.mk root-5.34.11/io/hdfs/Module.mk
+--- root-5.34.11.orig/io/hdfs/Module.mk	2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/io/hdfs/Module.mk	2013-11-06 09:42:21.320111053 +0100
+@@ -44,7 +44,7 @@
+ $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
+-		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
++		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
+ 
+ $(HDFSDS):      $(HDFSH) $(HDFSL) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)
+@@ -68,4 +68,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
++$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-pythia8-incdir.patch b/root-pythia8-incdir.patch
new file mode 100644
index 0000000..b0d0af2
--- /dev/null
+++ b/root-pythia8-incdir.patch
@@ -0,0 +1,24 @@
+diff -ur root-5.34.13.orig/config/Makefile.in root-5.34.13/config/Makefile.in
+--- root-5.34.13.orig/config/Makefile.in	2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/config/Makefile.in	2013-12-04 14:50:39.291637133 +0100
+@@ -224,7 +224,7 @@
+ FPYTHIA6CPPFLAGS := @pythia6cppflags@
+ 
+ BUILDFPYTHIA8    := @buildpythia8@
+-FPYTHIA8INCDIR   := @pythia8incdir@
++FPYTHIA8INCDIR   := $(filter-out /usr/include, @pythia8incdir@)
+ FPYTHIA8LIBDIR   := @pythia8libdir@
+ FPYTHIA8LIB      := @pythia8lib@
+ 
+diff -ur root-5.34.13.orig/montecarlo/pythia8/Module.mk root-5.34.13/montecarlo/pythia8/Module.mk
+--- root-5.34.13.orig/montecarlo/pythia8/Module.mk	2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/montecarlo/pythia8/Module.mk	2013-12-04 15:22:12.637030866 +0100
+@@ -50,7 +50,7 @@
+ $(PYTHIA8DS):   $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)
+ 		@echo "Generating dictionary $@..."
+-		$(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
++		$(ROOTCINTTMP) -f $@ -c $(FPYTHIA8INCDIR:%=-I%) $(PYTHIA8H) $(PYTHIA8L)
+ 
+ $(PYTHIA8MAP):  $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
+ 		$(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \
diff --git a/root-unuran.patch b/root-unuran.patch
index b051e6e..e0557e5 100644
--- a/root-unuran.patch
+++ b/root-unuran.patch
@@ -1,16 +1,16 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root-trunk.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
-+++ root-trunk/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
- 
+diff -ur root-5.34.13.orig/math/unuran/Module.mk root-5.34.13/math/unuran/Module.mk
+--- root-5.34.13.orig/math/unuran/Module.mk	2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/math/unuran/Module.mk	2013-12-03 20:11:58.916479324 +0100
+@@ -31,7 +31,7 @@
+                 $(wildcard $(UNRDIRS)/src/uniform/*.c) \
+                 $(wildcard $(UNRDIRS)/src/urng/*.c)
+ else
 -UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
 +UNRTARCONTENT:=
  UNRS         := $(filter %.c, \
                  $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
                  $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -69,10 +69,9 @@
+@@ -81,10 +81,9 @@
  ##### local rules #####
  .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
  
@@ -22,7 +22,7 @@ diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
  $(UNRS):        $(UNURANETAG)
  
  $(UNURANETAG):	$(UNRSRCS)
-@@ -125,12 +124,12 @@
+@@ -137,12 +136,12 @@
  		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
  		CFLAGS="$$ACFLAGS");
  
diff --git a/root.spec b/root.spec
index 52525a7..d1aaa53 100644
--- a/root.spec
+++ b/root.spec
@@ -42,9 +42,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.10
+Version:	5.34.13
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -84,6 +84,10 @@ Patch6:		%{name}-thtml-revert.patch
 Patch7:		%{name}-no-extra-formats.patch
 #		Fixes for HDFS module
 Patch8:		%{name}-hdfs.patch
+#		Don't link to libjvm (handled properly inside libhdfs)
+Patch9:		%{name}-dont-link-jvm.patch
+#		Filter out /usr/include
+Patch10:	%{name}-pythia8-incdir.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
@@ -154,7 +158,6 @@ BuildRequires:	srm-ifce-devel
 %endif
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:	hadoop-devel
-BuildRequires:	java-devel
 %endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
@@ -165,7 +168,7 @@ BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	expat-devel
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires:	pythia8-devel
+BuildRequires:	pythia8-devel >= 8.1.80
 %endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	font(liberationsans)
@@ -1160,6 +1163,8 @@ fi
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -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 \
@@ -1242,7 +1247,6 @@ sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
 unset QTDIR
 unset QTLIB
 unset QTINC
-export JAVA_HOME=/usr/lib/jvm/java
 ./configure --prefix=%{_prefix} \
 	    --libdir=%{_libdir}/%{name} \
 	    --etcdir=%{_datadir}/%{name} \
@@ -1281,7 +1285,6 @@ export JAVA_HOME=/usr/lib/jvm/java
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 	    --enable-hdfs \
 	      --with-hdfs-incdir=%{_includedir}/hadoop \
-	      --with-hdfs-libdir=%{_libdir} \
 %else
 	    --disable-hdfs \
 %endif
@@ -1297,7 +1300,6 @@ export JAVA_HOME=/usr/lib/jvm/java
 	    --enable-python \
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 	    --enable-pythia8 \
-	      --with-pythia8-incdir=%{_includedir}/pythia8 \
 %else
 	    --disable-pythia8 \
 %endif
@@ -1342,6 +1344,7 @@ export JAVA_HOME=/usr/lib/jvm/java
 	    --disable-cling \
 	    --disable-cxx11 \
 	    --disable-glite \
+	    --disable-libcxx \
 	    --disable-monalisa \
 	    --disable-oracle \
 	    --disable-pythia6 \
@@ -1357,11 +1360,13 @@ make OPTFLAGS="%{optflags}" \
 # Build PyROOT for python 2.6
 mkdir pyroot26
 cp bindings/pyroot26/ROOT.py pyroot26
+cp bindings/pyroot26/cppyy.py pyroot26
 make OPTFLAGS="%{optflags}" \
 	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
 	MODULES="build cint/cint core/utils bindings/pyroot26" \
 	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
-	PYROOTLIB=pyroot26/libPyROOT.so ROOTPY=pyroot26/ROOT.py
+	PYROOTLIB=pyroot26/libPyROOT.so \
+	ROOTPY="pyroot26/ROOT.py pyroot26/cppyy.py"
 %endif
 
 %install
@@ -1434,6 +1439,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{python26_sitearch}
 install pyroot26/libPyROOT.so.%{libversion} \
    ${RPM_BUILD_ROOT}%{python26_sitearch}/libPyROOT.so
 install -m 644 pyroot26/ROOT.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
+install -m 644 pyroot26/cppyy.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
 %endif
 
 # Same for the Ruby interface library
@@ -1539,7 +1545,7 @@ 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
-LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl:/usr/lib/jvm/jre/lib/amd64/server:/usr/lib/jvm/jre/lib/i386/server \
+LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
 mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
@@ -1973,6 +1979,7 @@ fi
 %endif
 %{python_sitearch}/libPyROOT.*
 %{python_sitearch}/ROOT.py*
+%{python_sitearch}/cppyy.py*
 
 %if "%{?rhel}" == "5"
 %files python26 -f includelist-bindings-pyroot
@@ -1983,6 +1990,7 @@ fi
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %{python26_sitearch}/libPyROOT.*
 %{python26_sitearch}/ROOT.py*
+%{python26_sitearch}/cppyy.py*
 %endif
 
 %files ruby -f includelist-bindings-ruby
@@ -2477,6 +2485,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
+- Update to 5.34.13
+- Remove java-devel build dependency (not needed with Fedora's libhdfs)
+- Adapt to pythia8 >= 8.1.80
+
 * Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
 - Fix hadoop lib location
 
diff --git a/sources b/sources
index 8a18003..0d3741f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-144ea7c3f9b3aea96445701956e3bc81  root-5.34.10.tar.xz
+0d4538ebd29542d4bb0ae48922ae54a8  root-5.34.13.tar.xz

From b06f48b2287292686022613baf73f9f2848cdf6e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 19 Dec 2013 13:37:13 +0100
Subject: [PATCH 043/344] Update to 5.34.14

- New sub-packages: root-net-davix
- Drop patch root-pythia8-incdir.patch
---
 root-pythia8-incdir.patch |  24 -------
 root-xrootd.patch         |  10 +--
 root.spec                 | 131 +++++++++-----------------------------
 sources                   |   2 +-
 4 files changed, 36 insertions(+), 131 deletions(-)
 delete mode 100644 root-pythia8-incdir.patch

diff --git a/root-pythia8-incdir.patch b/root-pythia8-incdir.patch
deleted file mode 100644
index b0d0af2..0000000
--- a/root-pythia8-incdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur root-5.34.13.orig/config/Makefile.in root-5.34.13/config/Makefile.in
---- root-5.34.13.orig/config/Makefile.in	2013-12-01 11:58:21.000000000 +0100
-+++ root-5.34.13/config/Makefile.in	2013-12-04 14:50:39.291637133 +0100
-@@ -224,7 +224,7 @@
- FPYTHIA6CPPFLAGS := @pythia6cppflags@
- 
- BUILDFPYTHIA8    := @buildpythia8@
--FPYTHIA8INCDIR   := @pythia8incdir@
-+FPYTHIA8INCDIR   := $(filter-out /usr/include, @pythia8incdir@)
- FPYTHIA8LIBDIR   := @pythia8libdir@
- FPYTHIA8LIB      := @pythia8lib@
- 
-diff -ur root-5.34.13.orig/montecarlo/pythia8/Module.mk root-5.34.13/montecarlo/pythia8/Module.mk
---- root-5.34.13.orig/montecarlo/pythia8/Module.mk	2013-12-01 11:58:21.000000000 +0100
-+++ root-5.34.13/montecarlo/pythia8/Module.mk	2013-12-04 15:22:12.637030866 +0100
-@@ -50,7 +50,7 @@
- $(PYTHIA8DS):   $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
- 		@echo "Generating dictionary $@..."
--		$(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
-+		$(ROOTCINTTMP) -f $@ -c $(FPYTHIA8INCDIR:%=-I%) $(PYTHIA8H) $(PYTHIA8L)
- 
- $(PYTHIA8MAP):  $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
- 		$(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 9f7c113..6837a81 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur root-5.34.14.orig/configure root-5.34.14/configure
+--- root-5.34.14.orig/configure	2013-12-16 12:19:34.000000000 +0100
++++ root-5.34.14/configure	2013-12-19 03:47:25.973920954 +0100
+@@ -4926,10 +4926,14 @@
     if test "x$enable_xrootd" = "xyes"; then
        xrdlibdir="$tmpxrdlibdir"
        if test "x$enable_bonjour" = "xyes"; then
@@ -19,4 +19,4 @@ diff -ur root-5.32.01.orig/configure root-5.32.01/configure
 +         bonjourcppflags=
        fi
     fi
- fi
+ 
diff --git a/root.spec b/root.spec
index d1aaa53..c58dcdc 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.13
+Version:	5.34.14
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -86,8 +86,6 @@ Patch7:		%{name}-no-extra-formats.patch
 Patch8:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch9:		%{name}-dont-link-jvm.patch
-#		Filter out /usr/include
-Patch10:	%{name}-pythia8-incdir.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
@@ -149,10 +147,11 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
-BuildRequires:	xrootd-client-devel
-BuildRequires:	xrootd-private-devel
+BuildRequires:	xrootd-client-devel >= 1:3.3.5
+BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
 %if %{gfal}
+BuildRequires:	davix-devel
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
 %endif
@@ -943,6 +942,14 @@ Group:		Applications/Engineering
 %description net-auth
 This package contains the basic authentication algorithms used by ROOT.
 
+%package net-davix
+Summary:	Davix extension for ROOT
+Group:		Applications/Engineering
+
+%description net-davix
+This package contains the davix extension for ROOT, that provides
+access to http based storage such as webdav and S3.
+
 %package net-globus
 Summary:	Globus extension for ROOT
 Group:		Applications/Engineering
@@ -975,7 +982,8 @@ Group:		Applications/Engineering
 
 %description netx
 This package contains the NetX extension for ROOT, i.e. a client for
-the xrootd server.
+the xrootd server. Both the old (NetX) and the new (NetXNG) version are
+provided.
 
 %package proof
 Summary:	PROOF extension for ROOT
@@ -1164,7 +1172,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -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 \
@@ -1266,6 +1273,7 @@ unset QTINC
 	    --enable-asimage \
 	    --enable-astiff \
 	    --enable-bonjour \
+	    --enable-davix \
 	    --enable-dcache \
 	    --enable-explicitlink \
 	    --enable-fftw3 \
@@ -1567,6 +1575,7 @@ cat includelist-graf2d-mathtext >> includelist-graf2d-x11
 cat includelist-gui-guihtml >> includelist-gui-gui
 cat includelist-io-xmlparser >> includelist-io-xml
 cat includelist-proof-proofplayer >> includelist-proof-proof
+cat includelist-net-netx* > includelist-netx
 
 %if "%{?rhel}" == "5"
 # Python byte code compilation
@@ -1806,6 +1815,8 @@ fi
 %postun net-bonjour -p /sbin/ldconfig
 %post net-auth -p /sbin/ldconfig
 %postun net-auth -p /sbin/ldconfig
+%post net-davix -p /sbin/ldconfig
+%postun net-davix -p /sbin/ldconfig
 %post net-globus -p /sbin/ldconfig
 %postun net-globus -p /sbin/ldconfig
 %post net-krb5 -p /sbin/ldconfig
@@ -1840,7 +1851,6 @@ fi
 %postun tree-viewer -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/hadd
 %{_bindir}/root
 %{_bindir}/root.exe
@@ -1860,11 +1870,9 @@ fi
 %{_datadir}/mime/packages/root.xml
 
 %files icons
-%defattr(-,root,root,-)
 %{_datadir}/%{name}/icons
 
 %files core -f includelist-core
-%defattr(-,root,root,-)
 %{_bindir}/memprobe
 %{_bindir}/rlibmap
 %{_bindir}/rmkdepend
@@ -1904,7 +1912,6 @@ fi
 %doc %{_pkgdocdir}/README
 
 %files cint -f includelist-cint-cint
-%defattr(-,root,root,-)
 %{_bindir}/rootcint
 %{_mandir}/man1/rootcint.1*
 %dir %{_libdir}/%{name}
@@ -1917,14 +1924,12 @@ fi
 
 %ifarch %{ix86} x86_64
 %files cintex -f includelist-cint-cintex
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libCintex.*
 %{python_sitearch}/PyCintex.py*
 %dir %{_includedir}/%{name}/Cintex
 %endif
 
 %files reflex -f includelist-cint-reflex
-%defattr(-,root,root,-)
 %{_bindir}/genmap
 %{_bindir}/genreflex
 %{_bindir}/genreflex-rootcint
@@ -1939,16 +1944,13 @@ fi
 %dir %{_includedir}/%{name}/Reflex/internal
 
 %files doc
-%defattr(-,root,root,-)
 %doc %{_pkgdocdir}/html
 
 %files tutorial
-%defattr(-,root,root,-)
 %doc %{_pkgdocdir}/test
 %doc %{_pkgdocdir}/tutorials
 
 %files proofd
-%defattr(-,root,root,-)
 %{_bindir}/proofd
 %{_bindir}/proofexecv
 %{_bindir}/proofserv
@@ -1962,13 +1964,11 @@ fi
 %{_initrddir}/proofd
 
 %files rootd
-%defattr(-,root,root,-)
 %{_bindir}/rootd
 %{_mandir}/man1/rootd.1*
 %{_initrddir}/rootd
 
 %files python -f includelist-bindings-pyroot
-%defattr(-,root,root,-)
 %if "%{?rhel}" == "5"
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
@@ -1983,7 +1983,6 @@ fi
 
 %if "%{?rhel}" == "5"
 %files python26 -f includelist-bindings-pyroot
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
@@ -1994,17 +1993,14 @@ fi
 %endif
 
 %files ruby -f includelist-bindings-ruby
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRuby.*
 %{ruby_installdir}/libRuby.*
 
 %files genetic -f includelist-math-genetic
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGenetic.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
 
 %files geom -f includelist-geom
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGeom.*
 %{_libdir}/%{name}/libGeomBuilder.*
 %{_libdir}/%{name}/libGeomPainter.*
@@ -2013,38 +2009,31 @@ fi
 %{_datadir}/%{name}/RadioNuclides.txt
 
 %files gdml -f includelist-geom-gdml
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGdml.*
 %{python_sitearch}/ROOTwriter.py*
 %{python_sitearch}/writer.py*
 
 %files graf -f includelist-graf2d-graf
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGraf.*
 %{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
 
 %files graf-asimage -f includelist-graf2d-asimage
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libASImage.*
 %{_libdir}/%{name}/libASImageGui.*
 %{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
 %{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
 
 %files graf-fitsio -f includelist-graf2d-fitsio
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libFITSIO.*
 
 %files graf-gpad -f includelist-graf2d-gpad
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGpad.*
 %{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
 
 %files graf-gviz -f includelist-graf2d-gviz
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGviz.*
 
 %files graf-postscript -f includelist-graf2d-postscript
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libPostscript.*
 %{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
@@ -2054,29 +2043,24 @@ fi
 
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %files graf-qt -f includelist-graf2d-qt
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGQt.*
 %{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
 %endif
 
 %files graf-x11 -f includelist-graf2d-x11
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGX11.*
 %{_libdir}/%{name}/libGX11TTF.*
 %{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
 %{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
 
 %files graf3d -f includelist-graf3d-g3d
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGraf3d.*
 %{_datadir}/%{name}/plugins/TView/P010_TView3D.C
 
 %files graf3d-eve -f includelist-graf3d-eve
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libEve.*
 
 %files graf3d-gl -f includelist-graf3d-gl
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRGL.*
 %{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
 %{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
@@ -2086,17 +2070,14 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualViewer3D/P030_TGLViewer.C
 
 %files graf3d-gviz3d -f includelist-graf3d-gviz3d
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGviz3d.*
 
 %files graf3d-x3d -f includelist-graf3d-x3d
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libX3d.*
 %{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
 %{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TViewerX3D.C
 
 %files gui -f includelist-gui-gui
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGui.*
 %{_libdir}/%{name}/libGuiHtml.*
 %{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
@@ -2105,35 +2086,29 @@ fi
 %{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
 
 %files gui-fitpanel -f includelist-gui-fitpanel
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libFitPanel.*
 %{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
 
 %files gui-ged -f includelist-gui-ged
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGed.*
 %{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
 
 %files guibuilder -f includelist-gui-guibuilder
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGuiBld.*
 %{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
 %{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
 
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %files gui-qt -f includelist-gui-qt
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libQtRoot.*
 %{_libdir}/%{name}/libQtGSI.*
 %{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
 %endif
 
 %files gui-recorder -f includelist-gui-recorder
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRecorder.*
 
 %files hbook -f includelist-hist-hbook
-%defattr(-,root,root,-)
 %{_bindir}/g2root
 %{_bindir}/h2root
 %{_mandir}/man1/g2root.1*
@@ -2142,25 +2117,20 @@ fi
 %{_libdir}/%{name}/libHbook.*
 
 %files hist -f includelist-hist-hist
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libHist.*
 
 %files hist-painter -f includelist-hist-histpainter
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libHistPainter.*
 %{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
 %{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
 
 %files spectrum -f includelist-hist-spectrum
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSpectrum.*
 
 %files spectrum-painter -f includelist-hist-spectrumpainter
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSpectrumPainter.*
 
 %files hist-factory -f includelist-roofit-histfactory
-%defattr(-,root,root,-)
 %{_bindir}/hist2workspace
 %{_bindir}/prepareHistFactory
 %{_mandir}/man1/hist2workspace.1*
@@ -2171,62 +2141,52 @@ fi
 %doc roofit/histfactory/doc/README
 
 %files html -f includelist-html
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libHtml.*
 %{_datadir}/%{name}/html
 %{_datadir}/%{name}/macros/html.C
 
 %files io -f includelist-io-io
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRIO.*
 %{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
 %{_datadir}/%{name}/plugins/TVirtualStreamerInfo/P010_TStreamerInfo.C
 
 %files io-dcache -f includelist-io-dcache
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libDCache.*
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
 %if %{gfal}
 %files io-gfal -f includelist-io-gfal
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGFAL.*
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 %files io-hdfs -f includelist-io-hdfs
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libHDFS.*
 %{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
 %{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
 %endif
 
 %files io-rfio -f includelist-io-rfio
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRFIO.*
 %{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
 %{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
 
 %files io-sql -f includelist-io-sql
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSQLIO.*
 %{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
 
 %files io-xml -f includelist-io-xml
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libXMLIO.*
 %{_libdir}/%{name}/libXMLParser.*
 %{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
 
 %files foam -f includelist-math-foam
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libFoam.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
 
 %files fftw -f includelist-math-fftw
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libFFTW.*
 %{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
 %{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
@@ -2234,23 +2194,19 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualFFT/P040_TFFTReal.C
 
 %files fumili -f includelist-math-fumili
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libFumili.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
 %{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
 
 %files genvector -f includelist-math-genvector
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGenVector.*
 %dir %{_includedir}/%{name}/Math/GenVector
 
 %files mathcore -f includelist-math-mathcore
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMathCore.*
 %dir %{_includedir}/%{name}/Fit
 
 %files mathmore -f includelist-math-mathmore
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMathMore.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
 %{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
@@ -2265,18 +2221,15 @@ fi
 %{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P020_GSLMCIntegrator.C
 
 %files matrix -f includelist-math-matrix
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMatrix.*
 
 %files minuit -f includelist-math-minuit
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMinuit.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
 %{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
 
 %files minuit2 -f includelist-math-minuit2
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMinuit2.*
 %dir %{_includedir}/%{name}/Minuit2
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
@@ -2284,57 +2237,45 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
 
 %files mlp -f includelist-math-mlp
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMLP.*
 
 %files physics -f includelist-math-physics
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libPhysics.*
 
 %files quadp -f includelist-math-quadp
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libQuadp.*
 
 %files smatrix -f includelist-math-smatrix
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSmatrix.*
 
 %files splot -f includelist-math-splot
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSPlot.*
 
 %files unuran -f includelist-math-unuran
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libUnuran.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
 
 %files memstat -f includelist-misc-memstat
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libMemStat.*
 
 %files table -f includelist-misc-table
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libTable.*
 
 %files montecarlo-eg -f includelist-montecarlo-eg
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libEG.*
 %{_datadir}/%{name}/pdg_table.txt
 %doc %{_pkgdocdir}/cfortran.doc
 
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libEGPythia8.*
 %endif
 
 %files montecarlo-vmc -f includelist-montecarlo-vmc
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libVMC.*
 %{_datadir}/%{name}/vmc
 
 %files net -f includelist-net-net
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libNet.*
 %{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
@@ -2347,41 +2288,39 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
 
 %files net-rpdutils -f includelist-net-rpdutils
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSrvAuth.*
 
 %files net-bonjour -f includelist-net-bonjour
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libBonjour.*
 
 %files net-auth -f includelist-net-auth
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRootAuth.*
 %{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
 %doc %{_pkgdocdir}/README.AUTH
 
+%files net-davix -f includelist-net-davix
+%{_libdir}/%{name}/libRDAVIX.*
+%{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
+%{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
+
 %files net-globus
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libGlobusAuth.*
 %doc %{_pkgdocdir}/README.GLOBUS
 
 %files net-krb5 -f includelist-net-krb5auth
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libKrb5Auth.*
 
 %files net-ldap -f includelist-net-ldap
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRLDAP.*
 
-%files netx -f includelist-net-netx
-%defattr(-,root,root,-)
+%files netx -f includelist-netx
 %{_libdir}/%{name}/libNetx.*
+%{_libdir}/%{name}/libNetxNG.*
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
 
 %files proof -f includelist-proof-proof
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libProof.*
 %{_libdir}/%{name}/libProofDraw.*
 %{_libdir}/%{name}/libProofPlayer.*
@@ -2402,24 +2341,20 @@ fi
 %doc %{_pkgdocdir}/README.PROOF
 
 %files proof-bench -f includelist-proof-proofbench
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libProofBench.*
 %{_datadir}/%{name}/proof
 
 %files proof-pq2 -f includelist-proof-pq2
-%defattr(-,root,root,-)
 %{_bindir}/pq2*
 %{_mandir}/man1/pq2*.1*
 
 %files proof-sessionviewer -f includelist-gui-sessionviewer
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSessionViewer.*
 %{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
 %files xproof -f includelist-proof-proofx
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libProofx.*
 %{_libdir}/%{name}/libXrdProofd.*
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
@@ -2427,64 +2362,58 @@ fi
 %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
 
 %files roofit -f includelist-roofit
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRooFit.*
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooStats.*
 %dir %{_includedir}/%{name}/RooStats
 
 %files sql-mysql -f includelist-sql-mysql
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRMySQL.*
 %{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
 
 %files sql-odbc -f includelist-sql-odbc
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libRODBC.*
 %{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
 
 %files sql-sqlite -f includelist-sql-sqlite
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libSQLite.*
 %{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
 
 %files sql-pgsql -f includelist-sql-pgsql
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libPgSQL.*
 %{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
 
 %files tmva -f includelist-tmva
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libTMVA.*
 %dir %{_includedir}/%{name}/TMVA
 %doc tmva/doc/LICENSE
 
 %files tree -f includelist-tree-tree
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libTree.*
 %doc %{_pkgdocdir}/README.SELECTOR
 
 %files tree-player -f includelist-tree-treeplayer
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libTreePlayer.*
 %{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
 %{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
 
 %files tree-viewer -f includelist-tree-treeviewer
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libTreeViewer.*
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %files -n emacs-%{name}
-%defattr(-,root,root,-)
 %dir %{emacs_lispdir}/root
 %{emacs_lispdir}/root/*.elc
 
 %files -n emacs-%{name}-el
-%defattr(-,root,root,-)
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
+- Update to 5.34.14
+- New sub-packages: root-net-davix
+- Drop patch root-pythia8-incdir.patch
+
 * Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
 - Update to 5.34.13
 - Remove java-devel build dependency (not needed with Fedora's libhdfs)
diff --git a/sources b/sources
index 0d3741f..1bc2d69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d4538ebd29542d4bb0ae48922ae54a8  root-5.34.13.tar.xz
+fd9ee1dac57ec8840fb95ee345e8ad0c  root-5.34.14.tar.xz

From 734af7d621b9c64bf9650fba0f9b1784d24f77cd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 20 Dec 2013 14:07:09 +0100
Subject: [PATCH 044/344] Use versioned BR on davix-devel

---
 root.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index c58dcdc..aab8c6c 100644
--- a/root.spec
+++ b/root.spec
@@ -44,7 +44,7 @@
 Name:		root
 Version:	5.34.14
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -150,8 +150,8 @@ BuildRequires:	dpm-devel
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
+BuildRequires:	davix-devel >= 0.2.7
 %if %{gfal}
-BuildRequires:	davix-devel
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
 %endif
@@ -2409,6 +2409,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
+- Use versioned BR on davix-devel
+
 * Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
 - Update to 5.34.14
 - New sub-packages: root-net-davix

From 803434059fead4b80018acbdb231952e3df8f96b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 23 Dec 2013 09:01:42 +0100
Subject: [PATCH 045/344] Adapt to davix >= 0.2.8

---
 root-davix.patch | 12 ++++++++++++
 root.spec        | 10 +++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 root-davix.patch

diff --git a/root-davix.patch b/root-davix.patch
new file mode 100644
index 0000000..3bd0338
--- /dev/null
+++ b/root-davix.patch
@@ -0,0 +1,12 @@
+diff -ur root-5.34.14.orig/net/davix/src/TDavixSystem.cxx root-5.34.14/net/davix/src/TDavixSystem.cxx
+--- root-5.34.14.orig/net/davix/src/TDavixSystem.cxx	2013-12-16 12:19:34.000000000 +0100
++++ root-5.34.14/net/davix/src/TDavixSystem.cxx	2013-12-23 03:47:03.785238174 +0100
+@@ -172,7 +172,7 @@
+       return 1;
+    }
+    if (vecRep.size() > 0) {
+-      endurl = vecRep[0].getString().c_str();
++      endurl = vecRep[0].uri.getString().c_str();
+    } else {
+       endurl = path;
+    }
diff --git a/root.spec b/root.spec
index aab8c6c..1584db2 100644
--- a/root.spec
+++ b/root.spec
@@ -86,6 +86,8 @@ Patch7:		%{name}-no-extra-formats.patch
 Patch8:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch9:		%{name}-dont-link-jvm.patch
+#		Fix for davix 0.2.8
+Patch10:	%{name}-davix.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
@@ -150,7 +152,7 @@ BuildRequires:	dpm-devel
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
-BuildRequires:	davix-devel >= 0.2.7
+BuildRequires:	davix-devel >= 0.2.8
 %if %{gfal}
 BuildRequires:	gfal-devel
 BuildRequires:	srm-ifce-devel
@@ -945,6 +947,7 @@ This package contains the basic authentication algorithms used by ROOT.
 %package net-davix
 Summary:	Davix extension for ROOT
 Group:		Applications/Engineering
+Requires:	davix-libs%{?_isa} >= 0.2.8
 
 %description net-davix
 This package contains the davix extension for ROOT, that provides
@@ -1172,6 +1175,7 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -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 \
@@ -2409,8 +2413,8 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
-* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
-- Use versioned BR on davix-devel
+* Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
+- Adapt to davix >= 0.2.8
 
 * Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
 - Update to 5.34.14

From 2f5267cd4fbd4563a321f0d39f447bc3c7e82883 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 9 Jan 2014 13:53:14 +0100
Subject: [PATCH 046/344] Rebuild for cfitsio 3.360

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 1584db2..ff0bd16 100644
--- a/root.spec
+++ b/root.spec
@@ -2413,12 +2413,15 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
+- Rebuild for cfitsio 3.360
+
 * Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
 - Adapt to davix >= 0.2.8
 
 * Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
 - Update to 5.34.14
-- New sub-packages: root-net-davix
+- New sub-package: root-net-davix
 - Drop patch root-pythia8-incdir.patch
 
 * Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1

From 0555799990b719959035d8060d00072b6e9574e8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 9 Jan 2014 13:56:10 +0100
Subject: [PATCH 047/344] Rebuild for cfitsio 3.360

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index ff0bd16..c2d2025 100644
--- a/root.spec
+++ b/root.spec
@@ -44,7 +44,7 @@
 Name:		root
 Version:	5.34.14
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering

From 7406803d34747886d5c9685e8eefc934c011aab6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 15 Feb 2014 07:32:03 +0100
Subject: [PATCH 048/344] Update to 5.34.15

- Drop patch root-davix.patch
---
 root-davix.patch | 12 ------------
 root.spec        | 13 +++++++------
 sources          |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 root-davix.patch

diff --git a/root-davix.patch b/root-davix.patch
deleted file mode 100644
index 3bd0338..0000000
--- a/root-davix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-5.34.14.orig/net/davix/src/TDavixSystem.cxx root-5.34.14/net/davix/src/TDavixSystem.cxx
---- root-5.34.14.orig/net/davix/src/TDavixSystem.cxx	2013-12-16 12:19:34.000000000 +0100
-+++ root-5.34.14/net/davix/src/TDavixSystem.cxx	2013-12-23 03:47:03.785238174 +0100
-@@ -172,7 +172,7 @@
-       return 1;
-    }
-    if (vecRep.size() > 0) {
--      endurl = vecRep[0].getString().c_str();
-+      endurl = vecRep[0].uri.getString().c_str();
-    } else {
-       endurl = path;
-    }
diff --git a/root.spec b/root.spec
index c2d2025..1df6585 100644
--- a/root.spec
+++ b/root.spec
@@ -42,9 +42,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.14
+Version:	5.34.15
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -86,8 +86,6 @@ Patch7:		%{name}-no-extra-formats.patch
 Patch8:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch9:		%{name}-dont-link-jvm.patch
-#		Fix for davix 0.2.8
-Patch10:	%{name}-davix.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
@@ -1175,7 +1173,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -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 \
@@ -1520,6 +1517,7 @@ rm TFile/P070_TAlienFile.C
 rm TFile/P110_THDFSFile.C
 %endif
 rm TGLManager/P020_TGWin32GLManager.C
+rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
 rm TGrid/P020_TGLite.C
 %if %{?fedora}%{!?fedora:0} < 9 && %{?rhel}%{!?rhel:0} < 6
@@ -1575,7 +1573,6 @@ cat includelist-geom-geom* > includelist-geom
 cat includelist-roofit-roo* > includelist-roofit
 cat includelist-gui-qt* > includelist-gui-qt
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
-cat includelist-graf2d-mathtext >> includelist-graf2d-x11
 cat includelist-gui-guihtml >> includelist-gui-gui
 cat includelist-io-xmlparser >> includelist-io-xml
 cat includelist-proof-proofplayer >> includelist-proof-proof
@@ -2413,6 +2410,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
+- Update to 5.34.15
+- Drop patch root-davix.patch
+
 * Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
 - Rebuild for cfitsio 3.360
 
diff --git a/sources b/sources
index 1bc2d69..9dc830c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd9ee1dac57ec8840fb95ee345e8ad0c  root-5.34.14.tar.xz
+bd618421e991e3694d5cfbf60abe82de  root-5.34.15.tar.xz

From 3aa26cce302f93d10f5d12989e8f5ce2de514aa8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 27 Feb 2014 19:20:49 +0100
Subject: [PATCH 049/344] Update to 5.34.17

---
 root-bsd-misc.patch | 12 ++++++++++++
 root-includelist    |  1 +
 root.spec           | 11 ++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 root-bsd-misc.patch

diff --git a/root-bsd-misc.patch b/root-bsd-misc.patch
new file mode 100644
index 0000000..b49fbba
--- /dev/null
+++ b/root-bsd-misc.patch
@@ -0,0 +1,12 @@
+diff -ur root-5.34.17.orig/core/base/src/TTimeStamp.cxx root-5.34.17/core/base/src/TTimeStamp.cxx
+--- root-5.34.17.orig/core/base/src/TTimeStamp.cxx	2014-02-24 09:37:53.000000000 +0100
++++ root-5.34.17/core/base/src/TTimeStamp.cxx	2014-02-27 09:37:28.381639337 +0100
+@@ -813,7 +813,7 @@
+           tmstruct.tm_isdst);
+ #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX)
+    printf(",\n      tm_gmtoff %6ld, tm_zone \"%s\"",
+-#if defined(__USE_BSD) || defined(R__MACOSX)
++#if defined(__USE_MISC) || defined(R__MACOSX)
+    tmstruct.tm_gmtoff, tmstruct.tm_zone);
+ #else
+    tmstruct.__tm_gmtoff, tmstruct.__tm_zone);
diff --git a/root-includelist b/root-includelist
index cd7842c..3faece8 100644
--- a/root-includelist
+++ b/root-includelist
@@ -1,3 +1,4 @@
+include config/Makefile.config
 include $(MODULE)/Module.mk
 includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
diff --git a/root.spec b/root.spec
index 1df6585..40a1b3c 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.15
+Version:	5.34.17
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -86,6 +86,8 @@ Patch7:		%{name}-no-extra-formats.patch
 Patch8:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch9:		%{name}-dont-link-jvm.patch
+#		Avoid deprecated __USE_BSD
+Patch10:	%{name}-bsd-misc.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
@@ -1173,6 +1175,7 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -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 \
@@ -1563,8 +1566,7 @@ mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
 # Create includelist files ...
 for module in `find * -name Module.mk` ; do
     module=`dirname $module`
-    make -f %{SOURCE1} includelist MODULE=$module ROOT_SRCDIR=$PWD \
-	HASXRD=yes CRYPTOLIB=yes SSLLIB=yes
+    make -f %{SOURCE1} includelist MODULE=$module
 done
 
 # ... and merge some of them
@@ -2410,6 +2412,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
+- Update to 5.34.17
+
 * Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
 - Update to 5.34.15
 - Drop patch root-davix.patch

From 56ba6949fd1e8a109e5147653910baf546527c69 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 27 Feb 2014 19:27:56 +0100
Subject: [PATCH 050/344] Update to 5.34.17

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 9dc830c..44a4da9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd618421e991e3694d5cfbf60abe82de  root-5.34.15.tar.xz
+1ebb47511ec93108686b81bc8dce8b1e  root-5.34.17.tar.xz

From 62af349cdfc7bf009a5b11d108094e30a002088f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 22 Mar 2014 12:29:07 +0100
Subject: [PATCH 051/344] Update to 5.34.18

- Build GFAL module using libgfal2
- New sub-package: root-vdt
---
 root-fontconfig.patch | 825 ++++++++++++++++++++++++++----------------
 root-gfal2.patch      |  72 ++++
 root.spec             |  66 ++--
 sources               |   2 +-
 4 files changed, 618 insertions(+), 347 deletions(-)
 create mode 100644 root-gfal2.patch

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 98db311..4a5621f 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.34.09.orig/core/base/src/TApplication.cxx root-5.34.09/core/base/src/TApplication.cxx
---- root-5.34.09.orig/core/base/src/TApplication.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/core/base/src/TApplication.cxx	2013-08-08 07:35:32.435919608 +0200
-@@ -237,22 +237,11 @@
+diff -ur root-5.34.18.orig/core/base/src/TApplication.cxx root-5.34.18/core/base/src/TApplication.cxx
+--- root-5.34.18.orig/core/base/src/TApplication.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/core/base/src/TApplication.cxx	2014-03-15 18:15:22.756445235 +0100
+@@ -265,22 +265,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -26,7 +26,7 @@ diff -ur root-5.34.09.orig/core/base/src/TApplication.cxx root-5.34.09/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -266,7 +255,6 @@
+@@ -294,7 +283,6 @@
        }
     }
  #endif
@@ -34,10 +34,10 @@ diff -ur root-5.34.09.orig/core/base/src/TApplication.cxx root-5.34.09/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.09.orig/graf2d/graf/inc/TTF.h root-5.34.09/graf2d/graf/inc/TTF.h
---- root-5.34.09.orig/graf2d/graf/inc/TTF.h	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf2d/graf/inc/TTF.h	2013-08-08 07:35:32.435919608 +0200
-@@ -71,9 +71,8 @@
+diff -ur root-5.34.18.orig/graf2d/graf/inc/TTF.h root-5.34.18/graf2d/graf/inc/TTF.h
+--- root-5.34.18.orig/graf2d/graf/inc/TTF.h	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf2d/graf/inc/TTF.h	2014-03-15 18:15:22.757445223 +0100
+@@ -70,9 +70,8 @@
     static FT_BBox     fgCBox;                  // string control box
     static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
     static Int_t       fgCurFontIdx;            // current font index
@@ -48,9 +48,9 @@ diff -ur root-5.34.09.orig/graf2d/graf/inc/TTF.h root-5.34.09/graf2d/graf/inc/TT
     static FT_Face     fgFace[kTTMaxFonts];     // font face
     static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
     static Bool_t      fgHinting;               // use hinting (true by default)
-diff -ur root-5.34.09.orig/graf2d/graf/Module.mk root-5.34.09/graf2d/graf/Module.mk
---- root-5.34.09.orig/graf2d/graf/Module.mk	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf2d/graf/Module.mk	2013-08-08 07:35:32.435919608 +0200
+diff -ur root-5.34.18.orig/graf2d/graf/Module.mk root-5.34.18/graf2d/graf/Module.mk
+--- root-5.34.18.orig/graf2d/graf/Module.mk	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf2d/graf/Module.mk	2014-03-15 18:15:22.757445223 +0100
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -60,9 +60,9 @@ diff -ur root-5.34.09.orig/graf2d/graf/Module.mk root-5.34.09/graf2d/graf/Module
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/TTF.cxx
---- root-5.34.09.orig/graf2d/graf/src/TTF.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf2d/graf/src/TTF.cxx	2013-08-08 07:35:32.437919624 +0200
+diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/TTF.cxx
+--- root-5.34.18.orig/graf2d/graf/src/TTF.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf2d/graf/src/TTF.cxx	2014-03-20 14:27:01.700346310 +0100
 @@ -17,15 +17,13 @@
  //                                                                      //
  //////////////////////////////////////////////////////////////////////////
@@ -135,53 +135,53 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 +      SetTextFont(12);
 +   }
 +   else if (strcmp(basename, "timesbd.ttf") == 0 ||
-+	    strcmp(basename, "FreeSerifBold.otf") == 0) {
++            strcmp(basename, "FreeSerifBold.otf") == 0) {
 +      SetTextFont(22);
 +   }
 +   else if (strcmp(basename, "timesbi.ttf") == 0 ||
-+	    strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
 +      SetTextFont(32);
 +   }
 +   else if (strcmp(basename, "arial.ttf") == 0 ||
-+	    strcmp(basename, "FreeSans.otf") == 0) {
++            strcmp(basename, "FreeSans.otf") == 0) {
 +      SetTextFont(42);
 +   }
 +   else if (strcmp(basename, "ariali.ttf") == 0 ||
-+	    strcmp(basename, "FreeSansOblique.otf") == 0) {
++            strcmp(basename, "FreeSansOblique.otf") == 0) {
 +      SetTextFont(52);
 +   }
 +   else if (strcmp(basename, "arialbd.ttf") == 0 ||
-+	    strcmp(basename, "FreeSansBold.otf") == 0) {
++            strcmp(basename, "FreeSansBold.otf") == 0) {
 +      SetTextFont(62);
 +   }
 +   else if (strcmp(basename, "arialbi.ttf") == 0 ||
-+	    strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
 +      SetTextFont(72);
 +   }
 +   else if (strcmp(basename, "cour.ttf") == 0 ||
-+	    strcmp(basename, "FreeMono.otf") == 0) {
++            strcmp(basename, "FreeMono.otf") == 0) {
 +      SetTextFont(82);
 +   }
 +   else if (strcmp(basename, "couri.ttf") == 0 ||
-+	    strcmp(basename, "FreeMonoOblique.otf") == 0) {
++            strcmp(basename, "FreeMonoOblique.otf") == 0) {
 +      SetTextFont(92);
 +   }
 +   else if (strcmp(basename, "courbd.ttf") == 0 ||
-+	    strcmp(basename, "FreeMonoBold.otf") == 0) {
++            strcmp(basename, "FreeMonoBold.otf") == 0) {
 +      SetTextFont(102);
 +   }
 +   else if (strcmp(basename, "courbi.ttf") == 0 ||
-+	    strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
 +      SetTextFont(112);
 +   }
 +   else if (strcmp(basename, "symbol.ttf") == 0) {
 +      if (italic)
-+	 SetTextFont(152);
++         SetTextFont(152);
 +      else
-+	 SetTextFont(122);
++         SetTextFont(122);
 +   }
 +   else if (strcmp(basename, "times.ttf") == 0 ||
-+	    strcmp(basename, "FreeSerif.otf") == 0) {
++            strcmp(basename, "FreeSerif.otf") == 0) {
 +      SetTextFont(132);
 +   }
 +   else if (strcmp(basename, "wingding.ttf") == 0) {
@@ -255,8 +255,8 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 +   if (!fgInit) Init();
 +
 +   if (fontid == 0) {
-+     fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
-+     return;
++      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
++      return;
 +   }
 +
     // check if font is in cache
@@ -310,44 +310,44 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 +      const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
 +      switch (fontid) {
 +      case 16:
-+	 ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
++         break;
 +      case 17:
-+	 ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
++         break;
 +      case 18:
-+	 ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
++         break;
 +      case 19:
-+	 ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
++         break;
 +      case 20:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
++         break;
 +      case 21:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
++         break;
 +      case 22:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
++         break;
 +      case 23:
 +         ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
-+	 break;
++         break;
 +      case 24:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
++         break;
 +      case 25:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
++         break;
 +      case 26:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
++         break;
 +      case 27:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
++         break;
 +      case 28:
-+	 ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
-+	 break;
++         ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
++         break;
 +      }
 +   }
  
@@ -355,10 +355,6 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
 -      if (fgFontCount) {
 -         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--         return 0;
--      } else {
--         return 1;
 +      FcPattern *pat, *match;
 +      FcCharSet *set = NULL;
 +      FcResult result;
@@ -367,174 +363,177 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 +
 +      switch (fontid) {
 +      case 1:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 2:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 3:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 4:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 5:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 6:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 7:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 8:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 9:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 10:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 11:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 12:
 +      case 15:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 13:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 14:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 16:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 17:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 18:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 19:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
 +      case 20:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 // set = FcCharSetCreate ();
-+	 // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	 // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         // set = FcCharSetCreate ();
++         // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++         // FcPatternAddCharSet (pat, FC_CHARSET, set);
++         break;
 +      case 21:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 // set = FcCharSetCreate ();
-+	 // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	 // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         // set = FcCharSetCreate ();
++         // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++         // FcPatternAddCharSet (pat, FC_CHARSET, set);
++         break;
 +      case 22:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 23:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 24:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 25:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 26:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 27:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 28:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
 +      case 29:
 +      case 30:
 +      case 31:
-+	 FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+	 FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	 FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	 set = FcCharSetCreate ();
-+	 FcCharSetAddChar (set, 0x0410); // Cyrillic
-+	 FcCharSetAddChar (set, 0x4e00); // CJK
-+	 FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	 break;
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         set = FcCharSetCreate ();
++         FcCharSetAddChar (set, 0x0410); // Cyrillic
++         FcCharSetAddChar (set, 0x4e00); // CJK
++         FcPatternAddCharSet (pat, FC_CHARSET, set);
++         break;
 +      default:
-+	 Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
-+	 FcPatternDestroy (pat);
-+	 Warning("TTF::SetTextFont", "using default font");
-+	 fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+	 return;
-+	 break;
++         Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
++         FcPatternDestroy (pat);
++         Warning("TTF::SetTextFont", "using default font");
+          fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-         return 0;
+-      } else {
+-         return 1;
++         return;
++         break;
        }
 +
 +      FcConfigSubstitute (NULL, pat, FcMatchPattern);
@@ -542,7 +541,7 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
 +      match = FcFontMatch (NULL, pat, &result);
 +      char* ttfnt;
 +      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+      ttfont = StrDup(ttfnt);
++      ttfont = StrDup (ttfnt);
 +      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
 +      FcPatternDestroy (match);
 +      FcPatternDestroy (pat);
@@ -686,9 +685,9 @@ diff -ur root-5.34.09.orig/graf2d/graf/src/TTF.cxx root-5.34.09/graf2d/graf/src/
  }
  
  //______________________________________________________________________________
-diff -ur root-5.34.09.orig/graf2d/postscript/Module.mk root-5.34.09/graf2d/postscript/Module.mk
---- root-5.34.09.orig/graf2d/postscript/Module.mk	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf2d/postscript/Module.mk	2013-08-08 07:35:32.437919624 +0200
+diff -ur root-5.34.18.orig/graf2d/postscript/Module.mk root-5.34.18/graf2d/postscript/Module.mk
+--- root-5.34.18.orig/graf2d/postscript/Module.mk	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf2d/postscript/Module.mk	2014-03-15 18:15:22.758445211 +0100
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -698,9 +697,9 @@ diff -ur root-5.34.09.orig/graf2d/postscript/Module.mk root-5.34.09/graf2d/posts
  
  $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.09.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.09/graf2d/postscript/src/TPostScript.cxx
---- root-5.34.09.orig/graf2d/postscript/src/TPostScript.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf2d/postscript/src/TPostScript.cxx	2013-08-08 07:36:53.709607143 +0200
+diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/graf2d/postscript/src/TPostScript.cxx
+--- root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf2d/postscript/src/TPostScript.cxx	2014-03-15 18:15:22.759445199 +0100
 @@ -238,6 +238,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -1052,9 +1051,9 @@ diff -ur root-5.34.09.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.09/gr
  	   { "Root.PSFont.12",            "/Symbol" },
  	   { "Root.PSFont.13",            "/Times-Roman" },
  	   { "Root.PSFont.14",            "/ZapfDingbats" },
-diff -ur root-5.34.09.orig/graf3d/gl/Module.mk root-5.34.09/graf3d/gl/Module.mk
---- root-5.34.09.orig/graf3d/gl/Module.mk	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf3d/gl/Module.mk	2013-08-08 07:35:32.439919641 +0200
+diff -ur root-5.34.18.orig/graf3d/gl/Module.mk root-5.34.18/graf3d/gl/Module.mk
+--- root-5.34.18.orig/graf3d/gl/Module.mk	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf3d/gl/Module.mk	2014-03-15 18:15:22.760445187 +0100
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -1064,9 +1063,9 @@ diff -ur root-5.34.09.orig/graf3d/gl/Module.mk root-5.34.09/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.09/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf3d/gl/src/TGLFontManager.cxx	2013-08-08 07:35:32.440919650 +0200
+diff -ur root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.18/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf3d/gl/src/TGLFontManager.cxx	2014-03-22 09:22:22.715637375 +0100
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1075,7 +1074,16 @@ diff -ur root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.09/graf3d/
  
  //______________________________________________________________________________
  // TGLFont
-@@ -391,17 +392,91 @@
+@@ -413,7 +414,7 @@
+ ClassImp(TGLFontManager);
+ 
+ TObjArray   TGLFontManager::fgFontFileArray;
+-Int_t TGLFontManager::fgExtendedFontStart;
++Int_t TGLFontManager::fgExtendedFontStart = 0;
+ TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
+ Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
+ 
+@@ -444,19 +445,238 @@
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -1086,114 +1094,303 @@ diff -ur root-5.34.09.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.09/graf3d/
 -      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
 -# endif
 -      {
--         char *fp = gSystem->Which(ttpath, ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf");
+-         //For extenede we have both ttf and otf.
+-         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+-                                   ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
+-                                   ((TObjString*)fgFontFileArray[fileID])->String());
 -         file = fp;
 -         delete [] fp;
-+      const char *fontname = ((TObjString*)fgFontFileArray[fileID])->String().Data();
++      char *file = NULL;
++      int ttindex = 0;
 +
-+      FcPattern *pat, *match;
-+      FcResult result;
-+      char *file;
-+      int ttindex;
++      if (fileID >= 15 && fileID <= 27) {
++         // Use the texlive-stix fonts if they exist
++         // Texlive-stix not packaged correctly - can not be found through fontconfig
++         // Use hardcoded path
++         const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
++         switch (fileID) {
++         case 15:
++            file = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
++            break;
++         case 16:
++            file = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
++            break;
++         case 17:
++            file = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
++            break;
++         case 18:
++            file = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
++            break;
++         case 19:
++            file = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
++            break;
++         case 20:
++            file = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
++            break;
++         case 21:
++            file = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
++            break;
++         case 22:
++            file = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
++            break;
++         case 23:
++            file = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
++            break;
++         case 24:
++            file = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
++            break;
++         case 25:
++            file = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
++            break;
++         case 26:
++            file = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
++            break;
++         case 27:
++            file = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
++            break;
++         }
++      }
 +
-+      pat = FcPatternCreate ();
++      if (!file) {
++         FcPattern *pat, *match;
++         FcCharSet *set = NULL;
++         FcResult result;
 +
-+      if (strcmp(fontname, /* 1 */ "timesi") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
-+      else if (strcmp(fontname, /* 2 */ "timesbd") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 3 */ "timesbi") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
-+      else if (strcmp(fontname, /* 4 */ "arial") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 5 */ "ariali") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
-+      else if (strcmp(fontname, /* 6 */ "arialbd") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 7 */ "arialbi") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         pat = FcPatternCreate ();
++
++         switch (fileID) {
++         case 0:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 1:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 2:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 3:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 4:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 5:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 6:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 7:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 8:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 9:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 10:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 11:
++         case 14:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 12:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 13:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 15:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 16:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 17:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 18:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 19:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            // set = FcCharSetCreate ();
++            // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++            // FcPatternAddCharSet (pat, FC_CHARSET, set);
++            break;
++         case 20:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            // set = FcCharSetCreate ();
++            // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++            // FcPatternAddCharSet (pat, FC_CHARSET, set);
++            break;
++         case 21:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 22:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 23:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 24:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 25:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 26:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 27:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 28:
++         case 29:
++         case 30:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            set = FcCharSetCreate ();
++            FcCharSetAddChar (set, 0x0410); // Cyrillic
++            FcCharSetAddChar (set, 0x4e00); // CJK
++            FcPatternAddCharSet (pat, FC_CHARSET, set);
++         }
++
++         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcDefaultSubstitute (pat);
++         match = FcFontMatch (NULL, pat, &result);
++         char* ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++         file = StrDup (ttfnt);
++         FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++         FcPatternDestroy (match);
++         FcPatternDestroy (pat);
++         if (set) FcCharSetDestroy (set);
        }
-+      else if (strcmp(fontname, /* 8 */ "cour") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 9 */ "couri") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
-+      else if (strcmp(fontname, /* 10 */ "courbd") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 11 */ "courbi") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      }
-+      else if (strcmp(fontname, /* 12 */ "symbol") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 13 */ "times") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+      else if (strcmp(fontname, /* 14 */ "wingding") == 0) {
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      }
-+
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
-+      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&file);
-+      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
  
        FTFont* ftfont = 0;
-       switch (mode)
-@@ -427,9 +502,13 @@
+@@ -482,10 +702,14 @@
+             ftfont = new FTGLTextureFont(file);
              break;
           default:
-             Error("TGLFontManager::GetFont", "invalid FTGL type");
-+            FcPatternDestroy (match);
-+            FcPatternDestroy (pat);
++            delete [] file;
+             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
              return;
              break;
        }
-+      FcPatternDestroy (match);
-+      FcPatternDestroy (pat);
++
++      delete [] file;
++
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-diff -ur root-5.34.09.orig/graf3d/gl/src/TGLText.cxx root-5.34.09/graf3d/gl/src/TGLText.cxx
---- root-5.34.09.orig/graf3d/gl/src/TGLText.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/graf3d/gl/src/TGLText.cxx	2013-08-08 07:35:32.441919658 +0200
+@@ -567,8 +791,6 @@
+ {
+    if (fgStaticInitDone == kFALSE) InitStatics();
+ 
+-   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
+-   
+    return fgExtendedFontStart;
+ }
+ 
+@@ -636,28 +858,6 @@
+    fgFontFileArray.Add(new TObjString("wingding")); // 140
+    fgFontFileArray.Add(new TObjString("symbol"));   // 150
+ 
+-   fgExtendedFontStart = fgFontFileArray.GetEntries();
+-   //"Extended" fonts for gl-pad.
+-   //fgPadFontStart + ...
+-   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
+-
+-   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
+-   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
+-   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
+-   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
+-
+-   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
+-   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
+-   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
+-   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
+-
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
+-   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
+-   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
+-
+    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
+    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
+    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
+diff -ur root-5.34.18.orig/graf3d/gl/src/TGLText.cxx root-5.34.18/graf3d/gl/src/TGLText.cxx
+--- root-5.34.18.orig/graf3d/gl/src/TGLText.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/graf3d/gl/src/TGLText.cxx	2014-03-22 09:15:17.075732162 +0100
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1321,17 +1518,21 @@ diff -ur root-5.34.09.orig/graf3d/gl/src/TGLText.cxx root-5.34.09/graf3d/gl/src/
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -209,5 +269,6 @@
+@@ -207,7 +267,9 @@
+ 
+    fGLTextFont = new FTGLPolygonFont(ttfont);
  
-    if (!fGLTextFont->FaceSize(1))
-       Error("SetGLTextFont","Cannot set FTGL::FaceSize"),
--   delete [] ttfont;
 +   FcPatternDestroy (match);
 +   FcPatternDestroy (pat);
++
+    if (!fGLTextFont->FaceSize(1))
+-      Error("SetGLTextFont","Cannot set FTGL::FaceSize"),
+-   delete [] ttfont;
++      Error("SetGLTextFont","Cannot set FTGL::FaceSize");
  }
-diff -ur root-5.34.09.orig/gui/gui/src/TGApplication.cxx root-5.34.09/gui/gui/src/TGApplication.cxx
---- root-5.34.09.orig/gui/gui/src/TGApplication.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/gui/gui/src/TGApplication.cxx	2013-08-08 07:35:32.442919667 +0200
+diff -ur root-5.34.18.orig/gui/gui/src/TGApplication.cxx root-5.34.18/gui/gui/src/TGApplication.cxx
+--- root-5.34.18.orig/gui/gui/src/TGApplication.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/gui/gui/src/TGApplication.cxx	2014-03-15 18:15:22.761445175 +0100
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1359,9 +1560,9 @@ diff -ur root-5.34.09.orig/gui/gui/src/TGApplication.cxx root-5.34.09/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.09.orig/gui/gui/src/TGSpeedo.cxx root-5.34.09/gui/gui/src/TGSpeedo.cxx
---- root-5.34.09.orig/gui/gui/src/TGSpeedo.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/gui/gui/src/TGSpeedo.cxx	2013-08-08 07:35:32.442919667 +0200
+diff -ur root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx root-5.34.18/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/gui/gui/src/TGSpeedo.cxx	2014-03-15 18:15:22.761445175 +0100
 @@ -119,8 +119,7 @@
  
     TString sc;
diff --git a/root-gfal2.patch b/root-gfal2.patch
new file mode 100644
index 0000000..cc1374f
--- /dev/null
+++ b/root-gfal2.patch
@@ -0,0 +1,72 @@
+--- root-5.34.18.orig/configure	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/configure	2014-03-19 09:56:58.943322923 +0100
+@@ -1630,7 +1630,7 @@
+   fitsio             Read images and data from FITS files, requires cfitsio
+   gviz               Graphs visualization support, requires graphviz
+   gdml               GDML writer and reader
+-  gfal               GFAL support, requires libgfal
++  gfal               GFAL support, requires libgfal or libgfal2
+   globus             Globus authentication support, requires Globus toolkit
+   glite              gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)
+   gsl-shared         Enable linking against shared libraries for GSL (default no)
+@@ -1719,7 +1719,7 @@
+   gfal-incdir        GFAL support, location of gfal_api.h
+   srm-ifce-incdir    GFAL support, location of gfal_srm_ifce_types.h
+   glib2-incdir       GFAL support, location of glib-2.0 headers
+-  gfal-libdir        GFAL support, location of libgfal
++  gfal-libdir        GFAL support, location of libgfal or libgfal2
+   glew-incdir        GLEW support, location of glew.h
+   glew-libdir        GLEW support, location of libGLEW
+   gsl-incdir         GSL support, location of gsl/gsl_version.h
+@@ -3759,10 +3759,17 @@
+     gfalinc=$found_hdr
+     gfalincdir=$found_dir
+ 
+-    check_library "libgfal" "$enable_shared" "$gfallibdir" \
+-        $GFAL ${GFAL:+$GFAL/lib} \
+-        /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \
+-        /usr/local/gfal/lib
++    if grep -q "GFAL2" $gfalincdir/gfal_api.h ; then
++        check_library "libgfal2" "$enable_shared" "$gfallibdir" \
++            $GFAL ${GFAL:+$GFAL/lib} \
++            /opt/lcg/lib /opt/gfal2/lib /usr/local/lcg/lib \
++            /usr/local/gfal2/lib
++    else
++        check_library "libgfal" "$enable_shared" "$gfallibdir" \
++            $GFAL ${GFAL:+$GFAL/lib} \
++            /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \
++            /usr/local/gfal/lib
++    fi
+     gfallib=$found_lib
+     gfallibdir=$found_dir
+ 
+diff -ur root-5.34.18.orig/io/gfal/src/TGFALFile.cxx root-5.34.18/io/gfal/src/TGFALFile.cxx
+--- root-5.34.18.orig/io/gfal/src/TGFALFile.cxx	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/io/gfal/src/TGFALFile.cxx	2014-03-19 11:48:13.762930884 +0100
+@@ -60,7 +60,6 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
+-#include "TGFALFile.h"
+ #include "TROOT.h"
+ #include "TUrl.h"
+ 
+@@ -68,6 +67,18 @@
+ #include <gfal_api.h>
+ }
+ 
++// GFAL2 doesn't use special names for 64 bit versions
++#ifdef _GFAL2_API_
++#define gfal_lseek64   gfal_lseek
++#define gfal_open64    gfal_open
++#define gfal_readdir64 gfal_readdir
++#define gfal_stat64    gfal_stat
++#define dirent64       dirent
++#define stat64         stat
++#endif
++
++#include "TGFALFile.h"
++
+ ClassImp(TGFALFile)
+ ClassImp(TGFALSystem)
+ 
diff --git a/root.spec b/root.spec
index 40a1b3c..a5dbd2b 100644
--- a/root.spec
+++ b/root.spec
@@ -7,16 +7,6 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
-%if "%{?rhel}" == "5"
-%ifarch ppc
-%global gfal 0
-%else
-%global gfal 1
-%endif
-%else
-%global gfal 1
-%endif
-
 %{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
@@ -42,7 +32,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.17
+Version:	5.34.18
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -88,6 +78,8 @@ Patch8:		%{name}-hdfs.patch
 Patch9:		%{name}-dont-link-jvm.patch
 #		Avoid deprecated __USE_BSD
 Patch10:	%{name}-bsd-misc.patch
+#		Use GFAL2
+Patch11:	%{name}-gfal2.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
@@ -153,10 +145,8 @@ BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
-%if %{gfal}
-BuildRequires:	gfal-devel
+BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%endif
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:	hadoop-devel
 %endif
@@ -672,16 +662,14 @@ Group:		Applications/Engineering
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
-%if %{gfal}
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
 Group:		Applications/Engineering
 
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
-%endif
 
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 %package io-hdfs
 Summary:	Hadoop File System input/output library for ROOT
 Group:		Applications/Engineering
@@ -875,6 +863,15 @@ init-program computes all tables and constants necessary for the
 random variate generation. The sample program can then generate
 variates from the desired distribution.
 
+%package vdt
+Summary:	VDT mathematical library
+Group:		Applications/Engineering
+
+%description vdt
+VDT is a library of mathematical functions, implemented in double and
+single precision. The implementation is fast and with the aid of
+modern compilers (e.g. gcc 4.7) vectorisable.
+
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
 Group:		Applications/Engineering
@@ -1176,6 +1173,7 @@ fi
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -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 \
@@ -1284,17 +1282,13 @@ unset QTINC
 	    --enable-fitsio \
 	    --enable-gdml \
 	    --enable-genvector \
-%if %{gfal}
 	    --enable-gfal \
-	      --with-gfal-incdir=%{_includedir} \
+	      --with-gfal-incdir=%{_includedir}/gfal2 \
 	      --with-gfal-libdir=%{_libdir} \
-%else
-	    --disable-gfal \
-%endif
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 	    --enable-hdfs \
 	      --with-hdfs-incdir=%{_includedir}/hadoop \
 %else
@@ -1336,6 +1330,7 @@ unset QTINC
 	    --enable-table \
 	    --enable-tmva \
 	    --enable-unuran \
+	    --enable-vdt \
 	    --enable-x11 \
 	    --enable-xft \
 	    --enable-xml \
@@ -1363,6 +1358,7 @@ unset QTINC
 	    --disable-rpath \
 	    --disable-sapdb \
 	    --disable-srp \
+	    --disable-vc \
 	    --fail-on-missing
 
 make OPTFLAGS="%{optflags}" \
@@ -1511,12 +1507,9 @@ rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
-%if "%{gfal}" == "0"
-rm TFile/P050_TGFALFile.C
-%endif
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
-%if %{?fedora}%{!?fedora:0} < 20 && %{?rhel}%{!?rhel:0} < 7
+%if %{?fedora}%{!?fedora:0} < 20
 rm TFile/P110_THDFSFile.C
 %endif
 rm TGLManager/P020_TGWin32GLManager.C
@@ -1530,7 +1523,7 @@ rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
-%if %{?fedora}%{!?fedora:0} < 20 && %{?rhel}%{!?rhel:0} < 7
+%if %{?fedora}%{!?fedora:0} < 20
 rm TSystem/P060_THDFSSystem.C
 %endif
 rm TViewerX3D/P020_TQtViewerX3D.C
@@ -1754,11 +1747,9 @@ fi
 %postun io -p /sbin/ldconfig
 %post io-dcache -p /sbin/ldconfig
 %postun io-dcache -p /sbin/ldconfig
-%if %{gfal}
 %post io-gfal -p /sbin/ldconfig
 %postun io-gfal -p /sbin/ldconfig
-%endif
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 %post io-hdfs -p /sbin/ldconfig
 %postun io-hdfs -p /sbin/ldconfig
 %endif
@@ -2158,13 +2149,11 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
-%if %{gfal}
 %files io-gfal -f includelist-io-gfal
 %{_libdir}/%{name}/libGFAL.*
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-%endif
 
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 %files io-hdfs -f includelist-io-hdfs
 %{_libdir}/%{name}/libHDFS.*
 %{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
@@ -2258,6 +2247,10 @@ fi
 %{_libdir}/%{name}/libUnuran.*
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
 
+%files vdt -f includelist-math-vdt
+%dir %{_includedir}/%{name}/vdt
+%doc math/vdt/Licence.md math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
+
 %files memstat -f includelist-misc-memstat
 %{_libdir}/%{name}/libMemStat.*
 
@@ -2412,6 +2405,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
+- Update to 5.34.18
+- Build GFAL module using libgfal2
+- New sub-package: root-vdt
+
 * Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
 - Update to 5.34.17
 
diff --git a/sources b/sources
index 44a4da9..500a62f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ebb47511ec93108686b81bc8dce8b1e  root-5.34.17.tar.xz
+56c3603bfc416382f20b3b65dcd41b1e  root-5.34.18.tar.xz

From 5fbb82bc35535f5e174f9421f70ac2a75f99c3d4 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sun, 4 May 2014 14:27:20 +0200
Subject: [PATCH 052/344] Rebuild for ruby 2.1

- Fix build failure on F21 (missing symbol in libProofx linking)
---
 root-proofx-link-iolib.patch | 31 +++++++++++++++++++++++++++++++
 root.spec                    | 11 +++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 root-proofx-link-iolib.patch

diff --git a/root-proofx-link-iolib.patch b/root-proofx-link-iolib.patch
new file mode 100644
index 0000000..ca06b61
--- /dev/null
+++ b/root-proofx-link-iolib.patch
@@ -0,0 +1,31 @@
+diff -ur root-5.34.18.orig/config/Makefile.depend root-5.34.18/config/Makefile.depend
+--- root-5.34.18.orig/config/Makefile.depend	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/config/Makefile.depend	2014-05-04 07:52:08.144211940 +0200
+@@ -38,7 +38,7 @@
+                          $(THREADLIB) $(MATHCORELIB)
+ PROOFDRAWLIBDEPM       = $(TREEPLAYERLIB) $(G3DLIB) $(GRAFLIB) $(GPADLIB) \
+                          $(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB)
+-PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB)
++PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(IOLIB)
+ PROOFBENCHLIBDEPM      = $(PROOFLIB) $(PROOFDRAWLIB) $(PROOFPLAYERLIB) \
+                          $(TREELIB) $(GRAFLIB) $(HISTLIB) $(GPADLIB) $(IOLIB)
+ SESSIONVIEWERLIBDEPM   = $(PROOFLIB) $(GUILIB) $(HISTLIB) $(GPADLIB) \
+@@ -291,7 +291,8 @@
+                           lib/libGraf.lib lib/libGpad.lib \
+                           lib/libProofPlayer.lib lib/libHist.lib \
+                           lib/libTree.lib lib/libProof.lib
+-PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib
++PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib \
++                          lib/libRIO.lib
+ PROOFBENCHLIBEXTRA      = lib/libProof.lib lib/libProofDraw.lib \
+                           lib/libProofPlayer.lib lib/libTree.lib lib/libGraf.lib \
+                           lib/libHist.lib lib/libGpad.lib lib/libRIO.lib
+@@ -448,7 +449,7 @@
+                           -lMathCore
+ PROOFDRAWLIBEXTRA       = -Llib -lTreePlayer -lGraf3d -lGraf -lGpad \
+                           -lProofPlayer -lHist -lTree -lProof
+-PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread
++PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread -lRIO
+ PROOFBENCHLIBEXTRA      = -Llib -lProof -lProofDraw -lProofPlayer -lTree \
+                           -lGraf -lHist -lGpad -lRIO
+ SESSIONVIEWERLIBEXTRA   = -Llib -lProof -lGui -lHist -lGpad -lGraf -lTree \
diff --git a/root.spec b/root.spec
index a5dbd2b..b4c7d8d 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	5.34.18
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -80,6 +80,8 @@ Patch9:		%{name}-dont-link-jvm.patch
 Patch10:	%{name}-bsd-misc.patch
 #		Use GFAL2
 Patch11:	%{name}-gfal2.patch
+#		Link failure on Fedora 21
+Patch12:	%{name}-proofx-link-iolib.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
@@ -147,7 +149,7 @@ BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 BuildRequires:	hadoop-devel
 %endif
 BuildRequires:	emacs
@@ -1174,6 +1176,7 @@ fi
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -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 \
@@ -2405,6 +2408,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
+- Rebuild for ruby 2.1
+- Fix build failure on F21 (missing symbol in libProofx linking)
+
 * Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
 - Update to 5.34.18
 - Build GFAL module using libgfal2

From f53e5b080264cff22271ecca36924a304d2e7d2c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 21:45:58 -0500
Subject: [PATCH 053/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b4c7d8d..9882b54 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	5.34.18
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2408,6 +2408,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
 - Rebuild for ruby 2.1
 - Fix build failure on F21 (missing symbol in libProofx linking)

From a8c3d7f8d4c51656df7704bfc9d750e6d171d5be Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 30 Jun 2014 17:00:24 +0200
Subject: [PATCH 054/344] Add Requires on root-tree-player to root-gui-ged

---
 root.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9882b54..2701fa1 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	5.34.18
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -563,6 +563,7 @@ various kinds of data.
 %package gui-ged
 Summary:	GUI element for editing various ROOT objects
 Group:		Applications/Engineering
+Requires:	%{name}-tree-player = %{version}-%{release}
 
 %description gui-ged
 This package contains a library to show a pop-up window for editing
@@ -2408,6 +2409,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
+- Add Requires on root-tree-player to root-gui-ged
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From c2c5b53558ae994ccc877714936e2422a8f4620b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 18 Jul 2014 14:07:44 +0200
Subject: [PATCH 055/344] Update to 5.34.19

- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
- New sub-package: root-net-http
- Drop patches root-thtml-revert.patch, root-gfal2.patch and
  root-proofx-link-iolib.patch
---
 root-gfal2.patch             | 72 ---------------------------
 root-proofx-link-iolib.patch | 31 ------------
 root-thtml-revert.patch      | 18 -------
 root.spec                    | 94 ++++++++++++++++++++++++++++--------
 sources                      |  2 +-
 5 files changed, 75 insertions(+), 142 deletions(-)
 delete mode 100644 root-gfal2.patch
 delete mode 100644 root-proofx-link-iolib.patch
 delete mode 100644 root-thtml-revert.patch

diff --git a/root-gfal2.patch b/root-gfal2.patch
deleted file mode 100644
index cc1374f..0000000
--- a/root-gfal2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- root-5.34.18.orig/configure	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/configure	2014-03-19 09:56:58.943322923 +0100
-@@ -1630,7 +1630,7 @@
-   fitsio             Read images and data from FITS files, requires cfitsio
-   gviz               Graphs visualization support, requires graphviz
-   gdml               GDML writer and reader
--  gfal               GFAL support, requires libgfal
-+  gfal               GFAL support, requires libgfal or libgfal2
-   globus             Globus authentication support, requires Globus toolkit
-   glite              gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)
-   gsl-shared         Enable linking against shared libraries for GSL (default no)
-@@ -1719,7 +1719,7 @@
-   gfal-incdir        GFAL support, location of gfal_api.h
-   srm-ifce-incdir    GFAL support, location of gfal_srm_ifce_types.h
-   glib2-incdir       GFAL support, location of glib-2.0 headers
--  gfal-libdir        GFAL support, location of libgfal
-+  gfal-libdir        GFAL support, location of libgfal or libgfal2
-   glew-incdir        GLEW support, location of glew.h
-   glew-libdir        GLEW support, location of libGLEW
-   gsl-incdir         GSL support, location of gsl/gsl_version.h
-@@ -3759,10 +3759,17 @@
-     gfalinc=$found_hdr
-     gfalincdir=$found_dir
- 
--    check_library "libgfal" "$enable_shared" "$gfallibdir" \
--        $GFAL ${GFAL:+$GFAL/lib} \
--        /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \
--        /usr/local/gfal/lib
-+    if grep -q "GFAL2" $gfalincdir/gfal_api.h ; then
-+        check_library "libgfal2" "$enable_shared" "$gfallibdir" \
-+            $GFAL ${GFAL:+$GFAL/lib} \
-+            /opt/lcg/lib /opt/gfal2/lib /usr/local/lcg/lib \
-+            /usr/local/gfal2/lib
-+    else
-+        check_library "libgfal" "$enable_shared" "$gfallibdir" \
-+            $GFAL ${GFAL:+$GFAL/lib} \
-+            /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \
-+            /usr/local/gfal/lib
-+    fi
-     gfallib=$found_lib
-     gfallibdir=$found_dir
- 
-diff -ur root-5.34.18.orig/io/gfal/src/TGFALFile.cxx root-5.34.18/io/gfal/src/TGFALFile.cxx
---- root-5.34.18.orig/io/gfal/src/TGFALFile.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/io/gfal/src/TGFALFile.cxx	2014-03-19 11:48:13.762930884 +0100
-@@ -60,7 +60,6 @@
- //                                                                      //
- //////////////////////////////////////////////////////////////////////////
- 
--#include "TGFALFile.h"
- #include "TROOT.h"
- #include "TUrl.h"
- 
-@@ -68,6 +67,18 @@
- #include <gfal_api.h>
- }
- 
-+// GFAL2 doesn't use special names for 64 bit versions
-+#ifdef _GFAL2_API_
-+#define gfal_lseek64   gfal_lseek
-+#define gfal_open64    gfal_open
-+#define gfal_readdir64 gfal_readdir
-+#define gfal_stat64    gfal_stat
-+#define dirent64       dirent
-+#define stat64         stat
-+#endif
-+
-+#include "TGFALFile.h"
-+
- ClassImp(TGFALFile)
- ClassImp(TGFALSystem)
- 
diff --git a/root-proofx-link-iolib.patch b/root-proofx-link-iolib.patch
deleted file mode 100644
index ca06b61..0000000
--- a/root-proofx-link-iolib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur root-5.34.18.orig/config/Makefile.depend root-5.34.18/config/Makefile.depend
---- root-5.34.18.orig/config/Makefile.depend	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/config/Makefile.depend	2014-05-04 07:52:08.144211940 +0200
-@@ -38,7 +38,7 @@
-                          $(THREADLIB) $(MATHCORELIB)
- PROOFDRAWLIBDEPM       = $(TREEPLAYERLIB) $(G3DLIB) $(GRAFLIB) $(GPADLIB) \
-                          $(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB)
--PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB)
-+PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(IOLIB)
- PROOFBENCHLIBDEPM      = $(PROOFLIB) $(PROOFDRAWLIB) $(PROOFPLAYERLIB) \
-                          $(TREELIB) $(GRAFLIB) $(HISTLIB) $(GPADLIB) $(IOLIB)
- SESSIONVIEWERLIBDEPM   = $(PROOFLIB) $(GUILIB) $(HISTLIB) $(GPADLIB) \
-@@ -291,7 +291,8 @@
-                           lib/libGraf.lib lib/libGpad.lib \
-                           lib/libProofPlayer.lib lib/libHist.lib \
-                           lib/libTree.lib lib/libProof.lib
--PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib
-+PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib \
-+                          lib/libRIO.lib
- PROOFBENCHLIBEXTRA      = lib/libProof.lib lib/libProofDraw.lib \
-                           lib/libProofPlayer.lib lib/libTree.lib lib/libGraf.lib \
-                           lib/libHist.lib lib/libGpad.lib lib/libRIO.lib
-@@ -448,7 +449,7 @@
-                           -lMathCore
- PROOFDRAWLIBEXTRA       = -Llib -lTreePlayer -lGraf3d -lGraf -lGpad \
-                           -lProofPlayer -lHist -lTree -lProof
--PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread
-+PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread -lRIO
- PROOFBENCHLIBEXTRA      = -Llib -lProof -lProofDraw -lProofPlayer -lTree \
-                           -lGraf -lHist -lGpad -lRIO
- SESSIONVIEWERLIBEXTRA   = -Llib -lProof -lGui -lHist -lGpad -lGraf -lTree \
diff --git a/root-thtml-revert.patch b/root-thtml-revert.patch
deleted file mode 100644
index a1d1960..0000000
--- a/root-thtml-revert.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- v5-34-00-patches/html/src/THtml.cxx	2012/08/29 09:33:39	45728
-+++ v5-34-00-patches/html/src/THtml.cxx	2012/05/08 15:21:21	44178
-@@ -310,13 +310,11 @@
-          if (!filename.EndsWith(fsentry->GetName()))
-             continue;
-          fsentry->GetFullName(filesysname, kTRUE); // get the short version
--         filename = filesysname;
-          if (!filename.EndsWith(filesysname)) {
--            // It's something - let's see whether we find something better
--            // else leave it as plan B. This helps finding Reflex sources.
--            //filesysname = "";
-+            filesysname = "";
-             continue;
-          }
-+         filename = filesysname;
-          fsentry->GetFullName(filesysname, kFALSE); // get the long version
-          if (fse) *fse = fsentry;
-          break;
diff --git a/root.spec b/root.spec
index 2701fa1..15669a3 100644
--- a/root.spec
+++ b/root.spec
@@ -29,12 +29,19 @@
 %global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %endif
 
+# Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
+%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7
+%global xrootd 0
+%else
+%global xrootd 1
+%endif
+
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.18
+Version:	5.34.19
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -68,20 +75,14 @@ Patch3:		%{name}-xrootd.patch
 Patch4:		%{name}-meta.patch
 #		Use TLatex in doc generation:
 Patch5:		%{name}-doc-latex.patch
-#		Revert THtml change:
-Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
-Patch7:		%{name}-no-extra-formats.patch
+Patch6:		%{name}-no-extra-formats.patch
 #		Fixes for HDFS module
-Patch8:		%{name}-hdfs.patch
+Patch7:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
-Patch9:		%{name}-dont-link-jvm.patch
+Patch8:		%{name}-dont-link-jvm.patch
 #		Avoid deprecated __USE_BSD
-Patch10:	%{name}-bsd-misc.patch
-#		Use GFAL2
-Patch11:	%{name}-gfal2.patch
-#		Link failure on Fedora 21
-Patch12:	%{name}-proofx-link-iolib.patch
+Patch9:		%{name}-bsd-misc.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
@@ -97,6 +98,7 @@ BuildRequires:	libXft-devel
 BuildRequires:	libXext-devel
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel
+BuildRequires:	fcgi-devel
 BuildRequires:	ftgl-devel
 BuildRequires:	glew-devel
 BuildRequires:	gl2ps-devel
@@ -143,8 +145,10 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
+%if %{xrootd}
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
+%endif
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
@@ -979,6 +983,15 @@ Group:		Applications/Engineering
 This package contains the LDAP extension for ROOT. This gives you
 access to LDAP directories via ROOT.
 
+%package net-http
+Summary:	HTTP server extension for ROOT
+Group:		Applications/Engineering
+
+%description net-http
+This package contains the HTTP server extension for ROOT. It provides
+an http interface to arbitrary ROOT applications.
+
+%if %{xrootd}
 %package netx
 Summary:	NetX extension for ROOT
 Group:		Applications/Engineering
@@ -987,6 +1000,7 @@ Group:		Applications/Engineering
 This package contains the NetX extension for ROOT, i.e. a client for
 the xrootd server. Both the old (NetX) and the new (NetXNG) version are
 provided.
+%endif
 
 %package proof
 Summary:	PROOF extension for ROOT
@@ -1020,6 +1034,7 @@ Group:		Applications/Engineering
 This package contains a library for browsing an interactive PROOF
 session in ROOT.
 
+%if %{xrootd}
 %package xproof
 Summary:	XPROOF extension for ROOT
 Group:		Applications/Engineering
@@ -1027,6 +1042,7 @@ Group:		Applications/Engineering
 %description xproof
 This package contains the xproof extension for ROOT. This provides a
 client to be used in a PROOF environment.
+%endif
 
 %package roofit
 Summary:	ROOT extension for modeling expected distributions
@@ -1175,9 +1191,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -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 \
@@ -1225,8 +1238,6 @@ rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
 sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
 #  * unuran
 rm -rf math/unuran/src/*.tar.gz
-#  * xrootd
-rm -rf net/xrootd/src
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
@@ -1298,6 +1309,7 @@ unset QTINC
 %else
 	    --disable-hdfs \
 %endif
+	    --enable-http \
 	    --enable-krb5 \
 	    --enable-ldap \
 	    --enable-mathmore \
@@ -1338,9 +1350,13 @@ unset QTINC
 	    --enable-x11 \
 	    --enable-xft \
 	    --enable-xml \
+%if %{xrootd}
 	    --enable-xrootd \
 	      --with-xrootd-incdir=%{_includedir}/xrootd \
 	      --with-xrootd-libdir=%{_libdir} \
+%else
+	    --disable-xrootd \
+%endif
 %ifarch %{ix86} x86_64
 	    --enable-cintex \
 %else
@@ -1363,6 +1379,7 @@ unset QTINC
 	    --disable-sapdb \
 	    --disable-srp \
 	    --disable-vc \
+	    --disable-werror \
 	    --fail-on-missing
 
 make OPTFLAGS="%{optflags}" \
@@ -1487,6 +1504,9 @@ rm ${RPM_BUILD_ROOT}%{_mandir}/man1/makecint.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/proofserva.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/roota.1
 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/setup-pq2.1
+%if %{xrootd} == 0
+rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xproofd.1
+%endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.cw
 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.pri
@@ -1538,6 +1558,14 @@ rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P040_TGQt.C
 %endif
 rm TVirtualX/P050_TGQuartz.C
+%if %{xrootd} == 0
+rm TFile/P100_TXNetFile.C
+rm TFileStager/P010_TXNetFileStager.C
+rm TProofMgr/P010_TXProofMgr.C
+rm TProofServ/P010_TXProofServ.C
+rm TSlave/P010_TXSlave.C
+rm TSystem/P040_TXNetSystem.C
+%endif
 rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
@@ -1821,14 +1849,20 @@ fi
 %postun net-krb5 -p /sbin/ldconfig
 %post net-ldap -p /sbin/ldconfig
 %postun net-ldap -p /sbin/ldconfig
+%post net-http -p /sbin/ldconfig
+%postun net-http -p /sbin/ldconfig
+%if %{xrootd}
 %post netx -p /sbin/ldconfig
 %postun netx -p /sbin/ldconfig
+%endif
 %post proof -p /sbin/ldconfig
 %postun proof -p /sbin/ldconfig
 %post proof-sessionviewer -p /sbin/ldconfig
 %postun proof-sessionviewer -p /sbin/ldconfig
+%if %{xrootd}
 %post xproof -p /sbin/ldconfig
 %postun xproof -p /sbin/ldconfig
+%endif
 %post roofit -p /sbin/ldconfig
 %postun roofit -p /sbin/ldconfig
 %post sql-mysql -p /sbin/ldconfig
@@ -1950,15 +1984,19 @@ fi
 
 %files proofd
 %{_bindir}/proofd
-%{_bindir}/proofexecv
 %{_bindir}/proofserv
 %{_bindir}/proofserv.exe
-%{_bindir}/xproofd
 %{_bindir}/xpdtest
+%if %{xrootd}
+%{_bindir}/proofexecv
+%{_bindir}/xproofd
+%endif
 %{_mandir}/man1/proofd.1*
 %{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xproofd.1*
 %{_mandir}/man1/xpdtest.1*
+%if %{xrootd}
+%{_mandir}/man1/xproofd.1*
+%endif
 %{_initrddir}/proofd
 
 %files rootd
@@ -2313,12 +2351,19 @@ fi
 %files net-ldap -f includelist-net-ldap
 %{_libdir}/%{name}/libRLDAP.*
 
+%files net-http -f includelist-net-http
+%{_libdir}/%{name}/libRHTTP.*
+%{_datadir}/%{name}/http
+%doc net/http/README.txt net/http/civetweb/*.md
+
+%if %{xrootd}
 %files netx -f includelist-netx
 %{_libdir}/%{name}/libNetx.*
 %{_libdir}/%{name}/libNetxNG.*
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
+%endif
 
 %files proof -f includelist-proof-proof
 %{_libdir}/%{name}/libProof.*
@@ -2354,12 +2399,14 @@ fi
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
+%if %{xrootd}
 %files xproof -f includelist-proof-proofx
 %{_libdir}/%{name}/libProofx.*
 %{_libdir}/%{name}/libXrdProofd.*
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
 %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
 %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
+%endif
 
 %files roofit -f includelist-roofit
 %{_libdir}/%{name}/libRooFit.*
@@ -2409,6 +2456,13 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
+- Update to 5.34.19
+- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
+- New sub-package: root-net-http
+- Drop patches root-thtml-revert.patch, root-gfal2.patch and
+  root-proofx-link-iolib.patch
+
 * Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
 - Add Requires on root-tree-player to root-gui-ged
 
diff --git a/sources b/sources
index 500a62f..bcc042a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56c3603bfc416382f20b3b65dcd41b1e  root-5.34.18.tar.xz
+3c68587354619c0a2d3bb9f77381b1b9  root-5.34.19.tar.xz

From 4abba64da95bc764407d96397731332298d27636 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 18 Jul 2014 22:21:35 +0200
Subject: [PATCH 056/344] Don't use new gcc options for old gcc versions

---
 root-gccopt.patch | 37 +++++++++++++++++++++++++++++++++++++
 root.spec         |  3 +++
 2 files changed, 40 insertions(+)
 create mode 100644 root-gccopt.patch

diff --git a/root-gccopt.patch b/root-gccopt.patch
new file mode 100644
index 0000000..5fb3cb6
--- /dev/null
+++ b/root-gccopt.patch
@@ -0,0 +1,37 @@
+diff -ur root-5.34.19.orig/bindings/pyroot/Module.mk root-5.34.19/bindings/pyroot/Module.mk
+--- root-5.34.19.orig/bindings/pyroot/Module.mk	2014-07-09 16:50:16.000000000 +0200
++++ root-5.34.19/bindings/pyroot/Module.mk	2014-07-18 16:26:11.682503438 +0200
+@@ -123,14 +123,15 @@
+ $(PYTHON64O): CFLAGS += $(PYTHONINCDIR:%=-I%)
+ ifeq ($(GCC_MAJOR),4)
+ $(PYROOTO): CXXFLAGS += -fno-strict-aliasing
+-endif
+-ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),)
+-# Building with clang or GCC
++ifeq ($(subst $(GCC_MINOR),,0 1),0 1)
++# GCC >= 4.2
+ $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format
+ endif
++endif
+ 
+ ifneq ($(CLANG_MAJOR),)
+ # Building with clang 
+ $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-ignored-attributes
++$(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format
+ endif
+ 
+diff -ur root-5.34.19.orig/io/dcache/Module.mk root-5.34.19/io/dcache/Module.mk
+--- root-5.34.19.orig/io/dcache/Module.mk	2014-07-09 16:50:16.000000000 +0200
++++ root-5.34.19/io/dcache/Module.mk	2014-07-18 14:41:34.700841953 +0200
+@@ -68,7 +68,10 @@
+ 
+ ##### extra rules ######
+ $(DCACHEO) $(DCACHEDO): CXXFLAGS := $(filter-out -Wall,$(CXXFLAGS)) $(DCAPINCDIR:%=-I%)
+-ifneq ($(CXX:g++=),$(CXX))
++ifeq ($(GCC_MAJOR),4)
++ifeq ($(subst $(GCC_MINOR),,0 1 2),0 1 2)
++# GCC >= 4.3
+    $(DCACHEO) $(DCACHEDO):  CXXFLAGS += -Wno-ignored-qualifiers
+ endif
++endif
+ 
diff --git a/root.spec b/root.spec
index 15669a3..69dc5bb 100644
--- a/root.spec
+++ b/root.spec
@@ -83,6 +83,8 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Avoid deprecated __USE_BSD
 Patch9:		%{name}-bsd-misc.patch
+#		Don't use new gcc options for old gcc versions
+Patch10:	%{name}-gccopt.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
@@ -1191,6 +1193,7 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -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 \

From 63400c04124fa020c719111f21b50389b0c83191 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 00:10:28 +0000
Subject: [PATCH 057/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 69dc5bb..20bf3ae 100644
--- a/root.spec
+++ b/root.spec
@@ -41,7 +41,7 @@
 Name:		root
 Version:	5.34.19
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2459,6 +2459,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
 - Update to 5.34.19
 - Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)

From 57e8c20a997f50a76be060cc4284aa14114f0b92 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 20 Aug 2014 05:24:01 +0200
Subject: [PATCH 058/344] Update to 5.34.20

- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
- Do not depend on wine's fonts
- Drop patch root-gccopt.patch
---
 .gitignore            |   1 +
 root-doc-latex.patch  |  38 +--
 root-fontconfig.patch | 756 ++++++++++++++++++++----------------------
 root-gccopt.patch     |  37 ---
 root-usa.patch        |  13 +
 root.spec             |  88 ++---
 sources               |   3 +-
 7 files changed, 437 insertions(+), 499 deletions(-)
 delete mode 100644 root-gccopt.patch
 create mode 100644 root-usa.patch

diff --git a/.gitignore b/.gitignore
index 5c35620..9ff0650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /*.tar.gz
 /*.tar.xz
+/usa.root
diff --git a/root-doc-latex.patch b/root-doc-latex.patch
index c3150a0..c66850f 100644
--- a/root-doc-latex.patch
+++ b/root-doc-latex.patch
@@ -1,25 +1,25 @@
-diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/src/TEfficiency.cxx
---- root-5.34.09.orig/hist/hist/src/TEfficiency.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/hist/hist/src/TEfficiency.cxx	2013-06-27 07:06:03.769693346 +0200
-@@ -2498,7 +2498,7 @@
+diff -ur root-5.34.20.orig/hist/hist/src/TEfficiency.cxx root-5.34.20/hist/hist/src/TEfficiency.cxx
+--- root-5.34.20.orig/hist/hist/src/TEfficiency.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/hist/hist/src/TEfficiency.cxx	2014-08-16 22:50:04.139089920 +0200
+@@ -2668,7 +2668,7 @@
     //the same process.
     //
     //The new weight is set according to:
--   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex 
-+   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex 
-    
-    if(!pList->IsEmpty()) {   
+-   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex
++   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex
+ 
+    if(!pList->IsEmpty()) {
        TIter next(pList);
-@@ -2558,7 +2558,7 @@
+@@ -2728,7 +2728,7 @@
     //calculates a new weight:
     //current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex
     //weight of rhs = Begin_Latex w_{2} End_Latex
 -   //Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex
 +   //Begin_Latex w_{new} = #frac{w_{1} #times w_{2}}{w_{1} + w_{2}}End_Latex
-    
  
-    if (fTotalHistogram == 0 && fPassedHistogram == 0) { 
-@@ -2971,11 +2971,11 @@
+ 
+    if (fTotalHistogram == 0 && fPassedHistogram == 0) {
+@@ -3050,11 +3050,11 @@
  //______________________________________________________________________________
  void TEfficiency::SetBetaAlpha(Double_t alpha)
  {
@@ -33,10 +33,10 @@ diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/
     //End_Latex
     //
     //Note: - both shape parameters have to be positive (i.e. > 0)
-@@ -2989,11 +2989,11 @@
+@@ -3068,11 +3068,11 @@
  //______________________________________________________________________________
  void TEfficiency::SetBetaBeta(Double_t beta)
- {   
+ {
 -   //sets the shape parameter Begin_Latex \beta End_Latex
 +   //sets the shape parameter Begin_Latex #beta End_Latex
     //
@@ -47,16 +47,14 @@ diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/
     //End_Latex
     //
     //Note: - both shape parameters have to be positive (i.e. > 0)
-@@ -3007,12 +3007,12 @@
+@@ -3086,12 +3086,12 @@
  //______________________________________________________________________________
  void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
  {
 -   //sets different  shape parameter Begin_Latex \alpha and \beta End_Latex
--   // for the prior distribution for each bin. By default the global parameter are used if they are not set 
--   // for the specific bin 
-+   //sets different shape parameter Begin_Latex #alpha and #beta End_Latex
-+   //for the prior distribution for each bin. By default the global parameter are used if they are not set 
-+   //for the specific bin 
++   //sets different  shape parameter Begin_Latex #alpha and #beta End_Latex
+    // for the prior distribution for each bin. By default the global parameter are used if they are not set
+    // for the specific bin
     //The prior probability of the efficiency is given by the beta distribution:
     //Begin_Latex
 -   // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 4a5621f..620dffa 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-5.34.18.orig/core/base/src/TApplication.cxx root-5.34.18/core/base/src/TApplication.cxx
---- root-5.34.18.orig/core/base/src/TApplication.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/core/base/src/TApplication.cxx	2014-03-15 18:15:22.756445235 +0100
+diff -ur root-5.34.20.orig/core/base/src/TApplication.cxx root-5.34.20/core/base/src/TApplication.cxx
+--- root-5.34.20.orig/core/base/src/TApplication.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/core/base/src/TApplication.cxx	2014-08-16 19:24:53.337132201 +0200
 @@ -265,22 +265,11 @@
     LoadGraphicsLibs();
  
@@ -34,9 +34,9 @@ diff -ur root-5.34.18.orig/core/base/src/TApplication.cxx root-5.34.18/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.18.orig/graf2d/graf/inc/TTF.h root-5.34.18/graf2d/graf/inc/TTF.h
---- root-5.34.18.orig/graf2d/graf/inc/TTF.h	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf2d/graf/inc/TTF.h	2014-03-15 18:15:22.757445223 +0100
+diff -ur root-5.34.20.orig/graf2d/graf/inc/TTF.h root-5.34.20/graf2d/graf/inc/TTF.h
+--- root-5.34.20.orig/graf2d/graf/inc/TTF.h	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf2d/graf/inc/TTF.h	2014-08-16 19:24:53.338132209 +0200
 @@ -70,9 +70,8 @@
     static FT_BBox     fgCBox;                  // string control box
     static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
@@ -48,9 +48,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/inc/TTF.h root-5.34.18/graf2d/graf/inc/TT
     static FT_Face     fgFace[kTTMaxFonts];     // font face
     static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
     static Bool_t      fgHinting;               // use hinting (true by default)
-diff -ur root-5.34.18.orig/graf2d/graf/Module.mk root-5.34.18/graf2d/graf/Module.mk
---- root-5.34.18.orig/graf2d/graf/Module.mk	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf2d/graf/Module.mk	2014-03-15 18:15:22.757445223 +0100
+diff -ur root-5.34.20.orig/graf2d/graf/Module.mk root-5.34.20/graf2d/graf/Module.mk
+--- root-5.34.20.orig/graf2d/graf/Module.mk	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf2d/graf/Module.mk	2014-08-16 19:24:53.338132209 +0200
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -60,9 +60,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/Module.mk root-5.34.18/graf2d/graf/Module
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/TTF.cxx
---- root-5.34.18.orig/graf2d/graf/src/TTF.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf2d/graf/src/TTF.cxx	2014-03-20 14:27:01.700346310 +0100
+diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/TTF.cxx
+--- root-5.34.20.orig/graf2d/graf/src/TTF.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf2d/graf/src/TTF.cxx	2014-08-16 20:48:07.427205257 +0200
 @@ -17,15 +17,13 @@
  //                                                                      //
  //////////////////////////////////////////////////////////////////////////
@@ -299,10 +299,11 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/
 -                                       "$(ROOTSYS)/fonts"
 -# endif
 -                                      );
+ 
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
 +   char *ttfont = NULL;
 +   int ttindex = 0;
  
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
 +   if (fontid >= 16 && fontid <= 28) {
 +      // Use the texlive-stix fonts if they exist
 +      // Texlive-stix not packaged correctly - can not be found through fontconfig
@@ -350,7 +351,6 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/
 +         break;
 +      }
 +   }
- 
     if (!ttfont) {
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
 -      if (fgFontCount) {
@@ -616,38 +616,38 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/
 -   // Table of Microsoft and (for non-MSFT operating systems) backup
 -   // FreeFont TTF fonts.
 -   static const char *fonttable[][2] = {
--	  { "Root.TTFont.0", "FreeSansBold.otf" },
--	  { "Root.TTFont.1", "FreeSerifItalic.otf" },
--	  { "Root.TTFont.2", "FreeSerifBold.otf" },
--	  { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--	  { "Root.TTFont.4", "FreeSans.otf" },
--	  { "Root.TTFont.5", "FreeSansOblique.otf" },
--	  { "Root.TTFont.6", "FreeSansBold.otf" },
--	  { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--	  { "Root.TTFont.8", "FreeMono.otf" },
--	  { "Root.TTFont.9", "FreeMonoOblique.otf" },
--	  { "Root.TTFont.10", "FreeMonoBold.otf" },
--	  { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--	  { "Root.TTFont.12", "symbol.ttf" },
--	  { "Root.TTFont.13", "FreeSerif.otf" },
--	  { "Root.TTFont.14", "wingding.ttf" },
--	  { "Root.TTFont.15", "symbol.ttf" },
--	  { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--	  { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--	  { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--	  { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--	  { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--	  { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--	  { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--	  { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--	  { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--	  { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--	  { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--	  { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--	  { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--	  { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--	  { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--	  { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
+-     { "Root.TTFont.0", "FreeSansBold.otf" },
+-     { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-     { "Root.TTFont.2", "FreeSerifBold.otf" },
+-     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-     { "Root.TTFont.4", "FreeSans.otf" },
+-     { "Root.TTFont.5", "FreeSansOblique.otf" },
+-     { "Root.TTFont.6", "FreeSansBold.otf" },
+-     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-     { "Root.TTFont.8", "FreeMono.otf" },
+-     { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-     { "Root.TTFont.10", "FreeMonoBold.otf" },
+-     { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-     { "Root.TTFont.12", "symbol.ttf" },
+-     { "Root.TTFont.13", "FreeSerif.otf" },
+-     { "Root.TTFont.14", "wingding.ttf" },
+-     { "Root.TTFont.15", "symbol.ttf" },
+-     { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-     { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-     { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-     { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-     { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-     { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-     { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-     { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-     { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-     { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-     { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-     { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-     { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
 -   };
 -
 -   static int fontset = -1;
@@ -685,9 +685,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/
  }
  
  //______________________________________________________________________________
-diff -ur root-5.34.18.orig/graf2d/postscript/Module.mk root-5.34.18/graf2d/postscript/Module.mk
---- root-5.34.18.orig/graf2d/postscript/Module.mk	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf2d/postscript/Module.mk	2014-03-15 18:15:22.758445211 +0100
+diff -ur root-5.34.20.orig/graf2d/postscript/Module.mk root-5.34.20/graf2d/postscript/Module.mk
+--- root-5.34.20.orig/graf2d/postscript/Module.mk	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf2d/postscript/Module.mk	2014-08-16 19:24:53.363132437 +0200
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -697,9 +697,9 @@ diff -ur root-5.34.18.orig/graf2d/postscript/Module.mk root-5.34.18/graf2d/posts
  
  $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/graf2d/postscript/src/TPostScript.cxx
---- root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf2d/postscript/src/TPostScript.cxx	2014-03-15 18:15:22.759445199 +0100
+diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/graf2d/postscript/src/TPostScript.cxx
+--- root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf2d/postscript/src/TPostScript.cxx	2014-08-16 20:30:03.271041920 +0200
 @@ -238,6 +238,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -708,43 +708,43 @@ diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1511,78 +1512,258 @@
+@@ -1511,63 +1512,244 @@
  {
     // Embed font in PS file.
  
 -   static const char *fonttable[32][2] = {
--	   { "Root.TTFont.0", "FreeSansBold.otf" },
--	   { "Root.TTFont.1", "FreeSerifItalic.otf" },
--	   { "Root.TTFont.2", "FreeSerifBold.otf" },
--	   { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--	   { "Root.TTFont.4", "FreeSans.otf" },
--	   { "Root.TTFont.5", "FreeSansOblique.otf" },
--	   { "Root.TTFont.6", "FreeSansBold.otf" },
--	   { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--	   { "Root.TTFont.8", "FreeMono.otf" },
--	   { "Root.TTFont.9", "FreeMonoOblique.otf" },
--	   { "Root.TTFont.10", "FreeMonoBold.otf" },
--	   { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--	   { "Root.TTFont.12", "symbol.ttf" },
--	   { "Root.TTFont.13", "FreeSerif.otf" },
--	   { "Root.TTFont.14", "wingding.ttf" },
--	   { "Root.TTFont.15", "symbol.ttf" },
--	   { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--	   { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--	   { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--	   { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--	   { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--	   { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--	   { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--	   { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--	   { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--	   { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--	   { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--	   { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--	   { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--	   { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--	   { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--	   { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
+-      { "Root.TTFont.0", "FreeSansBold.otf" },
+-      { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-      { "Root.TTFont.2", "FreeSerifBold.otf" },
+-      { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-      { "Root.TTFont.4", "FreeSans.otf" },
+-      { "Root.TTFont.5", "FreeSansOblique.otf" },
+-      { "Root.TTFont.6", "FreeSansBold.otf" },
+-      { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-      { "Root.TTFont.8", "FreeMono.otf" },
+-      { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-      { "Root.TTFont.10", "FreeMonoBold.otf" },
+-      { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-      { "Root.TTFont.12", "symbol.ttf" },
+-      { "Root.TTFont.13", "FreeSerif.otf" },
+-      { "Root.TTFont.14", "wingding.ttf" },
+-      { "Root.TTFont.15", "symbol.ttf" },
+-      { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-      { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-      { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-      { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-      { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-      { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-      { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-      { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-      { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-      { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-      { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-      { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-      { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
 -   };
 -
     PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
@@ -752,308 +752,288 @@ diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/gr
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -#ifdef TTFFONTDIR
--									   TTFFONTDIR
+-                                       TTFFONTDIR
 -#else // TTFFONTDIR
--									   "$(ROOTSYS)/fonts"
+-                                       "$(ROOTSYS)/fonts"
 -#endif // TTFFONTDIR
--									   );
+-                                       );
 -
     for (Int_t fontid = 1; fontid < 30; fontid++) {
--		if (fontid != 15) {
--			const char *filename = gEnv->GetValue(
--				fonttable[fontid][0], fonttable[fontid][1]);
--			char *ttfont = gSystem->Which(ttpath, filename,
--										  kReadPermission);
--
--			if(!ttfont) {
--				Error("TPostScript::FontEmbed",
--					  "font %d (filename `%s') not found in path",
--					  fontid, filename);
--			} else {
--				if (FontEmbedType2(ttfont)) {
--					// nothing
--				} else if(FontEmbedType1(ttfont)) {
--					// nothing
--				} else if(FontEmbedType42(ttfont)) {
--					// nothing
--				} else {
--					Error("TPostScript::FontEmbed",
--						  "failed to embed font %d (filename `%s')",
--						  fontid, filename);
--				}
--				delete [] ttfont;
--			}
--		}
-+      if (fontid != 15) {
+       if (fontid != 15) {
+-         const char *filename = gEnv->GetValue(
+-                                               fonttable[fontid][0], fonttable[fontid][1]);
+-         char *ttfont = gSystem->Which(ttpath, filename,
+-                                       kReadPermission);
 +
-+	 char *ttfont = NULL;
++         char *ttfont = NULL;
 +
-+	 if (fontid >= 16 && fontid <= 28) {
-+	    // Use the texlive-stix fonts if they exist
-+	    // Texlive-stix not packaged correctly - can not be found through fontconfig
-+	    // Use hardcoded path
-+	    const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
-+	    switch (fontid) {
-+	    case 16:
-+	       ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
-+	       break;
-+	    case 17:
-+	       ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
-+	       break;
-+	    case 18:
-+	       ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
-+	       break;
-+	    case 19:
-+	       ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
-+	       break;
-+	    case 20:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
-+	       break;
-+	    case 21:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
-+	       break;
-+	    case 22:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
-+	       break;
-+	    case 23:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
-+	       break;
-+	    case 24:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
-+	       break;
-+	    case 25:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
-+	       break;
-+	    case 26:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
-+	       break;
-+	    case 27:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
-+	       break;
-+	    case 28:
-+	       ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
-+	       break;
-+	    }
-+	 }
++         if (fontid >= 16 && fontid <= 28) {
++            // Use the texlive-stix fonts if they exist
++            // Texlive-stix not packaged correctly - can not be found through fontconfig
++            // Use hardcoded path
++            const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
++            switch (fontid) {
++            case 16:
++               ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
++               break;
++            case 17:
++               ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
++               break;
++            case 18:
++               ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
++               break;
++            case 19:
++               ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
++               break;
++            case 20:
++               ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
++               break;
++            case 21:
++               ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
++               break;
++            case 22:
++               ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
++               break;
++            case 23:
++               ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
++               break;
++            case 24:
++               ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
++               break;
++            case 25:
++               ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
++               break;
++            case 26:
++               ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
++               break;
++            case 27:
++               ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
++               break;
++            case 28:
++               ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
++               break;
++            }
++         }
 +
-+	 if (!ttfont) {
-+	    FcPattern *pat, *match;
-+	    FcCharSet *set = NULL;
-+	    FcResult result;
++         if (!ttfont) {
++            FcPattern *pat, *match;
++            FcCharSet *set = NULL;
++            FcResult result;
 +
-+	    pat = FcPatternCreate ();
++            pat = FcPatternCreate ();
 +
-+	    switch (fontid) {
-+	    case 1:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 2:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 3:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 4:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 5:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 6:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 7:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 8:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 9:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 10:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 11:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 12:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 13:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 14:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 16:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 17:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 18:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 19:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+	       break;
-+	    case 20:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       // set = FcCharSetCreate ();
-+	       // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	       // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	       break;
-+	    case 21:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       // set = FcCharSetCreate ();
-+	       // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+	       // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	       break;
-+	    case 22:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 23:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 24:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 25:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 26:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 27:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 28:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       break;
-+	    case 29:
-+	       FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+	       FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+	       FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+	       set = FcCharSetCreate ();
-+	       FcCharSetAddChar (set, 0x0410); // Cyrillic
-+	       FcCharSetAddChar (set, 0x4e00); // CJK
-+	       FcPatternAddCharSet (pat, FC_CHARSET, set);
-+	       break;
-+	    }
++            switch (fontid) {
++            case 1:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 2:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 3:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 4:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 5:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 6:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 7:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 8:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 9:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 10:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 11:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 12:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 13:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 14:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 16:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 17:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 18:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 19:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++               break;
++            case 20:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               // set = FcCharSetCreate ();
++               // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++               // FcPatternAddCharSet (pat, FC_CHARSET, set);
++               break;
++            case 21:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               // set = FcCharSetCreate ();
++               // FcCharSetAddChar (set, 0x239b); // Bracket pieces
++               // FcPatternAddCharSet (pat, FC_CHARSET, set);
++               break;
++            case 22:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 23:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 24:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 25:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 26:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 27:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 28:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               break;
++            case 29:
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++               set = FcCharSetCreate ();
++               FcCharSetAddChar (set, 0x0410); // Cyrillic
++               FcCharSetAddChar (set, 0x4e00); // CJK
++               FcPatternAddCharSet (pat, FC_CHARSET, set);
++               break;
++            }
 +
-+	    FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+	    FcDefaultSubstitute (pat);
-+	    match = FcFontMatch (NULL, pat, &result);
-+	    char *ttfnt;
-+	    FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+	    ttfont = StrDup(ttfnt);
-+	    FcPatternDestroy (match);
-+	    FcPatternDestroy (pat);
-+	    if (set) FcCharSetDestroy (set);
-+	 }
-+
-+	 if(!ttfont) {
-+	    Error("TPostScript::FontEmbed", "font %d not found in path",
-+		  fontid);
-+	 } else {
-+	    if (FontEmbedType2(ttfont)) {
-+	       // nothing
-+	    } else if(FontEmbedType1(ttfont)) {
-+	       // nothing
-+	    } else if(FontEmbedType42(ttfont)) {
-+	       // nothing
-+	    } else {
-+	       Error("TPostScript::FontEmbed", "failed to embed font %d)",
-+		     fontid);
-+	    }
-+	    delete [] ttfont;
-+	 }
-+      }
-    }
-    PrintStr("%%IncludeResource: font Times-Roman@");
-    PrintStr("%%IncludeResource: font Times-Italic@");
++            FcConfigSubstitute (NULL, pat, FcMatchPattern);
++            FcDefaultSubstitute (pat);
++            match = FcFontMatch (NULL, pat, &result);
++            char *ttfnt;
++            FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++            ttfont = StrDup(ttfnt);
++            FcPatternDestroy (match);
++            FcPatternDestroy (pat);
++            if (set) FcCharSetDestroy (set);
++         }
+ 
+          if(!ttfont) {
+-            Error("TPostScript::FontEmbed",
+-                  "font %d (filename `%s') not found in path",
+-                  fontid, filename);
++            Error("TPostScript::FontEmbed", "font %d not found in path",
++                  fontid);
+          } else {
+             if (FontEmbedType2(ttfont)) {
+                // nothing
+@@ -1576,9 +1758,8 @@
+             } else if(FontEmbedType42(ttfont)) {
+                // nothing
+             } else {
+-               Error("TPostScript::FontEmbed",
+-                     "failed to embed font %d (filename `%s')",
+-                     fontid, filename);
++               Error("TPostScript::FontEmbed", "failed to embed font %d)",
++                     fontid);
+             }
+             delete [] ttfont;
+          }
 @@ -2571,10 +2752,10 @@
- 	   { "Root.PSFont.5",             "/Helvetica-Oblique" },
- 	   { "Root.PSFont.6",             "/Helvetica-Bold" },
- 	   { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
--	   { "Root.PSFont.8",             "/Courrier" },
--	   { "Root.PSFont.9",             "/Courrier-Oblique" },
--	   { "Root.PSFont.10",            "/Courrier-Bold" },
--	   { "Root.PSFont.11",            "/Courrier-BoldOblique" },
-+	   { "Root.PSFont.8",             "/Courier" },
-+	   { "Root.PSFont.9",             "/Courier-Oblique" },
-+	   { "Root.PSFont.10",            "/Courier-Bold" },
-+	   { "Root.PSFont.11",            "/Courier-BoldOblique" },
- 	   { "Root.PSFont.12",            "/Symbol" },
- 	   { "Root.PSFont.13",            "/Times-Roman" },
- 	   { "Root.PSFont.14",            "/ZapfDingbats" },
-diff -ur root-5.34.18.orig/graf3d/gl/Module.mk root-5.34.18/graf3d/gl/Module.mk
---- root-5.34.18.orig/graf3d/gl/Module.mk	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf3d/gl/Module.mk	2014-03-15 18:15:22.760445187 +0100
+       { "Root.PSFont.5",             "/Helvetica-Oblique" },
+       { "Root.PSFont.6",             "/Helvetica-Bold" },
+       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
+-      { "Root.PSFont.8",             "/Courrier" },
+-      { "Root.PSFont.9",             "/Courrier-Oblique" },
+-      { "Root.PSFont.10",            "/Courrier-Bold" },
+-      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
++      { "Root.PSFont.8",             "/Courier" },
++      { "Root.PSFont.9",             "/Courier-Oblique" },
++      { "Root.PSFont.10",            "/Courier-Bold" },
++      { "Root.PSFont.11",            "/Courier-BoldOblique" },
+       { "Root.PSFont.12",            "/Symbol" },
+       { "Root.PSFont.13",            "/Times-Roman" },
+       { "Root.PSFont.14",            "/ZapfDingbats" },
+diff -ur root-5.34.20.orig/graf3d/gl/Module.mk root-5.34.20/graf3d/gl/Module.mk
+--- root-5.34.20.orig/graf3d/gl/Module.mk	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf3d/gl/Module.mk	2014-08-16 19:24:53.377132564 +0200
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -1063,9 +1043,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/Module.mk root-5.34.18/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.18/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf3d/gl/src/TGLFontManager.cxx	2014-03-22 09:22:22.715637375 +0100
+diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf3d/gl/src/TGLFontManager.cxx	2014-08-16 19:24:53.378132573 +0200
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1388,9 +1368,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.18/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-5.34.18.orig/graf3d/gl/src/TGLText.cxx root-5.34.18/graf3d/gl/src/TGLText.cxx
---- root-5.34.18.orig/graf3d/gl/src/TGLText.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/graf3d/gl/src/TGLText.cxx	2014-03-22 09:15:17.075732162 +0100
+diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/TGLText.cxx
+--- root-5.34.20.orig/graf3d/gl/src/TGLText.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/graf3d/gl/src/TGLText.cxx	2014-08-16 19:24:53.378132573 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1530,9 +1510,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/src/TGLText.cxx root-5.34.18/graf3d/gl/src/
 -   delete [] ttfont;
 +      Error("SetGLTextFont","Cannot set FTGL::FaceSize");
  }
-diff -ur root-5.34.18.orig/gui/gui/src/TGApplication.cxx root-5.34.18/gui/gui/src/TGApplication.cxx
---- root-5.34.18.orig/gui/gui/src/TGApplication.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/gui/gui/src/TGApplication.cxx	2014-03-15 18:15:22.761445175 +0100
+diff -ur root-5.34.20.orig/gui/gui/src/TGApplication.cxx root-5.34.20/gui/gui/src/TGApplication.cxx
+--- root-5.34.20.orig/gui/gui/src/TGApplication.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/gui/gui/src/TGApplication.cxx	2014-08-16 19:24:53.379132582 +0200
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1560,9 +1540,9 @@ diff -ur root-5.34.18.orig/gui/gui/src/TGApplication.cxx root-5.34.18/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx root-5.34.18/gui/gui/src/TGSpeedo.cxx
---- root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx	2014-03-14 16:21:52.000000000 +0100
-+++ root-5.34.18/gui/gui/src/TGSpeedo.cxx	2014-03-15 18:15:22.761445175 +0100
+diff -ur root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx root-5.34.20/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx	2014-08-13 15:03:22.000000000 +0200
++++ root-5.34.20/gui/gui/src/TGSpeedo.cxx	2014-08-16 19:24:53.379132582 +0200
 @@ -119,8 +119,7 @@
  
     TString sc;
diff --git a/root-gccopt.patch b/root-gccopt.patch
deleted file mode 100644
index 5fb3cb6..0000000
--- a/root-gccopt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur root-5.34.19.orig/bindings/pyroot/Module.mk root-5.34.19/bindings/pyroot/Module.mk
---- root-5.34.19.orig/bindings/pyroot/Module.mk	2014-07-09 16:50:16.000000000 +0200
-+++ root-5.34.19/bindings/pyroot/Module.mk	2014-07-18 16:26:11.682503438 +0200
-@@ -123,14 +123,15 @@
- $(PYTHON64O): CFLAGS += $(PYTHONINCDIR:%=-I%)
- ifeq ($(GCC_MAJOR),4)
- $(PYROOTO): CXXFLAGS += -fno-strict-aliasing
--endif
--ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),)
--# Building with clang or GCC
-+ifeq ($(subst $(GCC_MINOR),,0 1),0 1)
-+# GCC >= 4.2
- $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format
- endif
-+endif
- 
- ifneq ($(CLANG_MAJOR),)
- # Building with clang 
- $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-ignored-attributes
-+$(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format
- endif
- 
-diff -ur root-5.34.19.orig/io/dcache/Module.mk root-5.34.19/io/dcache/Module.mk
---- root-5.34.19.orig/io/dcache/Module.mk	2014-07-09 16:50:16.000000000 +0200
-+++ root-5.34.19/io/dcache/Module.mk	2014-07-18 14:41:34.700841953 +0200
-@@ -68,7 +68,10 @@
- 
- ##### extra rules ######
- $(DCACHEO) $(DCACHEDO): CXXFLAGS := $(filter-out -Wall,$(CXXFLAGS)) $(DCAPINCDIR:%=-I%)
--ifneq ($(CXX:g++=),$(CXX))
-+ifeq ($(GCC_MAJOR),4)
-+ifeq ($(subst $(GCC_MINOR),,0 1 2),0 1 2)
-+# GCC >= 4.3
-    $(DCACHEO) $(DCACHEDO):  CXXFLAGS += -Wno-ignored-qualifiers
- endif
-+endif
- 
diff --git a/root-usa.patch b/root-usa.patch
new file mode 100644
index 0000000..4b5a380
--- /dev/null
+++ b/root-usa.patch
@@ -0,0 +1,13 @@
+diff -ur root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx root-5.34.19/hist/histpainter/src/THistPainter.cxx
+--- root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx	2014-07-09 16:50:16.000000000 +0200
++++ root-5.34.19/hist/histpainter/src/THistPainter.cxx	2014-07-26 23:01:20.083002118 +0200
+@@ -2305,7 +2305,8 @@
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+    TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   // f = TFile::Open("http://root.cern.ch/files/usa.root");
++   f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
+ 
+    TMultiGraph *mg;
+    TKey *key;
diff --git a/root.spec b/root.spec
index 69dc5bb..028e0f7 100644
--- a/root.spec
+++ b/root.spec
@@ -29,17 +29,12 @@
 %global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %endif
 
-# Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
-%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7
-%global xrootd 0
-%else
 %global xrootd 1
-%endif
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.19
+Version:	5.34.20
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -62,6 +57,8 @@ Source2:	root-html.C
 Source3:	http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 Source4:	http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
 Source5:	http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png
+#		Use local copy of input file during documentation generation
+Source6:	http://root.cern.ch/files/usa.root
 #		Patch for ftgl older than version 2.1.3:
 Patch0:		%{name}-ftgl.patch
 #		Use system fonts:
@@ -83,8 +80,8 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Avoid deprecated __USE_BSD
 Patch9:		%{name}-bsd-misc.patch
-#		Don't use new gcc options for old gcc versions
-Patch10:	%{name}-gccopt.patch
+#		Use local copy of input file during documentation generation
+Patch10:	%{name}-usa.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
@@ -176,20 +173,7 @@ BuildRequires:	font(liberationmono)
 %else
 BuildRequires:	liberation-fonts
 %endif
-%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
-%ifarch %{ix86} x86_64
-BuildRequires:	font(symbol)
-%else
 BuildRequires:	urw-fonts
-%endif
-%else
-BuildRequires:	urw-fonts
-%endif
-%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
-%ifarch %{ix86} x86_64
-BuildRequires:	font(wingdings)
-%endif
-%endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	font(droidsansfallback)
 %endif
@@ -278,7 +262,7 @@ Summary:	ROOT core libraries
 Group:		Applications/Engineering
 License:	LGPLv2+ and BSD
 Requires:	%{name}-icons = %{version}-%{release}
-Requires:	%{name}-graf-asimage = %{version}-%{release}
+Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 Requires:	font(liberationsans)
@@ -287,20 +271,7 @@ Requires:	font(liberationmono)
 %else
 Requires:	liberation-fonts
 %endif
-%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
-%ifarch %{ix86} x86_64
-Requires:	font(symbol)
-%else
 Requires:	urw-fonts
-%endif
-%else
-Requires:	urw-fonts
-%endif
-%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
-%ifarch %{ix86} x86_64
-Requires:	font(wingdings)
-%endif
-%endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 Requires:	font(droidsansfallback)
 %endif
@@ -361,8 +332,11 @@ with CINT with any class for which a Reflex dictionary is provided.
 %package proofd
 Summary:	Parallel ROOT Facility - distributed, parallel computing
 Group:		Applications/Engineering
-Requires:	%{name}-net-rpdutils = %{version}-%{release}
-Requires:	%{name}-proof = %{version}-%{release}
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+%if %{xrootd}
+Requires:	xrootd-server%{?_isa}
+%endif
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(post):		chkconfig
@@ -379,7 +353,7 @@ transparent interface.
 %package rootd
 Summary:	ROOT remote file server
 Group:		Applications/Engineering
-Requires:	%{name}-net-rpdutils = %{version}-%{release}
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(post):		chkconfig
@@ -471,7 +445,7 @@ System (FITS) data format in root.
 %package graf-gpad
 Summary:	Canvas and pad library for ROOT
 Group:		Applications/Engineering
-Requires:	%{name}-graf-postscript = %{version}-%{release}
+Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
 
 %description graf-gpad
 This package contains a library for canvas and pad manipulations.
@@ -552,8 +526,8 @@ a low quality 3D viewer for ROOT defined geometries.
 %package gui
 Summary:	GUI library for ROOT
 Group:		Applications/Engineering
-Requires:	%{name}-graf-x11 = %{version}-%{release}
-Requires:	%{name}-gui-ged = %{version}-%{release}
+Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 
 %description gui
 This package contains a library for defining graphical user interfaces.
@@ -569,7 +543,7 @@ various kinds of data.
 %package gui-ged
 Summary:	GUI element for editing various ROOT objects
 Group:		Applications/Engineering
-Requires:	%{name}-tree-player = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description gui-ged
 This package contains a library to show a pop-up window for editing
@@ -615,7 +589,7 @@ access legacy Hbook files (NTuples and Histograms from PAW).
 %package hist
 Summary:	Histogram library for ROOT
 Group:		Applications/Engineering
-Requires:	%{name}-hist-painter = %{version}-%{release}
+Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
 
 %description hist
 This package contains a library for histogramming in ROOT.
@@ -749,7 +723,7 @@ a generalized vector library.
 %package mathcore
 Summary:	Core mathematics library for ROOT
 Group:		Applications/Engineering
-Requires:	%{name}-minuit = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 
 %description mathcore
 This package contains the MathCore library for ROOT.
@@ -1402,8 +1376,8 @@ make OPTFLAGS="%{optflags}" \
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # Move python modules to the sitelib
 mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}
@@ -1586,6 +1560,7 @@ 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
+install -m 644 -p %{SOURCE6} tutorials/hist/usa.root
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
@@ -1610,16 +1585,16 @@ cat includelist-net-netx* > includelist-netx
 
 %if "%{?rhel}" == "5"
 # Python byte code compilation
-%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{_libdir}/%{name}/python"'", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
-%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{_libdir}/%{name}/python"'", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
-%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python_sitearch}"'", 10, "%{python_sitearch}", 1)' > /dev/null
-%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python_sitearch}"'", 10, "%{python_sitearch}", 1)' > /dev/null
-%{__python26} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python26_sitearch}"'", 10, "%{python26_sitearch}", 1)' > /dev/null
-%{__python26} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python26_sitearch}"'", 10, "%{python26_sitearch}", 1)' > /dev/null
+%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
+%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
+%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null
+%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null
+%{__python26} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null
+%{__python26} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
@@ -1924,6 +1899,7 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/class.rules
 %{_datadir}/%{name}/gdb-backtrace.sh
+%{_datadir}/%{name}/helgrind-root.supp
 %{_datadir}/%{name}/Makefile.arch
 %{_datadir}/%{name}/root.mimes
 %{_datadir}/%{name}/system.rootauthrc
@@ -2459,6 +2435,12 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Aug 16 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
+- Update to 5.34.20
+- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
+- Do not depend on wine's fonts
+- Drop patch root-gccopt.patch
+
 * Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
 - Update to 5.34.19
 - Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
diff --git a/sources b/sources
index bcc042a..ba6bec6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-3c68587354619c0a2d3bb9f77381b1b9  root-5.34.19.tar.xz
+7ac7d0cdb28c2afe44be4c74a7cecb33  root-5.34.20.tar.xz
+afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 2f29b57628dbd1fc70abd190609da750ba7bc514 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 20 Aug 2014 05:53:54 +0200
Subject: [PATCH 059/344] Fix changelog date

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index daa364e..7ee5324 100644
--- a/root.spec
+++ b/root.spec
@@ -2435,7 +2435,7 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
-* Sat Aug 16 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
+* Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
 - Update to 5.34.20
 - Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
 - Do not depend on wine's fonts

From db06f3797ebfb2b62d182dc5cf6b7f0b8cdced85 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 29 Aug 2014 07:38:37 +0200
Subject: [PATCH 060/344] Move xproofd binaries from root-proofd to root-xproof

- Adjust EPEL 7 font dependencies
- Rebuild using new binutils (ld bug fixed - F21+)
---
 root.spec | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/root.spec b/root.spec
index 7ee5324..1503d61 100644
--- a/root.spec
+++ b/root.spec
@@ -36,7 +36,7 @@
 Name:		root
 Version:	5.34.20
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -174,10 +174,10 @@ BuildRequires:	font(liberationmono)
 BuildRequires:	liberation-fonts
 %endif
 BuildRequires:	urw-fonts
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
 BuildRequires:	font(droidsansfallback)
 %endif
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 18
 # STIX font version 1.1 - not backwards compatible with earlier versions
 # We use the texlive supplied version 1.0 instead of font(stix)
 BuildRequires:	texlive-stix
@@ -187,7 +187,7 @@ BuildRequires:	texlive-stix
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsizeonesym)
 %else
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
 # STIX font version 0.9
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsize1)
@@ -272,10 +272,10 @@ Requires:	font(liberationmono)
 Requires:	liberation-fonts
 %endif
 Requires:	urw-fonts
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
 Requires:	font(droidsansfallback)
 %endif
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 18
 # STIX font version 1.1 - not backwards compatible with earlier versions
 # We use the texlive supplied version 1.0 instead of font(stix)
 Requires:	texlive-stix
@@ -285,7 +285,7 @@ Requires:	texlive-stix
 Requires:	font(stixgeneral)
 Requires:	font(stixsizeonesym)
 %else
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
 # STIX font version 0.9
 Requires:	font(stixgeneral)
 Requires:	font(stixsize1)
@@ -333,10 +333,6 @@ with CINT with any class for which a Reflex dictionary is provided.
 Summary:	Parallel ROOT Facility - distributed, parallel computing
 Group:		Applications/Engineering
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-%if %{xrootd}
-Requires:	xrootd-server%{?_isa}
-%endif
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(post):		chkconfig
@@ -1014,6 +1010,8 @@ session in ROOT.
 %package xproof
 Summary:	XPROOF extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires:	xrootd-server%{?_isa}
 
 %description xproof
 This package contains the xproof extension for ROOT. This provides a
@@ -1966,16 +1964,9 @@ fi
 %{_bindir}/proofserv
 %{_bindir}/proofserv.exe
 %{_bindir}/xpdtest
-%if %{xrootd}
-%{_bindir}/proofexecv
-%{_bindir}/xproofd
-%endif
 %{_mandir}/man1/proofd.1*
 %{_mandir}/man1/proofserv.1*
 %{_mandir}/man1/xpdtest.1*
-%if %{xrootd}
-%{_mandir}/man1/xproofd.1*
-%endif
 %{_initrddir}/proofd
 
 %files rootd
@@ -2380,6 +2371,9 @@ fi
 
 %if %{xrootd}
 %files xproof -f includelist-proof-proofx
+%{_bindir}/proofexecv
+%{_bindir}/xproofd
+%{_mandir}/man1/xproofd.1*
 %{_libdir}/%{name}/libProofx.*
 %{_libdir}/%{name}/libXrdProofd.*
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
@@ -2435,6 +2429,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
+- Move xproofd binaries from root-proofd to root-xproof
+- Adjust EPEL 7 font dependencies
+- Rebuild using new binutils (ld bug fixed - F21+)
+
 * Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
 - Update to 5.34.20
 - Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)

From b1435a8750bac5b9a00c09201c05c6dad971a9cc Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 19 Dec 2014 15:16:09 +0100
Subject: [PATCH 061/344] Update to 5.34.24

- Drop patch root-bsd-misc.patch
---
 root-bsd-misc.patch      | 12 -----------
 root-dont-link-jvm.patch | 44 ++++++++++++++++++++--------------------
 root-xrdversion.patch    | 11 ++++++++++
 root.spec                | 15 +++++++++-----
 sources                  |  2 +-
 5 files changed, 44 insertions(+), 40 deletions(-)
 delete mode 100644 root-bsd-misc.patch
 create mode 100644 root-xrdversion.patch

diff --git a/root-bsd-misc.patch b/root-bsd-misc.patch
deleted file mode 100644
index b49fbba..0000000
--- a/root-bsd-misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-5.34.17.orig/core/base/src/TTimeStamp.cxx root-5.34.17/core/base/src/TTimeStamp.cxx
---- root-5.34.17.orig/core/base/src/TTimeStamp.cxx	2014-02-24 09:37:53.000000000 +0100
-+++ root-5.34.17/core/base/src/TTimeStamp.cxx	2014-02-27 09:37:28.381639337 +0100
-@@ -813,7 +813,7 @@
-           tmstruct.tm_isdst);
- #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX)
-    printf(",\n      tm_gmtoff %6ld, tm_zone \"%s\"",
--#if defined(__USE_BSD) || defined(R__MACOSX)
-+#if defined(__USE_MISC) || defined(R__MACOSX)
-    tmstruct.tm_gmtoff, tmstruct.tm_zone);
- #else
-    tmstruct.__tm_gmtoff, tmstruct.__tm_zone);
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
index 594d7c3..c6bf63b 100644
--- a/root-dont-link-jvm.patch
+++ b/root-dont-link-jvm.patch
@@ -1,21 +1,21 @@
-diff -ur root-5.34.11.orig/cmake/modules/RootConfiguration.cmake root-5.34.11/cmake/modules/RootConfiguration.cmake
---- root-5.34.11.orig/cmake/modules/RootConfiguration.cmake	2013-10-31 16:46:31.000000000 +0100
-+++ root-5.34.11/cmake/modules/RootConfiguration.cmake	2013-11-06 09:43:56.008974184 +0100
-@@ -167,10 +167,6 @@
- set(hdfslib ${HDFS_LIBRARY})
+diff -ur root-5.34.24.orig/cmake/modules/RootConfiguration.cmake root-5.34.24/cmake/modules/RootConfiguration.cmake
+--- root-5.34.24.orig/cmake/modules/RootConfiguration.cmake	2014-12-02 18:12:03.000000000 +0100
++++ root-5.34.24/cmake/modules/RootConfiguration.cmake	2014-12-19 11:41:09.559330313 +0100
+@@ -257,10 +257,6 @@
+ string(REPLACE ";" " " hdfslib "${HDFS_LIBRARY}")
  set(hdfsincdir ${HDFS_INCLUDE_DIR})
  
 -set(jniincdir ${Java_INCLUDE_DIRS})
--set(jvmlib ${Java_LIBRARIES})
+-string(REPLACE ";" " " jvmlib "${Java_LIBRARIES}")
 -set(jvmlibdir ${Java_LIBRARY_DIR})
 -
  set(buildalien ${value${alien}})
  set(alienlibdir ${ALIEN_LIBRARY_DIR})
- set(alienlib ${ALIEN_LIBRARY})
-diff -ur root-5.34.11.orig/config/Makefile.in root-5.34.11/config/Makefile.in
---- root-5.34.11.orig/config/Makefile.in	2013-10-31 16:46:31.000000000 +0100
-+++ root-5.34.11/config/Makefile.in	2013-11-06 09:41:09.145976839 +0100
-@@ -198,9 +198,6 @@
+ string(REPLACE ";" " " alienlib "${ALIEN_LIBRARY}")
+diff -ur root-5.34.24.orig/config/Makefile.in root-5.34.24/config/Makefile.in
+--- root-5.34.24.orig/config/Makefile.in	2014-12-02 18:12:03.000000000 +0100
++++ root-5.34.24/config/Makefile.in	2014-12-19 11:39:26.580520172 +0100
+@@ -207,9 +207,6 @@
  HDFSLIBDIR     := @hdfslibdir@
  HDFSCLILIB     := @hdfslib@
  HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
@@ -25,10 +25,10 @@ diff -ur root-5.34.11.orig/config/Makefile.in root-5.34.11/config/Makefile.in
  
  BUILDALIEN     := @buildalien@
  ALIENLIBDIR    := @alienlibdir@
-diff -ur root-5.34.11.orig/configure root-5.34.11/configure
---- root-5.34.11.orig/configure	2013-10-31 16:46:31.000000000 +0100
-+++ root-5.34.11/configure	2013-11-06 09:39:57.651833708 +0100
-@@ -1682,8 +1682,6 @@
+diff -ur root-5.34.24.orig/configure root-5.34.24/configure
+--- root-5.34.24.orig/configure	2014-12-02 18:12:03.000000000 +0100
++++ root-5.34.24/configure	2014-12-19 11:39:26.607519860 +0100
+@@ -1753,8 +1753,6 @@
    hdfs-incdir        HDFS support, location of hdfs.h
    hdfs-libdir        HDFS support, location of libhdfs
    iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
@@ -37,7 +37,7 @@ diff -ur root-5.34.11.orig/configure root-5.34.11/configure
    krb5               Kerberos5 support, location of Kerberos distribution
    krb5-incdir        Kerberos5 support, location of krb5.h
    krb5-libdir        Kerberos5 support, location of libkrb5
-@@ -2047,8 +2045,6 @@
+@@ -2141,8 +2139,6 @@
        --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
        --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
        --with-iosvers=*)        iosvers=$optarg       ;;
@@ -46,7 +46,7 @@ diff -ur root-5.34.11.orig/configure root-5.34.11/configure
        --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
        --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
        --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
-@@ -4082,17 +4078,6 @@
+@@ -4285,17 +4281,6 @@
      hdfsinc=$found_hdr
      hdfsincdir=$found_dir
  
@@ -64,7 +64,7 @@ diff -ur root-5.34.11.orig/configure root-5.34.11/configure
      check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
          $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
          $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
-@@ -4100,26 +4085,12 @@
+@@ -4303,26 +4288,12 @@
      hdfslib=$found_lib
      hdfslibdir=$found_dir
  
@@ -93,7 +93,7 @@ diff -ur root-5.34.11.orig/configure root-5.34.11/configure
                  if test $link_result -eq 0 ; then
                      enable_hdfs="no"
                  fi
-@@ -6843,9 +6814,6 @@
+@@ -7324,9 +7295,6 @@
      -e "s|@iosvers@|$iosvers|"                  \
      -e "s|@iconpath@|$iconpath|"                \
      -e "s|@incdir@|$incdir|"                    \
@@ -103,9 +103,9 @@ diff -ur root-5.34.11.orig/configure root-5.34.11/configure
      -e "s|@krb5incdir@|$krb5incdir|"            \
      -e "s|@krb5lib@|$krb5lib|"                  \
      -e "s|@krb5libdir@|$krb5libdir|"            \
-diff -ur root-5.34.11.orig/io/hdfs/Module.mk root-5.34.11/io/hdfs/Module.mk
---- root-5.34.11.orig/io/hdfs/Module.mk	2013-10-31 16:46:31.000000000 +0100
-+++ root-5.34.11/io/hdfs/Module.mk	2013-11-06 09:42:21.320111053 +0100
+diff -ur root-5.34.24.orig/io/hdfs/Module.mk root-5.34.24/io/hdfs/Module.mk
+--- root-5.34.24.orig/io/hdfs/Module.mk	2014-12-02 18:12:03.000000000 +0100
++++ root-5.34.24/io/hdfs/Module.mk	2014-12-19 11:39:26.608519849 +0100
 @@ -44,7 +44,7 @@
  $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
diff --git a/root-xrdversion.patch b/root-xrdversion.patch
new file mode 100644
index 0000000..84b8f92
--- /dev/null
+++ b/root-xrdversion.patch
@@ -0,0 +1,11 @@
+diff -ur root-5.34.23.orig/net/netxng/src/TNetXNGFile.cxx root-5.34.23/net/netxng/src/TNetXNGFile.cxx
+--- root-5.34.23.orig/net/netxng/src/TNetXNGFile.cxx	2014-11-07 15:06:59.000000000 +0100
++++ root-5.34.23/net/netxng/src/TNetXNGFile.cxx	2014-12-19 10:11:33.343919333 +0100
+@@ -28,6 +28,7 @@
+ #include <XrdCl/XrdClFile.hh>
+ #include <XrdCl/XrdClXRootDResponses.hh>
+ #include <XrdCl/XrdClDefaultEnv.hh>
++#include <XrdVersion.hh>
+ #include <iostream>
+ 
+ //------------------------------------------------------------------------------
diff --git a/root.spec b/root.spec
index 1503d61..2dc3451 100644
--- a/root.spec
+++ b/root.spec
@@ -34,9 +34,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.20
+Version:	5.34.24
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -78,10 +78,10 @@ Patch6:		%{name}-no-extra-formats.patch
 Patch7:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch8:		%{name}-dont-link-jvm.patch
-#		Avoid deprecated __USE_BSD
-Patch9:		%{name}-bsd-misc.patch
 #		Use local copy of input file during documentation generation
-Patch10:	%{name}-usa.patch
+Patch9:		%{name}-usa.patch
+#		Make sure xrootd version is known
+Patch10:	%{name}-xrdversion.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
@@ -1345,6 +1345,7 @@ unset QTINC
 	    --disable-chirp \
 	    --disable-cling \
 	    --disable-cxx11 \
+	    --disable-cxx14 \
 	    --disable-glite \
 	    --disable-libcxx \
 	    --disable-monalisa \
@@ -2429,6 +2430,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
+- Update to 5.34.24
+- Drop patch root-bsd-misc.patch
+
 * Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
 - Move xproofd binaries from root-proofd to root-xproof
 - Adjust EPEL 7 font dependencies
diff --git a/sources b/sources
index ba6bec6..2a3f5cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7ac7d0cdb28c2afe44be4c74a7cecb33  root-5.34.20.tar.xz
+8428348c943e4cbb58fb188dcb3d02c5  root-5.34.24.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 6a86160033fa2926c186e6a6346f2271609880d7 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sat, 17 Jan 2015 01:17:04 +0900
Subject: [PATCH 062/344] Rebuild for
 https://fedoraproject.org/wiki/Changes/Ruby_2.2

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 2dc3451..757bd77 100644
--- a/root.spec
+++ b/root.spec
@@ -36,7 +36,7 @@
 Name:		root
 Version:	5.34.24
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2430,6 +2430,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
 * Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
 - Update to 5.34.24
 - Drop patch root-bsd-misc.patch

From 5055650a66cfdbfad8a337363abaff8289cc7ce4 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 29 Jan 2015 22:12:56 +0100
Subject: [PATCH 063/344] Rebuild with fixed cairo (bz 1183242)

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 757bd77..e02ae99 100644
--- a/root.spec
+++ b/root.spec
@@ -36,7 +36,7 @@
 Name:		root
 Version:	5.34.24
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2430,6 +2430,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
+- Rebuild with fixed cairo (bz 1183242)
+
 * Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
 

From 1b4917794ee8a61cbe5fdeb74de9d40cbaed34fc Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 2 Mar 2015 10:37:17 +0100
Subject: [PATCH 064/344] Update to 5.34.26

- Drop patch root-xrdversion.patch
---
 root-xrdversion.patch |  11 ---
 root.spec             | 180 ++++++++++++++++++++----------------------
 sources               |   2 +-
 3 files changed, 88 insertions(+), 105 deletions(-)
 delete mode 100644 root-xrdversion.patch

diff --git a/root-xrdversion.patch b/root-xrdversion.patch
deleted file mode 100644
index 84b8f92..0000000
--- a/root-xrdversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-5.34.23.orig/net/netxng/src/TNetXNGFile.cxx root-5.34.23/net/netxng/src/TNetXNGFile.cxx
---- root-5.34.23.orig/net/netxng/src/TNetXNGFile.cxx	2014-11-07 15:06:59.000000000 +0100
-+++ root-5.34.23/net/netxng/src/TNetXNGFile.cxx	2014-12-19 10:11:33.343919333 +0100
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
- 
- //------------------------------------------------------------------------------
diff --git a/root.spec b/root.spec
index e02ae99..ad2948c 100644
--- a/root.spec
+++ b/root.spec
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 %global __python26 /usr/bin/python26
 %{!?python26_sitearch: %global python26_sitearch %(%{__python26} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # Disable the default python byte code compilation
@@ -34,9 +34,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.24
+Version:	5.34.26
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -80,8 +80,6 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
-#		Make sure xrootd version is known
-Patch10:	%{name}-xrdversion.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
@@ -128,7 +126,7 @@ BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	python-devel
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 BuildRequires:	python26-devel
 %endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
@@ -159,7 +157,7 @@ BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	expat-devel
@@ -369,7 +367,7 @@ Group:		Applications/Engineering
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 %package python26
 Summary:	Python extension for ROOT
 Group:		Applications/Engineering
@@ -1128,7 +1126,7 @@ Group:		Applications/Engineering
 BuildArch:	noarch
 %endif
 Requires:	%{name} = %{version}-%{release}
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 Requires:	emacs >= %{emacs_version}
 %else
 Requires:	emacs(bin) >= %{emacs_version}
@@ -1165,7 +1163,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -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 \
@@ -1213,6 +1210,8 @@ rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
 sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
 #  * unuran
 rm -rf math/unuran/src/*.tar.gz
+#  * xrootd-private-devel headers
+rm -rf proof/xrdinc
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
@@ -1235,7 +1234,7 @@ sed s/c1/c1c/g -i tutorials/graphics/earth.C
 sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
 sed s/c1/c1simp/g -i tutorials/hsimple.C
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 # Build PyROOT for python 2.6
 cp -pr bindings/pyroot bindings/pyroot26
 sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
@@ -1273,14 +1272,11 @@ unset QTINC
 	    --enable-gdml \
 	    --enable-genvector \
 	    --enable-gfal \
-	      --with-gfal-incdir=%{_includedir}/gfal2 \
-	      --with-gfal-libdir=%{_libdir} \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
 %if %{?fedora}%{!?fedora:0} >= 20
 	    --enable-hdfs \
-	      --with-hdfs-incdir=%{_includedir}/hadoop \
 %else
 	    --disable-hdfs \
 %endif
@@ -1309,8 +1305,6 @@ unset QTINC
 %endif
 	    --enable-reflex \
 	    --enable-rfio \
-	      --with-rfio-incdir=%{_includedir}/dpm \
-	      --with-rfio-libdir=%{_libdir} \
 	    --enable-roofit \
 	    --enable-ruby \
 	    --enable-shadowpw \
@@ -1327,8 +1321,6 @@ unset QTINC
 	    --enable-xml \
 %if %{xrootd}
 	    --enable-xrootd \
-	      --with-xrootd-incdir=%{_includedir}/xrootd \
-	      --with-xrootd-libdir=%{_libdir} \
 %else
 	    --disable-xrootd \
 %endif
@@ -1361,7 +1353,7 @@ unset QTINC
 make OPTFLAGS="%{optflags}" \
 	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 # Build PyROOT for python 2.6
 mkdir pyroot26
 cp bindings/pyroot26/ROOT.py pyroot26
@@ -1379,17 +1371,16 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Move python modules to the sitelib
-mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}
-mv ${RPM_BUILD_ROOT}%{_libdir}/%{name}/*.py* \
-   ${RPM_BUILD_ROOT}%{python_sitearch}
+mkdir -p %{buildroot}%{python_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
 
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
-    ${RPM_BUILD_ROOT}%{emacs_lispdir}/%{name}/*.el
+    %{buildroot}%{emacs_lispdir}/%{name}/*.el
 
 # Install desktop entry and icon
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
 cat > root.desktop << EOF
 [Desktop Entry]
@@ -1405,104 +1396,103 @@ Categories=Utility;
 Encoding=UTF-8
 EOF
 
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
 		     --vendor "" root.desktop
 install -p -m 644 build/package/debian/root-system-bin.png \
-    ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/root.png
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
 
 # Install mime type and icon
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/mime/packages
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/mimetypes
+mkdir -p %{buildroot}%{_datadir}/mime/packages
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
-    ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/root.xml
+    %{buildroot}%{_datadir}/mime/packages/root.xml
 install -p -m 644 build/package/debian/application-x-root.png \
-    ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/mimetypes
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
 # Init scripts for services
-mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
-mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/proofd.rc.d \
-   ${RPM_BUILD_ROOT}%{_initrddir}/proofd
-mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/rootd.rc.d \
-   ${RPM_BUILD_ROOT}%{_initrddir}/rootd
+mkdir -p %{buildroot}%{_initrddir}
+mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
+   %{buildroot}%{_initrddir}/proofd
+mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
+   %{buildroot}%{_initrddir}/rootd
 
 # Turn off services by default
-sed 's/\(chkconfig: \)[0-9]*/\1-/' -i ${RPM_BUILD_ROOT}%{_initrddir}/*
+sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
 
 # The Python interface library must be in two places
-mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}
-mv ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libPyROOT.so.%{libversion} \
-   ${RPM_BUILD_ROOT}%{python_sitearch}/libPyROOT.so
-%if "%{?rhel}" == "5"
-touch ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+mkdir -p %{buildroot}%{python_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+   %{buildroot}%{python_sitearch}/libPyROOT.so
+%if %{?rhel}%{!?rhel:0} == 5
+touch %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %else
 ln -s ..`sed 's!%{_libdir}!!' <<< %{python_sitearch}`/libPyROOT.so \
-   ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+   %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %endif
 
-%if "%{?rhel}" == "5"
-mkdir -p ${RPM_BUILD_ROOT}%{python26_sitearch}
+%if %{?rhel}%{!?rhel:0} == 5
+mkdir -p %{buildroot}%{python26_sitearch}
 install pyroot26/libPyROOT.so.%{libversion} \
-   ${RPM_BUILD_ROOT}%{python26_sitearch}/libPyROOT.so
-install -m 644 pyroot26/ROOT.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
-install -m 644 pyroot26/cppyy.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
+   %{buildroot}%{python26_sitearch}/libPyROOT.so
+install -m 644 pyroot26/ROOT.py* %{buildroot}%{python26_sitearch}
+install -m 644 pyroot26/cppyy.py* %{buildroot}%{python26_sitearch}
 %endif
 
 # Same for the Ruby interface library
-mkdir -p ${RPM_BUILD_ROOT}%{ruby_installdir}
-mv ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libRuby.so.%{libversion} \
-   ${RPM_BUILD_ROOT}%{ruby_installdir}/libRuby.so
+mkdir -p %{buildroot}%{ruby_installdir}
+mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion} \
+   %{buildroot}%{ruby_installdir}/libRuby.so
 ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_installdir}`/libRuby.so \
-   ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libRuby.so.%{libversion}
+   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion}
 
 # These should be in PATH
-mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils/pq2/pq2* \
-   ${RPM_BUILD_ROOT}%{_bindir}
+mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
 # Remove some junk
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/*.plist
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/*.xinetd
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/README
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/hostcert.conf
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/*.sample
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/root.desktop
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/system.plugins-ios
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gitinfo.txt
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
+rm %{buildroot}%{_datadir}/%{name}/daemons/README
+rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
+rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
+rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
+rm %{buildroot}%{_datadir}/%{name}/root.desktop
+rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
+rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
 %if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
-rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
+rm %{buildroot}%{_libdir}/%{name}/libAfterImage.a
 %endif
-rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libmathtext.a
-rm ${RPM_BUILD_ROOT}%{_bindir}/setxrd*
-rm ${RPM_BUILD_ROOT}%{_bindir}/thisroot*
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/cint.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/g2rootold.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/makecint.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/proofserva.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/roota.1
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/setup-pq2.1
+rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
+rm %{buildroot}%{_bindir}/setxrd*
+rm %{buildroot}%{_bindir}/thisroot*
+rm %{buildroot}%{_mandir}/man1/cint.1
+rm %{buildroot}%{_mandir}/man1/g2rootold.1
+rm %{buildroot}%{_mandir}/man1/makecint.1
+rm %{buildroot}%{_mandir}/man1/proofserva.1
+rm %{buildroot}%{_mandir}/man1/roota.1
+rm %{buildroot}%{_mandir}/man1/setup-pq2.1
 %if %{xrootd} == 0
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xproofd.1
+rm %{buildroot}%{_mandir}/man1/xproofd.1
 %endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
-rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.cw
-rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.pri
+rm %{buildroot}%{_includedir}/%{name}/*.cw
+rm %{buildroot}%{_includedir}/%{name}/*.pri
 %endif
-rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/proofdp.h
-rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/rootdp.h
-rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/BUILDSYSTEM
-rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/ChangeLog-2-24
-rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/INSTALL
-rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/README.ALIEN
-rm ${RPM_BUILD_ROOT}%{_pkgdocdir}/README.MONALISA
+rm %{buildroot}%{_includedir}/%{name}/proofdp.h
+rm %{buildroot}%{_includedir}/%{name}/rootdp.h
+rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
+rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
+rm %{buildroot}%{_pkgdocdir}/INSTALL
+rm %{buildroot}%{_pkgdocdir}/README.ALIEN
+rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
 # Remove cintdll sources - keep the prec_stl directory
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/%{name}/cint/cint/lib/{[^p],p[^r]}*
+rm -rf %{buildroot}%{_libdir}/%{name}/cint/cint/lib/{[^p],p[^r]}*
 
 # Only used on Windows
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/macros/fileopen.C
+rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
-pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins
+pushd %{buildroot}%{_datadir}/%{name}/plugins
 rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
@@ -1549,9 +1539,9 @@ rmdir TImagePlugin
 popd
 
 # Create ldconfig configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo %{_libdir}/%{name} > \
-     ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+     %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 # Generate documentation
 echo Rint.Includes: 0 > .rootrc
@@ -1563,7 +1553,7 @@ install -m 644 -p %{SOURCE6} tutorials/hist/usa.root
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
-mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
+mv htmldoc %{buildroot}%{_pkgdocdir}/html
 
 # Create includelist files ...
 for module in `find * -name Module.mk` ; do
@@ -1582,7 +1572,7 @@ cat includelist-io-xmlparser >> includelist-io-xml
 cat includelist-proof-proofplayer >> includelist-proof-proof
 cat includelist-net-netx* > includelist-netx
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 # Python byte code compilation
 %{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
 %{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
@@ -1639,7 +1629,7 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service proofd condrestart >/dev/null 2>&1 || :
 fi
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 %post python
 [ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
     readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
@@ -1976,7 +1966,7 @@ fi
 %{_initrddir}/rootd
 
 %files python -f includelist-bindings-pyroot
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
@@ -1988,7 +1978,7 @@ fi
 %{python_sitearch}/ROOT.py*
 %{python_sitearch}/cppyy.py*
 
-%if "%{?rhel}" == "5"
+%if %{?rhel}%{!?rhel:0} == 5
 %files python26 -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
@@ -2430,6 +2420,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
+- Update to 5.34.26
+- Drop patch root-xrdversion.patch
+
 * Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
 - Rebuild with fixed cairo (bz 1183242)
 
diff --git a/sources b/sources
index 2a3f5cd..667e107 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8428348c943e4cbb58fb188dcb3d02c5  root-5.34.24.tar.xz
+baf87e434af88ecbbdfc47ab49608b57  root-5.34.26.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 764ed778347e178b0b949c850312ead7967fa228 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 4 Apr 2015 07:18:09 +0200
Subject: [PATCH 065/344] Update to 5.34.28

- Merge emacs support files into main package (guidelines updated)
---
 root-gcc5-1.patch | 69 +++++++++++++++++++++++++++++++++++++++++
 root-gcc5-2.patch | 76 +++++++++++++++++++++++++++++++++++++++++++++
 root-gcc5-3.patch | 34 ++++++++++++++++++++
 root-gcc5-4.patch | 49 +++++++++++++++++++++++++++++
 root-meta.patch   |  8 +++--
 root.spec         | 79 +++++++++++++++++++----------------------------
 sources           |  2 +-
 7 files changed, 267 insertions(+), 50 deletions(-)
 create mode 100644 root-gcc5-1.patch
 create mode 100644 root-gcc5-2.patch
 create mode 100644 root-gcc5-3.patch
 create mode 100644 root-gcc5-4.patch

diff --git a/root-gcc5-1.patch b/root-gcc5-1.patch
new file mode 100644
index 0000000..ab826cb
--- /dev/null
+++ b/root-gcc5-1.patch
@@ -0,0 +1,69 @@
+From 126c993d3c432ed09abc963bdbb1dc18f229a3e3 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@cern.ch>
+Date: Wed, 11 Mar 2015 11:31:13 +0100
+Subject: [PATCH 1/1] Regenerate iosenum.linuxarm643 for GCC 5
+
+There are two `iosenum.cxx` in ROOT5 source. Previously I used
+`./cint/cint/include/iosenum.cxx` which also generated compiler
+version check. This breaks on GCC 5 based system (e.g, Fedora 22).
+
+This time used `./cint/iosenum/iosenum.cxx` to match the rest of
+`iosenum.h` files in source.
+
+Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
+---
+ cint/iosenum/iosenum.linuxarm643 | 38 ++------------------------------------
+ 1 file changed, 2 insertions(+), 36 deletions(-)
+
+diff --git a/cint/iosenum/iosenum.linuxarm643 b/cint/iosenum/iosenum.linuxarm643
+index 997f30b..0465c64 100644
+--- a/cint/iosenum/iosenum.linuxarm643
++++ b/cint/iosenum/iosenum.linuxarm643
+@@ -1,42 +1,8 @@
+-/* include/iosenum.h
++/* include/platform/iosenum.h
+  *  This file contains platform dependent ios enum value.
+- *  Run 'cint include/iosenum.cxx' to create this file. It is done
++ *  Run 'cint iosenum.cxx' to create this file. It is done
+  *  only once at installation. */
+-#if !defined(G__GNUC) || (G__GNUC!=4)
+-#error $CINTSYSDIR/include/iosenum.h compiler version mismatch. Do'cd $CINTSYSDIR/include; cint iosenum.cxx' to restore
+-#endif
+ #pragma ifndef G__TMPLTIOS
+-static int ios::goodbit=0;
+-static int ios::eofbit=2;
+-static int ios::failbit=4;
+-static int ios::badbit=1;
+-static int ios::in=8;
+-static int ios::out=16;
+-static int ios::ate=2;
+-static int ios::app=1;
+-static int ios::trunc=32;
+-static int ios::binary=4;
+-static int ios::beg=0;
+-static int ios::cur=1;
+-static int ios::end=2;
+-static int ios::boolalpha=1;
+-static int ios::adjustfield=176;
+-static int ios::basefield=74;
+-static int ios::floatfield=260;
+-static int ios::skipws=4096;
+-static int ios::left=32;
+-static int ios::right=128;
+-static int ios::internal=16;
+-static int ios::dec=2;
+-static int ios::oct=64;
+-static int ios::hex=8;
+-static int ios::showbase=512;
+-static int ios::showpoint=1024;
+-static int ios::uppercase=16384;
+-static int ios::showpos=2048;
+-static int ios::scientific=256;
+-static int ios::fixed=4;
+-static int ios::unitbuf=8192;
+ #pragma else
+ static ios_base::fmtflags ios_base::boolalpha=1;
+ static ios_base::fmtflags ios_base::dec=2;
+-- 
+1.8.2
+
diff --git a/root-gcc5-2.patch b/root-gcc5-2.patch
new file mode 100644
index 0000000..6343555
--- /dev/null
+++ b/root-gcc5-2.patch
@@ -0,0 +1,76 @@
+From 7dec562d1d5723b7eea08d08659dc9dc4e79c8ca Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@cern.ch>
+Date: Wed, 11 Mar 2015 11:35:47 +0100
+Subject: [PATCH 1/1] Update CINT CMake and configure scripts for GCC 5
+
+The following is required otherwise `iosenum.h` will be missing causing
+build failures. Needed for Fedora 22.
+
+Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
+---
+ cint/cint/CMakeLists.txt |  4 +---
+ cint/cint/Module.mk      | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/cint/cint/CMakeLists.txt b/cint/cint/CMakeLists.txt
+index 705b57d..e7756be 100644
+--- a/cint/cint/CMakeLists.txt
++++ b/cint/cint/CMakeLists.txt
+@@ -61,9 +61,7 @@ set_source_files_properties(loadfile_tmp.cxx  COMPILE_FLAGS "-UR__HAVE_CONFIG -D
+ #---Generate and/or copy the iosenum headerfile to the include directory-------------------------------
+ if(${CLANG_MAJOR} GREATER 2)
+   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
+-elseif(${GCC_MAJOR} EQUAL 4)
+-  set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
+-elseif(${GCC_MAJOR} EQUAL 3)
++elseif(${GCC_MAJOR} GREATER 3)
+   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
+ else()
+   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE})
+diff --git a/cint/cint/Module.mk b/cint/cint/Module.mk
+index 4cfed92..0293321 100644
+--- a/cint/cint/Module.mk
++++ b/cint/cint/Module.mk
+@@ -161,6 +161,10 @@ ifeq ($(GCC_MAJOR),4)
+ CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
+ CINTS2       += $(MODDIRSD)/gcc4strm.cxx
+ endif
++ifeq ($(GCC_MAJOR),5)
++CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
++CINTS2       += $(MODDIRSD)/gcc4strm.cxx
++endif
+ ifneq ($(CLANG_MAJOR),)
+ CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
+ CINTS2       += $(MODDIRSD)/gcc4strm.cxx
+@@ -203,6 +207,9 @@ IOSENUMC     := $(CINTDIRIOSEN)/iosenum.cxx
+ ifneq ($(CLANG_MAJOR),)
+ IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
+ else
++ifeq ($(GCC_MAJOR),5)
++IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
++else
+ ifeq ($(GCC_MAJOR),4)
+ IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
+ else
+@@ -213,6 +220,7 @@ IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)
+ endif
+ endif
+ endif
++endif
+ 
+ # used in the main Makefile
+ ALLHDRS     += $(CINTHT) $(CINTINCLUDES)
+@@ -344,6 +352,10 @@ $(call stripsrc,$(CINTDIRSD)/%strm.o):    CINTCXXFLAGS += -I$(CINTDIRL)/$(notdir
+ ifeq ($(GCC_MAJOR),4)
+ $(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
+ endif
++ifeq ($(GCC_MAJOR),5)
++$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
++endif
++
+ 
+ $(MAKECINTO) $(CINTO): $(CINTCONF) $(ORDER_) $(CINTINCLUDES)
+ 
+-- 
+1.8.2
+
diff --git a/root-gcc5-3.patch b/root-gcc5-3.patch
new file mode 100644
index 0000000..740561e
--- /dev/null
+++ b/root-gcc5-3.patch
@@ -0,0 +1,34 @@
+From 0a2381e82798f6fad2013d553c76b5f321b8a6a3 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@cern.ch>
+Date: Wed, 11 Mar 2015 11:37:28 +0100
+Subject: [PATCH 1/1] Disable unsecure gets() in CINT as it's removed in C11
+
+gets() for a long time is considered unsafe, one could use fgets()
+instead. Also gets_s() could be used since C11. GCC 5 and Clang 3.6
+defaults to C11 as default now. glibc still provides gets() only
+if compiling for GNU specifically (_GNU_SOURCE is defined). Other
+libc implementations behavior is unknown to me.
+
+Required for Fedora 22.
+
+Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
+---
+ cint/cint/lib/stdstrct/stdfunc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cint/cint/lib/stdstrct/stdfunc.h b/cint/cint/lib/stdstrct/stdfunc.h
+index 530bc71..f849b13 100644
+--- a/cint/cint/lib/stdstrct/stdfunc.h
++++ b/cint/cint/lib/stdstrct/stdfunc.h
+@@ -70,7 +70,7 @@ size_t fwrite(void *buffer,size_t size,size_t n,FILE *fp);
+ int getc(FILE *fp);
+ int getchar(void);
+ char *getenv(const char *variable);
+-char *gets(char *buffer);
++/* char *gets(char *buffer); */
+ struct tm* gmtime(time_t *caltime);
+ int isalnum(int c);
+ int isalpha(int c);
+-- 
+1.8.2
+
diff --git a/root-gcc5-4.patch b/root-gcc5-4.patch
new file mode 100644
index 0000000..14f8cd9
--- /dev/null
+++ b/root-gcc5-4.patch
@@ -0,0 +1,49 @@
+From 19f4cf3c144c4a2b6e2e758c601fc3976e9baa39 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@cern.ch>
+Date: Wed, 11 Mar 2015 11:43:02 +0100
+Subject: [PATCH 1/1] Remove `operator void*() const` from CINT if compiled in
+ C++11 mode (GCC 5)
+
+`std::basic_ios` had `operator void*() const` until C++11 and after that
+`explicit operator bool() const`. libstdc++ with GCC 5 finally cleans up
+things to be more compliant with C++11 standard. This is required if ROOT5
+is compiled in C++11 mode (--enable-c++11) on GCC 5.
+
+Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
+---
+ cint/cint/src/dict/gcc4strm.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cint/cint/src/dict/gcc4strm.cxx b/cint/cint/src/dict/gcc4strm.cxx
+index 2bc8d43..4db0264 100644
+--- a/cint/cint/src/dict/gcc4strm.cxx
++++ b/cint/cint/src/dict/gcc4strm.cxx
+@@ -1047,11 +1047,14 @@ static int G__G__stream_13_0_8(G__value* result7, G__CONST char* funcname, struc
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
++#if __cplusplus < 201103L
++// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
+ static int G__G__stream_13_0_9(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
+ {
+       G__letint(result7, 89, (long) ((const basic_ios<char,char_traits<char> >*) G__getstructoffset())->operator void*());
+    return(1 || funcname || hash || result7 || libp) ;
+ }
++#endif
+ 
+ static int G__G__stream_13_0_10(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
+ {
+@@ -4097,7 +4100,10 @@ static void G__setup_memfuncbasic_ioslEcharcOchar_traitslEchargRsPgR(void) {
+    G__memfunc_setup("clear",519,G__G__stream_13_0_6, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 'goodbit' state", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("setstate",877,G__G__stream_13_0_7, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 - state", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("rdstate",759,G__G__stream_13_0_8, 105, -1, G__defined_typename("ios_base::iostate"), 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
++#if __cplusplus < 201103L
++// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
+    G__memfunc_setup("operator void*",1384,G__G__stream_13_0_9, 89, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
++#endif
+    G__memfunc_setup("operator!",909,G__G__stream_13_0_10, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("good",425,G__G__stream_13_0_11, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
+    G__memfunc_setup("eof",314,G__G__stream_13_0_12, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
+-- 
+1.8.2
+
diff --git a/root-meta.patch b/root-meta.patch
index 6395e3a..02dc37d 100644
--- a/root-meta.patch
+++ b/root-meta.patch
@@ -1,7 +1,7 @@
 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 @@
+@@ -320,25 +320,29 @@
     ProcessLine("#define ROOT_TError 0");
     ProcessLine("#define ROOT_TGenericClassInfo 0");   
  
@@ -30,6 +30,8 @@ diff -ur root-5.32.00.orig/core/meta/src/TCint.cxx root-5.32.00/core/meta/src/TC
 -      ProcessLine("#include <RtypesCint.h>");
 -      delete[] whichTypesCint;
 -  }
+-  // We cannot autoload this but ROOT needs it (ROOT-7103)
+-  ProcessLine("#include <iostream>");
 +      // Allow the usage of ClassDef and ClassImp in interpreted macros
 +      // if RtypesCint.h can be found (think of static executable without
 +      // include/)
@@ -38,7 +40,9 @@ diff -ur root-5.32.00.orig/core/meta/src/TCint.cxx root-5.32.00/core/meta/src/TC
 +         ProcessLine("#include <RtypesCint.h>");
 +         delete[] whichTypesCint;
 +      }
++      // We cannot autoload this but ROOT needs it (ROOT-7103)
++      ProcessLine("#include <iostream>");
 +   }
- 
  }
  
+ //______________________________________________________________________________
diff --git a/root.spec b/root.spec
index ad2948c..6dd2cac 100644
--- a/root.spec
+++ b/root.spec
@@ -21,20 +21,14 @@
 %endif
 %endif
 
-%if %($(pkg-config emacs) ; echo $?)
-%global emacs_version 21.4
-%global emacs_lispdir %{_datadir}/emacs/site-lisp
-%else
-%global emacs_version %(pkg-config emacs --modversion)
-%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
+%{!?_emacs_sitelispdir: %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp}
 
 %global xrootd 1
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.26
+Version:	5.34.28
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -80,6 +74,11 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
+#		Fixes for gcc 5 (from upstream git)
+Patch10:	%{name}-gcc5-1.patch
+Patch11:	%{name}-gcc5-2.patch
+Patch12:	%{name}-gcc5-3.patch
+Patch13:	%{name}-gcc5-4.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
@@ -193,6 +192,13 @@ BuildRequires:	font(stixsize1)
 %endif
 %endif
 Requires:	hicolor-icon-theme
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
+Requires:	emacs-filesystem >= %{_emacs_version}
+%endif
+Provides:	emacs-%{name} = %{version}-%{release}
+Provides:	emacs-%{name}-el = %{version}-%{release}
+Obsoletes:	emacs-%{name} < 5.34.28
+Obsoletes:	emacs-%{name}-el < 5.34.28
 
 %description
 The ROOT system provides a set of object oriented frameworks with all
@@ -1119,36 +1125,6 @@ Group:		Applications/Engineering
 %description tree-viewer
 This package contains a plugin for browsing a ROOT tree in ROOT.
 
-%package -n emacs-%{name}
-Summary:	Compiled elisp files to run root under GNU Emacs
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch:	noarch
-%endif
-Requires:	%{name} = %{version}-%{release}
-%if %{?rhel}%{!?rhel:0} == 5
-Requires:	emacs >= %{emacs_version}
-%else
-Requires:	emacs(bin) >= %{emacs_version}
-%endif
-
-%description -n emacs-%{name}
-emacs-root is an add-on package for GNU Emacs. It provides integration
-with ROOT.
-
-%package -n emacs-%{name}-el
-Summary:	Elisp source files for root under GNU Emacs
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch:	noarch
-%endif
-Requires:	emacs-%{name} = %{version}-%{release}
-
-%description -n emacs-%{name}-el
-This package contains the elisp source files for root under GNU Emacs. You
-do not need to install this package to run root. Install the emacs-root
-package to use root with GNU Emacs.
-
 %prep
 %setup -q
 if pkg-config --max-version 2.1.2 ftgl ; then
@@ -1163,6 +1139,10 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -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 \
@@ -1249,7 +1229,7 @@ unset QTINC
 	    --libdir=%{_libdir}/%{name} \
 	    --etcdir=%{_datadir}/%{name} \
 	    --docdir=%{_pkgdocdir} \
-	    --elispdir=%{emacs_lispdir}/%{name} \
+	    --elispdir=%{_emacs_sitelispdir}/%{name} \
 %if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
 	    --disable-builtin-afterimage \
 %else
@@ -1376,7 +1356,7 @@ mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
 
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
-    %{buildroot}%{emacs_lispdir}/%{name}/*.el
+    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
 
 # Install desktop entry and icon
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -1867,6 +1847,14 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/root.png
 %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
 %{_datadir}/mime/packages/root.xml
+%if %{?fedora}%{!?fedora:0} < 15 && %{?rhel}%{!?rhel:0} < 7
+# No emacs-filesystem package
+%dir %{_datadir}/emacs
+%dir %{_emacs_sitelispdir}
+%endif
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitelispdir}/%{name}/*.el
 
 %files icons
 %{_datadir}/%{name}/icons
@@ -2412,14 +2400,11 @@ fi
 %{_libdir}/%{name}/libTreeViewer.*
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
-%files -n emacs-%{name}
-%dir %{emacs_lispdir}/root
-%{emacs_lispdir}/root/*.elc
-
-%files -n emacs-%{name}-el
-%{emacs_lispdir}/root/*.el
-
 %changelog
+* Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
+- Update to 5.34.28
+- Merge emacs support files into main package (guidelines updated)
+
 * Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
 - Update to 5.34.26
 - Drop patch root-xrdversion.patch
diff --git a/sources b/sources
index 667e107..eb2cd1b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-baf87e434af88ecbbdfc47ab49608b57  root-5.34.26.tar.xz
+87647e87b2ab5634759e0efe99ec1543  root-5.34.28.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 9af453a9f934fc7e209b2fb3514fdf7cf0baebbd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 25 Apr 2015 09:56:52 +0200
Subject: [PATCH 066/344] Update to 5.34.30

- New sub-package: root-python3
- Disable hadoop/hdfs support for F23+ (not installable)
- Drop previously backported gcc 5 patches
---
 root-gcc5-1.patch |  69 -----------------
 root-gcc5-2.patch |  76 -------------------
 root-gcc5-3.patch |  34 ---------
 root-gcc5-4.patch |  49 ------------
 root-usa.patch    |  14 ++--
 root.spec         | 186 +++++++++++++++++++++++++++++++++-------------
 sources           |   2 +-
 7 files changed, 143 insertions(+), 287 deletions(-)
 delete mode 100644 root-gcc5-1.patch
 delete mode 100644 root-gcc5-2.patch
 delete mode 100644 root-gcc5-3.patch
 delete mode 100644 root-gcc5-4.patch

diff --git a/root-gcc5-1.patch b/root-gcc5-1.patch
deleted file mode 100644
index ab826cb..0000000
--- a/root-gcc5-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 126c993d3c432ed09abc963bdbb1dc18f229a3e3 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:31:13 +0100
-Subject: [PATCH 1/1] Regenerate iosenum.linuxarm643 for GCC 5
-
-There are two `iosenum.cxx` in ROOT5 source. Previously I used
-`./cint/cint/include/iosenum.cxx` which also generated compiler
-version check. This breaks on GCC 5 based system (e.g, Fedora 22).
-
-This time used `./cint/iosenum/iosenum.cxx` to match the rest of
-`iosenum.h` files in source.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/iosenum/iosenum.linuxarm643 | 38 ++------------------------------------
- 1 file changed, 2 insertions(+), 36 deletions(-)
-
-diff --git a/cint/iosenum/iosenum.linuxarm643 b/cint/iosenum/iosenum.linuxarm643
-index 997f30b..0465c64 100644
---- a/cint/iosenum/iosenum.linuxarm643
-+++ b/cint/iosenum/iosenum.linuxarm643
-@@ -1,42 +1,8 @@
--/* include/iosenum.h
-+/* include/platform/iosenum.h
-  *  This file contains platform dependent ios enum value.
-- *  Run 'cint include/iosenum.cxx' to create this file. It is done
-+ *  Run 'cint iosenum.cxx' to create this file. It is done
-  *  only once at installation. */
--#if !defined(G__GNUC) || (G__GNUC!=4)
--#error $CINTSYSDIR/include/iosenum.h compiler version mismatch. Do'cd $CINTSYSDIR/include; cint iosenum.cxx' to restore
--#endif
- #pragma ifndef G__TMPLTIOS
--static int ios::goodbit=0;
--static int ios::eofbit=2;
--static int ios::failbit=4;
--static int ios::badbit=1;
--static int ios::in=8;
--static int ios::out=16;
--static int ios::ate=2;
--static int ios::app=1;
--static int ios::trunc=32;
--static int ios::binary=4;
--static int ios::beg=0;
--static int ios::cur=1;
--static int ios::end=2;
--static int ios::boolalpha=1;
--static int ios::adjustfield=176;
--static int ios::basefield=74;
--static int ios::floatfield=260;
--static int ios::skipws=4096;
--static int ios::left=32;
--static int ios::right=128;
--static int ios::internal=16;
--static int ios::dec=2;
--static int ios::oct=64;
--static int ios::hex=8;
--static int ios::showbase=512;
--static int ios::showpoint=1024;
--static int ios::uppercase=16384;
--static int ios::showpos=2048;
--static int ios::scientific=256;
--static int ios::fixed=4;
--static int ios::unitbuf=8192;
- #pragma else
- static ios_base::fmtflags ios_base::boolalpha=1;
- static ios_base::fmtflags ios_base::dec=2;
--- 
-1.8.2
-
diff --git a/root-gcc5-2.patch b/root-gcc5-2.patch
deleted file mode 100644
index 6343555..0000000
--- a/root-gcc5-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7dec562d1d5723b7eea08d08659dc9dc4e79c8ca Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:35:47 +0100
-Subject: [PATCH 1/1] Update CINT CMake and configure scripts for GCC 5
-
-The following is required otherwise `iosenum.h` will be missing causing
-build failures. Needed for Fedora 22.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/CMakeLists.txt |  4 +---
- cint/cint/Module.mk      | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/cint/cint/CMakeLists.txt b/cint/cint/CMakeLists.txt
-index 705b57d..e7756be 100644
---- a/cint/cint/CMakeLists.txt
-+++ b/cint/cint/CMakeLists.txt
-@@ -61,9 +61,7 @@ set_source_files_properties(loadfile_tmp.cxx  COMPILE_FLAGS "-UR__HAVE_CONFIG -D
- #---Generate and/or copy the iosenum headerfile to the include directory-------------------------------
- if(${CLANG_MAJOR} GREATER 2)
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
--elseif(${GCC_MAJOR} EQUAL 4)
--  set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
--elseif(${GCC_MAJOR} EQUAL 3)
-+elseif(${GCC_MAJOR} GREATER 3)
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
- else()
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE})
-diff --git a/cint/cint/Module.mk b/cint/cint/Module.mk
-index 4cfed92..0293321 100644
---- a/cint/cint/Module.mk
-+++ b/cint/cint/Module.mk
-@@ -161,6 +161,10 @@ ifeq ($(GCC_MAJOR),4)
- CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
- CINTS2       += $(MODDIRSD)/gcc4strm.cxx
- endif
-+ifeq ($(GCC_MAJOR),5)
-+CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
-+CINTS2       += $(MODDIRSD)/gcc4strm.cxx
-+endif
- ifneq ($(CLANG_MAJOR),)
- CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
- CINTS2       += $(MODDIRSD)/gcc4strm.cxx
-@@ -203,6 +207,9 @@ IOSENUMC     := $(CINTDIRIOSEN)/iosenum.cxx
- ifneq ($(CLANG_MAJOR),)
- IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
- else
-+ifeq ($(GCC_MAJOR),5)
-+IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
-+else
- ifeq ($(GCC_MAJOR),4)
- IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
- else
-@@ -213,6 +220,7 @@ IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)
- endif
- endif
- endif
-+endif
- 
- # used in the main Makefile
- ALLHDRS     += $(CINTHT) $(CINTINCLUDES)
-@@ -344,6 +352,10 @@ $(call stripsrc,$(CINTDIRSD)/%strm.o):    CINTCXXFLAGS += -I$(CINTDIRL)/$(notdir
- ifeq ($(GCC_MAJOR),4)
- $(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
- endif
-+ifeq ($(GCC_MAJOR),5)
-+$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
-+endif
-+
- 
- $(MAKECINTO) $(CINTO): $(CINTCONF) $(ORDER_) $(CINTINCLUDES)
- 
--- 
-1.8.2
-
diff --git a/root-gcc5-3.patch b/root-gcc5-3.patch
deleted file mode 100644
index 740561e..0000000
--- a/root-gcc5-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0a2381e82798f6fad2013d553c76b5f321b8a6a3 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:37:28 +0100
-Subject: [PATCH 1/1] Disable unsecure gets() in CINT as it's removed in C11
-
-gets() for a long time is considered unsafe, one could use fgets()
-instead. Also gets_s() could be used since C11. GCC 5 and Clang 3.6
-defaults to C11 as default now. glibc still provides gets() only
-if compiling for GNU specifically (_GNU_SOURCE is defined). Other
-libc implementations behavior is unknown to me.
-
-Required for Fedora 22.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/lib/stdstrct/stdfunc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cint/cint/lib/stdstrct/stdfunc.h b/cint/cint/lib/stdstrct/stdfunc.h
-index 530bc71..f849b13 100644
---- a/cint/cint/lib/stdstrct/stdfunc.h
-+++ b/cint/cint/lib/stdstrct/stdfunc.h
-@@ -70,7 +70,7 @@ size_t fwrite(void *buffer,size_t size,size_t n,FILE *fp);
- int getc(FILE *fp);
- int getchar(void);
- char *getenv(const char *variable);
--char *gets(char *buffer);
-+/* char *gets(char *buffer); */
- struct tm* gmtime(time_t *caltime);
- int isalnum(int c);
- int isalpha(int c);
--- 
-1.8.2
-
diff --git a/root-gcc5-4.patch b/root-gcc5-4.patch
deleted file mode 100644
index 14f8cd9..0000000
--- a/root-gcc5-4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 19f4cf3c144c4a2b6e2e758c601fc3976e9baa39 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:43:02 +0100
-Subject: [PATCH 1/1] Remove `operator void*() const` from CINT if compiled in
- C++11 mode (GCC 5)
-
-`std::basic_ios` had `operator void*() const` until C++11 and after that
-`explicit operator bool() const`. libstdc++ with GCC 5 finally cleans up
-things to be more compliant with C++11 standard. This is required if ROOT5
-is compiled in C++11 mode (--enable-c++11) on GCC 5.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/src/dict/gcc4strm.cxx | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/cint/cint/src/dict/gcc4strm.cxx b/cint/cint/src/dict/gcc4strm.cxx
-index 2bc8d43..4db0264 100644
---- a/cint/cint/src/dict/gcc4strm.cxx
-+++ b/cint/cint/src/dict/gcc4strm.cxx
-@@ -1047,11 +1047,14 @@ static int G__G__stream_13_0_8(G__value* result7, G__CONST char* funcname, struc
-    return(1 || funcname || hash || result7 || libp) ;
- }
- 
-+#if __cplusplus < 201103L
-+// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
- static int G__G__stream_13_0_9(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
- {
-       G__letint(result7, 89, (long) ((const basic_ios<char,char_traits<char> >*) G__getstructoffset())->operator void*());
-    return(1 || funcname || hash || result7 || libp) ;
- }
-+#endif
- 
- static int G__G__stream_13_0_10(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
- {
-@@ -4097,7 +4100,10 @@ static void G__setup_memfuncbasic_ioslEcharcOchar_traitslEchargRsPgR(void) {
-    G__memfunc_setup("clear",519,G__G__stream_13_0_6, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 'goodbit' state", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("setstate",877,G__G__stream_13_0_7, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 - state", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("rdstate",759,G__G__stream_13_0_8, 105, -1, G__defined_typename("ios_base::iostate"), 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-+#if __cplusplus < 201103L
-+// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
-    G__memfunc_setup("operator void*",1384,G__G__stream_13_0_9, 89, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-+#endif
-    G__memfunc_setup("operator!",909,G__G__stream_13_0_10, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("good",425,G__G__stream_13_0_11, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("eof",314,G__G__stream_13_0_12, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
--- 
-1.8.2
-
diff --git a/root-usa.patch b/root-usa.patch
index 4b5a380..d34da18 100644
--- a/root-usa.patch
+++ b/root-usa.patch
@@ -1,13 +1,15 @@
-diff -ur root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx root-5.34.19/hist/histpainter/src/THistPainter.cxx
---- root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx	2014-07-09 16:50:16.000000000 +0200
-+++ root-5.34.19/hist/histpainter/src/THistPainter.cxx	2014-07-26 23:01:20.083002118 +0200
-@@ -2305,7 +2305,8 @@
+diff -ur root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx root-5.34.30/hist/histpainter/src/THistPainter.cxx
+--- root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx	2015-04-23 18:30:25.000000000 +0200
++++ root-5.34.30/hist/histpainter/src/THistPainter.cxx	2015-04-24 20:05:03.349081003 +0200
+@@ -2367,7 +2367,10 @@
     TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
  
     TFile *f;
 -   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   // f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
++   if (!gSystem->AccessPathName("$(ROOTSYS)/tutorials/hist/usa.root"))
++      f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
++   else
++      f = TFile::Open("http://root.cern.ch/files/usa.root");
  
     TMultiGraph *mg;
     TKey *key;
diff --git a/root.spec b/root.spec
index 6dd2cac..a559c1f 100644
--- a/root.spec
+++ b/root.spec
@@ -7,6 +7,10 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
+%endif
+
 %{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
@@ -25,10 +29,16 @@
 
 %global xrootd 1
 
+%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} < 23
+%global hadoop 1
+%else
+%global hadoop 0
+%endif
+
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.28
+Version:	5.34.30
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -74,11 +84,6 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
-#		Fixes for gcc 5 (from upstream git)
-Patch10:	%{name}-gcc5-1.patch
-Patch11:	%{name}-gcc5-2.patch
-Patch12:	%{name}-gcc5-3.patch
-Patch13:	%{name}-gcc5-4.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
@@ -128,6 +133,9 @@ BuildRequires:	python-devel
 %if %{?rhel}%{!?rhel:0} == 5
 BuildRequires:	python26-devel
 %endif
+%if %{?fedora}%{!?fedora:0} >= 15
+BuildRequires:	python3-devel
+%endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	qt4-devel
 %endif
@@ -149,7 +157,7 @@ BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 BuildRequires:	hadoop-devel
 %endif
 BuildRequires:	emacs
@@ -383,6 +391,16 @@ This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%package python3
+Summary:	Python extension for ROOT
+Group:		Applications/Engineering
+
+%description python3
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+%endif
+
 %package ruby
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
@@ -652,7 +670,7 @@ Group:		Applications/Engineering
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
 
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %package io-hdfs
 Summary:	Hadoop File System input/output library for ROOT
 Group:		Applications/Engineering
@@ -1139,10 +1157,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -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 \
@@ -1209,6 +1223,9 @@ sed '/CopyFileFromEtcDir("ROOT.css");/a\
    CopyFileFromEtcDir("root-banner.png");\
    CopyFileFromEtcDir("rootdrawing-logo.png");' -i html/src/THtml.cxx
 
+# Use local copy of input file during documentation generation
+install -p -m 644 %{SOURCE6} tutorials/hist/usa.root
+
 # Rename canvases to avoid name conflicts during doc generation
 sed s/c1/c1c/g -i tutorials/graphics/earth.C
 sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
@@ -1221,6 +1238,13 @@ sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
     -i bindings/pyroot26/Module.mk
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+# Build PyROOT for python 3
+cp -pr bindings/pyroot bindings/pyroot3
+sed -e 's/= pyroot/= pyroot3/' -e 's/python /python3 /' \
+    -i bindings/pyroot3/Module.mk
+%endif
+
 %build
 unset QTDIR
 unset QTLIB
@@ -1241,9 +1265,23 @@ unset QTINC
 	    --disable-builtin-lzma \
 	    --disable-builtin-pcre \
 	    --disable-builtin-zlib \
+	    --disable-afdsmgrd \
+	    --disable-afs \
+	    --disable-alien \
+	    --disable-alloc \
 	    --enable-asimage \
 	    --enable-astiff \
 	    --enable-bonjour \
+	    --disable-castor \
+	    --disable-chirp \
+%ifarch %{ix86} x86_64
+	    --enable-cintex \
+%else
+	    --disable-cintex \
+%endif
+	    --disable-cling \
+	    --disable-cxx11 \
+	    --disable-cxx14 \
 	    --enable-davix \
 	    --enable-dcache \
 	    --enable-explicitlink \
@@ -1252,10 +1290,11 @@ unset QTINC
 	    --enable-gdml \
 	    --enable-genvector \
 	    --enable-gfal \
+	    --disable-glite \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 	    --enable-hdfs \
 %else
 	    --disable-hdfs \
@@ -1263,19 +1302,23 @@ unset QTINC
 	    --enable-http \
 	    --enable-krb5 \
 	    --enable-ldap \
+	    --disable-libcxx \
 	    --enable-mathmore \
 	    --enable-memstat \
 	    --enable-minuit2 \
+	    --disable-monalisa \
 	    --enable-mysql \
 	    --enable-odbc \
 	    --enable-opengl \
+	    --disable-oracle \
 	    --enable-pgsql \
-	    --enable-python \
+	    --disable-pythia6 \
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 	    --enable-pythia8 \
 %else
 	    --disable-pythia8 \
 %endif
+	    --enable-python \
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 	    --enable-qt \
 	    --enable-qtgsi \
@@ -1286,16 +1329,21 @@ unset QTINC
 	    --enable-reflex \
 	    --enable-rfio \
 	    --enable-roofit \
+	    --disable-rpath \
 	    --enable-ruby \
+	    --disable-sapdb \
 	    --enable-shadowpw \
 	    --enable-shared \
 	    --enable-soversion \
 	    --enable-sqlite \
+	    --disable-srp \
 	    --enable-ssl \
 	    --enable-table \
 	    --enable-tmva \
 	    --enable-unuran \
+	    --disable-vc \
 	    --enable-vdt \
+	    --disable-werror \
 	    --enable-x11 \
 	    --enable-xft \
 	    --enable-xml \
@@ -1304,30 +1352,6 @@ unset QTINC
 %else
 	    --disable-xrootd \
 %endif
-%ifarch %{ix86} x86_64
-	    --enable-cintex \
-%else
-	    --disable-cintex \
-%endif
-	    --disable-afdsmgrd \
-	    --disable-afs \
-	    --disable-alien \
-	    --disable-alloc \
-	    --disable-castor \
-	    --disable-chirp \
-	    --disable-cling \
-	    --disable-cxx11 \
-	    --disable-cxx14 \
-	    --disable-glite \
-	    --disable-libcxx \
-	    --disable-monalisa \
-	    --disable-oracle \
-	    --disable-pythia6 \
-	    --disable-rpath \
-	    --disable-sapdb \
-	    --disable-srp \
-	    --disable-vc \
-	    --disable-werror \
 	    --fail-on-missing
 
 make OPTFLAGS="%{optflags}" \
@@ -1346,6 +1370,20 @@ make OPTFLAGS="%{optflags}" \
 	ROOTPY="pyroot26/ROOT.py pyroot26/cppyy.py"
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+# Build PyROOT for python 3
+mkdir pyroot3
+cp bindings/pyroot3/ROOT.py pyroot3
+cp bindings/pyroot3/cppyy.py pyroot3
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
+	MODULES="build cint/cint core/utils bindings/pyroot3" \
+	PYTHONINCDIR=`pkg-config --cflags python3 | sed 's/-I//'` \
+	PYTHONLIB=`pkg-config --libs python3` \
+	PYROOTLIB=pyroot3/libPyROOT.so \
+	ROOTPY="pyroot3/ROOT.py pyroot3/cppyy.py"
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -1418,6 +1456,14 @@ install -m 644 pyroot26/ROOT.py* %{buildroot}%{python26_sitearch}
 install -m 644 pyroot26/cppyy.py* %{buildroot}%{python26_sitearch}
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+mkdir -p %{buildroot}%{python3_sitearch}
+install pyroot3/libPyROOT.so.%{libversion} \
+   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+install -m 644 pyroot3/ROOT.py* %{buildroot}%{python3_sitearch}
+install -m 644 pyroot3/cppyy.py* %{buildroot}%{python3_sitearch}
+%endif
+
 # Same for the Ruby interface library
 mkdir -p %{buildroot}%{ruby_installdir}
 mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion} \
@@ -1479,7 +1525,7 @@ rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
-%if %{?fedora}%{!?fedora:0} < 20
+%if %{hadoop} == 0
 rm TFile/P110_THDFSFile.C
 %endif
 rm TGLManager/P020_TGWin32GLManager.C
@@ -1493,7 +1539,7 @@ rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
-%if %{?fedora}%{!?fedora:0} < 20
+%if %{hadoop} == 0
 rm TSystem/P060_THDFSSystem.C
 %endif
 rm TViewerX3D/P020_TQtViewerX3D.C
@@ -1529,7 +1575,6 @@ 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
-install -m 644 -p %{SOURCE6} tutorials/hist/usa.root
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
@@ -1609,7 +1654,7 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service proofd condrestart >/dev/null 2>&1 || :
 fi
 
-%if %{?rhel}%{!?rhel:0} == 5
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %post python
 [ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
     readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
@@ -1619,14 +1664,17 @@ fi
     libPyROOT.so %{python_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
-%postun python -p /sbin/ldconfig
-
 %preun python
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python_sitearch}/libPyROOT.so
 fi
+%else
+%post python -p /sbin/ldconfig
+%endif
+%postun python -p /sbin/ldconfig
 
+%if %{?rhel}%{!?rhel:0} == 5
 %post python26
 [ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
     readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
@@ -1643,9 +1691,25 @@ if [ $1 = 0 ]; then
 fi
 
 %postun python26 -p /sbin/ldconfig
-%else
-%post python -p /sbin/ldconfig
-%postun python -p /sbin/ldconfig
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 15
+%post python3
+[ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
+    readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
+    grep -q site-packages && rm %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+/sbin/ldconfig
+
+%preun python3
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
+fi
+
+%postun python3 -p /sbin/ldconfig
 %endif
 
 %post core -p /sbin/ldconfig
@@ -1728,7 +1792,7 @@ fi
 %postun io-dcache -p /sbin/ldconfig
 %post io-gfal -p /sbin/ldconfig
 %postun io-gfal -p /sbin/ldconfig
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %post io-hdfs -p /sbin/ldconfig
 %postun io-hdfs -p /sbin/ldconfig
 %endif
@@ -1954,7 +2018,7 @@ fi
 %{_initrddir}/rootd
 
 %files python -f includelist-bindings-pyroot
-%if %{?rhel}%{!?rhel:0} == 5
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
@@ -1962,7 +2026,7 @@ fi
 %else
 %{_libdir}/%{name}/libPyROOT.*
 %endif
-%{python_sitearch}/libPyROOT.*
+%{python_sitearch}/libPyROOT.so
 %{python_sitearch}/ROOT.py*
 %{python_sitearch}/cppyy.py*
 
@@ -1972,11 +2036,23 @@ fi
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%{python26_sitearch}/libPyROOT.*
+%{python26_sitearch}/libPyROOT.so
 %{python26_sitearch}/ROOT.py*
 %{python26_sitearch}/cppyy.py*
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%files python3 -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.5
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%{python3_sitearch}/libPyROOT%{py3soabi}.so
+%{python3_sitearch}/ROOT.py
+%{python3_sitearch}/cppyy.py
+%{python3_sitearch}/__pycache__
+%endif
+
 %files ruby -f includelist-bindings-ruby
 %{_libdir}/%{name}/libRuby.*
 %{ruby_installdir}/libRuby.*
@@ -2144,7 +2220,7 @@ fi
 %{_libdir}/%{name}/libGFAL.*
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %files io-hdfs -f includelist-io-hdfs
 %{_libdir}/%{name}/libHDFS.*
 %{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
@@ -2401,6 +2477,12 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
+- Update to 5.34.30
+- New sub-package: root-python3
+- Disable hadoop/hdfs support for F23+ (not installable)
+- Drop previously backported gcc 5 patches
+
 * Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
 - Update to 5.34.28
 - Merge emacs support files into main package (guidelines updated)
diff --git a/sources b/sources
index eb2cd1b..696318d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-87647e87b2ab5634759e0efe99ec1543  root-5.34.28.tar.xz
+a28f5c9713ff920ac8069975f32d391c  root-5.34.30.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 8875471441a481158452507d2852460832c15e23 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Thu, 18 Jun 2015 09:52:37 +0200
Subject: [PATCH 067/344] Minor fixes

---
 root-fontconfig.patch |  6 ++---
 root.spec             | 52 +++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 620dffa..fe79d0b 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -485,7 +485,7 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
 +         break;
 +      case 24:
 +         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +         break;
@@ -945,7 +945,7 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
 +               break;
 +            case 24:
 +               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
 +               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +               break;
@@ -1262,7 +1262,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
 +            break;
 +         case 23:
 +            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
 +            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +            break;
diff --git a/root.spec b/root.spec
index a559c1f..4daeca1 100644
--- a/root.spec
+++ b/root.spec
@@ -1233,16 +1233,20 @@ sed s/c1/c1simp/g -i tutorials/hsimple.C
 
 %if %{?rhel}%{!?rhel:0} == 5
 # Build PyROOT for python 2.6
-cp -pr bindings/pyroot bindings/pyroot26
-sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
-    -i bindings/pyroot26/Module.mk
+# Use "python" as name for the build directory
+# THTML ignores directories named "python"
+cp -pr bindings/pyroot bindings/python
+sed -e 's/python /python26 /' -e 's/= pyroot/= python/' \
+    -i bindings/python/Module.mk
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 15
 # Build PyROOT for python 3
-cp -pr bindings/pyroot bindings/pyroot3
-sed -e 's/= pyroot/= pyroot3/' -e 's/python /python3 /' \
-    -i bindings/pyroot3/Module.mk
+# Use "python" as name for the build directory
+# THTML ignores directories named "python"
+cp -pr bindings/pyroot bindings/python
+sed -e 's/python /python3 /' -e 's/= pyroot/= python/' \
+    -i bindings/python/Module.mk
 %endif
 
 %build
@@ -1359,29 +1363,29 @@ make OPTFLAGS="%{optflags}" \
 
 %if %{?rhel}%{!?rhel:0} == 5
 # Build PyROOT for python 2.6
-mkdir pyroot26
-cp bindings/pyroot26/ROOT.py pyroot26
-cp bindings/pyroot26/cppyy.py pyroot26
+mkdir python
+cp bindings/python/ROOT.py python
+cp bindings/python/cppyy.py python
 make OPTFLAGS="%{optflags}" \
 	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
-	MODULES="build cint/cint core/utils bindings/pyroot26" \
+	MODULES="build cint/cint core/utils bindings/python" \
 	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
-	PYROOTLIB=pyroot26/libPyROOT.so \
-	ROOTPY="pyroot26/ROOT.py pyroot26/cppyy.py"
+	PYROOTLIB=python/libPyROOT.so \
+	ROOTPY="python/ROOT.py python/cppyy.py"
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 15
 # Build PyROOT for python 3
-mkdir pyroot3
-cp bindings/pyroot3/ROOT.py pyroot3
-cp bindings/pyroot3/cppyy.py pyroot3
+mkdir python
+cp bindings/python/ROOT.py python
+cp bindings/python/cppyy.py python
 make OPTFLAGS="%{optflags}" \
 	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
-	MODULES="build cint/cint core/utils bindings/pyroot3" \
+	MODULES="build cint/cint core/utils bindings/python" \
 	PYTHONINCDIR=`pkg-config --cflags python3 | sed 's/-I//'` \
 	PYTHONLIB=`pkg-config --libs python3` \
-	PYROOTLIB=pyroot3/libPyROOT.so \
-	ROOTPY="pyroot3/ROOT.py pyroot3/cppyy.py"
+	PYROOTLIB=python/libPyROOT.so \
+	ROOTPY="python/ROOT.py python/cppyy.py"
 %endif
 
 %install
@@ -1450,18 +1454,18 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{python_sitearch}`/libPyROOT.so \
 
 %if %{?rhel}%{!?rhel:0} == 5
 mkdir -p %{buildroot}%{python26_sitearch}
-install pyroot26/libPyROOT.so.%{libversion} \
+install python/libPyROOT.so.%{libversion} \
    %{buildroot}%{python26_sitearch}/libPyROOT.so
-install -m 644 pyroot26/ROOT.py* %{buildroot}%{python26_sitearch}
-install -m 644 pyroot26/cppyy.py* %{buildroot}%{python26_sitearch}
+install -m 644 python/ROOT.py* %{buildroot}%{python26_sitearch}
+install -m 644 python/cppyy.py* %{buildroot}%{python26_sitearch}
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 15
 mkdir -p %{buildroot}%{python3_sitearch}
-install pyroot3/libPyROOT.so.%{libversion} \
+install python/libPyROOT.so.%{libversion} \
    %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
-install -m 644 pyroot3/ROOT.py* %{buildroot}%{python3_sitearch}
-install -m 644 pyroot3/cppyy.py* %{buildroot}%{python3_sitearch}
+install -m 644 python/ROOT.py* %{buildroot}%{python3_sitearch}
+install -m 644 python/cppyy.py* %{buildroot}%{python3_sitearch}
 %endif
 
 # Same for the Ruby interface library

From dc8c69485d15320e80436c48db423403226a6d7b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Jun 2015 22:28:59 +0000
Subject: [PATCH 068/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 4daeca1..44a5362 100644
--- a/root.spec
+++ b/root.spec
@@ -40,7 +40,7 @@
 Name:		root
 Version:	5.34.30
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2481,6 +2481,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
 - Update to 5.34.30
 - New sub-package: root-python3

From fda3bc6d17fddeea6a8ce66701f7329479556d00 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 3 Jul 2015 16:51:58 +0200
Subject: [PATCH 069/344] Update to 5.34.32

- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
- Use GNU Free instead of Liberation, works better with TMathText
- Fix segfault when embedding Type 1 fonts
- Drop patch root-no-extra-formats.patch (workaround for above problem)
---
 root-fontconfig.patch       | 1367 +++++++++++++++--------------------
 root-html.C                 |    3 -
 root-no-extra-formats.patch |   20 -
 root-type1-embed.patch      |   93 +++
 root.spec                   |  130 ++--
 sources                     |    2 +-
 6 files changed, 783 insertions(+), 832 deletions(-)
 delete mode 100644 root-no-extra-formats.patch
 create mode 100644 root-type1-embed.patch

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index fe79d0b..f148a51 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.34.20.orig/core/base/src/TApplication.cxx root-5.34.20/core/base/src/TApplication.cxx
---- root-5.34.20.orig/core/base/src/TApplication.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/core/base/src/TApplication.cxx	2014-08-16 19:24:53.337132201 +0200
-@@ -265,22 +265,11 @@
+diff -ur root-5.34.32.orig/core/base/src/TApplication.cxx root-5.34.32/core/base/src/TApplication.cxx
+--- root-5.34.32.orig/core/base/src/TApplication.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/core/base/src/TApplication.cxx	2015-06-30 00:15:36.347566719 +0200
+@@ -273,22 +273,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -26,7 +26,7 @@ diff -ur root-5.34.20.orig/core/base/src/TApplication.cxx root-5.34.20/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -294,7 +283,6 @@
+@@ -302,7 +291,6 @@
        }
     }
  #endif
@@ -34,9 +34,9 @@ diff -ur root-5.34.20.orig/core/base/src/TApplication.cxx root-5.34.20/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.20.orig/graf2d/graf/inc/TTF.h root-5.34.20/graf2d/graf/inc/TTF.h
---- root-5.34.20.orig/graf2d/graf/inc/TTF.h	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf2d/graf/inc/TTF.h	2014-08-16 19:24:53.338132209 +0200
+diff -ur root-5.34.32.orig/graf2d/graf/inc/TTF.h root-5.34.32/graf2d/graf/inc/TTF.h
+--- root-5.34.32.orig/graf2d/graf/inc/TTF.h	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/graf/inc/TTF.h	2015-06-30 00:15:36.360566569 +0200
 @@ -70,9 +70,8 @@
     static FT_BBox     fgCBox;                  // string control box
     static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
@@ -48,9 +48,9 @@ diff -ur root-5.34.20.orig/graf2d/graf/inc/TTF.h root-5.34.20/graf2d/graf/inc/TT
     static FT_Face     fgFace[kTTMaxFonts];     // font face
     static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
     static Bool_t      fgHinting;               // use hinting (true by default)
-diff -ur root-5.34.20.orig/graf2d/graf/Module.mk root-5.34.20/graf2d/graf/Module.mk
---- root-5.34.20.orig/graf2d/graf/Module.mk	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf2d/graf/Module.mk	2014-08-16 19:24:53.338132209 +0200
+diff -ur root-5.34.32.orig/graf2d/graf/Module.mk root-5.34.32/graf2d/graf/Module.mk
+--- root-5.34.32.orig/graf2d/graf/Module.mk	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/graf/Module.mk	2015-06-30 00:15:36.360566569 +0200
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -60,19 +60,10 @@ diff -ur root-5.34.20.orig/graf2d/graf/Module.mk root-5.34.20/graf2d/graf/Module
  
  $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/TTF.cxx
---- root-5.34.20.orig/graf2d/graf/src/TTF.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf2d/graf/src/TTF.cxx	2014-08-16 20:48:07.427205257 +0200
-@@ -17,15 +17,13 @@
- //                                                                      //
- //////////////////////////////////////////////////////////////////////////
- 
--// RConfigure.h is needed for TTFFONTDIR
--#include "RConfigure.h"
--
- #include "TTF.h"
- #include "TSystem.h"
- #include "TEnv.h"
+diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/TTF.cxx
+--- root-5.34.32.orig/graf2d/graf/src/TTF.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/graf/src/TTF.cxx	2015-07-02 10:10:03.352185217 +0200
+@@ -26,6 +26,7 @@
  #include "TMath.h"
  #include "TError.h"
  
@@ -80,7 +71,7 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
  
  // to scale fonts to the same size as the old TT version
  const Float_t kScale = 0.93376068;
-@@ -40,10 +38,9 @@
+@@ -40,10 +41,9 @@
  Int_t       TTF::fgWidth          = 0;
  Int_t       TTF::fgAscent         = 0;
  Int_t       TTF::fgCurFontIdx     = -1;
@@ -92,7 +83,24 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
  FT_Matrix  *TTF::fgRotMatrix;
  FT_Library  TTF::fgLibrary;
  FT_BBox     TTF::fgCBox;
-@@ -87,7 +84,6 @@
+@@ -75,6 +75,16 @@
+       return;
+    }
+ 
++   // Add root's font directory
++   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
++# ifdef TTFFONTDIR
++                                       TTFFONTDIR
++# else
++                                       "$(ROOTSYS)/fonts"
++# endif
++                                      );
++   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
++
+    // load default font (arialbd)
+    SetTextFont(62);
+ }
+@@ -87,7 +97,6 @@
     if (!fgInit) return;
  
     for (int i = 0; i < fgFontCount; i++) {
@@ -100,26 +108,31 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
        FT_Done_Face(fgFace[i]);
     }
     if (fgRotMatrix) delete fgRotMatrix;
-@@ -112,12 +108,15 @@
+@@ -112,12 +121,19 @@
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
 -         if ((platform == 3 && encoding == 1) ||
 +         if ((platform == 3 && encoding == 1 &&
-+              (fgFontID[fgCurFontIdx] != 12 && fgFontID[fgCurFontIdx] != 15)) ||
++              (fgFontID[fgCurFontIdx] != 12 &&
++               fgFontID[fgCurFontIdx] != 14 &&
++               fgFontID[fgCurFontIdx] != 15)) ||
               (platform == 0 && encoding == 0) ||
++             (platform == 7 && encoding == 2 &&
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)) ||
               (platform == 1 && encoding == 0 &&
 -              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
-+              fgFontID[fgCurFontIdx] == 14) ||
-+             (platform == 7 && encoding == 2 &&
-+              (fgFontID[fgCurFontIdx] == 12 || fgFontID[fgCurFontIdx] == 15)) ||
-              (platform == 1 && encoding == 0 &&
+-             (platform == 1 && encoding == 0 &&
 -              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
-+              (fgFontID[fgCurFontIdx] == 12 || fgFontID[fgCurFontIdx] == 15)))
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)))
           {
              fgCharMap[fgCurFontIdx] = charmap;
              if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -381,27 +380,147 @@
+@@ -381,27 +397,147 @@
  
     if (!fontname || !fontname[0]) {
        Warning("TTF::SetTextFont",
@@ -280,7 +293,7 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
        }
     }
  
-@@ -409,161 +528,280 @@
+@@ -409,161 +545,216 @@
     if (fgFontCount >= kTTMaxFonts) {
        Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
              kTTMaxFonts);
@@ -304,250 +317,189 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
 +   char *ttfont = NULL;
 +   int ttindex = 0;
  
-+   if (fontid >= 16 && fontid <= 28) {
-+      // Use the texlive-stix fonts if they exist
-+      // Texlive-stix not packaged correctly - can not be found through fontconfig
-+      // Use hardcoded path
-+      const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
-+      switch (fontid) {
-+      case 16:
-+         ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
-+         break;
-+      case 17:
-+         ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
-+         break;
-+      case 18:
-+         ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
-+         break;
-+      case 19:
-+         ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
-+         break;
-+      case 20:
-+         ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
-+         break;
-+      case 21:
-+         ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
-+         break;
-+      case 22:
-+         ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
-+         break;
-+      case 23:
-+         ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
-+         break;
-+      case 24:
-+         ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
-+         break;
-+      case 25:
-+         ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
-+         break;
-+      case 26:
-+         ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
-+         break;
-+      case 27:
-+         ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
-+         break;
-+      case 28:
-+         ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
-+         break;
-+      }
-+   }
-    if (!ttfont) {
+-   if (!ttfont) {
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
 -      if (fgFontCount) {
 -         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-+      FcPattern *pat, *match;
-+      FcCharSet *set = NULL;
-+      FcResult result;
-+
-+      pat = FcPatternCreate ();
-+
-+      switch (fontid) {
-+      case 1:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 2:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 3:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 4:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 5:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 6:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 7:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 8:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 9:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 10:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 11:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 12:
-+      case 15:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 13:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 16:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 17:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 18:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 19:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 20:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         // set = FcCharSetCreate ();
-+         // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+         // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+         break;
-+      case 21:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         // set = FcCharSetCreate ();
-+         // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+         // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+         break;
-+      case 22:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 23:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 24:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 25:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 26:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 27:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 28:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 29:
-+      case 30:
-+      case 31:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         set = FcCharSetCreate ();
-+         FcCharSetAddChar (set, 0x0410); // Cyrillic
-+         FcCharSetAddChar (set, 0x4e00); // CJK
-+         FcPatternAddCharSet (pat, FC_CHARSET, set);
-+         break;
-+      default:
-+         Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
-+         FcPatternDestroy (pat);
-+         Warning("TTF::SetTextFont", "using default font");
-          fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
 -         return 0;
 -      } else {
 -         return 1;
-+         return;
-+         break;
-       }
+-      }
++   FcPattern *pat, *match;
++   FcCharSet *set = NULL;
++   FcResult result;
 +
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
-+      char* ttfnt;
-+      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+      ttfont = StrDup (ttfnt);
-+      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+      FcPatternDestroy (match);
++   pat = FcPatternCreate ();
++
++   switch (fontid) {
++   case 1:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 2:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 3:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 4:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 5:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 6:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 7:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 8:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 9:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 10:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 11:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 12:
++   case 15:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 16:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 17:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 18:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 19:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 20:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 21:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 22:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 23:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 24:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 25:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 26:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 27:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 28:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 29:
++   case 30:
++   case 31:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      set = FcCharSetCreate ();
++      FcCharSetAddChar (set, 0x0410); // Cyrillic
++      FcCharSetAddChar (set, 0x4e00); // CJK
++      FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   default:
++      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
 +      FcPatternDestroy (pat);
-+      if (set) FcCharSetDestroy (set);
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++      return;
++      break;
     }
  
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   char *ttfnt;
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++   ttfont = StrDup (ttfnt);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
++   if (set) FcCharSetDestroy (set);
++
     FT_Face  tface = 0;
  
 -   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
@@ -685,9 +637,9 @@ diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/
  }
  
  //______________________________________________________________________________
-diff -ur root-5.34.20.orig/graf2d/postscript/Module.mk root-5.34.20/graf2d/postscript/Module.mk
---- root-5.34.20.orig/graf2d/postscript/Module.mk	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf2d/postscript/Module.mk	2014-08-16 19:24:53.363132437 +0200
+diff -ur root-5.34.32.orig/graf2d/postscript/Module.mk root-5.34.32/graf2d/postscript/Module.mk
+--- root-5.34.32.orig/graf2d/postscript/Module.mk	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/postscript/Module.mk	2015-06-30 00:15:36.361566558 +0200
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -697,9 +649,9 @@ diff -ur root-5.34.20.orig/graf2d/postscript/Module.mk root-5.34.20/graf2d/posts
  
  $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/graf2d/postscript/src/TPostScript.cxx
---- root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf2d/postscript/src/TPostScript.cxx	2014-08-16 20:30:03.271041920 +0200
+diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/graf2d/postscript/src/TPostScript.cxx
+--- root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/postscript/src/TPostScript.cxx	2015-07-02 10:07:45.737737725 +0200
 @@ -238,6 +238,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -708,7 +660,7 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1511,63 +1512,244 @@
+@@ -1511,63 +1512,179 @@
  {
     // Embed font in PS file.
  
@@ -767,233 +719,168 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
 +
 +         char *ttfont = NULL;
 +
-+         if (fontid >= 16 && fontid <= 28) {
-+            // Use the texlive-stix fonts if they exist
-+            // Texlive-stix not packaged correctly - can not be found through fontconfig
-+            // Use hardcoded path
-+            const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
-+            switch (fontid) {
-+            case 16:
-+               ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
-+               break;
-+            case 17:
-+               ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
-+               break;
-+            case 18:
-+               ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
-+               break;
-+            case 19:
-+               ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
-+               break;
-+            case 20:
-+               ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
-+               break;
-+            case 21:
-+               ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
-+               break;
-+            case 22:
-+               ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
-+               break;
-+            case 23:
-+               ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
-+               break;
-+            case 24:
-+               ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
-+               break;
-+            case 25:
-+               ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
-+               break;
-+            case 26:
-+               ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
-+               break;
-+            case 27:
-+               ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
-+               break;
-+            case 28:
-+               ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
-+               break;
-+            }
++         FcPattern *pat, *match;
++         FcCharSet *set = NULL;
++         FcResult result;
++
++         pat = FcPatternCreate ();
++
++         switch (fontid) {
++         case 1:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 2:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 3:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 4:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 5:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 6:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 7:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 8:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 9:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 10:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 11:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 12:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 13:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 14:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 16:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 17:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 18:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 19:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 20:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 21:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 22:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 23:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 24:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 25:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 26:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 27:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 28:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 29:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            set = FcCharSetCreate ();
++            FcCharSetAddChar (set, 0x0410); // Cyrillic
++            FcCharSetAddChar (set, 0x4e00); // CJK
++            FcPatternAddCharSet (pat, FC_CHARSET, set);
++            break;
 +         }
 +
-+         if (!ttfont) {
-+            FcPattern *pat, *match;
-+            FcCharSet *set = NULL;
-+            FcResult result;
-+
-+            pat = FcPatternCreate ();
-+
-+            switch (fontid) {
-+            case 1:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 2:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 3:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 4:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 5:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 6:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 7:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 8:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 9:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 10:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 11:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 12:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 13:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 14:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 16:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 17:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 18:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 19:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+               break;
-+            case 20:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               // set = FcCharSetCreate ();
-+               // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+               // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+               break;
-+            case 21:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               // set = FcCharSetCreate ();
-+               // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+               // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+               break;
-+            case 22:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 23:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 24:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 25:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 26:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 27:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 28:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               break;
-+            case 29:
-+               FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+               FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+               FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+               set = FcCharSetCreate ();
-+               FcCharSetAddChar (set, 0x0410); // Cyrillic
-+               FcCharSetAddChar (set, 0x4e00); // CJK
-+               FcPatternAddCharSet (pat, FC_CHARSET, set);
-+               break;
-+            }
-+
-+            FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+            FcDefaultSubstitute (pat);
-+            match = FcFontMatch (NULL, pat, &result);
-+            char *ttfnt;
-+            FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+            ttfont = StrDup(ttfnt);
-+            FcPatternDestroy (match);
-+            FcPatternDestroy (pat);
-+            if (set) FcCharSetDestroy (set);
-+         }
++         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcDefaultSubstitute (pat);
++         match = FcFontMatch (NULL, pat, &result);
++         char *ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++         ttfont = StrDup(ttfnt);
++         FcPatternDestroy (match);
++         FcPatternDestroy (pat);
++         if (set) FcCharSetDestroy (set);
  
           if(!ttfont) {
 -            Error("TPostScript::FontEmbed",
@@ -1004,7 +891,7 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1576,9 +1758,8 @@
+@@ -1576,9 +1693,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -1016,7 +903,7 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
              }
              delete [] ttfont;
           }
-@@ -2571,10 +2752,10 @@
+@@ -2571,10 +2687,10 @@
        { "Root.PSFont.5",             "/Helvetica-Oblique" },
        { "Root.PSFont.6",             "/Helvetica-Bold" },
        { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
@@ -1031,9 +918,23 @@ diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/gr
        { "Root.PSFont.12",            "/Symbol" },
        { "Root.PSFont.13",            "/Times-Roman" },
        { "Root.PSFont.14",            "/ZapfDingbats" },
-diff -ur root-5.34.20.orig/graf3d/gl/Module.mk root-5.34.20/graf3d/gl/Module.mk
---- root-5.34.20.orig/graf3d/gl/Module.mk	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf3d/gl/Module.mk	2014-08-16 19:24:53.377132564 +0200
+@@ -2781,10 +2897,10 @@
+       { "Root.PSFont.9", "/FreeMonoOblique" },
+       { "Root.PSFont.10", "/FreeMonoBold" },
+       { "Root.PSFont.11", "/FreeMonoBoldOblique" },
+-      { "Root.PSFont.12", "/SymbolMT" },
++      { "Root.PSFont.12", "/StandardSymbolsL" },
+       { "Root.PSFont.13", "/FreeSerif" },
+-      { "Root.PSFont.14", "/Wingdings-Regular" },
+-      { "Root.PSFont.15", "/SymbolMT" },
++      { "Root.PSFont.14", "/Dingbats" },
++      { "Root.PSFont.15", "/StandardSymbolsL" },
+       { "Root.PSFont.STIXGen", "/STIXGeneral" },
+       { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
+       { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
+diff -ur root-5.34.32.orig/graf3d/gl/Module.mk root-5.34.32/graf3d/gl/Module.mk
+--- root-5.34.32.orig/graf3d/gl/Module.mk	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf3d/gl/Module.mk	2015-06-30 00:15:36.362566546 +0200
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -1043,9 +944,9 @@ diff -ur root-5.34.20.orig/graf3d/gl/Module.mk root-5.34.20/graf3d/gl/Module.mk
  
  $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
  		$(MAKEDIR)
-diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf3d/gl/src/TGLFontManager.cxx	2014-08-16 19:24:53.378132573 +0200
+diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf3d/gl/src/TGLFontManager.cxx	2015-07-02 10:19:18.521853256 +0200
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1063,7 +964,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
  TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
  Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
  
-@@ -444,19 +445,238 @@
+@@ -444,21 +445,175 @@
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -1083,239 +984,176 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
 +      char *file = NULL;
 +      int ttindex = 0;
 +
-+      if (fileID >= 15 && fileID <= 27) {
-+         // Use the texlive-stix fonts if they exist
-+         // Texlive-stix not packaged correctly - can not be found through fontconfig
-+         // Use hardcoded path
-+         const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix";
-+         switch (fileID) {
-+         case 15:
-+            file = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission);
-+            break;
-+         case 16:
-+            file = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission);
-+            break;
-+         case 17:
-+            file = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission);
-+            break;
-+         case 18:
-+            file = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission);
-+            break;
-+         case 19:
-+            file = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission);
-+            break;
-+         case 20:
-+            file = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission);
-+            break;
-+         case 21:
-+            file = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission);
-+            break;
-+         case 22:
-+            file = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission);
-+            break;
-+         case 23:
-+            file = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission);
-+            break;
-+         case 24:
-+            file = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission);
-+            break;
-+         case 25:
-+            file = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission);
-+            break;
-+         case 26:
-+            file = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission);
-+            break;
-+         case 27:
-+            file = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission);
-+            break;
-+         }
-+      }
++      FcPattern *pat, *match;
++      FcCharSet *set = NULL;
++      FcResult result;
 +
-+      if (!file) {
-+         FcPattern *pat, *match;
-+         FcCharSet *set = NULL;
-+         FcResult result;
++      pat = FcPatternCreate ();
 +
-+         pat = FcPatternCreate ();
-+
-+         switch (fileID) {
-+         case 0:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 1:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 2:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 3:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 4:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 5:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 6:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 7:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 8:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 9:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 10:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 11:
-+         case 14:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 13:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 15:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 16:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 17:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 18:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 19:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            // set = FcCharSetCreate ();
-+            // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+            // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+            break;
-+         case 20:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            // set = FcCharSetCreate ();
-+            // FcCharSetAddChar (set, 0x239b); // Bracket pieces
-+            // FcPatternAddCharSet (pat, FC_CHARSET, set);
-+            break;
-+         case 21:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 22:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 23:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 24:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 25:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 26:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 27:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym");
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 28:
-+         case 29:
-+         case 30:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            set = FcCharSetCreate ();
-+            FcCharSetAddChar (set, 0x0410); // Cyrillic
-+            FcCharSetAddChar (set, 0x4e00); // CJK
-+            FcPatternAddCharSet (pat, FC_CHARSET, set);
-+         }
-+
-+         FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+         FcDefaultSubstitute (pat);
-+         match = FcFontMatch (NULL, pat, &result);
-+         char* ttfnt;
-+         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+         file = StrDup (ttfnt);
-+         FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+         FcPatternDestroy (match);
-+         FcPatternDestroy (pat);
-+         if (set) FcCharSetDestroy (set);
++      switch (fileID) {
++      case 0:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 1:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 2:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 3:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 4:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 5:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 6:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 7:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 8:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 9:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 10:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 11:
++      case 14:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 12:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 13:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 15:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 16:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 17:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 18:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 19:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 20:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 21:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 22:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 23:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 24:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 25:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 26:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 27:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 28:
++      case 29:
++      case 30:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         set = FcCharSetCreate ();
++         FcCharSetAddChar (set, 0x0410); // Cyrillic
++         FcCharSetAddChar (set, 0x4e00); // CJK
++         FcPatternAddCharSet (pat, FC_CHARSET, set);
        }
  
++      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (NULL, pat, &result);
++      char *ttfnt;
++      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++      file = StrDup (ttfnt);
++      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++      FcPatternDestroy (match);
++      FcPatternDestroy (pat);
++      if (set) FcCharSetDestroy (set);
++
        FTFont* ftfont = 0;
-@@ -482,10 +702,14 @@
+       switch (mode)
+       {
+@@ -482,10 +637,14 @@
              ftfont = new FTGLTextureFont(file);
              break;
           default:
@@ -1330,7 +1168,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-@@ -567,8 +791,6 @@
+@@ -567,8 +726,6 @@
  {
     if (fgStaticInitDone == kFALSE) InitStatics();
  
@@ -1339,7 +1177,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
     return fgExtendedFontStart;
  }
  
-@@ -636,28 +858,6 @@
+@@ -636,28 +793,6 @@
     fgFontFileArray.Add(new TObjString("wingding")); // 140
     fgFontFileArray.Add(new TObjString("symbol"));   // 150
  
@@ -1368,9 +1206,9 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/TGLText.cxx
---- root-5.34.20.orig/graf3d/gl/src/TGLText.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/graf3d/gl/src/TGLText.cxx	2014-08-16 19:24:53.378132573 +0200
+diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/TGLText.cxx
+--- root-5.34.32.orig/graf3d/gl/src/TGLText.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf3d/gl/src/TGLText.cxx	2015-07-02 10:23:10.490205011 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1380,7 +1218,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -173,33 +175,91 @@
+@@ -173,33 +175,92 @@
  {
     int fontid = fontnumber / 10;
  
@@ -1418,57 +1256,58 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/
 +
 +   switch (fontid) {
 +   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
++   case 0:
 +   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
@@ -1478,12 +1317,12 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
@@ -1498,7 +1337,7 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -207,7 +267,9 @@
+@@ -207,7 +268,9 @@
  
     fGLTextFont = new FTGLPolygonFont(ttfont);
  
@@ -1510,9 +1349,9 @@ diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/
 -   delete [] ttfont;
 +      Error("SetGLTextFont","Cannot set FTGL::FaceSize");
  }
-diff -ur root-5.34.20.orig/gui/gui/src/TGApplication.cxx root-5.34.20/gui/gui/src/TGApplication.cxx
---- root-5.34.20.orig/gui/gui/src/TGApplication.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/gui/gui/src/TGApplication.cxx	2014-08-16 19:24:53.379132582 +0200
+diff -ur root-5.34.32.orig/gui/gui/src/TGApplication.cxx root-5.34.32/gui/gui/src/TGApplication.cxx
+--- root-5.34.32.orig/gui/gui/src/TGApplication.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/gui/gui/src/TGApplication.cxx	2015-06-30 00:15:36.363566535 +0200
 @@ -83,25 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1540,9 +1379,9 @@ diff -ur root-5.34.20.orig/gui/gui/src/TGApplication.cxx root-5.34.20/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx root-5.34.20/gui/gui/src/TGSpeedo.cxx
---- root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/gui/gui/src/TGSpeedo.cxx	2014-08-16 19:24:53.379132582 +0200
+diff -ur root-5.34.32.orig/gui/gui/src/TGSpeedo.cxx root-5.34.32/gui/gui/src/TGSpeedo.cxx
+--- root-5.34.32.orig/gui/gui/src/TGSpeedo.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/gui/gui/src/TGSpeedo.cxx	2015-06-30 00:15:36.363566535 +0200
 @@ -119,8 +119,7 @@
  
     TString sc;
diff --git a/root-html.C b/root-html.C
index 82b0244..dda9a93 100644
--- a/root-html.C
+++ b/root-html.C
@@ -1,7 +1,4 @@
 {
-  gEnv->SetValue("Root.DynamicPath", "@PWD@/lib");
-  gEnv->SetValue("Root.MacroPath", "@PWD@/macros");
-  gEnv->SetValue("Root.PluginPath", "@PWD@/etc/plugins");
   gSystem->AddIncludePath("-I@PWD@/include");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/include");
   gSystem->AddIncludePath("-I@PWD@/cint/cint/stl");
diff --git a/root-no-extra-formats.patch b/root-no-extra-formats.patch
deleted file mode 100644
index a3924f4..0000000
--- a/root-no-extra-formats.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur root-5.34.05.orig/tutorials/graphics/tmathtext.C root-5.34.05/tutorials/graphics/tmathtext.C
---- root-5.34.05.orig/tutorials/graphics/tmathtext.C	2013-02-14 23:27:35.000000000 +0100
-+++ root-5.34.05/tutorials/graphics/tmathtext.C	2013-03-01 19:00:01.437565765 +0100
-@@ -17,11 +17,11 @@
-    l.DrawMathText(0.27, 0.110, "\\mathbb{N} \\subset \\mathbb{R}");
-    l.DrawMathText(0.63, 0.100, "\\hbox{RHIC スピン物理 Нью-Йорк}");
- 
--   c1->Print("c1.gif");
--   c1->Print("c1.jpg");
--   c1->Print("c1.png");
--   c1->Print("c1.ps");
--   c1->Print("c1.eps");
-+   //   c1->Print("c1.gif");
-+   //   c1->Print("c1.jpg");
-+   //   c1->Print("c1.png");
-+   //   c1->Print("c1.ps");
-+   //   c1->Print("c1.eps");
-    
-    return c1;
- }
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
new file mode 100644
index 0000000..14a6cfd
--- /dev/null
+++ b/root-type1-embed.patch
@@ -0,0 +1,93 @@
+diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf2d/mathtext/src/fontembedps.cxx
+--- root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/graf2d/mathtext/src/fontembedps.cxx	2015-07-02 09:10:36.740969892 +0200
+@@ -30,14 +30,14 @@
+ #ifndef LITTLE_ENDIAN
+ #define LITTLE_ENDIAN 1
+ #endif // LITTLE_ENDIAN
+-#include "Byteswap.h"
+-#define bswap_16(x)   Rbswap_16((x))
+-#define bswap_32(x)   Rbswap_32((x))
+ #else // R__BYTESWAP
+ #ifdef LITTLE_ENDIAN
+ #undef LITTLE_ENDIAN
+ #endif // LITTLE_ENDIAN
+ #endif // R__BYTESWAP
++#include "Byteswap.h"
++#define bswap_16(x)   Rbswap_16((x))
++#define bswap_32(x)   Rbswap_32((x))
+ 
+ // References:
+ //
+@@ -225,27 +225,25 @@
+       if(magic_number[0] == '\200') {
+          // IBM PC format printer font binary
+ 
+-         // FIXME: Maybe the real name can be parsed out of the
+-         // file
+-         font_name = "";
+-
+          struct pfb_segment_header_s segment_header;
+-         size_t offset = 2;
++         size_t offset = 0;
+ 
+          // The two char elements of struct pfb_segment_header_s
+          // are most likely aligned to larger than 1 byte
+          // boundaries, so copy all the elements individually
+          segment_header.always_128 = font_data[offset];
+          segment_header.type = font_data[offset + 1];
+-         memcpy(&segment_header.length, &font_data[offset + 2],
+-                sizeof(unsigned int));
+-         offset += sizeof(unsigned int) + 2;
++
+          while (segment_header.type != TYPE_EOF) {
+-#ifdef LITTLE_ENDIAN
++            memcpy(&segment_header.length, &font_data[offset + 2],
++                   sizeof(unsigned int));
++            offset += sizeof(unsigned int) + 2;
++#ifndef LITTLE_ENDIAN
+             segment_header.length =
+             bswap_32(segment_header.length);
+ #endif // LITTLE_ENDIAN
+             char *buffer = new char[segment_header.length];
++            char *fname;
+ 
+             memcpy(buffer, &font_data[offset],
+                    segment_header.length);
+@@ -265,6 +263,26 @@
+                      buffer[segment_header.length - 1] = '\n';
+                   }
+                   ret.append(buffer, segment_header.length);
++
++                  fname = (char*)memmem(buffer, segment_header.length,
++                                        "/FontName", 9);
++                  if (fname) {
++                     fname += 9;
++                     while (fname < buffer + segment_header.length &&
++                            isspace(*fname)) {
++                        fname++;
++                     }
++                     if (fname < buffer + segment_header.length &&
++                         *fname == '/') {
++                        fname++;
++                     }
++                     int len = 0;
++                     while (fname + len < buffer + segment_header.length &&
++                            isgraph(*(fname + len))) {
++                        len++;
++                     }
++                     font_name.assign(fname, len);
++                  }
+                   break;
+                case TYPE_BINARY:
+                   append_asciihex(
+@@ -276,6 +294,9 @@
+             }
+ 
+             delete [] buffer;
++
++            segment_header.always_128 = font_data[offset];
++            segment_header.type = font_data[offset + 1];
+          }
+ 
+          return ret;
diff --git a/root.spec b/root.spec
index 44a5362..20a8288 100644
--- a/root.spec
+++ b/root.spec
@@ -38,9 +38,9 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.30
+Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -49,7 +49,7 @@ URL:		http://root.cern.ch/
 #		The upstream source is modified to exclude proprietary fonts:
 #		wget -N ftp://root.cern.ch/root/root_v%{version}.source.tar.gz
 #		tar -z -x -f root_v%{version}.source.tar.gz
-#		rm -rf root/fonts
+#		find root/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
 #		mv root root-%{version}
 #		tar -J -c -f root-%{version}.tar.xz root-%{version}
 Source0:	%{name}-%{version}.tar.xz
@@ -76,8 +76,8 @@ Patch3:		%{name}-xrootd.patch
 Patch4:		%{name}-meta.patch
 #		Use TLatex in doc generation:
 Patch5:		%{name}-doc-latex.patch
-#		Don't save in all image formats:
-Patch6:		%{name}-no-extra-formats.patch
+#		Fix segfault when embedding Type 1 fonts
+Patch6:		%{name}-type1-embed.patch
 #		Fixes for HDFS module
 Patch7:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
@@ -172,33 +172,29 @@ BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
 %endif
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
-BuildRequires:	font(liberationsans)
-BuildRequires:	font(liberationserif)
-BuildRequires:	font(liberationmono)
+BuildRequires:	font(freesans)
+BuildRequires:	font(freeserif)
+BuildRequires:	font(freemono)
 %else
-BuildRequires:	liberation-fonts
+BuildRequires:	freefont
 %endif
+#		Provides "symbol" and "dingbats"
 BuildRequires:	urw-fonts
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
 BuildRequires:	font(droidsansfallback)
 %endif
-%if %{?fedora}%{!?fedora:0} >= 18
-# STIX font version 1.1 - not backwards compatible with earlier versions
-# We use the texlive supplied version 1.0 instead of font(stix)
-BuildRequires:	texlive-stix
-%else
-%if %{?fedora}%{!?fedora:0} >= 14
-# STIX font version 1.0
-BuildRequires:	font(stixgeneral)
-BuildRequires:	font(stixsizeonesym)
-%else
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
-# STIX font version 0.9
+#		TMathText requires STIX fonts version 0.9
+#		Fedora has newer versions that are not backwards compatible
+#		Fedora 18-   and EPEL 7 have STIX fonts version 1.1 (*)
+#		Fedora 14-17		have STIX fonts version 1.0
+#		Fedora 11-13 and EPEL 6 have STIX fonts version 0.9
+#		(*) TeXlive in addition provides STIX 1.0 (not in EPEL 7)
+#		The root-fonts package provides STIX 0.9 where it is missing
+%if %{?rhel}%{!?rhel:0} == 6
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsize1)
 %endif
-%endif
-%endif
 Requires:	hicolor-icon-theme
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
 Requires:	emacs-filesystem >= %{_emacs_version}
@@ -245,6 +241,33 @@ Requires:	%{name}-core = %{version}-%{release}
 %description icons
 This package contains icons used by the ROOT GUI.
 
+%package fonts
+Summary:	ROOT font collection
+Group:		Applications/Engineering
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
+%if %{?rhel}%{!?rhel:0} == 6
+#		Driod Sans Fallback only
+License:	ASL 2.0
+%else
+%if %{?rhel}%{!?rhel:0}
+#		STIX version 0.9 and Driod Sans Fallback
+License:	OFL and ASL 2.0
+%else
+#		STIX version 0.9 only
+License:	OFL
+%endif
+%endif
+Requires:	%{name}-core = %{version}-%{release}
+
+%description fonts
+This package contains fonts used by ROOT that are not available in Fedora.
+In particular it contains STIX version 0.9 that is used by TMathText.
+%if %{?rhel}%{!?rhel:0}
+For EPEL it also provides the Google Droid Sans Fallback font.
+%endif
+
 %package doc
 Summary:	Documentation for the ROOT system
 Group:		Applications/Engineering
@@ -273,37 +296,34 @@ This package contains the tutorial scripts and test suite for ROOT.
 Summary:	ROOT core libraries
 Group:		Applications/Engineering
 License:	LGPLv2+ and BSD
+Requires:	%{name}-fonts = %{version}-%{release}
 Requires:	%{name}-icons = %{version}-%{release}
 Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
-Requires:	font(liberationsans)
-Requires:	font(liberationserif)
-Requires:	font(liberationmono)
+Requires:	font(freesans)
+Requires:	font(freeserif)
+Requires:	font(freemono)
 %else
-Requires:	liberation-fonts
+Requires:	freefont
 %endif
+#		Provides "symbol" and "dingbats"
 Requires:	urw-fonts
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
 Requires:	font(droidsansfallback)
 %endif
-%if %{?fedora}%{!?fedora:0} >= 18
-# STIX font version 1.1 - not backwards compatible with earlier versions
-# We use the texlive supplied version 1.0 instead of font(stix)
-Requires:	texlive-stix
-%else
-%if %{?fedora}%{!?fedora:0} >= 14
-# STIX font version 1.0
-Requires:	font(stixgeneral)
-Requires:	font(stixsizeonesym)
-%else
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} == 6
-# STIX font version 0.9
+#		TMathText requires STIX fonts version 0.9
+#		Fedora has newer versions that are not backwards compatible
+#		Fedora 18-   and EPEL 7 have STIX fonts version 1.1 (*)
+#		Fedora 14-17		have STIX fonts version 1.0
+#		Fedora 11-13 and EPEL 6 have STIX fonts version 0.9
+#		(*) TeXlive in addition provides STIX 1.0 (not in EPEL 7)
+#		The root-fonts package provides STIX 0.9 where it is missing
+%if %{?rhel}%{!?rhel:0} == 6
 Requires:	font(stixgeneral)
 Requires:	font(stixsize1)
 %endif
-%endif
-%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -312,8 +332,8 @@ libRint and libThread.
 %package cint
 Summary:	CINT C++ interpreter
 Group:		Applications/Engineering
-Obsoletes:	%{name}-cint7 < 5.26.00c
 License:	MIT
+Obsoletes:	%{name}-cint7 < 5.26.00c
 
 %description cint
 This package contains the CINT C++ interpreter version 5.
@@ -1207,6 +1227,14 @@ rm -rf math/unuran/src/*.tar.gz
 #  * xrootd-private-devel headers
 rm -rf proof/xrdinc
 
+# Remove bundled fonts provided by the OS distributions
+%if %{?fedora}%{!?fedora:0} >= 11
+rm fonts/DroidSansFallback.ttf
+%endif
+%if %{?rhel}%{!?rhel:0} == 6
+rm fonts/STIX*
+%endif
+
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
@@ -1578,6 +1606,10 @@ 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
+echo Unix.*.Root.DynamicPath: ${PWD}/lib >> .rootrc
+echo Unix.*.Root.MacroPath: .:${PWD}/macros >> .rootrc
+echo Unix.*.Root.PluginPath: ${PWD}/etc/plugins >> .rootrc
+echo *.*.Root.TTFontPath: ${PWD}/fonts >> .rootrc
 sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
@@ -1927,6 +1959,9 @@ fi
 %files icons
 %{_datadir}/%{name}/icons
 
+%files fonts
+%{_datadir}/%{name}/fonts
+
 %files core -f includelist-core
 %{_bindir}/memprobe
 %{_bindir}/rlibmap
@@ -2481,6 +2516,13 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
+- Update to 5.34.32
+- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
+- Use GNU Free instead of Liberation, works better with TMathText
+- Fix segfault when embedding Type 1 fonts
+- Drop patch root-no-extra-formats.patch (workaround for above problem)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 696318d..9ba3f64 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a28f5c9713ff920ac8069975f32d391c  root-5.34.30.tar.xz
+b4e593a5740a8154635c2fe5d3081cd2  root-5.34.32.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 5a930202e5b0a24be4946d57cb116b3df151e80e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Date: Tue, 22 Sep 2015 19:53:54 +0200
Subject: [PATCH 070/344] Fix build on aarch64 rhbz#1263206

Disable run-time dependency on gccxml in Reflex (allows installing on aarch64)
Enable Cintex on aarch64
---
 root.spec | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/root.spec b/root.spec
index 20a8288..cad3f29 100644
--- a/root.spec
+++ b/root.spec
@@ -40,7 +40,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -341,12 +341,16 @@ This package contains the CINT C++ interpreter version 5.
 %package reflex
 Summary:	Reflex dictionary generator
 Group:		Applications/Engineering
+# Cintex can operate on AArch64, but requires Relfex library and headers
+# This allows reading x86_64 serialized data on aarch64
+%ifnarch aarch64
 Requires:	gccxml
+%endif
 
 %description reflex
 This package contains the reflex dictionary generator for ROOT.
 
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 aarch64
 #		Cintex does not work on ppc
 #		https://savannah.cern.ch/bugs/?22003#comment16
 #		./configure only allows --enable-cintex for ix86 and x86_64
@@ -1306,7 +1310,7 @@ unset QTINC
 	    --enable-bonjour \
 	    --disable-castor \
 	    --disable-chirp \
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 aarch64
 	    --enable-cintex \
 %else
 	    --disable-cintex \
@@ -1754,7 +1758,7 @@ fi
 %postun cint -p /sbin/ldconfig
 %post reflex -p /sbin/ldconfig
 %postun reflex -p /sbin/ldconfig
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 aarch64
 %post cintex -p /sbin/ldconfig
 %postun cintex -p /sbin/ldconfig
 %endif
@@ -2013,7 +2017,7 @@ fi
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/COPYING.CINT
 
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 aarch64
 %files cintex -f includelist-cint-cintex
 %{_libdir}/%{name}/libCintex.*
 %{python_sitearch}/PyCintex.py*
@@ -2516,6 +2520,10 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
+- Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
+- Enable Cintex on aarch64
+
 * Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
 - Update to 5.34.32
 - New sub-package: root-fonts (STIX version 0.9 required by TMathText)

From 284227b471fd9971d68aa10009dfd77634d360b1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 25 Sep 2015 23:02:42 +0200
Subject: [PATCH 071/344] Add versioned dependencies between packages

- Reenable hadoop/hdfs support for F23+
---
 root-html.C |   4 +-
 root.spec   | 503 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 484 insertions(+), 23 deletions(-)

diff --git a/root-html.C b/root-html.C
index dda9a93..06dbcf5 100644
--- a/root-html.C
+++ b/root-html.C
@@ -22,10 +22,10 @@
 					"TGraphPainter","GraphPainter",
 					"TGraphPainter()");
   delete (TFile*) gROOT->ProcessLine(".x tutorials/hsimple.C");
+  gSystem->Exec("mv hsimple.root tutorials/hsimple.root");
   THtml html;
-  html.SetProductName("ROOT");
   html.SetEtcDir("@PWD@/etc/html");
-  html.SetHomepage("http://root.cern.ch");
+  html.SetSourceDir(".");
   html.LoadAllLibs();
   html.SetBatch(kTRUE);
   html.MakeAll();
diff --git a/root.spec b/root.spec
index cad3f29..ec5d0b8 100644
--- a/root.spec
+++ b/root.spec
@@ -29,18 +29,23 @@
 
 %global xrootd 1
 
-%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} < 23
+%if %{?fedora}%{!?fedora:0} >= 20
+# libhdfs is currently only available on intel architectures in Fedora
+%ifarch %{ix86} x86_64
 %global hadoop 1
 %else
 %global hadoop 0
 %endif
+%else
+%global hadoop 0
+%endif
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -85,9 +90,9 @@ Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#		The build segfaults on ppc64 during an invocation of cint:
+#		The build segfaults on ppc(64) during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
-ExcludeArch:	ppc64
+ExcludeArch:	ppc ppc64
 #		The cint interpreter is not fully ported to arm
 #		https://sft.its.cern.ch/jira/browse/ROOT-5398
 #		https://sft.its.cern.ch/jira/browse/ROOT-5399
@@ -195,6 +200,8 @@ BuildRequires:	font(droidsansfallback)
 BuildRequires:	font(stixgeneral)
 BuildRequires:	font(stixsize1)
 %endif
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
 Requires:	emacs-filesystem >= %{_emacs_version}
@@ -275,7 +282,6 @@ Group:		Applications/Engineering
 BuildArch:	noarch
 %endif
 License:	LGPLv2+ and GPLv2+ and BSD
-Requires:	%{name}-cint = %{version}-%{release}
 
 %description doc
 This package contains the automatically generated ROOT class
@@ -287,7 +293,7 @@ Group:		Applications/Engineering
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
-Requires:	%{name}-cint = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description tutorial
 This package contains the tutorial scripts and test suite for ROOT.
@@ -296,8 +302,10 @@ This package contains the tutorial scripts and test suite for ROOT.
 Summary:	ROOT core libraries
 Group:		Applications/Engineering
 License:	LGPLv2+ and BSD
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-fonts = %{version}-%{release}
 Requires:	%{name}-icons = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
@@ -341,11 +349,19 @@ This package contains the CINT C++ interpreter version 5.
 %package reflex
 Summary:	Reflex dictionary generator
 Group:		Applications/Engineering
-# Cintex can operate on AArch64, but requires Relfex library and headers
-# This allows reading x86_64 serialized data on aarch64
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+%if %{?fedora}%{!?fedora:0} >= 23
+#		In Fedora 23+ gccxml has been replaced by castxml
+#		Some of the scripts in root needs to be adapted for this change
+#		This is still not done, so e.g. genreflex is a bit broken
+Requires:	castxml
+%else
+#		gccxml is not available in aarch64
 %ifnarch aarch64
 Requires:	gccxml
 %endif
+%endif
 
 %description reflex
 This package contains the reflex dictionary generator for ROOT.
@@ -357,7 +373,11 @@ This package contains the reflex dictionary generator for ROOT.
 %package cintex
 Summary:	Reflex to CINT dictionary converter
 Group:		Applications/Engineering
-Requires:	%{name}-python = %{version}-%{release}
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-reflex%{?_isa} = %{version}-%{release}
+#		For PyCintex.py
+Requires:	%{name}-python%{?_isa} = %{version}-%{release}
 
 %description cintex
 Cintex is a library that converts Reflex dictionary information to
@@ -368,6 +388,9 @@ with CINT with any class for which a Reflex dictionary is provided.
 %package proofd
 Summary:	Parallel ROOT Facility - distributed, parallel computing
 Group:		Applications/Engineering
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
@@ -385,6 +408,7 @@ transparent interface.
 %package rootd
 Summary:	ROOT remote file server
 Group:		Applications/Engineering
+#		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
@@ -400,6 +424,10 @@ transparent interface.
 %package python
 Summary:	Python extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description python
 This package contains the Python extension for ROOT. This package
@@ -409,6 +437,10 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package python26
 Summary:	Python extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description python26
 This package contains the Python extension for ROOT. This package
@@ -419,6 +451,10 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package python3
 Summary:	Python extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description python3
 This package contains the Python extension for ROOT. This package
@@ -428,6 +464,10 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package ruby
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Provides:	ruby(libRuby) = %{version}
 %if %{?ruby_abi:1}%{!?ruby_abi:0}
 Requires:	ruby(abi) = %{ruby_abi}
@@ -441,6 +481,10 @@ invoke the Ruby interpreter from ROOT.
 %package genetic
 Summary:	Genetic algorithms for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 
 %description genetic
 This package contains a genetic minimizer module for ROOT.
@@ -448,6 +492,16 @@ This package contains a genetic minimizer module for ROOT.
 %package geom
 Summary:	Geometry library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description geom
 This package contains a library for defining geometries in ROOT.
@@ -455,7 +509,13 @@ This package contains a library for defining geometries in ROOT.
 %package gdml
 Summary:	GDML import/export for ROOT geometries
 Group:		Applications/Engineering
-Requires:	%{name}-python = %{version}-%{release}
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+#		For ROOTwriter.py
+Requires:	%{name}-python%{?_isa} = %{version}-%{release}
 
 %description gdml
 This package contains an import/export module for ROOT geometries.
@@ -463,6 +523,11 @@ This package contains an import/export module for ROOT geometries.
 %package graf
 Summary:	2D graphics library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description graf
 This package contains the 2-dimensional graphics library for ROOT.
@@ -470,6 +535,13 @@ This package contains the 2-dimensional graphics library for ROOT.
 %package graf-asimage
 Summary:	AfterImage graphics renderer for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description graf-asimage
 This package contains the AfterImage renderer for ROOT, which allows
@@ -479,6 +551,12 @@ TIFF.
 %package graf-fitsio
 Summary:	ROOT interface for the Flexible Image Transport System (FITS)
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description graf-fitsio
 This package contains a library for using the Flexible Image Transport
@@ -487,6 +565,11 @@ System (FITS) data format in root.
 %package graf-gpad
 Summary:	Canvas and pad library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
 
 %description graf-gpad
@@ -495,6 +578,10 @@ This package contains a library for canvas and pad manipulations.
 %package graf-gviz
 Summary:	Graphviz 2D library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 
 %description graf-gviz
 This package contains the 2-dimensional graphviz library for ROOT.
@@ -502,6 +589,9 @@ This package contains the 2-dimensional graphviz library for ROOT.
 %package graf-postscript
 Summary:	Postscript/PDF renderer library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 
 %description graf-postscript
 This package contains a library for ROOT, which allows rendering
@@ -511,6 +601,10 @@ postscript and PDF output.
 %package graf-qt
 Summary:	Qt renderer for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 
 %description graf-qt
 This package contains the Qt renderer for ROOT.
@@ -519,6 +613,9 @@ This package contains the Qt renderer for ROOT.
 %package graf-x11
 Summary:	X window system renderer for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 
 %description graf-x11
 This package contains the X11 renderer for ROOT, which allows using an
@@ -527,6 +624,12 @@ X display for showing graphics.
 %package graf3d
 Summary:	Basic 3D shapes library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description graf3d
 This library contains the basic 3D shapes and classes for ROOT. For
@@ -535,6 +638,22 @@ a more full-blown geometry library, see the root-geom package.
 %package graf3d-eve
 Summary:	Event display library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description graf3d-eve
 This package contains a library for defining event displays in ROOT.
@@ -542,6 +661,16 @@ This package contains a library for defining event displays in ROOT.
 %package graf3d-gl
 Summary:	GL renderer for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description graf3d-gl
 This package contains the GL renderer for ROOT. This library provides
@@ -552,6 +681,14 @@ rendering of histograms, and similar. Included is also a high quality
 %package graf3d-gviz3d
 Summary:	Graphviz 3D library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 
 %description graf3d-gviz3d
 This package contains the 3-dimensional graphviz library for ROOT.
@@ -559,6 +696,10 @@ This package contains the 3-dimensional graphviz library for ROOT.
 %package graf3d-x3d
 Summary:	X 3D renderer for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 
 %description graf3d-x3d
 This package contains the X 3D renderer for ROOT. This library provides
@@ -568,6 +709,14 @@ a low quality 3D viewer for ROOT defined geometries.
 %package gui
 Summary:	GUI library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+#		Dynamic dependencies
 Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 
@@ -577,6 +726,13 @@ This package contains a library for defining graphical user interfaces.
 %package gui-fitpanel
 Summary:	GUI element for fits in ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description gui-fitpanel
 This package contains a library to show a pop-up dialog when fitting
@@ -585,6 +741,14 @@ various kinds of data.
 %package gui-ged
 Summary:	GUI element for editing various ROOT objects
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description gui-ged
@@ -594,6 +758,11 @@ various ROOT objects.
 %package guibuilder
 Summary:	GUI editor library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description guibuilder
 This package contains a library for editing graphical user interfaces
@@ -603,6 +772,11 @@ in ROOT.
 %package gui-qt
 Summary:	Qt GUI for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 
 %description gui-qt
 This package contains the Qt GUI for ROOT.
@@ -611,6 +785,11 @@ This package contains the Qt GUI for ROOT.
 %package gui-recorder
 Summary:	Interface for recording and replaying events in ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description gui-recorder
 This library provides interface for recording and replaying events in ROOT.
@@ -623,6 +802,11 @@ and can be replayed again anytime.
 %package hbook
 Summary:	Hbook library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description hbook
 This package contains the Hbook library for ROOT, allowing you to
@@ -631,6 +815,11 @@ access legacy Hbook files (NTuples and Histograms from PAW).
 %package hist
 Summary:	Histogram library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
 
 %description hist
@@ -639,6 +828,13 @@ This package contains a library for histogramming in ROOT.
 %package hist-painter
 Summary:	Histogram painter plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description hist-painter
 This package contains a painter of histograms for ROOT.
@@ -646,6 +842,9 @@ This package contains a painter of histograms for ROOT.
 %package spectrum
 Summary:	Spectra analysis library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 
 %description spectrum
 This package contains the Spectrum library for ROOT.
@@ -653,6 +852,10 @@ This package contains the Spectrum library for ROOT.
 %package spectrum-painter
 Summary:	Spectrum painter plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 
 %description spectrum-painter
 This package contains a painter of spectra for ROOT.
@@ -660,6 +863,16 @@ This package contains a painter of spectra for ROOT.
 %package hist-factory
 Summary:	RooFit PDFs from ROOT histograms
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description hist-factory
 Create RooFit probability density functions from ROOT histograms.
@@ -667,6 +880,9 @@ Create RooFit probability density functions from ROOT histograms.
 %package html
 Summary:	HTML documentation generator for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	graphviz
 
 %description html
@@ -676,6 +892,8 @@ from marked up sources.
 %package io
 Summary:	Input/output of ROOT objects
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description io
 This package provides I/O routines for ROOT objects.
@@ -683,6 +901,9 @@ This package provides I/O routines for ROOT objects.
 %package io-dcache
 Summary:	dCache input/output library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-dcache
 This package contains the dCache extension for ROOT.
@@ -690,6 +911,9 @@ This package contains the dCache extension for ROOT.
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
@@ -698,6 +922,9 @@ This package contains the Grid File Access Library extension for ROOT.
 %package io-hdfs
 Summary:	Hadoop File System input/output library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-hdfs
 This package contains the Hadoop File System extension for ROOT.
@@ -706,6 +933,9 @@ This package contains the Hadoop File System extension for ROOT.
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-rfio
 This package contains the Remote File IO extension for ROOT.
@@ -713,6 +943,10 @@ This package contains the Remote File IO extension for ROOT.
 %package io-sql
 Summary:	SQL input/output library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description io-sql
 This package contains the SQL extension for ROOT, that allows
@@ -722,6 +956,9 @@ TFile interface.
 %package io-xml
 Summary:	XML reader library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-xml
 This package contains the XML reader library for ROOT.
@@ -729,6 +966,10 @@ This package contains the XML reader library for ROOT.
 %package foam
 Summary:	A Compact Version of the Cellular Event Generator
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description foam
 The general-purpose self-adapting Monte Carlo (MC) event
@@ -741,6 +982,8 @@ easier to use for the average user.
 Summary:	FFTW library for ROOT
 Group:		Applications/Engineering
 License:	GPLv2+
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description fftw
 This package contains the Fast Fourier Transform extension for ROOT.
@@ -749,6 +992,10 @@ It uses the very fast fftw (version 3) library.
 %package fumili
 Summary:	Fumili library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description fumili
 This package contains the fumili library for ROOT. This provides an
@@ -757,6 +1004,8 @@ alternative fitting algorithm for ROOT.
 %package genvector
 Summary:	Generalized vector library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description genvector
 This package contains the Genvector library for ROOT. This provides
@@ -765,6 +1014,9 @@ a generalized vector library.
 %package mathcore
 Summary:	Core mathematics library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 
 %description mathcore
@@ -774,6 +1026,9 @@ This package contains the MathCore library for ROOT.
 Summary:	GSL interface library for ROOT
 Group:		Applications/Engineering
 License:	GPLv2+
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description mathmore
 This package contains the MathMore library for ROOT. This provides
@@ -784,6 +1039,9 @@ is licensed under GPLv2+ due to its use of GSL.
 %package matrix
 Summary:	Matrix library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description matrix
 This package contains the Matrix library for ROOT.
@@ -791,6 +1049,11 @@ This package contains the Matrix library for ROOT.
 %package minuit
 Summary:	Minuit library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description minuit
 This package contains the MINUIT library for ROOT. This provides a
@@ -799,6 +1062,10 @@ fitting algorithm for ROOT.
 %package minuit2
 Summary:	Minuit version 2 library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description minuit2
 This package contains the MINUIT version 2 library for ROOT. This
@@ -807,6 +1074,15 @@ provides an fitting algorithm for ROOT.
 %package mlp
 Summary:	Multi-layer perceptron extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description mlp
 This package contains the mlp library for ROOT. This library provides
@@ -815,6 +1091,10 @@ a multi-layer perceptron neural network package for ROOT.
 %package physics
 Summary:	Physics library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description physics
 This package contains the physics library for ROOT.
@@ -822,6 +1102,9 @@ This package contains the physics library for ROOT.
 %package quadp
 Summary:	QuadP library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description quadp
 This package contains the QuadP library for ROOT. This provides the a
@@ -832,6 +1115,8 @@ subject to linear constraints.
 %package smatrix
 Summary:	Sparse matrix library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description smatrix
 This package contains the Smatrix library for ROOT.
@@ -839,6 +1124,13 @@ This package contains the Smatrix library for ROOT.
 %package splot
 Summary:	Splot library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description splot
 A common method used in High Energy Physics to perform measurements
@@ -872,6 +1164,10 @@ discriminating variables.
 Summary:	Random number generator library
 Group:		Applications/Engineering
 License:	GPLv2+
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description unuran
 Contains universal (also called automatic or black-box) algorithms
@@ -900,6 +1196,11 @@ modern compilers (e.g. gcc 4.7) vectorisable.
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description memstat
 This package contains the memory statistics tool for debugging memory
@@ -908,6 +1209,14 @@ leaks and such.
 %package table
 Summary:	Table library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description table
 This package contains the Table library for ROOT.
@@ -915,6 +1224,12 @@ This package contains the Table library for ROOT.
 %package montecarlo-eg
 Summary:	Event generator library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description montecarlo-eg
 This package contains an event generator library for ROOT.
@@ -923,6 +1238,9 @@ This package contains an event generator library for ROOT.
 %package montecarlo-pythia8
 Summary:	Pythia version 8 plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
 
 %description montecarlo-pythia8
 This package contains the Pythia version 8 plug-in for ROOT. This
@@ -934,6 +1252,11 @@ package provide the ROOT user with transparent interface to the Pythia
 %package montecarlo-vmc
 Summary:	Virtual Monte-Carlo (simulation) library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
 
 %description montecarlo-vmc
 This package contains the VMC library for ROOT.
@@ -941,6 +1264,10 @@ This package contains the VMC library for ROOT.
 %package net
 Summary:	Net library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description net
 This package contains the ROOT networking library.
@@ -948,6 +1275,8 @@ This package contains the ROOT networking library.
 %package net-rpdutils
 Summary:	Authentication utilities used by rootd and proofd
 Group:		Applications/Engineering
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-rpdutils
 This package contains authentication utilities used by rootd and proofd.
@@ -955,6 +1284,8 @@ This package contains authentication utilities used by rootd and proofd.
 %package net-bonjour
 Summary:	Bonjour extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description net-bonjour
 This package contains a bonjour extension for ROOT.
@@ -962,6 +1293,10 @@ This package contains a bonjour extension for ROOT.
 %package net-auth
 Summary:	Authentication extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-auth
 This package contains the basic authentication algorithms used by ROOT.
@@ -970,6 +1305,9 @@ This package contains the basic authentication algorithms used by ROOT.
 Summary:	Davix extension for ROOT
 Group:		Applications/Engineering
 Requires:	davix-libs%{?_isa} >= 0.2.8
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description net-davix
 This package contains the davix extension for ROOT, that provides
@@ -978,6 +1316,9 @@ access to http based storage such as webdav and S3.
 %package net-globus
 Summary:	Globus extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
 Requires:	globus-proxy-utils
 
 %description net-globus
@@ -987,6 +1328,10 @@ authentication and authorization against Globus.
 %package net-krb5
 Summary:	Kerberos (version 5) extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
 Requires:	krb5-workstation
 
 %description net-krb5
@@ -996,6 +1341,8 @@ allows authentication and authorization using Kerberos tokens.
 %package net-ldap
 Summary:	LDAP extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description net-ldap
 This package contains the LDAP extension for ROOT. This gives you
@@ -1004,6 +1351,14 @@ access to LDAP directories via ROOT.
 %package net-http
 Summary:	HTTP server extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description net-http
 This package contains the HTTP server extension for ROOT. It provides
@@ -1013,6 +1368,10 @@ an http interface to arbitrary ROOT applications.
 %package netx
 Summary:	NetX extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description netx
 This package contains the NetX extension for ROOT, i.e. a client for
@@ -1023,6 +1382,16 @@ provided.
 %package proof
 Summary:	PROOF extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name}-clarens < 5.34.01
 Obsoletes:	%{name}-peac < 5.34.01
 
@@ -1033,6 +1402,14 @@ client to use in a PROOF environment.
 %package proof-bench
 Summary:	PROOF benchmarking
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description proof-bench
 This package contains the steering class for PROOF benchmarks.
@@ -1040,6 +1417,11 @@ This package contains the steering class for PROOF benchmarks.
 %package proof-pq2
 Summary:	PROOF Quick Query (pq2)
 Group:		Applications/Engineering
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 
 %description proof-pq2
 Shell-based interface to the PROOF dataset handling.
@@ -1047,6 +1429,15 @@ Shell-based interface to the PROOF dataset handling.
 %package proof-sessionviewer
 Summary:	GUI to browse an interactive PROOF session
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description proof-sessionviewer
 This package contains a library for browsing an interactive PROOF
@@ -1056,6 +1447,12 @@ session in ROOT.
 %package xproof
 Summary:	XPROOF extension for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires:	xrootd-server%{?_isa}
 
@@ -1068,6 +1465,18 @@ client to be used in a PROOF environment.
 Summary:	ROOT extension for modeling expected distributions
 Group:		Applications/Engineering
 License:	BSD
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description roofit
 The RooFit packages provide a toolkit for modeling the expected
@@ -1085,6 +1494,9 @@ suitable for adoption in different disciplines as well.
 %package sql-mysql
 Summary:	MySQL client plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description sql-mysql
 This package contains the MySQL plugin for ROOT. This plugin
@@ -1095,6 +1507,9 @@ ROOT environment.
 %package sql-odbc
 Summary:	ODBC plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description sql-odbc
 This package contains the ODBC (Open DataBase Connectivity) plugin
@@ -1104,6 +1519,9 @@ supports the ODBC protocol.
 %package sql-sqlite
 Summary:	Sqlite client plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description sql-sqlite
 This package contains the sqlite plugin for ROOT. This plugin
@@ -1114,6 +1532,9 @@ ROOT environment.
 %package sql-pgsql
 Summary:	PostgreSQL client plugin for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description sql-pgsql
 This package contains the PostGreSQL plugin for ROOT. This plugin
@@ -1125,6 +1546,17 @@ ROOT environment.
 Summary:	Toolkit for multivariate data analysis
 Group:		Applications/Engineering
 License:	BSD
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description tmva
 The Toolkit for Multivariate Analysis (TMVA) provides a
@@ -1149,6 +1581,10 @@ compared.
 %package tree
 Summary:	Tree library for ROOT
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description tree
 This package contains the Tree library for ROOT.
@@ -1156,6 +1592,15 @@ This package contains the Tree library for ROOT.
 %package tree-player
 Summary:	Library to loop over a ROOT tree
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description tree-player
 This package contains a plugin to loop over a ROOT tree.
@@ -1163,6 +1608,17 @@ This package contains a plugin to loop over a ROOT tree.
 %package tree-viewer
 Summary:	GUI to browse a ROOT tree
 Group:		Applications/Engineering
+Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description tree-viewer
 This package contains a plugin for browsing a ROOT tree in ROOT.
@@ -1390,20 +1846,20 @@ unset QTINC
 %endif
 	    --fail-on-missing
 
-make OPTFLAGS="%{optflags}" \
-	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
+make %{?_smp_mflags} \
+	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}"
 
 %if %{?rhel}%{!?rhel:0} == 5
 # Build PyROOT for python 2.6
 mkdir python
 cp bindings/python/ROOT.py python
 cp bindings/python/cppyy.py python
-make OPTFLAGS="%{optflags}" \
-	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
+make %{?_smp_mflags} \
+	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" \
 	MODULES="build cint/cint core/utils bindings/python" \
 	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
 	PYROOTLIB=python/libPyROOT.so \
-	ROOTPY="python/ROOT.py python/cppyy.py"
+	ROOTPY="python/ROOT.py python/cppyy.py" python/libPyROOT.so
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 15
@@ -1411,18 +1867,19 @@ make OPTFLAGS="%{optflags}" \
 mkdir python
 cp bindings/python/ROOT.py python
 cp bindings/python/cppyy.py python
-make OPTFLAGS="%{optflags}" \
-	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
+make %{?_smp_mflags} \
+	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" \
 	MODULES="build cint/cint core/utils bindings/python" \
 	PYTHONINCDIR=`pkg-config --cflags python3 | sed 's/-I//'` \
 	PYTHONLIB=`pkg-config --libs python3` \
 	PYROOTLIB=python/libPyROOT.so \
-	ROOTPY="python/ROOT.py python/cppyy.py"
+	ROOTPY="python/ROOT.py python/cppyy.py" python/libPyROOT.so
 %endif
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make %{?_smp_mflags} install DESTDIR=%{buildroot} \
+	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}"
 
 # Move python modules to the sitelib
 mkdir -p %{buildroot}%{python_sitearch}
@@ -1616,8 +2073,8 @@ echo Unix.*.Root.PluginPath: ${PWD}/etc/plugins >> .rootrc
 echo *.*.Root.TTFontPath: ${PWD}/fonts >> .rootrc
 sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
-ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
-rm .rootrc
+PATH=${PWD}/bin:${PATH} ROOTSYS=${PWD} ./bin/root.exe -b -l -n -q -x html.C
+rm .rootrc html.C
 mv htmldoc %{buildroot}%{_pkgdocdir}/html
 
 # Create includelist files ...
@@ -2520,6 +2977,10 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
+- Add versioned dependencies between packages
+- Reenable hadoop/hdfs support for F23+
+
 * Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
 - Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
 - Enable Cintex on aarch64

From 47191cc0cf97dc43f546b891503fcffdf53bde5e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 10 Nov 2015 18:05:20 +0000
Subject: [PATCH 072/344] - Rebuilt for
 https://fedoraproject.org/wiki/Changes/python3.5

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index ec5d0b8..4543e06 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2977,6 +2977,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
 * Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
 - Add versioned dependencies between packages
 - Reenable hadoop/hdfs support for F23+

From 33ffc84ca9d798c87ac03ccb4b34e59b0b663b91 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 17 Nov 2015 16:40:19 +0100
Subject: [PATCH 073/344] Adapt to gfal 2.10 - uses a different #define

- Exclude ppc64le - has the same issues with cint as ppc and ppc64
---
 root-gfal2.patch | 12 ++++++++++++
 root.spec        | 11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 root-gfal2.patch

diff --git a/root-gfal2.patch b/root-gfal2.patch
new file mode 100644
index 0000000..cdf06ac
--- /dev/null
+++ b/root-gfal2.patch
@@ -0,0 +1,12 @@
+diff -ur root-5.34.32.orig/io/gfal/src/TGFALFile.cxx root-5.34.32/io/gfal/src/TGFALFile.cxx
+--- root-5.34.32.orig/io/gfal/src/TGFALFile.cxx	2015-06-23 17:56:20.000000000 +0200
++++ root-5.34.32/io/gfal/src/TGFALFile.cxx	2015-11-17 14:33:31.069759901 +0100
+@@ -68,7 +68,7 @@
+ }
+ 
+ // GFAL2 doesn't use special names for 64 bit versions
+-#ifdef _GFAL2_API_
++#if defined(_GFAL2_API_) || defined(GFAL2_API_H_)
+ #define gfal_lseek64   gfal_lseek
+ #define gfal_open64    gfal_open
+ #define gfal_readdir64 gfal_readdir
diff --git a/root.spec b/root.spec
index 4543e06..4ccfbdd 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -89,10 +89,12 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
+#		Adapt to GFAL 2.10
+Patch10:	%{name}-gfal2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc(64) during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
-ExcludeArch:	ppc ppc64
+ExcludeArch:	ppc ppc64 ppc64le
 #		The cint interpreter is not fully ported to arm
 #		https://sft.its.cern.ch/jira/browse/ROOT-5398
 #		https://sft.its.cern.ch/jira/browse/ROOT-5399
@@ -1637,6 +1639,7 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -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 \
@@ -2977,6 +2980,10 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
+- Adapt to gfal 2.10 - uses a different #define
+- Exclude ppc64le - has the same issues with cint as ppc and ppc64
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 

From 093cf36cc6fccb433b9d87126a23bc4fcdac0d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 12 Jan 2016 15:55:56 +0100
Subject: [PATCH 074/344] Rebuilt for
 https://fedoraproject.org/wiki/Changes/Ruby_2.3

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 4ccfbdd..768094d 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2980,6 +2980,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
 * Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
 - Adapt to gfal 2.10 - uses a different #define
 - Exclude ppc64le - has the same issues with cint as ppc and ppc64

From 7b75beeafd1ce62305712c8f3f09728850a2527b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 14 Jan 2016 13:10:21 -0500
Subject: [PATCH 075/344] Rebuild for glew 1.13

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 768094d..0face28 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2980,6 +2980,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
+- Rebuild for glew 1.13
+
 * Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
 

From af80df442b38f7466b30f790997ea2f490bd29e7 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sat, 16 Jan 2016 01:31:25 +0900
Subject: [PATCH 076/344] Rebuild again for
 https://fedoraproject.org/wiki/Changes/Ruby_2.3

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0face28..e77edf6 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2980,6 +2980,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
+- Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
 * Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
 - Rebuild for glew 1.13
 

From 9b3288a2aec158f145ba9ee481bbc42292689aa5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 4 Feb 2016 22:15:25 +0000
Subject: [PATCH 077/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index e77edf6..f552292 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	5.34.32
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2980,6 +2980,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
 - Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
 

From c073038c81f3ef84bf892c875f562d71e7213906 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 8 Apr 2016 13:55:37 +0200
Subject: [PATCH 078/344] Update to 5.34.36

---
 root-private-public.patch | 142 ++++++++++++++++++++++++++++++++++++++
 root.spec                 |  20 ++++--
 sources                   |   2 +-
 3 files changed, 157 insertions(+), 7 deletions(-)
 create mode 100644 root-private-public.patch

diff --git a/root-private-public.patch b/root-private-public.patch
new file mode 100644
index 0000000..40c2b6b
--- /dev/null
+++ b/root-private-public.patch
@@ -0,0 +1,142 @@
+diff -ur root-6.04.02.orig/proof/proofx/inc/TXSocket.h root-6.04.02/proof/proofx/inc/TXSocket.h
+--- root-6.04.02.orig/proof/proofx/inc/TXSocket.h	2015-07-14 12:54:01.000000000 +0200
++++ root-6.04.02/proof/proofx/inc/TXSocket.h	2015-07-24 23:17:46.482814148 +0200
+@@ -43,8 +43,8 @@
+ #ifndef ROOT_TSocket
+ #include "TSocket.h"
+ #endif
+-#ifndef ROOT_XrdProofConn
+-#include "XrdProofConn.h"
++#ifndef __XPTYPES_H
++#include "XProtocol/XPtypes.hh"
+ #endif
+ #ifndef XRC_UNSOLMSG_H
+ #include "XrdClient/XrdClientUnsolMsg.hh"
+@@ -58,6 +58,7 @@
+ class TXHandler;
+ class TXSocketHandler;
+ class XrdClientMessage;
++class XrdProofConn;
+ 
+ // To transmit info to Handlers
+ typedef struct {
+@@ -140,7 +141,7 @@
+    void                PostMsg(Int_t type, const char *msg = 0);
+ 
+    // Auxilliary
+-   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
++   Int_t               GetLowSocket() const;
+ 
+    static void         SetLocation(const char *loc = ""); // Set location string
+ 
+@@ -170,13 +171,13 @@
+ 
+    virtual Int_t       GetClientID() const { return -1; }
+    virtual Int_t       GetClientIDSize() const { return 1; }
+-   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
+-   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
+-   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
+-   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
++   Int_t               GetLogConnID() const;
++   Int_t               GetOpenError() const;
++   Int_t               GetServType() const;
++   Int_t               GetSessionID() const;
+    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
+ 
+-   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
++   Bool_t              IsValid() const;
+    Bool_t              IsServProofd();
+    virtual void        RemoveClientID() { }
+    virtual void        SetClientID(Int_t) { }
+@@ -215,10 +216,7 @@
+    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
+ 
+    // Interrupt the low level socket
+-   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
+-                                        fRDInterrupt = i;
+-                                        if (i && fConn) fConn->SetInterrupt();
+-                                        if (i && fAWait) fASem.Post(); }
++   void                SetInterrupt(Bool_t i = kTRUE);
+    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
+    // Set / Check async msg queue waiting status
+    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
+diff -ur root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.04.02/proof/proofx/src/TXProofMgr.cxx
+--- root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx	2015-07-14 12:54:01.000000000 +0200
++++ root-6.04.02/proof/proofx/src/TXProofMgr.cxx	2015-07-25 00:18:56.528053529 +0200
+@@ -39,6 +39,8 @@
+ #include "TSysEvtHandler.h"
+ #include "XProofProtocol.h"
+ 
++#include "XrdProofConn.h"
++
+ ClassImp(TXProofMgr)
+ 
+ //
+diff -ur root-6.04.02.orig/proof/proofx/src/TXSocket.cxx root-6.04.02/proof/proofx/src/TXSocket.cxx
+--- root-6.04.02.orig/proof/proofx/src/TXSocket.cxx	2015-07-14 12:54:01.000000000 +0200
++++ root-6.04.02/proof/proofx/src/TXSocket.cxx	2015-07-24 23:23:46.982746510 +0200
+@@ -924,6 +924,36 @@
+ }
+ 
+ //____________________________________________________________________________
++Int_t TXSocket::GetLogConnID() const
++{
++   return (fConn ? fConn->GetLogConnID() : -1);
++}
++
++//____________________________________________________________________________
++Int_t TXSocket::GetOpenError() const
++{
++   return (fConn ? fConn->GetOpenError() : -1);
++}
++
++//____________________________________________________________________________
++Int_t TXSocket::GetServType() const
++{
++   return (fConn ? fConn->GetServType() : -1);
++}
++
++//____________________________________________________________________________
++Int_t TXSocket::GetSessionID() const
++{
++   return (fConn ? fConn->GetSessionID() : -1);
++}
++
++//____________________________________________________________________________
++Bool_t TXSocket::IsValid() const
++{
++   return (fConn ? (fConn->IsValid()) : kFALSE);
++}
++
++//____________________________________________________________________________
+ Bool_t TXSocket::IsServProofd()
+ {
+    // Return kTRUE if the remote server is a 'proofd'
+@@ -1643,6 +1673,15 @@
+ }
+ 
+ //______________________________________________________________________________
++void TXSocket::SetInterrupt(Bool_t i)
++{
++   R__LOCKGUARD(fAMtx);
++   fRDInterrupt = i;
++   if (i && fConn) fConn->SetInterrupt();
++   if (i && fAWait) fASem.Post();
++}
++
++//______________________________________________________________________________
+ Int_t TXSocket::Send(const TMessage &mess)
+ {
+    // Send a TMessage object. Returns the number of bytes in the TMessage
+@@ -1933,6 +1972,11 @@
+ }
+ 
+ //_____________________________________________________________________________
++Int_t TXSocket::GetLowSocket() const {
++   return (fConn ? fConn->GetLowSocket() : -1);
++}
++
++//_____________________________________________________________________________
+ void TXSocket::InitEnvs()
+ {
+    // Init environment variables for XrdClient
diff --git a/root.spec b/root.spec
index f552292..618fe54 100644
--- a/root.spec
+++ b/root.spec
@@ -43,16 +43,16 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.32
+Version:	5.34.36
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	9%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
 License:	LGPLv2+
-URL:		http://root.cern.ch/		
+URL:		https://root.cern.ch/
 #		The upstream source is modified to exclude proprietary fonts:
-#		wget -N ftp://root.cern.ch/root/root_v%{version}.source.tar.gz
+#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
 #		tar -z -x -f root_v%{version}.source.tar.gz
 #		find root/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
 #		mv root root-%{version}
@@ -90,11 +90,15 @@ Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
 #		Adapt to GFAL 2.10
+#		https://github.com/root-mirror/root/pull/106
 Patch10:	%{name}-gfal2.patch
+#		Public header #includes private header
+#		https://github.com/root-mirror/root/pull/88
+Patch11:	%{name}-private-public.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc(64) during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
-ExcludeArch:	ppc ppc64 ppc64le
+ExcludeArch:	ppc %{power64}
 #		The cint interpreter is not fully ported to arm
 #		https://sft.its.cern.ch/jira/browse/ROOT-5398
 #		https://sft.its.cern.ch/jira/browse/ROOT-5399
@@ -1640,6 +1644,7 @@ fi
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -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 \
@@ -2954,7 +2959,7 @@ fi
 %{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
 
 %files sql-sqlite -f includelist-sql-sqlite
-%{_libdir}/%{name}/libSQLite.*
+%{_libdir}/%{name}/libRSQLite.*
 %{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
 
 %files sql-pgsql -f includelist-sql-pgsql
@@ -2980,6 +2985,9 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
+- Update to 5.34.36
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 9ba3f64..c19ad71 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b4e593a5740a8154635c2fe5d3081cd2  root-5.34.32.tar.xz
+eb9d4a4c6becba8dc591c7945a0b2544  root-5.34.36.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root

From 9a997630c22153c394ccde93569a2fa21ecec20b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sun, 10 Apr 2016 23:12:54 +0200
Subject: [PATCH 079/344] Update to 6.06.02 (F24+, EPEL7)

- Change to cmake configuration (was using ./configure)
- Change to doxygen documentation generation (was using THTML)
- Run the test suite
- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
  root-notebook and root-rootaas
- New subpackage for EPEL7: root-python34
- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
---
 info.png                         |  Bin 2060 -> 0 bytes
 root-32bit.patch                 |   78 +
 root-abitags.patch               | 1267 ++++++++++++
 root-arm.patch                   |   81 +
 root-avoid-gui-crash.patch       |   59 +
 root-avoid-std-bind-lambda.patch |   42 +
 root-banner.png                  |  Bin 132555 -> 0 bytes
 root-broken-cmake-config.patch   |  194 ++
 root-cache-test.patch            |  281 +++
 root-cernlib-doc.patch           | 1307 +++++++++++++
 root-compiledata.patch           |   12 +
 root-deprecated-options.patch    |   30 +
 root-doc-latex.patch             |   64 -
 root-dont-link-jvm.patch         |   50 +-
 root-dox-filter.patch            |   86 +
 root-doxyfile.patch              |   30 +
 root-doxygen-warnings.patch      |  723 +++++++
 root-fflags.patch                |   78 +
 root-fontconfig.patch            |  332 ++--
 root-ftgl.patch                  |   55 -
 root-gl2ps.patch                 |  254 +++
 root-hdfs.patch                  |  129 --
 root-html-markup.patch           | 1031 ++++++++++
 root-html.C                      |   32 -
 root-includelist                 |   12 -
 root-latex-markup.patch          |  877 +++++++++
 root-libgfortranbegin.patch      |  182 ++
 root-links.patch                 |  376 ++++
 root-llvm-static.patch           |   11 +
 root-macro-align.patch           |   36 +
 root-meta.patch                  |   48 -
 root-missing-cmake-config.patch  |  187 ++
 root-no-hexfloat-const.patch     |   12 +
 root-no-testdata.patch           |   20 +
 root-ppc64.patch                 |   38 +
 root-private-public.patch        |   76 +-
 root-s390x.patch                 |  147 ++
 root-save-memory.patch           |   30 +
 root-see-macro-output.patch      |  266 +++
 root-soname.patch                |   11 +
 root-stressgraphics.patch        |   56 +
 root-template-files.patch        |   28 +
 root-test-install.patch          | 3091 ++++++++++++++++++++++++++++++
 root-testfiles.sh                |   85 +
 root-tildes.patch                |  194 ++
 root-tmath-doc.patch             |  274 +++
 root-tprincipal-doc.patch        |  483 +++++
 root-tvector2-comment.patch      |   13 +
 root-type1-embed.patch           |   42 +-
 root-unuran.patch                |  316 ++-
 root-usa.patch                   |   15 -
 root-werror.patch                |   12 +
 root-xrootd.patch                |   22 -
 root.spec                        | 1554 ++++++++-------
 rootdrawing-logo.png             |  Bin 15051 -> 0 bytes
 55 files changed, 13301 insertions(+), 1428 deletions(-)
 delete mode 100644 info.png
 create mode 100644 root-32bit.patch
 create mode 100644 root-abitags.patch
 create mode 100644 root-arm.patch
 create mode 100644 root-avoid-gui-crash.patch
 create mode 100644 root-avoid-std-bind-lambda.patch
 delete mode 100644 root-banner.png
 create mode 100644 root-broken-cmake-config.patch
 create mode 100644 root-cache-test.patch
 create mode 100644 root-cernlib-doc.patch
 create mode 100644 root-compiledata.patch
 create mode 100644 root-deprecated-options.patch
 delete mode 100644 root-doc-latex.patch
 create mode 100644 root-dox-filter.patch
 create mode 100644 root-doxyfile.patch
 create mode 100644 root-doxygen-warnings.patch
 create mode 100644 root-fflags.patch
 delete mode 100644 root-ftgl.patch
 create mode 100644 root-gl2ps.patch
 delete mode 100644 root-hdfs.patch
 create mode 100644 root-html-markup.patch
 delete mode 100644 root-html.C
 delete mode 100644 root-includelist
 create mode 100644 root-latex-markup.patch
 create mode 100644 root-libgfortranbegin.patch
 create mode 100644 root-links.patch
 create mode 100644 root-llvm-static.patch
 create mode 100644 root-macro-align.patch
 delete mode 100644 root-meta.patch
 create mode 100644 root-missing-cmake-config.patch
 create mode 100644 root-no-hexfloat-const.patch
 create mode 100644 root-no-testdata.patch
 create mode 100644 root-ppc64.patch
 create mode 100644 root-s390x.patch
 create mode 100644 root-save-memory.patch
 create mode 100644 root-see-macro-output.patch
 create mode 100644 root-soname.patch
 create mode 100644 root-stressgraphics.patch
 create mode 100644 root-template-files.patch
 create mode 100644 root-test-install.patch
 create mode 100755 root-testfiles.sh
 create mode 100644 root-tildes.patch
 create mode 100644 root-tmath-doc.patch
 create mode 100644 root-tprincipal-doc.patch
 create mode 100644 root-tvector2-comment.patch
 delete mode 100644 root-usa.patch
 create mode 100644 root-werror.patch
 delete mode 100644 root-xrootd.patch
 delete mode 100644 rootdrawing-logo.png

diff --git a/info.png b/info.png
deleted file mode 100644
index c0bb348ef5b7c87e2411ab39765a7f39e07a7416..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2060
zcmV+n2=n)eP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000NmNkl<Zc$}S=
zZH!!18OML;-g%#W?RL7|EeNh<0U<4=0tKrPByHjgZ;b{~q6x7Q6a9n<=od6<;tK{u
z1AO5FqM!j2lOjz)ZK_cUf>J0@=*za-Ww*OKJ3BiwcV_NA=Xv~a@2qWip$#W_a_*fu
z=RE)C|NNhG?lGKYJMz>WrT(FTb-jhDE6J3uB-OnR{Ip8DiEEwEc6qP0nHR*R_lo!v
z#mx`s*{o~MG~nP9UoFfYe&fcWk-o1FuD@Y@c4*TIQr)O+fD0h302;sBMpG-Vyey6B
zr<_ecl)vuD@B;%l`t%*S*LOX8UFqDu`!D_cZ5QO%eg$<+sQwq)(;ya9Q58^yPVaZ2
z(n4qd{V&@L?#*xAvFif?*!j(&Z}+WCeRsp{-yck`xgM(fAUF!P8AmKayCqDGw@IgA
z^*KI90d*h|*tTk`eB3RJe<SzV=bt@m0Ed73#oVEP?%v+Js{4U;x86-=_){?V0@|E9
zCDKs3m}euFZjQgUkJ`bVT)nADMyuc~NGt&rol&QE=WpKg=yCwO(|;J-`?pWoX62rX
zKm9o}L!W@zf1tr6hy$@`V(GpS1~0jab1uD<%Wu4ix%o8Z`4)sBScf`?T8rAKgxDVi
zzuz=+MgRvMy0$;6&py0%!v(907v73i_anh1>O#~;@q%F+txrPjP)s+FDHIspd==@H
z1;kp!S~RjqWYNf>kzK9MJ<|Bi#-aBGP#Hh)rLNxmd8LnTM%AIUqcNS%C4Gd}#*oU}
z$h&*c@(b}qb@Z(~%!(cxN1xcK&-UZ$Wb1osVE=vV*UTJz^$(@<&b?;zmU}TMG{*n0
z^7aDKm_VB|pn{5GJcIY)i_x^j)Mv5dvuMl4IuS)xV=btnasRf8tnb;rzt!=ZT0~+P
z@qI?ROT!qyfG)g~h)KY;aFw?p3Q!SHKm<`m-rNViLBm9NB53meNsc@HD5}>0e_fJ-
z%Gj%yc^-qs{#D@GXxKn)h=c)dehh8aPR=Rw6?nHg!p;{j;pwM+W@lom#k$4($K#XU
z+N4757v>)v^_DPz;Ud8JsSFwhsEuOe3&)YhiC71!h*KtJyUDEE&cNDDY`M9c{m<><
zrQN?^%O?ebC}GIOQJ=(s@l#;kNAOH9P&oyFD1-5XivdI-v=?ym$4<#<wRj!pe)%qP
zeLbLxF&VDdwvDOR9>MPma5aZ^DDR|11YF|Bx>a~ysRLk<3Qf$mT4>Zn!zNOj0Bcbz
zv67vzVt9yrcM4Z|5Uo7};%HUpDRi~bC`v>t$-d!GC*TC_Fyb_iNPbBQL}EnEYMHKf
zfHulVy@DpxD>0Ss&`w-tFJAd5UiVF8*IUYCN9Y?+G>ia2Rgwzm2vJa{7++9P52H&p
z;DloU^~ww@!zNOnL8CCH50ZmNp)rBJHANIya#sw4vs9-h>FL)vVov}`w&DaxCxv*Z
zbuDAeVi_(X>0YsVpA(w%v(vQar;wnUs5jY6oJ$TGi_}|~OcAdz2+lHh>=^weMb%<b
zg7F2s#BfPk9C#Tt3TIHASpvXWH|B)#AZSycdI$U>xMWZ7n7Cvg5KOiQlkNhs)TXB?
z_6tEEl&e5WF)0CGz{I8ri+CKv^D0XKsOX!D_xGUfm>7E-RUdIA4A|JYb8$pQFxes|
zRRm|rWHY?<+{GMR*hZ~8hu3Ff=Zh=|CfkLyo1pw|;GW}d34m*UIve_a`Z4EVdah2R
zG6P;Nb}EtxN>Cga2fmNN183QE%MGmC@-;5m(q#0ixRe)DVHAvD(nYit93_|D!%6Lw
z!)WV6?LF4<SUXa8U~HUrqmh6}%1B)-FeBg=(69>PNM{;&>0eP`7w$+E)Pk?zE5=v6
zd@pKEJqjB?EPZdX^_~C#iuvr%oUm`U)?#dOCa&XDJ`rJ3;|LOrVdr)bMZ1aQm*jOn
zcA^%8^AzJL#siZpKyDCMp4eUYQ-3<$-?E=%JGbXHlowim1kPVuDsukN3ev?ca0{4J
z2w8)dH<%2h&&kGhU+-+epjOckRJxGnphicI{^xkm-n!xE<=NAH`O5)#{AD|J`^Pc|
zTA|xmZQ4@1)n=fO!Y}qi$_H&@QgM`o4kE$$U^?M=9$sb*5)2R>I`ZPNdh=VC-#7Qp
za=za8v;6VfGOMF@ct3D`Z_XbWDP<Y{&?>TheVAN`$vR9{Fexx;A502d0awe>JUBJE
zci-d=oA>WJ;k??NkIpT7PdMYf;MdzSy=k>qdn$LPe6BBbrHjM;S%%m2lPPBLy0REQ
z9iJC%M}4{;RLiyJe*Apx;lCWVFI{<IuD*FRXN@A?d9tzu#2Enq{NOWrBL?rpTsRO#
zZi{EQ%r{&x++(uV`JpN`E6g+^edFO5-7{^sc(w@;-ng;QxM+1c`pGlZB>+-Oyq(tW
zx;A6xo8nE@G_~V(32H6=4D15Dfr4h|n>KRGU&0J=m1(W1OfSf?gU$$GvMNR~-V?7x
zSs-`voN_?4%#=>_4hTmF({0}vIdWpTp=SZ$-FXMbnA4pv(~@Hlmsqs2%X9g(vB%4i
zdvhxKU?N=8gE8Pw)<`)eLtMI@d5gI=ASn+~a6MTx<s0WjwH&ZK_h$<r<zWD$isy9E
qxk(&%BF6*qy%>-Z7sZ*@2KXN|aXDfWg+Ueo0000<MNUMnLSTY++xBY!

diff --git a/root-32bit.patch b/root-32bit.patch
new file mode 100644
index 0000000..326a8d8
--- /dev/null
+++ b/root-32bit.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
+--- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
+@@ -179,7 +179,7 @@
+ 
+    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
+ 
+-   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
++   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
+ 
+    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
+ 
+diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
+--- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
+@@ -1121,7 +1121,7 @@
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
+ #if defined (R__LINUX) && !defined(R__B64)
+    // problem of precision on linux 32
+-   if (Dim ==4) scale = 1000000000;
++   if (Dim ==4) scale = 5000000000;
+ #endif
+    // for problem with PtEtaPhiE
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
+diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
+--- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
+@@ -312,7 +312,7 @@
+    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
+    double par[2] = {3,4};
+    double xx[2] = {0.8,1.6};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -326,7 +326,7 @@
+    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
+    double par[2] = {3,4};
+    double xx[3] = {0.8,1.6,2.2};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -369,12 +369,12 @@
+    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
+    f2.SetParameters(10,1,0,1);
+    f0.SetParameters(f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
+ 
+    TF1 f3("f3","f1+[0]");
+    // param order should be the same
+    f3.SetParameters( f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
+    return ok;
+ }
+ 
+@@ -465,7 +465,7 @@
+    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
+    TF1 f6("f6",func,-10,10,4);
+    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
+-   ok &= (f5.Eval(2) == f6.Eval(2) );
++   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
+    return ok;
+ }
+ 
+@@ -485,7 +485,7 @@
+    // keep same order in evaluation
+    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
+    f0.SetParameters(1.1,2.1);
+-   ok &= (fsincos.Eval(2) == f0.Eval(2) );
++   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
+    return ok;
+ 
+ }
diff --git a/root-abitags.patch b/root-abitags.patch
new file mode 100644
index 0000000..040474a
--- /dev/null
+++ b/root-abitags.patch
@@ -0,0 +1,1267 @@
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
+--- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
+@@ -0,0 +1,90 @@
++========
++Abi Tags
++========
++
++Introduction
++============
++
++This text tries to describe gcc semantic for mangling "abi_tag" attributes
++described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
++
++There is no guarantee the following rules are correct, complete or make sense
++in any way as they were determined empirically by experiments with gcc5.
++
++Declaration
++===========
++
++Abi tags are declared in an abi_tag attribute and can be applied to a
++function, variable, class or inline namespace declaration. The attribute takes
++one or more strings (called tags); the order does not matter.
++
++See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
++details.
++
++Tags on an inline namespace are called "implicit tags", all other tags are
++"explicit tags".
++
++Mangling
++========
++
++All tags that are "active" on a <unqualified-name> are emitted after the
++<unqualified-name>, before <template-args> or <discriminator>, and are part of
++the same <substitution> the <unqualified-name> is.
++
++They are mangled as:
++
++    <abi-tags> ::= <abi-tag>*   # sort by name
++    <abi-tag> ::= B <tag source-name>
++
++Example:
++
++    __attribute__((abi_tag("test")))
++    void Func();
++
++    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
++
++Active tags
++===========
++
++A namespace has never any active tags; for types (class / struct / union /
++enum) the explicit tags are the active tags.
++
++For variables and functions the active tags are the explicit tags plus any
++"required tags" which are not in the "available tags" set:
++
++    derived-tags := (required-tags - available-tags)
++    active-tags := explicit-tags + derived-tags
++
++Required tags for a function
++============================
++
++If a function is used as a local scope for another name, and is part of
++another function as local scope, it doesn't have any required tags.
++
++If a function is used as a local scope for a guard variable name, it doesn't
++have any required tags.
++
++Otherwise the function requires any implicit or explicit tag used in the name
++for the return type.
++
++Required tags for a variable
++============================
++
++A variable requires any implicit or explicit tag used in its type.
++
++Available tags
++==============
++
++All tags used in the prefix and in the template arguments for a name are
++available; for functions also all  tags from the <bare-function-type> (which
++might include the return type for template functions) are available.
++
++For <local-name>s all active tags used in the local part (<function-
++encoding>) are available, but not implicit tags which were not active!
++
++Implicit and explicit tags used in the <unqualified-name> for a function (as
++in the type of a cast operator) are NOT available.
++
++Example: a cast operator to std::string (which is
++std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
++required from the return type `std::string` but not available.
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
+@@ -144,6 +144,7 @@
+ class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
+ class VariadicUnsignedArgument<string name> : Argument<name, 1>;
+ class VariadicExprArgument<string name> : Argument<name, 1>;
++class VariadicStringArgument<string name> : Argument<name, 1>;
+ 
+ // A version of the form major.minor[.subminor].
+ class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
+@@ -336,6 +337,14 @@
+ // Attributes begin here
+ //
+ 
++def AbiTag : Attr {
++  let Spellings = [GCC<"abi_tag">];
++  let Args = [VariadicStringArgument<"Tags">];
++  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
++                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
++  let Documentation = [Undocumented];
++}
++
+ def AddressSpace : TypeAttr {
+   let Spellings = [GNU<"address_space">];
+   let Args = [IntArgument<"AddressSpace">];
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
+@@ -2255,7 +2255,8 @@
+   "Objective-C instance methods|init methods of interface or class extension declarations|"
+   "variables, functions and classes|Objective-C protocols|"
+   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
+-  "interface or protocol declarations|kernel functions}1">,
++  "interface or protocol declarations|kernel functions|"
++  "structs, classes, variables, functions, methods and inline namespaces}1">,
+   InGroup<IgnoredAttributes>;
+ def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
+ def warn_type_attribute_wrong_type : Warning<
+@@ -3922,6 +3923,12 @@
+ def err_redefinition_extern_inline : Error<
+   "redefinition of a 'extern inline' function %0 is not supported in "
+   "%select{C99 mode|C++}1">;
++def err_attr_abi_tag_only_on_inline_namespace :
++  Error<"abi_tag attribute only allowed on inline namespaces">;
++def err_abi_tag_on_redeclaration :
++  Error<"cannot add abi_tag attribute in redeclaration">;
++def err_new_abi_tag_on_redeclaration :
++  Error<"abi_tag %0 missing in original declaration">;
+ 
+ def note_deleted_dtor_no_operator_delete : Note<
+   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
+@@ -846,7 +846,8 @@
+   ExpectedStructOrUnionOrTypedef,
+   ExpectedStructOrTypedef,
+   ExpectedObjectiveCInterfaceOrProtocol,
+-  ExpectedKernelFunction
++  ExpectedKernelFunction,
++  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
+ };
+ 
+ }  // end namespace clang
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
+@@ -202,6 +202,8 @@
+ class CXXNameMangler {
+   ItaniumMangleContextImpl &Context;
+   raw_ostream &Out;
++  bool NullOut = false;
++  bool DisableDerivedAbiTags = false;
+ 
+   /// The "structor" is the top-level declaration being mangled, if
+   /// that's not a template specialization; otherwise it's the pattern
+@@ -251,6 +253,167 @@
+ 
+   } FunctionTypeDepth;
+ 
++  // abi_tag is a gcc attribute, taking one or more strings called "tags".
++  //
++  // the goal is to annotage against which version of a library an object was
++  // build and to be able to provide backwards compatibility ("dual abi").
++  //
++  // for this the emitted mangled names have to be different, while you don't
++  // want the user to have to use different names in the source.
++  //
++  // the abi_tag can be present on Struct, Var and Function  declarations as
++  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
++  // are always emitted after the unqualified name, and (implicit) tags on
++  // namespace are not.
++  //
++  // For functions and variables there is a set of "implicitly available"
++  // tags. These tags are: all tags from the namespace/structs the name is
++  // embedded in, all tags from any template arguments of the name, and, for
++  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
++  // parameters and sometimes the return type).
++  //
++  // For functions this is basically the list of all tags from the signature
++  // without the unqualified name and usually without the return type of the
++  // function. In `operator Type()` Type is NOT part of that list, as it is
++  // part of the unqualified name!
++  //
++  // Now all tags from the function return type/variable type which are not
++  // "implicitly available" must be added to the explicit list of tags, and
++  // are emitted after the unqualified name.
++  //
++  // Example:
++  // namespace std {
++  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
++  //   inline namespace __cxx11 {
++  //     struct string { };
++  //   }
++  // }
++  //
++  // std::string foo(); // needs abi tag "cxx11" on foo
++  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
++  // __attribute__((__abi_tag__("cxx11")))
++  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
++  //
++  // The tags are sorted by name before emitting, and are serialized as
++  //   <abitag> ::= B <"tag" source-name>
++
++  typedef SmallVector<StringRef, 4> AbiTagList;
++
++  // state to gather all implicit and explicit tags used in a mangled name.
++  // must always have an instance of this while emitting any name to keep
++  // track.
++  //
++  // TODO(abitags): how to handle substituted names? they should add the tags used in
++  // the substitution to the list of available tags.
++  class AbiTagState final {
++  public:
++    //! all abi tags used implicitly or explicitly
++    std::set<StringRef> UsedAbiTags;
++    //! all explicit abi tags (i.e. not from namespace)
++    std::set<StringRef> EmittedAbiTags;
++
++    AbiTagState* &LinkHead;
++    AbiTagState *Parent{nullptr};
++
++    bool LinkActive{false};
++
++    explicit AbiTagState(AbiTagState* &linkHead)
++      : LinkHead(linkHead) {
++      Parent = LinkHead;
++      LinkHead = this;
++      LinkActive = true;
++    }
++
++    // no copy, no move
++    AbiTagState(AbiTagState const&) = delete;
++    AbiTagState& operator=(AbiTagState const&) = delete;
++
++    ~AbiTagState() {
++      pop();
++    }
++
++    void pop() {
++      if (!LinkActive) return;
++
++      assert(LinkHead == this && "abi tag link head must point to us on destruction");
++      LinkActive = false;
++      if (Parent) {
++        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
++        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
++      }
++      LinkHead = Parent;
++    }
++
++    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++      ND = cast<NamedDecl>(ND->getCanonicalDecl());
++
++      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
++        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
++      } else {
++        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
++        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
++          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
++            for (const auto& Tag: AbiTag->tags()) {
++              UsedAbiTags.insert(Tag);
++            }
++          }
++          // don't emit abi tags for namespaces
++          return;
++        }
++      }
++
++      AbiTagList TagList;
++      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
++        for (const auto& Tag: AbiTag->tags()) {
++          UsedAbiTags.insert(Tag);
++          // AbiTag->tags() is sorted and has no duplicates
++          TagList.push_back(Tag);
++        }
++      }
++
++      if (AdditionalAbiTags) {
++        for (const auto& Tag: *AdditionalAbiTags) {
++          UsedAbiTags.insert(Tag);
++          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
++            // don't insert duplicates
++            TagList.push_back(Tag);
++          }
++        }
++        // AbiTag->tags() are already sorted; only add if we had additional tags
++        std::sort(TagList.begin(), TagList.end());
++      }
++
++      writeSortedUniqueAbiTags(Out, TagList);
++    }
++
++  protected:
++    template<typename TagList>
++    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
++      for (const auto& Tag: AbiTags) {
++        EmittedAbiTags.insert(Tag);
++        Out << "B";
++        Out << Tag.size();
++        Out << Tag;
++      }
++    }
++  } *AbiTags = nullptr;
++  AbiTagState AbiTagsRoot{AbiTags};
++
++  struct TemporaryDisableDerivedAbiTags {
++    bool& StateRef;
++    bool OldState;
++
++    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
++    : StateRef(State) {
++      OldState = StateRef;
++      StateRef = Disable;
++    }
++    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
++    ~TemporaryDisableDerivedAbiTags() {
++      StateRef = OldState;
++    }
++  };
++
+   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
+ 
+   ASTContext &getASTContext() const { return Context.getASTContext(); }
+@@ -273,6 +436,10 @@
+     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
+       SeqID(0) { }
+ 
++  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
++    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
++      SeqID(Outer.SeqID) { }
++
+ #if MANGLE_CHECKER
+   ~CXXNameMangler() {
+     if (Out.str()[0] == '\01')
+@@ -286,18 +453,21 @@
+ #endif
+   raw_ostream &getStream() { return Out; }
+ 
++  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
++
+   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
+   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
+   void mangleNumber(const llvm::APSInt &I);
+   void mangleNumber(int64_t Number);
+   void mangleFloat(const llvm::APFloat &F);
+-  void mangleFunctionEncoding(const FunctionDecl *FD);
++  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
+   void mangleSeqID(unsigned SeqID);
+-  void mangleName(const NamedDecl *ND);
++  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
+   void mangleType(QualType T);
+   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
+   
+ private:
++  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
+ 
+   bool mangleSubstitution(const NamedDecl *ND);
+   bool mangleSubstitution(QualType T);
+@@ -326,31 +496,49 @@
+                             DeclarationName name,
+                             unsigned KnownArity = UnknownArity);
+ 
+-  void mangleName(const TemplateDecl *TD,
++  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
++
++  void mangleNameWithAbiTags(const NamedDecl *ND,
++                             const AbiTagList *AdditionalAbiTags,
++                             bool ExcludeUnqualifiedName);
++  void mangleTemplateName(const TemplateDecl *TD,
++                  const AbiTagList *AdditionalAbiTags,
++                  bool ExcludeUnqualifiedName,
+                   const TemplateArgument *TemplateArgs,
+                   unsigned NumTemplateArgs);
+-  void mangleUnqualifiedName(const NamedDecl *ND) {
+-    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
++  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
+   }
+   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
+-                             unsigned KnownArity);
+-  void mangleUnscopedName(const NamedDecl *ND);
+-  void mangleUnscopedTemplateName(const TemplateDecl *ND);
+-  void mangleUnscopedTemplateName(TemplateName);
++                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                  const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(TemplateName,
++                                  const AbiTagList *AdditionalAbiTags);
+   void mangleSourceName(const IdentifierInfo *II);
+-  void mangleLocalName(const Decl *D);
++  void mangleLocalName(const Decl *D,
++                       const AbiTagList *AdditionalAbiTags,
++                       bool ExcludeUnqualifiedName);
+   void mangleBlockForPrefix(const BlockDecl *Block);
+   void mangleUnqualifiedBlock(const BlockDecl *Block);
+   void mangleLambda(const CXXRecordDecl *Lambda);
+   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
+-                        bool NoFunction=false);
++                        const AbiTagList *AdditionalAbiTags,
++                        bool NoFunction,
++                        bool ExcludeUnqualifiedName);
+   void mangleNestedName(const TemplateDecl *TD,
++                        const AbiTagList *AdditionalAbiTags,
++                        bool ExcludeUnqualifiedName,
+                         const TemplateArgument *TemplateArgs,
+                         unsigned NumTemplateArgs);
+   void manglePrefix(NestedNameSpecifier *qualifier);
+   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
+   void manglePrefix(QualType type);
+-  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
++  void mangleTemplatePrefix(const TemplateDecl *ND,
++                            const AbiTagList *AdditionalAbiTags,
++                            bool NoFunction = false,
++                            bool ExcludeUnqualifiedName = false);
+   void mangleTemplatePrefix(TemplateName Template);
+   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
+   void mangleQualifiers(Qualifiers Quals);
+@@ -391,6 +579,10 @@
+   void mangleTemplateParameter(unsigned Index);
+ 
+   void mangleFunctionParam(const ParmVarDecl *parm);
++
++  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
++  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
++  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
+ };
+ 
+ }
+@@ -441,6 +633,11 @@
+   return true;
+ }
+ 
++void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++  assert(AbiTags && "require AbiTagState");
++  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
++}
++
+ void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
+   // <mangled-name> ::= _Z <encoding>
+   //            ::= <data name>
+@@ -456,14 +653,28 @@
+     mangleName(cast<FieldDecl>(D));
+ }
+ 
+-void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
+-  // <encoding> ::= <function name> <bare-function-type>
+-  mangleName(FD);
+-
++void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
+   // Don't mangle in the type if this isn't a decl we should typically mangle.
+-  if (!Context.shouldMangleDeclName(FD))
++  if (!Context.shouldMangleDeclName(FD)) {
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
+     return;
++  }
++
++  // <encoding> ::= <function name> <bare-function-type>
++
++  if (ExcludeUnqualifiedName)
++  {
++    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
++  } else {
++    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
++    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
++  }
++
++  mangleFunctionEncodingBareType(FD);
++}
+ 
++void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
+   if (FD->hasAttr<EnableIfAttr>()) {
+     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
+     Out << "Ua9enable_ifI";
+@@ -509,7 +720,7 @@
+     FD = PrimaryTemplate->getTemplatedDecl();
+   }
+ 
+-  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
++  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
+                          MangleReturnType);
+ }
+ 
+@@ -567,7 +778,21 @@
+   return nullptr;
+ }
+ 
+-void CXXNameMangler::mangleName(const NamedDecl *ND) {
++// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
++void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
++  if (!ExcludeUnqualifiedName) {
++    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
++      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
++      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
++      return;
++    }
++  }
++  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
++}
++
++void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
++                                           const AbiTagList *AdditionalAbiTags,
++                                           bool ExcludeUnqualifiedName) {
+   //  <name> ::= <nested-name>
+   //         ::= <unscoped-name>
+   //         ::= <unscoped-template-name> <template-args>
+@@ -583,7 +808,7 @@
+     while (!DC->isNamespace() && !DC->isTranslationUnit())
+       DC = getEffectiveParentContext(DC);
+   else if (GetLocalClassDecl(ND)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+@@ -593,76 +818,88 @@
+     // Check if we have a template.
+     const TemplateArgumentList *TemplateArgs = nullptr;
+     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-      mangleUnscopedTemplateName(TD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+       mangleTemplateArgs(*TemplateArgs);
+       return;
+     }
+ 
+-    mangleUnscopedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedName(ND, AdditionalAbiTags);
+     return;
+   }
+ 
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+-  mangleNestedName(ND, DC);
++  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
+ }
+-void CXXNameMangler::mangleName(const TemplateDecl *TD,
+-                                const TemplateArgument *TemplateArgs,
+-                                unsigned NumTemplateArgs) {
++
++void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
++                                        const AbiTagList *AdditionalAbiTags,
++                                        bool ExcludeUnqualifiedName,
++                                        const TemplateArgument *TemplateArgs,
++                                        unsigned NumTemplateArgs) {
+   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
+ 
+   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
+-    mangleUnscopedTemplateName(TD);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+   } else {
+-    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
++    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
+   }
+ }
+ 
+-void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
++void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
+   //  <unscoped-name> ::= <unqualified-name>
+   //                  ::= St <unqualified-name>   # ::std::
+ 
+   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
+     Out << "St";
+ 
+-  mangleUnqualifiedName(ND);
++  mangleUnqualifiedName(ND, AdditionalAbiTags);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
++void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (mangleSubstitution(ND))
+     return;
+ 
+   // <template-template-param> ::= <template-param>
+-  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
++  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
+     mangleTemplateParameter(TTP->getIndex());
+-  else
+-    mangleUnscopedName(ND->getTemplatedDecl());
++  } else {
++    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
++  }
+ 
+   addSubstitution(ND);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
++void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleUnscopedTemplateName(TD);
++    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+   
+   if (mangleSubstitution(Template))
+     return;
+ 
++  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
++
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Not a dependent template name?");
+   if (const IdentifierInfo *Id = Dependent->getIdentifier())
+     mangleSourceName(Id);
+   else
+     mangleOperatorName(Dependent->getOperator(), UnknownArity);
+-  
++
+   addSubstitution(Template);
+ }
+ 
+@@ -824,6 +1061,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespace());
+     break;
+   case NestedNameSpecifier::NamespaceAlias:
+     if (qualifier->getPrefix())
+@@ -832,6 +1070,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+ 
+   case NestedNameSpecifier::TypeSpec:
+@@ -917,15 +1156,18 @@
+ 
+     case Type::Typedef:
+       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TypedefType>(type)->getDecl());
+       break;
+ 
+     case Type::UnresolvedUsing:
+       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
+       break;
+ 
+     case Type::Record:
+       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TagType>(type)->getDecl());
+       break;
+ 
+     case Type::TemplateSpecialization: {
+@@ -943,6 +1185,7 @@
+         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
+ 
+         mangleSourceName(temp->getIdentifier());
++        writeAbiTags(temp);
+         break;
+       }
+ 
+@@ -974,16 +1217,19 @@
+     case Type::InjectedClassName:
+       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
+       break;
+ 
+     case Type::DependentName:
+       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
++      // writeAbiTags(cast<DependentNameType>(type));
+       break;
+ 
+     case Type::DependentTemplateSpecialization: {
+       const DependentTemplateSpecializationType *tst
+         = cast<DependentTemplateSpecializationType>(type);
+       mangleSourceName(tst->getIdentifier());
++      // writeAbiTags(tst);
+       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
+       break;
+     }
+@@ -1033,6 +1279,7 @@
+     }
+ 
+     mangleSourceName(qualifier->getAsIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+   }
+ 
+@@ -1049,12 +1296,14 @@
+                                           DeclarationName name,
+                                           unsigned knownArity) {
+   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
+-  mangleUnqualifiedName(nullptr, name, knownArity);
++  mangleUnqualifiedName(nullptr, name, knownArity,
++                        /*AdditionalAbiTags*/ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
+                                            DeclarationName Name,
+-                                           unsigned KnownArity) {
++                                           unsigned KnownArity,
++                                           const AbiTagList *AdditionalAbiTags) {
+   //  <unqualified-name> ::= <operator-name>
+   //                     ::= <ctor-dtor-name>
+   //                     ::= <source-name>
+@@ -1072,6 +1321,8 @@
+         Out << 'L';
+ 
+       mangleSourceName(II);
++      if (ND)
++        writeAbiTags(ND, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1111,6 +1362,7 @@
+       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
+ 
+       mangleSourceName(FD->getIdentifier());
++      // TODO(abitags): not emitting abi tags: internal name anyway
+       break;
+     }
+ 
+@@ -1131,6 +1383,9 @@
+       assert(D->getDeclName().getAsIdentifierInfo() &&
+              "Typedef was not named!");
+       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
++      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
++      // explicit abi tags are still possible; take from underlying type, not from typedef.
++      writeAbiTags(TD, nullptr);
+       break;
+     }
+ 
+@@ -1140,6 +1395,7 @@
+     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
+     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
+       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
++        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
+         mangleLambda(Record);
+         break;
+       }
+@@ -1151,6 +1407,7 @@
+       if (UnnamedMangle > 1)
+         Out << llvm::utostr(UnnamedMangle - 2);
+       Out << '_';
++      writeAbiTags(TD, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1183,6 +1440,7 @@
+       // Otherwise, use the complete constructor name. This is relevant if a
+       // class with a constructor is declared within a constructor.
+       mangleCXXCtorType(Ctor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXDestructorName:
+@@ -1194,12 +1452,14 @@
+       // Otherwise, use the complete destructor name. This is relevant if a
+       // class with a destructor is declared within a destructor.
+       mangleCXXDtorType(Dtor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXConversionFunctionName:
+     // <operator-name> ::= cv <type>    # (cast)
+     Out << "cv";
+     mangleType(Name.getCXXNameType());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXOperatorName: {
+@@ -1223,6 +1483,7 @@
+     // FIXME: This mangling is not yet official.
+     Out << "li";
+     mangleSourceName(Name.getCXXLiteralIdentifier());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXUsingDirective:
+@@ -1239,7 +1500,9 @@
+ 
+ void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
+                                       const DeclContext *DC,
+-                                      bool NoFunction) {
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool NoFunction,
++                                      bool ExcludeUnqualifiedName) {
+   // <nested-name> 
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
+@@ -1259,30 +1522,35 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD, NoFunction);
++    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
+     mangleTemplateArgs(*TemplateArgs);
+   }
+   else {
+     manglePrefix(DC, NoFunction);
+-    mangleUnqualifiedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND, AdditionalAbiTags);
+   }
+ 
+   Out << 'E';
+ }
+ void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool ExcludeUnqualifiedName,
+                                       const TemplateArgument *TemplateArgs,
+                                       unsigned NumTemplateArgs) {
+   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
+ 
+   Out << 'N';
+ 
+-  mangleTemplatePrefix(TD);
++  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
+   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+ 
+   Out << 'E';
+ }
+ 
+-void CXXNameMangler::mangleLocalName(const Decl *D) {
++void CXXNameMangler::mangleLocalName(const Decl *D,
++                                     const AbiTagList *AdditionalAbiTags,
++                                     bool ExcludeUnqualifiedName) {
+   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
+   //              := Z <function encoding> E s [<discriminator>]
+   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
+@@ -1294,15 +1562,25 @@
+ 
+   Out << 'Z';
+ 
+-  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
+-    mangleObjCMethodName(MD);
+-  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
+-    mangleBlockForPrefix(BD);
+-  else
+-    mangleFunctionEncoding(cast<FunctionDecl>(DC));
++  {
++    AbiTagState localAbiTags(AbiTags);
++
++    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
++      mangleObjCMethodName(MD);
++    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
++      mangleBlockForPrefix(BD);
++    else
++      mangleFunctionEncoding(cast<FunctionDecl>(DC));
++
++    // implicit abi tags (from namespace) are not available in the following
++    // entity; reset to actually emitted tags, which are available.
++    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
++  }
+ 
+   Out << 'E';
+ 
++  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
++
+   if (RD) {
+     // The parameter number is omitted for the last parameter, 0 for the 
+     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
+@@ -1327,13 +1605,17 @@
+     // Mangle the name relative to the closest enclosing function.
+     // equality ok because RD derived from ND above
+     if (D == RD)  {
+-      mangleUnqualifiedName(RD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedName(RD, AdditionalAbiTags);
+     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
+-      mangleUnqualifiedBlock(BD);
++      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedBlock(BD);
+     } else {
+       const NamedDecl *ND = cast<NamedDecl>(D);
+-      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
++      mangleNestedName(ND, getEffectiveDeclContext(ND),
++                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
+     }
+   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+     // Mangle a block in a default parameter; see above explanation for
+@@ -1350,30 +1632,35 @@
+       }
+     }
+ 
+-    mangleUnqualifiedBlock(BD);
++    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedBlock(BD);
+   } else {
+-    mangleUnqualifiedName(cast<NamedDecl>(D));
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
+   }
+ 
+-  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
+-    unsigned disc;
+-    if (Context.getNextDiscriminator(ND, disc)) {
+-      if (disc < 10)
+-        Out << '_' << disc;
+-      else
+-        Out << "__" << disc << '_';
++  if (!ExcludeUnqualifiedName) {
++    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
++      unsigned disc;
++      if (Context.getNextDiscriminator(ND, disc)) {
++        if (disc < 10)
++          Out << '_' << disc;
++        else
++          Out << "__" << disc << '_';
++      }
+     }
+   }
+ }
+ 
+ void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
+   if (GetLocalClassDecl(Block)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   const DeclContext *DC = getEffectiveDeclContext(Block);
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   manglePrefix(getEffectiveDeclContext(Block));
+@@ -1384,10 +1671,11 @@
+   if (Decl *Context = Block->getBlockManglingContextDecl()) {
+     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
+         Context->getDeclContext()->isRecord()) {
+-      if (const IdentifierInfo *Name
+-            = cast<NamedDecl>(Context)->getIdentifier()) {
++      const auto *ND = cast<NamedDecl>(Context);
++      if (const IdentifierInfo *Name = ND->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
++        Out << 'M';
+       }
+     }
+   }
+@@ -1420,7 +1708,7 @@
+       if (const IdentifierInfo *Name
+             = cast<NamedDecl>(Context)->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        Out << 'M';
+       }
+     }
+   }
+@@ -1502,11 +1790,11 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD);
++    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+     mangleTemplateArgs(*TemplateArgs);
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND);
++    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
+   }
+ 
+   addSubstitution(ND);
+@@ -1517,7 +1805,7 @@
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleTemplatePrefix(TD);
++    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+ 
+   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
+     manglePrefix(Qualified->getQualifier());
+@@ -1525,18 +1813,21 @@
+   if (OverloadedTemplateStorage *Overloaded
+                                       = Template.getAsOverloadedTemplate()) {
+     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
+-                          UnknownArity);
++                          UnknownArity,
++                          /* AdditionalAbiTags */ nullptr);
+     return;
+   }
+    
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Unknown template name kind?");
+   manglePrefix(Dependent->getQualifier());
+-  mangleUnscopedTemplateName(Template);
++  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
+-                                          bool NoFunction) {
++                                          const AbiTagList *AdditionalAbiTags,
++                                          bool NoFunction,
++                                          bool ExcludeUnqualifiedName) {
+   // <template-prefix> ::= <prefix> <template unqualified-name>
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+@@ -1548,10 +1839,12 @@
+ 
+   // <template-template-param> ::= <template-param>
+   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    // TODO(abitags): ???
+     mangleTemplateParameter(TTP->getIndex());
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND->getTemplatedDecl());
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
+   }
+ 
+   addSubstitution(ND);
+@@ -1595,6 +1888,7 @@
+     // <name> ::= <nested-name>
+     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
+     mangleSourceName(Dependent->getIdentifier());
++    // writeAbiTags(Dependent);
+     break;
+   }
+ 
+@@ -2370,7 +2664,11 @@
+ 
+ void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
+   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
+-    mangleName(TD, T->getArgs(), T->getNumArgs());
++    // types only have explicit abi tags, no addition tags
++    mangleTemplateName(TD,
++                       /* AdditionalAbiTags */ nullptr,
++                       /* ExcludeUnqualifiedName */ false,
++                       T->getArgs(), T->getNumArgs());
+   } else {
+     if (mangleSubstitution(QualType(T, 0)))
+       return;
+@@ -2417,6 +2715,7 @@
+   Out << 'N';
+   manglePrefix(T->getQualifier());
+   mangleSourceName(T->getIdentifier());
++  // writeAbiTags(T); // TODO(abitags)
+   Out << 'E';
+ }
+ 
+@@ -3722,6 +4021,74 @@
+   Substitutions[Ptr] = SeqID++;
+ }
+ 
++std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
++  llvm::raw_null_ostream NullOutStream;
++  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
++
++  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
++    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
++  } else {
++    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
++  }
++
++  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
++  std::set<StringRef> ReturnTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
++
++    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
++    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
++    TrackReturnTypeTags.mangleType(Proto->getReturnType());
++    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
++
++    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: ReturnTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
++  std::set<StringRef> VariableTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackVariableType(*this, NullOutStream);
++
++    TrackVariableType.mangleType(VD->getType());
++
++    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: VariableTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
+ //
+ 
+ /// \brief Mangles the name of the declaration D and emits that name to the
+@@ -3824,6 +4191,7 @@
+   //  <special-name> ::= GV <object name>       # Guard variable for one-time
+   //                                            # initialization
+   CXXNameMangler Mangler(*this, Out);
++  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
+   Mangler.getStream() << "_ZGV";
+   Mangler.mangleName(D);
+ }
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -3948,6 +3948,58 @@
+       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
+ }
+ 
++static void handleAbiTagAttr(Sema &S, Decl *D,
++                             const AttributeList &Attr) {
++  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
++    return;
++
++  SmallVector<std::string, 4> Tags;
++
++  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
++    StringRef Tag;
++
++    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
++      return;
++
++    Tags.push_back(Tag);
++  }
++  // store tags sorted and without duplicates
++  std::sort(Tags.begin(), Tags.end());
++  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
++
++  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
++    if (!NS->isInline()) {
++      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
++      return;
++    }
++  }
++
++  const auto *CD = D->getCanonicalDecl();
++  if (CD != D) {
++    // redeclarations must not add new abi tags, or abi tags in the first place
++    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
++    if (nullptr == OldAbiTagAttr) {
++      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
++      S.Diag(CD->getLocation(), diag::note_previous_definition);
++      return;
++    }
++    for (const auto& NewTag: Tags) {
++      if (std::find(OldAbiTagAttr->tags_begin(),
++                    OldAbiTagAttr->tags_end(),
++                    NewTag) == OldAbiTagAttr->tags_end()) {
++        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
++        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
++        return;
++      }
++    }
++    return;
++  }
++
++  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
++                                          Tags.data(), Tags.size(),
++                                          Attr.getAttributeSpellingListIndex()));
++}
++
+ static void handleARMInterruptAttr(Sema &S, Decl *D,
+                                    const AttributeList &Attr) {
+   // Check the attribute arguments.
+@@ -4707,6 +4759,9 @@
+   case AttributeList::AT_Thread:
+     handleDeclspecThreadAttr(S, D, Attr);
+     break;
++  case AttributeList::AT_AbiTag:
++    handleAbiTagAttr(S, D, Attr);
++    break;
+ 
+   // Thread safety attributes:
+   case AttributeList::AT_AssertExclusiveLock:
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -79,6 +79,7 @@
+     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
+     .Case("Expr *", "ReadExpr(F)")
+     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
++    .Case("std::string", "ReadString(Record, Idx)")
+     .Default("Record[Idx++]");
+ }
+ 
+@@ -92,6 +93,7 @@
+     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
+     .Case("IdentifierInfo *", 
+           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
++    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
+     .Default("Record.push_back(" + std::string(name) + ");\n");
+ }
+ 
+@@ -986,6 +988,16 @@
+     }
+   };
+ 
++  class VariadicStringArgument : public VariadicArgument {
++  public:
++    VariadicStringArgument(const Record &Arg, StringRef Attr)
++      : VariadicArgument(Arg, Attr, "std::string")
++    {}
++    void writeValueImpl(raw_ostream &OS) const override {
++      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
++    }
++  };
++
+   class TypeArgument : public SimpleArgument {
+   public:
+     TypeArgument(const Record &Arg, StringRef Attr)
+@@ -1047,6 +1059,8 @@
+     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
+   else if (ArgName == "VariadicUnsignedArgument")
+     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
++  else if (ArgName == "VariadicStringArgument")
++    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
+   else if (ArgName == "VariadicEnumArgument")
+     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
+   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
new file mode 100644
index 0000000..d865e30
--- /dev/null
+++ b/root-arm.patch
@@ -0,0 +1,81 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
+@@ -19,7 +19,7 @@
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+ elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
+-  message(STATUS "Found a 64bit system")
++  message(STATUS "Found a 64bit ARM system")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+@@ -42,6 +42,18 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES arm)
++  message(STATUS "Found a 32bit ARM system")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxarm)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxarm)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
+@@ -52,6 +52,8 @@
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
+@@ -47,6 +47,8 @@
+     set(AFTER_CC "${AFTER_CC} -m64")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
+@@ -52,6 +52,10 @@
+     set(FREETYPE_CFLAGS "-m64 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+     set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
++    set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
+@@ -17,6 +17,8 @@
+ 
+ if(ROOT_ARCHITECTURE MATCHES linuxarm64)
+   set(ROOT_CLING_TARGET "AArch64")
++elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++  set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
new file mode 100644
index 0000000..776e79a
--- /dev/null
+++ b/root-avoid-gui-crash.patch
@@ -0,0 +1,59 @@
+diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
+--- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
+@@ -30,7 +30,7 @@
+ shape, size, angle.</h2></center>
+ The picture below shows this interface.
+ End_Html
+-Begin_Macro(GUI)
++~~~
+ {
+    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
+    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
+@@ -41,7 +41,8 @@
+    r->SetWindowSize(700,500);
+    return r->GetMainFrame();
+ }
+-End_Macro */
++~~~
++*/
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
+@@ -72,7 +72,7 @@
+ <br><br>
+ A simple macro to use a TGTable with a TGSimpleTableInterface:
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    Int_t i = 0, j = 0;
+    UInt_t nrows = 6, ncolumns = 5;
+@@ -111,13 +111,13 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ Begin_Html
+ 
+ It is also possible to visualise data from a tree. A simple macro
+ showing the use of a TTreeTableInterface follows.
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    // Open a root file.
+    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
+@@ -153,7 +153,7 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ */
+ 
+ // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
new file mode 100644
index 0000000..5cbff77
--- /dev/null
+++ b/root-avoid-std-bind-lambda.patch
@@ -0,0 +1,42 @@
+diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
+--- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
+@@ -33,6 +33,9 @@
+    // Total amount of numbers
+    const UInt_t nNumbers = 20000000U;
+ 
++   // We split the work in equal parts
++   const auto workSize = nNumbers / nWorkers;
++
+    // A simple function to fill ntuples randomly
+ 
+    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
+@@ -57,7 +60,7 @@
+    // We now go MP! ------------------------------------------------------------
+ 
+    // We define our work item
+-   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
++   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
+@@ -74,18 +77,10 @@
+    {
+       TimerRAII t("Parallel execution");
+ 
+-      // We split the work in equal parts
+-      const auto workSize = nNumbers / nWorkers;
+-
+-      // The work item requires two arguments, the map infrastructure offer
+-      // an interface to use only one. A standard solution is to use std::bind
+-      using namespace std::placeholders;
+-      auto workItemOneArg = std::bind(workItem, _1, workSize);
+-
+       // Fill the pool with work
+       std::forward_list<UInt_t> workerIDs(nWorkers);
+       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
+-      workers.Map(workItemOneArg, workerIDs);
++      workers.Map(workItem, workerIDs);
+    }
+ 
+    return 0;
diff --git a/root-banner.png b/root-banner.png
deleted file mode 100644
index ee1fef09549d205ce8bf71b3829fc8cbf83723e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132555
zcmV(pK=8kbP)<h;3K|Lk000e1NJLTq00UA0005Q<0ssI2Th%Ua00009a7bBm001r{
z001r{0eGc9b^rhhPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z00H{;Nkl<Zc-rj!S*#^ldLD{>|5__z&u7S!nJ0(Jq2{Wt>gsu7lg(}p8c2$wV1be?
z*w%~T2Ltw-AN=YU`N6OO+X4*e;sV08WXZ6vbagG=D^g^OL$k>qtGl|o#;nSDI^#Zj
zh=?`(eu(K`vG>WUZVDDIz{5f_^W-^u$BtOTzrOz)=(XSYU*WI5{_5+mzW(a#KfxCP
z{4sx2o$POZ@O{tx|BuTeTD?$!D0t`cV`e1%bmL;Od5L||y-pB=kDPOi_EngJ_e2B+
z5$S#c1~V(IhTCI~Ka^tS(&C*j{(<@qU%U0i(X~s#70ECKP%QG`JV442DFTDED&~1{
zl7ZlzXZHQxc9M(|Gk^jI-+lyDehgask(oIJHd=km`>RNS$OV@I=h*4s!rE76PSVtB
zvWsO;X%2HYc+CzzPyX<<EBQE&2O+5CQShEZp}<fYKF7ujIVJ37fC8z$eXRYGNqyWw
z$gIp@o?bY7^c`&mU<TmfH_dR8^c{z0ARIjU(+~<G)4YVE^kVVO*zH^Dm#=0>op}4x
z`AJW;x70lKGF^D~ucrOay$Jl(*MF8T^H&4wuO{AKef`zff1<CCJ?gSqKRfZx{%5)@
zA_No*9&9g%=QN?e^E8-YGm2{$B4Q4Q&e;%jT{|)}hz1*@;2i^6tNzA_>o;MR<spcO
zJkfx|q}ZgZTbHh7b_!5FTbBQ-wBo?pXq_4k3}CQ1+}Pa&k)35wluzeHv6m$0$fs$q
zA2^gBz!w|}20~d{LbsojnG>T2<NnEfK_6L+ky6T7I}ag*B0nx>XNH@@B(Z^+x_2&w
z&`%Pd=;CBHR3?xyb}ytypdr}({Evq~<BRMq@)HUk#T=|r%uVmCM-O0zQ2`1nuwJ{~
zt$kez+zY<f+jYeu$dq?RLu;4-Uq2w#?_F5VZxIDi1p6f>BR(=*a8+E>ka-NA*}SRz
zxHrV(n{@8lf9e(Zf6xo~Uu`}ALofRXV5<LEu4lY5E?39slfM)FD-q(eF|A*vqaWfY
z&W!qBs*C5J{d%cdiq`xbPJN*#Pt}i}$l~5ovx&r?Ji0Cdxc!XL5At7PiFx9Et(Vg^
zcQv}cpXnOPt(L)SpWx|_g{awT#ZSt+R}X^I##lTOKgKZrnV#(G)yt<N{`E=kbNbWy
zSig1J4}Ij=uE$sR*8S!8Fap?Q^WL4G`u|+ZUT{Hab?${?xSbBqkhj4t!M?LhC?GH&
zT5FlBnvcQEfx~!bbGS8fwkVg!5CZD*Y86>T00x9@gnK?*2=LVTF;e6T=W+`MDTNUH
z(kZP;DR}h8<4M2oRp$B&q#H)5av`RIy<>2I4m9tnMFL$tbOswT#1xp-DMb;1Kulzu
z%d+Cw*(DUGqck<<z!cD6!-><z>$dnKR>sUuP86_}_B=DuK-&*ham@{0QGWW-fZyqZ
zmV-A+VRR-iQ!ygDp!qG6ZhM`==ip$IO)B>5A~AZM(-tiDi(Xg^C(j)`{1amg00lL(
zMXD1`DlnI2-)Qpea{eLE;)sUrk-4~GAE#l)WQgFwJyNfXHr|*|7v3dG0r2m9TR-zz
zTJs6TN{-HQ{ZXsj6Bo~wpZ!bjI#1je<wmpqCqL#6czW6J<b8R~vf1qG%_{$dmpE-F
zI%S_~KQC5Fh~^FD-5?^=(EiHPBm#41H~P71`qh#1Gd$U~Kc{zJ_~QDx+O`ksU76$$
zMt`Y)@RT`E_2?(U6V9I0d2M>qL2msikIM6TdCAnhPI}_25!zoPc?YO_aqa(a->3S+
z>R;n)C5msb{9!)zc~`eiR5sDTC0U)H{$W=xrt`iO4HD{%0r>~w`ts?Nal`Suth<J2
zfH9Z|6b~?Ye^x(<TuPoeQrhaU8O*e1$jKpta-h~5O!xIEdIerBVdVp&b-x~61D$^9
zr_4%P`QQ`{uINv+=7vWvPit;1=(PJvv~mF-J+tb$Sv_k%oIb*I?>`Bw{WJeY@E}Sq
ze1gwhbI{5c;POFhs{d0;lTuUXX5M>dLli>Q6YP)sqn&ZmOG0365~Z}#T4~M9L@JsP
zO})(E9;lyA-aMa9`n+04Gbj*|A{F@Pn5{RPHk@NW@L^!X(D|Olh|QS2$tYzQ$J$}w
z)Wqu%t5MKH#-_)%#g@aCr86#!Y%ve%Fwq08Q=@xE_q6V7Gtg#ev{vlE%!NOpzIAS9
z`o{DUl|m_A!X=4<f>-QxusT>B3KLX-VuIF8U@%oXVyeS&NG>o92>xR|q$e%y3}z&K
zHa$v)&TMnAU`ODfdfG1(!YT7&-Kc~j1X~<s&X&)HKn1&=GO04<e$33IQ>9G4d`P65
z-&Y7$^#}e~)l=Mo4XK@^ckFG>p?pC-*<n}EU}NoS*j@3M*8PjvJ36mHYd+HYUHVD)
zJf5dSr>#XKcG1&!dHE-P(k!GW@6=6YOs76eT6q_WKMsAI#o&}>iaM`Mb=kJA{9V1U
zc#&Lb64b}#=68v@ACT%By?&ovsrhJaeM+mv2CW@A;<=l0AQDl%7FF0$d(q6)OmOl3
zWhq<!29;P1i!GJ_=IXCaA;AD~bwOeR5HYi;p*hB}+P9^+tY`7rnV1+1qO!u~_=wQZ
zJ>ti@GHN-V62#T&P4z!93v7zIz>CD6x`&PCvZ&q@<Y;56?m|@qfw+F-1_`U-7cjUg
zaI0sqihe~WA*vyO=7LsFA=PCx<BVAxbUOG?U1;)Z#lrx_`&t)!C9x^iFV2K+`N{1d
zl-EFFKP94a*p+vJ<*BGsw22SGVm)o}>-J99_mI)v>T0l2d~fASQH_VHeyyGht+~DJ
z;OC}7W;raW87dr~Vo^VL?jCu$dbssKm8a4Q&=3Qo9$=6-o;<wP?@&J}ae37?xo*+t
zmE$rZkf0g1OuhYk`tI9*Nl^Od=_e7vS%8vDuh96c%V(;Y_C(DDR0IN!oy`bJYt6(y
zr2W3>CH={OgVjkw+Q{=D5mS=NMg#!w9D~6`8neBVbMEqmYdd%6Q?2S>wDm+zKm!;>
z>MXy`-e0-))YxCJ^I$zwSz&pd`OyPVqIK$&PT@6k+fOD6iw*BID1gE6fQGv68N>+s
zV5ppC6R1$+6_OBAt5a(fB_UA>^~NcC1~G$t<~Xy9K<7+SC>Pp|0D0;yap?D4<`NEx
zRXPwWMd1+c0hwpIYb&isx7#Up8cgOL2q7IS%rQJ~mycEOV7AGoDIPKON4%g|!-Jg-
zhu0T0Tpqn;k}(JddTN)cGKv&~0alb~GYUReI+fsdp@y=`Bv8RTAf-T|UNOS0pQum$
z8rtokGfrD%sGg^F2cn%w%$=iY^NWmiczX?_RQpqd@X95!UJ4?ti0d_z;$LZgnxd{t
z{F>DT^SZ9ZDo)ltq03cE?#lHPsBQwcEr!*a57Zqq-EFa3TetVF-n8r6Nn&5GKR~rc
zaTi#Wx2L)*^?J?}y-)q_)mt=ZSG7;a1p^ZZ5hJ8pX{oNAIBK!7tPScWSNom%7v;Nj
zH{9w*n0CC@Pmbj|gX6M8Ksg*AYpETAb+y;rr1JPsovkExR_%hkrsdoGe_1%z4=;NB
z+<dp5Co8o)H+PZRt+2Wl64Qp-3q$=8h@<geKlHY>T77<MFkoWhXx=stI9de6-^<%0
zitngIYc8S&nz<>j;{GO!1&TXZ7sstmS;wy&E_vNiNh}N0&Vcy6<V<L<su~XrM0ZTC
zZq4K^4;YB2q%0%223Wa-8@R5VD83kuDwt+n0Er=8mOk}R<G3m!Q8HB(CCB(^yKr!G
zDkz5{cj}&cR&jIksV4%9Pshzjtq%av!{C*5U;G%a><VHUb2|Wt+v=ORb99W>$m$}g
zQ+qS5>7g`*dUJ2v6@Ud~T|O{R9Pp97ol`2jpPTeVAa)ka=Bd|cwBw5Wl;$@R=-9dp
zUK6noI!Vmf3^s<<3^zT}hLkRc7c)~dhTEs6lcZ^lGQql~hcij4*n=q)l$=qV_^=2V
zgU|XfpWmJA`v3C(4B$?dUHsqwqwV_-UB4gQgu-*+po2+zfMO{2<tU}mp%_REr`Yb0
zQM4>vv2((Ph=M*!)KZ59LxbU69!RMW$StiaEU9|=&}2De98xkIgA@!<ZWB@<RiwT;
zb-)n+kkoZa1ymd#D^6=Fc9|REY{dZx6mn%o%nsiAK$iN(Em)iGI&(@pkx46F4$`4b
zCJaxkYDA(P+ssz$LE7K(ZXtvn%)mlzj>0k5{a*qs!e){z*p*iu!20n`Tzyq6pu}QI
zx1}AxOf5!2&H1if35l6W?$fgJqxLY`?)^-%_=^A+ahPlt(&+VL_=;DWxp4=H*LFh7
z)v^mR#Ml?N&``aB#&vMLXHisKG@m`XruDrAmOIPpv5+DNK0Z6MJVb-yEu+5rYX59@
zj2K*#r~zcb-MrcgNw(VW>Mgw8L83Exjfd2w0gIBLeX`BYE3Uj9Jm^ed0vjS?xo1l-
zjOCiXI-}~{zu6My4uLLA!xWDl`Lf+=gPUd&N1sGihD6b=q!`rbK%>;my9RC*U{m?x
zB+x+O29lFN6pQj-R#Z({!;<+%omYzx$4<AAOPq40w_DaUQSB}2*G?af(N6VsBbb}I
zmRFJX4kLxcaHZ~}1g*osn*&F;SKI|td8KX9InPu;9#)0{Q3s;xbl}^M(xTV(`AM`s
zNzTt^KG!$8ok-LmmmC$Tw5BDxGT_BHl+%ynV@7mg<wWNO*rpg4gv7j~#)K%0+tM~(
z@ay%XdVi8|bhC)G=hAX_=`dKT&OoeLh>rU8n$@fh&2nF_TK&g&(%V1bpBJ(FnMlMj
zb<6=|o_bA<c3?BN@~i+TA_k7E&Dm>^_kk2fJL7ba*t{T0C{bFQ5CSS4Xxs9ZO_fd?
zmq_Uz{K796g&Cw|HB#1RgV|A`$Lu)C(0{B^s6(#t$A9tvq}#W7JXsZ0IOpNLbIv4*
z=?zGM19PZnmIfh|VvNxNw4x+X=HMx4&9nY&nX)kn=GyN2;2b4Xk_(%fuK^-Yg5Nd9
za)`I^`Y;3#nR;MqfSKP8$&011gBTp3SgG#upatx?vyjlr3?hJ?3Mbm^7WqS^(_jXL
zRwf)ETfpbgCMp~|sA2V;gco-vTc2GHFJ!Y1wCb0WY;N;$QkB#p6utiLV0h*D;QJ=o
zY$m^_^f0|VULK&84|8C;nD!sr%m!{$K61&A=-2J+AdWi!#GTTrS)w^U49l(s$K9hf
zm5u1RkzB{biX?%+_ITS+(c*G&l`Rvqt6LbbQ%%Z3t69yO&fLm@fFn>$6bLN#4UX4R
zj=`z81ypZhZM|EqMeP<s0s*Z{nW&xF?kF5#rEMQnEW;E5-9$0e8&_6URS?0e6}(V$
zow#kw)xes#u;$dxqOIE0Bcccv4ZNn0MWlCM_+o?%trF~-P8O|}+0@<nnr=14wHU>n
z=nnNOnzYnqL{T%m1mSGur$irCP@srbKF&&`pVpKPb+xdrc~7TvD+DEMJ+q<QU@2+>
zw}mgQ(9viuTTexwg<>)s#og*oZ6w>})ZFb3sermnG8T`fLqcE>t>S{TN`X6tf<r_r
zJMh}?tg>D>{&3udpGtC1%SGfTbI)iEA+s6+&Bsuy#2SiNdZ*}4<X@}XsKhNm=Xl+v
zS&HuZ>IO-t5%oINDX+}UZt=Pf$fNGy>rj}eLNC#roe1%hZQqb!m&#`5=;6=D*!x+(
z-`>6uh{#-eRgKQVW(D9+p_~Qg6I&=!0LD8T{mr2^;6OS_l`%w$KZe4EI$uy(Z;6ra
z9c@4pc06{1+F);ee~$+z=+Dv1RO*v+z~tTcFMRKZ7k=*#Mrof$6Cxs|qyI|!TR`xh
zebA{PRqmIh5(0ZrD4U3ZSQ%{#i<834y;?dwW4(YKJ8vw8oL)72LI`Wdk0SESny9ao
ztowW~Rf&Of-TBA`@f_v_;!uqp1y*c=Ar7RpQic(#@n03o&0nbdXQKAF!j_Z)4T8@I
z(3(^)Wz*xNM=s+|l|d`5UIHkgkS+45W3Q;%#T|!{Nkuj5j2U}3cWy>xYO;k&c{z6b
z!ZoIvK?$j2XRCeb+;yHGtKrrPwS+oLWkliQwRCH0NwDHYsDZv{g)SSd$<#fHlBfc?
z^NXFmxGiGVmVDg>M-V92?~)vSfbQ;0E8O^~lOdmDeexH}m#nka5D`h@N-<5GP>-@z
z0Ymk&w3ZXdw5H_foc3wu?#bWn);}c4-AvSF?zK;o))pJGQPbTkc|~i`F6Pj?&wsJ~
zXO8&#?SSa$3F`lAMkjR!_i9PUBygkpgv_G-y=L@NS8zk!vZ*s}I;6=ihcW_Dx&<N0
znn_NHW*$aQs>775^$py)jQV$(nsW(Z&GTqxCXqk^DK03vCV^7Rwjz>zy!iCfDGfOu
ze_~f|!A_!Xv$(B&R_MJfYU{d)B%+es7X3WY`XW!(;=Cd?X~#W*;$p5wyhuP<(Z^gb
zJBSVvos$63It)?hx2QW-)-^m=XXDDMT4DOsKEh^5(>e`CyGhoo7<CxUUD;A+7*n_I
zUoG^h9Xv#<bBScBNYw3LiN{2()Tf<3?R6%{dy|{5ho4Kj@sX0nwSOQY_Ld0x;wRPk
z9J?H#wNM`b4Vu~_C^gs^jdv#6kk*PwsWkohCCvo#l=T-hRDCnz-NFolQk0(1<cJbW
zi6sIBO~EL(cH_ne<6C#e=P&SZ$n2}LCyD=6s??E?((FBZ)+SX6sRUpj0)ydg2t^3a
z86xj};cQR{0m@S1sJ9?Z6ei$=c_WYkGD7HXEsj|e4V32g{y+_fOJ@@wR*qpBJO^o*
zr@_l=)#JX^iwEHkvc>&TdPPC8<i*Ouc;&zPOA&%nn)Q%_Rf+<PVy89O^pTF7Nhx?0
z9Mrnqt~sswg&AF5W=G&qzHZ<UfT2n2OA034$QE~9ai~<<s5%NYBKV2ht8mfsJ`fS;
zevz9JqC32wBz-<}u`N?1N4(QyklRXB9acmivF*kfGIbh7O-;j8X$WHUL9}Y3)nHv^
z)}r$9B22V`2+)e~Q7%dxbK_SP7|{WkSJrL$>k{-M+3}#J1|eD_EQ$7}wI~gBJH~6l
z8Wsz^tXM>)Nb<Lsh`M~vE^5JI>k*HeD6XZbQ-e{wr>{{zb~G^Ev$;U~K%{qH_)`3U
zC@OJ8AzfV<$-7z0L1>L&gh+@zo4to+Z<fRcO!2s+h)ER}Lot>|?VE@VSv0Syu3M_^
zX!FQOHa#02C4smDQg)kqvH~Cp&&die0+y@Gh;%*e2_R-d)xSvP)pk(Hw&`29kBPc?
zSoACP<cJW&wvSAmvD+?B5so8BwG`Fm&C;S|$x5nzEJUD^B~LAhRLo&H`Kf)DEY5wz
zBnJj!sFK>-)+za^t8Xo@q*+lFHG>)ir3ej&Lspz}z^!26l9Isk`8I=<R=!)$OOn!%
zdWzNMzqkPIzG%ZAkSJ^i{v}DitmlKIIdD`C#={uRk&Zg2ug?A<*Als-%jsA(dkM=~
zKbztB(a(YN{k%U+@D^Zm`868vz~uzE+Nq^moCVITa|5$+VOwhuDN;lxA*Jzie=(3N
z>T{MZ!Z3_-lad<Ed2j$z)DJ<4t5M1i27Wm34MmjXK_y<!1GF(@6u?SX7a4r;ne)yu
zduF!QhQQTO2SI}sh+!-SCtwH7P(9ckPac@*vQ1ozU{xMMUs0-5scR^h`{QvjUzqh!
zsV6Yhc_0B8YyzJgT)$^8j<QGJhv!l6MQ}l<cjQm;1yBe}tp==mA><%MM4B7{q_j3E
z4JHU4#S&_rSxxx{N*kY9N}bQk<<=u4WX4I~3*Y7tmbN&Ss|J%|qQ0ML1QzF51{T2;
zq25rQdYK;Iq|M#P_@blsYo~t4_k@~FtJ~7;oWqH_rUQgdt<cngU0hynrY%+hQE|#e
zZpD&<J60;vWkOUMVzG>y0kpC{vur`EY5UN+QzkcCCpVu(7G6y~D4qh5gb_&)vE_%Q
zm7+wJLv4jo@43XQ`*>8SQMZ>8;W9)q3MjcV)K<Ep)hUk<68>xt05KR$+_^1vc?pzd
zpQKjBpIm|#a=T{k>YrCS#I&OP6r-M~(?$fM6HnDguMdCB(eB+o`!&ubG00A_e3DwC
zy0{oI8?izKlNKiwyH`Xt7o@8RQ#3<4g2+iJRW2PwL`o49R9SV1b8cCeK#{8dTrzN)
zA8Bs1iccA>YGchrYO$Z@j0vW0i?^*mTG{|QxFWzrN&z6~>R?W!lv1Qr^;e~-xo747
zQy{3$Y8WjxE7fSc232#dewG}aS6ck6A+lBY2vv8QSScb!N~`*sp-3rR=PeK_Se3e1
zysVp})_A>Y*Gnx?)mm2NlMxS*h@gmKq=OW#v;~_nfaYfiM5=n+<@Z&6{mpcSqIC@<
z672_B!Zs^%G@%6NuM*8P@LgvSiqLL|K^ZM+^=s<+;rQc0eIMak@$pMQmxGjf>eD5k
zkB9=W7V2XkOfM-$MvoHBP$p4YQ<D6ptY;lT17|$#__>-X$LH_&hhCu&4V_g6$9g$c
zr^`Sbpc9?+5>mwMT;Y7iE-#1z>EJ_CGE!(zi1^ULge1pcMtY$JXLZ<yr$9tl5_G%X
zF_6}WrMXsyx##@)he!#+L#QG2RiMynJhk6jY)<toGgC}@pJA0SygJ3i>oh0Hs=_s!
zp249YA`fH8Yw|6Xsy9aPa7&P0Ll7hYtW>HuURca-H^);38`4IpnuF$h{oQPF$A^qa
z*8rzq>J7vB&>e+Z?Gb>X)<pE6$Wo;M@ctb=Ig8D6VtzzUA4GD8rIn^;tg5596D&46
zw8!z*!eYhNgx6Hm6jL;~R(Q4BRi_Wt9xo-mxJ7-$*|gbGTY*a4MOufst!zVRD>mvZ
zGpo(3a=Brl8I3xXh#SD7WNhiuBzP<oZ|EE~Pl;m!5XbP?N`2pDdQpW#aSLQbEu^+v
z*i_@ZzWi9>{>Q~}yqrX!7)ipAiH2T`eX^_=sl9W&mPoWBwd3x=r@cOw^!$jH6|tMd
zyHnijm##Hblh|7oL##ZB-3K95({!2x5VxJwi21&DVXE<QilBFn4mIt3rWy?^ktgob
zYHDu1P<MA2T&k}0r3`}^%$30`l}@C@aXGa{NVMX%*|iB`sWxayx1{R&Tq#vnB2{Tc
zq*R$Q)%uNa;1HO>A#ezx5lL`FekVa$Cc>(+y<Hu|ppO*R%?eujaI{CdvK&=)38>1)
z+n%a@d40?waNz2zoHNYrDZf4yGp{Q%+TusW?fJMh5Gh;h1&G$@LC}?>$0SfWcyvP&
z=gP+@bd3#K&j1Owm%=_?*GfW-vZ7Tn#~z4swP*z=!rNE=h_}OR?oM}Rr*#X+6GR)U
z($9$RzyZPOv(Kv04)rE%v+~Xbz)M@+y5`eq!drtxbBS7$GRy%X{5;iO^ZCy@9x@O8
z;DEN(HjU65lWlZ+D<6EFJ&oj_w|5v?B}xPAy${ZN7nUc7-sQvbxe&BTRgx-KxWJrh
z(@WB2k^A7+_{u4jsU;V)-UpxU4-Ue)1KvsfErl5oQEBwN@P49nLMnhqKv*pKRHI1-
z5+E&uL)b3q{6(BOQ4g}6^j8vd&WD*NVvvGrJfLaqxQ~3207~EvjoGm(0egjDIZ@<V
zksJq1&VzvEF|@{7KhfYYzX7VkOcYTb+|m~VGqUV!ZHFCCUYH)eA?1DwUbF99UctPn
zlijqx?~0_{)CObNf|4FbP)MU(Y4-p=O%MiNVcmA5b@3ue%_Kz^f9q6#6p1Hlz>?9P
zkJmg3(ex7D6hav&ch6c&MzOCBQ8$O6-AT)ml^ZjL_Oq<&Ue{W;g1eN?)fSBSK1nrO
zeHldY0xQh>#9fWYDq+2|U%RVxL~nv**m~Y_yo_~MuvXbiou!34_oOvMp*T~45c`ca
zE4jfbD=e?v@5o_9h$uR#0UuwZ$1AL@mEWSSVVP_t#p@&F!;o5-Q)L43MnupxTECqr
zPDEJf5D*!kb&hPj`u@$+C(>GJrL<C1S4ebv0LUo@1;ij`&kSaiHA@H_0;|RnKv*yE
zI#;Ney&%hjcE)gbqg73FPbqD*Qc4+3m!E#>?8S4ve(%igPTKD^uQH#`X48}T@ofLW
z-s1<4y<-==ckI0n%*-JK0-?;LiV)v5x1qH`I3=s1wYez^W~G!SQd()F&R;x#_Tt&e
z)?{OAW3)ML26mAbhmQ}6EI)X-fB(a~<u>X)`w*ND96~6I1eOsfv?~6o!AxZ|DXnx_
z1+V&~)B2DOtTAZeHQyJ<nojk@Ksf-M_rV7WEK*B|(OL3pw@ji)dD3hJ-8)RQ#to7f
z>vx9Lia0%fsP6uhR~DI$`w(NDGuP=gAJ+UlAvgr5&%da5uEBfuMY91|=5EdByh@Yw
z%rK)6pc7-5nfd1`_}Z2t^LF5~KAmB7TPYXpxdAJ(oQZ9E&Gl2)@t}K)0Mb1}ia4<M
zp;+Y1TrB2!w$F^kTn&cXHrGkdB&o55^C9H6VCJ>X>KsD0b7Z$?{_XdAdmCGWvAfnk
zo*(ii@t!GRKT>oY+*y+VN(U9_iHkZ7$^MAdE~(wzy*oFzXmDALdWkv{!o0-!1A!4d
z!33>Nfef%(D}<$jCuP`s0G@S#){Q%K`Mk#G0AP6pove8>Y<nslkFFdYy_F;*fK#Ox
zF7NB4uai)>dehzxvun^k06N%%^r?P0PD0)Qex7-xbWbVAAtlX#d;k09+9z@G1?jfJ
z(SdgT3g21f;wRo^uF38uccy3TbrP2d-8HCFBd!M?g=0svMz92EIO0!&pX98$Qv7x7
zZs-Z?-rA8NE3lQSgSwN8I`@L&@C)KoFlXu3#_OP;=GHJuNG7t}5ryDtHB3N!3Y2aQ
z@?1nKYkuq$+^oZ$n@nrBQNT3Y0<R{;2o$TfU26r~r{$Nm8weUdL3FYoSQzTIh8Fcf
zf}~KrHH{Xgk8#aQ-1=ZP9*0~-4>fi-D+NsJb$jYG6jpa6{BvVXxKO=wTRV1KOez~+
zBJ5t?{iWadTGI&?3`kx*)ChA%>h1zekM7)O=EFw^Cr2lbA3X9tun*QF1n)fuW)5M+
zKY69Pt||#BG$=EuS~f^?s};&7sWw^-$HSLD^U}2!pWeN4v7wx=9$%ZJ(jqS&-+6HB
zy_@g6{<bZgb>6!2LIW!>6o=aUzd3QS^tG#>Kx5{~1UZz-3q+_(Qf-WS`7<wHf9dH9
zS1+ag9(9Ea)z`HbuGfeuKfd$u&igmtef{nEY*AS6ocBI>?}K!6sfUhmX()x1>ebJG
z;-$}iLMx?+NJ)@+#o1VVjJ1la)rTGfvE1Q%mgxrn-9P(pvfLGg<=R#56uYg+FpD_8
znesDM)2nusu1@ycwLE8GAkh4O0aa@6_({;%M>KHPM)a*aRsq3tS@UgQ<sy@p*=_F<
zv30ti_RfqQ1rMDh35U?MQ}}1na1c0WVnt_tIO{cYa*W|2DFzb-l=gaoL{&|(lf5*7
zl24#|xFrgyH7NvVy~}MLf>YKmisC-0iwfl3!O8JSnrf|fRXQ?h;&NM9TT%N~?ma0r
z+&i~$oWJ^}``+K4+?^(e`=dVW^P^%?@ST8M!J;580%_z9xuQ|Exvl?F;3fQBrg7T8
zvUv~=?*B*au7ttUs~sYzyk@Nc#g#WbBU(M<eLR6XFv-Qj=hcDD_xgGv?tTCm<Fi1C
z`I&BwOG<@hA3o`wVLvYmJI58Hqjrl83{KOX!XC7(Zm=h_&|90~ksO4U!$6sy(hYvh
zCL!q*)^(4M#`3y-vn?+Wr6$C7^CV|rwRuNCgW$?=JF%nnhs6?9Z^&X_mmYzQ%RaZG
zlIu5?ugDTTX{>$_eZK}&8pk@4qE80XdXS_3AhCrZcb#4!4c@viO|_+0rt`wFk7c>i
z-BTdlaVd(3Xf3a}-Jz=Ovs)<DD|LOV>xb8|5bIXBk!^ouBwdbz_M>*P7sQ<sLynuW
zuW>9CyDhcbY{!+bszT$^t^QXQ1FdOiaf~%lV}46D#h`j4mOeENOd;zzj^K`lWhe$E
zvpi1_w{7y)BZnG;w8$fog-cu0F>cMZ<KB!cO-bAlqQ;9;7;1BE#Ysw$CQ@|i`sG%g
zhZV*YR?4Pz>+Hqr7n`kuQI#w=-~Qlm@2D!OTnOHI7I&|?Uk&11_W8tz=PnLfU7S)(
zN+(L4Ik)|}uYd8mPrlGpuF^N)G<wcpIJok{^{1Y{_W5so`JErU`Q~@uI60mdg|p5%
z7ebJhi*4+SXdQCwS{KKn5EDazNhxE@Xfk;1%b$AXi?8+iJ*C8b#*_1t_`<b|yH_uM
z_Um7|`P27*^rzq3e|(f%YYVcDL+}I@m}`*&xGsoDfk0ZTt(~pQ*DqH!{YrnGPdx^&
zSe)`{f9&eFWQ84=Hzp%s>3t}{%4P})+_z;!)J^j?Fou{rF+IY;y#|1}Lwo4>-c#)!
z+s^#n<6G(NH~6Cxf={D%tz(a@+`;M<7;LMW&t{#c?Knc(*gD-y`@37gyFf}S&2d*(
zmP#K{0us1Dav=?-@FS-S+MGgX@IWZ3SRn+Oc(-lLJ%;Jp6m#UmNVTgd*RxP1M(L8l
zk=rb|!r1(*)-&rK7t4K8m%uLpKOrgz7mDH<PI~>(UeYU)fltX;7xH2a;Kv9?r{hQ4
zCyNXA%Hw>o-(QS+CvJ3PPHeHb>S@M&$9NY`$nR(_LZN8%5ojm%$^C@QGl6&%o~B@X
z{Y$4kcuQV^Oik8ZEtet#Qf3wATK9v`P%>J<wUKhY0&}P^zw8()={P}npA9yy_to-b
z|9eTg39u$wxI9t1Hiiq@jD{P}XAi%r&7`?##r`mPYUqy*7mamu!F(a@9XY#a^Hf!P
zNto{I$xZ{n$nCx3hgVlCjMzb4Ouwqyp;aqhIZ#>#M?~dd?&RmhbT<|iq^!rdGpp-!
zc)gZDh8Btaxen{AXA8+Puh|z##uC*IxMhLHwed4a)709)pvt?6C1b5+AUB<$rjy&$
z6g70lP32VH(sF6!7SH0?ZMHrRH+66G45_|lmB(tW1#K!sVrjNl`)SuYL#`eU)%UOZ
zd;MXVWS!RN;+mQ^ju@lJqk|iF>?UKNgY*&;=(XSaU&kiR%}DDku@z}EI_5{%U)+Rh
z?2cD9zqYb(gQ#NBQsg8a{}$@fQ*_7cvrlw-h;x&h!d~VtNasX3^iS)sa)+`f9I87O
zL#>&5?FCsqaix?=)F4eq!`_*5+gD$>{_JZn4kzP=@83O>HL;N^yWE;qQI!+V_io&J
z>-%rse)m>hxWYQ;eDHzm+@>ybq>k6@sCQU63WK4P(wfGT(J%guUwZDf7s|?}R4SA|
z@#up)$B*_FC$oe5k4tWxNs`IV*5u6g#b>XMw>RaeW#%F)-u>a5-~Z$9FBf@kowLq!
z;82}lqC4EIEAp?6s;C6lNs%I>lrj1Xzw*Ubzw}yv(5qB1)t%+(qy7E652go4CwqrQ
zRs=8sTf66mlhL`Wm(D(QQQmuI1P(WUdgD94|7X+bJj-oiUGSl*PoqRNCQ?dMYV<Gs
z`d2>lwa;r^6A8u1njy`{yQLd}I?k`n1I7B#Da4*mCApLT?LYY!dxs~}>2kR&Lf}vp
zbtI-k2QKXr3FXmEx-M}G4Ybb8&1zmReex(?CB~u1(v!XZ2S3F6K(|wq-k<QD_5Z{`
zDD?Rk_0|=3S*L=u%r5Hf2Hj8lyPLsVkj~W4<Ihs<MgbHELvNlX7rZ(Nn|q`j1=AkV
zr(0n;etLN0{6_B&1COHRio1MU8N9_{og~`m5FE2{#a3~08|2BHx5dM3ai53@7eEE@
z7@PtV&}9zAWIN+9&a<b|M0uYly$^{%6qq|HsH_y+$*wzpd%1h3e}8u{+YUBYissw2
z+-90nxNF$+PQO1=i4DcaxG|p1voN0paz#Vtg5jQ^%we!%WmrGaqldwPbkFPaMR7o+
z8Ay~(Dd(<_C4n?%j|Aq|>?VPfvFW9QliMyoP|5)C9M1PQ6Qx4S2gAwHPnPprO7)th
zU$eWIzp2@?poS)--dawNoJ~kosP?m;Q|F&<t2q*;zFgN3Bq}@>m2I5A5mk-cbi*L0
zE{jm8Hq5E6D(aVMf-Wgy*tI)&+*{}b$44Pkgg8J{0{vo9mYa3kyKeHT>a-G;-PO*A
zZE`A_ToaNJS#_P>v?Johr;FNDDqfa0{1wAHTH@rL>>N9~a3aSs7Th&6XrW7r+B7Z5
zNaCtkz`d(Ev`r6H@c7y{k9g|TiC(SWLd+00o$4PVQleANv|Ya_ikEmLIYs7*$?Q`!
zeQ1_UtnLtLr3Nd^ZElm^5Q%L`QXINLzRj?u2rg*hPp&Ec4QPOl?J>t%rWTMwORDH(
z!_?I?*9lkENDpkS&+=mb@xgpLyZ7z~zwq0?wt04YRSLk22k*YOckABaqy57AMhvli
z@m#N$j<>hYUA;8g-Vn`IW{_gO^8EG7&t7}~^`CzKkG?mZ&hpIW&UqIUBXn!KrY>&I
zY4X{EK#HNXGDbiD$>+ZIx4zLI^vZ%yDFVS;_u$<R?*8=s`FxpMTNKW_;DRr4lfAuT
zZEnBwgP&|{Z#@6mS1&wswXVUaKj^*s<xfBL+_k^>@Bif9?FWmjC~{}vIdCI2kTUf)
zCrligxzuQYl_F#Gg{OAE{<nW+XZNg9R8l9)7kPa1&aEH6Jv}<f3u~<_oDZ(LorlK@
zt?2z9zdIQBpZVlVS6+TLNz>AQlvqFgiRUgqd*!>o_pNt-@?Mq|S>|l;!39=`pvc<s
zf*J{PQ*45rv-6|r^wD0C+u6ZU$!ct-l~(l0U-@dS)omBsgWGo>eR$j2;GFj%l+Vee
z>Ez62k|vwGXUAKcBwSWXdgq{*q{e7f8r}v9<w`9=9IFD2R$^CpMcgAD09w6L#QLqJ
z@XQ^P`Wmb%^6}w)efuYf9OKt>fM`vD8)xjTMli@f2d~aOug_fNB42%RFHfT`n0}g`
z+wk6LGKE$gJmF{lA|iIIQ_Vfc7rZ~=$srj>iqX`3wN`-o{d{9Q^|_7&n&_k!w{1=)
z*2WN}jKcYWx7IEW5OPu=t&9Bqd^saBL>l}E%)k%;Z~}gvh&Vh&<a)hFFi6Sze8c%(
zueZ-2t(MH1xk}~?p3LMfKe#q@$>Pc_x{bkXI~X@SW`LI4;0q29jV+cw^<^N(DaAS3
z>dM_=^9rB>FF#U^O`t$*$txzqir2A_2?Wv{a-~j8vSHnc25DGc6?`)TzQp_}o3b*J
zfX4QuHz1{YA-J;aQ=n<F*y-2U9tV?bB+16yXG--O9*0xuL2~s%{;s87vnM;|tLbp=
zPXe<lZ4a_J7da)pwo4KviBhw+H%2SmoN2jM7;q$TZ0ba&7H5*mvKj<wf_bPbd}xl9
zEOQ&FP1WI6K^n`nWF8o(yYWGK4RYKh;;tIKn*&Kiae9O((3(xCjpwcI3`wGE3m?^8
zDi&^D)c$J|`$@t(n5A8q2xsEhXQIQgV=2lIc3~1XVJWNV1Tu?nR*mhp>rLEYqLBb8
z(Pq7L_`b5>i*nj3-bE)0m`t2}6{oDT6s>UEz?7tOYC7&st<&NKQpe0u+nJ)CBkHkF
ztu9qaygR~_PDM@)9@h1ZM=N-b5~U+eFn9$6YjO3sdD~(yl2AZV{A}X|BklF7w+|c?
z-~-?}gY%(ekG=JsAAjL*{F0`w)l#us+<o)ili6}MTV{oGE|iCxqv>2LrHxL$^ZLft
z=5wEY<-#*p>po_6kWs|Xf94bCp1SxK|Nc+z+`NY+S$OLmF*q=baUz%QRy$t9>jaQi
zX=;Au@BHfXpL$U%rOS$s0MN<){`-Ia`q9DhVwo?pBFn6`&bi>ZEc-|)(u$HqpUkuU
z$A5hO()riE_QlDWt)?j2K6mEV|0jRz`+xXnKmG2TGb$*z);bR+QV5}4^#sA9^+Mo^
zNK8s4#=QE4PyEtveWNV+N-z?jV!6EWo!1}VeK=nhi)EH&F1Oa(;JmL&NJZt%?9G?Q
zN8f$_hd=$)H@<xS>ZOXRsL>zvf8n>jarwEc-}<-zk#tU(E#QOmL@IEo8VCdi6e>br
zV?bLhmiOO!@80_#E^}*hS2*WAdmlJ3m-aV`(nP=Vb=DdZ?`7s<ksaKBJez0B+&SyG
zPEb-rMw8KIvORhBGq3DEbETF4GnFbEC<O(C>ew75&q)!V2*DItfK+!UYJM9DP@5v6
ziS$@pvo3)3@}z&~r^Q+oUMzcxr8({4X^mnd{;g_VDCV?zNuRkMiVPe`q-m8<UuZiJ
zY=*tw*@<^fDTUNHYkwZ~27wEhtwcW!JN0IX!IaVrK~>JjQQ7B+lKPBL?+n};RYloP
z%t2|GbONLSNw9~-?0yIYcp^tCwfQ1n&Ov2sGE`ihTJixNGQwhhys<e9YCrAuRHCi2
z+8*V_1*7NAZfZR@$w>&kD*HB=kY>H<m>=xSo_atxD0N$G>~IPq*z-x+^K^4MTZ}d)
zTh6=F6*W}x@c5YAPdNQWgu{>Hz*CMRPs~74SAH>ZlUen_AQ}d>1#eSh6%vGeeL^cd
z#%H~A<d%{1q8ahxcB<0CjKHpJ&Mkw@e9_ZMdA#=_SGsSKNk`j}>v5(=3Fi&q$Kbx!
z8#+03)fo5p-qshNXSva|Il7Tbt`%)Gun>!m7s+-)i^B0r_`JlDnmQz+^h%*bY^}t!
z;<_nNKfwio3=Wp?U=-(8Uv}-F)fxbBi|8~Cwb3dRHPj?6FTyBW)k@t87o}ZC4=obL
z8;ngB0NmkhwRa}&l0r1KTdK3jy=<F_HHO$cSQd{YYOV<8jZhm?M2?jI!}T@Pq~oT~
zR56Zfetv@qw<UjD$v3c|zVO1AsT+(2Vb+Rvb&V)Uwdqf58`R=MR2!y62fF&?BNG;C
z@36YD-x}mn*EF(W{E7a)urF=>Xe*B#qNe}YYNlHuH3=4DZ7atzrhr9`Ry}oE2}XNO
zvG0()OVs)3rPPyv5a5};XBRvNo*$pQ^5stp50vU<vg7I9cRxIyE{~>*lap+b<;$#C
zW;V;*vam%~<hftW77uRTIlTXH_vtHIw^X~b$JieYu0DVL{(CpQb>4>%5CWI*n2744
z=<&4PLrM{m){~9lZ~aey`}&Jd8?B61T30I7$2V@i^{ww69Zio<7Soe#dXmkT#Ud;6
z!smr83SW};Y~ii5xplVi^V#Cjhj%v4Y>hT2tsfoH#p_o_li~i|`+=$K@gjKPHNBFa
zT^U3x0vn}MW4`vAU;DzZd`W9%wAQBVvC{nD@Xc@j+1`V_<CDel$?{~joXzuPR%Dqi
zoXZPW*iec~iric43+uAnKDco!F?##LIpMB{&9mDVu3g%@eLpzQ95`^OvGc~QPaAdZ
zxhog1T`b={JDI)pAHVhB&V%XkVtTTi&a#tvF<)ehMX|_=MP`?oEehv@fB8$FQo^gR
z{F?3^+`oB$da{^Km-9t7TNaC~SY|fQ>>{(v+|Fl<hd1xIJU@5k64lPhH{W=BzR0tz
za8-|2+KK|JmU|LXXgmN&3|;C(z|`)NEzl<&=P7cra&9zz6sC{k^FDR_oWx8g8K+2H
zzrjwhl%zd-Bt5lt1v-IuHAlMyJ`{tzPzkULy|WW2=D=yMmxtguDE#bTpC=@&pCOy)
zqx~>BA~0C3C%BUF%Z)SY{+VI_j`NyC)KP0)$pAxXDAOao2}+#HeD=_0SqPyr?^MPX
zi#$Ih(h*y=o2CFTYm;g{(BAbFd7=>5m}8}a&CfZvrF5qClIw<#_d}KB>WD&GWap;z
zP#K-F;&h3vK|kBZf!67Kkd!u2r>CNb;=(~~L5+a$u?uMg;@UCVKn+0#lz<Xe1LHnS
z+$|LjmAl^$H;uhZY<+S8q|2WHC7_hJmF{?@l$}$YFvRS7{d4o|Fu)U0U<_2MNcC#V
zYq0ALE)>Oq&G(u<FM+KZGU*NbsL}J55dTP<Jy$e)w(*v>FSTB?QMyBG@GD$oJI=n1
z0x%Y!32V`M|0M~XMUn3jU{Bn-wKrXecK-kZK>fev+9H=Y4%b2Bjz=VzSkz`BKw3~y
z%u^QQI|`kojxS4WE7vYZBmyHCvAt{UfhR9VhG$Uw8&bm5Bzm^K!mS>dIvl5N2wiIu
zEFvgc*L@PcZ{ljBlD6?&jGmNCNUq_)%Ia^m>5R6Iv~o+M+ZkoO%Wy6*^zI8^YRt_f
zs)ooqZ=K$NTa(yMz$yz~w{$^lEMlp%Kv2gihd5R<Q^bI3Eh5G4!?N&1lu$x4v!P;A
zis(0zpOR_<r8KBTC*mM(gw=WmCK2zzh|~1i<6fw5eF)5q04SxNe(~wSXwYo@CA5;w
zm$%=(aWq{{XUpZX$O>Cn?`$ZXv(^>X6@@FTFRWio7kjtvU4G$dZFDE`NE?0e+T}ZM
z-v}XiAKC`v>b6s_Dy73Qfwk7-jp6V7!@sk8W!Gp`Qr1c~->o11<bxmo^!Q|Pc)XaN
zENAmP%ZtL+<z@Ls0X_sDg7@rPa6VY;^TIy-;P%G$#$;zxx)g8k?riOBJ-T&|nSEep
zNl}i90BOLalui@#tN){4efe{r&{b7h70(BE?)~&nzH@XuJDx6%rrF6nTP|%;IO~G*
zzVtdN|MSc~1n+}&-Z}4_-@pGb6!!epORaCVqTyt8>H3w2H}5*@U3nill=EB>X(D6v
z%b$6<Y%v4$?w@^U|KZ``@$zUopU$%RqF81{mfNDRdEtt}7KL}-gYeofd{!vC>$30B
z{=J)bk59@g&-20;h0U$Y3s<(P^TJu{r+bIzuUr_6E290w8@G;+=Zj@gILD#!IBcO?
z**j{6W*bpSQ6>quWfrek2DV;g?dgFc7*3z;4R5~AYa#-vljI%A`63{LSaMK7aS&s@
z==y>NTk7m{sQvlMo_Bff^&!~O$QoeBX53SK10YHJo~Q^Orx*x7vE~C(R+pW3ZoJ2X
zCHdq@#Iz)F%Z-ikVlpuI^Fm}WwiA$vpc73hD6<vV6pK49pV`b48l!G)i$%6Pq$bdr
z)^|{eh&kB&#H4-lS&yxyL?wnjfw?!lM>@|ISClH0&WIEP-Vc?^bYGjpk=>q$Ue=#)
zK_f8Si5nC;7(3r^!+C00n$WBXnykcv{1|EieI1;w1N>CyKZXG`K?g;w28r8C^Y3Z@
zz_`2G-8JrBTD)!CEo1Mb_J(nfl)I<=zVau!xUKEo`oEiOcA(3CH|b;m7}yNTfK>gT
zp)g1PLS7t&5GG0gY=6>IMp_;P_Sy_waU3|O8rut`2W~p{2c5F72;q^<8-|YF+QsH>
zTj#}D-D1b0w(9C;@{oueCz(TqC?8$qD{wTTIsy@DJwsSbUXD0j)E;4DmIcHD($;yx
zCs_dNB=P_Rki#NXlVgwj<_8*CnW!yAerS|Q7DY>~oIHqS{wBA;3r7V<4O2;|ZA}&f
zTD#r&EXwhTR8+u?3BI(+UWrVh)yPYVa?K)X14+<{Aw2q}mpjEtnzi}0B#;x4-hJWA
z=;WtT=f2VkhnfI_l1G-tH@lVF#F1(pPauk;-6b$a93ATERQLAk?kJ8j(z=PG>m(4g
zN~!N=7SkGPLJK_5nm}e5uM?Ms5pvrR@e{~s_1vq^jW;K?M56kqe7?B#_6H}kY`!dt
z!r8zf1YcGvfxTzvgLR=4?Pkk-adiCD3s1*c9{{K~=!d*Ge0*R_ZAajS2!hoFnex^t
zD5cWW{Po}c>zA%y)=HILgC(Eu;LhC}KYa6Ox;#2wOlR3*QRIblF1S#FU?|Dap|*ty
z3{;mLoDU)RN4M@>xO#Co8BvSv(#FnKnkM`AAB7O=R}#*GaiIWGTC3Ek&;H_PKlRnm
z)R$KRZIm5P-}$p293Gw=O_$S?#cZDExvfglzyt)Lizk4~zH10RR3+f?{$ZLXXD*#<
zLq3Rl!~Xe8=kC3Cv#M-EBcKN<N)z+imtUJ~ZIGh<+jnoh`TkLf)XuWSvdFFX);Z7K
zd&gWF7Xr{mf94lI+g!OU`|jVoKbvRsWl=a^)|x&r2k$*wAH4U@d*{RQ_~iO4&zI9^
z@6P>${i7_i&iW7}rz7^a?^?^FyJJW<t<Ew>oi;=pG>s^=1LLCyJl&&c%6ICyj(J!&
z@fvI9V9XXOnPlmRcAlmch>bu2uw}8s%+@8NL2_nDnzT-h(Yf~y4b(@dln3ggalRgK
z(Q(3)0}Ph%`XjEJwazxYn(phO2qbd`+Y~U<OGxz@gJQX7=Lg<;4piEq161OC+48WA
zdifZ<LluHAIj*B#y0i)mooZ(GE;Tw=Is@xGyQq_yQN?m`)tEU{rYTJp!~D{eGjEnd
zHcW1|5saS_k5O#+!91zlz}JY&B$U&ma0qoCY63WrM#XwnM24_bRB|LrR^?Q=KO*-5
z{0Az$?cEJs+#b98Dje#tNO{&*Q|7>wP=)_#qEx|Ze^2{E<@dGUH-2A*1LY62y{+ws
z+TPUmrdCJh_%G=AQ5ak#zo3v)$Q4-iF3j`kSkrbo_O;QGAo7Q#x4oR-@@_$7Y6v9c
zdYo|H_b0OQ>nW`W`!+9y9XS6q=0`Nz?)JJ?(jw!z2x@TDbpbV^gp`R3HI*$2E0VFj
z9r-YI*pMQDv1>;v<G(xE=~z=3NQi?-5YZ4tsYm&=SXpGyqL|HrUopj|A);G|s5wBL
z6qGnu1gk-$-E?FLQ;IrbH8*ITwv6J0)YWjEZs@T{3B$U;$ZoN;YEw_5ROdKbI6jJz
zWVRVv5y{oUXKq=Qv6&7_e{V=|vXS6cjqQ$iD@D?5!7+>|eB5|rG=_4q%8umEaKvd4
z{DNpWvXJn^#(J%?Tsi~^{dO#O<k&T*;$$|I(vHoc6gUZ$bLT~Ts7nBbjG?QI*T5l!
z5GZiq+CT$}z>3KS?@ReE;e&T>y>R#8xu-5r>(xMt7>b_%+$%TUe7BUNy1)oQ*ltAb
zQq9rC82wAX@k`fUcv`6v=c`JR<@Ds;Z~tIA%Z{gulUX*;a$C3%xDl2!w+j(71!f`y
zfI?aOSq>pE{^Z~M;jjOXe`~ZcE)7<cB0#<HxmS)4j^6&!JApYY*&>vN|6R2~l}V?b
z|Ktl_`t`5qiqBU;k<PkzzWx2f!|CyKc|2V%vOF)m_r8%ucSS9=oH>Blc@E400r=h@
zeP?55^TN|tn)bd@*txX(g<t*hpa1^10y75=jyU*kFfjAox89#Gi`gQZFS9JS*7;CD
zyIhBpQ288!=Tn4>l{l9Jys!B^%mH8yAPS)z_Uhiv2S<+&x6hwZpunKYPlg)bqd4oK
z9quuIqH8ZI?CH5{-jBxTPmrD?B{0&1J9#?jpXOMzhUypnnNHDp@TwfZS+)BK^f%%1
z^|!Hny3U!&KyURpc%39#Yv)73UbJ^Ta1NLOGoard&9qLAre>Mt=XO{VERZsGEhiZ7
zp}&Av9rHCw>8-2f0C*S7(l17o1h9>k+~7<vQE4v}iOUb{GDFQ1t*5arig}S8l{g>M
z$1yx)t&<|3DjtXN1O#V;AvURYg%2UoI)i2dy_{bgjy@Pq-exvn6_i)G(U1F!bNhO~
z*XwN$ddp>)vmTH4Fh3jSyZPurPk9Q4pLiJxVNT&5>kUHcea<`&Ar0OnDZ{=sJNXfj
zNfMJJ8W<xm=>>pL43$1)gN45gw#(wta=AP@o{z`RojWro%3K&J6k26W6Nj@}d8vC$
z{egmQj9u6n-a1e2rg{7S2$Mi*02Hjz8y7DBJq(}m_JBi<`ffL>2p@8jjGa3Xbg|$m
zo$Jk^JCdOe1Z?P}ue1j%kbnQX$>kR-$W>@lg&v9`GdylR4k87U4DsRyj1V?&wIX0$
zZcS&?u8SEKGK^YFQol<R$XUtusbdZkDLHC_m-y9)+1_Dcv;vNnF)tGsq|&5e?X9>U
zwk|D*eL>MEcS$<ZRUo>w0B&4O;;@d0mkfxOSS%?+8_e6PM636tDCt48JG(B+EW43{
zXV^L@wl->lQ{4<GDO|2i`y^Gd`pNbUqsN3Q=!*obLQEtgjhkyEZZmotlbaHyuAS+c
z1}jIM>9!<gZZ?>R!%3~Sqo&7`<O*;c&RQDXba4T0FOee-Qp0qtA2<sk4_GR7gm(_Q
zA{_xZ)v6nj>&Gn!$Q<|ATgMS<!#^VbLBS4PSw)EhH#|lm4hsx;<^W>P*7+<emdos|
z@4p#BlP%WL&IaS*`Ag^fy(BSO>&oRwu=}d~TCRf3NGo;ixvQ^y;gedoHDCGO?|%Dx
zCyV@ex;&ZZ^DMVEl;Vic0LoNbI<*G?0;s&M;5oNpv9$Yp$KU<^KWn<qRjQj(pZWTi
zE?hi2?59bhwTdV#tze6w6-_pWU;A5M*Ja>Ijg~QR=Z&`xA0JImvgv%e$co(h;6tUJ
z<7SezqV-C~#S{Vp;Dax$&6ajH%f9{J|8bG!p}JQUY4ZB3FFf~&=f=Z++DnX9M5+p`
ztDjjmU+h2JTP*WzS>(C1-uuuTPil`%W~Ok8s<ngKaC_~{fm;I^=R;v#mb)8ozE=U3
zEaYybNUGj$V#D-C9#Pw6l89Z5e^kumHVm{C+!J%9F>I{6s#>vs<NK>w(X>vzds<4+
z+L+oXr`daqcaZeq?b@2JC>!z4CmX}w*$pssk}9P+xWe0-0oas%V_*Zg3IxCcfl2j`
zPfkAh(#_xfEtTh#Gg8Jy8&XX6F<8Lss6kU5yxZK=`lEX$mxjT%Nhg}Xjj))&@T5{w
z!(g*w`PeQO<xrM2pDpG^cGLo?Ka1526CGv<Wy+Z4;DR!W8O(}Vr|EvL_h>PDHuyeK
z9eSa8cz7<QNpWrFPEH2B;nFEmAjaST^S;Y27Cs3SM3ia#o(g1C57^}V$HeoK+4~3k
z-}Z%5^l)qY?d5zg_g5}F<Ii6EaO1+Q(e69mJUw%Nv%fLyZ;VdtZzh8)lXKZUeCfoz
zdhYp~*FN+9i(kI+i@&ksH$J!Lzv#!~Z1ntr`r57e%kND;a}cf{hG&lP$$fX_AUtz|
zt211#|GT>6vnu3z_ZfBZ8CC45Vqe<>1gDDo!+ZZS+5Zn5GMEuHlGZi^jmH}=cR)bH
z*)+MhFq=x)0Tmp!OmZRZ7q#yrPj>kJ+buj-Zdp`qJ*_l>WskL0#8)$pyCiXuK-*f`
z#bgWuI;5r6lY(XaQ=tkZ7`zQY*OUSxhr7*lr^e>3cF(6+J=+@ckxUigwvc3o6nBX7
zNGKm->)oavtre}3$3|3F7sSG>uFE;BN~GBTgT&^|6cg4s?tivmP{l#7%oQuDd{s<R
zop(u%(xI$C1l-eb$(SSks%VQedG8H{jJZP?sKK?i%4K=r?2@_bnvJ1Yh%?Y6kWjY)
z-8d7LpNL7gYp&~jvfxc}Cm4@bIoc3Wx!gKe6E%BRGlJVr6H!}fw#wRyf(o>yVI4vs
zC`@&2EoqriQVh3OQ=b5uu4!X-*QkEWC)lRex0Ho)G`99PHIB{Hd;~t##WoH>r0DQa
zYm!1>4uPEwdExHdxWgetp&WG=_2Sb{_0l9s41tttc_&<hI?dGAibfm5U;gcHG?Lhc
za(Hn2-qHT?Y@W>)S(fM41|I^|AX9Ds+!|s-RL14=35*beb8fk`AHH|%@x6z2;m2iB
zmG;t4{nF<r<NlzRBqdXin=V9k9i%8p^f&(Yul5JMy6USQPO(_td+)>9B0HHc7fYKL
zuEO~m8vw~EVT$CSwQw~staDlJ_V;J+{qU`(l5SKeul&Mix6e#Q{a#|UCi!&0%#Uu}
z%L|`nE-$=y0lqmKk*LX}|J3OecV=-K<TkCmTtNf*z}C4B-uj@tjoyVa4MI_CbHt)i
zAY9`~cwDw8ziM+rD=%&Mcr6LMCW%wSU};QBnE*-;?jUkQ>cVv$3lLf{;afFlUbXrI
zh<r|yi%3U^Q&X#!ZFwNEF4-9N&TRx|b&@Ehm^llfD3MbHMhR9YjJJVfKm$4O9I%xZ
z^Mi5n*6)1%?%(~55C6_@Dk|urMS_hz^ylm~)}}s^9Q?J&4h6WU!H<9;p;v!MCQ_z%
z5lD;W+%9vXC?37(?Ka2-@H5Cyh;+6*W^a|MLSwuOM5J`};6msn>0z(`fZ51_po1Aa
zJd+Kkz0G;PuqqvbnH4C|;FyYuD|$Xy1eD-7OHWV*v&<K__us<szUk3&j?Jz6SFX=V
zJ*5-p_>H7@$t1(g@!#AU|NUO_JM8|p*5`VC7yKuJdwDQ$K3qFle6iOLoDP!Ych7A8
zFF*6if3$z_!)12Yn9DmmZ;#Iu)BKfByh6YJ%ZJuoQB)ireRD8)UZFp=yT^QO%2%d*
z<+%LcaOJ2tcYOY@A7A<1<IS%gp80j3Y$zy|-|yf4uLgJjIr$~@0I_90Gm|pI$#cv>
z7=jb=nuuPm2U}(A^47OtQkix^XstM!8l^Szk$VrsK2q%w6p5d>tPV?FanoDj#u<iX
z_lX1}jq8~!i202{MQbqJ9`dNYsHSGDN}IMl#P#V=;71L-f=XP;aiE;w6Ez?WlfVKi
z1Me0KYfT&|mN7RCxAND8LYA5p8N%whRZw*_X3a6UF;65Zg>9g)x*VZKtkT@(20%r}
zNs?*}B~hDe!7YCiTw*b`P?w3DFbYB(&RYYJwXi^lHCk;ZOQ}$!C#glN29d=eHxI1Y
z5xEl?8|z&tws>r0mTT14GMSxQS^;-m!YZ2?Vqt?=JBmbUBis^>7*S4EZIa2Yjd`=r
za#z&OEb|O&dnA&2YHBe#@h{OX+Q^DHGVdV~TisQna?5pC&0L6t<#oTU>EN@Nm<@}<
z`7oO;=O^=xtx220S<kc4#yCxl)><3oohKzC>>A;{A}ZNtU-{Hzds1f0Dry&qTW`KS
zU*xlSzQ}Bm2QK~O0#oER6wl4dd%dn-nTeDQOy13x`H#Q#!*BfEzou#tP1#62fA!Lp
zXRc;Hy-`@MQs$T{&p{#u(n?=__UhFat}9WPmh<KQ+waX6#mORHEDKv$4j#UxC3G_C
zA{~F*m4+gOz=icHw?F>Q8_#~~rT(DDx;i5$h2doM(&t{8ee*kI|2BBx-V5yAd6Z>E
zURY<n5ADH$gfkH{)&^#+G(W2&BMbUAx4{L(9IOjRdq?x**?4Q>eDKb5Kp9y=RHc<h
z$>q)Cq}aT1)$5X^6>0U}Oaj!000`?T6^e|4?|=CEYP%MvWb)D}-#IO!y1E#*#Kr|0
zY{BJgC1)PYfs>6<|LnvUR-065U2bxgLqxKwHpxCC2X258!T~@*zc^gJH$GaP0JE@<
z%Pu5I)!Wr{O4qvMYDWOz2*K)pZs*{^22lps@>VD5B_>xa9@(WQBES)J*`p+-i(-*4
zkEq$@u`ZVGiC;>a%^n|TCn_0Net@2pQO^5%ZBpJ3l(NO*sb0EA$^zt#*T=oV*7o%5
z!rtDHiB#i5a8EDKdsjf^nswCx(i*`tJKBEg`1;Ov=H330TRtR3^F+V0zmFRq%!Y&W
z=g)qn-=7otpS-biG`;lH#lo}FYN7SXY_SVK>*L%`vSM57g=h8l`%fvWJ=5{gSI_Tm
zrs>}P{#U%ZG8wsh_io+4cV{^M(zrkU)n9{2fB)TgK6rF^F`NA|L5ENf;Oy}dR{*ee
zIQJEdj(NWC)I@W}AgEONg`2&vlFfeqe9(P_99*h=SgBrraDI0DrdGqon^<w!Pp_QM
z-`DJ#wp9_r#k4;Q?!;MB;r`UIlxfVKq`h4CASB%Qm?C4O)}gmOVM?DEYImo27I7ON
z&=rPAV?U0?tK2wcl{+#?_hv=%J8d!-NkOP6h#Kfjp|PqV5jIEC@;Ne<6_)&Uu!eLs
z5hi>k%G|WTSuh-<i6gB2xNb`^bv;YbcwY(na$D0;OK@oqdeU`R#D-O|D#9j1<j*MK
z15+0{ZQ!Ob)r*vLwYg(`-ztnXPM(Bt?dgQWD~g29ZNbO2qDHnSYf!P9;uSG`K+KWI
zZ-w7X4S?L`tV;N-{$F7y$dTs?p(FThHM0$p(@1Nou|PG}A~0fV2Y9Q9;uZvN;qlhc
zyFSf`fCXx99z!aDIcBuC{pD6?%&S3-9p@@0c|>B_RjQ6_fn7lGVSYU0RU<8+KOP#R
z5<`j<E8?y~y~H<JDK#7oUirc&wTgPX0FEC#njTCS%VL=o)_TVk2v(m`B1@>IoaIPX
zRIV?90(%#1;cnfyGoQ|dfiX&+-wU6AWi;pw`bH;4DMhVN4WvmM^SNLCoK~c(ny)5j
zS$FTfn~P<>nCE%nOI1S<;4-yNHO)D!Javh0fS3_LrM7o^Jiq(?txzjN8wLH<PdvA|
zJ?{6@B&qC?16OzC-pzZ<%of($DsrwyvbnvRO~uc2+78am;Ap#s)Et8vNCJVmu;Ib2
z`yqtfI_rXG<`B5GVrb5sko=R{#GWLlgGlsq<47{8<|VG!Kh06ILEg>sWODOItGvCA
z>oTo?e;o_p)+cK|=b|XJxb^1_@D|F@;0#o<3iT<#gF^@^(dpR@R}{)5WDGNFqC5n|
zL2dDbNx_PFpZUn?TPC^i{6Bs3wg2rue)YZY_(3w>r>eL6@yzJT>8hD0VZPAUx%b?l
zH?KQi!K7nGVHbDoG6TRA7!!sf<VqK|cvNJ2M7HY-^)u#)JUZG3CCxw!j!BU+HT8_V
zEzSfsX)-N}9i?2g<n*+@H(d6eomdLZ#tIw!Hunb`>2lZlzSk=2n|VK-4bM!ORUrHR
zd;Rafer<WLcjukY9?f@kKO9d}1oQOO`GsBG@9#4E5NI;aFJ3q%HBYqFst?v$6-pJ%
zn#gIDffc}Me>ob3t&xA``lr)m%$&J=%la+Shl~8v$MfGX`X1r@pMCo?|MFk{-hAO-
zd2!h9^}w6sGdFwVMZbR)q#0^FJU`H*;nwy3_-rs+wtvkJpSH=_MY_9OJUl-5{>jO^
zx_C^Kly<fNm_2~ROv*nre5Zm2iX(q-4<0C^KoaxggZn~7)pS%y)O=D~N+RWg1WBjb
zex-E1RRgp=kZ3DqkSGpn<9H&b)x&Sg970P&TB((4hF6WQwfH5kLAr%#gQeR?g#mD+
zHIYt)%`(#Rq*z=bH87ai!W(ZlrlyD2yg|oRs-+)^l`j(8a-_APw#O{~z~XPr!V*EI
zr_1d|K66NyIF8%CjYhsU$6;Z&&;Wi-hq1nsC4SQy(+N*5LX<>bjw{pVXv8gS;;vRp
zqN;IDvtXFE)gE_5KrCEJV<+b}=tX)r3X*7xz6)EQR$oH04UZ_ex7KVk1PloYs7EdJ
zR`t=C3)U@f608Vn@2dD1jdc=B$C+;5N^JU(lLf8U7z>I<XhHU-t>0cjiG}*mFfC)Z
z9)JL?N*NuOJ>F0PK{fZJ6htVaKmC<Y^#;8<YNBm<JpS;`a%q=YkrmEakI+*78$3(&
zN#xOm&<$@UAK*L}xx4%RtrtJ@2__aAer)fad+M3Xi#I>W3g;Y!&@}H!D|PMJOBb$Q
zQtc&HSGj-tZkF3+W^?OmLuMtyt~g4bh!t@xqJ0`prSsled+Xhs*I#}%D3(QAlBO?w
z`V-S{emBppbIN-Tf&Sh9<NrJ8r%J&VAupT@p)AXUsE#<YL3vV>mxO6kYs+6#fEt2c
z2<)8uqkr?wKmYx2DMDVj;KB-Ru9{no0Xa*u07#tg1+qpRhjeg9KNuT@F+k4tv#Ax5
ztra8H2-u_3X?y@E1c3RuXX)?|hX*{G5HmXq0I7kQ(B>uB<?3$-z%!FlX3z`Pmc+|4
z6x)U1Iq*k7tz3B^2k*>XEKG`B=Z@3taCo9!^3jrt?oTMFf`WHuQztIXf&&H9+XAQF
z9TdybMTH4Fz(wGg)IpK=^K6^wE|4%5gcBwZ`as$&1|Rclwwwnt8ylCs&p{MIAPc1w
zQveWx>GdBfmFr}#%{+vpy7$PoF@PT}2K$@K${{E<iBt6M+YdGm-Q>lg-h7<Db@kTW
zPp7@3GxkUQ;Epzi4@O_zI&=5-ZQ2~Yl^AV{ZBm0I4FDKE)HOO08^aU^MSdq>)*rkS
zI7b}BLZpLVPTdXTQ}*d7xe7L{o#7*kQLi^jdm8?z2n!#so!j|89PIJ_UeMYxFNeJg
zOW(_EvUP5c$Sn>pf|l%(Wb-+bY+$yhlF5Abc0PSen~~Q2+2Y~&(SO%F^ZCW@Z!3QS
zcY=Vle||W5`e^^VCfx>wW>(J4_ShZB$6c`B(8<iZ^2+^t-%&4pRn<Kz7O83NmKe`~
z)<J?IkNOBmi?>0Jx<-QB*DM_!m1-Ry+eyC?oc4NIX}fFO5u^%-73u(fLVi~p0=By?
zQ)4gO-QZXXJ{b|uu(fBas}unWwsmrc{}j7zAPNf;K_t>9j3F8vZTZ8kvw{3=ZqLb0
zR$JY~Ycwg%Y7$w$NtWg+r>pHFQe?}`peT(PLh&q%CTR*C1(3C7cuK0TS;`Qo13uN3
zdkqd3X~<i9EpFn95$k!VWhizSRgEuKCuyS_9w{ot+W(KFGFg;d)OvaeO-56GtmT;V
zN{|e7f_m3Al4L$KqZ6*$jX;RAvH9ckbU1RnjED#nm$0oB0j&zT%DP3#03Kny3#C+Q
z)F;01Y8APwqCVuogU4BJv)p-Gv)u$lDtp=78Yq&i`RX=)<tP`tx6Z%!<9BPHJ{E?Q
zc>2{BMuT3O8e??H$10V{O6yO4>9sO?O~uI;$B*{2+*SsMz6@rU>S-CtCul38yl$LI
zOF~u%ur7S?)(1siaFp&sO3{^<pB)X;v~P?tL==KA3cpz7^F^`9@-oAhg|R{RAp4{q
zVdUpT0zB_p0}*jx=ffhm^LaL#<=N5}&bNHTR+>dZVBQtxt~eER0R%+8V(Vc%0;%~?
z|Mr_$L-X%W9ITmuD|f?MoIOXs`@8u2e;+$%X}N@V=nwcyU&i_K=%?^&!d^?L&jCzI
zZw$dqN_l4Qeem9v0-ujfjziJM#)skBpQ_;dGv$nDxQ_<;(6z+i!e|`M!=01qG1PW4
z>=O{e)a6-i8AHH1z(Ead{zATdneb)ci@+CwF94q-d=1!U%mG`c&EaEoeCf)$iz@g$
zn^t)h<<f6-wF#?IaHPN_Fi-}7G~hOeEno1INO8c2w?AY${LEK;G5^#X|Ngh{zWZe!
zC+rYHs@yhv%j4}czXo-Ae6V#U+d4}{q50hsmX0Nn%mBQ$y_1s{kB@h6E{dNJOxNVX
zt3Yo0{B-}hgMIw)IQuc62!_I;R#o<)MUSDCazvR@xmFg;#@NSq&&;Po&}`hhHts!Z
zi)DXcC%ZpbX19ELnTNXww(Nperd3KK8Krx_H@Njr^vPRDc0kJeW!m5E4KIbz=)~Dm
za-3XJ9F0B4e7V<8Ncq~8L7g0g>?GRLROD6O1a&kGLtZ)XN2YS3|H<OK#j#k6V>h#y
zHz;={5o6J+GFtmvUO^>R{Y0dF3AcuM5Xus8)KHS86Loeqis~N8Glbk)C7G=uC{t85
zL`kca%%XKbB(eSr55;(da#XpX=|Kvg4^UgKx4y^KQZINl0-1^uIe5((IAZEa@dC;I
zs@SmNLW>aj?on);TD_y9i1inZs-|+1sB-<RV)LPHf>PAli@KO%yKNFq>Kmab<}Haj
zS2AC_n@4LW9<^cHy*&o@h$CV^$H<4|V3YdC4x3tvUeMw(U1*d9g}*~)<@&6~r)-C@
z=b!3u^J&$=j6lHF*=@p_R#3iNf)OIlCDq#2MzTcDy!=eB-zy6$`RcR%gXJR23s+cQ
zb`d!WEQ#&X&^>u}%}7f)f#HLHc<(VcvMAxov~%U+WOLL{lSEeq9+ZNj@wk8G`Rj@V
z8d*Q_N4M@}xi50>e5kt`hz-(&Dj~9;l7p@4#<J1?`w$8j4j&(gORT<<G=1v1tNk=h
z5=A8)(D`KvHx|MB5XA6VY1@BP%}=Z5B@Nkt#G=N5;eD_+WVu`BHZQF6A%v2uNzEyT
zs5IN`mRwO7XVXcdrg(1;YAr@6b`*|mpeZfprJiwBqRcCa5+5mJ1_x|Ru(gd>U*%_>
zK~eC0Mz4L6e*3rSYrhPWRu+-*CklXLkPp3$K6~5txtR;^Gwa!h;6GM$1m|paw0X8q
zMKaktN|%;t3%JhcF|fY=TZ>*QV5!(!HGxK^^hl`<4!&4SU2ds`f9{d;E~jicBm(FJ
zxX9Q5E&`tft}#AKxBz?wc)q@cWfAM2Fq)QmZe3=Jc@rKOJO}SpLR#BAJMZi^sZ6f7
z91O$EyfJp07qH{04*B+u|Ant!Id^XB#)p3|gq>$L-`YCE_Wa&+FMRXb&JUC>ko44p
z2kyIX2GaVei>k;##ME1VS%FlR6lUtLoz)kv6nwu+@?--j^b>vdYI5$f8JOj0Rxg>l
z5ga*A0#tWvVA6?KDkKR%yl3v;HN75Ln-9hhKk=D^^H;xJOy1+c4%oAkYoKCE)1$xW
z-}~o!_6DmSL#4f)B;97;@<$b1u7>;RHO+-Ah8**i-aywYr@Q-8%=Qr5VV*V}x|%0p
zamON}w|n@fct7CQ9*<?Rg_yQti;s<&JGQ!zMl2HNYr&n<c^c8Vk)lmYfNcVaY@_Px
z-Y9kJK*X*cO_F3wtY=v+h)t;bF-b@myW2I|oUFQ`%25Cu32|u6d+1OwIMP&eCycU@
z-n6T1y*|~AVy^3hc9G;Z)Qkn38Iv`;H43-sKhZc-;>i%&fl$k4iAfp)M$MkcUAhTt
zp@?NiLi5^Sb1dcJB(q4H{%{kd+vvtymL^q_i#QlpM9Q>|#iDawLhMwF7`b8z)TwMj
zeACbjNW4X5_TA2<nm-W-$57>p#)4YNQdTSr8=}sqU%`O5NzmX%E7ZnDlc3d>MbPBT
zM%qtXd`V1|#nChb4k45+Fh=_lCC&#0qv`sKPfPV~Gcc!*4)Vg~)|bjyu2m9^ez_eI
z91TgV0-Q`tR8r5JW9P%;I}bUA0?PNk{LGbJFENSMno5k)kh=czGpalz#J6s?cUXp(
zxU#v*r6+TH4C|P9wwK+gF{;m7UrGoZ5IlSDAKrdYv-?=;qc2>)Jm@9H7*dLfybsR#
z!a3(0hmsB5IfGH;8?c^luyO`$><Q3{XB%-Am+p@~6wX^0tmohvR6pgea;<AXANhMS
zNj^Et?^1j6YBK4XQCtsHIGuP%_Q2_V&r{+Z;{LnB!2y4818==W2Zu0*C}23kc)&`l
z^c>(<%LxxGLwa@N-tS!h56|!qJd)=1N>9cT2ldVeAF419S|_k!5L7VMdp|nXNv^%o
zzzlc@oB=KXnvro?d(!%k+LGoABz|#{J~x<L8;=*hu=(QH<-Tn1mNwC(7q)mi%l-uP
z0cZvs19u6IkOB($DPaoyDlh^(@YjF|<1*1#h?r<bWVM=VbwuRQ=Eh?0WC}7xF}KA+
z>#}(b_8>(d@9YLqNRl~o{VPF*Vsn&c9H`&t-L#-fdjHX@vqkdZ2e0luPKx7i?~Go*
zy!-YU_b&T%o{S1NL?Ewd<lKm~o-f9C?hR-2U`}O0`ZRZE1By9)_ebWv>DYX!E~6Pp
zSZhZ|g}Z-p=@G2M-TRpIC;Y<d=~zAS?7&PW2}u$_!Mpz9t#5qzZc^C27hc$*BxM(p
zfm1pXPy60^K=tnazxp5kV^th@)l*87?v=A5zyu@-=Um10M$5`j8P9F`p{Dy>?H&zO
z)MSU&{3PnY%Z((HMdP;xHMseGVH<~f9M>fmi^C>00lN(`jwGk6wz=RK;izqRJK;JU
zWnOhd6x-G>Gu2eQHhQdDvTA^_q0&q4Sz{|Bd;qDgSxI`!$R;yWj9kVIs8$WyWZ8mR
zGFww)G?xIX)wPYEaqU1?8}SgW0llcsj+0;^cW^lBIO4~?^~8eM-4>aRhe_SzW$B>M
zKHf$vQy1y=KHk2RL39eKp8!Xw6pPy>B)43vMH+KFQ2~nl;g;^tO_Et1Oifawh$dCI
zi85<Q^lkWZBZ)$!<P|Km2qctp^u`I2g$Sd?orU5_7J($NP@)L?hHNWyM3ErbNo@;!
zVap)}A1kFg3!X#6Qf=i`BK#R;dKjRTx_tdItyr#?SMm7vy~29$+56DC3UE6s6e+Fs
zg=-gOE^u=(^P^*Hy>l*jF1OlN)ZT_vb99npbV&&@#9G!--iO1-2fJ4<G7Hq1L7?r6
z=hDO&W0bNAiWQWi%T;DtLxZjQ+Kc0<b-`M1OKnBqr~|;QKZ^`suEklk^=M5VX-z1>
z&hx>eedewKIT5yY&-Qvrl4z}!wE-ML?PJPiBrXtvi$d+SvSzH3J)}CSamN&i8G<oH
z3ShM6*xVKLp&d`PuXrseZne6tTalO_u>i2!pFlLn%VxaeKtMu@o(O@hYmLT#PE#Bm
z(Lebw0Olm2;Sd?|J8#h+o~7^p2$-zJ+8hUFJ=BYB&W2%%R0Fm|0rL>W?=rLZ3_wd)
zn?^e5NbQ8M<@5~3Qm8T%9AJT4z!<m)EP(?cv?k@WMxVl<BngA1ooyD&w3twqEoQEm
zmyxg4-m8qwXIXYkM8N9}Ob@)oI7={$*9acaz!l&f;1*%q=<P*zp6E5;HW6p}=R6O#
z#@|ZK1BP*aY$%*NYxbw)J#4YirVl764n8QYiIT(|GsuTjh<^*l(ZT);o9BOUbnxoA
z?DGc?rpxS7dbmFt{e`o=$z*28Eb^hAW5hT)=gm}8K}<|ZvU%?w?%V;06N9Rf>(=}f
zFnf0H&lj{jqkepQJbzjbCR}p+C?Q9)lRsU)l<FDly-_hCrdiLP(P|vLCm>WCj-a`p
z?g!pHZAIGoz>8;&7tc-~D6QD?;M!}my_>!1URqdkB@2|9RS)cSey@M$pDwTb!@>Dq
z&6j(&IIzi?p+6eB<1Kq%vGbI6&k2OBB$--Ug#ivG?Zj$yhAb4Q4K&nJXc;1)t?EF=
zO4Rm`b=X?NJr_ss4oAK%u_7nHa(;JOk8RqoTme{?qs{)+RFfjxswp$Ye#udEW3wP~
z)Od~nnAYGq?h{E{8R_>S(?u8}(osrAn(dn-E*7oGbz9&r;^}o-kX>e-SgxrKzG&@}
zA!+{{Be2}~qEJ_GfJm|+78$O%lC2;{?#mGV{3QFjrsWVYcU2f@ErD35lH+cs$WSSN
zP<o_5mW+_7Fp=OK*1IlI%$Tcva70rwF1bL$1Wf?OG7?wfY}`mro68iChu~Z?b1Oz~
zbFsx_k?z|Kqm$OKmZ<9^gq9@0F;!|63Tf=CnK-f~m&DU5v@=P}r@#6cDm_j}GH5W{
zJ2*L>TkE{7G^x!t#f?xzsg0eD@y3{%m{zfs=6PX#a4z@|D%E)C81+P9f?~F{z9o{?
z+MGs1;FIH7g<`S@7$HoyH~XnEMrozXaiFx`Z3@%)Q16PuId6Sn-<nlRYNRBS3N;J}
zD!Q-2eV`PCa0t_b8FM$2fQWj-;czraj}}@hr4WMb+Ea&R+sPy<iz345J|JCkYil@K
z*Lv;ihUz4Q5F$-3Q@ln;G*gNUtVxg`BC-iJhF<Nwj@<s+6;>){EOU+0Mm+tso!`?c
zUywqYwyW@9L?66QM~W^z54Y^J-OHkkiTbpBe|F{Q&e^FQ>wzyHiVdeWcAfWNG(O3s
z2m!R?!#S^W+Sr5g2wGy48aM#}oB=fOsO+4uByF(hqc8#mnveS1hYLOEFNQALQpSN7
zU{l`KJe%5LR#nj4fMg@!J;INHO~O9l0ms+|J`McXh22HoEA0DBBjD4TrYG~yGt?q`
zanO6;`ZF8D?-KWO`vqhEMPin&n1!^b^Z@WgDg;(KN&AnPHHV}=05XAlTfL3GyL<b^
zlar@sCks0N@P%LaeSQ0dA`D0c4hBkr5Hu$ldJEWXpX?jdO%!N-x=VLGEQe$0z<tL9
z6{cR-7%>Mo8-I{(TD|OZ&y4S1Ex!MV)lNTLB}0X>DQjXCbBb0N7+u<KyG_>9(4)7Z
zN5g}gy<%yc#qM>xJ@xL6LRwzCX1zh~xPSMbhm+U(!>2;9+xhz=e>CvN1r20ATO%YI
zD0ML%9M~cS0SJQ)^Zs}F+0RG8($TJ?grAu(=4=gBA_o+?=eF*>90@B(sAgLaz{b);
z?2lZpehs~9?L3rX&vs#{QyHYy47HxSATGlo6o~|n29|2%8WgS1jnr%v3yE}rZJtHU
z?2_&&EV6!uY#GAOmr2+vL?(3+ordDuatbeBIOeoIE|sr!t4d`dC9XexX^5km>=u&S
z7EA6JM>an~8!K@;X>-F+)YfFx3U6A7m{vaxb)*iBeo$KdwR=H>Dhl~TQ_PC<f{00x
z7LQzagh`^x+=3HP#l<3EqtT5@1}sY%a2!F)h)p7z0!cuW>y`~^Y1TR7322VmfS1-f
zPl$*(qFNH2R`j(*Ss^)UO+U+fr~p7KN)q$wue>(ioK!jtiXe^KZ@#-+7FlksccHA?
z<e{saehQmgn>ExIhetAw9_)D+f@jYn;vr%ZiwVdqq10H@L2WDvsQ`o!4j%492)CQT
zHQd}VsZLDg9|(}vswqr6WY6PA2hNv?we@)6AnmT@ib<;y(i-MzO^k`b9Ebwr@xwii
z!}A)bZ0qdyqesU^mz{CN<?bb|`Y4Wi>9BjjA1!?#c?53~&gJP@93{m;tM1Km+`(;5
z1T2oL(w|T6B!XHPu{yY&HG)DNLtX3`ieT32p-yRNpT7G50Ez{6uF$!wa9L-gSAYd9
zn4Q;yM4!L@D5U9xm9M0}PbmAS(Y99%FNFZL5safrS@W3=T*W{NEP!KR7uW^%fv{TQ
za7`RjiAlW4ip;R}MKK!d`Fuku1ybOCp5L;?2~ndqF{n-><s0<?2fSW#7YRMaLts;@
zV;^3cXD=|Dz~jX1?e6?@qmOSt`rqWmHD=}f*52`NJ$>;z*6ln#`UeDix%YZs9eUr>
z${U&kTiIf#H@L5qa@Lb7jG@JHym$1ei@WnsEH7XDc8?z%T{@Uzb2!iRW}gEW91N2t
zu%a~QBEw=cm_sIi+M^3AH(Z4`f20TFQSlrvUe@VG*+d|wfGj^>&<kJTKmGI3!}Dsq
zHQ+5M6?D#Q0a)@0=n1V|e&RRUS>UZ6O&)zPNp%QLZ(VR3iGTC~Ob^aF#n7o?v!UFf
zdHCO)+5Ggx&4>9tPyL)mr@eh(_z;?!)c^F4)l;7kr_BbOYsC*jl^?~Lb*hk<5J$of
zg1e!zQV&5Qbd}`cTZC$frWMP$hgF<jGJp{wVJtTBDyo%4pQWPHu?UW9M7_d3L)Kxj
zMmhS#vKvCOj}qJciFm|FBD`WMA{yngU&X?~L-=`!`X#CeNcKKju_XyPaFd1>!9|TB
zbQ60gw@#9t94p!aq0o*kwqh$5f(%AcqH<}ir#niPmg^X4d19;-s}&5d_N<~kwp*k|
zM+#x4E1Z!bxt~!o(29Y5Ea!;BaG4miTH4VH%eL*W$Fh#-G{PN9r^t$qb&;!W+>a5i
z8DTFC?M>BO38l3*srlsRU;e_cd`UO@)|T$U58uD}@b>-rvRLNMR#l$>>T3F?BD#3(
zA`#YFTZF*Q2VaI7)CP978B3E76A@~~w5bnuO7a(~)gmxF3t@0f#of7hKG8;-O0#?E
zdfS8UjJCkRIqw5kg_l5?g|@nbK#*`8sI!iv!AZmvLKBC)=3#ALIA@Gj%77FTSCx3o
ze*so>MI8~zlYk21NOTmFYF7zmt-AuzDK_9Sqncuo;ClRd&19C*TtXv{7>EwcP84W-
zN^h4=tMg(#JCvfq8JM)|)kn2IGcytCL0^&U(_HxsAPveZRrQmnT7`3moU!FY8q_>!
zi=fv|Qw9`}0((FKTm!aZfvtorl}b(G^E3|!i^1`HzbF<&3Dk}cqxt+zYtNH<8Z-ee
z0#5-1*th^zzz7%t6Tko;05^%=8xQ~eg`Iyk?7zo=^Bec}{uhP4xH<asdG@?9M`?2V
znT!8o)aTjq)zsWmdVVq+S-bh+oxk?RJOAMD_@%&CmibP<zvtXTo$PI$S6dssgT1G;
zzB8M>JsF>{A3A?F&8}Hm_{33ts0sB`cM0`pq#fI{j(ofj0)QbtR^d&c7o&Y)WA@U<
zqpQhrn({8Gq@-yw0Z_>vt9S48{k3HCS+C|yU=(22=q@b<CiO853_1R<%oGV=>lXdV
z3*()uOg0^bn?LE@y<vLF;@sfkuRohkdb6X2wvJWLr@J(NuU|a2Y7|I6q2zSTXOi@M
z+Fyps>W~NHaB!EUokC06mL$^l*0CTXN8JF`5zxn;6B5*HnDdQcEJgE=qlJZ{!*7!`
z)^ZIgPH1f{=>!{0_+C&1t3_SbsG%qq5Q^j-wPhi9*-G&;7#(!GRJ#((V3Jo7Ejbh|
zSE7U@iV+QpdX&P&Pk8uYovwn!W*2eyD7IsWWw@PhGOe*2q18mU_(n8ED02iFfJOea
z&}(q4ImOEBQ}-VuxpGVB>C||DBw`|pAwW06m*US~r|qJnK3ZpvLc&w1RX30n4^m@z
zOo}5#=gQ8+9oLoC5`E1bZ^vHTQHw>vEI#%}??mP3RRluqpsbW4tyN-@UZVP``TQ?_
z`WJumYjrwp<Y}^h`|dm6{n2!m&lY)}TUR>!QJr;5GHIql)Vextpja+_$(IX=QcPED
zTI$cEI<j7=gzxC`1Nh*<{wc?F(pnj#6p>OOMXJh`qg509Y_<rD5Fo8(#M4o0v`*3T
zK{4Tjn#%(y1U}k3T!S1C6p_)SHK{7Lv?H&o&(aiCI2236KB5>|%`%MFidM3`A|{Up
zH?6KptvoRj0(DJ@8bA#ZzeBQ5h=>C#vqs*)>^OMvnsSmlLMp6IruJsL9Q{q&yoe%;
zeuzrb76gDiQ)0}d&(@b0On^i19l(j!+=*&>T0pUyptr#A2o8a3<;S{4V%hLL25tZe
zaK3g|kwctKnlLQsjpIA{JiSR~X>${J<n66&@g`Ui{Rp@U{1$KxxCXogq`(O<2j;*c
zb~aGJ7+5j`ywqxbX5;s-U-(D6+y7!R{BAG3y)pXs#^`&;vtRh|{{L?8_*XQ2;Qh$D
z-C_E{r2mJ2+uHa*YkM+3`=d8My|klScYfjK-QC?wFU{w_Ud)o0pZ<e$+uxat?-X|A
zeWDUiOGQjHQ3z{Bs|rY$#69+XhVLE^2p-58s`Fbq*-+`26VFuCz&wCJlx)mj-g)~O
z9;AC;+Miy1koz0KFNg-B)?vj<szen`KdXVYIJ@xZtk)*6&kD-(!ot(c^)F6#{=q9(
zzy8dAaGFU0q(-Mol2>rWZIcd^DhIrK_b-s0NSAhQdtW3f!MLfq?(ogrX1%U4wxD<o
z?w$#wqb99$U|>O6lc8>1JR@EdxLYbU<(FE$ysqSlI^d6LR43vJI`7>wuXr7XOR<)!
zrH@7C7fQ4wRb+bD?M!saTZ$2>Zr@WD7i-sI#8L_=k?wY*S2xQQOri6E*L78-(?T__
z45A)RYy-#9=M?^UjZB;)XP5Xnw1_A3iv50k@NR9bWh0Gc6Cd%(B1)@m)8ymqwvJO?
z8*V4u^jP@qw8CGA7oq5-YDksZXcR)1mM;i}#6p!KDaZ|uqt-Y1$^(@mrIglM8())F
zRe9>unv~YhzIgppzx0`%^E+iB*s1yMyz$nJAHO?2Sx!%~#lq&+`!=zcs*lj1rJBy1
zKSS&4kYce6flKdU)Qb5Skmks6lZ3N0w<3)uXr@;9R6f*sRxqz4e-S3zTXpKL0^#iW
zoi3VCe=TRr5V-z$RhV1DJ*(KyEw4p*i^e30=$V66jiKATXrM58nd9vZt(Deg)kn1@
zD|cxGP3J!*|9;f2R1f$dG-Wlpui;!!hjGyT6wzSjhS?fzHu5gDMLpNj5826yeoN#}
zr~7x*``<ZLxyfK+Rk}vSQESAq)f`jN+i!X{12wq-Z=-G#10WAL1Td3P$)wNTkup#O
zW<`|w;FxvieLLOA@*O?vp)pUv>Y{%i6u_E*Qk={!LZDV9C<HtN&H~Q>2f#5(j#yxo
z7$~s!%em{Hr1{0i$9ord2f6N@JbrM(A&?5dGr$xGz@Gt2&?mqH;2B_43p;)clt#)0
zAt_BvN;s_!O-hsG(V6s)4<kkP+}6KNlSg3Z!?m~Xd~Q1b@~HoA!0>qXSsOmt>n$!{
z{8I(jGsWiC4|D%FJ%9a=zm;Fz`Tz7r>W#bqGqBs3e0XmAjpg!+4+$^kv`rWWEah%q
z-N!%}9Amk`e$$)#N$7F6t%@~xDX&vuH=~M;hFhrPz#HS~r>5zRw<pKXsdU2ZN=XQZ
zJ*BTYYl)QO)KLC&lzm)cf5C%{hFkP5q*$2a`5*q@{`lF?Uwi&<zWChJn|J>Ck9FTL
zvm#33Qf6(jnFl_bq=zoOU*x^2W8Vu8Z>Zg8>b-y?%~X_e$kgervMga5au^90&X#pA
z0H2!3Un>ftj*QqMA?*Iwm;{33&lz__Tg*%l{h4D%SfncfcN86Hv#lWai{|xN@E~gr
zPNU6i-&9!jQOuuf*S?q>*(fR)apO%SYOr*)tEC2QuC6%t3jcSCV*zT9YKo$`sAECG
zjZh(?H&Xn(Wb=8A!C)nm6qeIWEMKeoEh8<fqXIQbe<b2=o`qD*bT>?jU7v|o64ga7
zSB6>eD&D{mT3qwl8&(0!>bc<qv}Da%O44@ixognhF|BB6?%ggOcf<gaA}EvmnroIU
zS(d(t0;*jb5>-E`#He1X2fajrLdxUK(PV2f+1{9JjCZeI+<j`d^bIae?3B<Up6ngG
z|J@%S>>W*K+4N*No9D}-D51X41n<Zvrl1LFuSYR@$}M2QW!=Z6_ZtP04F8Bh$%sn_
zY8$P@66h+$B`9+&z*ytKmZS;k#-WeWetH@mGH?i0-A7V+gpR;LEH=&fkRn@jY})IX
zz6wL^T9S}X5>@4&)I%|Zh++{z`_wUw<|lSFsbj|4EQ*4!h&9y=M-M~HM;YiSh>8%#
z{%G}stxSnz4+IoX)%x9nHaey;Pz)#pMgR=eDBSAiN#fyj4j{~wq%=7XUqBL(sD0&9
zj-kf`_O=<vHn0mpb$CG(w*Z^J2BI{C5%=%IIH4S921D8147?7gRj5=K6M%qY1g#RI
zdx<Zye3pB=Hy-fGyg%!Y&bvjnxDvu6qC0>Eo(CQR1dM<l@D}jPz$M`OfC2izE5Hwd
zKJaPa29N_5P%Q)t2AjZ!z|0B3pPBp~Fb95Zx;QiL{};o-d(Lkb#kSFz(aW26zkdDl
zk2c4T=ZoFli?8ST@~r;xc!2jGer7cMKr6Ox^8W2#ac+C}%=-iSE(qucb{;w~Gb!o+
z4PuNBFq?S2q4Zp{{yE{d_Guf}KR)Mv_&xW`j(*{#;?_5v+f36lfGeLxAZlDYe(tib
zB1jLnu{=?*i)43P+#@}`w!Lxk{ri9Z!T$3vUbF_Dy(03=KGs7dP$udsw&UE3iS6J0
zbN$+{iH#%v4VHEf)OB=-jMEwhnB0~mfjAPG)^=r(D$i)vF;-r`^S*IOKym#cS#apK
z-FSVZS0sHPLKNE(N%2-3?Rg~@ggAcLI<1Uojj*zjL9k?1wu((i$|BLK>X@WbmAHFz
z+AUSOldKS~xpUv5guI4yC?hPQCAWK@IihV-tsQQ;cpNoT2tcbvBH$D&30B=igH~SN
zKy)kpqt;ljGeoeeCv5LRR|L8e4Ilwrnb%8L!*_~e4%&B#<p2Ue{lD@ZF*2`<QBZ=3
zPb)3qcx#JV^DB@5t(5SJum%PO1H;XYPyOmwi^3;^{$M;<F(*eOzi6hmFYM8SNB7_P
z;Na20BC{v+Y`)0n^E|W8S|36{t5^V<C}<*(s)4PDBHQkap|Ks{?n1Bz#irJ?u%&iz
z6jz6ifBb1{a#hrpFy~r(HHdaBS4Kg63Vlo-D?4oiT0{RUarMwSphi3yBGOcKpHXfO
z>lk-kO;JoqeIm85dy>ammyqbgD$!%^9Jg3#T4)tsl}SB_B_z@7W8EF@HjZdjw85zI
zxePjeZ}Drqww+B-I@l#CL(*uV#A2K7qb7Eil!C5?oZ}FxRSex#h*zkW2H5mr#%Vzm
zgrGLQ&f40M0g&!o=pK*&7r>;Fg-H`v6xqzOQ%a9KADgKy&Q2e{|4f2EvTmNHr3uJg
z;8oxVumA%)z-8brP_p6-a0b{0o&nASw}Gz#cYz-fIYo<_V6KB7)fcFo-vUx#`~2ol
zbNh}98>zXMCP(ARayGxffv#RZc<1eBKfLwn+2SvH>Ep9!9^HBT8K{HAxWV8N2R-bM
zl(M~auJdtU`(=KpI8mH{f)8Fb5It!XR8lC6!TU@BoKRff{On~PJFPc2_$&7AboStn
z$M)HD@C+l1Pen0tX6;_~alVof@+H`76vTl*4oEh8NfvH==T>jr^VUD}TQA-D_N~SK
zBGnXt@?clM7vfD*(i+4-9>P<-!NR+YYyG#}&LWus$NL(`qm(*FzBW#x!<1sISrce2
zoua!p3Gcd<T5#Q(#IbS&o!p+T3);F15TILSnS)bk$g5$Rj4ow`R<@qjmQDx-SB~No
z$7+dXflg)Lta|LOQ61BIKT^bn5Y|fA1o|75)Y3R5dQvP^!-(zm%f5M=EL**kSxcf>
zQ7QAv-HM;XszJpX`E19wFkXPA$rwdq8G%~Hi*)-G*UfW^MFr6}rCz7bs9EVBcgTxW
zi-n^?w!&vQE@w_7sWVnzdKK}YhWlbR&+P<e4$=T6N<Ic5Shtv-OdlT{J=#CG|2Qvv
zUf4xeESGkX<#}E@82iA|VhLSKjTi%^6*z=fjj`6mbfK$tZ|?y|&MwVKMG@m8m^oD(
zheF3cX%!h`Zo7`%qb)bkd`GY@mS8mf&knm&MdVD5iYQTuD-oYVk=}jHBVIi-oT})F
z6FXLF770?*+Lg5<3PPOZ*i24AC7193tt*k@T+ok&s>DylF&msx#IOIR3forzhRc*P
zO6k&jf-4s{5P@CjogI<ZTsw6H=Awl9*3lZfm1O`8*$>e_p)_k8Th=4-?fCEoz(l$_
zMN<ke_<=GPb?Uua<g+ZeEu{i5VqDqc9~Ej*U_R9MHqTF{Q{#OCdH{R^cpGql1HJ@u
z;2!{6009|bfUg7J0)7Yp_%ZM_Q39MC&b~sFGLV|bgXC7ssY-y`^Sof*1~iZm!`Zt@
zvhl*x|N8jg{JAq9p3G9_p=Eq{@7H?C0XSV|XNY`WY+k+iAFUfLmlw5OkTVVit56b6
zat^xjAPT_;uVE(E%#xtAhXYhKX~7IiKq+|n@l){tVic70Qa-z#f0b0iZMpS?@x`lL
zjZ+?8Tf&pl813-%KD3I;ja2p06kx5?2X8&#%nlNLXLd3)$yUGbIbv)8C|WTYS2u^T
zPJPL1nB%SU1+N^Z<KiarcR$4wy*;h*IuiamUb+b4<~2(bN0G8jBHnEE#1@<5(aQb{
zDI4ba%)R=DD6}l<6RvKrt=ZgaX|b~W#%+nlTkn+gR%zq6cD<^JTr4)b)y01;bx<z6
zh?^a8_G+{slW-mBe$3`Z)sDwvzc%Q!iYOw+F;>P+Y&_H<A4K~>hcc+-_gTW5qEXcW
zf?96in);t=MJh=`V*Hb;VML03O$qxOLU-;)qfGMq2&#QYQO<NoNvn`f!$puGb=*j-
zPTS~8WXmp=%h_V%+?fX6YuSfHU_5x|y$3h$ESAM=k!P7*<~Gl5UbwvQ)>-e_d2S8I
zr9o5dq!-nCv=(=I!eM%aE~lvV(xi2zEk_1aAFphnRd(>{g%Tn~DaoV|>Hyab`GLEn
z0<4QrI&A{4zAp<7EUnx*{&<^UYj^&H`hy$A1yfwfQ47yW5S_c!c65*EgjGbhV;NTa
z-25!tdHdy<l?2N^c0u5S^TBDQiL@q_m)GQj9u3G)wUGl1w&7<1egfz$E05mtiMBf3
zyLT2ynWx}mz>rD+D6LKM$k{<YGr=vD3cz_F1I>^<T@;1>#1GORJ(He&g--qmH~@YX
zSO5p2Y1<RjW(E@AL*NFm2`Hj>n2$i=VEUUOyhQl1=kf8$=dPUpzXAh*wVn~24`~R?
zMik7<WDW+S&%b-))7u+&wk8WU4_|oZr=Z3B=$9A#ARW%M^7kHn(fi)>&-|-9_kJ-=
z=KUlGz|QsjhNfgCfuvegdFI_cXD^aD32II-1g*i$&`KRJ-)C%r?9T+uRZKo@c#Szu
zOoo#?@0u~ZiXC+>BgD>i@!?7%ynjSm&8OLCf9JK??c=>4-A{%otv^Emps+^vK&`J5
zBEq^zUlR^;T^NnlVPEm0-Q^vf)(+s68x@7tqjPp<*;;K8Dalkn<vDhJM;QXpT1C#N
z3m!_l!c*=^R6j9w>W9^a6i4WT=!h^qfw9@r7(3U^w6dVnD%?sdHvu&Z94o*nPIIq6
zWi6tWF&5n@Ub$B$Dp3(Nr0T=G;*|}&onKs)Q5D;H74NNnR(wXLHJ-+;8F9DnXNVSf
ztAMIWanvSSbR(&|ONeUa2+b}UPq-%ev~$NBqiQ*`YOzW)WT*?}QAB;<&cE`i*+KNR
zI5>R!Pro}~7DeH9pML6vFMYbv+{#|urB`3xe{`@on4QeC**wp3TNKXv;LC`z%AR=@
ze3B<3Dy0aGK?!##C5_ODX#IF^PI0aA=t>pMDr#YXPHPf(wgisWcJ8oYqT;AyT0*O(
zW^CBUs&>T}yw^BI@uON%t>tx_58K)`Ds)s6Yl6Ezih0z|##5G(=H5y_|HiVDg_48?
z(|7fac<qAMjl+ys<FT9M&r$q&<^W3Q<5pPm5aNSV2tg<16@<Wg)KjTp-wMqOb|3ee
z9B7*<#m0=yf<p4diX<u?&epyv+kofrkij}lm_u+&UksGl0S<vX00Uzk&TL@+)&<x9
z?$?r=AHaN0={rCHyhB(rhIO*VPe7L00HNmg?bYwP1fC-GwS(iaF??q0|H2qEzp%(g
zj878YATo~*|8`bf-P!o&#%QCk_n2o2%<u=Zzqftv>h8IJuW`-=3uMkuY>`~p{q8)o
z)(?z!7tVg~_~iPnJKq=%9utMMe>Y?kII!~2!s#c(dS!!tPIgu<lZwIYTm{$Ldr)VB
zIY*(WAi%Y|`TB=XYXLk00uirikgikf$4156Ay|Y!$q@Ys=Zls3RlmGZ0F+U)=`zo)
z*2??9KA6;etdm;@B587`Vtj^AX$D2)B3>ywI*u-@OGqT8BgB25wZ~>&&$}gw+c3#M
zvvq{L?%DFx<)tHnYrTcL^yMf(3v2o)LIx*W<jmcDSyH^#j2vF=>GBE?$+B9Fx-5iK
zmec0Oa@6QmZRh^989|-BHfkz!Ehk*F6t8U7s_ni}XNXelL4i1@y{1x=Fs*5l@Z{b=
zO%$*2sir8(x7uMjN^TZ4V(h!dRhnPah?Y6eG6W@3WpHbvBl7Vg@3E-aFKM35rxtKB
zw|0uuWi!;#fQ0yX6ago+4pnQOcVJ|>ozJtQ>GJK@-@W;h_X4-iRdNqr{OT8aqoH@9
zur4cXZk=`Bhro@pm1}ZuLmJ?2j0FRa?mk*O*o-lyU?KLcjQyg7@g=v3Ny41Iiz<pU
zfj+Imz~XpXDk?(Y5b)^ELtfVy2Vl}v*iS16B|WwNi-@18Op9y2-9+LwamyWNskk~n
zIsr3-0~2BwqK=1DGjXVcmw!ZIN!-Rbwj|-m*|cT3#avsKr`S44hKQvJs`L!+v_GUz
zgw%Mita4bBQS)&jTxPa`U0Ageq$hTX%MJo^S2$k;=gg>Y25E4<eEJF~g8$f5GBAP0
zFrLlqG^4)L0O%XQ4OFHoXPKW<<~opi8|?B(nR~zp*ajJ(uZ&AK4u+5J^O2gr^m=OD
zU^p>qmmSz2GhPKea0z$|_(7S;0TjSffC7F5TmT#pfCHo6&x&UU>F+tebS??uw$a}^
znP2Ip5B83K^LX|(>o$%~e(mOiuN9WTOK5X6`>n<7+R4E`-QIX)i@|)hw2piTNzy;e
zCxt%)kn`!*#{1`Yet7rcFA#;TjrW}!5qa|3CQGl}s+DN7HE2t^pkg<0B48nKa3Bm5
z8XF#~Fd%2hr4;()Qxy{OJ+g+75_;qkq8_3AuTQPpAFtr<j9__%k+GIR!(zlX#I5p}
z%E2*vQYq3Q<0E<xy-DxGKe}=7-k#Pfxj5F(ZWYs<{rU>ZH;tsK7q`Z1H|ESi8ni_A
zWz7q5)G3l{n9!WAA-++Rsf0E+A|kR^TSUCN%NJ{aG3uV`JGAu(*FaazCZcAW#kgw`
zFZfK+O2lX*d7E0W>2%U+*Qaqlrr3QZhCif#A@Pc{3`Io?LFE2QK$0lh0%auybYh_7
z${Gnn#T^m`$%4$(+>d63=Qi=RwO{Uri_|W5WP~`CSm;P1f?<_{D+`-aPbA>ImR}8)
zpN6Ak(bnjLs8a_t=v{<R%OZjzJ4hD7*hVtmL<+Oi%u*Y~T*unh;khh4AzQ-{mSF@O
z`v@^d9fm4$x<SS}gm`WPxP@Lg3Ithaja!y|oaJsd&rjw>;P9P4{EN}{=DADfN}Cqu
z)@;tC>8HN&rIUa42lHj2h?t3esb}R{w%c~*xRVnHDzCpr*6NQUxE=j6{6i^HqzHjl
zOxz)|S~~4hS%Orw5W(Li0?~!1E}e!H*}?|Tz8Zd9CXB4bf5vAv>HeXDB1Poe%9dI9
z&~r1)>N9|h%w`E$)<HRS)p+jmdBUm~j-9nWa0s<AW@PYQCmT}DtgIasq+!s<!wE#B
zQ5Py*Yl1FkS;PXAnTC=K#8F;yYb8Kc;3BuBGc#m_4yrsuR{G~?_13gH*bow>PA77A
zzZ77>fkNrlLp{wLs9e*)9`GNVKEMU^HZbP?ePV|dkGUuRx&u#v8Nk4K@Pufj6x)2r
zp?m_57+X3$%Wgk7wJ0)vlwQ1k_wKn*Y-@jQ_a_hbzZBFDwYg$5c=t)Ao+tfpz*m4A
z$bm7iNw^7on(-R&UEn>?epYPv()WpufH80kSjJ-1f3(b>b$<KG?whIke*+iyj($DQ
z51)N?`_bXAhJzoS-Fp4t_?5!$Zg1RG>D1<?uS4MjQ3A^6i}TESJiMoM@yVC|%PiZT
z%`X{ao!bOX6ciC5bQoCe-WW8rgCeA+7Yffl7@Kfl9n@@kIHMn^exZ6M>G#VX61;(D
z3_-mSjuuFOQID1dl!jw2JfKo@kw`;%5JOYoQq`dtIj{$PCIoMyOw$I7S~HHKd{F{8
zm}Jx1BMv$BHdVghxqA{g9r(;}z=V97T{ts(>UUng`LEu5{O#Mrje%9&_QOyc>umj-
zdDI7JQ*`3QO~FR5V|<$}BBD!EH5r-L(AgU!er`T(O++M;0k3VDBM$0a{6TcbI%yXy
zlhJsEEmkiOL=hAhK{g_Qin<t6x5v|Fzt<~HM~1>3pDbyZP>+h$?nETKmDkyDSV-8d
zP*c&7e3DHAvJOBKV$-%d<ybn+HLrffQmV>_Wf@??GMv55+-&KfRLKuSkC);mS@k?j
ztH>q+hjWxE%#}eXN9rHR39Rp0ZIPy!q=};#$F198-3cUV#3H~~mQriULtjO&m7u}a
z8*02GiXL8NRo76GB%fcLd5Gf}I>=)KTDd**3jSQfuq}`;wf0R@n3*Z||LW9I%+~qb
z`ej~N7YghD_`m(;U;q2RG1?qgNqhB`DZ=E;=4)U3?6>~ix149^@;YO_VfzzzK({FW
z1%TqfhYt_ebMR29DhR|-3?~O@ZJV^7R}<yR)hx%>AdWyFrLfk!nt|Eji4V*HApoHL
zM~A$I)=|BiRz$i!NGYn+$FX&}pqEmox)r(ZtxsuHu`410(8{--A5J|Zgi!IhRkIqZ
zHoROicLbUkt)XiQz7{fVc@&Y_td+QPlwmIV2i*8%xAbXVN33bruSow@2RgFoL6OvX
z)gscP2lz|4c2E=JTN?X)j6Qg%&9pfLGwkbe&*hm;`$UN*EWPuA)yHY^dQcA-a~jxu
zw8&=lOSeid+$B9AI?KGY*#`JICIF9sna}!+p3-@-oU1|L*GJ*6{pje5zklQ0<nnE(
z$37S}d|9b8`SP1~Ia2CnG76M}?*RW1_%Z{)p97n~FDLrpgT22w9{uB9dg$B+0Fd?m
z?Eds`4AS>@Hve6k47`5<IKMUeuP;0`I=lPy;o-jn&druzXP!<^E^KTb57OJN7$wRV
z9sp^>){R0)NCkN6_m1v7`0Ajyx4ZL3U`5(86ARO8OPp3T22M??JTYVN7;w0AcxzLQ
z^p?JV?Z6C7vfY1_fA7)qjy4$Dt#kRSftEn3MqeNs_}~Vfc?CBfQg08>zDVD_jY}s`
zK`k<czQ?O%6_$oG(pLAvb4*N{pb91f>U%#8q&=sKifWLr4xbencXhN5b~t|476;Cq
z5Nk@uqzzp5gfURQ_-JeJ<8OcP=y?9ifB$puof-c5zkTDmGg~fB|JzM_Gw&)+;_}2V
zr)sd#ZZw@iE_^fF%_8RWi>*X)lt83d{$QNT)#-;aMc9hi=mnF#vG;63xg#RB+=x|c
z=+W7isV%5hF<G%>5v?a)3)}>fS5iZgRLd(k${**|7N^t`te6YepOczKU{m1ME;LoC
zS9=?hAOXcTc`fqUCh)OD6}pG;TE9@+<cXbu+Lb*{2dgb;iA8T!>@BpWdaqurJZ!-T
ziyv-E`xvyMNS56^vibs=)YbaCEP{WfL0lZ^OB|~O8%7z6fVyUW3MQerlU$>OQnM_b
z5}Qq3xE2bI6iE^n$GogaKqMN0(wnYxlxc4cgqx&PU`b2Jb(vk=xxvgnuyb5k=X{`p
z*|+}PpZxOge52Rzv1&gx5h;bs&t7}=i$|~j*&E(_WXz?)u1#ib76}$1(+&2-0krq%
zfVtI9%dg3q%}4t)(n^suwq_X_&aI`R;G9r&B9g^nHLx{JwkEXBVBA}mFEj6h_a1>6
zyj*6B>1<<rqf6%n#@m}pm={Jzg_ep8?(n<CL*dhX&o{Ovr#+@@w(!pTz#$$;F{xI9
zYK{950MJK;bkzQa&G}KTIGr<h#IWVaxSe^8$SVrFVPU<>6!nan1F(>DP-Lh|2s#=3
z<ePsPyS6IN1JHn`m8!lX-M2sNz`ky!a{xOgm|%m}!FdGM2{Z^nxhJ%C!C*&vz}Vv6
zW9R~2;pft*lyfZAI_PAtm@kxBco%>XunTO1W{S?+;*AhyoFt?D(boQh$Cs|2d00Gq
z=B_K!J9qatw!bsl-0n|QKEJ?xV|n~l@MF+VfnQ?GNc}lL%o_A%=XbX^{;^gEJ`C#v
zmDhT9viQ_^@Z(|cr+G0^YUus1T)KAQ{O-B8-}t=;51t|YrL!CVEHSr>@aY@3e*5CN
zy+QxrsOTj+XbOzs_QrckdFw_1b5L42O`gcxV%ynEl)i;Vu@%_)&`X$DYf3+ObbGcr
zGnWjVQN{VNH@$Ok{0tT8ar&0FeS7a@cjK$CZT^E|eyoc$JsyKYP&_-|gDdEEABP#T
z3}yp!9SC&k6+FHh&S<`N>Ey#Vcz<fHem3;C)H`n!yZ6E(<*74sHA=ruNEs$@VgvPc
zz7DKff2MAZ`hi^)8O#BLO;YCL_|6o8ub<h--ah=J|NFOI{-1yD>pR1D|M~05xED8h
zV{m$~i8un0BvwXf!)oilc9a~#8d%l`+~vkmOiU&bolA`gXU9Z~xr3@ugp^Xujz(9T
z*d9d%m7GMQj0GQF7T&GVYx9Yu_K+zuBb8UiGU&c}5n(*NVm*Pl+bX@^cqP?{M77Xe
z4p{1MY8MP{9|t$PVYJl9WQ+JMxlM~=p@ohV)lC{x`9D!}RKkwY!0)8UR>hR*Bq~Jq
zbQLn(BEr0eu}Fe57u%+A3qLkREAz@JL`sjStsa@BoW1FvQir)I&33DH6vdrKnO?;m
zUl!`f5$e0%(BhlMU#oqP^Mj>3ansXV(OxwUhtl(gyFtLGEK&i1eF(vOUXs0g^Zxh$
z;4i-TH+~U-QY|k-fuQix7hjuC=WqY`J<nh+EEM^`XfqbM;~CnNYXKa1dN?ieLhJsj
zom<*ZwN^@%u{K=aCYht$8b^v4>UcGx>ajL>n*tNmWMkZk8Y&;tZ12$d;C%3*BFY5M
zhmVgowkFK7!2keBFEOS}Dp5qL9J=iph@0nC6BZg@CyL>(uI7Risg12kOO22+0PBtq
zkIJND4pn{^)sD!gRQ6Hr#7~kjNQNDA$LC#;V;diSxeT|41Z{7ED9ROH<622gyPt^G
z$eUOsS#|>o|MFkd=scJ;Q49Nd%iGtG3@SGe&&&t`R9NN$2{VIL4#R;%7*e=6{P4XW
z9zOn1ZK+LvZF}^zr=m)W0N@dPNOgZQIum?GndUSo3d|~${>K3bakTKqldO;e8N-2s
z*WMlyF=IhEV(bEaAO!mb4l`Ci?CsF#FE(d?=i%L-j?dj2oH;k%KbU26@9k{!{O)-B
z#QQYqzX9wmr?1-Vs@DH{@9=LNp8U#{3;(CY+zw$l?tkBga~%3aj))7pJI`J|yY+9a
zKNGmm7-}5tUf!E*fBMh=!WD~8*zn2o+y50)f1dr_t*!4pJ^n$KYliNb%!l5Gx4&H2
z4Nc2scJ|uk|1cijBjq$%hGK@IshP|<BuOZc=9%}Zzv&Zx_uwErf2ekgLM8sc{)hiR
z+Ws`yvg|q!#MavT40pcozWKeJhsw&zD%5}isxTBL0wg#>Bt@!4sXJQgwp;Fy+YX2Q
z*Y*#Gf3+RaZg;mFwnA!KQmZMOQfnYVN(2cIKozDc6l%=O$~j-YdAjo%_TI}s&al@$
z_hq3#QW+UQ)*J3U_Y8Zl^{sC}^FHCflDForoO{9BZ<zsIn0|^9VJ5>+J|8wdX<$l1
z8!uB9YyX`A5dpmn4-ujzk<N{G-|^r~^hQ7IufW{=c(4~fJQb>s4QnH67(Gtp@x8UP
z7_HMmR7>K2K@oNO!jFG}s0*qN03Z=i6C^Mb`vR`Uo@Sg2(C9(^QZIe;rxyMQkQyVq
zHMKXr{y)6gy)d6ymFrl^!29qOeRj>a&2W+4W)+pp4a2E>$|wp%A~?~U$=MuPmE#P!
zi2Lv&*FRu&B<c{3D`p{N;UjeYz4DcZl_c4JI*uH~W)s9fFt^Svn_9b{mfN@Esb$9;
z&I-)tQN-Y+A|8(_C1%xx%r1ab1!Ad;onp*4Vr3gSY&lo?S(I6o0VT0O5ZAw}n)!up
zcRst5R`S|CVisa_0{5)QVkoA~)ry#yI|(v}nDVn_8xlD>04gWsWsz1?3s$yiOIVRz
z6Ly~nM%2s5Te)_zoP6=3jtZV@0gMZtu4cU*ZR94}hREh<Aan4uFfNtWwXO;{_mFqF
zi405S^W+a%Ve(?v7&K&(RF9|W&3Es1mwHz}@pKkEg$(DBLOl2RPmKB_eQ%41Oq6B@
zW(LR!xdEgqFhxM5G;QA5xb*ZTnjuklmlx%Yhf+vUctlg#H*!PvvK%LC%uXfUp;Flp
z2`N2+D`!`VnI;=X5DfMY5~b4&OCtaPqs_*hhi9KSLr}pav9q`!1xhI-mXN=22Nz`%
z!c9zs&Em1SYS|Kqm?fkOv3hp(L>qw7!BLtTtxax>NM%_h&@K5&TPVt{j0C_5dgPPE
zyojdIJ(ZC{)<26JyTH;19x2y?6hjyR#H>__3o7l%yI^<-psGZ^_!Nv@Q$T=3@RwBh
z*^{h@JjBd&8BzjjLDGcj5acnmgsG8kNdpHe+JG8DfKv$q5+D62Om2Oeyw3-|SM#^(
zo$KpHYE%LU@;opJ0!au2R3MhXpF$nNkqDYoYAGN9lY&7o07`(8U;q?>M#x6@AEG`N
zQVNkwCOSz0z2YI8B5WWUmG)A#j$#d9C4qDfZ}o5AjGn9Sd}m`686n#MflkxG-fnAQ
z(GNU7=o8jj^Rd96j7QI=N6&Vf{n7Df<D`9R`P*^wg`I;>tS<eoAM8NtZyo-}^K*Yl
zCWzG<kwnnr_>28}FX8=h65p3zJ&irzJ4({e7_AW-Po8=3jqm-&T<<5%#_rbM$Gh!Y
ztyUjYvc3QD<Nl?3ZI6@~O;+c+A9&RD&3tOUJ&p$c_*3Jf#{K2*%WE5$iss>0rTjDX
z#-nS&+1C1XZKm+(Gn9()kuPKL`-1!sLcn@Uo9nUcfIJ0MS}vm>H!LqAXoG<^Ttng2
z##0OeoQm4RmH=M{ExP;G^ubM;UhEt;mgfFg`YrYFlLK)F=L~hdApN}>EG7Cy07-+C
zqL92L@CYD6&@*GWSq~@ssOi=^9lws!`$%^xk>3o|{&a6|qgM9;sJ`4x2FYWxoAY(W
z9mj%=kpj!0C%Xrs(?hf1BXHv$oi>gWZm=Aml@u<tHA(SyISYUGK_)j>%GE4T8AoXe
zl~9?im4ZjK-$kde&6#XP#Yh5xhz~3ZLscSf)`q;gvWu84jB?1WtTBlfHavZpn7)*l
z@|&^ssghlboCsKo1uRloj+=?Gpvf78mv+Fy9wD$~gYvFGrxGV{Bm3+H$CEhf?o^!s
z5WMoDBCjJ04Fp+tVq4i1`Kkp|&7}ZYDk*ZIM|ne)FeR1Xf`wU$2_f=~U$T_Ja>~WB
zUGu`vzBrLv^_E>!u~QW-1v;ZGDp604{JGQHq8%#e1f^?@HNnO*o|c%5HJdTpJ({J}
zkwfr$%m$df6@fAYiIyUH<2yg@F80>WuOkQ)$jk&W2!j{D^z!ImenV+v3{k9%HUfkV
z=%6w;n9bP<G@v$SXJhBW)0ZSs+4*Hh(3<P`p7f=Vo<LRJRa8b3vsyBLn)BWVoL;WX
z)FS{8L<lIbw=|C@OnGVl;dYW3tqc`z)5_51y)8o|h{f_CAV6cT?R!#sMQMs<JfyWI
zaT5;tGi?!aETrNk=M@DkEH4z!Immn7qs^TpRf*EtP=3x#A?he#zuf2qf%VfY-R!6M
zU7@ua;&M9+uUa@9%T%5+1c+D@gTx+w?k31W2gzD75zinbo@Q-1$YeWm`b#YP@{g%O
zMTRsA0XQdNc^_93s2ySS07Wn&rG)`Wp1&+6Er>DDK_ctv;@N|H`|zK>dj8_e?S)mP
zV+ctI4~1~rcmM)05CgRVG+jZO_;{RB7=vE}xeOjbhyXFrF^~Z8ffVQz5(z0ljF2Ko
z2e=_3&zDvvDnzjoc?duxl)ex6Ccskw>p*8Ae6D-*vwOex_qSGho%=7h=3Wc@-Bc~=
zG#wu7H|KhOtp>&*CZN1-eRA!If0MSO2Ya6nlEiebZ(aXf8aBqs^P|zHgQdIexgUjM
z+p8Vd^nI23iWVO3{rZz<|Bw6qUk!XORg2BW+e+5~0Oeagg%3Bb2$A?$-#fe($1A5-
z-jTsHHTv}0clVE;B=Gi+uB6e@(wRTlGuM-5XZ$C>z1w*7peJklt@V}9r4PRm+=?&F
z|3uzhBC(<)P4YlUMDoc86KDz$C6Z8?DISu-YIi_J>MFu5B>|yV&u(D>As}cN*S#kj
zbQNlTtak1{d{%%@X{#rHm7?WT4W{CC>?ptWx}b+L3<&1q=mp%5Qn&zN3t&Vi$>wGq
zq=-m*0nVL*{uX>ReG&mkUwWC6-xue<dgb=Nd{0H{apaAnRU%}#N7iF<ehsVI@~zde
zr!DwW<;<g;xRGPiR<z|sY$xLZv;5qgfKQC_ZsnL(%aFfg0nn5@CD(Yvk*cBPmt;~y
zR;%Sp5aqBCj}EsGOP;05${1pxA3BL^PIjb)ugZO{q*!y3JySrGNF$Xf7a}WZt&V|P
zmlj|cv4Iky`x$ugP}GzqK!8wc9?JM+uo4_1hGrJ0gfV?sKypzEm6<DChs%S8y%Nx4
zSG(e!hmHjxmh(+=Lh1;){*Q60DvFa5*F$GVL5m(_uSVz)6PW3V!zRdYAS^o#N7k4F
zfwqLV_#L{o7e(fc4NZ1T4v~qh3M)ZkX?g?|?Q<z>MMvDg&I}Tuz>ma&&jL>g(2xQ%
zO;Rzz*Z%FRU;fRn%q{hR@+hwC<OqSCh3+T6{HbsMn{OEcLy)AJwC2T5sn0H}B19x(
zw2}92K6vp9pOB3Zxg!feXKCK|rRRA91)xBof$|ouq9o<F4HpYl#RLR`galk#TMEL!
zM$DDQD1*`Pc$B1RqK(SjQ3wn{|8TJXXm{nzsuOPw;Q4-csdsQZ5dwukZ3KWRBvpkn
z%Aq(TRTz9+{7rdo5K8GuxqN2DhFjXuN!oq5l_WY%wbF*e>{NCqeD+}1FB{!WA7ws@
zMN!AK(iO|4N}3*<)sRE@Ef?&f_p(nhGXAxjB7{|*@N8&2{RIcT<o-o~IlvXrYeu(>
zM<~@6P47b71MzHnkjfFs0a0Ij!J@7i@D!1PFTHF&|LLRC%M1VI|Ghhgi5Z{-05qhK
zBua@`v1SQ@ZsCIP6oo@WMnWWDnk^gz1Rx1K1RuaRAOn!A(3}FMAYw2nL<m!aIDbLu
z`9cVzl#0_*t5qyB!l)!oViX;K8vyqJwlwNFp#C5KdNRDUy?45$FVw?Zz0S8#0O^=?
zLnk1;00|~tFdk^~V^v#Re-(s`)92?--;@5gwr)PJ#xMHx?Ul1Tha3NiH#zLK{@wga
z@4?24=T`swN%RuYAPkm-c)#8FW}3cY;Ne^|IJMw^>+Pp|y|+;&N-eD}zA@-OjWY4P
zy+-4nKrJ8<I`mI}eQVm=9{qaq)N9?ee#N_>!`}}(!+CSYY@fzOG^7n0K$FXWDE9&&
zB&@o$<4224qZuAo_TP#SfRe!L8TAECM&OWeV#E~1RN<!w$JpBb0K_S=G$)&fzW;SP
z;|sNA`m1Sr6;MI$Kwx0T62^L>7!6@lE?&`x_d(QuhMPBgS`2N!_CTkE0AQ+IU+bxW
zC0dX}M9ATE$3z|p9gxX!FXV0xoHOM_$RaCbiuI>d!4?&a1!Tx_x9#YxfJGc9XrA)u
zxJ-k6u{=SQtuyS@laqAnh*~VFhYrV(4doCj$phuFQN@C-V#k55!E!m;afyT0m$&#g
zuo}u`<yG0@6|dytToeQ`XDY}eEGz`b?<_>CieQ$t{Gyd0FO`xMX6(QP(OJFgF*HPg
zopY0AK{>88eBTsR%+m4hI!R;5VN6ReC_~R!C<xOQ5!e!#nYuWpDlWIt4QFtM+JsJ^
zbB=l2!^RWRZCr=#(ou(I17aK_>dI7{I6D>HV8M?x^g<9s1`H_$(<nVU9DVoe-~P&9
z`^8!<Fv5x-vmCRPbL*e@!Y9A?CqK~I7=qLQf(A!#!mNuC4UixtW5%QC(cO)U*Dew{
zWKz%fdrQ5e{zQ5x1RCRrm0T|uHZ5gR9Uc)w04NXyqQq0@SJ9!(Wm(d&bNhars3_4Y
zHO2rLAV6bCDRbw&JIkk6a(In-tuL%DZrtDYJSn6ALtsR??#$XG5>(ntVk?%_sY!(8
zwZ)JXrsX9*e7HFoMbjirQ*8{90pd%y)fk;5MW1!^`Y_b5uqk46S$ps2y9qb&!aVs7
z9P2Q$5<Uyi+0LIiI211>7_rsyZFB-i@T1V)9>2>g01e;+ga9poHGn069smIx0!{=S
z1^SpM?xF5r6i~gRWGWD_23W_`8>*lGv>6WQkG>hi(fu>4!MpD-OiiRUmbF)Yd2|N*
zvEq-wgxJv{1wWD|$XQzen+5enfRQi-m?$s^Vgz0az5-7|ums)|dJ#wsDVUK7Jc-7r
zD5gY%6g<Nlh~i{~dCFf4Km*(W05W3!Fxq+U&uVj@iGKWi++H6?*8l`UybAxW-5Hyn
zp4Kq!hkAn213yNUbWo5FUf4S@s($v$561&Myx-iv|MLbm8)r6m52goqzSe2&sN~x5
z_|(e${|lfa{T;1eK&*S9E}mK*C;idncy&cZaXn7v7v}%faM<_!9{3xR<Mqv*pW70r
z#iMJ{i~nXE{^atbFGAE#ul@76<MaOh8ST^5B<QE8K}soRZdXCj9KaM#$f@{?L%>7|
zaae3_Ss8~2V<}>2whcV5k4WvWq~R$M-tcO-adF#AZ-`@0=@*Tf2U!D55fq)QqC+4>
zCIRXHd2~IR4sY(u&<lL;QIqN;C89Db+Ufj@O$}XrEt2K?I~z8OS1S2TCCpaM{K!uY
zxiuLV*p@v%o3)nK69wm(*di%rU4V%-hBzaU2G;@4$wPqB&%x?KEYTdxp4IW9wrqZ`
zIkwBAW5w+(S+-0-=F4n<p4=fibIf5v8Y)gah^iKXk+-N~XjX9Z(7{BImp|^A&pusQ
zT_7tQXVMnz@fI^i?qp~&M2D7`eO!-iEX2~GIpv+98xC*J^1sUqWQVatRo`vPSs=?u
zWtbp1&MUlnv*H|bx%XVMJCpoZ*4Y4V`@>;7WXdKN11g4n#P!z}<{+zUA*iI-6%rhm
zdC3`3c{xiJ-^P=-edIPc1gH(A%1okkckA$bfB4<ceeDYpL`HzboPC6VaPH|#gTwwi
zuU{uK1p<{C&5}|Wz13FDN|RFR?bqHqfAyjec`;Ew0P7deK6<e0d!8q?F{BM48RA3x
z@>a1Yn(3;Fhl?!aDm*DKK7AQkyhe7)b((J8emIF$9II4oGTG%fhJ?~|^Q~JS`_!}T
zxfT|L&g|t^E}RK|d?WCs6etn3GtFTUm1rq!09><=j98j4u~K@MKX#cHra6jCwDrOL
zX{@41B`Wi8G3?Q(1SGk-T>>U;{xDJ>_vIwl8<!mF1ovR!Po5=OIDv>Pw=EA(5#)ya
z%)G>m-y~y55JY2{M)Wgn?g}6V5CHQ4D*(#?ZGbkw2w)rF2EYJdlt5<*fBSc+7MM4F
zj5l`Vywqx7d>@S_KrjGWfl{a;TwDuwj@SRM|4%#~_yk&VcS-~RFl2O!QV3~K6qcod
zK?70&c^m@@oXtxDfB;YceJ}_yLZkr>KpGGP!8{mW1~GL9W-65ikN`TRsfUDFIIB^K
zF)5>%3xJ%~RyP|S9!4*1UfBCrQY_s+`kFMcPR`$({N2XVPv)9Gg6(d-x#@#a!?wwC
zGK3&VN&A3d*b0Nj!&Yw{DT=2X+xOm(@^4NLzT(S&HlzzG6##yJd{xSiH^S7It!8~!
z`Dfm}{-ve)omS(1np|wwk1$@Z1-nX)_x4sdQX?dphu7wN_fPfb{KlH^ZB65=g6^aT
z61|Bw9$&CZ^vpUg5_l<69mu1{S$O<qRDhCnUtoh|%jk&_s3DO?lSkkQ1B*0n>gn@1
z>U-hqw0P*Le{CkG)#PK4^dP7KL<j;<6#Hu_9!f-K4Hhry&9|}M{V1wlzFK>ApJE;L
z<SW1Q)Wbji;L*`g1d`z(*2{vBuLH;?dDh_Gd1~!+wi*ZOzH&|{DduU#3XBdvgE=Z7
zRgF_@^emP`NQ;eGQV24_60*IL*PQ53;;KC)qjZ&AFl0P=TPEe>grX{BMIMqXcxC)C
z%e8jWrK~QKXOY|EK&!dTTR$YICVp@M1Dr@BcP$D^WQ<YYcma$s8$dy1uU@WKW&SFq
zJ(z3!XC1;yIS6O*0YKr~$MXa%96?;bz;xlr00BbADz%<`?AkKygP7pkN^$Hwm#aR>
zjYDy!t-PS-F?h&B-k2jGM}QsS1y)-Lu+n*e3UZCs_r>vn%Mf%b--{en5}hOxfXeCm
z2!wun(y}?CKs1I_swdO*{;h|-*WP;O)6W5tux`DC0wsv2UVipy|47~0GA1T6MjJ4e
z6ILpl@=GQVfKp`+4h9cy-aCKwf^fW0aQVXN*6Z&MMo|>0L~BMLLpJgUUf=M^1TS)l
z08t2ubMxK#<z7acL$nRk*3CQ9D49%?Bvr;_o_#<dfIw-Jr0TsNyz|Mgye!bFS`eTy
z*I7NiG8jccl%|Tb)@c2{E#0=fb!YVRRhM@ZC?%e|e6}!#u_CPg&fdY!!DN~wsaD#U
zLP>!qTS#DK<%7z|_@~W}%0`Y$Qt*WQVJwZd9Bmgb%3ahPUD<p22=F%r=8HglDK5Pq
z$<%IsPkkhh7JwK)0dxVb0IUJj0crq!fZG5M0H<ICOcU@t2#kS1!ub^p0@z(5FEBly
z-n>qc#xTsdD^fS%_rK+}oAt%h<7grWN=RwMV@Q(-WQ+koL&EncLa{<pLgToQxcro(
zm(0mI0Rqqn(><e2h&6HO#j$|^uveo|8yZ6}6Bq$TwKyK1sN6C@exq~ht#D%{9=y_A
zdt>m@6aOgf>brx>M>kiZqfc(Vei00I*WPM&H<}Cg$Vi<uNEgx?AZ-wY@<JpK?Qs6|
z!le&xorCrx-Cc_Ny*d1oIBF8LJaOu9kdm1$FP(|grD(c&=JZ=}ygc9DY1ChTpi<Od
zxVw6@e(P%I^j#BvPwqW=_Us>!mY{;s=!#jnPPCdFJw<Kf1&>f92tX9_YQb1z3p5&Z
z$H)l1Jpn%DEENm^TZNkX1gwmyJwD<eQ=om8CQ$4;Q}7VLBej_5-;je_qIp+z9|W!2
zI(}Lme-gAHX)@SX>nVXokU0)c8r!Sb*Z`Hl&+b5up_IqT&42vkRDc)CqSwuxFw3W(
z7zBst41}3NlWloy=2}vWI0MSAE8I7WGdJuqh?O{9$4>-p(tNq#SXc=-Kf5rBBVHMB
zHg`qEhn!l-m#boJM0BU6W!1@PS@t9#cPaqZiB@Th;F@BiGuA*Vlr9x(gKCterR%Ys
z&Q{9APa3ixAm)!>f$WMM$u956_Nj7AU$7ucu$R}Se61^SLN@&cM7M&Ht51Cnkf|u0
zlqPhtSdn}GBO9aI4UAjpflE5D>?SPosSp?rgghMuZSos3>t(A9N37<Yl>aI-OE`??
z#Ko0CQ%pSSq-deDgU{MjWHbpI%bOWlS-pxKB3px{Y(nq85~4sv-xF7#ztZlugb+g5
zj}uR(8y`FvPm(A~Q)MhEBqw|dLNY}C-NW8|x3kbi7I%|7k9czV%<AslM@gcz&Jx6!
zM>=BGLAmLb2q31%gA3O#N?#({j2sjq8BLD%j+0btWlSOAu#XA50g#Z2U(P>zPR#`Z
z6aYdB-}hem>Zcc1=A{(2tRhGz)AwI}<9HAc$I)b(CYpfA5Fvrch0kJm)Ia~k*;=#a
z=J0|LV(0#&G&O0attBwT$$O03hc>bXUG-UJfh~maJn_uOpL*hBm!%ZBGfeT2U;pmw
zhexCSFd9$OB+1_^zt4+jq4527g%g%100N~S$d7;a`RvkLdLzML?{H^hcRY=gL@8rR
z%K)3)gf^Uwb8zi5kJT&~9s$kO%zRi&1uLz*oaLj!9!<17m+Wm+5^mozAA;#*dvXFm
z0OtW-0eBLi4G;rd2Y40W1As#S0Y-x7!<CB=hR~k~nM~pSeR#M5!vTE$W#iW-AN)jU
zA-zU9gYx`#eQ`;dG%-X{0E!RA&H)UOF(%dCJjw+@+Juuo$BY`wXiCrXr0<b2$)Hce
z6vsYBb*N83)=<u?^=+jmFcR#^&tF1nV<gldG)FsIyT2$$`|~T4EolZvt1zBNI*&pS
zn9;%I>0n(Y&C&klT6512M?_vhfhm@ILqQO9=NjYbsB`MNnRr1kX+HUZk86|Tg?l@n
zytMwRCstS1=i~8r1a61nX%f5J6SZ^WcOE@4=$q*&pDwKb%lPJBZOgIpRI9d|9b;-5
zX7M#YIwglI;EfR}np{egCC?kyWKu?*@gP+#A!>je37i565D0(*AVJzedW5uvrt<dz
z(wM|LAOd=T63{FDA?;V#03=W46<vamNC_a6F%pUjl>-SOGIG%*m*}tu(DZ7r>&6=4
zGNvhHY!wt~a#W-rP}7TKXW2{#G~7lR{Q0!#D1-qRDs>PioiF_@v2z<1Pup6DobXWO
z&hS{?SvV7EW+xl0kYX8LoLErCx6=vE5q7gEmT5jQt!}8~ewhk4heBp+lgrrQvH>jG
zcr&t#ZUy)%1KYsn&hz!BIC{bohGgXfGK;nH1ah_(mhVf<GlFkgY!qvY8ZHJz;GV_y
z6abckTP#b`?7KEbj!~)r%3`U!YUR7zW25450qq+(DH`ZlBj%qJ^VCWnPfu=Io0ktR
zi%DH6?<fQ(hzxDD$7XSAJ~t~>kqC?xXcZDAR}(GX%OYN_EYtCnV+jLg%vA|Xl$t}U
zyeuxVwE)U#qK=iKtxN6TK0ju1i*X(WToCxERL?VoG4kir-qMB93&X$iV-^UG0_kL+
zFOPGja)1v&fQF3HB8kmNq(AuPk2(w8xy2q}KH<f}%&*aEyz;d#{=47(BW;KvHo1Yb
zjR~=>8xbOCLrSUr{r>eIz5DDdFO<<78PDtTi`O39-k3y5l2uiOu?UnjT;AxEQ+DEg
zV0Jg6L@~eEz4XjQ$77j*2=2V`_IQ$vCrK15m3g=^ziwkdX)}%055DpJpZ^cODhmIA
ze9n9R)cU#garD4Xlrp493nIst2e=vym`I;ZKeED4K;X&eKl^NPgtlwkx^d^|pg)-;
z(>P6))<7p@)RuQB@J^2f(-f!TF_>@3n?@ekNgTAaWtpX17r}j&cF6=x#mvWHC|f-l
zXP=bm*H8^|t03|pM(h)WA_4<oS_EBy^8lv+rT}{Yy8zn&BLE3dvo8_HurP1_#uw9f
zZ<+t;pq5;^;t!AE`gM5jIh@3*e}t+bgD#O~d%FhG%8;Vc=NV7pX7Pp}C^jZYQHtg+
zf&mctvqMeAJ?%^3iOJEJ0MYk=BET^o2m*n%zS=uaX&0Y=8+J7ur9d&nz7U8y*;`y|
zO$Jg9n|o(E-4FKk7mi;)pWr{!$8QGRi80>{8;ymPC7|}vqt732eoPsE+&@)sZ!MjD
zJ-e-i7nAYRBn2T8(|`N=)j&$<OTv#YpZ$lbjsE)NiG@M^{#vR+l<`mAetxd?N1?y6
zn;h<K{?arI#D#C1+iuLw-D~YNkJ7&_nzyH_*RE{{kq~)cAeetJZ8p6-hqbwwKx^Id
zykkTYMQ0}CW-aKq>f1y@h*W?U!YJeWUeK<I38e(G7-UMJ9|5RYYq8>FhQjP|$;GU$
z&B$i~L-sQoAOT2x5eWp!zLj}+ySE`y3<6B!A`Mr}@D#LrSc{+zFhWR0EnJ<B?-6JM
zL8Og}&9qNCMd86;;EztVk>a=ivoBnK|699PzQAa|%x2hvT?m|O;#ME7rqRi_XUIL{
z&tWN4zzTQ>;OZChT@<b9Q@)j#a}jdQR;Z$eDHkW^lEHRJMhQVj2f$~)SOFaoOOpWG
z30pXgMQD_Md3HF#r2yz0U_}s6%$=C$G7F2XfLH|R^1w@M56dBrEt!zZ-p~fi0Z*l{
zJTmTdNZek#VhvpkyGs|gigOPF!bu5C1qzs#TXOZO&s9tUf#FqU3Is7I&~D@wb`aHg
zX&ZdY`eI~SU0c<n^%ZjmxYn}Ama!}qqogq8H<y4yq{^6<+0O{HJiemeAt%DLbQ=K%
zr5CM^#X4=bM3p`VXE#Ge4n>BY6t9xYhtc=t)#sjQcUwXV!GNoHGTr##{&<>1u~JGC
zS@UmJBLNxGO7A_`y70^;Ps*}iDqFaq9(L#2yAQXNCS%B^+U6ArhsFyME<%6*aA|F!
zHP>c64Wf{NFZVWfRH~IBL&V6)SV~UwlWhA+%P7o<?ox^%@P6U9zucK?XF!?|`9rmR
z^Ul2+_xporFpj3vG*KBcgAA}n1Ar*vNhA@L&#acMV|JMB`R?Wi_mwtUn{4{Z*$(C7
z#~LTFL+0W#3n>Fny!@pX&s{kur4SPHLj)M@A6@_co5#brKa8>=Z=Quxw%z2gNnPC_
zmOY9<5JCi=eBqVnGxhNd+P5>FCP|`FZK&*J%i}K_5$-I*9Bq($f#=Uo))a`cMP^$-
z{*bcAv&7@EsQ-A^%>h%uG!7WrM+kzjHj$H5kI!p*0lW(cR{^E~?*m*1xC?LyfB+$Y
z=kgs?Dg@Nm7B;4xM>_`p#@`U1d=V~Pz?)n6!yCAB3=me(JRt<sgV-2R2}pb#+E*TB
z4MdG<0}{q+e?Ht#2fzSisl6S504PMMr7v}=Rg!=)#jP(%2;rfMN6G#nriW0AL0y5`
z0(3#hk(?atEIfJi@>BX@zc%(#dSY;NO}zZB9*N-a&z3Gs;`q7;QKOl3=e_x$zStV}
zR)1vVM32va!Q-P-2OBR<j?M?+$Zt(m|EMM+^xM<p^@9g5Hs&79tsUw3h=#o>tx->`
zc|-7SH(MLW<9VzNcD!)^{%^=+X}NWDZs`Z@)YPceSF6L(@_hIG<Ixjyof}e236f~^
zRMNidFX-CVl97_gN7SA_klwfz#8T)<w3O=BaB>QTN>yVL&DCrD1`Z9;R0ZC|1{@Pe
z0^fiS;3EcrKA?~21NwvkA|myXCP?GTU!ZaJbwNAAJP_u-Fb~i?K=V+jn?k>hq6VPJ
z3=r!m+Jrs;BBV1(Uom*X$azozu?CIM0IUg<M)7DX8;}Tu0AryOXe_|=7}WIf;PFo}
z+cb!q!yy{@($}89{rzvM))VYOW3*p}+?NDrL|30*9Xs;!#DVBIFz<-T@dQqM_R)&b
zgv%R2%V;W}cc>1*tW!q`{9y&xa|8vzfwdwwiY49_8wYT+j*>jcz|TT(25x=93XAe<
zWZ}bVM_97&Ihw}c2|E`e2Q9OQ&GA7N-Nq)WqOcCJ#CNQa`q<5YSY4;E+@{M~B735c
z1uN%=BA7yl=VzA4VMbI0x%$-S?Y1q@73%?26yX+?boX>&PhEM!E728vC#ot^u&P;g
zgHzdzn2pC64;Q)X8?xez-@D~6I09gM^|>z$G6gug`KJz;ZAaGZ16I&^1b)5k6qW!4
z3KZyj;_7q7kk>8y9^HB{o}|+_QOba8mO=oCBF}swQrZl5_s>0b5&3YwIGT2^tCQsT
z;Mf?VtQ0C@9G$UXwh$B_^>AzN)cI3kqsAr)&|c`NI6gk;Yi+V35{vE|9bC`C)a3zZ
zyRwub@a4;2dhv;8E=eh5KHvlbIDEKu^GEL<52yWMG@c|$s*E;n^McHG5{~zddkdXx
zz+EnOK`m^}wRRqCDXq26FhT<;n6RC9nq?P|cd`Nz1^Avk|HSFf{qkp}6lL@W08IPC
z_rCl3(eY%^pAIHT94lq2Iz>VU`Q;BZ?>G?i^7n<$J|}0&zTy7i_QRcVlthVA+E@k;
z*NIf(8>`x&8D|}|4<nlkBU{;!HC*m+oP7<QK^p*6%f80gOH#A<bh`03raON%j+e~x
zH$(G7fV%+0Ot*{R=T9+Toxm75*GXUc^t%_n{OE~SyjwSgCqOB9<1IW&FuQwaiZhf#
zG(tr`i}Vr!Qo<U_E(RmS5(9Vkcx1LC*(*l?ZGZ)UIzR&;1Pq0jcs?ZKsYz0h!i@|x
zX%Z2PK_+m7FntK)4#t<fmBvovnf+fqSNoHDi+A-@T$yjZrs4hR=ob9ikK`7900lt$
zzv0qny~df2|I9+?QcbLwM4*T~sP!6?mBqXBi#O04N!1%qx?b%F{r9h)UR+x69zL2A
zo&k|+6E(Zv*9tswVJWO9w6CJt^1`lYJYnY1>wHc&+6vS4&e#{X8WelA7`@c<#nR%t
zhlfuz>syWbwlOt<2|ztrI}pb@h}(oZKSd;oL?9^irj7buEjTpfX{rszr{2ByONnYs
z$Mb1TH5%LAm<;*=;>4Lh<G5ybmsj~q=plMoeg#qhmHkCf2pS*-NI^dYeH-)*&ydt4
z)FVVe-bywdMoPh%_^EtDPyi92C#aFedJ9rO0}7-jujxf30~l<9ngYr{PuT~6h+5#i
zhr5H_@vr~Rr|!M_&A9!9%M|Ckq%F9Z6B!#iips-W(r-8_hK_fML)GH*E6$Na{$6zA
zOXN#dxon~{2DL6Uh_e$9bZ5$pXo6gbi@fFmHm60XEJ|3SK*f?ZGbDCU9Y>63ixzgq
zxGcsYR3g|BGuhwef{e->ffF<lSe80g<5>zssW>;xa-w1|giPPZv%V0)<*k7u5#`Bs
zEOiqRP_AD4d~q^MljX8#MyEbHF&`aWb3JFM@35{oNzA?&+S`T7i%QN=p53;^y^#^e
zkXs$GzgWV}l|epoxULdji1z+R8`;Goo~u+04rro7mtwx&_SUD0p=A!gqY&u(^4XWJ
zHCv6mwkXbSGMR4NdN`iOQKS-Wm~Te`PUWobjP?fcG%`uDa&Emm@$8(#(wWuct-a}J
zs*N#*3qG-oG6Xm2MJsc>vw!Z%^HNG+l#8V^t4G^=(I`?xIqM7nb4^^8kWwN_BD>+F
z@ICp=C$7HybDxw_cv;CO@`~!lYd=2fPmYJv(I}1*rIjIao}yB6P!gi|9&VkvbULip
zkgX4`UPq8Q+BwpObmm@IptA+BrtDs<Y(k&_1Sy2?$@Mc!U;XW`_<`?9%$SFOpp*3G
z_ut&xIXWIhgGoG{rl~Su%Go;-GJ+{MjX-&au=PktAzJPFvoAlx%D#LN8tfnLZ0t^^
zNffJ$Nm(o-$ogW38&r1Gwjn9WIr$uicjk5x;bkeeF)HT4#r<ZNW+o-e?q?N;+aCa-
zp9qX`<I~ga|2*1#DV|IH-aiZ4|3udMlDq=go6XxT4`DKfr>@~I|B7tYWj%m5-hfwM
zh3oI)VG7-41VciY6N)>O&7ZC8BSW$&{1vIu)W#r8@v+DhgYpXYX8;7iX@H=JZ`%SG
z5cU0ffI{k2nN*>$O|}qH>olGYQ2GD@1ONtrdt&;|?(zA<pZoIS?QfgceyM%&ojLkp
z6wFT=M%`2<#pJVN`Sw$n7hag8LzIE^Js~6tPbm!`G$E))JD}yI+krpbAJ)$-v{vS>
zzrE4&n{lIa-^b4CvepnO?IY|gc4T~r!}f8w^6UsNnB#+n|HC<bc6BZh4ImYSbGW(p
z*}a_$i^~s=2N#W2y}6sIY6*;0a$47RaqS>@)XjV|c_^kQWVU@0U@bUo1bgkqey6!h
z1_#sChufb})6VhWQmek{`(q$UAPP1y69QwdR0H5<0FO&T5d;E35M&{G<zERP3Bxen
z58^wh?hAbkW+KzOXoki=1t0-EwEZcw_(}yuX{@)P0ici+`cgM!Odw#e1uFXUm3;sZ
zpa_H*0_<)c#FO;PzxCpq*C*&V(PaX;>^!K@g&Z&st6iCkexV~DLv*C3d?7+h-6+)>
z1zuu{rE+q^=7>%Tf*l4{#R1NyUpkmE8<`RS!Rp%1=0oHN8eLa7rhZ0NjG<$mYim0;
z)Z$Q2`Ra%ky(_Cm-oA4JIdcE!V!?NsVRZWC;{DL+maUPTd*-=;LwOX=^+n=y$P#Mf
zO*^M{BjYz_?<iNVeSyt|%R5LQ?<umu5Mp_tRGtQM;5$TzNN#U46oi(%N32vVUO?FW
z1l?wcESg%(@C8Fc9WgX_BexS<bglOg9S&xd<j!OW$fB)zNsg>j;0`(HVvg?6n?1Mr
z{|iJRMBvNM{KCtkgp`V-_3O2J?|v|ys%esHWwa^zyXfMgXfi8bg5hC*Zob3i9jy4k
z^$Vx>H@2cEF@}i15T`cSn~c!9Hl;~&ytBW0cGU}fEbmUl^$Vvb{o!OVqI}Yv4REvj
zgj`~9&H@lZNGSr(d*%~YKle+Yk-|aIMh8dlefx)pN28<RbU2Equ}-um1BNeDF0q9Q
z>HhBh&879Fdb7d6W|&`J7Dz|ChZ&QS2na<M%~xtFN^lYd3P2Pfh46j3erEZXf9Dr#
z^{@aV5df0u^u}v%Y;WxMN7LabnoQF~X)?sr%mv-pJ{Q7e<#6J(5QswJ>2qtBKXyq<
z7wrQeqK#V*rg4&_S}6kS%v2h>u=35-S5alt#7ZnXdwzM!x)r`*sata97M2~1<aX>B
zO&a&^9(d`EkB|2Mcgf)=6aTun@J|~{|GKug8Ppq6dDZ;Wa?wZ)Xa$IbX$qhC1YEcX
z2M2Kdefa&~hvOqK1Zjf3We7V+IyY*o?5}ez^t~jf0(?aK7!)1EWvK5%5V;PnEE5G0
zi#H4a<^fWGV}M<N2*3vt(hsE&TI*yywG8gUv?qy&uD28j60z6Z|8$4$M00=KTwMRQ
zxN@Yg*7qSAyme&8>C)gr>%#J*Q*STst+i^MQ8e{}5K#&tJkK{oWK71vO;fMiK1@gJ
zJ3F6G(-`nUG+o(y^z<{&+-)_zz2iuN5ES0J_x|4cjrz6A$%DCI>${EMUJwQK#-=BB
z8{XF3{2s`8;f2lCSa{*)=2M;a0|`?Dh(e{~OVO#3mmb#o^JIm4lsO0a`CTNk0j?$=
zkvh%IrQY4e&fTCr&|pF}IT&5tIeuP>v>qI$x*>#;m<lukiAa>&2qCvMfyYhUKg0_L
z0kjm70>lQwRH_H4_k`XTdS9x$Qavzo3D5)3fPNtp0Yo5`#z$Kqfk>ECNMV{@L?~I=
z_mS;Y-FrJSrmxb#^EWs4M~{Z16tTI=Wb$lK=zK7az85E%of%tfu>yI<tE|FebBc_L
zfPtTFYf*<#HKHn;Wnv;xMkFlZjIw$mVl*0J8!lNY66@F<z^l4`In^ECshzxZZp~Zr
z#29rAOG+3oAWD{wbz0!_cQ&tcu|BLQSb!I%j_SlIV9Djv%<%bnen7D)1IxH$B5cGN
zN;x_jAjEu#SDr+<^3><-@=b1CSx8WbNdu|4fyf<Xku5)w;kLx(Kg>Z0ohAd(3Ng^F
zSaHVZ&{1|XUX!IaSt!@t!!lh=k=t9QgE*soyM+><)g4!4@qk=xO%70QNr=Fq?>u=h
zpHO2?AQPU4>t~jpeEvx(P)N&C%eJ4r`;UghX`C3PbP?xMH~|1tESpl_i@O_Jt7ldl
ztp;F~sv)FYJhim{U`wUCV2c&{)BLu`ZGTbZA!C|MG>&)gZmgbL3+iDBWJxJcT|Ofa
z`nyL|LZ2u~DhL*0t*o+>Quso)I*l*<%BP?I>~rPhG&@y?8(Z&w_l@KJ<ajt8j*`hV
zO_U-H71K;k<H(;|A_JgOy><IxcfQl=bvaFMaeb*f-#OknG)k8Q5>YT!5dZ}tKz4*e
zN?(Y;^FIEWkA3+!zUT+O%wpaIBH(l|eD|B*-`_bt9!C99Jf0*;s<i>4tSBgy+O~m1
zV3}vkDLj*hK=#5xAfLE);nan7DT|sPt;^4&oA)NuG)}eAWGrt~IJ9g;XO6)in&KK*
zZv}Rb0waMtGhN>B6W?PvJvAQ>Smr`9dhgPkd;i;5zd-ay_{9IvT>ECN)%Q%3l90^f
zw@qbWWggC~!suYC*G}Q@{0&%Ng@61{;Jxc`xDP16_W%iMU97c%G@MxWb(<tG{h7)>
z0O13)p*{pJopEm|6iyj`0dW;z4&VUb7=Qr6Y-&klyue39ohTK>$f<>h+N5bbaVRVZ
zDo&;sFG6>r^-aV^(rJGS_L{Nr23IHXg?@moOW|k38?A?D-#F^-tRJ42K{M3}k_JLb
zJONUQ!1HT04-M#AO)d6rOF7!vT|d<uNz#ehY>Xz6(%x{agm<*Oxp(DlL6>VcKHCbu
zTaSz}4U!UNlgKmVYaI%jwwl|Wxx<*wLA@7tdTA1da@#~_Cz#^JH|yK0n0Vms)&jxH
z^VUrfV2uE%O^~WODj6>Bd7ZtMItct}v$or8?C$rkZtcG`nw|=S!8BPggtegW$(TqI
zcxd;Py#6x;1|R2$^f<R8@{Evqz)lEQ0|a4?gc%7l6lzPR_q_BbVV%%NGXV6#>uNC5
z$s-dBAB+^*7rG`BKo16+prVr$#Iyfd0VwlRlo0h*Di9@#$>m=V^JiTYiL+qx5fBwX
zTY*ckz<Nt(uL@wv!G|)&d|`=IVs_~Gh~+arV#OD-r`}4r*kFVgK_v=QidXqG!}9T&
zlA=T+2wje1vB=mk5p=vuF+Wu9yWsc{xGuLAu3?mX#)d;X`C&8z0=9SMSPpXU1y+w)
zWv~?sBD!N$M}klk2?c&Z4jVJyI<S~S7Fy{tJguyAiU?yDvC2b0uwoQaRE6yBK>`4|
zcI^vTs(CBg8N|x?hZV3`(#owEo0&>8vkEMA8I?1}>|mVvJR1>%`#NlziVnBW@ykJ1
zt-(jiymPSRyqU4PYqiE?PnD*^0brT?l52%yBM~91bOfM~LP+$b2txnmFMVQRd7f?j
zcJ1&&fA{`Ys<bj?hAhJk9Vi!wFstPbHg?WjIqL^LqI=gPhPB$t+11_qTUu$dlX!H;
z9*lfLKtyS(b{=fjYJO+2$JPf}I<>rZZbd~&G@4`wFS1XU6;g!<iZ5jtcu&9h<d^@-
z=hx1zW@FQ==F_RV|MvCUKfc)?M*U$l7{`-o5-UxG^D#L-+gQp`tz9+|8PG(#54R*x
zcc~|&EIWwKeD~}VX9dvUsE;Dk%%G4W8?Or?q>xggCq>}PbC*wl>DOMl`ur6sgeOoI
z^4;A#58wap8%O=g@gVAtqVXh65}g_%LzNb*peb7+lyylcuB|{2Qc8)QFKeOqg<tzz
ztsdkt!om(eq~}G$;qhT#rKSje18161E+yQS(vA-h?S!Oid1<LCc`L+eGz5++gj+?G
zfjIWz0f24%*27=^7QG1d|Is`54;q)>Z~Bpd8tQ;P+?kR9CR6y$FTvM75AWW=!#+rf
zu(t=-ZvYY08->lX#>Ske&yh*hN$Om$Q9~(yMzjx5f>^*{3{st(C`^<|b=CpKh`Rt9
zn7@7YI14EWNX3cC#2n=b7BY_dWVGX|Z&FcfURv!8-bg0nC)bw$$249sQXGt;=^r0=
zdaIL<ANE%^yJoHR_TteeHy#b{ENq>xcRTSYMTB5EkxlZN#xs-t;B-AaFGU(Bt>JWU
zbN76Iw20<#p|-0N!lCi!@ck#>NEXJO8!wz2{;ku!_jaS9ta*M6D20?hQ5i;qhGd$y
z6fG<?->mz)##;}YZGsM*x$S8XTMZC|%o4)@)j)a$uOr7udHOqv6oYBc!-*H@X%Gwn
zs1feBn;Vm8B_7O0QEz+jB9S+ooC$({tF}XcngYaX1;rBkeu`{7`(~hpa7eBQkW&MZ
z5`+Z62)!kf+g^GDC;{|@+5@#Gh3Wc}Ie#3=lt2KAqU@7D4cNn(nlD!zlw}_xdeX<<
zdg&l+D+F83RrC_bsa6Gaf-Vfk=yFvrE`}FEH4n{&@|fQqV~02sJ12y*l6l0)P2~<r
z=zw)xL<bIGub81Rej>0P+6f=x-$FNSi?RBMO)5&^1aZ2)>vB_SK9CI>%jy)}S)F6O
zV27wKRR*mm4B2IsPv7hhR7hapPAA;}D{FUR;aX={4(Ny$Y<3$sJ)2y;_JxY052sgh
zS`~5TxNyN@uC+m|LXNI}gMj}YD-mZYgU&NmFe}C5>@ILdCgR*`_&9yvV_lQ6Vy5dR
z{Z*bbbR}BsTf*wnv#J9n_?`>`Z|(Hbr@r*!#iuV8H6NlYCv0?D&2B56OyfyZqG!cQ
z%|)0cKu7?njT-JBoxXHNN`c&b5daW^dU)a5Mbc_`Jg|4VO;cm+T|&w{&InYR?r-c4
z504jC7d_uE2kP~9<J^<yPMuo|LP^>fZ9FMGPxzkjJumdV)l-X4K6m*`U;Eq>PhYCl
zL#yCG7#$qlc=g9y_qY4Q=y(_n$H^p0(ln#viE<aItOCxGg93;&01;_z4tEasH+JS0
zy0vDbydpu(Upv2k>Dt9w=m~%{NjxchFFQyt@V$kF&gG{seC8`JJ^z_!JH56Pm?4pX
zm`ta)zyH?#_wV*c(a~@^7{%jhnx<MAlcAw*^INE*xEQEd3k3oS6cRm82A&K8@5;3c
zU;NtVx(i(?5ev&k9uhaVvKRzjW(+7$2$|Q8JYs1E+^_H;D|f&1eDGEafj_*n<r7v`
zlkBTU>D%|d`p=_h_Ilq8R{t-x%lDdoAX1+|&VV2%{X07bL$E)9+nX|(q~gYV@cz5t
z`yixc1sNrp3$ig!q&4Z8c?!s8Eft{6M`!kd2+&)V#;0HkUV38Lmo1oUKtq5dB8fuq
z&tQ!4!T<%NQ3M1=Yipj1La8WCBWI^0Qb|fLe|j8EquUFO)?Hur0X=i79&0sxw0CCu
z@r8#MlKIh%3*Tt<mgvWN`26ni@uTMM>cUgq@J!k`KMa=><@<XN&ZuDT;8Fk7N*nR~
zVgKU#QW7P&wf9V#&P}IJ>$$_d=9Y<qg&+5N!QV__`}pwf+Ip)l0EY^skX}$-xKP!@
zJt9FGL$N`+c{KWRtJPmZ1JDEkDoM&-oB(_f@<dB)A|OHn<x^Y-IS`n5Bt$lE@I~Bf
zzaLy0wpTWS={Qci1Y#Vm91gB3UGFv@A{rv^aitxxOhsqQU_b6x%RYW9iu`ZB<Azcn
z%H)Prn+;zzWh~Jc5T)&@E&D!PApSTw88IP~m3;sp=T@+{27Dk;-8ul=a5FpsiTEk+
zPp$%z&*B&ltDIUfwQF^U;{j4kdgA1vRSjjR%I$W20<3Nl(TOLkd{*Q(1g@~-#624;
z*0WSy6Oq>g%!AGu(UJpa;z^P&JW1M*jtzo)OEN=2UT&g8&O<!0AR)JaA?IM+$nQ$~
z!7m583gPVMp8u==ds~l@6N+pz>t>&>8Sfshk}rvPB{c6^$=D<ZB5=YSoLF5p*X1f(
z8=D7?A5m%JQ{<6YWd}Gq=Gjp}9(v*=xG)MSvD7Z-Q*irpw27y{l&tJjpg<(ko$p?I
z;fd4d*A`ah!&)FL?Bu|1#rjFwkTE8XlEb~DgYBbxAKZU<XDdmyB16g$aGfk5pp+Pf
zUb_)K^Wu{)eBs3sSL3f~h_ZCG-AB7y_qTuaoj2oHr>V|0zC6ef2n9+h15X5@-)i`+
zdib%IpI*Oww$`j;kriu*h{zBS(f;OM_AWsfbQkB4wNgUlkJae#_|f~f_a5y|rs;5!
zj3>z?%3S)i(aeR`p{tOa>sSmDgg_!8(UY<k`pt&ltOXaZp1b_~ldWE-ga?VhWJgJK
zyx&jaB;(30omwvUJ(2ydKmbUm(WC2kw(dNfOw-Xc8I9ucG>wupRa$EzW9-I*?rrHr
z6XkcGKt!Z&uXFABE2l54hV^iMsh7Q%%wf^W#fR)<8e_DfBuWnVjt_SZ_jeB8d-H=-
zX{9x3Fl4wRfnDs_0l2PSu7Lr~Y#Huj3r_3`@fe&m9p3tde*_(D|Ka)5@h^A(=$}Fp
z@&M8kuF~x4VYjg;22Bw9Amz-jWVc`%$;C^uch;ylF`CFV<{%1|x>IqI<6A`(SAHS`
zvX1hy@Q+NRUtv|1|6u@D0VV)P06}(ggeZJaiBNhnkVfldG7-X4Nn!;;LQW?~T19#2
zdG>N~w6L&z|5GpS{Lyl2vwrr%f0d>^kT6)22X8;>iq-X{XKU1o2czlg(Z<!cmmgi$
zEwvv!{FMIk>WlS6Mc2Q*64ceog`M3;z23_0``_LR<7L0zJiGpcrrKz{HyzCnNo}Sd
zB+<&6_h<>j1Jh5N0r(q`O4+LUJ!lOfz&g%^Ph?%EN;ME5X%c3*5KOkeGOw@KJGWID
znlwqK6P2VHgiuH6qo^8m7ne^Mh#N3mq~M`|F`_3>NCYxTGMHaTUj8H{arccs>x_pY
zFvp{dN23eJqf71jBW;4!`PV~#Kp+KZfto;Qk{?2*Lq-E4fJP!EA^kZcqWP<P@bE_v
z9fR<z+u~1oj`BYeairD#Xp(tJ24_Ep7e4N~#uJNTt1#txau}Yl5fe*%Du*D}3WaYY
zl~HKrQ}94aazc2j--T*0g|jr{Y|k{a?UG}e=J)_s3OVk1SG<KA`{5kM>{YOi1(llN
zF{R6iSM!7~k`t{??$xx_1p&+9oLK~E=IFs$!>a`ku#iAr@Ky5bz%4>b=a%Y4^w`Hk
zc3mq8?9ORsXOoATmBd8>u6HeP0wOtQ3YnLn+w8cmMBuQBDkW{1%UbcbK$cux!fj5*
zB3ilcV+g}&w>npWLY3;CT&lrL;8nJhqY&Ns&Wo8(8)if=%OoWh8^<nMHk=JsPOmJV
zT2^Vg{a{xc&?y-nhMnuMK^saEJ;vnSAK$FE8dqO@ig6d6?M)yqpITm8TYBgF?`Tch
z7?X_-8F?z>5NKs$AZ<u%lO*~_-~LJCNAF#H>cYyowT1PS?4>AISm4U(mCB=2k{y!C
zbZ~IAb@Tr5!Eqd`Nt}+S$z-bHIL#x@43+URZg#c{TiNrBIl!qY8_8*HlEl3K&g};u
zJX}A&cKV64i>H<|J&F+7E93lf?{P<{Q`J8>+PnW~_u*C?n`xAcqhvZwC$Y-XGO}P}
zLdPq$JQycrml$Q12obxz&WoRWu9R*#%H2}4QE99I1wv2@R!%Q3pIX}4*uDMU9b=3(
zNI)nA6~-e}LGp88L@@OmGh60#DZ3a7+e#6G4mf3&5D?zK^!MO7@V?u4V*76c07Rqs
zxlhpTADrOBi|%7JQ~wb{5P%_&;-p{64$uqD@k0!oSep}BL2ObtLzF}&#w}B(X{O3_
z#b;zlC%UH4Q=ls75+YCpcm_ZL90B=7&L<h8%UO~Th(e^}F)5=lW%ZMn##0j~2tJ?&
z83CXmjlRBp`D2aS8_ip5y|r)ZNmC;1jV5VC$?l|eX1V1rPSPXlK>KLz!Vg<Px2|H{
z3D2n&_3&1B<F%)HOZ|&4Jn{p7^~~lpYMlM_>U1y;8-5ZGCJ&NSCi3bB3tB7=gS~sB
z`y1!GSI6f&jobHcn3lj0lfz+J^J>BmHGr`Gz{VIL@B#@0qyS}N;&ya)M=so4*c$Cm
z{<9_j$oCFKP!qmKTF0Yt=GqBDRQ6gSb1^hqgAEdpF=TXhsgy54Yd=nfY9<N{dCl5R
zv%Wds{y^z^wifRmJ-a&p<0zR+R9niV5$;MEDb+9_v6@9|Tg1#RfcW0^m+}WszKh_*
zT>~GBhg3HR?%7sOdpXG;t7<Ig@hRPEtxT4!jm-4<<Z8*L%kmCN6oJv@>L%Qjj~OfA
zayUy?w!rE^oI$A^hm$hx>g4Giu?#ty0c9wo=nLeTe3b&)^-HcEIj^Rj-z)lLV)4fn
zi8;At1kAv<H2Ybgiq?_C{B_S;<*HRQJ9+Uz#L!xDM)M`Fb9M#B=l|;efrk?~cQo<a
zlwh`zC+@fnT;*`W?sCFEkhLNlSK~i|tRN=#6(_q6fGZo_r<0iIyDZaqQOmK$iq9aq
zfgP3oiUZq~VjX7jOF$su$v}v(ChN7J9{OP@eNXyQNKZ(~!d}X_ZUb6tZ75YHRVGb!
z6sMDEnukMZa!wW%V{jCnFKVIRtOuQD*r<7d?+KaH7|4Jzq_s)4PL+w{bTU=rNfM<>
z=^PNNl=#_EWuTNVWf;g>;MHq>E%d^`TUuY9UtMVRI$q#4yB+CUgd?6z<MA|}MC0SZ
z@!sL^u&=a<V;!ez8mlNy<3uHiR+=;!Fd12{a+&z;K3g?d2C4uA0TP8LMc|8i%?|@v
zuLWTs=a+j6t4pn3r`D*2&3f3Zm(Qe5)%bXzQZ?xhk9QA`b`P{NiBfT*qF6_fijp)*
zbgH#hWXkOH@)RM>wuCHO+;#&(2;UQ7;5X`CJ@kFw^Cfz|^aM&Ng|xis+?G27WwlX?
zl*zAtoT_Q0rcs(CIW$Ym0qumFaMrP%Drb^Tcq(Us`n;Q>`;Gr;^0iI415f?n?=tiZ
zy@Ln-^*^JEht-Gde*`BD7AiOedx+E6TfK&@#Z)H%NTi8$QSy?%G#4WvqA`Z|zSVbO
zlR^vt&tr1{jXr2u+0P7+2e1No0OZ=X6^o(pJg*i2P%@h8Bo$HuAf*PRLSZ6vs35|S
zK(*oU5=bScda!ii!LPN>z4edfy)XOSTOJNj$$kqCcMjFwbiq3}ho@<*>vQvj8jS~@
z2^PHi+4yL;GrD>1=`U~l>i|YYqX;ET;&gE(-nq92Q4)_<#&9s{?gjIm-Va~#WmvCI
zw>FP9c1~S6yX(Wj)@YD){Q26dS?t5nev@iO1OfpJW*R3T@InEET8}8|MgFRK>PO+-
zS|f(N$ycSA%(uRknr<1}N1)YVUmAjZ@C`&DJy=@RNdiavQlt>KV7LhWL%@-Z;YFep
zVbtlgQyoUJkzTR1lfXRES(9gs4E*ta|Jvc;O1tr>*SdW)ytveRryd*`@{|gdsbvX4
zGjkiL#nLN$y9GkE-Tj%+zI)$=WCGbhoE|^nr4!8706;<o?Ryq4zUb~9!1l@t#0}2!
zV&M!z+Zb0DYDel@-Lk>`$!c~-_4APX?ye5iMpHOCe{`d2u{tE<kQknfezDMta!;=Y
zfzMPCxwO&+&VY|9P6pem`%Ah17vaF=IV5uZwJXCY1dCl#B@fR*^laz`E31f?H{c?t
z#Gp5Fn}^vVZRS(+i^z%`k4GZ27so0~wOaIYe~#)D*xDPCh2ZFfp}0fFt0H*>fG*lu
zy3KN3#tAP4&PC;KQO(5V+G;zoW5}ZG>Cb;<HvhzVzDh19?*otwX+cU+oG2nnRL<!W
z0+|nZ@hXK!uQA0~R+&WWRA>Ep5lmN6AR-cgQWSwALrUw>)bl-I4L>QfEdxWO6{Sig
zsaD1qA~Lh5k;<prC?Wx5v^FM5b(HA97lH2$Mi1}bdE`kcJrn{Zit<6sKEE+pU<M`1
zs6@v~C8<eLohq%h(V8;vKO(1ZaC{74wlm?ZDIfp?gc>v&V~jQ;)y9wIBvOGd`orka
zgFW991#eFvn`vf(Wn)MyQd*}<$Ei+Iou)cTwN|8!F~&Lwx;Fr_*c@aXLB)40XGtoh
z;}i{nm+EY+?~HemJu5`Ts5id>v^GkaB-J`MUM!rlPcTU(v{vUQ?oSRKo8jH)F5ett
zhxdQszk?o}`u}{j6I`zJ<*L@Kfl%3;^+Z-*r4FmC!zTu+Rd}_Y&y3F{qBJJWZdotz
zqcjFW;dx{Xm2lJJ_=V0I=(enY05RYSKngGf3{Twh$q*Q$<CGE&njq8=Ac<5=R#h4(
za|Y`O0YC@<0yU*VY|LNjdOt{}PtTos;MMoFu6rm%2k<n?B-l%DZ^L_`ZeQ8_il==w
z)`2H3`~r>+=Dz#SKl}MFyxMFZMc7Lxsi_MA=IGAGU<W%Z^LxAfc5A=h8m0Z-{0A$o
zxv{6rDDGZ9Uzc+0%@0;Ter=^*`%yFvM575XNzK_nLcP9sFhm52Xhh~@P9f2hl3rv^
z>npF-c71=+Nu^n6{=5CbFCL9P-D|#@njWGtS~u!-f2B6q+2O)X07z3xl&xfP0SupD
zAbJ43qdo~xDA43$X(5Crzg(V#(5Y%Hv~MiUy(3Wf$LC_z**^R@04Y^l=zg%!zM1HT
z(zTO&iXypB6q|=EGN68z`j4P{8V>Km4D<XWxwt&G=Rp@QL_W5fxnuDp5>@rPrO#3o
zw0<0;b~cv#F)*GR%Yjt29G+3%AkJbV)zyh+`Sj@atIQ*XC0%jGTxFjnPS~>%6$RE=
zVPW%u(#&#L0CVJ2PW*jsA&3<L4P%CJq9xC>b8Es%9fGrW8qVBNd}d80n9HzEbcVv@
zW*{K|fal&NmExT(l30lxb!XddTBjQ`&0^#pLxm_fm_%@*9EvD|nzK_Q=rPYOD;MDL
z&~asq1#rT#;mk+kpdj*b9Dg`$jNnPKvs`?s4JD~I#w1FMoa~PVD)wjv>O&T6rF^e3
zT9Gn_3>2rO%puHw-4GxcrHF`9r9DqEw_PfIGXaRodO|}^SF=8I<UC!FEB%czhEQut
z6-6<6p7JD0DLsj0%o?(W6LNYYX=74llr~12G_Ur6GQu5C`vz`f#SP=cOvh&RZO+h#
zfRxrcFRy(mg+$L2z7$eOAu`97;zJT;g{dLZ$|y}*8D)&pq_x%tAjdy#e`lXh>oVr_
zH7D>)5Q#_|fk0-OCemQRCZx)u!GJm{-y)weg2@l8OvS4p-0t2`eU_b^UT}sB<bH-K
zUH-ib|1JDHH2=|=bJMS7YRf8+XpBTu^wYM(pGu8?%;t*H(?<`53_*ICqcQ*p;b)a!
zayX!7fI{TL8OwV78UGLgXn-C70_+2LZp~6q{(yiqX{jJhJBjdX`e+FOMIgx=r_)1>
z>o6fu9s~nu-y|i%hX2gcWcvF%aAQ7gX&HK+lt+V6wC>T7t_7|2)oZGiicqF%YW!3z
z_|Q^!-wJ>HuRptXWwZ9&WB?6490w9k?cp2y8-6cbSX<cJ*qyffL`iM4)uP2%#Iku;
z_Mb>2Jn}@NrFz|WwvShq+N;U*(f;uJvKGvF^GUoEM=xr)8wPutf{ad!G^I&5Qm53%
zUaO5U*jY4Q3IGOz#qJ;N9{<V_yfoMPfzn+>R8bt(>dlqq$<BT;N(7_vaL+5;MTvaG
zL&7nDtUeHwPxO(rvT^NzfI<jaENDiPua!?E8sYAhQ@3`HpN^9GTD?D*oZjs}6L_Pw
z`5!$FSjL=IV{iUU3MBEw@o!~JTU_tnSvY<OCVhNt`p<kPJ3AFW7_>C@8M35+86Fbf
ztEgzRUDyrX@tOPfC-{5LoCFuppvN{+wwkK?3h?P8@t3W9gfh2?$es(bpeH)yESICg
z!K!jkv|&y&6(JD;7bg?4`E+6CZ`XD#Cf$ss4?rLa_ZOnawiC#z4P;Es%4c`>GZu<o
zxh8^BGzA}013UiW6@>Gj?&jn<6Z+B*j<5t)?fRY%lZ#~LEW!DNvXLC1l2ZmN)fics
z0aWgNhJKTS`OMH1h+|T&bcrF~mRFdaPhyn~l~5w(mmR^H8<2Z?$aWtN^R)Qb#DNRs
zpFKMaVGI$HCV|Qn)@O8*l5mE=o4tLG)#Y<QJN}%Zjv50*qy?l}6)eTdt%haY17tD>
zpWJ-8{Betc=N?_z)YkwQrL{n%GzyeLVZl~JW@w)Ix@Pr?0Wg|~$QUvJWDF8f<^f^B
zf3{SVk3O=-1<1jqD_<>7i4a6YN&}+OM&$m1C=oDo%qv>3@(4?%OZK-McIUM)*@cuN
z=)^mN0z2e=R(AIpB1A#Pq=cvul|tlIBk^b$a(Hd!rxlc4BQgY-RW$|T3n!2$a7K4k
z;f{l2B3gVDavm{+e*FICZ+`>!;PT)5TfS_OTXEZ))eoafFNxdVGxV20rax%`6=vEe
ztw8#&g^F(|)svWN9!M|KkdhF>{P`+B0+0a90AqkDK+Rsv%t6UB;1gg?G$hp$IPRgI
zfC@<;OOU9f)(1M>&DHP$0SM@K(dg}<E*4kQKTb)0WvTYN;29K<py}TpV4MWuVmCgO
zCJ_**dZI9v4c%N-@BG_y^XDGD_*Z_YbxTbtO;g?QcEp3{_at;Xo2YhI9-QlZY(8EX
zZ}0Utr?qx7=+t(PZiU`N^+P|LUtO9U9ls;wi`qz3LD*@-;ej%#h7svSoqFBoc0USH
zrljiQ=|z2Z3x|91{uQX{oTyEnkfVBdcQm~^*LWSWI7R^~j=ZqeSezg4?H5*<1Sa!r
zFWf4o00}^iP9R;`Cpa6>WzU&0qya!kpZ6+;{Bg1{*SaV0mJn(ZEsf)4PeyJPl5bCm
zZ)!$XYLl}5D?4^6keSQ5D}DLDD*j8P2wD?9mL@<YEyUXC<h{A|W2*83%esjy@I#DB
zmz##=%dewi<S0h2ks$ZG=+<c^$YINoqD~-pXXj@R-F?le+R$0J7}t$T2!<C~<nXUf
zuGQV~u9b<>tQ4gH38<*p%DUMpjMz7=AeM-g(FGXB<;+wG>BQ0^BR7#LD+S^cm6N*y
zbg(Jl1qoG_cZ*3n*T%Wnyp#8!sByrpg@DR`u<<Urg(!=8vwSB)r*5h8h4K^#LYID?
z4~6*_W-k(PO$^L%G})b392}NAHDiBbmBmDrtSJ^v#y4d<dc+E+lE|i<mJc(P^J0Pu
zj8#<8NQM9mf503fGICa;dp8uP#hd`YT9COsg(fo;W)LLt#>T3u@*9-nPT+oC`%IRB
z5d>K<oYGV})Pcwm(Q-k{Sl#84Tk`kFZFcRF#~RmC>1BQ6$y&tcYaF_(Pj(*_U)357
z5TLdORl?FR5WzrZ3!4{z<#?iKI0#D5W48Vgv6KtK;%0MdEV8!*5*5FZqlcE)0fdkf
zl?be)CA%I)eFrA*N*SXAiaW4;1|4M?0+7J66lOk2d0+`6?Ev%YEQbZR7XM-T3#0je
z^6V;no+P+pC8x!PMpsP+4S?iB8GV1DO;dW{hqGT7!b_!)flo$LK{W#*gaIN$L_Y<p
zss1ql2LMBW&@z}6LM;Jbf}V%2fnfv95XKUsK12zKDGH?w1hp_3kHLf>SidI-fd&in
zGVag8s`4KO{-)M#NLBM}XS|`J=}5E!(Ft@kAR^KvQ2G=cJ~}^lp>g4bR|lJQV-ner
z?I|ANQIx>xT4&`TIyFsNTW9*0Yr(}poIck-el+bL>r~g;ScgcdfGAa30M-&Uf)qe`
zgWcVRSoAz8<$!3ML>Gh+3-x<@qt(gentJ9>#iU=ma~5i-Op;5@5K}$ZZM`v$pFEzt
z+-rR+P8Wy(q)>4rYN6k5#Ye|72%r$w5r8m+DS(F{W-9}57jkgbIRF4!r2r&^%p?mL
zD?^zY0DuP1i+bK&0xagjPK{>-AdokW2~pR=$BD?5DMU|2c_o|#F#HIp-A^s^&;TeR
zuN?ES{i5iv(eD0^cHWvGJI)x@>Wx3McmmLbf`F=o^WsRzg;9_xpvjh{$i*js=uYJ-
ze7StdBxDMes!F$5<oM*YD*3Y8Rq<bfvDwN(1$jM040fc7k4t69$DFGRM59>a?bO)8
zF&U_ayfB8MKtw)2%=DR57%3x%WlGRaAosd-TJg-2xqM3U<=R4h&QuU-7F=X6Mt0I%
zP-Ir0{sK#cV<!F9s~K5@X`!$zZ6I+rNs#5%mSGayZjBpET4o_uZF-8guSSq?vqE4=
zyqrCNPQW$Kj3z{e&Tz0D!HK@WSyy%&+Dq26+D?CYd>%Ss##V`3#i+PMjBU779XWHW
znA{h{F#*Tw0aH<W(M%2MGEJ$p@Gf!~*+YWP@mC3C7GunA{R|$<@}mq;?q{4O;uiAY
z{Kr@xaAlrI=(vQRpiZ;B6+)$BM|4RT`J+RH!w#9e0yAWcfy{i*7y@FLb6K0SUJcm8
zK{yk%%TmITnIx7bQq12nr@ay}Ys?Y=Ajh0Gb0I2`YYV+o86Jo%RuP>toi`jdZpUHj
zFy;c+d?5fN>geWQ|NF*Ip8A9TWed--#~+zXI!lct^e2aU{<MGa(ER%;`+!IZPlV0c
z&2^wPX5oPdqOc}G#9VMNTlo>71ni+7Ll9LWI(h&ez$9}e289q1EG8hA0DCa;U{nLM
zFF>J|+9;znisB(bL1=WEqU+sBMD?>5=Hq^{(FUoT^&7_2kU%wYJc-Rz1L}I%t%qG>
z3<%-XLNdX|gBPCth4)BHrIA!RohG%hiTC%f95hbXn)QYr?Q0UEaWpv?1}n>3813)v
z`R#>9*sjxIq|=a4B2lU$6zF^P!SRl2L|w0iDH0%%5&rRDy41y{sE7UDQK*iBt!7Yf
zP~n9`r1P7DND4iPFM0CFmywTN`N+yJFsUM~ZQP$Bs7bZzrvoh~2(k*Oe#EMY$dtmJ
z3@<NiO@$#zaI&k5G(=kTPp?ng&2T&x@KelO41g{kIs;$;WVwbL1A|Q<^D}l1tS3Q8
zh!SHEQFd3w{3+m`#Klu=ms*~D;MmUbtZ$s9>hXwPWCpv;<sN~DjoPiz-Qlc5F>uQ~
zYl~Z{;<&>xa|E=pKrGbO#s?8OpO72_XBQnU*HN&6AWR1BxH;Qe0&VT$6pJ=I*zOVT
z_QM&3PTVm%OCO*O_;40sbd6>$^^T?5Tbph-7q=XEmhRP@9aznYL*Nc#;2c<aw66cT
zO}Mh;^s2lV`D+v~BO<X;5UVqbR>=v7FSlX4bCw|{P~qPdC>_^Rlo`=1Pr8I~kyw%d
zA#$5@{==mpp1AKgFPn;sfauhaGu0m=?}SR13?4M>2u+Yqhz%~`pyJ*vr^ZEc9ibJ2
zl$mg3nWfC&99%TFTBw4}d$EQ#<)dsh2!v#LuH}n6rrqF_IAy7erA;(tss%7v(}Z~v
zZo!Q+WocE2R;dzsV*55MuN(Up+WaE!-|YgnZWB;Gxy6wbOuc+iV$e`t_?rBCoG}AD
z)R@QJ@+2E{7_LaJ!!)^f0w*-*c^Z{uTqybq=L!M~$;h#6ax*wwcTZc7A{UzQR3|KN
zdG>fB0>Bo2<M#jJpLpMDJoVatVH1F`5--fA7Jz_|EM6c0f#~7Cr>f7W!Ny6vEHp|_
zk4Mt;5JZJAfzq4xsQb`4TnFF?NB|Lp1nVixH6ghKqX3S_ARdCe2cQr=ZL~=gw@g>5
z0)U`aBhEKL03o_t8+fooqVUXOps*)`(RBZKw1MdPLC|dX0>2@BTwQ&a0R1owo1tH?
z*8v6#da~5K1@S>+v~^lv-<<{^sTOb4ZXM}^RH5g2D%K`V_l|HpiQ;$=1dSkQPN#ie
z)N?~==^+ZOl`%@_DJDnv{nfdv_g4M)gWZ-NHcc*v$m<p|+Gw4owR-S&BYcZUNEBXH
zPa~Q*@qFKJ)=ifBQ?#(!qiF+5TR+y!{H$Y90RTE<+p0vXRI9`o{UM!&NYk|0-1*gC
z+57SrcYSHn1V74q0O&#=o)V>0Qh)yZJ&Xow2(Rb+iprs7;j_h_MPfn?VnI_pBQ!_m
z$z|%6xfHHC#PY|S`5lujmRlvUoejyZA$GV?27s6I2PmsUwAKarl9e^Fgw|2YCWkqW
zZI#3iw2^$a0JM7rXa1C#SS~b($iOQ*9drODUcDmE9wX!d!3b0&1tP;#944Ag1GXa<
zJ6=Yc>76$)#Tn&6DaC*Yd2$NE%>GcqnqUh$bR2=pNYaX5KTCFYx&^PCWs`-O>?D^g
zd0P+zWb>~eoiLHM7IGZBMn<Eol1pI*sAk}#1L9dkhI>I4MJe}av4jN_6-Ts+yCN}5
zp{)MluGM)FEDE=_(#N=fU=e{x@UcEw4(#k3@#35+K0AcY5Ib9riqu4MI0%Bca)gHz
zmf^4Hz~R8XJ=la!z^vfhnOh66u`&f4!#Vl6%7$D{3gdg0>5>kywB$*YZjz;DoA)7{
zq*}n2cIHsz)e(Xy%T_p1djy%1nK+3D1(W9>WNN>v=cG$hD6OWbLT2Uc*P>)6$GZ=h
zw7XPY^XkyL#*;fpAlp=z-xn?|`b5!$rT+j{#w|QYlYMH$_doVu!#Z5}d;dW#SO(|*
z;TEwK!A+SxlpmRyAuP|xcR!p~e=<EDWe7roQI&!a5l{*MM45dS!<oY<1QHrDOk#TC
zdl`TQ&_fUe^%R;R_#q4yAc<jm0Nxlp1rU@+WVF%R2+5|Hi0O1H13#!YlIg?_P7FOb
zHQ#^OThjG~`L8QIS0xk@`l9Z6K7d96QU;LJ=9|N2yGeoBd-b@!?E7;ykIZB+-3_Ok
zI{wUtP8x8hKThZ6daeEtmKx!{YH!8ivM{Yc3Sp!nHH}AFB?4uVPKmT%Z}@&)M3EG}
zNor$SF->I_|KQH+A8#Zm8=JGN&0@DOY1;C|CK*p@3<`V{J*mdipx#Uyk%?oJGOJol
zV$2|s5>J5l@G*{eA380C+;p9?^NEmA06iCUpp3OAlO(u(+eFhSNsN^8BiERm2uOyI
zOlpir;A5$+_!$681Ta9_@I6~FC2qx)R9JeRtIuF6hf@0}nDvV-z}Q(3R=2@IYKiT&
zoO*}OUXDy^Nx+N2(z6#!mX0eJg&A>THEn{(bss)Slap=3!WNoT)fgjY>J4y80yf1i
zJ3ux}<I^)DSGvMCYv6--WYu$pkl=ddRk&;?5zw4jJOKd;OAaFB3J5}Uy|^76w?z?<
z-%BjH(@u8y=srJ4QD95JLN?J>k%Y4`H)KafC7!?o05fSo(XTKNjmps~*!VnFB4Zgy
z%wWnQ8<_#oEQij)T8c|mzH0GWU}XkWWRO}XBCINB3y`sdWXr0MF;@w>rDU0E%1k}c
zweGF9j>I#M%aBF~G$;FbP);V}q7{xLu^8>j?3jy(u;|JdP|8st1V;nI4I1;<69kv{
z$J@&SwzOf*L>3z^)+Xjio&#G&orLIQ5VGk2*`c((4VaZu)?b!P7p#ODmNF_rR<0qJ
z;FJXx%>=G90Y_f*F$b-Z`p1l1$a!qa794ZBED|#~%D-OpaO|2g7Xcoe<TPn$v&_rK
zWG2g~Xf|v<XMVF$+43VG;3&EO{_p(P(1vS&^uMYFEBxlHhFa&CzNG|Y?Xgz~GX>(~
z;<09u?BOx-_LXmu$V#nrJUeltJTt@3hNPJ5wAmyAQRc>#1v^!h4My=62EjzoG_Z)!
z?LoW<+dUZVL9!425D;z6SKy;O&KnUkMp_z0L?&o75P`JG8vV)2k~Xz8UB<$62M~-R
zGNjU2O5bmXt@ctFv{6VQrW?B#kM@=h-%x(gSUK+pHAE4B^nGbg`v4kXKYeOmU28`D
zT7U7Wl~AUKI}-zbctxmM->XSL;fqG9rm30+vZ0c(hmB_1Hj`MT-MBG7?9Q2U_hkFM
zxvhDM!YLjrr3@7el9`h%WOO|G#KXPc)*2~Iv{JeBNgEXCd7iWSA!g3XC%CPX+fRKI
z=_}(<6iM8M$Q0n8BGN=An~-YHuO;d7pL{EL^?PgRdD8n?MH#$`B%suoi8fPhVr{ai
zbG~u@j6fiDSLn_U3DMbedBi6cI3HP0mSXEFhnZB)hFNr)GiqQwEwVE+mgQ4mawW2d
zRH2}k$-G#;CL!7^?-D`dWG|-nwMW7R5InYdcCuWJv9}kUY?><-KTFjl%5n~xBav30
ziwN#KrRb}%z#zE}4*1}Vkd0!Ubrs2t$FwB}GJ1W5dXyJb+3sLxd@er+8L1O1xK}xP
zXA3x6$B;YH6__Rx2amJkk!w%?oD<E-!*VTo4+*Q|{7N1)l?_FO%;c=zEIfvB76`<Q
zXGnoh*!s1c#k&+?7801}%DW-a?B=M%3Od;@XajMb6HR5|$n%u35;p8E|9t=E{3mo!
zZ9C&<tPDP$vqdkf5Xl+RJH|=5E}z9kJE@8+dfSO-M$QaIJKe`J$C|MgI9W5NG!*}K
zKV9jf3BZV<h$m1e7$1e9N9ZO*+9*kfTv*a#*fK+`KX6enMgyqa38lXc>vUNNupJ99
z%ByQhK+ee{v<tSqe8nuHnE6!VD;<*n;DlPLaALuUW5((#f$l%@=a(v#6_(7C>>ci}
z{r{S;pSgVhKXMzT8FU8SHlNW_l#tL_k_Qhn4B4FI|M@c+UGPmmMWK=@>BMiZ0~<sl
zKxB*|lD-s3AS6nOjJVDW5G;vLEJ&|G^(kNiAOIACmx8wn4Ie0g-43Kj0J|Wv1y=H>
z7li<U#u%eCTP{SBj7cjYq)t<m5>a?TKtx8V=3>tqC5I3Gitr|###=_$O_Yk$&Cww8
zRM1&m#wKZsJM~p5e9u#xJEt0rBQK4nyR!T7cI$LYD*y@daDbDTI^m;*`l+d&S9+SX
zb{9|ew|5|_t*xBX6E%Jqd)~Zh3eWS@FiN9HdSN`#{+ib~AEdqgiPr#~h6^|Aj~Zdz
zMz8J%2Szm-K4>*HrdYg$a5y*=G-~&!(fMxufhW@31Rw*(l=ABJB%0<;5P^{pcR)-4
z$HmE`$NGMpP;;HodCf>g?c;68=&W8PG6IE1UP#bIJUKP^qgH<iq)q=(#_h|E2?<il
z?`@s66Ce5-5^<vSP%DXOc5chLRna?zeAHP|;@GST8IPz!mq)Ivu(Ao{BO_+6=d^2J
zS%j8lXK685hG-%(`IqbLTbUyw_uoLQ7K022w`(doyFVbh!i$`c$6$=|#Sk5S5%7YP
zof`|&!OVW@Ou9Lb2Q2_%_cdM&xB?G;a<D|d$iAE{oE>(T<8+9~No|(4g`78DY7($w
znOrjdU`9xQjMawd!mS9oZyz~uAr%8>a$~0oO@Ng$bNLTTG_hoKu&KC~isWR6l;ZWm
zNhAl-kmo!*IvK95cBa5o$%ZbBSg;&e6CW4=yGT?ZNu_d{DpRUbt6UV1geRDm=ZIr*
zH<Qi$up2A^x9_n)I+T-HD$go8ris}L6t*H9mA7(N>nDdalaf*pBk~KDjaf5C^89*Y
z*+5tm6-HXLV{T+pk<vV+l<iyXm-R=g$iFzCPZo%Fa{GuZumsHCob2c#7nN9V=scD(
zpVpT=g5tdK8;LtNv9T-W8mvNq4{WAe&`XF5>75ZY*Y!GbJFqh7N?IclkJsTt9;6C$
z0*fn8$ZVFJD^^(;35o~G4v6v-M~ry_0C;8Ze+EoSQrttu<A|1jYPIStIvEL|)sw?L
zu(nb3m*;)~3dkTzl(X^lLWm?zqT#r;&@D950%dLs=TiNoFl5kp>s}D0HA5)?Xn+>M
zJkgPX-2l8H%1wd*AUwftl*se^6T&|@EFgr6A^`9^-LTb(hW%5M@n(1>YW%3%{C=9Y
z07Y|QemoV;<@rXhWt5g)FcC+oNjwn(&RsmS7X;pDvOl;r3B6~iIjFY}Ygbp>aB6f*
z?@gxOcJybl`E)yI#x%Jb%e_XuBRi{e(Y+C<`NT+UrP{-EJx(U$j(;g`o5?HR6N6gg
zNHpk?H*Wa-bJ|ZxYUz7A6-j)tRr^55*pM(rgMo|_nYkThAJ7;d$PcRNt3*m;Jq#L+
zcswpGL~x8aaGYUJ4sJOy?yT~kkNW{fH3%k~{u3psk|?G03kJuZ?>0mLLai$S8Ui5A
z(}X}_Ueg8wPZq2=cny0F8SRFOgb6!6;NwAV?MZxOOO6Li*@;o%Zh*yB!(5v<kBYxo
z;dQ|jph(Cjrbyh<mZf%}6J&v4Bg5GKSXiSmAO?}`ipb3K$jS}M*C)1zl#v_-7)e&L
zSX3R>+MrBKBJ0OjY8V00HBrufh@73Q*lMZVD}l;!J6qTp_C@6=sW_Q-W=xLxA0KGt
zACXu~PkeZo9|6O`T;~$xT5vWRBy#W`Bp{C^3h*Vo++!S4T^Sx-YFx-N3^<U)<;+lA
z5+EnB!y58g-#j}ww1hT3{p4qXU^cOkAx7v#lOVV(6Rbom+L>?FF0JHhp~DYwLX0c8
zp}lv@W{7(#y205_$X78j1UHb;$z`t8O~mVU$3})6%NpR-fgRG768PCXRpO5D){O_z
zYSbCBN2QhriDdu_K=i-cm8C4YOSk2_ls6kxt-Wl@i&OaH%%B{r1c>s4yDmeeeU7y?
zw*vSI_rvi_KyvJ*n41iDCbjYi9@&QOhrt=od>*t^j^JG;2QVQMV8u?nAQ_ZR36YIe
z=T$AIklXANhTLIkUSOqWE`gT;`dA=4MVX5TKtij+fDt8vra#w~o2H-?gh6J-=Wd{e
zLwy2qq*O{qppc$lY!kU<D+(_o0&;&#LPQ}zp&`-+2mu!qG@8&~g=q_dJAe^E-Jw`i
ze4l25=T9gZgdn1LG)&~A)@%+T=z4TNT{7ZytMyP*({HvKgM?Pw$uUXefzhP#81F9z
zPXwMEj2m+v&9zSJT0GpH#*;Lf_7{$8=U<*P9vltu%nvrsUtWNo_tv9H(i+WQSg6m{
zw{LDFd!nsQYe?|8spDig+NnL+PUF6j$IJ0Et#>rg82o@dqePtDb4C#<3>$Y3hNtSy
zRDb~?4CyRIH$PvQ!7`eq-k+jO2t>t1$4p|8>!txcp)c3q{sg93PRWO2yB{8FfgkzT
zOL>*iMr#16wE{4R((?iUDng28nBI>a%4+cHV&zG*{T`sl->OWmC8CUHstb?EK;SHi
zVdj9Tnh(LlnF>c-;?ogUZ57BuxxtiELE<A33miI3yHZ_Y3G{`-6bJ5sb?;8rJps(-
zX%N%4F`&(sK*;u8su;g80$Oo+NHf&zat*fv2j@xTwI1YU9wIpNF&kj(;4}<gMV4wg
z>kC_~@JM)4eP0<6vUSp)LbMzztgyDQ;&8-Fhmpw9YqJlISZYRK#swN(zIeHSdk(*m
zYfrclk7bfOg<WZf$7&5%>k14~5L9j<Xc+*u{UFD6CJ*PRCek5P<l3d7FY(hy!0ruR
zH5K(M@;j^QMrLyhFn`J`xxV1O8awP_FRk(qoE#G3Q~`#ZfF<hMIvY6`f!V+i(@CLy
zN|~Aj9bL9d))v6o6U7TK>&_F?9B1w)Za0io@+@L$8Yj@Ag1MN2n5|Q;^_mG;&kmE*
zKuF{(2g_rolPtD!KMi7b&sL&~7PTX5-wE7gj73XV2m|QcE@Z>Jx%P~gs#rp|XuIAS
zQ*T~d6kS>Igi)oQcN-nbZ_%QOvMy1=bsNvQ-j&t5%Hqzfp;<JxOUlBMFrEowtYsu2
zAS7YE4q%uH<Y%_=BZ5{FS}oYyhcpG>x0Rn4=+QwMZuq@(q~aU}B$J&WqlpX<r9uSu
zGfR(*&OI5+b=-iyuha_4wyJkYn|a(8lqQHx!T>?>!={t?iJ1lYNx=|K6+%QNiKl5~
z#HW|e4I~~!=?lxvM@drCX&ThUL~ETCGI9<5bd$)e`KOKtYwd=qcSMpH(8~84o($7l
zaCcj6k0W@h+c`VG6o@}<O{P~aE-%l=)BgBQWG1~vvJ55?Sd%h1oIa38VekIA19j(v
zrEkysOP9s7^|X$GARu4*S}P$jOMMYy;(1Xhlp&!A1$sn8pn-sl)?~6;Ht=>4Yn9Zd
z91En<_Qgb#2!f9g%JPv*x{rMG00Ih>83>sjOqyr_l75Jg8MRA*EQu06RN@05B!=y>
z`lrWm6p7hE$AzFdK$M7vDq6czy<w$?7TREpi#&#bIY?E)b{t`Z?PNI(TCkmz0|;d^
z=j2m?OGO7{14ozZQH-4|6n0Y3D%cPNDuY2v<59cyBUw)X9vhM&TSzl;TUg1UbuI;!
zL@*Xx#r9}Nv6xYYojfD}%yuhhd3H9M%s_B<eJH*n3b3gB$S@N%%j@fGea|B}NRXrS
zWIxY}bz(pRl`L(RWkQ9#nm8_4?p>mw6LR*R%daG0B7m~zKrY50;9f&$?=3fhuPkK<
z`NgwCXpTw{I3zW&L@6Tc{Xx0@7MLcXG^6AML)YJkvmVL1X6L{Uoe+10%yk7_&IOis
zD@--dxS#fum%Mv+7h=VBq?(IN1yO<zZK-6g=C+X5H-ub%Cb(kZ@+=l&f+CM3BbhQr
ziG$aIGs&_%N!PB4@lK1|wD6W=KGQ`Uhn2}Q>mKIFQ;K!?n7gD6+t}I)4}x2mlC>~F
zmyMG9_~mt<6}6NC3)VMqUan;rTeC^l*t<qg#UjfaP;1N2=#0phPAnC^ydSa-k)_WU
zF-bp_hB$>4HWTk7GkL<Yu`g!&*5w<KSu)sUZL**#GCze%a(sT0)%>}DQRrm0$A0u}
z+ZYf6e&tu-@BAHj{&`Rew05_34aRW>%#X<v@o=1sCMaYj{TGEt!gHV(4KM}lX_{}t
zpba|+Y7Ybe4geCGx$~>A4I*i+;*=X{Wf?V9g(4yf3EG%c|FG9in?IRv{aE^qY)Yb)
z36|S_Pg0KZql92M*}XIPPOOuJ#*@+eCfe7=$j}QKzLYTS3w-I7V5gqm*m~8#&DL_@
zsljGH*{+NI`Ea-b&;U6ny<jxmIy`>Zn_ml{2HV&hu1uDWzx&c394sG%W8VWoKwjVr
z&m)7LCkfCKBOjE=OpSmLQJ^P;hr-L&RiiX2^k4!8XGA+f1ObuoWE2Dgm?#_}Nci{o
zhfezIbf~4L2LXakqcokUG}1cJIy0k|78$5Yh>9)C=o72ZSuINCHxr_XF|i?2An?J9
zUjr4pf<LlCSJ!?5N~;$vws6O?3Z3;Gxdj{*WWn6Bw1kmLAOsoo2aY=*6JcPLQC#wP
zijs^tm4pg<b-9NUlb|p;AaWixBaCxqIN3n=iiDS?4;QPem8P+=Uh!c|wH=edaE!3<
zZXvWpc4CMSC&xQ67;F<q#ESTWCxP+$t*mLt>Yy!rQeNr8rwmI6ALfV0jS9<)&D3hZ
zy>1a1r@)rf!sXy&C0)2wY7%#)C97}c=NFh)Vm=;nRF#%7TJpY1Sqt(~kC@A2fu2z@
z#4d&G47}kmY)Q)G8fM4~BeKJ?!gjAz)qrd0gIwf+)}@C*ePq)+%AJ)ev*(<HkxOW;
z;))3($|GktQTb#LvyslqJC4AYW}ketT~^h$2FY1`mDFK=8@dHOR_mowfr9_*-}$4`
zfgJ(=qhJ1RuQRq!GgQnf%lH=SO;`}hikbou5JOM>?O*#gmsgjTdzi~w%UNlD`Tmn%
z`*wMAJ$-TWlTY0(NuAuft$4tAXf6VP^ysUfe)~7S^rL1NXYI)8mBXv&w#q8*OE13n
z*M9y7%wmi6%Y@ZTqrB&~1dHX~=;dc_m*wmiUwpq2rWGNNeSAtI@nT`Qe0KNeKlRS9
ze(uL#dFh?`_PFe{iR@Im6t$OJ3(S2W5!tBQj(oTVq;QeqHtJas{NhvhcqX}BKiF4F
z7f)cFsPCC4&u=V#?g>`-fy``nKf<32Pb5GDz7MC*K;XmE*Pz`7rDiZ-4^f;H?JX)(
z)}{HWEe(ZFg-;840GAcC8e(@I`v&D6AR%}J2M96dAsbE=G2=N`sRM;lvDR^s^=JQN
zmLk}H+iYFy{@hd3?S=ilju)iD^9Z08f$R$YVnTS7Hfr4;C*Dug<elCAt!8Th0I-Im
zWP<(&@!sC_sIL5UF<EaMoK5xuI_h|XHHi%)#|HW+{oy#-KRB+}n!e}n?7kOX=skDt
zmtOd%pF8*P*}azscRzD`NQb@_D1i(}&qv{Vo)01z85x_>=a7o0N1%`>J?SBs-lP4O
zBu$Mrq>U@5hMGUv>tB8M?r)fBAdj^}?E8xpb01RSeH2A*iC+N{Xr&^h;#9?HIyFWM
zA&~o7&eZuIMQw~H(GdlJAyDN*IPJrepR<g0WMK!6I3rtIkX%b;U?4(yjD%JR3wB0e
zJ9MlL>5!~}fa8i+A#yPHP&;2PdUfCirBqg;1XZDL0Y&0TLwqW&0uh-rYl&TDt1J`1
z5LT#~<irR#F469oHs5U7gbRodpzVHBENh6aQyH^a;Q~G2c>&0hoEV-3tog_}F}e7Z
z5c%TF!@OqZ{~TDcJDTnPbH@q<K7OIxeZt||Bg)mMzie-LrtM?JFSx}oQ=ycXC*Nbx
z%5a!LFj)4bV?<5vtd~hCk=vayNv1&VH-dbK#w;giG{sh*lNZy>M2KgLVC4bELOg<w
zNi8=sW<>#^6D?sYTCUD4T&9r+GuqA9vHoRxBJSZ{5^*gnm27MY+Da6xzlfW4ftAt{
z$x$6uB(>Hw%`;zl>7DQX<jV1|nH}CUmp7D>@84SogfD&k{in`v#%VAZH5&E!^UvS7
zbY^#b@%Z7+A_97z`N~W0Tt2hAy+5C735cJ#dhhAW8-cI)j@we0-}>?o5TV<eKG<2x
zj_M09T)%R5doZq#qp<KWu=>-ly!=kLHEq?S&4ZrS;)N&gH|z2G@-Z0bj~fWEvM_k@
z+TE3f{-eEl<YMjOwEx=Ye*CAeKfQa@>9(f*VWZWIF0Sw0xWBGUw(H~0e(%)E;Rg>_
zvw^|d((%(5AN9JEor5lW#F#{#tpF&^OHbde2dY_*caAy;aQVzmBTUwo`je;@r9Kjz
zT0XjXYOmFZjs|VCY{C5W9}Zgg9xbme9RJDd&rB2F_w*BIc9!Nw3*GTyznztLSI=!N
z&kskFnlcgq))$XYEgsi=HJmocX76CB5x%g#x6~Ud?Zv4Vdivb@!F+qttjGOv0}!Mz
z7uNUM&A8i~Z0yZDpgjO0G{W@M@^QNn4aRk1Qs#31I=g!KXm4pSl1uUJ$pocGtEW_}
zV<sc12|8V)HITt(%K(7U)jhPgprxR8m*Um)rac$D`Te=W8;zdl`IyG20Hj9?ixA3T
zY&s%n)Wf*jRw7Ii1;!v5Gq+Uh^^7M?l6pkgZN(_49_loe1c)e_GOl-wcq&c3E*{O*
zqs?wO^g};M5uk;D0MmR-GXv!CW|;s?s%`fqFij>(75uiDg4C#k1--X)=4^ix_Z}>I
z-d)5vXteZR6eR}QB3HcTe|*2TEyst8oy9FpsW=R<*}%o1b(p5x;$C{Fh8L1UGakQJ
zTj;{PhypDlA|*s11dK-a_K)t=!nu{jpC9+9X=Bj3<m2&iv)-NC?A6BUUbJ*HeyTCQ
zUmuH7NGF6sfjT)8hWlFcMyFg4MNLWxAqogYpG?lQ#6t7y`O)Uqx#483e)hIkAIaf|
zj`!)`7YK*|Qq52XIU=9!xhC^wHrg1iQ$v&+{PBw|JV>Wzu$c*V(S5zgDOHdWPb1QY
zX_75p-rTB~TX7sTOD7gKtFY+4t=Sy%I(Obhs|di-*aJC+WrMZ2vqE+Xn2i@Re=ZlH
z0z<L5gPmWXjr&43(u16|D!{U&bCN00nzOLz4PrhDRo4}8UK5yamNmjf7UO9R$}BEf
z8djlIyK)bT;tWtFv=zxI37xu{?Xzxa<QBigDl49R;>1SeK#8#RO~vTO6)f|U<hoE4
z#RFE<#(B{xs=hEbtdD*00z)W2X`zO3$l`2FTG1cdVx_F=%JWFz>~_pug7__1n1EY{
zG)E~7$h|`V9lL1P#D%zRNvSz6c?^XE91ld{)V|`a3x&{ZeFWB^l9>HcUUXXAiqIvu
z6=<eolwM#k&g{amk^~lO$KA$lg>9#Y<si^zEL!;?FKM0IJ3q`Xef;|N!Q8#=rR)$r
z&%E;djX!<k8Y2GA&wqbwzjtSI<(21e0>W26^>(bhhg*xi_GEqOuu+eG^_4g8Z7y%_
z_dfgl4FLT0FaBs8hxay@ub$uZr13q|s3q^;U4O8>kfGhb{>9fH?e*?%Eq~_O4_FFK
zUcLyVTA&{8EIitqSIR@gwZ;Cejg<%6^G{!Tgb3%?_Aj2^-Pl<$MqE9&Rf!PHPE4yF
zPoiMwVDA3bA|a;AyLft62-_6Rb;tctGh1rUt{tu~9&a7YNu<lCcOBT6?8JeY9-!9Z
zXxP~6x3lFn^z~l9vvbgW`r-xxtgjr+wWoVWozT~(mk)tA*M*OxkVcctZi8k$S?rAt
z2dyX$uAbi{z-KQ%JQ}tRj@wtyZz90jLcdW<j)u)zEnS)KI};K@M111RPMrD&gZA3u
zaU)2>Anmp$$D^jw^8ETf0zPqOw?A$U#x-q3xh8Y-urn(M{b6Gg)h?Xc1INTQudCBk
zhCw<t&HjN00H@BT<DnQ0<(YG-L~Jxovqb<9gw*MplY|_ojGPQ;;XD6d@4xx4<eNXL
zb^K}M2|;s<ngAA;^>pe@hVepshl~kBEfA7OHX5p4*NE5%qiG~mYUbyr0HCzcTEvO$
zwqqg4C-QqTeoBdCu62Kn^j@<$O_N%hif%grbeXO0c5VSCVIN9@@-HBY$Ll=M4+4Dj
z`knFH2cNzulGW*OJ{dlmj>a;S9WTI8f+S`qYQWT*(Ayi%d9~s3WT!uP|8D1K_u{!O
zempW-%CNO~S&Czf1}caR#7f0U8jU9hTRYcB<KtGd)9bdzqqj%?nm+%lc+~Z#Z6%Mz
zg6Z{F&)=Oi_tQt4zjbriO~iq(Wi}8@wd}Qmrc9JkUJ$SVo}A$<$a{47iB^3ZWrz|9
z&;X=b>qLPzS_RGe!I`DkdrLPlP{hO8AA{8q2_X_85+d=JRrGlY;YT0{BIZMRGK$C;
zohHd7O(!O&h(ZZc;|#MCPHYBdAWH<$1W7@8#5B%*Ov`$z;1?k=XEkOuLe>NiSv`|O
zamcAwh0TXEnYA4$5>+5D8z;sFwf5K@wS>#Ra&70U;aF7%wbFiqAv5mWmNA4Zle;Vh
z^J!VR?Yjv`<W^$5m?{efDlGa+rj-qeC~FbQx8QQSwnInenpJwu7LF=5A-zDlxD|$-
z-Xd3FFuHZN#ySl}NmFC-Ey#kPfP-{|Zk{VS1V6N>DzQ0oKF;8wv)MHh9ERnVj83;9
zkXv$BI}zt56U>i{+Xq!3HtslrF0Y`H3dSJfsz{dK@W_+dDo?0G;&J*SbP~E;x1y>H
z!(jp;v9TBOghbZP<)2QJhbjQ82C1131ThH^xFkoiC&39Ywm>G@>uBlw4j2g)8WS(}
z3tTXNg<t>T>+j!Rd;8Ye?9J8|`+w#0Z~Q-g?<)xK#M$lsxPIfo+6NETe(xKfB!Dw3
zN8fq#>h%ZffBb`IHun}j^~{|I+Y9%%7Q4;qU|a`)ufO`-#_s&1z253VUuhX9e(38T
zy?^ok&JqbYwR{W!_qUeEldu*jcAQ1pI*D4C{@~q9cQ#j`AQ9erxOQ)Id3k<7fY&ZQ
zda%84e|urBJ&odkpgPF-)mPqZH=@7&Yk#)Bc%1FzapDt+X&jX2WNB`6*l%TTd3JSw
z@3^zM*9(JG6Thf}IL=z!jmC&L_3rO1Ztu^PPFs(5=O69&=GqegSnQ5Q)7tJ)hX4X!
z5mwB~00D((OukeI&ojeGZRe=-aCiRJ!xaFSYflaat^MP6s}U1mqn0S;9SmBD@|yLy
z>Ocl?XJh%`xP3fq2w}pSG9;4JKO8m>`t7;a7yz2}=%C*|9=77tlhRZ+HX?CrV`UNt
zN27YD8M`+#AfS|bsW&{kdT{OBqv@rW03fW<bRtFrAp;6Mil^xLbpCP@MHtpkD*F;l
z6C4di(vO?^D4qZYax%ifk=#2H8enJ3i(-h9x*lx?o=TE1A=96T@!0FM6iTTlgJB=0
zv41?M15unvAc$fwPG!SOv93F3_UPWy^u24{;AV5O<*CGYQYkSU2U#6Jl_Ia=E=(k(
z<jEW#m9hu|>vP?oyieWR_@!5){*_7cteV_A-hH5thF(fyC8Wd#Zwf)w=x!W7OKJ%Z
z?{Ch9cg~vW_9GRVh2^up4r1S1nCr;F@&4$3f4DUmY#kqO42HX5&|I9qG}k$EbiBRs
z=vD8^AN5vmnWKd`S&JrD3<ah(Y_w~am$ui={DX;HeLx?Jm+tsR6G=qv2N6&vcR=C!
z*@q<{4aOJfqZmbtTGs##q7+hwZEDRK5JZ}^HeoOhAXU>g40C4Lho2`Ql1aRls#YyH
z_{#zSksep{;fZA;o3#=EX%(f(M5#zqYP3RhjlXBhJA5q9uSi5d00^J`Diu&48|DcX
z5mY6E5js}HI4fGS_p0M?Sw_E-Ln6=BBv^GPcKANTARG5n3)cbF3H-7d2TlTV_Bw(&
zW+EY06*$g&73D84d=Xvag9;s-bL_Ybf_om6pLYgD6xn}>@<t%n@{nMr-kMRZKqY>-
zBptd+Ks@QCm;oJDRKczefs1AYIR&IkhA+d9of6R|ni7I%C&cI&w3V)G?2KD2i{;!E
zU$tIq)+)nM36<$$=*Tsgg^?AoVpW_(&d(Me6~ye|sN}>J6K9vyK-S2ow9avK<(B4N
z63|NN3bA;dLTHmqnV=9fl_bKFyoOeFP~Nf@3a$utsB~Z|weVHh4?)Fuyl~%h<nX18
zi3d;<aO?BZ35JM;?eIBtZdsQz*zoWC#y9@a*FQIn{Oki?Jhk`CrH8-wr=QGT`K4=j
z{_uOx0-ynkwZGEq?;dutmy8l0fSx$B9VPz9E^SO>|6hFT6Jd~k>BaY!dxLtI-riV7
zfNpDYG;Ef4$;I{E<=*hOzWf6K_~z?Rl~#4U?C-WF{c%0}!0U@gyGLyRXw>7;v<?Id
z-O)==-w{ZYD15lP05i+nci(#Q(;vI}2d_TI2JKb3_Cja)?%mVb8En<#XD>f^`r<~a
z<Xaz{vyLo8$i2u*M@xi8EuBVT>1JY#un!l4lyvpnqjPI}0PyCG^Jp#ktSH)(M(aEd
zN(!U3%*fHo2t@Lv`S_Ff0B|^|A)+REetmDL*9U|<k5;$?P4+O?YRTnO+bF2hjJEcB
z+T`pKO(;axk_&-G6B-iv+X0_;&|E88T|ClCdQv$%2ND2k?cI5_+-XfW_Rq=So(~Ym
zc<xf7HIe~9NMqS)rCK8y41yE(_-Kmt22I8gC0?g%`XeEQ&hG4tST7|lENLMi2q;ar
zw75*NADhr4>HD!UptMxc1Z5LE-$&H@QM;{^X(JZ3#oplV+|u~tSLViYVe8uu0<-g5
zfA{#U*RQ<$RwIxa^k@Rclt4RG1e<?xm8tgq_H;7*v+p*Zds=+*gURd9iFwtmkEZ>J
zOoz#Q8(Vd$6Ky1-AWR3r&3dD~|JL8cFaN9Qg}IgYAK=!5J9V#DJ15&_I>lzq>#2Iw
zT4=<f6kd*1kVvA@aJ)B34{$w{(`M`LE!j&F-Aba<akNf!PRQeW>(N4giTv+8IQYcv
z<ZoWm*BkBoNet0s+-S6AVshS;lmHTqmWDh)0)1-!bs-WWBtsye+k$#cZpR{t1tOuw
zsDUKO-vdN2WrXEp{seNoGr4p$esZPzgZb8bS$>Hj|1YBi<XaUzW+Z#ETpJOIv`SKt
zflx^md}Hn!IQwqp%1q9T4<>za?m26ES_$g1fm~(pZLL|Y_ms5=EeD!h7hAYE6E`hk
zK3Gt4k*pk`4Adm%xZ)VLlx79ib)-mGv)&xmJ}S2@V5;A8Bw}4I0JwU%;Gz*Z$;G8H
zEOOHoCfRc=V644du@f`1IO~53OjO5Cpxuv|cS!j`xY;jN+%1rM+aNb}BjzBCrF}6n
zi{nDSS2!h;!|<|%HFCw^Wy$0?<&aJ3B72{d&I8Ci7d@Uxg5<imRQ5`$TE!7p$6Aqg
zDV0Gdpw3ZyvP(d~{K;mjbH<D0PQ;}@jIF@R+M0OMJUO07B|nj8=3!M8PL4OGqqMaC
zKg4Y((UFD|OL?Z!Nz!e~te;(R{SZpEH8C$Z*T~Lst*f+S91bP2G(m(JlSAuuP|C22
zdV{cxq0Wx)E1!J#)wi!q;~;zO)60iXp4<Av*Pbow=*79=LB9<Ezxb)Qzy7^vKmOFc
z*KeFJ0Y=|b+KB)6?|&W;KKJ}}rM=(!x!3;id(R#Z8^84Fw{AUL1H`A!Z{B>chDe`(
z;rh3J{L~X?xBvdX{GuW8!j*f+qh>M6rc$q6^V9LP28f@3;rgHb`0ClUgZtY{fN*Bz
zaC2`iyEy;io1Y|tm!H0EjBu810svZBINm+#@~GNoBN<OaHu#24YuX<-vbSv3;@|tz
zmjL1EiyMiS+2i`cllRk9zI*316t@IF%b~BPaj?F03_v>vbE%eWwvNqu^xe0vjHdN7
zD+h)<N3l!lA!(A?9VR7d65N+kllZ}Vmw@onsa+uOg#O^+%I4mDr#TIL#d#Om!gOJM
z@9y^Ua9qE*z8m;@JPoDHPOA`tkid`-(ir7wBR$U~sqJmD!#lHj@RJYD0>RT4H$0E>
zl9cQd7pHz03<-gR6o^{k&b~M7i)P#S0mV~Mufb@9LXbR(>>o|V!jb}zaU_Ce4b0m!
z`%|k^n&9Dq3<J?=eGrYqx#bR00w|0D0E%LidTMlSj-vf@^LIb<%V*5JQGfN!@BZ%Y
zE9bVq^q;CT;oaqpv;XD$2cP-e==o0^zkh4#_QU$AkELeXZBLE|VWCzddR)2)A`z)L
zfuGTt28q&oy}Q5LdJ7+X;S;KPXY%SZ!SGtA^-ml9ZS?mh^DTYvOWnmEqwJ41Ux`K?
z^VD|}Zy#^{hs(qNzS+NLT47+|IQoDZot?>GVe6>Aa(<Y^kxD|Z2|z}fi25c>Ma@tA
zxU)L9OiiPcR5XQ9jn4aNypSgI$@Gj-i+-@v4U;F}t;79~-@zx_<{#9QKOfwc{uv?1
z`3{r~=Y;eH)(|zpa_4%gY6Jo$f-y%2;!qGO=?S2eJo2VBtvnNkAxu+Yh@>#aJno#N
zy0y@Ls~+rb9let3X6PRg`MuUV#sq%>buXTTzQIYA--lp<na_(bWCT>1g5<bpoKQMu
zOF>F>lqLdgO+q$k604>u=s0{hAQw3S9ekCsYT22co4H6KCzshG)6&C{D!U0)HXp2%
z157wzKQE!<1yS<s*j7wDg^0*fxOldN^@oGfHxylUJ_}snqZ~peZb9Y&VG}=qA2WNW
zS$|omWSJ8q$d|Eq;H190Jpl60NH)ZwDE3(B7L{SQWC?}b(8QTL5O>vLoP4KZM`l>%
z6mL1&$824gt6b^+le>o5Vie18U8XvzSob){cv1GSq#OaIA#~{>R~j}}ynBf|K?2&q
z3FKk+r2`MUU>16_O-;4l0|#qlg&{bIFgY?O#}FHw>}fU?AQH%89SZMsDvUEqUs)(Y
zNJspFG{a0LvRiQ(eu7Z(LnLBgPdVr=s1R-(q_xW_1>1~NxzHV+UOD*251%eI-M{wA
zoB#0lKOd(7A`uBh`pK=c|C_)5^-)y&-GBEf1bE`~&L6(^TzTG<@*eHY{}+Gl-yRK{
zzxO9E0l>H4y!to4`f8$NuRZztYtI3|+jq|X^`C$3?CSm>eD`@E_~z@^{?2dyiPqu|
zUwbY}eCAr2A9t+$?Sr}h`PcsRU;WvO2zX}s@DFc43jpU<58k<b1`*!7bNX-n>bIge
z`1)(lIeyc{`CMD<fAC<fyjP?!zxl-<*1~kIGdUVIvS&RERFZgE1M}Utul)9xzfXX#
zy?t4my!?9h@`JmZOHSL$oSI*K`^wio|Hl2T#W!!BtJmT*^$0;CXd{8(_4hA+_PLwB
z)OR<RH+JW3GsWBkJl~{BWcRHnv@ycoML<8kasG=hz7GKJ-#rD0cQ==xx%BYTsolY(
z@y?yov-{cgd+X0!+NcF-ElA$Ids>4K!sG@INPzg>ozvGYY)DCsTC}k<UwpX)u<`wS
zr#^P+p&@A25`ji%6awVCxb&n!0HIR=*nHrxpG()yq;Z4~?*_)e;f~kns!q@BJUXH7
zOJZzw%(+V`B5iH>+1S?)NX7YkjE17qHD@oRL|{@p-rWIQtkt~XPzjp;pZ?aHMvMRU
z-&_sqUe`o7U-_-{3$G;N((WHz?<^n6r+!YJTHXJ~w|YPL`ogt2djIwQ7k{DWk>8!4
zYmF6}(Re`M<*^b%AbnWKh|x^Xfx@UbO(rOQ3PH_i6L#Cl;ArkozJLD{&z$>hukqU9
z;o)CT{5M*oSL55=!C)a7)t644UpzBS&C%UYycquAU$k!OX4_A_UNT%kGysW;7LUgC
z`@=7JXNS{MzZbyrVthek0wDs4pjB6%?oek*cZ|*yN<<`d+LCfC8-uWZ0D#G~H;SK?
zs8<)hgWbLDy{~it=e&QC4Ew$mK$6?@2g0j`2R9ymt=GBRY~C5wx-dV7qj9*ikA{3o
zb?9pXEeL`jQk~Hg>n0ktuit2buSJf6lPj+TKux|UN4?g&t=faZ^pa9d0x^!(o3%}2
z!pDnf>12=%0L_P&;`q2C?=e-RL6wwc6LSORXomwT@U%}uloaNU2tX=AzXn_i&o^uC
zJYO{b$OF<XfP<C!p&i3jKuC04dWkqSiDh7MWTh|-brxJF<B&N_K`9pnthf(nrY$8J
zWM#uFO~ZnGf;*a`9lIbK2C^UsZs=DXjTYD!G4o}<j}uqfR<;E<C7{X%DBwu$?vE9V
zTe7Ff5y1jOZV3Rf;;2z*aH>Y|tg1(J=x^K?25kI?4bI|%3vg>ieEzThpOJmg83Xzf
zp><EiV>?|IPeDBX10VA{JmQMS70mu3@&4uHMz8vIRkWY^pjUwVYMBpCNDe-}w{+`M
zfRkM3PkLLodpzmAoPV<ie)bcSBlJGuY|rK&VfCW$h#me2p~>pk61mK(J^o@s7!*JT
z4V465-l3on1^~!p2EtG%f-*9^C?rQYkvdy2vo^sPOJuHG2!R9um3J)uL89OW7;+v+
zre(`a^omtU<oB#0+kRN)uRUhUX0_RCK6!R4@YA<$pS5k0<GhFh4dq3++ci=75s<PZ
zv}#OBxxVCQ8_|?rK4b~AIfzi4#(X)XQvXyjoG$zyh_HJ5+8-bS9;HXj2Nh(oRuY}K
zI_B#K#pB?3Gr0b3W+7yEqSSnthjZoUGx|*ol(-8W5y(&d2NX2)ba;IC;e37bzxliG
z3IYH5|LtSP>C%~=cl+fhkACMj;m+3Sd*4~PbNAsLHU5wPLwf!D%inl)@$BVv978RI
z3!;1Adt;@gB5DC70121Wf?NC%kqCT&5RWI8U4cTYIGzrEYS~vlGM>@>M0u;rS64o!
zad3YQZ){zu9iQ?=tv)_F+#J`Q|M9tn!SLqL7X%(5nq;~>*!wh!*pRH(mjQR{ThscJ
z@7}ol$DQfw+TOKPMl>}>kpFZe(7LtZOW_+ZvzlB#0Hcl8n0-=#Q?1ty&s^QR)osF`
zu6e$nOrSj^Bf$g&<RdnviIVoi`19S<w`yj?)H;+TrqveP+u<~VMqM>R1;OBGb9%XM
z=rU~%%+pVH-gu*V_f8V{WjkyNFO159CNL!sSsQ6GRQtnn+-L^3%eN^%CP&8m7n%|y
zs06p(E-Hv>s4%ey>;!WXLJhQ)OtW7Lp8BF#e{yDTb>?>XxGl}yXV?ztZYU>gFKmmg
zp3};U|CD`w=38uVJiB+go2~`2PAK2;B$FIsu5mW34cSuUmI05u3h)>&ZWk@AzAt}W
zs!}Rxwn91iq*1ki{15|pR(Fx*bGaJ|%*0xsaO5ZLl{70imut^_g}72@2KPo+TQnoR
zsC-dWVl=qS98QR_Wnx-zb+=XLn(QZLEWl3a-?;Uou;OrVx*%{l_|;O<E|%i)O(SyM
zbgt1ro`m5X&k2o1b;A6(p@VyP=who(!;Z7K>j}JOJYoES%zx4KKVyoY8Oe?)lv)NE
z^;J}^MJZk@=i8aZbXmO=rN3YUF-csOjP8Z7KJ_Ok>T)9}LaKgJ;kxsbt*pouRn7&)
zYQ;oIREE=Ivk@=%20yuV)&}M<2V0BB+Rs(FG1xoi0-h83z9$F=`KK@-*y|&IM?7K1
zW!<)1#xt^zz*55Im{phjT{G)-<o3jXfHIKdL%ILp#7E~N+W7HbF#vkzA(f||rl3xw
zo1M<l?$Hn4rEk2^-5vIPqzKUe;rIP-|Dbj2k5_!HZ@0SSFMsEIOZ($saV1qL8I%h(
zx#X#F>Zz>T@c|YAVgThDTh4q$fjU+E3q(3|0Df%NguCx(6gA)XCjG5#+#mQNIS9I&
zy6N}Yw^sdcL<`@FeiBaa^}}Xb?=5NtCPmMmHhVv5bgtLice~3gxbXYGdieDy8a`TG
z=`>qnOQI)&bB$U@G$+Q}*1i`~l|Y{jYy}`{Rqg~t8s#F^r>NVFLGKqwN!V@OS3Ap^
zS~460iH7hR!NJ|Fub4Bz;^{kj>|v{gM8fw;$}|kpQ>P$Jsn;|Y+tZ{;wPhF#bv&sb
z95$38;R)dZ5E&yxZoMF|A|{iCXaMoC2;7H=X!9FVYLMnHuk0g(!(9ZbIP!vnzMOch
zn58`obeetFd*V~VuTy2sWu6O&v-@e~Oo-}UfbLH`=CN`phK}fQ_9@24;-P$BXR9&J
zrgOMXgQbtu31M|O<FwBM$GC5r6Kf&tZtK2rwY13RitL6#_qGu{g#l)=sZP?Ho=~C8
z{=m$CRETpY+)J*u7SOpy?%v8iU^S2eE21GA8Q^?Tu6^vwIYz)E;kdO(b#gtUVZlmX
z8qTl)9MdFr@A4}_Go?mFy~^JgT@g*iajv2sXBK(jDw2^OZK)E+6F!I|nc?1gtRKJ`
z9*J|=2%YDh+#B67f}XkFk1MjBkMBr@2v4f^+~?ALWbx!;(Pep-)Lm{C?+B0FzRtP&
z=(<C?$4~By@Y2gYd2sS0!KHc3cpOhEeBFcre9Up4P<L@!QtIs-b{YGna)VkQ0kX7#
zlM-3bU5goU1YE}g77&AOs2W!L7w!Z*d;g$&S0g%yZ+(`mLzlfeP&sknYTWH-l;Z=n
za@pIvd*VJs|9|HGJ6Mt=%@4%B&)q|$e)+VlS6X&gceS1#)w?5iW_DHp*u?_a18@Mi
zXTb67c>f&CD2!$_(hNAG-4O<w0R&02I|%LqSYQP(JF`1lb@#MZrK?`m(>mWv9TD#S
z@sG%eaF5LDnQ81D**4Q%^+aZdhll&;zwakv_WsXS^C^J9T2Kb>!j`Up<1y}O85HZ&
zn_Gp0&REeyWE6G#mD!WkX~K(+`(WJBu4GcWu5tvC9$cE@$S5o-uZK)&U><+~=;l#_
z#1erB80TDYAhOCnMABNx01=1k^*r?oGB;Ty<bt;xeV#Smt!>@wzW;n-_ho9Y`Vr1e
ze<mnxwW9UzR!exEUnpxuq#RP5=;@%lauh@-B5}CA7hE{ymkQB?fK7uK$8tk^P0hT5
z8E2gB033zGlq73uX8=Uq^||`&vAD{PKfMy*-IBZ_cm!d?WsWa`gZ72K8e8;#thy1o
zK9tJjIKVlRI>zYS<7Ur=R;gFG-mE-q6!tcY+k0+503nbuWSk)~mW6Gmp%8zb{(TI%
z1g8G{%02*W?*ffLOn;Vt4x=!3Z$SXQ^f)>N%UcUF4-Onv2@#kRYSczx){U0^8(NX>
zXeP#jwYAxsvjt4x$Z7`jMVqN%#YZtJ(Mn%J9PZ4HDCVs!ZW=npS_iX1!jM%iK5F|j
z7HP8k-G*UJ)_5QJQAghh$`?N)(5R8MLEiBuzZ01TC&PiEXq)kqwMF6x0B*qTOS^kH
zf}TMV9A*@fWwmUv4$uhMwW2M|&y<%`WNbpny-}{3v9FzM%oZ%NqJ>n^aDu&YnPezo
z^W})CxU!*F!u&BKmq|PVzai^$f^AY`F$7W?K&H3I(EY3-Yxo6|ol<MaFpc&v8Hvhf
zm4?>HSh8lK9Pz}w-8r2R7-_V_<Q(%3T9#-CIP`UkR%t#?nfNUKnJLRbv0{GB6kqf5
z=@C_lNsED@UVU!<SXX3*dy{QaWE>JGGg8k{64EpwLxpD$Tr68FyOS`aP|r^(^O7k?
zl)<4F2a9EkU@a83@c<1SMWUJW{^pHGwu=UV$v@LS+Ug?>u2vu;uN;38UaYC^@#LAM
z-o`B@B{Igr>GqG+73tkAdVODe<Y+IVfV3XG5=Y&Zx}f<CLqz}_AONTWI2PJBs3#Zz
zfR@M@GNF|Q@PH&B1Ly*{3E7v8Xh6{DW@U2i9wC5>5iiM7L6vIY6@-c!d*By~QUhOL
zt;SCCcz=9xkpWi<87l)F3eFl1j8}?lTr<b<mUuxbajO$*qC(jhj#S#3SOf&bIM<r8
zK^S~Sj!}<Sy43AXfB)<Bh3W0!ckr?O#f{r=*Dv|aelWY<c<$odA2_lP&4TJn2tr00
zJ6%6!TJ*Zm5Blo|{<<!$69XdG0RqifmS>9$kqP8lYfVww$mfIRFa0@acj-|Lw~zRG
zAVYwU{)#=VbX*fZ@k`WgKxxc!AcMrJ)m&}B&TOC@=4XWH=JrGwML4q7QW#Dt$Zfk;
zE1NRD_fR_+t)PrSKQ@)#0uA+nO=f<U{AFo3aMZRq3h2$$Z%CHp#3C~0F}9pQIoVyv
zh(yl06=ybPm`kcRd#X9eDHpe3x4_BF*999nGI(_P_AKUPA~w&|u(U~tf3`;43|<}#
z7PD$Kv~ebr)rqG2p!ssl)aGWlEh|u1{=1fq9y30!2?C<Evyu^lL8hU04s;v^IOU3C
z%EK-;?q*>&$=I>%gAooRw|T^cvKri)vV?g|G<{9N5wQSiJ|U)2u({q78|wSoSTq^U
z_v~IW$TFA_$O3+FRBOdD(S#IEOCa~G%FhN3iRBNJFtRks!X`&_w!xmU)`1N26Tlok
zGM?V7+_aCe#&or^E@{*`6|IF}1knPG6qL;Vnq{>t8Lvh;a)C)xVM+fw{$XZVwAu&P
z+zHBb{mNUHAppy8yTL0k<E@zmBI3vvR+gza)JJ$kv*XbiN!;qCpR%EjJSm%W5SD(M
zmuifVF^3C>w1x=u)0*uGZ`%u07l8qw<9NteMr?Ed6;cS&k6$%F<aWZFRjVPm1QS3E
z!3U@S_y9gYg#eUl!EgXA4IR#HdN%+7NPrf=1ZiF>yzlU10HL7Q=uA+rIEC&+%c)iT
z!ZcHG#7m9B_|nAETA?15>s-~miGo*dK)I=^O>ldN1i~)~$Com~)HW`u`nbapK}E{u
zP9nol$+GLLmE>O3?N5DQ&Yo#E50+OqO2zU@6rI{>U8@x~9o~ze6qbw1^POI|eB3N3
z#k6Kx3n{~(*DD1M0HC8hM<eLmKqj`<jB&v|!9B(V0E;8+7$VCsmXBiJLJW8WTmt=h
zm3@eKcpp+p$It%{Pc;QmpHH0v%5kpp0C|45G9OqPT8?N4Ak5m9I0EQL)5JfARk0CX
za%n8Axo{2x3PVUgSxX24u^hE5AJ+-S_Jl(@^<bp7n@|+m27#1grKOgEnD0=N!N`jL
zO=c-<8W9`&IHg+~+QF6fGDjnOE9PdzjIgp;Ct~aoxs}#bVdvWYh(tqeG0JMoq3*m{
z<;Mk$oj76yS)&o+n`NdMZaX=g!!E@LbM36mi5rcG3d0;S*BG{u<lM5Kzp^}1Y?iPF
z>`QiYFsIkWEE>bIy38sFn`Mxq@uN5ym>qEdMl?gs5)f&q!)S;J0J4l>vqfi?zd5QK
zSduOrrpza4DYgnBeUP!_2QNN;`>``?&tAHB;lvgIoSNTz_VWFwFReUx<xasLFznAQ
zZTYTD?h!q4?!ofxfjMu7`ln=HFU(9FKXd6GV>*4Pd^b8ZzZXO1%d>j`usD6_ID<^{
zrI|y{HNlXDzA2_hwB{t5u0KeCi_?c@^OVwHXEUv2M4LPJzwD`6m^?}c*Aa4ZtW89-
zlScr<?PlUaPmQ$zaJt?^YYHRgJew^vHTf9=i`8L~CCp}h&f=VE<qj9xK%K39#`B`0
z9|A(X(oL7a@oM`Kgbm7~?k%c7_M=>e^r1B!v!Xs=R2JF@N)U}WmjD1N2L9Y>&RyPf
z=_$f#gqJDmgj!3jBrrgRj_Uzq1I>#7IzsAVubz$s2bheLxJEQ)&_PgueH|SU?Etm_
z8i*dLauhBhb^+vvd`f$HO<%qTumSKSK)^9ztSxm^DK1aeZX@3U^pqyQ4P%F*xYf|N
zIDeqz?T3{HpE{)Vy<YR6RZn;T8i;!($1Nl+X$@KdXha5t+!4r8h04Hb2#63OB}?t&
zr*+?PDInoU)tmbM59ey%=myob#!J^Xe@j8>#MBQWRT*fgrYE6L1R`LJ0KgMb6zMQR
z$ytYy$ie0?gqaWi%(>$Tmvhd!AQ~7Su-G>R{{QEn|Ad+^ck(ylOtW<cvp>KH|FSG9
z!ECXa91^20Fq}-RjS7bZf7TL5L?$c7a{V&$7l*rzM#Y&cS<sL)lg%tjMt~mK#I(3A
znR1nEA|T{D-9{uFK^~&S4B*I`L1b~pGAY>*YaH!R2qTw^tSTYvdP5RPmn)QwzL~K{
zqv@P%Z1R?`ow1vy=!?ya%t2tL37p}RY=@Vl-Pp!l`D~Y#%ru?GA-0x<Jdr&uDEC^%
zD3C$_qv3YRh@Bv-M+rvTX=hW1nKjM`E+^UA_YqW6ySy4=TVNXdYLnh_e2zy_l1G^(
z#vCBiq}fIbaG0ZkxmCtYD9MGz<<U*!52qJ)$E%&Me&UUZTIaA?7DD~y&;6)e>W^33
zMK9_HZhV>5Qm-F6@o##reDUg?$$B&Ahz^e=ufqAIt;bKVjg`As&#uMas1$o&{Mb9K
zZh;V&XZJ6k+yulge(dc?azIAFKKI<aN^!&1JO{YpqgmI3zddv5-b+tkPdx+%L(1S$
ztUeq@p0c@%1i(36yO5IDaB94HdTtjOK6B}w*}6>!q*CmiKd}V>PhD6cV~@)jGvo=<
z=}N{%xj5SM6YY&8{?Cb-gMu67(1nx{Qz-<q<3|8^dSPcUCWO^eKaP4EzL9oB!3YL;
zd+L;nAGU)FG*mW^v{?I)t=QZ+ftPBUGY5QUs^DDo=p9W>9m-HC)o(XR=@@JBx!_U6
zq6m@4LIPCr6T$)Z0a`G~#LT)hNg6{BpuxB&BSku{S{;A`z&>IN;5@(_K=2_@)u`_X
zfHuHe04@=4v_2a~FkL$_R(eOOO#&xgwiOE`o8{hP{owuP(R#1fbA7KVSe2m|D2>Q*
z3u(<a!1t6UsYxp4Fvge)^dsC9xL3H(3(;X9kRco&>%*hkyN7OYVQ2GiP1IhwIP-6n
z^arA^P8U|!;OGd1lVU}xA9l(L6ywJXIE+3rjTjCB0M6Z{{uAj6!IJ;s|1S$Z2KW){
zPlk9TqcE`y#i*Z0$Bi{PPlPd;$B4PfgCqZp!^fn|^48+~(nz6<O?9SG6l%)x0ugbD
zhn*+G8<p!Y%fUX}=6VD;)J?%r)OH;9_%#f!F+WP9buVb+p!rnO5lnhB19s@di#a@X
zghUTVsqK(PG$%7*0$D$ad5CkwtvAS{U^Y?*i%!<cha{IH_I@Fwb5B_lI`Ne@9P}tj
z#v{miRa>oA%DUo-5hGbfWsrJxTb*ySjb)|-kj;}wX?WQO0ke;nymOXPVt6uV=HcdB
z<ihO+z8@JQ08_(d)AT6$Hh{s7Fs}j)%XQ-_Q`c_F7zbItM#6@$vm|KX(*vnnHqi*c
zH}hD`K2DZGk~d-pLVWMua?uZd{NBayzI6!*KK0~{@4k8E<@e4fTn7@I{)=Dx(;vKZ
zF&S<QLMM{^#>0i=Hqc-H^7l%9@ZC2rUtd`q!bAxPf8ps5{^=incD&k_k^{nQ{rKsN
z_x|L^PX!SNgmX*Vx7X*(#h~3O#Mk-Pe(48AKm6-o`u-pO;OV1Qd3kQ{Q%_!3iZz<$
zKY8UE03p}E`I%Q-F2DKO)y;!C5M4gG@#MLcZr}fd?>`%lLc3QuY83~D@@Ye5U@S>b
zoO^hBeg_fmuFt-6=L8_s%AL<V^S;vTYd^XcN<j!OT)8t-Ki=H0zkc&95PkmncS?o+
zS3dE^_ujnH>iT8B-|71R11@-cGtJ5CyHOB2=27^GvkxX}Eyn29>ipWy1QJZun~$Ge
zjUxWTcQ0zq0O9G2_bP>8eRurs#tcJv;j!C*AeegP{qvy|0Cefp#(1T3*eu_8Fb@C@
zSI=C!&ye1_z1$7_dbvG0)++j8yXRfMe<Gd^PhEJxxw^A9d(<i^%>-A54L%XzgRQB>
z>4WKdbGK2AjU{Ksk0-~P*Y7XJb{k}R4Pts&MgjuIi%vgF_g?*w&07FOAIhJ?N1H#z
z>mm`{ezq>htCzp=khw*gp4*!Gqsi!^^S&2VLLJGV9r_hl%SgCB?}w|C{?2cH?%a1?
z_ujcK78d1xPtIX?3`z~ASqGqyGBQbPw5@Ov9RhGmg|O43fhC)R&;!^3m`d8ddL(U>
zh9NK{01nguIIn58RQOS=|G!q+18Qj!n%rc0>1kb>o_d1u>sy;`E=v7QGYWcsy;ke@
zk2khpYFTj4bxIm^p0o}G3`uJlD!UsvNKw|R(rTTp)oyZVNh%Nmcja#D7bEx7sp)SY
z_WH*Q51Opy>{MD4B}U|SyFw|C3jhL5AUH^^rHp(g_Be>2zd<_)G-ezaV?t|5qyP}&
zXct5T&_4t5kKoU*y&Dgo4ngaW2KF()o>r2`L3E$^GUbWhDVL7Os!HNuB+4?9OuyH3
zFEDqG9Lo%|l&r*ZcaUaJG$O4ev;7+w+nOZo%*~g`s5L3GW=^stz|P0YoQ)u{KF>Jn
zMm?3R9a+9rM(Rm*RCaBUIon$4T;^_vdDE6OdLZ815<+~oD-%)1$H#QghztT88L3%h
z)E8!p$gE@tjBs45lrgiDGC$f!#Gz5<4V-Z%jgSws@PU*OZqykDi5n^PxnKrHjEM_T
z;vG0hi_ZRlhE^qwWl2M=$jF_`y1A*?B(ti{6;+so$fQRdOiNufW1?}y(F9Y^;*=vs
zM1&OE(xh?4Ic6T3m3{`?Ab<sSLOyYilDITNgHmh7Pg6z$h<8QGn&YwS8ImEk0yGk+
z6aThB`gVF((mZO*@xwY`VD8jq2%h5!NNL!J(H+h#wUfV6>f}OCUtIag^|SF!c>K)T
zjR%WGKNMWWQ&lN!b_)B))zlM&bL~2^*Y^QYaP>F7^xc2{^-uk?Km5!KkKZvobJ937
ztXJEibQsWatJLfkiQuUV_isE{45Wz1>W6P%yuUsj1kUe&_l0=!-rtyc`}WD-`{s*B
ztui1ydG5jY-@g3szW2gmt9)U30}%hhOF#KH-}>0^{@KSr`Q!}*c;@nb0Q@)Ke({3`
zi!VHWJML;nk~f+aqpu4IdlCTP^!&~@Uw`b6fB1B*)E%#Ns-@o37gql0htGcVwX2_d
z?ma~K<P$d^Y)^mv)oW7oQ}a6naARe0>tOs(UwNY4_W|+##_WxU^9<n6UVFljo@CvP
zy`$ROcTNK0w_kreem1A-tygcH``%kurt8gWxnC*um*@7s^XBE(Z=C(u<F^6fsS7I)
zwx)jc?s<kZH+~FALg-gNIQPo?=VPGp?9$G0tMuvz=bG)}nZ+Ffyn1f+wd-eIe((IH
zlbf9Bqjq`!xVo}AeRpjxUbvn-|M2>Q#W!xAnV&o^6@#Nz`QGL%AiQ(?WRh$Mh|ug5
zE2UoAOJzu9FW@}cpmH*FN=6b99Y1t^K7ze~W<!eqwC!Av@;spDe*;t)Zzs{mpQF!z
zZsoj-!l9zy`}|@1y=}Kt5ssszWB|hTdcB^*`QGNet*0*NPk;K>fBm1|Wv%eu9b`TM
zYEDeYWS}vCBE<C*W5Af{^fQ3-F_%1!041P3pgK?mP>=3H+iVfzw*{aE@RXimz<d3u
z+3if%OO7KnAz)Wi_1u}o@%r7py<IMfh=9ms7)70S=sV*DrXAqICDM=!_Kc12IqFE0
z(xlYDH!sWXrZAf1e0#!gF%3#fBv9I`*WQ|(_!9sNK=i-VtFsq=qKd!x0sF+!V?|M$
zRI{@VvQi{DX-ygsIWlmuJ<BKr-p7yH5v8Q#jGQ@w`<%OjRy%1V;s)vRQOrN4|NJz(
z0Ki>5T!nrUnE3fG1{k1|`cicpd}`U|=4WhwTNH>ny$>2WRfFbfM$th)gUB{Wh8zSQ
zP+~2dRCZ|ON@Q)iIAJFXGq77msiTw8Xa=*zY<W{;Ss<9{WCtz=@$qc1VNp^DW?Un(
zX^Vg~$gx0Emy5YX44ZCel87?yAX>fMY;#O`x0$su4*W_H$<VPOW;P6&4;h*y^$e>*
zL^7yES#U9?i-(y;H~31%C`808y2F&&C5WBX(WYcSM>En3F*78@^aLB1hshLTkmfd{
ztzu0x(+pl&8i7X1Xrk2#wfnirdl-g@j4V79jSl?aR}xEGmNk;nX_xEjW%*;Vr&=Z_
zNGE_PIvkWUn3TR`@@liA7!9-8(GGl0CQZUmz^uFmqslZ3s`Toz1sBmqK`}$<Ot%^&
zOWl#5<0hC(XeQlZTIFJ{*`Esqq8ubVm}CV{B0{(C5`gbU)8og#^|>GYonQHu5E=&E
zJshufHuolyryVYx+`P9j8&B&CCpX)@!tD6*g_B$Tz)2LV8Gv8(gTL{W@0N?bzxkE#
zCf>g|Kh=1+Go7%9u@||37-=5KSn!9l<HxsF7lO!%hpS%ctZq;B1LxHb&fQvFSeQCg
znoZPNi!+Du1GX@As5I8A?Q@IUdyQ&52D1~#+lON~+I$Wjp_-jiB*pjNxzuQur^Z^x
z-C`7RAXLN%uwLmL996<dR0=_-?;)Zi)KRk(Dkm<3BF!~10*s_XW*SN|eU)ZPa{vhC
zKuXV<?)3af@i%XsZng`KBV8w|75kNPS8xr4o)h)@g-D6p>vLNNV-C|wF{N3k#H-iO
z0fOMVT<n*Necul_5+J;N>r}PeD;4^#BN?N(-j$jM(n-iwx?Jd&3xN<)Fd~FF2t;b0
zerO_;nma<Jb7SkE{_6E}QVKH_DNSleTiPB~rUm;j3&~jF$sY~%DS*i6wPs+1aKZ87
zuh;(7e}D%M#&7Ndz>)u++pSFAyAb(3#$4p?(sXHgq8Noy(C?Srk{4&njg5EzhktNz
zdd}_j5w&(8^Z^wSbO~n3tkbgWLeNTSsq(5BjKhmdfHwh;0C=vxB^qH3G-y^30Qmqn
z0A0j0mC~P8OW}U&#7?8`3WeB_QANow6P8!k){U4!V4RWGT_I-5tgZJ*l5o8&oGj(g
zdVJ7PiB}-4Nh(kpG%zNE{<2hhesW!b*C&s25&MXHdaKk}W04z`rpKS&joimpC%@P`
zIm`EUL(lDxj|Y`XcY0clRk)<URnZi8b~&j3^qMPesDtCULO7f|jPs<OfgF)1=LE9l
zHcW$v=+71K`)Jw{V2B+Z^+|Eek!{lCiJW@O;Nsw*bf7FeX}Bec11)BT_}CgWLa<5b
zWONA!iB=i3k`YTV14k_L{tQ?`i$_gKnn#}53oPEo!1T+tg(-$x3`+;w2oX)-Gr~ko
zk-|4-!UZ!4k7QyUxjrgc7`Wk3hnVAx<UVBPnSn+tHn}&H>KY+KXTb<w2Gdal$RcE6
zCU8mN$Bc1pcp2LTcKSuKx}FSE!akZjzm$f}(oZfZxdTR4Lz=2g85PftT}!+rV&o9B
z=$G{9h6rY5WdPA&BBW`KF=m}Mi*ad8Tr?>mS*epYrj70`Wq28-ZYNfzVLr<`r=uDG
z-&sT+Wj(B<tS8gmF|lli6qG}-mD5(#O$O&0F>=Y<WjPsSZ4sH$oeWKcnK%vEV{BQW
zn1h+5Z5ZWflJ{jck)OSE_wC!K;vab7%AK#ja_yD(&y(?LOEddh`(x>;hyb2A`{2)B
zdm{eprR9xMq5ttGZYst8^e0bZwtWtQH9CENb8r05Ub}jDT#g4PPVZIPawed(@eF_f
zW0m&aQ8oUvBc#-v3~+mP{J7)?&s@9@0589P9tmsZ?&<kmMC$gv)t%{hWGAZa_wFqj
zJdiY*gj`33Qa}=MK?q}&&T*>@h_y<m)%5{Ta2+WD00lp2_j~}Tl=_WU$<nK(3Fe4~
z-A)otf?&*W(;aH?C^Do<v43`Hhao-Kng#^MNT;qqI8eZww^(VMt~U#Q008SdQvf(S
zc{o{XD-E6_2j;Vyai-HmNUhlX)S*&5jGTTX&^mo&;vT6u=gGN`QrJ2>tPtjyg=BCS
zsCV{7e)~t})}^hKL?8f$sDB;@4@3l(uK2jP=Pvx?Zvn3Z(9SP?|Lnj2TkJHt9D}X<
zo>x3L3Ky5W3#VuAt?gAOrXPF#?t2s82|x1-uym3=_PF!ocf*DVXSFCosgJ<65&V2R
zHhD5ZX@$T9%Y0FYqM)1nWZdIaDS}DEwJzm@JOK!x0(2LEq+Fb+g{wPDf*;I|H#@zP
zOAF6)ap%sR4;TXDHr0!$K{PK=h273!gE=mD9YWGd4s046PKtDtM;}Qm#-gBiLMdJ^
z-S*Ml=|sQ>VQ9#L-Q!Qsm+n{Tpn0%2_U(1AUBBD-h1O@@Dfddj(gYM-y>sYzuJ*jv
z&dy<{#||A%E-?BzDk`E6XU>r(h8(#7AVj6LikrWNsoGHU_s_BB8|}RPGyNj~8%p(*
zbQvcA4EyF>qJ-R(EpnDH0CVj*GH6OE@<M1nsTpCLY-5rfanKe-4q8!UthDLYV5$m|
zuMB#Tm?DUn9f}M^U<UfxeDt)Qq#R?~{4p}fM}xA8(k(BuT1l!7N<2~1W+)m_9wyN*
zNoh@ZX;x<)$gVRD;#*p}q<E`c03>Aq8S6xfxtK5}Q5KtoWH7NX?Qw$<?wPs7V76JL
z)d(5JdG^e=(>c-`n)=2K-iu{#YY;Ut`?V3QcpO$F*w!aWYZpzOYWAJ1RhiY(CQa2=
z>ZV}n;CN$`6D^@Jj!=(64vfxbXqK>zXdmv#E<-V;SD^JqCQXAdlLZ+eEJ#Dq0*L9E
zgmU_9G8wa`4;~}5IJEgN9Rjd}fpch}RX!%Y{K3GI>5^xVsh&9Z@FzFU#>a%m&aA$9
z^E4TUAOw2m(!JMjo;9EBiCTNNQH%dNH*xeoe(j}y{jC?b4(iA4qTyDA=_#mQ=^P$c
z(hblRYUgk)6%beuG9mzat_(sK0A6_Pw(CaoQ;ogD8m2HV(#g5KKmOs<fAaEEHy<tp
zk%L@^k@)&6*S_}hQ=PsiC68aQT<EpBrBu^h@WanO``+YO69DU#PODom4+!;2`><64
zfU!#VxLpE+2I{+EFYpMlQs}q4g`yW-KD};9ZVk!a;`HHjm+!Ka`C!ota_b-!T)DP0
z`Pz*$Z{0o_r`+-Z(+rnp4r=8d01`1nT84t_yK8gr+&T4NYgPz}Kqu$+-no0?{rk)9
zp3k_BBRv=bGCDoK0{|NF&g%U2m8HF-s^=(554Sc+cya1*`(P}+F2|K;7PpFiXt>_w
z-1v>>q&zNNpC_-Vh)SH#IsUM|fsM+;_)uYlC0C07azyW!K3MXcajex5z?(aT3=SIo
zpS-?WbfD;o4oT;@_1M4r&hr2MA5{OdzdiTf-Kah$LLVa}AY#ZM3U#R~FCq3VI3~d?
z8Rv{~$M>@;Rs~7<p#W+Cj{~#-0)hY_0O(uR)HqVw;Q;Ouv^&95{jgN_8zsM~^*m$e
z!|1JE?;RkC%!-WDT9wP=cMrq<!Ja$exmfA7+r4Hx>V?Q1K!%I~0g)aVA)!eGy{an?
zN**4EAVKg9#ld=E^TFXu4-S8!+-Vg%ojGWnT7PTry|Lye5DshmuPun^m=L>LJ3R_?
z#SvWr(T7>f+v!%Mk!db|YE?x<KpKcR<AOUvcrmCPmqZMJ8?p~V`15mqMj!?HBle65
zfDbxr;63>za($aAgk&lOnMuV@m4!C6mlHf$SxnhtJ|eu*+6*zPVbVzVA?tgCIgYmU
zgmQ6@Wc$jQURm&{PD-}w<#r#_oFXd(<ABSw&6ana$mF5P+c7YjyMt=O;JH&W_`^MP
zr0o2Sn0K2q+t}9KA;bL+(A1-lU0Pu3)<TfSw#fJat1cgudXUpJm>xCel0un~8Ixut
z=B3dH0LbSa{~V^<Qv#~leLw4fl{K&tag@p8aB!2U&>?`lOB;@mj$0~5uwBSa%Qwix
z?PS&@LxMlFpvA0-oKqR)oySJyvLyZO+}Rc}Z=9F05^SuVWpHx(!P1x*0LWe$O@q1=
zL<FM-L;ymDfFm5pVPq<V<r-*o0+`{LkJWPb^2v?YZk!{4QlbC&>GfA{oHtC7@$=8W
z^X#R2n()@ch4^V)p4+Pw`Zpge0su$iLVx+iH=j87@SVFS8_g<O-E)k+OXemUAKX8Y
zwzMNDx`FrN<F{@;SR}}2n#7l1DfK_|%zL*UF77pIPn>(WzCUr$tfbd{)GB@Ux%Zzu
z_n_S`+*_X|K+lz*zIOf6$;}TQEVa9ZXD{9T)U_MsV*lLIR;yDu?vwyvd2avO`IYM{
zOTExNF?}Ev-#)CTSK4TnU%YzjvD0hqUg5p_C*oG`C!e@^ZfX0q8|T{H0stJfD$icN
zJ3D@KePt<<!qRmmH{r1}Ys)kH@2@NmX}tiEPR;M$-<(aA@tvMOJ8^vJ<i_m8(aPpb
z5IK!b<*D=cPtEU2$+!0Fj!?4`N9(&2>0@%-E}xp;J-x77DfBn?C#2%-Zt?25hYM4U
zO0mDXGo=)3bqb5q2g`H&Yr7MHbdOu53n#W0X7)MKUZbi9hrj`Z9?!3(nS&s5_8PTx
zLE;QfE$sFJx7{n`8db)_!qRUk0;*2){Ri=-1*D5Y06|YHo_{J(519>-Ws73$h9{py
zCM-84g!O0sKs%Sa-RWw`(e*J5WcyHX9!9jY(df5(j>iK)7oEz%(Kx!SSkk1CI3pHK
zgrbX{lzm#zR4t0zii)<34*`G+&Nvcj70UP<Dhde@F#_lSQ~=HbNP-D~IzSy@8lVHv
z18^QG=LG@~oCSg(9W-BBoZ4mJg{tB>cRJlhujg>VjAjQBDZg0vi}l`dV>ybh&z~JX
z01`l2>nH*O$9I@uN)g4ii|ICs#CR|4&oSO}-NRn!gqjJ?<9?R{aM7tb&1&(U((Z2i
zsfqHcS7<`3yH~x_e7eWhF9tWO)2CK@ek};Yu+-&E6o&#_`Vhr+x_~p%A;Q7g)4fxt
z*#5o~MW*@U=-<j%^T-+FTqIm&N>3LIktyJ6I70QK;dLGyZ{X1y2=61*d=A4<>yDNT
z(Wy?c<)<=>QZy_dh9&F>dD~3P_+dB{`ebd0Xf;1Em)Vt>BBzIBtBQi03^jYZK_)5~
zRg|GNws;*$8NtA`a=@(g8P0{W4N0x&NL#9(Uop+S7Kh@8OqWBl0!*@^3313{&GhWc
zoUqLNrNj;pEgHR9VUbx6pk>aHH1S!!q=4aN264Em#z&m2EP^MFQaWb@z`@_2`YZok
zh6GY7m7%Qdhe^V7!Zl6wH#lHVlHqtWz*93p5mCyaB*=cr%9PL4x=HXdrA>Y^WtN8i
zH$kl|eNhIO5@ewkiE@WbK`<F889{a^psasSDcYQ}PSegS5t{u{FraWU6uvo)vMG`>
zn(G8KB=p71)f$PiPe?ic^b~l{%6%eRNN7fNP>O6D55!=+(*Xu>h1A5P;y~mIMS!8=
zCL~)ecL1;-iZFEIH}IV(R9q_-zfHLi2%#d$Iz68ZVODA+?g^<ii@UTb`p%dxc(T)X
zvqMs<7(xKTVxcD(9Cr!`;CoR&6lUjub5$w?2+->I1dIR*Zs-arHS6?!1S<IfqSnL&
z)2*JTH3LM4OUF^Yz6$^jmy)>FnPWRcDi`_y&<os1G6WDp`EH~MJAHpJ_&}9H5Gmdd
z9k7T1SyS70qL-e2@9VEzOP;NCA`n9mLWPo>(c`X&1lL-#e(1#GR`5b#5QSW7jtHD-
zskos=L(ho>*O6jTB;vkB(G3AX5eA`%-__v}W6%$s_~~&Si2#}~lmbl#Mbcn*gi;!H
z%!f-fFw^yB!3$TnCn;Sy$YRE(&p`Y|fBgo#{lj#bia<{aw=I<fZF?1g0`rvs2^2uz
z$O=eL*6dS%gSea72OyFPR<8cb{%`)jpm5Rs=f8XQosL!^?{&Kyw;2}%6a{^y<no0%
zbi4orL~1Z`G=d;C6^I}z9Z9XLU3JbED}o&WIi?>05ir3RN3B%Q>c*cv=(aQ+BhCUW
z1FQpF1vn<lN?iiH4baM@zN0x|VK<oT1;5TvR;z~v=l8okV$8|?m{PJ(towzU(yHXB
z`6hd(wN#y7(b6GeocEDw!U`9H3C0B1Dk6o+NNWI$f(hpBF#-f;_{1YIWQ-S)a{vP6
zi1uFd@x#vfiobbk;?<+W=-ppw%TvF6;vb)?pZNMwPiWTF^1#{Ryv;xW)08zm0CF%z
zBD~N&guV0U*wj?%jkju@E^wY-B!>&fe6l<Of>O}{_tc63D+ZtmVz*{R^q*Ax2_G7(
zcyR9{lzj-Of%c=Is}x6cPd>%YeJr84q?D+1Z!z_u0~st>sS}At1FfdyV57AbeuGU!
z`G9vcI;g2$HfzTk-BrpYt(od1HHb*|)a1>9(qaLUFPN+w^V1HHLNXj9(w*MwwgRSh
z6NV>;Q9EWYX@)i#gGZ@Ema?XIqFEhmpUDvllO;FjGLaQDrp#ur+7IkAvQpaWq=9)I
zDfTz`O&YS<H+^F*pPY1z3DcG{8FnJ(piovZSPm)!a-7i}1_Tg<2KmkiP_Z(Rvob05
zI<)9_WZ;B@Cm#}FQ6`tM6edW+fnPQXVvb)t`4e64fL54e29UuqOo#<mu#6$xNyMtj
zc;~)usEcg1M9QMgI@E)SoBMf#t3^XG3N(a~CUegw5n#$z%$pLC$?~(0h)F?eg{4t;
zm>ZBC(V*#>`s?@|L+PY}J%JKK>jxaSOPCe^fB^l-fh;u#T75qk>y@n;1OOOFCu5&u
z(kR!w+vn+XmWQ7ay8S}RAL#`S8X+SDpcHSli)PW=3*BDmro++h`#Ieh0YpkjCE`&E
zrDIt;5@^6?w~*Ks002ZvL|u`}lHxhg>iJm!&F~qI;Mq%e|Lm1(COJBJ5ReGMNMx~h
z@w-T804F5_)D1nuYY7sWOLmeDBPWy@4FU*yflGE2Vk8~&{1S$anW1A9ZGZ?MBc2&;
z5)uMKs+T*rSLX>0V}O+TGZdhR!1^<1JS2YWM+3Z&5CCU9ZzJg2wikeaa>(i)?bb7q
z>9C$XP@A*g=y&$vZ3Zt6hMo(TLBF_op|$#f5U%SLJMETi2ciTLBEL`!yAfjmj38jV
z?Z|1Z+RP0PeZE2<a7agj2wLi-@sxt~J)l{Da{vthhoA}Y9e}h88~~gJcmaR|tOMKv
zC=3;RQB3CcoQ_n%{?YV!eFuRds@zX%r3%HdLZPO$VgUU}98Rpwj;$W|&v6We=rxW`
zfm56szuswa#;{nc3CEKV5&&q8NZsxU!TWVr^_AO~#EibNQs4jz!8ITN4`hA1`W{1l
z+&}T=`fn_HHy*$J@L@+CzqIDO+H?2zf_c|D;Jn4bA=J9zI&KhFkV$+5=0-q_3n?e=
zuHeJ<LKuMHGz@wTNzI17NI)RC1As(IF-}qrV$hOEA`PJaQv@C#)iIDEbfju289P>{
zxx)izF0(H~2D2E^EKM?$z<9Wf;44h`d9vXyBFn-#qm`kFqNJb5$dV)^7!faEGS#v@
zjEp{Uc0x?mruh~s3_)`=6eAA?SIrVj7z}hWdYo1yC&kUsbgMwC&quj5R)n;OMJuEU
zELNPE>z32kU{(>Dp|<J%o!#+dWHQbnrZ**HJ&`SPg<Pu~&9I0hn9VF^1}+^L7e2eW
zXd-H9#m48Zem)iTkj)H4V`7;)VIx=2NO89twV3lYL@SIm&my#Q*|I=oJJ=X=;#ROk
zlBpqyDMhl02WYy~n65dPbgq*)<y6*=IR_Ur`32KKF#vTUb0o56EDhlG%;v@<M3JQv
zPlqe%ty7kVW-C_)qeM1NPx(NaL<(g%a#Qjt4EJm_F-9X=8gm&eXwXh5*VLzMpePgF
zWNZa8b*-2V`%q@1DW0cX!eOd-voLwn{ReX_OEgwoH0~i`#%#zKso76Z)|H{WiL&9v
zVT~J@IY^l{|KZLQ0n0T%vNZy62*ii<tb=Iu9a88tW1OJH`2aM-e#|ZzU}gb|`MSz5
zhBq7Qh&HJe3E-evu^tP{MjnyOyATVN9px58p#leMvDbS`OP8@p;U3CR*!?bBOP4fx
zF{c+qTzUezV=f#Av#&?@TTp%pPK+=8%kMkfLqPJpA~}`PL>P8t*mZrsdDLz;T0p8)
zE0k*GUME08V1yAem#9d*;|P8j>1hDQSQmlk&T>LHj4?#ekpfUkmVwR!zDIBepa`%C
zunABAZ~z>D5<mkW1n2?u?1}~fB8K5n=Y@W>T=JPC7Dzvstj#leqZiCD)(2<-2(2;B
zvG9x4La|OXh+2t2xrcX_!qSF6CA9R4@~CyT)0!MB-y-q=P==w3r0_tvDh%ejom0X&
zC>OUJ=JcdpF(7hee#|!~0%Qz9Qla8)jQJ~^>A;_GJMi%3`q8CtOz#(U5tWXdLl*?0
zRL5secP?I#6XU&BOZ0kz^G8u<IODF8P8bnqLrRyQM()fDq6v{9Ltpy>gwisGLKp&z
zWxtt?+z7w%Q4Znp1mw^=!d~MexVJDwNz_q_A-dPTj7s9ze6B}FnXiW#v14ou>9T?5
z<D4DIEbB3g!-tkw)%@8ksvRvW5@QK8JAvjJn|o8rrDjmBca3E3yjiK6?0uBcvB->?
zpd3#SEtlyWKxRY9Xa%{OPy;5ubJ;SBIFvh|IIQHdK21etR@a)FK3VEoBilHERM0eO
zL?aXfDA)SWDH$*m0|FwNmkn8EXQuAuRL)4bxsZGe1U`TD3%P)gl*~s~(;jV1ZbXtm
z;t*rmf*beSO3O0ZH5Shqjfi;28`GH-zgz?a4pmx|vDYxS$K^<ZmN7RDHQsTEB8PeI
zDqun;jY&;I{^eleRyfLDJfC=+F?I*OJBVl*5DiK}La@<C(_P7ofW@Iw(2|myq(sW)
z(B*<3%;0FuP7zsEoLc1!1ubW+SesU1$RMo1xWVP4@dvQ*R<rKRDmX(yl!0h=*fW?u
zjW(b|xvR#Usg$u~n^l}CiXv+*!MtuglT?}Int9?ighX~8nz>ZqkZV6?1zSc>Ci~~p
ztUAlWE2EJnPq8`LS$StdrREVUyT8O}IC~g`%eqHm??Kl1B&rIhrIZ5Vb_j}@=^a?k
z=7TS?kN;=j`pD2&X7O<5P1#zWyYHO%;fl-s6sM0+7e%?~)uOONL|R9rbQs8j%gYr%
zA`U=ON>GeBKqYblWC|3Nh|pn8J%IhPr&G8NB9bO0RTwt4dJ^${fHpu0U>*PgwhcQ%
z0&oDD0Gj|MfG+{8102Uz`3&7i7IzQ-TC?|pCpKoM-;(l9v$GJ%PQklFa7k;2s4GMu
zoJyfQ?g&3-_r-UiFF^Rm7k8bTwOY{=TDw*M?*85x1#YdfA$5Uaq?PP<%0a*8c-r@O
z-9n%w_9Y`@?rQ>$SR7CYDU<yXY4XwYtF;3btTy*MhYuH;JC6rXy<a?N`Ue$I1PG|9
zIXwjv<5(T*_qxTyhQk=)BYAejm{s$^&sOt23Ya4(Xu%lg!r{V;Yhofopt$(MftMbT
z>1O&U`XP6qcZB<Qfjb`o?c<0Fprs`P<ke|*@)}xCoK2EXjW{r^Z!$W+&F)J6%FIPK
zw=|`^A+i<(Ggl)|6+<#G98&~p5b<MOMGj%d<ddKgR*^&ckn9jSbFYMK!J+(qYg!vv
z#b8csf%e9c<e^!h5TRuQk|=P&D&CBXCp+p1t-Uo%>&=SMgmaG;7a#4a+pq>1>9tGN
zrf*y_Gq-z_j)|CC)bqB+Cb^t!?-%5=PkesZzJ#pZE?<Zv;3zEDpif#H%v?xR76yez
zAJeEZvb`D6VttsNHI(gCXsTQ>G10*kv?DXZDT^kf;Y6DR#vTeYG|*k^hgssK$L!Ew
z6Jln`9~oKNs|+noH9I&!gOC#02iX`(&iu%jQt8^jAbCv54#5Q+Qf-ak2&WYcVm{L>
zw){-af0)nGv8IKoWicAuM(u;<$;?7`a5z0Xrx?gJA<SjPN*_YZC+TG$W>`IBsihEr
zna>27^``ADl&WyDQqVYw7-NRUbs|~bjrjwH5mr5dZ*3hi(e8;Fz-6B747uJ-wnQ1U
z>!C;tMEkj8=BFZy&}|&z&8|)o53h-Mc{~RE5HJMI5l{Q&-6+th+1-FZp1pr$Z_9&O
zec~z#-#FQ0B%3>bwE>^~m+fEuRPgRkY8`Gs@VpO^%bZGiS~z|fbd>5NK<lu3uya_f
z7HZS=@oF)WVXvX7s?dj0hXR;93SL0e4%^QX?i0ZvLsC*{6{=`fYl*l;AOJ#uX@FY*
zd<aS606xGmKp&uvxJ9I*C=9|+mCKX!v)jGy-Q(^jdc9t)^z!b}(;D1L;SDJxE*?W1
z<6@>%jsS>=6X~P^N5yru2IY;;21mDCQ{6t}iYnu+#!R`m%0)j6W(h<Tjme0W@Qx5l
zivlu6S`WxrfN{-N;({42BR~WUz~v~IR<hfOd|JJ+`k95<o9_11%AcL7$o0umUr|i<
zXVf_CA0Mku$KO9F2O)9}|BL*iK>Nz!nkD96Ah;LjydgS7k_Z^0KulcpK#xZLQoN2s
z)W!A=un%#Qd}L!-1GKaZl}1E9aRSE{a1^F)+K&y%m6(;$o;An-lTg$gHV@X4j;0vW
z%;m-$;VY{OnYq^x<c%*(4_h<*JGWe$*2t!^0bxYf*s6;xuRya$J<xikW^4q2BWR1+
z$(}5aM02Qd*wN2er86V9TpS$Pa2lD|KpLiC!3LIrMuIX93V@u`G1^EL+5I}i3>6?V
z^3H0o<XBo}MQM6mTY<%V{_5v#3!t>pw{DFwfEJuWb`+mwIc+$SnfM_ZARk#~<Jng-
zT-3yE@`~zYL~Xu=fsY`jnG=w2@!^mvh?2IYq58JuON4emJ97v(f!VA;G#?W}L!ymF
zF>RGONnx5*vlhB;qAXdP98;b}#%0Z(C(IQMNIBCGtB04>a|V`-X57c{0{~X~HCp9@
z?c#18@v>^yIIPhqT@$7XBcn%5#`z14qYfG%A7#2{q&%vZ*T9qUiO@VcW)&M6&5gmw
zvQ_s+zdrpu1KavE!4S|k8%ke|Fe~n}al+KN9l<*PBIZo;?XfjfLdI+`!@+Sx45UFW
zL}TjPO1A9k$>e1kqOcVDGaA~6<Q1XccK22&Ve<7g)r6RF{6iHIl8s0YRK3!aLM1x~
zJMknqj$sW2J=#3}MGoOtp$q{=)7SSilOzB{)~5(Hxx#lG-}Oo=>JvnuuzTDRE+1c*
zn5dU3B|i*g<Vq%;lHTLILxc|BClKaoQ)|r_XiX{%86Vf`0|E&U0bB&w00>j_YLk@*
zKmab$L&PVwz96`>uqbC|Ye>ZKWfxy|oa4R5Zz#1eTQ3#dJ7Lsd97~lQ;f`xn4SO>H
zTsVz56E9vrcmX;!?%pe+)9My#Olv)RqH-aMLVx$crGnc7CIPTeS{F_eu@Hv3-|Ybq
za>hLoYaax%GIyA1JMVIII7KQ9Lls5Aao6QX+ecTF^k*lomrvdCueo~i-tqm*MK|KS
zPslt1r`7h4jw@0M&gg%UnvZ~l7M|kvV8_|ZF6S;Xj(}RJfeJe@d|^0<QW;UfaSpPN
z?LA=P5g;TzDnA+lBci=9h)Ya9ae|G_k?EUaph$=*1eE8bSf~qGQ59q_dYFY=<u$UF
znv}p~93_P0bV*HPy3&Xy15rw$5CSyfBGMGNl<i|$W~2+g*<mMR+q4#6G>^;~2hmbo
zk^x*o4qLHB(5Bh2=_y49Nd}GPI^;<J*&WICJW^s(_6;+cBS%&=mQSNLwEDYN)+(l5
z=|o*YBfUj3iqH^!2NNKQOc>2%g~e#!+|@52nj9g6`jhFL5e&z}tf5bKfnd)^%C>`)
zhL)DDgm&W*4g4!1hNoM2iVzu8HX|-B*)Y)Bajm&CfYGxGj7-*Hx-pv{!PxDy#(#>5
z8O3zUnnOc+VwX>e<0D#5ea0P%e<Rf)4IFaP+B&U?k<8FMwB&C_k{)5k%^OT#GSX?1
zxIC-=rm=GOzxm65{NiJ`UU=-*wR87hyLtYp3-|uUm%jbNmD?{~y;&{y?yk?JD0-HC
zM`(B0jqU@PO_hu^={f2*Kl7va?w?E_K0^HLGw&d<qjs5+3Fo=duYda0>nkS+;V*pp
z)q9&W^OKEh7w$jUo&ki3TKm&aesFhVKD}f__{zs#-)q$RkqdyIe(L=&aul)8Klk?S
zwYg;GWRt2=>b-RB{d=2ppMU=C?ZbK~9rHwzMp~wBpVkr0IOh_;$FAINbxUF77==?R
z>bK4eakVsAYk%p5Hx8P$PR~c{xQdqFLZ+g}PhWfg%;L_exxG{KJDa<ciWrzo5<*Jl
z6-gkWVb(BUmS9Tm$SUn*@RIRiOkY~w+&iwuv(I;<vy0pN&1yVs<zjzf^03h=Lq>qb
ztaCz`$=M7s5+P02TAri&9R;;1cCZ>ldJ1SS3Z@)S619}%MuS2KI&&dVgzX*<tKr%5
z6Bx^QlX<r{{^Qb*mAp^-*$Wr``~S$8LufN58IQPTiag=FUfFR9VbCFxBz1uu9vo>=
zDi%Faa|%b$?v=C?cxBk;f{{DN)E0o7?hD0&tW+qH4rv6~SL#WveZ&$#4PYmsBgUr9
z5rA|AA^KVu3WW~PWyCX4M6)yZ>tp4{(Zl282S>+<e9U*&3;uikaA9$3vf#ZIL9tvO
z1FSP_IPN}?U`{Ivr%C%V8sq#J(dWg&QFX6)qgg2xkE$*fr+dds-Su+Kzrmq{NX617
zpeF4BF-Z_-qNq@kR$3}4rQ--+Fkm1_0|Rt8BFJ7K!%&Bz4ni%J>jt~WXSWW{Uq1Q$
z_5_8Ve|F+WTaVr3>r4E2?yx^w^7jz2D3qf)0_u+(()RO~eF&}+j^czg%1VVW7BdS6
z0JT=}1H}<z@?Uziu++xLA?jjh4+hyW2qV%3X_U>(;Qt*Z2bMgO%UGXJV>#0EnjO|*
zwpucuSJSw~R8eFn%ryTqV?krqsL8c+&E6VX;xS6AG?R7@8J{eD#wlrCq_M$Sw<e42
z!jv#gkcJs1%_6j<3)yRvAq+Kot{G1_VY+1ud9y}Kt&=lYBio_LM&Pn`E2f*Z#eOp*
zM9g7FvdXBW&1>~e4BCJCanLBjvn4m<ZRSX5>9%dY2c|>-GMR%0mO`eNp2>?!-_0nn
zfzMt2g27s}^t@=3Z4K<$AkdpcIqS4x82RLllr5kqnU9$pH6joWp|JJ?XV}>#Q8UI_
zit<sqRt;{79w0Y4keO{kLWb}NuAg}V0Ly^a=GL1ubQ4Rl2$kt$pStML5W5a73ZrrI
zBZDG}MyfEHZPqjyF)I-boDUE%QsM{iJodt4H~;(J`|2CF&XUI6#@Ow(`Nipj|NFoD
z^1Y2&K$xg@Dy43@&<i4069d9hu|HmI`(D@!y!aE3*V@%$k8>47E@Z66Y~nnB`L+;h
z^PnyjkL&ACUcK?$<-33SlWSVD_$SA!?ax2=_V0h^#rSFd*yA@}zj^+t^Y?cS>j%d*
z1bFW99jSPuRSu+x3!0andhf!C&F{Z+C0;>3cIDPjuAe_Kb5QWYhg&mA6E?G$Uz|ED
zdcnh;nP)EEee2HY_`#_bd&NTFa1}-lWk_cBTyn1Km7ecLp%j`B5sF@T)Gjx>g}6EC
zyRuviq~t|EjCH|<LRc#FeOD^YwMGQ&1zxq(Yj#TQz8}AA!3&Fi=x`lMVXoTg8SLTq
zGy(KO_q7}6lxB=m(GPq#@*EjPPCTtjUg&v}Gaacxi?dt^d^aM^m0`@DPAtZ?Bed3x
zA-RrHngN3EMU7TTDjrXmf*(%TkB?gAcpc{qrpJ$t+9gj!in!62X4z2~u;4|mP;m_1
zU@y?D8+hbbwU#ixRBYYTfW8ZX1cA6%EQCTzE**|aA|Q~)UWeBv)cz4m{Q@1AgaEA(
zPdqU&*GOjgarJ{zueQ*bp8n>$f^%d8+|d=1b4|bi7$PTE`wRqXKvu5IGA{bP{eE9}
z4!XTgz$&G7E1*uK{BW#N5FPBxF|RlwqlRFS2ClRQ1Sz@aGa`_ZWTd3pK-}fLg}6qf
z0ZLj=0~D3+6V*AN)D(@?&V=D*C4<F<uBNqK|E`RpUibcC1EunXU;wBj_uK~HZC@Og
zDz&aGOIi2aJ*A64j5|%nB!EWN6K?30Dd^6$qZ&-#?5>}^)p(5go0VDt#)NR1taHGi
zw|j84RNQx*p3<)A-G>Z;NGZ)pdju3o6-tVv4y6u56-GLgq*M%=A%gF94qHo(3}+tO
zX!u3gCw%Y3Ciah(Um0Jk*URm_=Gj(nh7f)C7@5}ELHwT`@6$k>SV0N;u=gSWV2m-w
zIrkV7K$?JvG(%(v92vKAjSyvk`*-rL<sW89Xmw~qt-4ypV79pUY339tZ#)NRcK1x;
z6=g~3hPQ*&?n=EZ5Us-y+F@21JII12nL(Ok=2k_9Vk_sKVe3)SDl>U`v=4wbzc24D
z4K{fVO@44jWFxZ<B9^r(?bu(F#%I~vqPg1|J{X3KlG50ObeYYnTeDdie;P(+!o49%
zv92VAPRYX92A5#o2eOnA37BI5y>==WSSEocaGN2*X0wh=nkSgYhJkFH&t3f@8HoZp
zKV*}=n8QQSqP)W}Q!d{fw*>@bOcF9>1lHjxmo137wl<iRF`zxqN6?w<{N$|CCR4Wx
zhQ?_~LS}tPBmUV?%4eK<Q~qr$?U8aMUxOBBYBtFV?Z`0?GUb;+{LdXoG0#IoTLEFx
zJ_%3G?bOS?cki7dV)0i#_2i8^>+{<ObpZCnxs|{A`R^}G9iCm>-ffIEJEgHo=T|=Y
z>Jw)l)+?Qd+tX6<Q**mt`S|NsPOWO<8+(&r(HRi{&n|9%@r5@9SBsN}AFP~=-+cR^
zetu~)&inv?N~!;qkH7Y>zx~NUPDZuk2=#D#`t0KNyZ25?#m+2lf9lB(JV(xqAKzMC
zh(~VoVEokF?tAx7#)CFL)wr`UzcjPIwLgB`EgCD#U;ySO4|f}5N1ftS{rJJw3?NR|
zn;(1p=Gleqq91M_j8l@JoFHewn11Zk`qi^53sZ;fzTfVa2;l13)#tC=e*gZ-Sdj7A
zXWyBdXaL~S%>M3S9T2|yiJweVJ11uLq!f*IDZcN^b9>tdWBt&L(?_nJdAK~gSFg4Y
zn-!@9<=06BfbnXZfE_j~gg9Aie(cJvN~t$9e%$SQ{m^wBd1-lLe(JDR>K(SqO7m)|
zdue%NX8c%i*=(0AxB>wHrpB7H<41?hDrfrY*$0~k;|O?qe)r_u?q+iDPS5X@{C>UC
z4V2RhJODT`vsWqg$7^k=oL=C9rRoC!^hC5UbvRLLm;9jH_q67Kbbe{uccbG@3H)lg
z`S9%QJ<?FFYKP-~N7u*b@pAy4^vkl}<4VQZaaf;_dk0(t5s_a|Q!}z$QGgW9J`LP6
zS)0w`%`vaW6z}wv?|9Q=$L(Ix6>6-~Df*#sR1mrVI5&9=ZolGbf!GhoFO2yGHc@Z)
zd%AnnmyxW_ja6LoS&zp1{l4P_hourP6di}{IF1`DDzqjd@>~k~Itq(2sulb(E=rD=
zMAnHSAMt#xR+*j(D%F#%)}+?$6H5oJ_B|Q3H5^94nj@khd~*BXscO05I2{=Y#AC<x
zOXb;+WQj);;}d(wYIpxx*X<Mwds6uTj0ibb!a?Dnl8i$$bno^1=RYoX7sASVVXOq(
z*lV%=F)47|K=5dD=lM!$(-B>*oxBhNvA_f;Af0C60%$V$;z)#!2sRHcPFL1yW7|8P
zi%oF%1-MM_=zV`m9_=p_<~?WasIwf(3L;2V94oCMfFk#Q*0K))UCo*1KO3|dUl0?*
zkLSPE1fb(>k0WD){hg7Pbi9T5QH=i(U?&Pxss~=aif+-4Y5=l|C=-pt9DIV7g25s|
z<zuIY$h>G%Z*x>=<1<*fuQtiv(7{0#H*as3Xd4Cqf^Fep0yRV7UZyc}24$risKJ9X
zNrcu$nYN(;a|S46l!9cVQYNR1AXm{D1`=6yY57kW;zF~VZ2@3t-tK%1(@<`gr6tJv
zK7={JVcxIVl1b#FElkG-<0Byeps?d|k+S$$f+3#=OY%%;B#!2JpkyYp#rctjFCyCX
zeauYv@@js}8K4c3Dol_(!;Q&4VvuRVXw448yx8#30W&H(7y4s371@k?!^p?9_09|<
zjVWmK5e?lzZrqH6ob^jq@XNru5iL)eBxTkV%#t;LVBed;l|Fyv&MVi?rPdvQaCUL?
z8?RoAFY&occmMIf`_gf%eC5<?wb%oI-~Qrv{?WhvG6Meg7r#>~1hsPKV~^eXXMgm0
zK=^yV{vTid;G#k882s_>`s`7w^#Az7FPb>=((L}$;dnaK%d@-dN!bBFjduC_Z(jj`
zZ@&IS{9AX|=Z;$CfANi9(1yj+Z2kD4Sx)E4pZ?@Y0C@M_sVsQe7MomOIT8Q;yKi2N
zzkF_K^FRLhSpfLOr{A3#Yi=FXbCdAg;+7EVkAC>P>&UBTS2p)15#Y^RXBMaS(`g{M
ze*NaT^Gh53(3!3u9UNDh-O@K-e}Vvh>G?NTcczpE1a!EJ)BvS>;_UsE&AHv9>ik6G
z;_}8@w@+KTpXA*cBOQZh1P<5hdz0_2EOVfXC)W;})r%)K*LNrPkE@fl=7pur_wJu~
z?9|$;*UxFqE}YnytRL?l)>GzdtOQk>BSNLv3qmJNdbzze|J22M>2=>+U3~J~{dex3
zj3=blEC}7}D<=rx%Bj_M&krL(_Cq@}etg&}H(F)ijmB!7-Geb8c4vM5<lIhtC9T?W
zxBguC;4J{C)m5j>);hs*r_@_>@Alf4FGef3-B@0Vh;i~N0!&V;%{3t<j!&psxqlRt
z3~vQ+y48oz&5wWOZy$6^)&Ijk3#AJP!jY|Ru@^Xw&{Jd0-9}Ane$XD<4&@Y&ioR@j
zL$9zToXPRY+gqEh#@aSRxqM}=*PZU}9@Qs1`luxI!@fRu)H+r24rXVl-7X=3)C&2r
zQo33xby$`3PNlpYMk;8p)~el;CvPE!VNmIGZaZQtlBEX^i&BNIbFjVpscvwUvtxiZ
zKp_l8!4F)Qnw?J<1^LAX<BSduuE|}hmf!K5AFgfw0!+bJWhIOX3JSs#z?kZXN-72n
zD-J)ZZRpk~CV$fOCpXlXuLjv6QhL?$LqN5<{^^CeS6sKH4FgUM;KV8i8bYj$Kl@&L
zW&2tblqM=`jTyuq^R@(WiXfcj3%hT;)cVXn-2L{}*!0xNnU^^Rhn<r<$Cq}FF8S{9
z;^ga6d9k9I{=Bh20$_x${BWo*5BmWCkrKiIaHR~8K<P-SkTHRPE&>25?jYx(QVc&@
zF*^9idF-<k1puZQb3VcrEi?uob8$nmY}5v}&R_(rrmtY6!eT~kH}YJ`_C3iQqu~)+
zYa@Pu0ER58Y$P`)-=NGG53SEbxhmB%RWx;ii5qf0uLsR!dPLhq%S23a0vRwej}!Cb
zp<UZ_xgyIA*wS(t0}ojw!=U#}20h($ZpnTUjof0gDpaGZPBwI75!p=#LVJJ=7JBA~
zZ5kI_S0U2U#8e_=gim9;B*QPx#1}JqTw?P|nf*6q{5dkTnm}g0jOE%uG5(y;|8f=9
zXo9WXhb6ltq||6U^B6bMB4P|SO(IFFql9Xgg?ku&Mdl-(Wo5+HyOc}kuxwihhkQuW
zGeH`5&kzjKfT7@}%(EqV7!#v*w42kTmvh5aJTrI9YI$0iJovqhPo-fX6SY>mS5%tC
zggnoQj@xBI_+aG(0GycH6GDCd*>@cw>y`F?v+|j1@A^*k`RCpqE4Q}~>*>N`B$hzE
z((U#=$PO1ofESiFZ?Da#19N6^`^}qY?YU~2(1Yhnsbf>w%yn#W`e0*k(pcnJ>=|#_
z6`N++rY}4J0K9eU^rxP<-iw_1$-^JNchU3^h+p-nRUWT&p1XXzAGojGJRcKFT~|t-
zZKy=(xly<8m5TjN-!BxxFd6_7jFHkjUR52g!)OpQ#TlKR-<}<BjMrM*hhv$mxh>~r
zoFd5vOA;eR3<)%{xPDa{muGh;##-e<uNS!SG`@IZQz|i0Yd6}JbX87ANNYv_bCZqj
z!?B!u3Z}U?WGM$VW%4kkxL`Vn_2ZQBd=Hw{iE6V_2$W`<ap{a86=O+00hJ~=$SA~e
zRfhrd3)Jhv4t1-%HYvPNb&x^qOs6Ee4)sC=fS`}F^QzxR&m#~LT77g2Nv;WK9z`8?
zOtq<EL)N<e{sa(od%ovI<FyWH5L^L35Q>5yYF#+cSX7P>O3Dzxo19+k_IrpJwfYa<
z+g&<eFR~(YgYFEpc3ro4sMzH&daK!Nw7Ye|kr4d?b37OEh>O)I*mRwHMA{J=p}4iB
zl!_v`ts<?d3V>m>A4KO5o4-@^t{1&Gq&n%lx?K1tQZ4zVd967(h}gY-=QD*uzg)iY
zaO=srsb;yfx-|do&FvT0)_<W|TRnC9M?tS3`#_|TF^~vV<wX5%ck4gyJl~&kz49H>
zeoFodqDrN_4#cz;S_{UcCI^5tp@UFl;zQ~&MD6hY%JwxG7SEh``Cw8&*Y!6X8f0o<
z#CuEC>+j!usWJECsbHbciV>B^iW?lGR&N#nuCIP|s&;#<w5qh@@{R^U#Nm;_xx>jG
zAF|q~kMpqnltyd~_A3w(014p%AR~usSIK_tRS2a0#wrpyoQFh`2p?f7_((|6h`JDC
zbE$;Z;`^8(B1Y@fV7KK&5J~+<l+_M~R$~~Lp=_H#D{FxaJR>s}PJ_2_h$BUoZLzT#
z4PH38V@5%fE%*bHA5pwSqyZk71dJpFD&>JVgO+df(sE7#16v+L6=|+RgO5k11xwtq
zB{D<>Ni-E&1?=Es#myng91qb*K*5|vaOxaS_7Q+ma#co!OhK9y3Qm5DS<cQT1eG2h
z3}qvbZFfS3+mGS1Kj4WcAB%yRYMhvD*@iA?yj)V8lKG4wn28Mr*>RAdoHf?$%re8|
z&kz}=;cHe_L*B(NE0;0N&xp$)12sk4fnunRCZsG{gwha+y!Jh9;S&NGo`b0cw&}B-
zVctoC3T6Fh>jyIFCnXs>m`TaWQg>&GCbobUtP>=Xu_!!Zt+Md!*aS8nzVk~PYrB)C
z6WsHcZohr|WIQ>po?f}VwqW>$;I*^&S2kx`J%7Jh`B#7T5)zzW-n_Rt*Y5duH|GB2
zm1ojI+H9DdTiUq4HJ7!Y5fEr@@^E!~IwiwSR9hPd^^E0^jv);MJ@b=?2gjAPKM+ro
znflS@;lyAB$da&=K`2iA@iKKrJR$`@ymsN<L95*9`AV^Vob5pt{Jz_$?;Y1V{ep1x
zso9-)3YPpJ2t|Ca97jir`)<?=J<pN-!1LWGjGSa<W{%E`YpF#12_2z2f!7b+wVlbe
zo#}i-B<Y_B7O!JSIH>qclRkzJO1Ibd_KwCL?o7wO)(_o4iibPXN3Am00q+E;2stOE
z8AG!&M<U={XT*2{&M0kbq<d4OgyTr-VIcs3PT(ChtC8eV<NQP;8FGd!T^*oToKk0A
z6fT7!dOj(|4t3Co!t=#)ksRR+K5G<Uy*wZx1%1XC$p||gZ2alJAtuOl3t&{<><35O
zy?3J=O!%&hud?I?k>rtb2$3Q5BhParAR%|VJ}1X@TwltFb6y#n_6p@fb-d^lq6RCr
zN`6>{De6pCN|ob+xFcz%A5BD2yVdUZdXd(yU!ZQEqR`R0a&)YZjs<|%?#iw0#{NOS
z*Hw{HoJmLYrCK~Z{(@kQ@!I#ss&7uz{=^j@pz~O%wkSlA^Fq;k;Jf?NQ*SHX4f{){
z7QV&!aVW=Jw|ipwRn7dy@x@kiw%aWrM2N_M_rsR*nuY$x!>BUTf1|ebopux-VbeYf
zg<-i|US~|MZ@n0XRfbX%I*3Ka<0IFjYCZs1*?C5V{^_Mx8dIFQp1<i3&r+-qu^hF^
zYFt0t4x2LGu0mBU`pt#$cc*K&PE5ZN%Hr+K&utt$b<{l(L={At(?H~6cORKKnlI^q
zkUS+YU*6G>&+Z7lZE`%*L<$i(cZE}Sy$a_ZAcLR<q&Z@Nu?pt}#$r1m^{7le<8`Ih
zdaymB0cL=)g(Ych2)VQlBW@_c%*g8P3=Zi?WOBjMoh|ieC#y^WBZ|X7zY>um0h(uj
z%FJ_#AZz47n!klvh!<rJ7nv<Q*-7N4D=*rnZIqX&QhMf0;y(;fE5+z2S-pY4>IQ@5
z|C)8Uvm?SlwMJ%0K~l>aW1iHrnfGea^UWL;DWznZxp;{v8uK2zhA&c{*hjfqBMGKU
zjx~mxw1t}*jl;}pHV5<=VO(SyYGkR&$-oa`tCnM{Nd+_hV?1I835~Mi#WKi2umjU_
z9+sK^B&HQlrbACFzLY^~%8*Ckf|Ro#GueHnoiJE=Xja5luCUMBz6~i*O#2}#LjkN)
z9vVvTAwhdq;^p{_7Qv6Q&upchVE$X?QcLEMI87qK=P%!R^@EF$$d3T=?BdqD_fN$y
zdiCssH*TNJRH_KevwMH=gBM<T|Dwy4;Huz9Qu6P=bLGeHUz{C3k`Xs3#+k<C?Be!~
zhl}+}`?Jry9e)DXRYVv{C%s{B-9GcemD@%e!$R2+acO36ZD)!AzVyQDX&qB8^%~7m
zHXn?`Kz!I5uQq?{Gv8mF-XE-UWF2glruT{X2P?}rR~JL&m}Yd8=&V0}^~T!X<OeG!
zq~xVS5Z~x>q2CMq_!@mD(3-99PTt>~Ex2JIMac_dN}MB<(k!L@G6bEhWP<D4s|$BF
z<|5_P%3Uy`rp+72QO9jrBxH;<F!R{MnBF|7Kir)<YL%wPn(?h)+nap2HBE%oQWxw8
z77?`O3`uLo7?HtPRhltFQxqe7m11vkYCnDj#xx*G$z4ZUI0GU87MyUr+S+c6?KbLT
zl}^@J)LaNXz>54S#%Qhb1sS2|YXo3`$2#n5JxPT^A*Pr?zmElfFj<2DrNpBKJ38dG
zn#zJphyXB{*q?ZSm;TTHa{T{!uj~h{UI73JnCC_9UZLId`+@6wVGuY%s6;^}S}tnG
zb=+bYf$M0-9AHr9qO-R1o~E_%L_I16b&R}9#gocCqxeF-PK<F<vfm@ekqCf{Yw!^u
z45{1Gj*vp25X1!$m8Gs!t8)MNSEt6mzBK=besNy7XOTbUcqbg!BSJu>v{vLQEnKHD
zIr-Mfg{^L9R``9l$OuY;^)FxeJx4Te-ufy6a;63oyAs0AGMA;X`c$#5r~5&HJe9fk
z3>Hcm6+O3Et2{Vro^;)2)oT|SgGWPZMCdu4Za78(oSJ#%u<q)X=WTQ1M48|XwB}Bs
zc@no)yOrjJTYgX;#4C~$=!!<C=p4_~Zl0h2#$5f~?W4!K;W%f}BMLhj5tWfM)--6}
z1RykWJ^W)h>J>(iqOzAFO5)>@bH^=BqT`!eD@QDG<}v0V3Pkm2e3T&`$}l8ifK~tq
zK=;2~Pu`suiHzFI7I;|94$L%Cc33L{<XB@iW!qw{gJ~E=mixQ8pQHUES)K(Mc}5w5
zj&f{s!%7Ts#0F<&s~c$mR+5q7F%PL7MW$S))USr@JuxeJDU~fG8MvuszC9sKUwmso
zl2}*DuE)^x+T1rXAR&`TpCT`mnW>B*H&WuGLq_$6n8w>uuA)Pmb%u6iA*Q4*gEL78
zBa%lz*sC_!D5(KbT4#<Cwr4r>FN=AKL#&Zep=*{o8Q9)1R>LptsKXG1$PA=AYm3^2
zwOvu=o1g~Rh9=bxb0mjk*<>jNW0*gis@#nP4T2H;y1XY8+3y57c{iXLOlleXj<CJU
zdDR(h6w9EGrpB79yHn|On5rMQdj+XD5OA)`h5r6=#hCl>qxUZVH^2D@Qi(tQ(R15}
zbwpa-nf|Z-;ve@z_xHc|VyK*~RcYw5zVqhQzxuiF-CAAz)*Dv=@vr~Vw@Q9raP>RC
z^7Y^Q)+dkJB|!LK<;0g?d~LkiK5Ug?NDTu3uirTL%b)nk#gprQ^2*Zy@VRH-UYI&4
z`oZ7)(zk#3?&aHS3q~iNrLFe4$)jqy+Y3BIgKd#)e|I<L<|Z1y@ryrXNQbSmN%=^B
z@aF2`m!5x9aCvKW@q?9R0IHU{pSXG*k#0O(Y_!V7LKsFOlp=2FBBBub+|t(U#8D*q
z_uqMpObSPGr(V5r{*zB!7hG-ZO<aF)Vh}5u@A3lUTE~SW5JLm1K?H*LSC*eVyK;GX
zt<(44zrPHCZ{In6?fiX*tNr8Zoz(@?tS_G2?Vf+sF1sR{sI?w!&c;75H*r`g_8&X_
z@XcFi;+MbiaQX7dHKp<H`T_td&4kcl#KK58LgqbF0s4{K?fX|wtpUK=?o|A(dZq2V
z!MVk)n-3QVSR@@dbs@O3<p$`u1OODWiL;%Gqf23tcM6gM7cuPfVl|2%uwEA#W2etX
zM6kcdL50X2U~G^h5PE@kP}XN3_`!+Fu|BTE@4ItQpBig&rWw;j*bO`!^m!N{A@XAk
zs}2<l<a=#`3Og2uZf*N-J;z@>(fR-Ud%o82#}<xwd%hOb=sR6C*XloBs;)$#r?nO=
zQc5B+&b?k=O-;D~GKv_XAR-}PY{KI#+}nStQr@amfni;1O}Y?8)5Y=|TDgwXk3vQo
ziHHk^%;$_LZ}X`Ct9nB&&3{`)AR{JN|I~^9u)X&j0C3UQ5oe^JM$nvxpdtLARpQ63
zU(vMBVLzeMWf7@TxwXowsNY)M{+LkZ({ryW#evxH5t(u2xt*1*r^lU#=P$i?I5QI-
z9hDA5+FCQ$80kdCMt$Lp-`c8vtBBhisst)!*K2g+Ma*@&SC;-rYB!R_M<{%MJ{lb{
z?S?KA5`HMZF29xGPkC$Z;L#cc9bh8&qYk2nr~x9vwE4>({aWr*zYLv5UJg7^)2Fq7
zk>_flAXZ4c6*X$x-)Faj4fV&<<{uk$LX*~{q4FR@bNZ+oVcD@i`lMiUy5f(NHF{Ie
z4l)W&N?VU<4K-BzW6szPb2P|2$v<_xLZi8A2x%biEt}^vVp@yYT*CA-lgX6N@3aOF
z3~l=j%rVbKlpk54Ot}|MtG|rhW$9sZstTLmm6^bq)HK4Ue*1qIGUy)u_XzlGh*2>#
ztTd8lfsdFf^oZ94`$RZQ0-$_y#fZxp`7QJDfYBds<R`%lhBXo1M|@h$5lakVhh2fu
zBR+qcv78ZeE!fazn9`%3UW1*OD`Wux1XqmdFv=WCT_H80)EtNeR}3Lk+;{;h`k^DF
z*4XM5<LjyvdyJ_tiY1?;DKU;vr9!{eDJYG|s8Z-F%@}F`XmtzeH5Lm&x93^oZ)G4-
zrO*we8-xM?%Y_~R5}{zS-S@R-IhUsR*BqgL^^-6E;g6mVLnk2+n0En-UO!$!gV2$R
z54VjNQo#=apdYwOGXUUBd5#2xe&A|C&J-d@#SzJIWEeV6UAWus79Q?QGt}v@AZkab
zFmjT`LHn*mpil~_cwQfs9Fql?TJsnq<V*vAO0P6#89EVXT4|QtNAlbV0hH#U<T#=Q
zMvM_dLL{ZQCICRr6lWR`!pKS3%HWC!075AMk)zfG1dIUzlGa1pDiQ)YLIHw|gr-5A
z$~gg0?ApUn6Cm5UholQP{!A&HU5NU9>>cw{e#r;tVZXN@1sp+e=tR^d6<?|lga}F@
z|HR(}zmneKjj=y+x;53icKCn&FB$0R|Ls4TkmD&1noxB>6S73cl#Z{KVMQqx1VA8;
zdIwLPzVYAw1_uSd^Ix3W^B12y->L7p9bP}uQWcKn*|N9kc@3qRQlSo`sHdW^M_LNk
zjRh!alZ{BZPV?Twzc^ldcdT+xDqm{>fLa$B>%;@*xB@u?Kx7O6R3tg?Y;S*NYxmNn
zbN^h3fQS*H<Fv!Dy0QHU&ckYXMYhMPpZIp?pitha@q#B0?%dh^D@!NuRorz&BDZlP
zq6YAp47yA2-v7ev#I17+FC&pA79)6^DMU?#jn=}$-K&$uhl?jy)YZ!I!7+QFoVN3b
zstJq!!S<amzrFP4)AbL=_AW;v7>OT#NJIJO_H98DiWQ{uQyQ*H4~iPbe%6<E3i$A4
zXl{dBdQ^$S02Pq}Ab>zCb5|3{cEWy3OM&QK_#{91^vFecXb&CUTQRS@9YKf(TPN}1
z{6pgvMsJZY>Z6jO*!bCg(O7IpRTTE?Wc;(?7l#o|e@lpL2pvq2h-iojijNriN3%<_
za@^b_auODLL{&qNsx(H8Cp{YTrcs5{&|v0XEt@CiC5*UVeC~-a+Id}IORR^gG|btT
z*u7mdz#&tl6XZRya}rpStY#-v!Ei#AEp$iAk;<yI^9Vm#={2cwCFb+Jjf<k81TPbE
z%~|l7RTmC{p!t`u5${}(uf?i_p}2bswzNWLa*@KeR4O0O21d(<Db39(qBPS3JODMY
zxIt;2TOuif&<!Ie{jD%^g2<6lj9Af<_tYBup-TgJ9D~S-qzEGsB_@CIPe+pHoeFJF
z)gW?};_=-Kr4vOWk|L09++#64?$fFGh3DS-`cIw?Lnj>&X1ggxN<>mbQfOk37YYq{
z9FY`}62`vHA}t~*63Gxtd#_4y060Cry}3Wx>=b33C6L@8MP~F9D#as}yzlU10tf&)
z?Xe*c0i_vc$z>|yQVONBWH6<fR6=WpL)VgWMl~?4S<?MMBBnG~17D26M;Ux2RWv26
zx&duBpAU?&Ojs#SS*jsw%~G_IfB_(t>TY9`_SX==@xXQ9@EDs?)rDIZPDjbMk`6Ee
z=+mIW)f%-%BH+tUgK*M^U3a7Hzj~*4{(lFHWde*gSI2i`#@+!&iGOTHh)?@ROoZK*
z=hsx&=Rwq;pWOTSWdg<*Pc6K@NnP!g{IC>+j2FVdgO<{)**jBkb^rx31Z2Vyj3aVH
z#u?{~GbR}0j0?_$$FW=Vw~=8lm~y=yAadSij^lU^6D$rqRZ_`Fks=`McaJMxxjy#r
z@OZ9T-XP+Lq?G46oq~Vh`-d{BZ*E>Fo%*06HS73<&~qy<9la~tAN1?f!=;2Kau9v=
zD*nOT#7#tccjXIVRG6*bWk`rxYkt(3y|?i(rJWP?_a~>;)f1(ogEn80-m#zcc1LZM
zo#uGwxpu$x!PxOMbHs?9HH&%w^D%Dml;E0uNS!0JKGtgOlOH>J_UYc;JJm?ThwE~Q
zz$?SiLp)dk;eW_0#}h{&Fa&2{`KJ*u_P}XtDTx?jY}A||gv>Z))OItX8BIe!i9_}l
zI8wkm3P!TM0j(XJa^@BWW#8VZ^Ly)1!D<=E<eN>l12EW(G|FEo4qp@*`xoVHQ|$JA
zu9C4F*hc;j$?A^bP=+h!Tv~F?R~UkpNBvelpU*B-aJWXu1@A&WwG@WgUwP{sn}7#^
zz~`R$rBS`XQ3Sycsq#nW#pl|XIAY>vZB^5t2JOIle1s|?pRdM-YEa0xp>de(Yemaq
zzT&l?I>e!ou^kEXt~@y0XU+H85g$1+k6I0Ic%s{)*L;1*MjzHk!1i|dT%HhNJe#(>
z#(G*tJhV8Xr=1(a%x6CD3ot_Dg;vB`emNqmU7rs1-Hmyb<v1Y>SNj$}28N2`q0z|w
zn})6zVRrmzV}Bx2!d^y49yN3IQ-0%w{D};+s9<Yin5QEX{2y^SwwF1}Tdu><6Jeh}
zbDs%pyGwi&p?;7YjQ~hN8^;%L{~-W)K6Tq%6BRfw3n7V)rDTW_D4={xQa^l~FI)jJ
zfP_7m-1}-B&U`8U?!>?TW=R(ef7skA%q&|ZMDz<71ddmNpsN8ISC>_#$X4%9zIIo2
zB?PWtcEe&2F;NI2PO7h_8Az8ONhzX!7#l-qZ8+d1LL`pC(eZLOIMwMbN2*Y(Z2`E*
zMC^+vL#0Bgq$Z_757J^?7x#`%5(M?Jdz^=eu>rEy<OtsPy#^BN&^)-VKAI{z`;KV4
z9+c>~)t!yTd^DO7G5+B)R$v?f6bT`svC=MQ@~AVb$pIwa?Yz74#lzO(#pNGNl~?^j
z>u{2H8`9Y!ujy*>Aw~+Iv@<qwzxDP@&8g;+rzmpa(T;bBIO<gM^Fe)%VxDw9+_!~y
zy6ubS8^81g<$LtjTN6^!hhu(>0ZBM~fWa|v@l*TG>AJ!ZUB(>7II<%d9;-+ogE*gK
zY<|=O4pu&HE|fL5$mEs_v>D>LSD>MdDZkF=iz<YX@DAE)Rv3aC!1l;XA1HgJN*5@*
z4jhU5ptUCCsfUP`#q%S#_#7A7f_)HZ<hE)+A!OqKkh99e0Z@SUI*&u4^0~SqZx_RI
zwlV{gYO`3NVQ>dV;W#+@yB3+==E`A;_C5JUGnOU4_h9BEoNdcwA6d-JhKvXrL<=2+
z5iZ@<Nhp^tO<;_UDb6*O9A;*9jt@KPVK5nz>7-0!v}mYqCNnF~5b)-#A5;0WIUrVH
zmkNZ@3Zu&qDU*I{-w0EFg`@b+2>FuYk);^ecRBZ<8hd1pmYXX($gDX=Rfm?L5{_E4
zQm=6{3CAw!5OXe~KxlbKn$=7eKa93u87u;Xd3BkYrXA;<Ta>dKVV+VT6TGJ}gJ`;z
z4!*T{FcC?fys2H2<q#0ll+=cS(YiHY$jxkeuStT=sDWrZo~Gb1+4n9J1*eYvxswK(
zR$q3?Won)ZBQ}wdhqr`DT%OQTP}sQ>M%ZZ&BH`ohbJFn~hR0HJKux5F%5c8?6bd&P
zCw@pRy6`Cgoc;U%w@Ec_iRN?0w@B9NObCd|by(1Ya;><&Q@OXRO5WH%{oP_$vqC}k
zLhQO;Nrc6I<cLCF`TVdIo*^RNX#g=95^1d>sie|UoBxXfUMW31ZY}}I*~yoKo=-|?
zrM1#ZYJ0y=i5hOPxVgUd@p|oEyR#5QCEq(D;xYS9lh6CT^0lv(rW&31t~I)+y8Y=+
z>(mY&-co;YVd6amU>E@nfK}8~;sP0q7dXK}M4YOvI3jrM_OI<8ojz(UuI)YXvCF?Z
zUfc|1sWHPS;DuF(2b?~%=1XrSi+KCRTe#7!M0NVmJYGcnXimtf6p{ft>Ze#V3xW>E
zqf&vt_ulmChR?-MsWqJfbPjO)J#b4Osw^I<K?Ve<2;L)gBqM>$d;T}zU=3%^3<X{p
zI~}1_2xd<%S-T8oF2Q*|*^p5f5azTa_Sw%q91`V=NJL9{K$*xOw}D&B;G?!1v~p@K
z2?*Lw6xPwyu7Jt%Iz%*M?(C|-bWNt5do)_INh=S{yd6e;3C1#;f~f>~lDQTBVBZL<
zgtdzSvQ7OA6)EHkz${k8#=Fc!2(-{g3)Y2nN}$z!HPOCYtP2i<Nsw)Esb(98`mkuz
z3{!6tw1Qg<PjVarD$%}Sm`}I>%>6vt1*lPhVYcI<dHWL&4>ZM0XzlTNpcpM8pD}~2
zCN|obtu;l5qBN}6Hs0NCP$SrSe9WS8jbs?JhBNCnGSo&x$SaOWmP`~QW`S;k@OH};
zjl3AjL8fTmsNq9`Ib1e{fUMx5?5+|T&g4U9WozW^3KS{#dD0u2CSjtP)naJ3(6Z7p
zLxE_-B(au^oRY@KKSG19i)h)Ppph1Xc7MRia52jTux5^NUdrRjn6L1R$J$soAtwn$
zu);bsyK#H#A}bltY_+3(6f`b`7-N1F4_4E|Z=f{*)E%eDg+T0R1wdgE!kFGae)1YP
zUV2j}AC&hl&qB3AcW;d~&?s*ajW~dG?x9&p#~KCKg?<O><KEWZ+&A8+R~M;RP%=OU
zQ7^)t?-fN<3L?S%FmkZXgd4IdLm=59BMUSaajvyjuimMYS0h<rXf!<$N5I*nwN_((
zDGcYzl^c8e*CJIKtKL)Ei&>!pbi{kTpn81wOB1y>B3)Wt|Lk%5Bpth-rC07YUz7sc
z?L{Q*hz^ZU)5Ik7I!pl|<EZX!J-@#9*!uqEFe;v&dvl_?UhtZyW?$djy|Udt&Cjh<
z&+#_|3QZgz)qXHPu-494@nE-d=ScS!+b2{kG#=f=G;2S!C?h{h%?H2$J?Z>ZvYvJw
zaojB5xmVxV8sm=s@D49yphDce1xluoWuvsfkD`DhN9-uI5%lBdNt7nog-?v=8s!#7
zutVW<+yko_Vy10b$P4Dr@Mbppkf=5fj-dT#vY%E%(Lrd@tH5^lKs(mT+>!F-*HBZ%
zV2KQ@l+8_NxLHTJaI$<AmD^CWm|-$~eeHEJ+tDbWzh!UM=9xU-0k*u`3|eiv$Xo3=
zO3QRKEBjpCJj|mrT`lr{&8ddfj$0c<qM5rkiZlc)Vco_8Hxv6Z(#H%Z!NgT)#KFk+
zls47oM20+vz;NHOAx;B^F?_o*b&jPh3JoleMM_K%Q}oWT>@%$v85!>8BgIG~mpe>d
zi!$gb)3{M0*UC#ztRA2(qy?*zG;bjplQG+>k~u;&^vXE0CyJKk_#-qDMu3PVe=`Pz
zjl3u$f{(!TRL1<35`mpak`pnT`f4+k5h-U~o&n@pk~jd_`j(8>Isz@XFeftQaX_(z
zmO;ul9@x#1)#5Qm90|!3kLSt2@rR5tkl3-5WmII$Nx(9TfXvkrY1D98s(r(Y({6QR
zUbuvL6`2vsW3_h-n^!O&ShBm>Xd;J@`Tu9{YpfnHl3$E|B`j1bh*4q_<}%(=vLT}h
z;Z6#V0lV32g`|Dt_S48A=#p1Vg?nTF;vXLU=HKs}KLslfC|lV^(9JSs7Mhwxipmve
zx4iL*uJ16AUbF86vhNXjPSEVYn(vQ~N44(Jgs$y(9o;;n^BQXfFVfu|1P&;GNz!EG
zyaE7)vYg`q4Eqa1mJ+0qWUaU-WpQHSJwz>)i!20SO8VV?eYbrk()BTYC~CbK|E)@C
zgMb|1<C_o1;VhKbH`YGA*SJ)0o3!sM;e<z`;vOn;7ALRIjNb~ws^(BBY**cu(i{m8
zbvV~)_NVUr<SUD%>y`3KI~;eN&R|hQ%`uYNgQ3780sz#J^2DtYJQs!QA&Q*H9B2eT
zJ++l*KtQB_HmHxd;zF~Zn#`fKc74AfBjQ4G_R~T_5c)0X>;rc{l<fZ@zmIJ#yIT5;
zLuMj9s@}D1*@lA3EKR88^kKQCVdl$6rWcpt!kROO8_F<9x8`_hvJ<IHQ<O)wMl-()
zX6ZQar%5N!+^o$-FWsl?alqWU-HcB#6FQ7*L5ql)?$NohTH_islNEEZvjIOVyu#dz
z&0=PV{WZA8oO07dI%xz8o@^&JOFl9*)F~c7sYjrp_A#wjvK5}sJ@F-TFEAVF!=6bv
zBIm=#KMcz~f)Sj~VTO@mXKBD_h<QR7=DM~Bm`882`XuKsW98JDf_Q}de{cj-(&hjf
zR)Bd-6pei55hPQ?4%@8J(Xu(gJnsV^p~65IjglIvf<s(dE7cGI>($o96YJZDb(0}{
zerdz^WxG?ryzestz;ylSGtazpVQJ(1(&pXu`B7<yIP!d-Z;>F{jemIN;+^e-aT-D&
zPtWhvtL;XsBDj9?+{*Sr{p`Xv=epPT0rIVZVK1BMvF6m+(NVi{^~{6)W^ItyGQ=@{
z?9}ST<@MFwDHzK9F#%@GP+QDB1psjA<odx;b!zOmQtGw)g&f_|up}5F4<Z2I*@dmc
zR;5%3uAE$(n>d^uKboi=?;nkg*P3NN>;~@X`R$`lIiA6%=eL8<jTE<^&0H%PhNMLZ
zfWVBV666>KXh!kmA|XfI;#|1sa8DtBL&>IB0|02p)8%o#x03#-B;trQ;b@>T7l5dU
z0@CJe(+}R{OIOkH6NG_nyzoEK@BWXM?_EM<#+lbTMPxUW!4M@J5K+4x20h`GxT3~m
zCt4Rz6!zQvsHuvs4ph*H9O=UZhMvSwlvvZjULPiVZI|J(;1Pkt7()b78i(vL=tF7z
z3IB%${Vo@q!t3qsKZStR@@~|h;yha0c&XW(A3yQ6+KKIPctDJ4?YK_M5j|o@2eYNc
zi>2n_e!09pU3)NB-Kv!zmJ1JA<V{vr3*PZe{f@)>+-)u`9286X=(q%dqqNf)cUhrZ
zRn5t0*Y}Pi@b;T$%7y*7$cUmsyEpB-$2rpyGhV9d)i>)8qMc|GXBDVNF9$eG(*7Aa
ze@yd&6hBLUI38!snEvTJLIUpL<~tw*VEiNWof)De{V?dotUmAbv+TqZ$ekgI!*D*6
zi4*0l;f9&wn1NR2WX^SUMpJ5Y+c#Qho}~!Ep~VD7k^3^5PD+Hb9&CIRmk;gZF&fda
zXq)2Zj);__YN4g199qvUN|+@wr5u&p{_d~{28SzF$Ww`iKwPWNPKjc}0bNG3ZYYg5
zpG}u_qek7|p^^X*5b+U;2xi;6nP?5!We{0s5VCqwWCW*}H<$pk1iV3XF_4`lZP?RL
z>c(k&SQDYL7)NLu@#RQ=1Vh+z2G!)6uoh7ihXqGq2LeOVqaiX=WsI`|T7Xo}ylF6L
zG0k<RTt6WB521-jnUgS!sm?wqk<pyX9r|)uaI(fAeg4_EI{iXoZixi&;^WtU>$Bh6
zIUI`vAt37(4Bqk!&%LD;J7`w>p?m4nngNaDkenoIKoHru^&n+3yTEd>e`$G514Fxx
zyl`Uu?84^e{x|}hnAw}1I3$2)F5V8LLl$bEcwL%Y2Sh-;baK`6A^^B@@}W`;tx)5^
zEWdJk)%U_q-@ANr)$;Df^q!@6f((ex>MuJ&pPAnxz{TnPa<QK^tMjSOmV(Ya7@eBi
z2Eg%3t5)tbJEd;mb^8SXoT#>|<qiNY&+L&NtXAE=e|~A5G0JjevTV!bYh;|6OxQn(
za59hQXsnBbsUiR^e1G^*L>b#4ZK==@MxG~LXU_150O*wvAbRZc=?{5~9msI4-%|vA
zt>=XQ@#@4$x6sv6LbjXZAU|aAy32p|SKzCkyZ+z(&CP1tz%4M3@R31LwQo;+f5TE)
zMZsPbuK$<6bm#AW<=%h&7ielqgc1;dQ+K~h_dQ~MV@9<K+6h|~w$H0GdyVJ%L5(p9
zK!_YU&)JsHquq+lKXAqxt=6e3l)XcMaC`r`J1c)_bLSVd^2e%o$`e~yF7u5gR%km;
z+Yw!*J*8b4`GR?c^3hSN<vXJ4DlUQo26gOST>3ue5*h6@&iD0Hv7(PVZqOE7L$3@+
z^CXdZD`m0c3%`#{Gn9+t@1)r{nnW+EFwivAbxpPrzz#%PA-^O<D2CJzIZnwaK;aQx
z?@T*_<SEAJ&q)rPRc!)}Hz4eOw3;uTFb6Wy>4G~pk6v+Dzk-%X%6Lo=a;)W~5YD2#
z(!C{fbV<k}Mkmpv!{_|}jg*5l{({K<-q4*z98%07S@8oY%_~iq%D7;Z<p*0Qe3Si~
ztc_@dBOql(l67RxTFMD`EF<a;%=Zn39idH!OUn;4BEk%mz---2I!p#4n9+;|?%81E
z0F$w}Qm$~!JlinW!Z+G(WKpEiFv(6YI}Q{?vY4G_EQH0)!;CeM)ni6J8j8%n&WQNU
zGW(2`o3f5FT7AvLH=B|&gYw>lMjM_GawbG6j!RZ#O8UD5wm^6Y3(qZ`gQgp$LAiDk
zuF>?R<a3bmT1kdhZcj9dFZ*G_G!1D`eNk$_onhf-varz)Bl{C2{j(%_J0ZWNQO)Ta
zQ5poCu+NCnnvyb0N$YWDMsNxdz*k><_43KpO0hRJcKoCFuEalE@PgHyX%%Bg@jx1p
zFoNl^a_66a;};R(H-7Q^cQ@ye!C!jm`;JhakbnBxQ|tQ^Krl1j_@(Dx2g3jO@^kyg
z)k>-Rr59cU0KwHC{pf{ew}^yi7B)Wi*i9+fAN=seUg$1N?T?i^f8kR<Vo3k~2QNy^
zfZ*!c2i0Qd+iyJ)yXY;=?5*!k0x;hVo1G#eTwGqew7g1$t#09)uU`XzXD;5kzcG8*
zu1r>&Cua8EynSZ8+J5Km>9KOBA9@KJZLn6Q_vrG8)qnflPoA9LIWfH(57{T5c)#F=
zjw5fZEZ^UrL7-<Z-u}sr3jla|d3F1s-e^?^snN+0`(6}DjsU(JZ6EjmSn`5rF5LzI
z&h#tSFLrxgz1o=?JG#BLKm<>mU3u@`sWh$n@ly{!c(9BJz8CE_#_n&;r}@r;E2)It
znueXjI%9P4#QODz%V`$m)zc69krT)0;h?ucrbk^?_F%GFCr=&`LVAEBG`k#Rrk`dh
z?Uu(<W}}sJqNIdek!HISlF?C$7l3f?lDqMNx$!v24rDm#cphVtDA4L$p;ULAjiA3C
z_C3ZpAfW?F0psziU38XU=GOtB@xS_uv;W{faPF87OvY8nc*2<a)}}~(JTZFJvJM*D
z@fASh@ss`2i`6&VU1!i+?(TO=Q1VVduiBHYTZrVmb5oWVluEZL#RXFUq+~J_>`@M=
zkP8<lSt|QCH(%Om*Zsok)cC8BtonsR<gM|s<L&koO^3zat-bxH4jUIsrLDP{pJ**O
zW3J%MZlP2@S7C=LmSZ3gU@xqWmA4$xTitnF_;O|(_IGJtqMD|Nqd4SVn}H(jWUG@T
zXF%N}?z_#he-KJPXCZD<D@5ch!@2G1#@O*hZKf`DNJAhW0Z56O01-IPd8!~722r`T
zuSRmE;Pg}4y9j_%5otgKhQRnwV-6As506$M>VQ-Fxrm15F@8S^;`!q}_5~=9;~>W@
zS?#mXRm>y=>72B8y0jBVc|TmVOxS3MOl7z*Q<k|tBy&YF<88CuE{#7!i$g_;*wLUN
zCFN#Dy=IUG?i!Rcs}-G47|HlGOG-f50zx?z4;Y!FkVa@^F`SSya!w;X^Ob=$AP7K%
zNZ*vtlJ56x&`nNS!v^EZre+W(5%)&48w|GOWT}j=I*AWXcy?sTaR_qTy;X8#uxd)B
z8g$0Vm>y&k;PX1?Y|630T4w{mac)dH{{{dRnbkF!jgdjljM1$foZwOfiiXg`I0208
zZ&DJiYmn`XAc;)VL6`v%VD>fRb=%4Z&cKLabxJN@4znagu!Ama7%AP!5R7AiC9br{
z_(+x<#ne}ufS*;U8Gus?=UIHu^cZLc6{lxEOYUmWNCz{EAxXv8cc*^v?v=OioW&#q
z&lU26mE|PRY;ccg5EcyQPpq%+PR2)v>9OOLt(hlIuXv7p<@%*pu3vcJ$_)Uxd}{T{
zvnxM(@5<}9&Od+UCLlg}?p`<WUb}VvoqMN0cI5^DT)S|0cH-!j_b=UCJ@Lt_?*qWO
zg{^n*oqFr;nR}aaAG>lro_tT8yZgqib4tcFDBN6Ky8iHlBh=Skc`ja7o;Y*=&f4PJ
zch9tY#mgsG0pR@7dZ+Ir;PUJaX9S2Zzkl(lQwo*yowu%LXS=K&0gP!yY`oT7n%aB$
z`b9u+9W_63c;n%Tcki8AoY|`uyS^7r*N@}DJTbGYNDS6i!vrJ<#7}NqB!rs}m-d=9
z1gMreu8=n$F5OyNeDchF0H_r^m0~wWH0Q<}+JM7nCk}TG>jWT}j+7wC9*EVQnXUbC
zKzRG^nG8oq+&!#Mjx{rSEW%X%c%s%cx-^t3moXJ?Sd0Oa6Pcw@k`XJJ@l&!#+`tIz
z9gYmo1vK^QWNIDKLl>BFlfm41I{$HV(PsdgQBM*9K%_|$%)5ol#p=ha;}s@)TJ^s3
zPoUo+gR?#T&;JwwaAltfCwaul{2&R&o1Fd=nvT`rKm>q-TR;7O`4?`Z4e!5)8ymb-
zaoob-(R84*-%)E`@n}*B)*Pclw=^^N&~w6D_r7{`e1<efDY@_A@+mrb3d&`aGR0U%
zI^+)EOCD%ajrQkn?47MtZwLKTj&pos{u^WEJ6d}xESFE-5G}-z3WbB|skepb?e1T5
z+~Y>`iH*(b%inok1XEq5AcK1Wk(6?}L2Y5;mZuKhy|eJ{?sL7Gr-dwRqH`cXffkx{
z?$ZtEshU`*JTsUxr(-1`?udzCy3=X4Cz@Pxy8}G9^X;x!p6&knr#F39ONFhj7|nmf
zfpc|Q^Erwaq`(h_`W&r~NZtO_$5y}c#rr4b_8kF1I4A)hRr9$eY&?W+14Q8?)O-Zs
zGTaIKF(Cl}NcLE<Za~OGO0TTFL>4I}0r-+_6;n7IhkRQzi_L^HodQ0oa5GcDS^}@Z
zK7y7^k|4!L;@W{sXp+*+8jS#Sv%w5RNngl-m?*<L$yS$UA}cU4O+(pWSR!O7nyJZ1
zS4}d-p@vPc5d(`xyc-znm=SuPg}a%(i9!6i{X=Mlg<y(urQJmW^PoA%KSyH?CQMJw
zV5qcnfqU`lWVFkSecT8u!@Qqba)Sm++H@Ff*IPlD<p(F<wGd}BKzb0Tf+k#GnyF!;
zzCg<I<5C)Bg6olqxMlw~a9PT*V~cob91GKgW=cU{0wZ0;cD%MYn_${~XW|S58af@N
z#}6x1dw_qS{W{st8}Y#=D3X?%*_6#5JG6a~kW9RfOb2p%QBHc6={dt_xTi4T;EX{A
zE0GAN#*Y8&jcY4gGYLM5gm89o^ILCROX#nZ3R&a(cWHTjd3NV_zWTLRxA6b|+UEiA
z@iPy;{pJ%J`x8YkJZMz_;HXu;yFMRDacOy-F--tx=C^<UdmnFhi&xJ)h(FSkXYT**
zw?EwtylSz#x;+g9)AggTzxGTd`Nyu@h?GMBt{VYBKlIY}#ZJsY1lT<qiz`>xk?*aX
zM4)qvn|sGK0DSev#b+<w*=dY%u3x`#9*A}t;{ed@d0p@Z#WSTlJrN-h`(S1HvC|J<
ze*bbL1rSwBo#RevZEp$yuARLXN)d+6`rhQ3`K_@^=f>*tai@?E#sLVW2-^+<HQJSU
z)|dQX|G2i(s3YhnPOkvq+TPSu{dm06I=i&->WzyDE{#uLxc%<^ld*?05u9IIUzj|I
zB>(aImjR&D8(7FT+9l)IJvdQj(d7iM-8vVCZY5zul%28?b_J1fBu1P4mlktmsIL+o
z6B*w6iR%$jCL+ry5o82{V%7r~wl^F+bc4r)yOCG+0kwh6H=@YH;Dlf3DXjrIN^yh<
z;XYQZ-U-^rQiAK7ZGkB@KK0-Ji?&<=amoVr?2xWZCI%LXF`e!4UgLG~^8fK)xad$v
zhOWzz17H+(5r71A54xz!z8(w9?XVj5%0<@ipPKouTWoC~Ji&B-_RJls*C`BXh7lk%
zn**eaC|?x;5FqD$BEGfvanET!HuERdv9&wBsVJ(4VI`6-qEe(}b&RhBlBxxNuT<EK
zw5w%_WMy$;<v8j;r~ZkzF27d%>f_U`T5$!C4^}NrBGN(8mx5qv$6G7i{O(_wpLln^
z_O5nSiv7}Hb!KKpgdJswG%{gIK(N`@b?sho;2naZRorq$jh2|3=>Mf(Sf8kd*UlY%
z^Y!U>?$!1hUb(17DJ~EhCn6#(B=@EGP^rYA_TWPFC&!~pSJ=gihwJN&AO2`*d$*{y
z8d>=v2N^(X53~gCeuT0Q0Rl}eCF9xaKK-kFY#t2f2Fi7L?Y+X>LQ@eKnUaVB?TyT+
zPfF{%TqDLTp$yd_<O6&SXXbRX&KO#Qr#Xo<%L)`UfW~<1v)l+WGz<xC<2A~aL?Z})
zaUYP9x+4urix=oYEs$VO=>|)-VKb$hyV>8QjHE+ZBbWxS445uuar&7dva|l0*t}C(
zSW`NHMx<KGAW9%DGaqn(9wu))s1=gWL{_&mZHJ(d`f3&A*(@=&0BMF_cKt><KuQ0a
zrDp=ugf(rt6QW_-XNVC}4=>vQ$SiBf(22l^C|Qf>koI}Ag2`arAlW7&gRR0q`6%Nu
zWpM#$x_aAT*Y*L-R%>8-n<)e2hYVXrl5~dBmM#B9V^ECQnWOoj$#*3)MA5WBHVs+L
zYB-_EfT7Sf8JFpSfH6H$Ypra}CWHh;gz5TGukQ!a8Te<~LP$hhoZkDr?|katfB(h9
zW@T>t5CCfB?#BKk0Cod!=U^NGo1N0%{>s<?&M$xcS3miqcki8HNUo5rP6+_dE^OXe
zTXckGjJkaf0Gi$6LAz2e1X438IRGq8??2q00fdE##$l^MkYht+49M|XD}Irf54U?b
z1^^GXW;s`5rS9uDFX%W50`kfnMDsy}xyi;@r4xkiSh*cv=UA!R?iB_NR-yZ$N5F18
zSUxem*JxHAZch)}#+WDfv>Y$^VLxyIz!6$g?B&7UUpaZ@^uv{{*+#n@KgLg;ySvw@
z?;MT~n#FFkvN`wG-81j6oXiYuMoPt4zIJGKO090epyHy%mL>aOo20PVb8~PAG<n%%
zEZJlbQwW)9I7!ywXcXnyM7eDRbNo}XI-}2j+<dSEVoS-klp=ZLVz!^p*z=|OwNlM!
zwq#d&aO#J5uKlAli!x1PBTF!w%2({nBm1wiP*zdIs}rO(Y0bHC-NN8G<Jf7mf=1{c
zjkEnK0go0%G}(+eTO4~MiYl8A9v4Szexc)52^QvXb`~55w4%}Jr%I{f_Q5j+|F~Lg
zl-+kbM;F7WI5YW5Bufa$BoC`csvG)LMI@y~s0t2<vJ)236WFbm+}a{5br+wSY~0(s
z6e&NR0xTq6bmV-YIi{LZzz@B7eed+l5Bot?lAFuPB_aTwV{m>*dzuEAobr3cx-;Gy
z?@DE@YK+lg%bl!6fA`n!P1J%;Ur2>tdSUzT|J7TMpKfmK`jJG&MwWhvj1|d6M8cn<
z_Ki5Nhw{|7zYl-%HNCNpCzjRcKTn<qksJ-xIX?6naI^|e@uNX~1<v+m&{EPt=DqM+
zZ1+C81&hU+n{s6G&MmhO8kXv33sh3|7^XvL`zht^cr#$j?)4cy8f5m=(JJD}Y`G`A
zHuKR2%MQ(;j-kcFx9Zm+SC+hSn+<82n~q6hr>r@LNf*x0Gg~5QOgfo)+d<0W0SxaD
z<9*1~L{PSAr=&X*v?rUJi#aP<Q)!TSxeQ>xJoK1SG*eX55T4|A|C|7Iuxb$uaUv0|
zOfW=1hSq{U!Wr6}ra2#5%IlCZ*GW&6twWO`#RD*_(=n@^O?gEEcw;uoql_$)ur18>
zS2H+t6w8>Bc4<!9V#|0eQ4HA(LomFY$^N>n@ECkT!Vh%?Fl0?+RQ_3a8}L!0xAcQ0
zd{hK9pH(Y><B7BPSGHyWfOC}wRy}j!&b#+dnXC$iz?qH<-IH_Mdq-m%`;)szW2fi0
zAMDJYS=icb)XZ@>IlKG0XW#svzVX@L`}U`f+NB5E)902pcN+Ehs;9?}SGH%)Eo^KZ
z*5j^*U<3fmv%7JB69B5k&Q7C_082Bw>wA-?4&U_QBY=gegWX0wZg;qjZ1)NP@bvk+
zyN&wf*s;Tvb*{+Ev0_&;K!AnGgI?ghcJurvu72?O=iUH-u}b@>T_OP2iBdr9iL>`s
zw&#{-cMwesi8v02Rt|Uw1vl)4aoH!867lW3a`NHbjk&W6o9QgAmbypnN;>z2P>puE
z)hRZ+Mbi+6QqHeYyAxR_7l!GHEL}$uqwwtcN<HN=u|Js*fB_PY%vH?n`;4e_)8UVX
zET__*0_9CNQ&$B9KrGgRLQNR&7MFcTGIEhALn5I8T3XeGGrM)&-@k9LGyo8m*MHkN
zs@}Qwk1#D_M+kZ|c%Cd$3D_J(>{rTx>|?PUS4E7wgKjSna@O5%ciSzY{8D$u=~w#G
zerpVl$DFydZ<NJu^R|EUJ0Dwp?J<UoEsSHe08-{$uafdec6;O9&goj|K)CBIcWJe|
zFf;K+7}jFbIvMq%S><&(^`t^@kd>JzGRHxofe4tZ^p?k8t<Fm-oS*#(2gwvfQZ*~o
z8i(c#VV4&k2+`nyE>G6(URd~3#^g`{3dArQWSz8ZK=2W&6h*2~E}UsU9yN-+Qpj{x
zIv=;4nX&%=<~MHFD^aWC#x2EmPbiJQ`PsF<`)l{+C;IyhPf8?ht!o;{Q-UE!&XMsC
zk9R|W&=Ivp^VE-Co%|19lfVD_`di<GAOuH@R&oSwJbVDc|7esxf!K`Xk(6#chmSV!
zvCj=ZAVUE~XwG(m(Hdr>Lz|L|EXQHnEfYtY0p*M}hDkqQ>49-b3TsI#&~g_u^#K-%
ziZbCQp;fG)sSC-8nQ6#%z^3u1kqJ3JVoRcFb+nTsXpR$UN(r(bL%T?|>SW7}Ff&lY
zAqxNt*ui1t6Xk4j?W)N-BiLA!X>4n-KTRknGb{iEdX&Rv+7yC;otPyAGzdY~h-C~S
zv|zEcuWYt?Ori`~Hp+wA#XMu1CzCAI2yC&nRW@QyIcvF+AsH4am}(LeC=GKi6NWHk
z(9)#T$T0RWG;SxEBCCw?goY^v*};K{>?4`r)_!9cUzl+!hEd$Gi!PzXK|teRlZ8<L
z8J4t$7CH4weEjr-x9*&ssJ8y{XTC?o9HBX*bBi0d*A`u&(iP|LeC2C@@7Mk~roLW1
z{ov->A|lO>AN2xHDfZaOhc_Oa0HaL5dglJ!jrn%3;5w??_YvUy;`+_iMF1SHwtArp
zh|9CP54L9*($v_|mtTAp08Y+r-`|==z=>+R8+h?JzkL15*@exb7o>Z$WormHJASxx
zG=>N>_2Xuz0D!;v)I057;pW2=@2@O>_SrWvmyu`?KmO87KltU3zY@>CO0nDO7B~aJ
z)eqi%91yFeZl_m3q<XpA=@$Uu#mBE7w5kubXKt-6zI5%ql>hw8FTVPjXWk;?`9#BF
z+I1qS1w$$of_~%x;PaPm?H-M7?oU40ntlHAO#pc2;_ch(i_NZ|KJ|htr8s4i!8n#0
zeE`n%lV|V$<i^F6<UxR+xcdH6=kF#A9W;omX;X<T8%S#cnWy1F#8|3MBWvMKxvW+o
zyy=;R)>#D%UXpo4q?7}ken?fQh8I3*E}A}LhcY~r!SL?b*ZRWd2Pc|4<?TBVbd0kB
zoP6*%iw~AQ_?7=t5bhC}reDe4iAJar8V@g8Qp)%>qjEJ;5o0129B}S9u0MFhIqU9q
zd+iQJuIQAi?J2Gb?V8)ZvdBKuljHpf{o@MV-T29+``>-~Xmg1<fT%c&2IXc3gb;uu
zc+dCl641ldFJoA&SMDk8Apk}wC%RIX_|XJIT|)GkaFA)Bv?tCPY{}v&^<HW372(~+
zNw@cy@1GByW!>vY{&wUx9NuBT2~kVs1+wxXrgQ{alLjmD+`=|&Z8Az8!j9)hRV?eY
zqt@(-xryH2`}Mn(V$^84DXNDEy+Ck)Pd~Z;+h2J2JHN70uY?59>I$t9kThyvabG#f
zUc&)7`_POvB$AG(RBJQM&dCpMp1Ql@BI=R9f(*hAw03}rkEj3!Y-!n1QXqOy{~G4b
zFo=oE1En(66s0oRVPrxFW)~v!o~1$0GkdhM)+1#{6w`j)JZlZaBxD&~Wm{x&Ps#KX
z$!H{l9XZ>r63$^3!;scqDS%}ebY!BAbh1;d6d+7!Z-c=~c3!kiNryfsp&4&%bSA*G
zM?=Hw#Vj9*aL7akj0_NCLq?;3x0E)SkN{~YoyoEQF(U`i=)mQ|2D0Xg;kuAYS`wa@
z>E>@iIb?L45<4BEoJd=|1N$;Q|Kyhq)Y!}kNti&%uUKg-m<v@w)2S<;Z<U2f7!?<p
zx^~LjOk@R5Hpepy3L~_J^6q+etvI*<M99nODdS(5wV+A*N7IPbA_-v{q=07oH6cL_
zZXKm}oGkwW<0NM|s$`%e=1iF^vz+V`kcpHdp;2*A?)lHgI+<@fhvWbGm%pwx`}aTm
zI3WD3FMZ>sYwvnOK6CL-qgCE*j1xeu-1*$IZ@zu^%)QMy0Q`k(@1B|8`o!bc3Gny7
z_X$M!#N!`)=gn(M^YpD&wr0Qb@mHR|bnE#`w_d$*Y4c#><Bwhc!Ml$u%`Yvlc6x=?
zo$0l`>0f&O^%oz%E(YQZeE!m{SFc}|nx9?V=!f3w&NKiJv0mSQ^4$IVn{xxX6q=Tj
z^z6kur{}k?oxdl9{Q9fU65ulzZohWxyi{U-;!tqCx-*kANs32S2=)Bsn}^NH-Hio6
zT-}*|>B;vNr}y5zd*;;K&es0Km6H$8EN)#nx#oG%ciw!G03SQKdTVtlluo_eDf#{N
z-Dv=1OkX>Dztb<oy>c|}cs#vM&2OKb+d8|nS@41%zyBBlonF{_xIGg@Zm|%ImAV`I
zlc(l(Huffi$W5QPg{gy`Mm>mJ7?IbLHRPVXc<1`c$zJH1na0bryNI~9HwD@JH5%hM
z!i6i-&t<0nnW;u*<(iv{NlA%zz6)lVd!sM~JC(|;lCzKFmlQCXSl~PNQelT8YAQJ)
zT!%4je;7$r=p5D#R>^TYrEz2;9j;pcV)ea?_kR1I(j8S&r_IPdvX~wz-*GspFuQ;#
zXczsO3VZRnmvO-mm6Gu_%Wecn#fhSpO1D*X#N^CWL_UkQoyDC3JM_x!@#(eR&J@!T
zvZxzQyQ1ZYp5TEZ4}nNkI^7HH-h}5J>>fThQG0i}^fF*MKxD`%i26%SM}fD^i@wW%
z06?ePi6pK76tU{WIlLk7&E8pj3daw_UNr5Idx*i7%Oyhu__>WrGSc;jC2s&Aq6~F^
zR=Oc`+MGFb+;L{d`+xf@55}uOyXWKzFhtOVt)5f#<=jO7`OA%JDLQO=?VcdQ5(!_q
z8f|NEL}bi3iI3=-XaL~c^L*EF9~lF}1a7_yN`AC}V2&7Sy&CpnSXvZn?CcAvHL0=6
z8#RFKtbrMw2O;OmfoOz*S&p#QI$&in7?2to#>+OeZHC)sx(6%rBBSCW5sru<vb}h$
zT^|$q|6s>89x)v1!ex{UviAFQ`$D_doeeHo-3G%-4k>5bXS(p)IicxV2Sc&qCLP)G
zsUssPGc_~-9C8^n5-JnI6`8~{D{L5ta?rBGE3?>2WoVd+;mqtd%0$|U8C%9~%DD~$
zBH~kj{U0M{Y7|6+?3t3^!9<=?(Li3PMYg9%>XKucWvA9D$<!iKyiK<43uZ#}ybKu)
zrxG&J1GMa61`6~<{Q+hOpGlr2J8HnJ4dV*gRF)fZ@0<#TOo9GDT|)WDh|Hec$gLnF
zAvKe~P{#8$B=l&c%VfL+GW0Wmsk<CeZiyLOq$8B;M7_R8gvhAihFT*baG+k~YK;iU
zxOSKfl^~6P<T;Wd0b&qxr5Q5dsHEa)Nk&ARk?TkRQW_&E5J4~<N)8BuD^g4WasbZ@
z2_Ogs5d$Q_w3M6>9Hz8pI$`<?t^r6&o-tJu>OSN8uYK;D|LR-6C{RU8NW~D5Go=&*
zM23nGNOK}G4Z%|=``Vd%o*TV-<6=CPo{*ZDB18g3>@R%khkx?wvq~{ZOeqckoGC?&
zG-F%?kXD04?KATm(__ake{d<wS~QN;pMUnXmp{1N4?InvGzS9Cwbn?0ESBCA<ES*C
zCgTLdHE7hpkO=Ig5tGC1I!a2G@|xotT`hMnEUmwG<GeX%%pjR`GQ~QcG}0#VaL5E0
z)~o}t+2dAlB@pC)4>Og1##XhS6f<DNOw}1I^Zwe~?B@4u@QD`O!i?)jl$UgJz>w6D
zlE<f?l}t3I&VXAm7oQt1{zE;{pZeOTrqoNhpqR|LjEs~(GnB;$f5PKN$*ZW=A;vau
z2wF!`&>KLB3JT-Cs1h=4ZtMiYXTVT3u#Q*)@RZvjzXc?8bTrdBn3<b?d28<}$qF-*
zueqYx?Vd;8+Sz|P2<x*`uat`GQWghyAjGKB>6|>8xHnmmHOXXJ<8WY{m>hF;sm*#l
zSac3<R~Gh`R{dGO^13?ESdvOHUyC$&3_mn?;!!P6hJ0kHWo8ICeLT7x9(SVoO~2Xm
zChNg}^%w8dN>Qix(?K=HNH8iD)gSz5_K&}_G{>D%xvvN{B3DXCC56yN<OXR1u(O(f
zR{d=O+Pk>%77!U}Y(Jlv<3NU6QJ(`Mfcx~Xv6-{!)0#`(p?nKACG*?D2*WnTqD-Z7
zT_eynrR|z8pK~-rgV<_VyIH(6H0+$v+N}~fgKd^fc|R13W|byk7#iF3Ze<V+L2kYI
z|FZYyL6ThOo!Iximq%S))z#N@_uTgYgBc7k07wEu0K7zy0x64>w6UwzVQDSL%4^Gx
zu)|^h<@K>)|DmvVwO+{%hjz7EuYB!_luU{eDH0?O0vrs0xiI(DGt>7~cU5M-_xX>i
z%>3TV>X`ww5suhUM+aiMQC*e!@*UstJ0N>SoD0eV3dTerOEHZFPo_E>cRfjUr;@E|
zz-?m@2y!7}BO*y2Zrl_g?h?;~l|<Dg4OA#Kvt)Z`y!$a@CxcgOV4Ms988P@B-<H!&
zolQqdrS*`I<jhk)ZHidOSxORKCQ6ztd`#HpXeg|teewa(IC*JYfl6pOkUCT#>mH-Y
zx#J3k%pL)mrAv~okWm9g3nxLTG!0X&MT2|I$=jH!j`4B@r6)jA(~l_;yt-?MDIuEt
zjznxdRUqQ`%`2vc`n6%JhfMPm4HuGFj3psdGM}xuoPnA|6gh(~KZ!7sp>`tW^j#kY
znHz~n3m`!V2qMxlR8FV_z#!o!ExAZe|01Hu36)eNk&sAeJ-9bbBGw|pP)QXzFc7{I
zD$a~`s%_8*jv<jqj7<`~T}0eAx-nJV{P5PEP)kh%LNgKL_mfED5~KS8`)3#Ox!~O^
zhvNK7L|Q6BAfZ9Hjyk;a-npCmBJB`~K9gF5j7xbU_N=6da%0!F)weG`4vf#mV03h7
z=l#obyCN+~i~db%=+h*j{|^G{zhP1hCq&RlvBn!E2I0tDf&dXvX%Xk`as3(LiM@Bu
zTs<(jcU}r$;;9C7z%+uvWM^erd1_y5I^$qA`5*W?nk=yt-;2g19Be9N8ZQr!iIHEz
zVpYVx9sRdi55vB7hssnR6;PK{eq+9{ey=EnXw|yq$%M=`arac=!michZ!MnqPLpo9
z%cHIwGdzpPDCZ{%6iF3u@MA6)wKj8wQ3|^Qu&!`W2(6<&`?S~S=&0wHeLxYcuR+iO
zCG{pkh)@?w$ljFb`HnZz@J8mEt|vzJy1h^bbm#t83%NV3*39<lHzup^N!iuP14IP`
z8gf##XO{}v9hn~$xd>5#awJ4SHRu*~<bj$|w--*{n?JsCe|NLK`?;A5-PR9+-gqu2
zrE)xwAcn*)ACbgBU|UHT<^%o4dDl~sr`2*{TP669f8pwADXh1=N2#e1q0-n3<dI#C
z{WEQWc=gt(?`co#p6}fouNGS^zZ<9+tA{8sV@2@rFW1A?3f_Geh(30Q7Xa?`+Wi^h
z9eV{U+k~4-s8DJ5htOmI0zm!0FhQ(&i}7MN%reRF%|=%G0Mh~odGU%htIXC8@zNe)
zqQ_wul#=Qjr7Z$hwi|4Bgv2$A)9$H($0v)iftDi=$LUbwnu|8FkKc-+51l5InD%S!
zPAscoCS@D6&RIivAl1!I+e*pymX>}}o+PpgY!WFZ!(ob&r*V`~w;qfqv5rGBqP(kx
z9O;iq(2|-yfME=3;xSoE6WF<g4%1`c1yQaY$|9c>VMtudf%+&oZY*dp(G4BJgcY5j
z9%2!SxQYkBFh$JU&aNq<AvuOI37R|YA<GK53vOH+WIiv<N;DzR5GA!WG6?5`izGCm
z@99TVs(S(h4tlEkOzCnqE{P1g6f=clwPjAaOd{Vj3pVw1(#X#Qy0L9Loi_wvREAgs
zfFs_sKPAxuvEFzZKM=bzN~zThpFl<qlvYn!grBMd5YSkqes_6_B@IbHj_d&g>r<wa
z`1azoCJsX$DERcn0`gvOvpE8prU9X8^h3Db7<uQ?A%?0<q>uYM4Rixn^#eY(JlQN~
zxkJp3NWdCoKt+>lAS5P{#L>t=0Qlau1BohZlGjoy7l~Xxe6abFu`C&s6^%K;G<_1@
z2Qcvh&SV2#Wge`(lxPyGgmATc&SFOZz}yICggpphBMN8yyaZ60nqTsxcjtX??{gyy
zmpl1URhjOu#FD%Bz=gjTzPG+nIJa=}TfyFS+;sCdcH~#5ouC-zn&XX=o->}H(Nnc|
zBz~Dx8E@3qMv7I{+8pSHNDlzRumea!U~O>&9UPe*L&V0?DhNOibOTTWv;gY}3L3sE
zr`;&fBZarcc&FZ&6{9ygrB1gMUc37Xh?;=H$RG8t9V*wNV)5q6SnblNsOQwa_v&l2
zD$MVA@;hr+pItupSaIftU*42w@)I=I?M-SD`RZ!@{EwkQ&WU4Mg|<lyV`+$w9{CYz
zfnul>E&!k)UDLrV9^KvimCwwTi_vD&lj0+ACNx3NaX<0c#{QZ1Gsl)+e|zS}E$7O<
z$JOUgMH|cc+jq8|K0{J6z`X<@qUez;bq>_#A?krY@-VO7t+e{Yy>3Sl$T-Fj#W6^?
zdOJ9vR9F=$UgT(~fu%$bGSpL2>{Wc!#9}GPT{{xF58@aGG-NfoAp@&Lk}2~*W)Y8T
zC=9v-7Fhw!w_w%ZM0+F+7y9eoDpKM=HV6#1Z;A^{Z4<Z+ecCfiIt|IWM`?S}@>4*w
za%kx4u<oXr)FvXw1e_Vn$O){PX`23^X>XeNC=i2QBAOx%#0-deArnpSaHgeY_!J|i
zaa^3Zl8NmhBs}@6|1)Juwua(dW^HFz0%rbUg%-4Ra>+&Z$Tlm^yaNqyFi`q{5QjA^
zj4FFZCmb!$IYVqbjc@^NgFt%V-Pz+d<WpFOdg}`wI=n!}@-`fyaqFSxUFl&D$YiDu
z=ZM+;eHilWXxNLH^8?r`5ez=LeP5Z0k@T@GcnlX`G-kpuwa8(}bRYtOq`|Ig@W+S5
zjqtXZ00bz=@VDT$eFo@Z$f`-_GqI`w*<hsXjc~Pavamy${>%eb_waU}IeGX_#rgRJ
z_GrV<O(yfskUGf#b!vr`8+7G$o~?99kGuZCT+vc{6NoJxHX|kDNZLcOx%;WL(nK)6
zd&nH5s1q)<z59`04-55hw6^WaXN&G$!)Abc&RcGhwY3qy95pu(1puHx9R)$qMHIbG
z6P=*EqbfYvSXhmMFs)>$SQ-TZ9RPqZ3UC`qUpt~3DIW>K_JksmD4fw;^X~Ph>e@fD
z=X>L~i|Zqkn=@G2&|!`Uz4C^hAEA|k%yrR;C~)%m4dJ;0goa$SJa;13c?W0n#WHFA
zKx)FHHhFDYV5;2{-=9*=Qn6N@l$FK*aL<+Fv+Y{P75LFYD?tOX7SGXzT-0v6H}Bvd
z-g{>0v%j=4zN32Y(t&^aFG$E?m^>n_>A{hlTY%Ow-gyV4`_aptgFDqg*SqbW)((Py
z@@rU~MK8~rbX#xQ#67`muj0(M3|p)eivmg(4HaRyJP=R1Gpl>6Bb#9Bvx#i2Ks3o)
zLyt=^cUm(N9db|_h$ic5&C?$;BeTT@!v@46A{g&aJpWFEIWo&l=A)#vpE~Tw-a0^f
zNaQf=L11Qg1tZ|bAtN9EEN4!<YUt;fVmg*};#TJkE6s7Ym0^C)!0ArRkkGtIOCx~m
zzJkd%XVhBT%$SC~RobUAqH;^WCS}WW7b(l@nDw^|3Z&&h$&3oY0J(Cq5F<-whay3|
z6J&AqwuiQ*8-<x7C7LaVVUK#y%{1i*t$AUieZf%ru<ydqq_^z}xnj9788UMk(K6Bo
z*7`TD6^;HpzkTD5kT@R!jF!9|yrOX<Xg{O01IDPb!j#iW*;c?W+k_P(w`Vsb6##@m
zUC(A*RzD>j9YcL%NNRvKbi{l#oHl0686>Nf17O~kWxt&?tuqQHyzt!5solJ2tf=Wj
za`{H`4xSK;VW;f4Ro9K!87~ndqMp_w{%8&4Z7!&hsnLylZQ*FYXe<^KuB;SbM^PUr
zcOI{9p7i9X1%GCP#_{+F0FWz$ty-=ys)H7y0P1&pQIkT@-DZPS<m6qiP-t(~gd@|D
z5Pg*$0Nr0>l4@G5X|?X@4b+<uwHt1yJrRT>#b9$|eOGa$y|#E^`s}tFg^8{Zb?vpg
zUZ*QoJx2#_z9~c?P)Rq?<f;gXJR;1GPaXcL@ppc5ezdZiw0dy)iau5Z#7TVpiP`OS
z*CxiDPdwMU-k!hGICZ3<KZ=De0SH1FmnO8vULaAx_!xa{*TwO0>GZX+!kO#i8;dlY
z&x?oxF&nsI%HGuxY}~=l=ErOA5<p(cg`m401)f0vQ-2E=u87$qXsVrO{HTpxl)z?D
zfZ?LU#Q97$2Qv0~<g+wI?P9i_g9Ik)a#*%+o?AHV)J`NsO`?OTio&=Un2lX*w+^(=
zO5Q=@mfcp;l|pHFi`hUzrN|>|pbQ-vG%!kL0FfS-B#e#Cj1&0Df=uSn+Strak)>>E
zj&pV%8Jfx&0eUno$TA=|!;QE9FFAYS%N8Kb;^3L0J7A2FNqS3Xm@(mu!x&6G7X#5|
zl_Jx?3$4h~j06a{)ZegD6N?NiBU}VF+t5A^(Yy;}03}N~iDM=>e>RherIMSN$sZU)
zJ7r}hY;1!Y8G{9gSo~({x(&%E8A6d~9*Aa)Va9EV9gKDInO$ujNEzr0B=gY{LqJj{
zmd*rx3Fa-OS)1m}yr6Fc-?qGS+IBJ2dC>wdAb+@gk|Z|drm%h*=OJdoQ#2WR)-q@R
z17nP4EQ)T6zYp0gGMki1r%kT`(=HHl1Q3!T8^lWL+&`YJeL@Z^PYL*plg1}Ao2tw<
z2^k3l2eSoXNHB^Bpeoy-z3DDpPcBCQD1?sIRmT&E981*Gsz+Lwb)fvlJ!f-X6e^X?
z`KIFoX$)H67VM-2IU#O<IT<?U>3*2Yhpo+Ap-Mrgf73!ZLdYoWhC$o)^SyQx1vtJJ
zb$Tec1caeJAsmMgl#T!ag(yn5Bz;#n(YmfU6AlQc+srj~jM9u6fI|d;=%Y7@1cFE(
z5cT_I6oo1bmS$$AHr9Oc$URp4IDt^Qn@S;c5C)r@(fsOowe{kmhSDG5EwP`}7-tHQ
zMy;`~i_cbW_ul+LbnTv&(*m`T{2T8g5T)&m(f@K>2%0#57To;D!}B?aEgda|0Rad^
zSsE8dUW~b=+318TOBfm-DF+WZUkW+mHb!Qc$&`_pF|#~F%F8-gSy{wDkef;%tf|Sw
zA(&&0;la&s2U0@`BgBl+`mCgqpaYGw(~Mwv1;fhHhuJRhDgdQ>8X6|3h-eujaAjN;
zfnchG1Dwb}z=3^W*g$Z)Dh}Hy5-1U{;EK@9{J}(FrbQv+ITF**j+r-h@g$XFW%Ai*
zL`x`VpL*4Vi1B)iY4&DRQh27q^_5emby5g0RKb{x11FYaV*LrW*b4uk6!2&qS~hip
z8EP=`GXD1nnX(8DsaJqu>p)<xAnq2-?+|#L7B}*_M_^isVnMBu9wxYp6y#{J@tM>#
zm_k96QISkn+eo49N)`5fIN}4oTxdH|2a%J`erEH62-9O5<K@O!xv912MIM>HwqS*g
zl#&TpjR#T!KEo-O3mqva>Qh6^jAL7Mvm5vX=($lo7xY4BwAhZ6&?H%zl2L}zNz%U(
zJz8pa1Ha%0t{X+lVNWndDFYDTRJB&{d+i{XSO=OWW0dIpBudE115PO2IWP1a6=|nj
zXa|u?hEbwnz{zrqRBDR|ihdUm6v=Y2S<Lqexn42Xi<HpXDdjss<T+C3yfEr>ZU8IA
zR-jxUfo6)#s??OxrA#B&_`VFULonidE*45;t9T&8>+$Xiv7_7Af@2jx<XRSJ7Xk*v
zsZ_eF*M_m3V)<s$l+*~zQ844@N<u~q;pd=G01;^m<&S{5jr;!Q{Enr|WA`qgUkalh
zMS<uwWNTd)D#$Ia({cpcbyy9O={q6$g`mCZ=PMNU21Q550iY=C1f4EL1VSUAjufCE
zj(2B4iA1P4e%^6CA##W#jw=u~5lZyB&b`^ixjn1f7IuR+&`mh3lQ?ie*SgaV);8xp
z`%_PUaITqiKU(bd(PO_pyjuV{k^)$nkH*6C1iZMju0Be&Pw3P<z-0KsNCAFw8RwVk
zqhqT8qTQLof$HJ|f<H_cIq5#WbP1y1<J~0yxI(Ol!Ez9I0=<)8!}bPF>@nqqt<Z$$
zT)bVtg<bejN5tI~SS5!TcQRopn58(Dccn*AtoOnB4v-STZ0TG`-Ay6g>yqV4$;LqZ
z<i<oPm(UQBOF+RE2@^S`648LIajn@D6OGJCJ0+DOGP`hYv4N~!k-E<zFCRiWK&&^0
zX*(EG5Pz!l$;obU$C7xxfK!k;aUiYn0#`8RHBLw+^NbQ3W}8t73>=u1Zd!uGG#mwk
zCKNwlVHv#<$MW-%W}h6HTC=CeU|OtTvdA$c+!$5nppq$ikU@2!G>zfl?-&p;OiYZ`
z+>B~ACEx(!Hi!e87fJ{vv5qaFQSU`ET~Oj{AdUo00wpxlGK!;mGED7a5t6hlLo6g5
zpus3Ty6q9+%}7E<QBFXjY0PW1P7(gyFa5cYhWE@^x&9kp`BtoCjmXCe5Re|<GxzVm
z`mI-<JN?t2d}m^`mU^nB>b-_;RKkEs)nv>wf>_1(XFvUh?*>GOsV@xx;;yNc=Z}7<
zwIITmj-T5zwS<8G&WmqoEqQ_ylP=S-N&LvCMr$vhIEx6+KXGyU_<Cwv%u;Rw+%~rP
z@`(?Q?!DtX5v5E8uxLb#Ma$+ho5fG;xwUKC5)iz2;=B|(Te+fiJ{Wd2NoD)Q!5ig#
zTLQgw?81}#ZXMry>%_qul|ly)o;`9E04A%Ohj-siNO*^K-7n`mspmVf_75vrrdxI5
z-Hyz1kk#?}GoKfzne+o9FXX0*sWw!USv%TD8O8@o!$3gGcPC-lAobV6*e=vz^1l>-
z527T*rFNsCBEej?9TXC`gpv_JTkD=y{`I$Zo&V0k_rJ0K{XZ$UYx$)c-r6mH<z{K&
z3dS%v!jun`()=J^%b3!vs50IR>atYnuNbYg?~mjPRSl%kLFu<!O)Z5$a1k8<2f;-c
zl}<JOE(^yKn3rzR$$8T0X*EEtDs1}Q)<mIH-yifPeSo_G4F`Ajr+{?CROL|Z(xs?%
z2Oqh(^|2eir1eHa?4E7>cfWe|@BiZBXjymUM`PGZ5@wV(xDFwplouDT1#i69ZijhA
z`D*q0SoNAxex!1^r5Md%ixW~}9|(v7dQE7pe>|bSK8m2D)p8i*qy#|RoEL{*<fO19
z5+d7`g4ddmTLtp$htRS^17fEV!@Xj{Xe3_rNEV&JY=cY>k+YMKm7HP&MjTu)GL}T_
z56Of;Q{PmB1Rw7tNy{mbmqH7HWYOn=vwJOx`Rvw9=>`=ad1zr=QrW;bs~h+g5hq^q
z&4)+DoN|$3`;5Mi0rE~*BLGGyiD`|GTe(?i{#X=+h<To{ZXhe<5CPaGc!r#9TF>A)
zNFsULzh%d;`AwXcQ`MOmSkA*%BoleZ;N~%HGPYqNL%Eq!k}h%k3^b`PT*eDoKnqNb
z#8N`yKJT$+4>Db`^d*#n>k}C~;x5S?d<*P4je-jB4l7G~A$Bh?{@jMFqKz`;6+es@
zJSLifM2w}wth6$_Br*ju7Ih7-;ps!y37}kP0q91nL`aTMzxJg+U#pkffp0Kk7^U{<
zgV+A>FTQYdVP>kj@zv+wzPT_nQs|798hxhY-Ia;{a~>_Vsv`}h#J$x?t%c`=Q=^+g
zYCu?8uLhwD2)-LlRo4a3^5$r}m-C!3=k@Zr-bk@sYZdFQV*ft(%`85)`_4Dsc%lE?
zCq`>OxqPHtYWD(910ujkp)*owBazZ#VPlLCO1Z8k(dl^zP#tM*G)j}z+D4;H1m$9T
ztuewtC`kzx%lY>6M=$<gKY00*k6k*vYwrBbeFRXg)O{yHgnB#Q>=cloQfk#(c|zg2
zfg@DAmje?t2}HSExV%~Ik65TA0{Tu+DYpABS*=w7(Q`vbMy+nHUtw*w^ExKkdQKE6
z*$Z9AiCVqfYacwB(q06`xIU&P0QAAN{U;9GJbPnbFLD#3_HwbKG`73BnDNJQV8b1N
zcixF*BnjaR6DJblSUfTf;=%I41fIplmq2D0pVtBm1|e}sCOc$;ktyfc7u@sTjSGG#
zQLKi+^=|9A(r8_&giZc1NIytK4`rxzNB{t(Yj2iWe6mV|u+P=e`q*wLl)+GZO+1Se
z>N6q%l_%=;wS1vMtqlO7HF|ELnk#A*VMqBRBVoH&l&*tYvL$r<-a>jBf=DYDB`Mn2
z9u&fycd=QWkS+9-(nCSwl=-il^VVwZ+CO{yi+hf~mdh1`&eqYKZAYBpM9~BP5QK!)
zP4CJ5^<V$eEv@MfZhqocxZ?z!dqkeB29ShF4q&maig`SLJ$U1TZq7$3fJjDBu2Q)P
zK&{qfFC3MkhbfO}$h9IOf&jln3ui$E;P@Xe?9%|XD2j-je&|-6MGFv@s-6RIJ-Vd%
zLxbQa#lyxr7io}`${nOqdTHjK3V9|16PyJH1|bAFEQ1)NE~D#_9E&M~DKXSa`FF-A
zk<FhQ98^p|mp9Katz=>>fR`2)Gj$v`ViczXWGK*^x_a!;jjNdbQxh{fh%slF$mmjM
zlqpPrcN!FBcmrsdhmiq%pyW3A2qb%;05)Lh8*s<H<gO{@xtN38-(-!%8Oh+c5{vQ&
zjgdYggo$#c^C&496C{Mf^gh!{U$Wj}(TPFwgG`QyK?Dp<$5fLT5=}pfX~&dmDNr_U
zqSSARc-dr7a3<DXi=`VA<&;GFCQ*tZ;?r$#L8<JDB`cH6M2_YhXdyD0x%hU{C!XpS
z8rE<;u1%{QLqwd3m5xlVB*lf;lx2@x>-Wgcxv!miqtVWP?Zwys>7TtasGTV1(w*HK
z%@U-RAH*e}9I2`!&0C8z2ykrg?W^~;1HdnS{(BNh11xV;H=55hJB4bw`O0(eREn)y
zv-qvIKUHrPP8~o0^nvT^%@M8Sx8HegWph+W^@+zW9oaP(Df!yjCvVQrOjS2W3Z2iN
ze9w2nH!d8jw~7F;d)xAfgV+D~^;3h~Sx~c+tF=mdXXkG(PWLCy&%E$f|JIf_N7vsU
z2}17+&zyPZ!^b;aZ?d|1>e$6U{?Q8suQ#_mg@~Q5UuzaIPLlhRq5m*OOU-5{j{wDd
z_vXSZ0hV&zuRj0dje6O0!w>K5xpaFcB7Ekl_rLM_DMC29=S~zk=Wgvyx96D1A4a0q
zF1U`~XcqhX_0hd|_D(M}J9$mwoy$iW&Enqa1>cL#-q?!-pE~;Cch8&zJt&@^JaYB=
z{A{C>FXp@bg6KfTi2wl_?E(QP!e%F*EWJ=U*XOsNIC%XhmyS@3`F`%m<xbCk^Wsso
z{lODmB1%<o(2zkQi=u`sci?gn#PwXc{wSI1$9-k00U0^fe<h2?5=+<OK=C^<IY?ei
zqch&dJ$65&fqWrqDqN0&s`R>A^*=EuMMPRZP&YsVsD2l95OV1_w}a~C*OD_{9Tsv;
z#r;RMHojZ?CD0M7i1HO)u|z~FPq>YBuQ*1Xh6eERBRS8<);dV&0ks{4*pKbZ-g6XT
zq`>nSm=Ybw3!`2Xsot1YRXuW5N*M`MXtU@t2xep7*PE^<$G1)2zPO$%m$&UuVK6K{
zq+xVG;L_g1nBVEqC=k|a-V^)kzwy;u<Ava#zc%@u^&`{Artr*_M-2NUp`r83=HN&k
z&tDDRc)yeLg<#AD73C_GTb0Vqm6hYo)^;g7CbXBV9yEAGXe>de2J+(z^#RdR*y|%l
zy(eFR;#ekq=X*Xk$Dtu+u!93Lk(@Q#fr)ZSB9F#txa@=`q68)$*Bw&v`~>Bd0*8o$
zgp#u?IoUZ@J~@^tIen0scqBoJX(L2wUy{XilvpqVnF_UFmPa6!?gVZWH`pBv#tE6y
zxQXj)rh7<+x*P{S#+vm!498UcgvW`gNMI7*v%gDYn<Ogjd(T-4&Aj^<+YfLBKQ;}B
zbr;#la~gC;4uW-RiOG)kOGT*$mlM0Maqo=y!6GpfC|QhDNZ!zPoF;~*HzVO8R!_wG
z$Z1?fm~uWT4S<tGgu@?s7@dY>Ci;%UD~Mm9q3FgHbC}K%b95PYbg>&ro+etpCVV&y
zPAM@g1c%KMg6Sh_YR~aLG_mB(VgV#O4Ix~f+qG6N|K2yh(h1$95)26Yx6l9nx4%TT
zjNahW_RY?>ySd5AhU4h5a{W6$d2Y1Sij@4_Z+#gFzVPgsiAufMDSYwS(|`1rp96rG
zj-P$<!1dS99p68@@V|cRD~(qE@Xomxj$Qc18>hbh;*U;WdhCbij*k{vFP%7hV}ADF
z&bvSO;K}!{9&&{Gl~?}a^4v}Y+_i0GesyBtn}|e&fBM!7L~v_<_SXCiAo^|qK!5n%
z&ja8~Po6!z>+ZQ5`-=JQYQ0Q=Q`OClMhO5<Upd^L(|`7pXOKB55>xST+-R*{K6U)!
z2RHVw)yoJ_9cj$3PJH*>X8`EcPrh?+Wg?0krA2>GOZm>-<tZLAB{|hkK773YIN!W*
ztiPs8xz1Y`pIBV4mU7)s9{upUXHNQF)C=6cs~Zq#J&@pX-4F<Sfrki=R04IS(DB@`
z-Y)b)7c`!}au^X7*T)x`?i3Ls=sxx$Ztqj0oev^6ExmJGLVEYWJ^Z-p19umqL43^c
zDg>#rJ`*yGo1$h5AoY(=_7lKld2)5h#Df%AQ#swf01;Z-4*AlPmtO1t-vUTNXe)iX
zvH6LSYFRoxtu;UnWe2q)g%7ft1qUDmAVf(7y?}_M<0{ulA{7Bpx$-0aCkJnxb`S|*
zb<fF-(q!ZngbK;=NIC#0qF%3CAJGj_nWdmbqyp&)>0sEUK=~*`S8HLkNkkBKcWm!W
zZ*#6(Ep<ACA~}gYnTu4fG1K!`rQafNe0n8_1ZdZhN=KNHqM%I4jv_T0!SbmW)k{;Q
z_nOTMOU0Z+F}!0KmM_a1ge^2ZkoPxM8{YB#n}7FbZj**q;1+Y_Ub)a%^6~Me>tVO^
zke;d_6jnndo)e{_xOgr2(YqbrM}ch7A`nodastE2$#a0vXzUOo5JH*BM0_J&0UAqm
z=WQSjj{h;V`uecZ`$30j!09Bn;FQM6<~Aa6A@roe29_S3aeSuebmCGF$g6c=cySRY
zU?J0^wbj<rvOrpeLQFMAV)P1`XDF~hgDKEk%}`Tyjg0CJr2%Ogb0uq<BS;t@jvZ;t
zW{Vgugl$(zSjCTX<jr<stv||0z>v|59_VNDt_Byp<5one<_t4tqZDJuNY{q6V!HDh
zS}(C%12<MS(l8Sz#UY@{?#ORHb~H%jMtQWt^hg{-dIs6bvKK5bFfx|Bt>4JSeXU2u
z7D%dZg#2DJyh`&eQkB;X5eUoxY-?>ZVi!mzmYw+0B9j(M_L?*9my1}Kgm7LAG%^sh
zs>PVmNx>|Ko-Cz+Vd^S8A7Iktuy<ym-YRrMkCy<a$JV=n*Xrhm$j0<*guCudR5pL^
z<=4Z=`PV=Cbfc4h@!0uW3p4$X?T1GI@Xa@$-!Zw;>3N5C-TTJtrwX|)05sZpLO8f{
z{>J<)0F0Jeb1PE_P-_?e<gMosVEe@S`J4LzaC&^B-Y)j<Zu`W_kIo$jZa`%2OH<X&
zW~b1<yopNf!`plEeyFwRd%;bOZY-{kXR|t9#!PPX?()>W<LBm<rq=3}{%=N$&3>;L
z0bMt0cJh;zS~nP&dlvj&vy&&D(Z*9K-P+=}_uQx#x&+{Rp;7_?d?&283J4&j)-eo3
z2z_GTjjQ*!*PF#Y_@tQcK7H_->xS=LJ=AZG+sAau?;^G>0|35r`7xU`ZRXc3z_TQ2
zEbxp$!Aq5Qtb@op$<if-DXosT9?b5tX-A4&vJot0p~7fTn(!b0jQH>eeHb5-@&&e(
zS_yk)>BNvJ(nJqMs0l<DF(RU7>-48TS=+Va#XtG8Qlz@haG5y-=*BWAxf}275kdm?
zi-H}kA|gWU^;%so?>_b=QJMtONSbnG0Ocq_T4NaXTt$Nz2PEl^z}mKLuxF0~D82uI
zu|oyW*)32zBTGW&Fbc!GD_u~lt$L|YCarLbxC{tGQqw!a(E{AOpuYX|7ynZy_{61e
z{;R!@?+C-n%9@leZMijO%ZQdHnk^!>(R82Ozxivg&M6J8j?<C!;<4u4rCZ;-R_TrC
zwT6@TwceV{D@ZVIn;{$Fx_IGQ@cNmy=b`K15L;*<(yj)W96ygh?arjut`LE#BSGZm
zsj&oer-A5W$9xD7k*=#q0|)^BnXie_?Lc6aU$V$To=`zXQI0PYK>H5aGqs#w5wbu%
z%E&$0=QbytrqJy)=mX|X0b2yA_T?o-D82(Ro&31TiT1^$v|%1PC)=5!T7{N%8(|85
zv#%<Zupp)`l{PWbqMu3IGFlG_unY~7oI%PnWvkOH88f;iEM_z_Y(vF@cS(%#XKhmU
zBUdo6R9L{Y7Pfg`X<BPN539nM(Mtil32a3Qtllj$)G)!{#}dIK6XXcl5XWFYS!pSc
zM2D=OtOGsu<+ISlG7o+focMw;ba68v0NN^@U<;)6-$o2o%tr=Gr(ujb!=cUEU~qWw
z&3NB~@jQ9>+6Old@K+PSQwOhKy0hEL;rQ6@-nRHZ{@*|UPrmup53cY3)X|Fwuz&mf
zhj(_f&>yAHpL_cKufFis&%gXb&xuxQmBTykEv$|A-*kFx{l@+6lcSrRp09N31Mf(c
z^MaLHg#h+WFWy_3=)b<0>n?3nvr%wj!?S&2ZE?NYzrwuVTdq~6svC{=0JmN(wO2Mr
zGutqxf^bYy=apwqpS!tl&&<+TxjtHI0>J1<tJW$afFl(GX)VgdR=b<)caeNI?Ejn3
zSe9TK1|d?aUg!b{-wOie5`gE1z0d^!SEe2lPaU|vyjfkVRR-o1Zn&~peeLX%-#c@1
zwO-+?oib|pmVOx-6VKkchsiP{3|9fo;_;EurcGB{Fbr&rS#3uYwpb6J@MIoYWG-q1
zps^iVy8XY@KnjQeic;R}w%b~{v3js8#6#HxeS?aT&DxbuoLu>zemnRt{>vZ#&7W`9
zR~;cA%5X)1K<kcH9jyYbB!B|y=}5SF2s+XA*HF5H4{<!ojggQbg#%755JIEwyCH%Q
zL~?yyE-&X-R=DgF1W+%9ttnkx$T{SMq$1Kq&zs1p)wKo3j@yjQa{!HTwU^VP=)0#c
z1pngCNABNscg)sz?by^IMgih5UABktJnRyn5VYR#pWI*j)i2K>QM)SzlF|@H@Qa_V
z{myUPySL!~!H*_J^U?6ZCm~5}_1QTe8!i3jdu`v7Ww(<PU0Vt-wPSUacE`pp&Ca}?
z%dHbRoMwV<0UOJ3_Y9E+>48myekATP0r*m`gh59s2ho52Z{yN+%oQGJY>XCAjfO22
z1XFy1ZNKJ;H3)qYNO$(#67FZ_1xP~|ej;&U^x}qG-jIP}oveg<veh_nslp+9#PAZv
zkl5Ffu)!@>DB15RfC;r2WLH!A0Ja)ZLpWo|RZ@ymMmyFvlUg#jHNyyvd$*y{P0bdA
ztUxgPc|&sE7`8@iTp(LBBgk(2n6)G@oV^&Dfl^zQ#2MxRbvLA}BSLJrN5etI*;t<-
zgAupFJ+dLVWIlB?Dv(APMr2z=Fq~aR*^(Gwfm7sSpdVl1mOQpixytTLWW|=mNT+Bk
z;HAGM*fF_s?&f~a4ads$WaReG-amU|KW9gc<hzrVniQG<c22D{JB1)}5a7tJxeIsp
z2&7`JyRbIFOP7D=r@#H9b5H)0Z~V+(zW?;nMimhEZ=b(<e+K}R3LOAw_xuCf@84UQ
z>K7XO7ce`q+7GZ0aCTyKZfP13Dy3GvUG&{3o*!sa1puc;H|E#I5pbl?j<iI8+41$&
z+91@+``wMkh!ue+1M5gVHq!9jsK4{&ykMhIK6CZp&%W^Hj>(mN8@JXf0bn854V41`
z<wB?4F7zLukkk#m{u=e%Xtdapg3wU9N}V|!sl&)YAm5FG$VC|Z1^^sKDJ}ZPr;ya{
z`N^Y}QYj@N^>_rZ6_nDaocDru&*z(L(GT)|j|{G-B`<DFEyC=|#6b@uQ{W-yFF>ZW
zl_5`x7T5y`EJ;*LB+|%IjPTMdax3Ws$9}5+?;MI`ub&UPiPl3&Nbv|(69gc1S3Z6O
z{5$|O|AW7K_tdG<+CpsnwRP*$JfsPrfWk$gfk1lHYep;A&@TZIXa$Z3UJ+CTjw8|a
z1K~#!0F;0nLB7>eovw&dIc1?Ra;Uji6&FOg?K-~aNDqZrZ8dK-<^Eld1wjWh+}q@W
zge1^n@ve92l7}JgyM6mxU;M26KmYrE)dDozg&>GXM^UKzwdRimY-1xJ1g+J*WBY1<
z=PP$4LN64_qf-h)g+Krb&@(x!9L)E?(i#9>yAw#qDN_A*Z_l-rZAGd{RFt{szNIyh
z<2tSJvCEo=eU1l>1-$#NBrSxC!)*?Rp8IHVfEp^Q>u4Yb*jf|EUtujo9*Q7WtYWkW
z+_E5(S$3wppE2PuV`j)KzKrC_&=Jc>{U>=TE5xM*M~f1YDHmb9FC%46W-|3+$viX3
z=rGvDq&{Pw_-V@>)icqvtv!#F;<ylpgm5WzkIM!d^15V-yT!$Bqa#N)o6q*iOV4&P
z2%y{`eaN&UyXD86-x3fPBluvd8%NoqC*O7Zl}J<fvF|h=g9~`wkjSi`S?Did<v_AD
zwA02d^QJeV!<bcU)h8@bs<=CCXx}8nZT?_P88AzV72|Wv)W4)ez=+WNl~Hkw#S4)i
zzR5@vnOf`VvSoyfMDS~9WyBm4ruJvLsToafmiu7ZHzzi~%xSe}dU0u^>d5G;&%ZT3
z(jbJfa^vWp+geLUs$#yEy!f}i{;&SVXTPttM1Uvu-nzFkQ7N{j$JV9PcNS(I-*bC$
zqngs80n3GUtD6I)Vy=5)|BWm6b^yV6rG9&H8vyQ~nV(-D2f*=4eQBdQT59c|U3l^M
zc>vfqvpBar)xW$_p|h|)1_YbU(%kaYQwOi5bgL8yIfz8c#a5`CkwSaV%;NpkNdn0G
z-CC<OQf%#<TnV+)kErZc3m^a<*){j|7hm5twnjj%6LkaMcf;B7^&1PbAI|Lo0N)D$
zX{6BJHd<S&mjOTs6@*?X-`O^{K?GWh{!BS}@Y<`N`f)Me;X;XtT!BCkNQGQb$aPD(
zZoOFm#7Ik5szSayR<1|d0idT3UR&K9UD+H>wkFq6Q3433)PR~-$NF33<Y;Z8QoDG2
zZ<^>Mee&qVrw(2>D}957M#c`1BB{ylm5||H$<8bjPj1u_5RD?e5i2BH6Cq{xUo$6+
zg&yL~hfK*swe4`S9(<Go#d(A)o#xeU!$m;=3LjO4Bp97K@X!CK^xk^_fYQDC5B|ZO
zqbG738|<7VyKtX)keY(%1(Y757J_sXUi_9?x`g=(Ac9up=D^K^R^T`SUAHUzP#^(C
zA&rgEuAS`z2m1Fb2$ZJA9#sfr`JM}s2*7b%M|vQHL<m(#Tcp3q29cA(L*eDA6L#hJ
z=#A+;6W@8W&|M!{T+TV31|Suwu&1^97?B?V5y5KBJGQU(n?HL~Aaw#^T?!G92Go7J
zpz)_jAPL15A4~)SG3VotKWM*uu~*Wyxv5iUUjF+RU-(bngfB0)#(nGwP)G`l9TNa_
zqzdcnhXqFI-s<LI<1U14kgh}&*cZ&^>c|}5WA$dz<HJR)M^P;b9Yp_`uS0W#Id{d0
z5Ls~-@bW<{i^My^3A4g-cx37>DN+k;3xz~h2sjtP6qq+c2Lww{Iw|%Mnzi{vu>)D4
z&)u&XT-?;Xg^b}7rbsj98B81pWq=ed<=+_OlcMvGi^(TyKg1;Xnb|HO4r`BD8<rKG
zWn-H}>?>8GCObk#qp8e6UrB?55&@1xFpm)cVjWdpOGKk;jFh^hV`{0+3C(0E4?`+j
z2ke;+KGI?3LNwh*F)6nZH!6w6`j{#U#uPz2?MOS@#Pp(vp+$@{I_0`xg7=|RJTU{N
zOcsl+jzdiFf`!gFg!htO8-X3(A{g3YaRfqkPL_aF8FA7i92rvKgf<6;2luS1f`-zX
zQ7<;?&O`<{ARcuhxV<>@%;BrQ^|gQfyMOZ4daJl|YWWvG_m^Sh5Wug0`P;w$XJ2Y{
zb3m|ja>bGA{p$z&Z#g+ytCkwa_T9R>JoV4M^9lm&nO-_~V}DY~M1Xp`c;)WSU;om#
zJ3Zf#>YH!8FkY^&*GIz81Av+F^{aC`0pR=Zo&3emf7f%P%X2%w@x}`PFj{I{ym+jS
z&s(cibj+_kedWm4PQ6~p_1Zlj6E1RmkG>mLitW!o{hsdzXRaQ3{p@i>`u_V*{ld#X
zJbCC!-tXO7nBg&eQaJ99dEV~<K)qE$z#wwoy>j>$KJ$Y&&Og!Y<hNDV7FH(<e(!~&
z7agf?EX=%h;R!%GefhD^pFDGP&uuAHtywfY9TB>r$KBSGh2sd7^MV(SUhv%T;+@^s
z?(GDkH!nQ#xu@Q9oG9-F_g5zS3%DJ429TGa+sh#%kTH+}CRJTeMtf%#PG3Hf$lvv!
zdN=R{qkqR#STGoPJncxOl9*2-Z-=FCWvYh~CA^?mwF-@Pk*UOJxv6uV(3mI3?Pbs~
zF-TC%09v}y(a$><zt;~X`dhmISPFUv{gR6!ASDnLJzOa`aGmjbIQ4t~OY^_^uVC8@
z6>^<oK`6ylHktmDg@{87OPohZT1C<apy1MXTmonM2?`njl8WQlTn4SsaR@+0;1fpD
zfkquyR^(<4l_u$^K-agcZbglqbA^PcAJJ$MLP*F<)hb1+ZD%}^c~C*NGu8h&2w-x%
z+PNpVa$U4HyZir-Z`^<XwL`sD_~grxlri6oC=AH;u<ud!$cQ&0*l4;Z_Sb&>)j6%P
z*)g$@WELUO!V2~SzTv`(MBqB;d-&%2oe!=A#hh?eut?jxW823LOwAuXQTxk39=-98
zopN3)%E@-%l|1M`rv<JjT(Pixven+^IGw@gxH(w93e9Ekia_c9EBY#3L`(q-4Tv=W
zQ`#VjqNVj}*vt3XFq`+~k(UUW#tJb#bI3qs`FR$nSp7OfdXO^286zb!bT%bCL9$fT
z$Wo6<@aU|ul`ee(#!sar*iE@t1SY1AMWbW^*%_<QkgCa+GZPIlGAdaHn3o&tk|CUt
zU~|}zBa0yc(jiT_AA`J%$k4AQ^U{bI4?ki2#k`Z`6-+BJ=0;n1PU6Kc%;+C6@HHhI
z4#O$kwrpdJP_p7Du292~kHp8p;#Ci3im5e&Cx7ktfNYx0gN&My)txdbQnq7x7OFtp
z;uy2#cAGlJAApHXB-=}mz1E7v_=~f60K+*sWmW?W1LGP)L8;sddwv9_tRQj{JXjaa
zD>;@^sclV7!`L-e!eEvM)1@yc?*)+(LFfX2=R}U9A}yrQMA!|yxTB$^qr%7`jVQ=-
zB7qtJ!pI4gL<HA~qDYeISMR%_kQxA@NQTN8&{RnPf$M~ka)=Ox&bc7~^!l7e0N0Iz
z&_M)5EdUgWLBK7@lTj~nQx9y0W!OEv^z^~2fBgEVbAAwnj@AN^a()noPNd}XPh1F<
zbNce(ELgSwV=>?Tsb@}q>+Mekp#um)Xir9gawO_dIR(G_%5$f``Nj)Usz}TJb^1=I
zNJL8RonG8Mz4+SuC;IPMF0@{F;=-T*<T*`Q05w#KtxrAv;a|M_jO#=ylKs2$-B6K;
zBDsJ2e6`eg_sU@uI#xoD^=XlSKpP`W2B3Lxgpw30R1TLP1%yhmb$I98PcA>k*H@xt
z#M$~5<1N{-&|G3TOrMWzZkg#u4v-DFw<Lxp{_#vy49y+Dx(u;$qwxNpDxjv0qIi!E
zG;Q<zqxlhu*dx6e1>#Z4S%}bRo|zn7{#$?Z;J3eX@W$<4E@#?x!w?DtnR;FT5<~<V
z0UA0YK+q9T<R1EhGxG#>H$gbq*@RvbgaiOm3RDCXu5O=fl?!gCQ*Jf=&CW(qH4mxs
z9jCM@83?xj8O~;H_1PJ(2e}XCYhxoNij}3UFQqU)qQ)nq#bu#eQc5?xeg1Fcntw2Q
zr09<VDFZ<*Js||5Fy#)1M}b1nYRx;bzy2#<zU!dwh9cW@?E|`dgunH}Jx}FZ|M_R;
z*IN!|yfm^{X-8r{hp(UMoV(I1<b)95$?)dN<h^a5tnL3)ea90g-~WfZ?)~NKQ@>sq
z!RKp#B<mZ??JDiw2kUFFvAVf=H0M=yzuM;&VC^Q{KL^qQltXVv18D+-oH)z?RRFAo
z!Tq4)pg;ic$uG;D$2bjP_?eaQUZpJiI!W{r&9N-hi875=81_pVwrZ@iGK<g}8fS3#
z#G%U@hlK}bTZ*euKxQouPbUx%9*E2sHY`K_iU;5@?Dr3jG=>hE6(nT;9EQm$4SfVz
z^(019NeQM~Pspv-C|RDNTU}E8qr-W9M5eYkmmf5LpU5(sKu1Cof^K{yZ!ep~SU!|Q
zV0My_)s;;yI{z^V5QavshEyY0Z_eOW3ArxgP~I#X5;2IR(S*B_JzJBaEG61MWT2MF
zXqZ_djV7sxWsl6gJL}8`oVHCG+r3;YXo*4O1j;oZE&_tmLIolb#_k2K)hrDohw1ta
z{<s@?7^YB!K^qkMuXp3eDp@}W0Vs@|L2?E{@v$ZB^B$OYP+E)HKCyCtbpjB&f!Dv)
z$?E3Q2e1A4>1PR`Tx?&wwbzdMk_r~Wi^tD?=k#+yIOsoVExOtR0tEsAD#doE=P8mZ
z5`!~L=$B7?@Y>lEN{eE?6Ic5XQ9pC&>i6G!T5~f)7S-q6uot*QA_(37un442JpSR^
z7muPKN2pHV1Ar!B<}Ij=Y8)|Z5kqH>w1^BD&A|*mFnfPcthMGCCu<NG*(8D`+?tl*
zh=vGvP;xpXz6wZO9mXht2ryMYfz>^@%6h82WfP;)Pw8Kl8r!80zJOQXD4?uS)NgJ0
z0_S?|ZLYt^FLqV%$el~VQt|m_SO4}u?&fpdeBRCsx6(6Vw5fIgE$D8Oc_o#LqDNW?
z2^zvHe*pl_^yAd6Q?7!95Vimj9fuH{W|!Pb_^Icyz0tXFMQ&US4~X)TQ`&H}Lm6OQ
zlrL6weq`m=yDBOXmH~!`eNs}dCGXayBLM|z70QE8Z+<B^^}qkP;a7zT!vYm31;X_O
z$_EQwOF=6&|M{cqzx>MGAP~J!X31#^u;8ew({4p6*AR#Kr<tcHAb{`T8}D__U+I;K
zgY>VbyuA}^``Z7{)wkYj7q`uZXWy@Ux%2W*2Q$^zzgv9v#(#Th|Euet`6cJ(6`G%S
z!uF1H=PDqySA?~jFn<ml_W`knh^0?-HWXlZQVp;eb|ne`@E&^^tJ{rwwsp*+2^8<=
zSOm8JS87|49!*AXI6K>na3RqpW^0Pc>>F#)){TgzR#*{&i6|p+xC#T-8U;4W!nz2^
zFajgvbi-7X8i&WB2wTU^Ff5`?3jwU`nV1|PnB}6BuE45-cDh0tLQMjJB<|B@&l6;=
z-M;F}P$o=jvBA5JrXz)!R3{lPvTldb`y$rS%&aIDjUX9SX9AG3Pru3p<;-A+(1<2D
zV2)CrL~IOZE(Xgt2TgD)4}DA@7qqXQ`|+}<5ScKa(JVC-YAlNqM7zC}IHM6E8lHw|
zx{V^I6``fuXNek_w=fXHz*L5*Zwtoh3O0|?bksE(mYBf?6CZpuG4f>KLhS7zRv@9o
zfGmC<WEx4bE+jFd?ZnH}cxOHh6Ebvqz%w+ku_H2`RmwKR)EWx`0G>Q><NEy_^;R+Y
z!&WChUao)PnRlPuf9s8N$L7~3OxjbrNeQI;tCO7pe*(F?Z2zA#<Ev8WyUSC_1&|i)
zUheZJ&m7%*d$l%t?&kjFF)VFVyFm_8j4*>DAdHpk1wXjAGLgbT37g%*i%*_Ayz_3o
zUA%C64_YSDL-Iw_<_FRCCnrb^p9ukRy)iP-e8E%}3@jfcH1I8m8K2kWn$h}mgH?iw
zcA-hoNc6h6_>yf<m9AwL%W^ahH+?c8Iw+mM%@yvR50QGLld7JBqDy+rbp>KeEAhzS
zH6;Y){78yy#oeM20@)yB1S}uk>`pbYEoI<25)mK-LX=2aEnUV!RaSR`4gn<wt-&)F
zl0477cefiV)s5t}OP#}^YC&br1$Q{j!S`}kZhp9@S}2e0Sa0_v!d8T3L=Ylf<AK(b
z=gzzuitiO>a-_^VKp@acqZEi@tMQ4HSZ{fsIJ~}Zy6yW^%tZo0v#v=0tL%m6m&g9M
zxfk9K58qg5@AKO)>~3{K`QUP^M9BH#tq(fqF84}B!EaiVP|}+&uI&)F-5hvfXH8G`
z0;h8RN3-h2!k$y%_>4O~A|F2-jaS2WPfvIwdi@sMe;=d=Ti;F^`2n|swf9{KuoU*%
zT8Vx^ckeTDY`bx|@TGwUc_3bQhG9MPa76=xg=n9Zwn9&`ft$w=-*XIwjYL`s(*qXK
zEa@iz1vKbhnT|7??Kn((jv><dc80cg24)rEOtBKMj#LY@Z;lwHZYaPk$V|RV`U-~D
z<m!5eW``EYFw5i20vtjHHW=H;v3yLvhaE9Il0hyhjp;GM%@)ifcwmBpXjp|Nv;zxP
zfsCSpl={j6Ab^~G>QzoPvA8g?BILj$*oY5OydyKk=3d2#4;=EUlv!p-2({b?iW@*1
zt}&P%(Mf5VeHLcvu*h9?c?l$@utV&a9MfKzkRTIIA=+YDaykl{F2u+L){;CawTMo=
zsQI7q%Z$T`A><ER6bcQ=9Yj-PGJ)@)x#uUIBH5)*h$f8^Ip~mAP1A`^rs#l4^+sUM
zM8-NNW=NexDpq_S??>}%lWVoI!Ja{=w~E*2cV3>`xz?y8j#;U@a5_{ND%T{!8^?RA
zU6@~+R3x~oV=waVuT0*YpIuxZS6U{tnozk+m@aX?9VB0!Zf<d-s+7aCrXcbbH>z_>
z(@Pswtz-<#W>(sW83A2}I!_c)5N*?%_$HKgQpe%M%g8`=^W2MBx~D;T%3F%%sJXN<
zf2^k3eyaM3M&J!8d>pOP4^I|jNH<&Pm>ziXJO1Xu-?@CZ9TXoEm);Qwh!Dn8P$Je<
zH0F2{jvo^Av=)!dT8JGxhSNE+reVofH-y=z8~?+9O*dD2KY7>PmUkoo0EIv(9RyHI
zS1@0ZqdR~!AYjxT+>sED=aug+xQolR$D3M;$~EZ-L1K$)BN0efdF2Qk6@`>Q;2%a<
zj!+ak^6AaF*Abn<1Zrgmi9nz=X)S~ROli;psTavw+ub?Y{^ifz`Q(ueN2;8o?$`3a
z{r~QquJrb8>-9pJY$>B&=be=uzrXs$6*(DPojXu%oZ8cEhvET9LC-<Y6F)xNIeWQR
z$PcVI`unesJwl;DC~`vdBXCD?ZF1%8?7i3bh35(*VPR>hbY@vBEVgrQ;e+$rH(Fxj
z7To^;92f9W-8e+D!<rT-{Zilkpc@ehME}{ZV{r_<ys^0@Y(OF&#KcXr1pH%F1Q~*C
zSa4*@m0*UX$tbIdye65vRAeL#GtD+DL&i3eS|kjKJ54Pz{`ZKyvB3B-n3doHBcied
zNfPa7Q@VgT20_Xpj-%BCG1jMAq>%<1Z5U$g0VE@KGlM!4gKs?%Zcc6>l<iI>nGF==
zhoE8B!XyUKgqfP>V;m5&VlA-v3XHBF)4^s2oXEwHoeU@kQ>o%4k{T38Stv%PgeF?!
zLcFL3*_R>MK-g3vnJds{ScVpSARSQ35XsSW1R=2XbWNE;t38e;SA$<aTe-%JWSW@l
z135V(<I-agN*E@>2)x12dro{yER#jF`sJL=Vop#)Je*DZ6t2WAxhz4^v=?itY_oDD
z(oh(bjRxg?dA1l>>DL@>B<Q=7apzznKxlM|&@qaJn0EY!f&8-C6bJy&>$kAY0zeo!
z14S4v{z=2I>8zs@DhW!0X_}(6sI^LFwVcl-E0kwOlu0(q8?nYjB`_uHxyg?0(P%v*
zv&ofO3^6y|#Kw@g#GLItKo&lkh88Y4^p(#dE(k+bfo<@%zdZ8~$4m0>efmS;UHaxt
z{PFwbIUsU_h9?2|LR{`Ne3YILE%lLTsvr>wD1r>$YpC2Cn^ALD+?(%&bgwWeyofXa
z_(Brtp4P(g0Y!M_dw}3fKS6*H1rWADI6x$&tAyG((bThI;=67EWaw$2p)nt5h)VfV
zPgA79^@}R(DAE7}--xa53IQB|xl(y)qw@tp-*Ws))JgSId0T)Y6_Ip&L<G>07E2qs
z?UU^T+ncXEv$$iT+v>>K@$SN=_l+|%rAof1J%QS2&N(jC8*t@DI7@nONE#o^4)Gk!
z<?xL&gP2c>xc&!9^xF4Z)rpagmxmyd2!ucZ=0-%l5^RzW&7j&_+u^l0CmQwY++9Rh
zZr;%g=fUx}!t-tQ-1~YK{X<U0k2NR6-Cn1sm5aiE;cvszb+PRrWbs3o=>;*~BxZr_
zi4m<GvD->0ri}sdf**p}*`;B6U-k(|G4s}t-sRvsOb8!_ii-h4jQ1RSKQ&wxIJsh|
z54{oMn0kJc85T?t^l9X0cQaGBu#B!Bix(}>oS_w-^zVor>luU{T6uP+p&JX<nH%e{
zT@H*|p7kcg<vG$Ig>30Mp3j5TSRr1@P70j;dY7Di>MJZPC8K6$5X;RvR#I%VyY$(v
z3~sTB4x6cHp#L&tFjho_2X{q>(mj&qvLWwcvaWce9a)TQW`dSk2V??V$S|4+vqF_H
z)EmQw)&p2#;s}PC%+RT0SYg|ieZT|^Oci-!9+{HUIAj%Jrao!7yrNO|vjQDM;n<os
zWYkP~Q<D!PWfiOmA=8*1IzD!Woh?9GeP?q^LKp&KKnq!o2Kt+`_6!S_t%OlcB`_Pi
zF>JP3YllxE!YpXc{6jvyfcH3fZw1L#v$vZa?1N%is6=-Q?eNY{UCi>iY4q{$?fOSE
z<8p0N1HedGJaOC^^JFbl=a$2=6wUyRi5;y1(z9N!p`wQiH(Lm{ekxB7+`!C%cO}3^
z{`=o9)>gb?k&<-EK}3L%NT5JKwQ^15MnnOV1#J3d2dN%LJpd3=^lEzkSkyb9r@!x2
zyFMZctw8la%B)U)Ogx0DY=^xDx+4NnQS{K7pAfjJLEc;1x3T`i%6P@i0qJ4oP6Qy*
zN;+b*nM0uGj;w$F$>pE<<UA2}0!f6L&=GKbDep=3>4R%Z4P;RONCUbKjg@t7WAy;u
zzFqWohta8ht*xqkeR0Ki&i2k->6Hq|8?Fd&ZTzLv+kd%N4<~!Kq?;;`X>`F;fhsO8
zJrhJF@BoAmM7Vy77B7NuAKKe}V8yqO#X$!!AX*H1{ZgMZwnOfJ4!{y#Fi#oGloBAD
zbDAJ1JI=%Gz6(a52ZwE9VE0vEc%g2{2butS)0O~%cf+hYNXDE54FO%`QG!uhLH4&q
znfoF@w3(E^k2~%KoKY||E{N?@wioM=AvA$gIIL7OR8$vjE-4~|<G_&p0?iEHpu<=Z
zFvHbAECxH=Ol#<axBAeAhXV`yhJ+zo{%+XFJy?TttC!&rt>U4_k_}IN@TX*7io<_B
z{Mo<|w80}?!`2su54g_E6vT%P{X-Q`A3hE^eEWF7o8zzud#ibZTVFUnY;J9R0S^(_
z$A>-W2ahBU562(<-G*!sxaIYK)JgPlUTOfxANHnbV{5Wkjt^T+57gj)(6Yq`O_kr=
z`;R88a;>I?13{NiqVVzgQ|`W<&YlV9)-AQs(m4<NZM%S|C}i1jyISK%9CCr69%XCc
z|5JeHLu&95ztTa02q6vd&ua0qD2$4+eE=F%&uxpfy+QqWxZ~|oWy1}f2$ZhnM;iNf
zi~5FR8$hL>=0OxF1u`d4pb$zc0mE>9sho-yxni+6QkcK7St$1^6H<j+&m5|?<fo6V
zees#)FF(6b%tz}@KW&0*Eaud7se5R8^Xc8SW=jT<kPZT1-lf}%?!SC(`j=kb_}LfN
z{^h-i>9y#^Bh7X&JPvatwtMuW)7^Z|xN@PRz!~}A`Twl&;?ql)niKcl9UYAn$vA`!
zqo}aB_?*%?DSLzKa$LCo0jLOsgumLC0B{j|K-b#ME-4R%|Lo6UeF-P_ZaJ$T>iK~W
zU&;9JHI5&1i@*oI6z$~xVSD~x<vPt}j=0rG;)8Y;G+|B;*@yui{Xp2l!Q~ORk0JP+
zVMwqo?-Cz4kcc1WY{0F85G(Ba>#u*Sz8>3sXWz`i{nbhS%dwHhOHZD?KEHjdznU3e
z`?;5XczoZ@XOCQ7+8ArJ3;$-X>V+pR^g_4Q%@6%wL|AVZT_^g?i4Sfq%*;-#9@#lJ
zzc%rRZ|*tK3s0QCvot+Bv3g+k{^I)hR<GPQGyl1hXVx3#W+(qwxgF09pE_`Ter;lU
zY<>I0>RP?>G2Ue7<Z`9hs<(@e?YeVh=iTj-t9!OBRZ6Ypjq1$!+E}?!Yn6`dn(GB_
z5V-(Q%6AU#xSzG5`?vDzS9bhvrR*(lBA}zl(dY!BB<ZZKi?K@X@h5VRKarcB@;<mo
zuIC8pL_(}+m2*7b@wAX691spY@;68)5(0#zzuGql=}4D^6AForPeQ8I>sT0r%63t2
zwPvHWlhL+!3zY>oD$2g7*UG8q+t0t`Hk-M7bL8a!MdlmZkVCIDz?29Fg;W590)!m)
zdI2aM6gPGEQ>~@h>g;=k(LCubUMU(~|M@32zy9gP>PWOyEA&EFlZdqJe=Cyh(Dgl>
zuBwov??DiWM#n>RJRQ!3Gr!~iNAE1n%!aq#>*dFm;n_o-M%PXLoPR5lKRz4PI|xE*
zNWTe$B4@dDq_s(h?*8dc_f8;-8XOH01O`!YY4zzy=cE%7N<u+Sj#jTzXOmo?KFU+x
z>RU*s39zIh-|;{?va(Gcc>e$2`Hz2nlKu79ztOM%ZvgAJ@hVF%W8we+002ovPDHLk
FV1jNu0xSRk

diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
new file mode 100644
index 0000000..3b01f2d
--- /dev/null
+++ b/root-broken-cmake-config.patch
@@ -0,0 +1,194 @@
+diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
+--- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
+@@ -0,0 +1,23 @@
++# - Locate dpm library
++# Defines:
++#
++#  DPM_FOUND
++#  DPM_INCLUDE_DIR
++#  DPM_INCLUDE_DIRS (not cached)
++#  DPM_LIBRARIES
++
++set(DPM_FOUND FALSE)
++
++find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
++find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++
++set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
++set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
++
++if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
++  set(DPM_FOUND TRUE)
++  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
++endif()
++
++mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/FindGFAL.cmake root-6.06.02/cmake/modules/FindGFAL.cmake
+--- root-6.06.02.orig/cmake/modules/FindGFAL.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindGFAL.cmake	2016-03-20 17:08:52.162461425 +0100
+@@ -6,15 +6,18 @@
+ #  GFAL_INCLUDE_DIRS (not cached)
+ #  GFAL_LIBRARIES
+ 
+-find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
++find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include /usr/include/gfal2 /usr/include)
+ find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
+-find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
++find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include /usr/include)
+ 
+-set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
++find_package(PkgConfig)
++pkg_check_modules (GLIB2 glib-2.0)
++
++set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS})
+ 
+ # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARIES)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_LIBRARIES GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS)
+ 
+ mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR)
+diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
+--- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
+@@ -9,7 +9,7 @@
+ 
+ find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
+           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
+-                /opt/globus/include
++                /opt/globus/include /usr/include
+           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
+                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
+ 
+@@ -24,7 +24,7 @@
+               openssl gsi_proxy_core callout)
+ 
+ foreach( lib ${libraries})
+-  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
++  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
+                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
+   if(GLOBUS_${lib}_LIBRARY)
+     set(GLOBUS_${lib}_FOUND 1)
+diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
+--- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
+@@ -6,7 +6,7 @@
+ #  HDFS_INCLUDE_DIRS (not cached)
+ #  HDFS_LIBRARIES
+ 
+-find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
++find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
+ find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
+ 
+ set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/cmake/modules/FindOCC.cmake root-6.06.02/cmake/modules/FindOCC.cmake
+--- root-6.06.02.orig/cmake/modules/FindOCC.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindOCC.cmake	2016-03-20 17:08:52.184461642 +0100
+@@ -11,7 +11,7 @@
+ 
+ find_path(OCC_INCLUDE_DIR
+           NAMES Standard_Real.hxx
+-          HINTS ${_occdirs} /usr/include/opencascade
++          HINTS ${_occdirs} /usr/include/opencascade /usr/include/oce
+           PATH_SUFFIXES inc
+           DOC "Specify the directory containing Standard_Real.hxx")
+ 
+diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
+--- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
+@@ -2,8 +2,8 @@
+ #
+ # This module defines
+ # PCRE_INCLUDE_DIR, where to locate PCRE header files
+-# PCRE_LIBRARIES, the libraries to link against to use Pythia6
+-# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
++# PCRE_LIBRARIES, the libraries to link against to use PCRE
++# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
+ 
+ if(PCRE_CONFIG_EXECUTABLE)
+   set(PCRE_FIND_QUIETLY 1)
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
+@@ -446,15 +446,29 @@
+ endif()
+ 
+ #---Check for Castor-------------------------------------------------------------------
+-if(castor OR rfio)
++if(castor)
+   message(STATUS "Looking for Castor")
+   find_package(Castor)
+   if(NOT CASTOR_FOUND)
+     if(fail-on-missing)
+       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
+     else()
+-      message(STATUS "Castor not found. Switching off castor/rfio option")
++      message(STATUS "Castor not found. Switching off castor option")
+       set(castor OFF CACHE BOOL "" FORCE)
++    endif()
++  endif()
++endif()
++
++#---Check for RFIO-------------------------------------------------------------------
++if(rfio)
++  message(STATUS "Looking for RFIO")
++  find_package(Castor)
++  find_package(DPM)
++  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
++    if(fail-on-missing)
++      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
++    else()
++      message(STATUS "Castor or DPM not found. Switching off rfio option")
+       set(rfio OFF CACHE BOOL "" FORCE)
+     endif()
+   endif()
+diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
+--- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -0,0 +1,10 @@
++############################################################################
++# CMakeLists.txt file for building ROOT io/hdfs package
++############################################################################
++
++include_directories(${HDFS_INCLUDE_DIRS})
++
++ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
++
++ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
+--- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -2,10 +2,16 @@
+ # CMakeLists.txt file for building ROOT io/rfio package
+ ############################################################################
+ 
+-include_directories(${CASTOR_INCLUDE_DIR})
+-
+ ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
+ 
++if(CASTOR_FOUND)
++include_directories(${CASTOR_INCLUDE_DIR})
+ ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
+     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
++else()
++include_directories(${DPM_INCLUDE_DIR})
++ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
++    DEPENDENCIES Net RIO)
++endif()
++
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
+--- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
+@@ -8,7 +8,6 @@
+ endif()
+ 
+ ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
+-ROOT_INSTALL_HEADERS()
+ 
+ if(builtin_openssl)
+   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
new file mode 100644
index 0000000..ca24479
--- /dev/null
+++ b/root-cache-test.patch
@@ -0,0 +1,281 @@
+diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
+@@ -1907,8 +1907,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    TMultiGraph *mg;
+    TKey *key;
+diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
+--- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
+@@ -1956,7 +1956,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
+--- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
+@@ -10164,7 +10164,8 @@
+       refFile = TFile::Open(refFileName, "RECREATE");
+    }
+    else {
+-      refFile = TFile::Open(refFileName);
++      TFile::SetCacheFileDir(".");
++      refFile = TFile::Open(refFileName, "CACHEREAD");
+    }
+ 
+    if ( refFile != 0 ) {
+diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
+--- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
+@@ -78,7 +78,8 @@
+          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
+          return 1;
+       }
+-      fref = new TWebFile(refFile) ;
++      TFile::SetCacheFileDir(".");
++      fref = new TFile(refFile,"CACHEREAD") ;
+     } else {
+       fref = new TFile(refFile,writeRef?"RECREATE":"") ;
+     }
+diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
+--- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
+@@ -2011,21 +2011,15 @@
+   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
+ 
+   TFile* input(0);
+-
+   FileStat_t stat;
+ 
+-  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
+-  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
++  TString fname = "./tmva_class_example.root";
+   if(!gSystem->GetPathInfo(fname,stat)) {
+      input = TFile::Open( fname );
+-  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-     input = TFile::Open( "../"+fname );
+-  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
+-     input = TFile::Open( fcname );
+   } else {
+-     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
++     TFile::SetCacheFileDir(".");
++     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+   }
+-  delete [] fcname;
+   if (input == NULL) {
+      cerr << "broken/inaccessible input file" << endl;
+   }
+@@ -2440,14 +2434,12 @@
+    TFile* input(0);
+    FileStat_t stat;
+ 
+-   // FIXME:: give the filename of the sample somewhere else?
+-   TString fname = "../tmva/test/tmva_reg_example.root";
++   TString fname = "./tmva_reg_example.root";
+    if(!gSystem->GetPathInfo(fname,stat)) {
+       input = TFile::Open( fname );
+-   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-      input = TFile::Open( "../"+fname );
+    } else {
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
+    }
+    if (input == NULL) {
+       cerr << "broken/inaccessible input file" << endl;
+diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
+--- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
+@@ -27,23 +27,26 @@
+    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
+          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
+ 
+-
+    factory->AddVariable("myvar1 := var1+var2", 'F');
+    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
+    factory->AddVariable("var3",                "Variable 3", "units", 'F');
+    factory->AddVariable("var4",                "Variable 4", "units", 'F');
+-
+-
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
+-
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
+--- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
+@@ -36,12 +36,19 @@
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
+--- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
+@@ -44,8 +44,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
+@@ -221,14 +221,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+-   TString fname = "./tmva_example.root";   
+-   if (!gSystem->AccessPathName( fname )) 
++   TString fname = "./tmva_class_example.root";
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else    
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
+@@ -201,13 +201,19 @@
+ 
+    // Read training and test data
+    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-   
+-   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-   
+-   TFile *input = TFile::Open( fname );
+-   
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+    
+    // --- Register the training and test trees
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
+@@ -123,16 +123,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+    if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   } 
+-   else { 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+    }
+-   
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
+@@ -158,11 +158,13 @@
+    // load the signal and background event samples from ROOT trees
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+-   if (!gSystem->AccessPathName( fname )) 
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
new file mode 100644
index 0000000..eb05d5d
--- /dev/null
+++ b/root-cernlib-doc.patch
@@ -0,0 +1,1307 @@
+diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
+--- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
+@@ -15,7 +15,7 @@
+ #include "Rtypes.h"
+ #include <string.h>
+ 
+-// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
++// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
+ 
+ ///////////////////////////////////////////////////////////////////////////////////////
+ //                                                                                   //
+@@ -25,8 +25,9 @@
+ // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
+ // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
+ // add the result to another matrix, add to square matrix the multiple of a diagonal //
+-// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
+-// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
++// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
++// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
++// Fortran convention.                                                               //
+ //                                                                                   //
+ ///////////////////////////////////////////////////////////////////////////////////////
+ 
+diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
+--- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
+@@ -11,8 +11,8 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // The set of methods to work with the plain matrix / vector
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
+ //
+ // Revision 1.7  2006/05/21 18:05:26  brun
+ // Fix more coding conventions violations
+@@ -33,7 +33,7 @@
+ //
+ // Revision 1.3  2003/04/03 17:39:39  fine
+ // Make merge with ROOT 3.05.03 and add TR package
+-//122
++//
+ // Revision 1.2  2003/02/04 23:35:20  fine
+ // Clean up
+ //
+@@ -154,27 +154,24 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication
++///
+ /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
++// --      ENTRY MXMLRT
++// --                C = A(I,J) X B(J,J) X A*(J,I)
++// --                A* TANDS FOR A-TRANSPOSED
++//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
++//             CALL MXMPY (A,B,X,NI,NJ,NJ)
++//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
+ 
+-// --      ENTRY MXMLRT */
+-// --                C = A(I,J) X B(J,J) X A*(J,I) */
+-// --                A* TANDS FOR A-TRANSPOSED */
+-//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
+-//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
+-//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
+-
+-/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
+-/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
++//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
++//             CALL MXMPY (A,Y,C,NI,NJ,NI)
+ 
+ 
+ // --                C = A*(I,J) X B(J,J) X A(J,I)
+@@ -191,6 +188,12 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication (double precision)
++///
++/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
++/// ORIG. 01/01/64 RKB
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
+ {
+@@ -215,36 +218,31 @@
+     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// Matrix Transposition
+ ///
+-///  Matrix Transposition
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxtrp(const float *a, float *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ } /* mxtrp */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Matrix Transposition (double precision)
++/// Matrix Transposition (double precision)
++///
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxtrp(const double *a, double *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ 
+@@ -283,38 +281,35 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::traat(const float *a, float *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Symmetric Multiplication of Rectangular Matrices
++/// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::traat(const double *a, double *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+@@ -346,34 +341,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
++/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+@@ -405,34 +400,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+@@ -470,34 +465,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+@@ -543,51 +538,51 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+@@ -596,17 +591,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trata.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trata(const float *a, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+@@ -636,22 +629,21 @@
+    return r__;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -684,25 +676,22 @@
+    return b;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
+-{
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
++{
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -743,26 +732,23 @@
+    return r__;
+ } /* tratsa_ */
+ 
+-//____________________________________________________________
+-// trchlu.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchlu.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trchlu(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -806,15 +792,17 @@
+    return b;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trchul(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -823,11 +811,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -875,17 +858,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trinv(const float *t, float *s, int n)
++{
+    int lhor, ipiv, lver, j;
+    double sum = 0;
+    double r__ = 0;
+@@ -934,22 +915,20 @@
+    return s;
+ } /* trinv_ */
+ 
+-//____________________________________________________________
+-// trla.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trla.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -981,22 +960,19 @@
+ } /* trla_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trlta.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trlta.F -- translated by f2c (version 19970219).
+-// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
++float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -1036,16 +1012,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trpck(const float *s, float *u, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1072,17 +1047,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1140,16 +1113,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1190,17 +1162,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
++float *TCL::trsinv(const float *g, float *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -1209,17 +1179,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmlu(const float *u, float *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -1246,17 +1214,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmul(const float *g, float *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -1284,18 +1250,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trupck(const float *u, float *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -1336,25 +1299,20 @@
+ } /* trupck_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trsat.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trsat.F -- translated by f2c (version 19970219).
+-// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
++float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --s;
+ 
+@@ -1391,25 +1349,21 @@
+ 
+ // ------  double
+ 
+-//____________________________________________________________
+-// trata.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trata.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trata(const double *a, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --a;
+ 
+@@ -1437,23 +1391,21 @@
+    return 0;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -1487,24 +1439,22 @@
+    return 0;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -1547,25 +1497,21 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trchlu.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trchlu(const double *a, double *b, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1609,15 +1555,17 @@
+    return 0;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trchul(const double *a, double *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -1626,11 +1574,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1677,17 +1620,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trinv(const double *t, double *s, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int lhor, ipiv, lver,  j;
+    double r__;
+    int mx, ndTep, ind;
+@@ -1735,19 +1676,16 @@
+ } /* trinv_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// trla.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
++double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+@@ -1782,17 +1720,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trlta.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+@@ -1834,16 +1770,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::trpck(const double *s, double *u, int n)
++{
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1869,17 +1804,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1936,16 +1869,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1985,17 +1917,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
++double *TCL::trsinv(const double *g, double *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -2006,17 +1936,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmlu(const double *u, double *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -2043,17 +1971,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmul(const double *g, double *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -2081,18 +2007,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
++double *TCL::trupck(const double *u, double *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -2133,17 +2056,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsat.F -- translated by f2c (version 19970219)
++///
+ /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
new file mode 100644
index 0000000..4f30e9b
--- /dev/null
+++ b/root-compiledata.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
+--- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
+@@ -75,7 +75,7 @@
+ 
+ # Remove the flags turning warnings into errors or extending
+ # the number of warnings.
+-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
++CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
+ 
+ # Determine the compiler version
+ BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
new file mode 100644
index 0000000..0049c46
--- /dev/null
+++ b/root-deprecated-options.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
++++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
+@@ -202,7 +202,7 @@
+     enable_unuran=yes
+     enable_vc=yes
+     enable_vdt=yes
+-    #enable_r=yes
++    enable_r=yes
+ fi
+ 
+ # Remove old log file
+@@ -2288,7 +2288,7 @@
+         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "yes:"; then
+@@ -2318,7 +2318,7 @@
+         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-doc-latex.patch b/root-doc-latex.patch
deleted file mode 100644
index c66850f..0000000
--- a/root-doc-latex.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur root-5.34.20.orig/hist/hist/src/TEfficiency.cxx root-5.34.20/hist/hist/src/TEfficiency.cxx
---- root-5.34.20.orig/hist/hist/src/TEfficiency.cxx	2014-08-13 15:03:22.000000000 +0200
-+++ root-5.34.20/hist/hist/src/TEfficiency.cxx	2014-08-16 22:50:04.139089920 +0200
-@@ -2668,7 +2668,7 @@
-    //the same process.
-    //
-    //The new weight is set according to:
--   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex
-+   //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex
- 
-    if(!pList->IsEmpty()) {
-       TIter next(pList);
-@@ -2728,7 +2728,7 @@
-    //calculates a new weight:
-    //current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex
-    //weight of rhs = Begin_Latex w_{2} End_Latex
--   //Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex
-+   //Begin_Latex w_{new} = #frac{w_{1} #times w_{2}}{w_{1} + w_{2}}End_Latex
- 
- 
-    if (fTotalHistogram == 0 && fPassedHistogram == 0) {
-@@ -3050,11 +3050,11 @@
- //______________________________________________________________________________
- void TEfficiency::SetBetaAlpha(Double_t alpha)
- {
--   //sets the shape parameter Begin_Latex \alpha End_Latex
-+   //sets the shape parameter Begin_Latex #alpha End_Latex
-    //
-    //The prior probability of the efficiency is given by the beta distribution:
-    //Begin_Latex
--   // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
-+   // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
-    //End_Latex
-    //
-    //Note: - both shape parameters have to be positive (i.e. > 0)
-@@ -3068,11 +3068,11 @@
- //______________________________________________________________________________
- void TEfficiency::SetBetaBeta(Double_t beta)
- {
--   //sets the shape parameter Begin_Latex \beta End_Latex
-+   //sets the shape parameter Begin_Latex #beta End_Latex
-    //
-    //The prior probability of the efficiency is given by the beta distribution:
-    //Begin_Latex
--   // f(\varepsilon;\alpha,\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
-+   // f(#varepsilon;#alpha,#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
-    //End_Latex
-    //
-    //Note: - both shape parameters have to be positive (i.e. > 0)
-@@ -3086,12 +3086,12 @@
- //______________________________________________________________________________
- void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
- {
--   //sets different  shape parameter Begin_Latex \alpha and \beta End_Latex
-+   //sets different  shape parameter Begin_Latex #alpha and #beta End_Latex
-    // for the prior distribution for each bin. By default the global parameter are used if they are not set
-    // for the specific bin
-    //The prior probability of the efficiency is given by the beta distribution:
-    //Begin_Latex
--   // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
-+   // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
-    //End_Latex
-    //
-    //Note: - both shape parameters have to be positive (i.e. > 0)
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
index c6bf63b..fdc0091 100644
--- a/root-dont-link-jvm.patch
+++ b/root-dont-link-jvm.patch
@@ -1,21 +1,21 @@
-diff -ur root-5.34.24.orig/cmake/modules/RootConfiguration.cmake root-5.34.24/cmake/modules/RootConfiguration.cmake
---- root-5.34.24.orig/cmake/modules/RootConfiguration.cmake	2014-12-02 18:12:03.000000000 +0100
-+++ root-5.34.24/cmake/modules/RootConfiguration.cmake	2014-12-19 11:41:09.559330313 +0100
-@@ -257,10 +257,6 @@
- string(REPLACE ";" " " hdfslib "${HDFS_LIBRARY}")
+diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
+@@ -263,10 +263,6 @@
+ set(hdfslib ${HDFS_LIBRARY})
  set(hdfsincdir ${HDFS_INCLUDE_DIR})
  
 -set(jniincdir ${Java_INCLUDE_DIRS})
--string(REPLACE ";" " " jvmlib "${Java_LIBRARIES}")
+-set(jvmlib ${Java_LIBRARIES})
 -set(jvmlibdir ${Java_LIBRARY_DIR})
 -
  set(buildalien ${value${alien}})
  set(alienlibdir ${ALIEN_LIBRARY_DIR})
- string(REPLACE ";" " " alienlib "${ALIEN_LIBRARY}")
-diff -ur root-5.34.24.orig/config/Makefile.in root-5.34.24/config/Makefile.in
---- root-5.34.24.orig/config/Makefile.in	2014-12-02 18:12:03.000000000 +0100
-+++ root-5.34.24/config/Makefile.in	2014-12-19 11:39:26.580520172 +0100
-@@ -207,9 +207,6 @@
+ set(alienlib ${ALIEN_LIBRARY})
+diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
+@@ -251,9 +251,6 @@
  HDFSLIBDIR     := @hdfslibdir@
  HDFSCLILIB     := @hdfslib@
  HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
@@ -25,10 +25,10 @@ diff -ur root-5.34.24.orig/config/Makefile.in root-5.34.24/config/Makefile.in
  
  BUILDALIEN     := @buildalien@
  ALIENLIBDIR    := @alienlibdir@
-diff -ur root-5.34.24.orig/configure root-5.34.24/configure
---- root-5.34.24.orig/configure	2014-12-02 18:12:03.000000000 +0100
-+++ root-5.34.24/configure	2014-12-19 11:39:26.607519860 +0100
-@@ -1753,8 +1753,6 @@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
++++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
+@@ -1822,8 +1822,6 @@
    hdfs-incdir        HDFS support, location of hdfs.h
    hdfs-libdir        HDFS support, location of libhdfs
    iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
@@ -37,7 +37,7 @@ diff -ur root-5.34.24.orig/configure root-5.34.24/configure
    krb5               Kerberos5 support, location of Kerberos distribution
    krb5-incdir        Kerberos5 support, location of krb5.h
    krb5-libdir        Kerberos5 support, location of libkrb5
-@@ -2141,8 +2139,6 @@
+@@ -2214,8 +2212,6 @@
        --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
        --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
        --with-iosvers=*)        iosvers=$optarg       ;;
@@ -46,7 +46,7 @@ diff -ur root-5.34.24.orig/configure root-5.34.24/configure
        --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
        --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
        --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
-@@ -4285,17 +4281,6 @@
+@@ -4535,17 +4531,6 @@
      hdfsinc=$found_hdr
      hdfsincdir=$found_dir
  
@@ -64,7 +64,7 @@ diff -ur root-5.34.24.orig/configure root-5.34.24/configure
      check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
          $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
          $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
-@@ -4303,26 +4288,12 @@
+@@ -4553,26 +4538,12 @@
      hdfslib=$found_lib
      hdfslibdir=$found_dir
  
@@ -93,7 +93,7 @@ diff -ur root-5.34.24.orig/configure root-5.34.24/configure
                  if test $link_result -eq 0 ; then
                      enable_hdfs="no"
                  fi
-@@ -7324,9 +7295,6 @@
+@@ -7641,9 +7612,6 @@
      -e "s|@iosvers@|$iosvers|"                  \
      -e "s|@iconpath@|$iconpath|"                \
      -e "s|@incdir@|$incdir|"                    \
@@ -103,9 +103,9 @@ diff -ur root-5.34.24.orig/configure root-5.34.24/configure
      -e "s|@krb5incdir@|$krb5incdir|"            \
      -e "s|@krb5lib@|$krb5lib|"                  \
      -e "s|@krb5libdir@|$krb5libdir|"            \
-diff -ur root-5.34.24.orig/io/hdfs/Module.mk root-5.34.24/io/hdfs/Module.mk
---- root-5.34.24.orig/io/hdfs/Module.mk	2014-12-02 18:12:03.000000000 +0100
-+++ root-5.34.24/io/hdfs/Module.mk	2014-12-19 11:39:26.608519849 +0100
+diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
+--- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
 @@ -44,7 +44,7 @@
  $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
@@ -113,9 +113,9 @@ diff -ur root-5.34.24.orig/io/hdfs/Module.mk root-5.34.24/io/hdfs/Module.mk
 -		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
 +		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
  
- $(HDFSDS):      $(HDFSH) $(HDFSL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
-@@ -68,4 +68,4 @@
+ $(call pcmrule,HDFS)
+ 	$(noop)
+@@ -72,4 +72,4 @@
  distclean::     distclean-$(MODNAME)
  
  ##### extra rules ######
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
new file mode 100644
index 0000000..90df77e
--- /dev/null
+++ b/root-dox-filter.patch
@@ -0,0 +1,86 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
+--- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
+@@ -98,6 +98,7 @@
+ 
+    // Source file.
+    if (gSource) {
++      size_t spos = 0;
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+ 
+@@ -106,10 +107,11 @@
+              gLineString.find("/** \\class")  != string::npos ||
+              gLineString.find("///! \\class") != string::npos) gClass = true;
+ 
+-         if (gLineString.find("End_Macro") != string::npos) {
++         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
+             ReplaceAll(gLineString,"End_Macro","");
+             gImageSource = false;
+             gInMacro = 0;
++            spos = 0;
+             if (m) {
+                fclose(m);
+                m = 0;
+@@ -122,8 +124,9 @@
+          }
+ 
+          if (gInMacro) {
++            if (spos) gLineString = gLineString.substr(spos);
+             if (gInMacro == 1) {
+-               if (EndsWith(gLineString,".C\n")) {
++               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
+                   ExecuteMacro();
+                   gInMacro++;
+                } else {
+@@ -153,14 +156,27 @@
+             }
+          }
+ 
+-         if (gLineString.find("Begin_Macro") != string::npos) {
++         if (gLineString.find("Begin_Macro") != string::npos &&
++             gLineString.find("End_Macro") == string::npos) {
++            if (BeginsWith(gLineString, "///")) {
++               spos = gLineString.find_first_not_of(' ', 3);
++            }
+             if (gLineString.find("source") != string::npos) gImageSource = true;
+             gImageID++;
+             gInMacro++;
+             gLineString = "\n";
+          }
+ 
+-         printf("%s",gLineString.c_str());
++         size_t l = gLineString.length();
++         size_t b = 0;
++         do {
++            size_t e = gLineString.find('\n', b);
++            if (e != string::npos) e++;
++            if (spos) printf("%-*s%s", spos, "///",
++                              gLineString.substr(b, e - b).c_str());
++            else printf("%s", gLineString.substr(b, e - b).c_str());
++            b = e;
++         } while (b < l);
+       }
+       fclose(f);
+       return 0;
+@@ -203,7 +219,8 @@
+    if (gSource) {
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+-         if (gLineString.find("ClassImp") != string::npos) {
++         if (gLineString.find("ClassImp") != string::npos ||
++             gLineString.find("NamespaceImp") != string::npos) {
+             i1         = gLineString.find("(")+1;
+             i2         = gLineString.find(")")-1;
+             gClassName = gLineString.substr(i1,i2-i1+1);
+@@ -238,8 +255,8 @@
+ 
+    // Build the ROOT command to be executed.
+    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
+-   int l = gLineString.length();
+-   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
++   size_t l = gLineString.length();
++   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
+ 
+    ExecuteCommand(gLineString);
+ 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
new file mode 100644
index 0000000..46d6dde
--- /dev/null
+++ b/root-doxyfile.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
+--- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
+@@ -2058,7 +2058,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-MACRO_EXPANSION        = NO
++MACRO_EXPANSION        = YES
+ 
+ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+ # the macro expansion is limited to the macros specified with the PREDEFINED and
+@@ -2066,7 +2066,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-EXPAND_ONLY_PREDEF     = NO
++EXPAND_ONLY_PREDEF     = YES
+ 
+ # If the SEARCH_INCLUDES tag is set to YES the includes files in the
+ # INCLUDE_PATH will be searched if a #include is found.
+@@ -2098,7 +2098,7 @@
+ # recursively expanded use the := operator instead of the = operator.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-PREDEFINED             =
++PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
+ 
+ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+ # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
new file mode 100644
index 0000000..35814e2
--- /dev/null
+++ b/root-doxygen-warnings.patch
@@ -0,0 +1,723 @@
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
+@@ -1,4 +1,4 @@
+-/// \file impl_tuple_apply.h
++/// \file ROOT/impl_tuple_apply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RArrayView.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
+@@ -1,4 +1,4 @@
+-/// \file rhysd_array_view.h
++/// \file ROOT/rhysd_array_view.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RTupleApply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCoopPtr
++/// \file ROOT/TCoopPtr.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDirectory.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDrawable.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-08-07
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
+@@ -1,4 +1,4 @@
+-/// \file TKey.h
++/// \file ROOT/TKey.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TLogger.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-29
+diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
+--- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
+@@ -57,7 +57,7 @@
+       // Same value as TVirtualCollectionProxy.
+       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
+ 
+-   /** @class template TCollectionProxyInfo::IteratorValue
++   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
+     *
+     * Small helper to encapsulate whether to return the value
+     * pointed to by the iterator or its address.
+@@ -76,7 +76,7 @@
+          }
+       };
+ 
+-   /** @class template TCollectionProxyInfo::Iterators
++   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
+     *
+     * Small helper to implement the function to create,access and destroy
+     * iterators.
+@@ -204,7 +204,7 @@
+          }
+       };
+ 
+-  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
++  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
+     *
+     * Small helper to save proxy environment in the event of
+     * recursive calls.
+@@ -276,7 +276,7 @@
+       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
+    };
+ 
+-   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Type
+     *
+     * Small helper to encapsulate basic data accesses for
+     * all STL continers.
+@@ -356,7 +356,7 @@
+ 
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like vector, list, deque
+@@ -389,7 +389,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like forward_list
+@@ -425,7 +425,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+@@ -457,7 +457,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
+--- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCanvas.h
++/// \file ROOT/TCanvas.h
+ /// \ingroup Gpad ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-08
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
+@@ -26,7 +26,7 @@
+ #include "TClass.h"
+ #include "TError.h"
+ 
+-/** \class
++/** \class TGLPolyMarker
+ \ingroup opengl
+ To draw a 3D polymarker in a GL window.
+ */
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
+@@ -14,7 +14,7 @@
+ 
+ #include <string.h>
+ 
+-/** \class
++/** \class TGLSelectRecordBase
+ \ingroup opengl TGLSelectRecordBase
+ Base class for select records.
+ Supports initialization from a raw GL record (UInt_t*) and
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
+@@ -15,7 +15,7 @@
+ #include "TGLPlotCamera.h"
+ #include "TGLIncludes.h"
+ 
+-/** \class
++/** \class TGLVoxelPainter
+ \ingroup opengl
+ Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
+ */
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
+@@ -49,11 +49,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
+-\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
+-\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
+-\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
+-\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
++\class TH1C
++\brief 1-D histogram with a byte per channel (see TH1 documentation)
++\class TH1S
++\brief 1-D histogram with a short per channel (see TH1 documentation)
++\class TH1I
++\brief 1-D histogram with an int per channel (see TH1 documentation)}
++\class TH1F
++\brief 1-D histogram with a float per channel (see TH1 documentation)}
++\class TH1D
++\brief 1-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
+@@ -30,11 +30,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
+-\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
+-\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
+-\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
+-\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
++\class TH2C
++\brief 2-D histogram with a byte per channel (see TH1 documentation)
++\class TH2S
++\brief 2-D histogram with a short per channel (see TH1 documentation)
++\class TH2I
++\brief 2-D histogram with an int per channel (see TH1 documentation)}
++\class TH2F
++\brief 2-D histogram with a float per channel (see TH1 documentation)}
++\class TH2D
++\brief 2-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
+--- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
+@@ -28,11 +28,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
+-\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
+-\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
+-\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
+-\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
++\class TH3C
++\brief 3-D histogram with a byte per channel (see TH1 documentation)
++\class TH3S
++\brief 3-D histogram with a short per channel (see TH1 documentation)
++\class TH3I
++\brief 3-D histogram with an int per channel (see TH1 documentation)}
++\class TH3F
++\brief 3-D histogram with a float per channel (see TH1 documentation)}
++\class TH3D
++\brief 3-D histogram with a double per channel (see TH1 documentation)}
+ @} 
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
+--- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistDrawable.cxx
++/// \file THistDrawable.cxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-11
+diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistPainter.cxx
++/// \file THistPainter.cxx
+ /// \ingroup HistPainter ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
+--- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
+@@ -2463,7 +2463,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Write the first part of the links shown ontop of each doc page;
+-/// one <div> has to be closed by caller so additional items can still
++/// one \<div\> has to be closed by caller so additional items can still
+ /// be added.
+ 
+ void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
+diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
+--- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
+@@ -63,7 +63,7 @@
+                        const char *location = 0);
+    static Bool_t CheckFile(const char *path, const char *location = 0);
+ 
+-   /// Note: This must be kept in sync with values #defined in dcap.h
++   /// Note: This must be kept in sync with values \#defined in dcap.h
+    enum EOnErrorAction {
+       kOnErrorRetry   =  1,
+       kOnErrorFail    =  0,
+diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
+--- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
+@@ -160,7 +160,7 @@
+ };
+ 
+ /**
+- \class TCollectionClassStreamer TCollectionProxy.h
++ \class TCollectionClassStreamer TCollectionProxyFactory.h
+  \ingroup IO
+ 
+  Class streamer object to implement TClassStreamer functionality
+diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
+--- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
+@@ -434,7 +434,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include needed for the argument of
++/// Add to the header file, the \#include needed for the argument of
+ /// this template.
+ 
+ UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
+@@ -587,7 +587,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Add to the header file anything that need to appear after the class
+-/// declaration (this includes some #pragma link).
++/// declaration (this includes some \#pragma link).
+ 
+ void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
+ {
+diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
+--- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
+@@ -3645,7 +3645,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include need for this class.
++/// Add to the header file, the \#include need for this class.
+ 
+ UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
+ {
+diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
+--- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFile.h
++/// \file ROOT/TFile.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
+--- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
+@@ -4,7 +4,7 @@
+ 
+ \brief The %ROOT Mathematical Libraries.
+ 
+-See the \subpage MathPage "Mathematical Libraries" description page.
++See the \ref MathPage "Mathematical Libraries" description page.
+ 
+ 
+ \page MathPage The ROOT Mathematical Libraries 
+@@ -39,7 +39,7 @@
+ - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
+ 
+    - Physics: library with the TVector3 and TLorentzVector classes.
+-   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
++   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
+ 
+ - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
+@@ -18,9 +18,7 @@
+ #define ROOT_Math_Random
+ 
+ /**
+-@defgroup Random 
+-
+- Interface class for Random number generation
++@defgroup Random Interface class for Random number generation
+ */
+ 
+ #include "Math/RandomFunctions.h"
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
+@@ -209,7 +209,7 @@
+ 
+   /**
+ 
+-  Calculates the real part of the cosine integral \Re(Ci).
++  Calculates the real part of the cosine integral Re(Ci).
+ 
+   For x<0, the imaginary part is \pi i and has to be added by the user,
+   for x>0 the imaginary part of Ci(x) is 0.
+diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
+--- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
+@@ -21,7 +21,8 @@
+ 
+ /**
+ 
+-\class TKDTree class implementing a kd-tree
++\class TKDTree
++\brief Class implementing a kd-tree
+ 
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
+--- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFit.h
++/// \file ROOT/TFit.h
+ /// \ingroup MathCore ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
+@@ -83,9 +83,6 @@
+ 
+     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
+     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
+-
+-    @ingroup MCIntegration
+-
+    */
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
+@@ -51,7 +51,7 @@
+    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
+                \cdot \left ( \int \limits_{0}^{1}
+                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
+-               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
++               - \kappa \, e^{\frac{-s}{\kappa}}\f].
+    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
+ 
+    The parameters are:
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
+@@ -84,16 +84,17 @@
+ // [5.2.1.6] (complete) elliptic integral of the third kind
+ // (26.x.17.2)
+ /**
++Complete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+@@ -220,16 +221,17 @@
+ // phi in radians
+ // (26.x.17.1)
+ /**
++Incomplete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
+--- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
+@@ -38,7 +38,7 @@
+     - The user can optionally provide the
+ 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
+ 	  - the mode via **TUnuranContDist::SetMode**,
+-      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
++	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
+ 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
+ 
+ Some of this information is required depending on the chosen UNURAN generation method.
+diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
+--- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.h
++/*! \file TGLiteResult.h
+ *//*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
+--- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.cxx
++/*! \file TGLiteResult.cxx
+  */ /*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
+--- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
+@@ -60,8 +60,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// method used to get or set http header in the string buffer
+ /// Header has following format:
+-///   field1 : value1\r\n
+-///   field2 : value2\r\n
++///   field1 : value1\\r\\n
++///   field2 : value2\\r\\n
+ /// Such format corresponds to header format in HTTP requests
+ 
+ TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
+diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
+--- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
+@@ -1195,7 +1195,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
+-/// line [\r]\n. If so, return the pointer to the position after the line,
++/// line [\\r]\\n. If so, return the pointer to the position after the line,
+ /// otherwise return 0. This is used as callback to GetHunk(). The data
+ /// between START and PEEKED has been read and cannot be "unread"; the
+ /// data after PEEKED has only been peeked.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
+--- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
+@@ -813,7 +813,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+@@ -826,7 +826,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
+@@ -1002,7 +1002,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
+ 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
+@@ -1264,7 +1264,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ 
+ RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
+@@ -21,7 +21,7 @@
+    RooAbsReal is the common abstract base class for objects that represent a
+    real value and implements functionality common to all real-valued objects
+    such as the ability to plot them, to construct integrals of them, the
+-   ability to advertise (partial) analytical integrals etc..
++   ability to advertise (partial) analytical integrals etc.
+    
+    Implementation of RooAbsReal may be derived, thus no interface
+    is provided to modify the contents.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
+@@ -838,7 +838,7 @@
+ /// L = TLatex mode
+ /// X = Latex mode
+ /// Y = Latex table mode ( '=' replaced by '&' )
+-/// V = Make name \verbatim in Latex mode
++/// V = Make name \\verbatim in Latex mode
+ /// P = use error to control shown precision
+ /// F = force fixed precision
+ ///
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
+@@ -55,7 +55,7 @@
+    confidence level is reached within an acceptable neighborhood as defined by
+    SetEpsilon(). More specifically: we calculate the following for different
+    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
+-   d{normset} \$.
++   d{normset} \f$.
+    Important note: this is not the default method because of a bug in constructing
+    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
+    calling SetUseKeys(true), and the data set will be interpreted without weights.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
+@@ -53,7 +53,7 @@
+ To make Propose(xPrime, x) dependent on x, configure with
+ PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
+ 
+-````{.cpp}
++~~~{.cpp}
+ // our parameter
+ RooRealVar p("p", "p", 5, 0, 10);
+ 
+@@ -74,7 +74,7 @@
+ // number of proposals. If you don't call this function, the default cache size
+ // is 1, which can be slow.
+ pdfProposal.SetCacheSize(desiredCacheSize);
+-````
++~~~
+ 
+ PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
+ for future versions.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
+@@ -40,8 +40,8 @@
+ By default the calculation is:
+ 
+ \f[
+-	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
+-   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
++        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
+ \f]
+ 
+ where \f$ \lambda \f$ is the profile likeihood ratio, so the 
+@@ -50,11 +50,11 @@
+ If ``SetSubtractMLE(false)`` then it calculates:
+ 
+ \f[
++        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
++\f]
+ 
+-	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
+-                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
+-
+-where \f$ L\$ is the Likelihood function. 
++where \f$ L \f$ is the Likelihood function.
+ 
+ The values of the parameters of interest for the alternative 
+ hypothesis are taken at the time of the construction.
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
+@@ -9,7 +9,7 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
+-/** \class Detail::TBranchProxy
++/** \class ROOT::Detail::TBranchProxy
+ Base class for all the proxy object. It includes the imeplemtation
+ of the autoloading of branches as well as all the generic setup routine.
+ */
diff --git a/root-fflags.patch b/root-fflags.patch
new file mode 100644
index 0000000..3fd6f0e
--- /dev/null
+++ b/root-fflags.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
+@@ -70,7 +70,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -107,7 +107,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -144,7 +144,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
+@@ -37,12 +37,12 @@
+        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
+     else(${SYSCTL_OUTPUT} MATCHES 64)
+        MESSAGE(STATUS "Found a 32bit system")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
+     endif(${SYSCTL_OUTPUT} MATCHES 64)
+   endif()
+ 
+@@ -65,7 +65,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+@@ -101,7 +101,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
+@@ -13,7 +13,7 @@
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index f148a51..b60ac0d 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.34.32.orig/core/base/src/TApplication.cxx root-5.34.32/core/base/src/TApplication.cxx
---- root-5.34.32.orig/core/base/src/TApplication.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/core/base/src/TApplication.cxx	2015-06-30 00:15:36.347566719 +0200
-@@ -273,22 +273,11 @@
+diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
+@@ -265,18 +265,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -9,11 +9,7 @@ diff -ur root-5.34.32.orig/core/base/src/TApplication.cxx root-5.34.32/core/base
 +   // mode and Root.UseTTFonts is true. Abort silently
     // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR);
--#else
--                                       "$(ROOTSYS)/fonts");
--#endif
+-                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
 -   // Check for use of DFSG - fonts
 -   if (!ttfont)
@@ -26,7 +22,7 @@ diff -ur root-5.34.32.orig/core/base/src/TApplication.cxx root-5.34.32/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -302,7 +291,6 @@
+@@ -290,7 +283,6 @@
        }
     }
  #endif
@@ -34,23 +30,35 @@ diff -ur root-5.34.32.orig/core/base/src/TApplication.cxx root-5.34.32/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-5.34.32.orig/graf2d/graf/inc/TTF.h root-5.34.32/graf2d/graf/inc/TTF.h
---- root-5.34.32.orig/graf2d/graf/inc/TTF.h	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/graf/inc/TTF.h	2015-06-30 00:15:36.360566569 +0200
-@@ -70,9 +70,8 @@
-    static FT_BBox     fgCBox;                  // string control box
-    static FT_CharMap  fgCharMap[kTTMaxFonts];  // font character map
-    static Int_t       fgCurFontIdx;            // current font index
--   static Int_t       fgSymbItaFontIdx;        // Symbol italic font index
-    static Int_t       fgFontCount;             // number of fonts loaded
--   static char       *fgFontName[kTTMaxFonts]; // font name
-+   static Int_t       fgFontID[kTTMaxFonts];   // font ID
-    static FT_Face     fgFace[kTTMaxFonts];     // font face
-    static TTGlyph     fgGlyphs[kMaxGlyphs];    // glyphs
-    static Bool_t      fgHinting;               // use hinting (true by default)
-diff -ur root-5.34.32.orig/graf2d/graf/Module.mk root-5.34.32/graf2d/graf/Module.mk
---- root-5.34.32.orig/graf2d/graf/Module.mk	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/graf/Module.mk	2015-06-30 00:15:36.360566569 +0200
+diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
+@@ -12,7 +12,7 @@
+ 
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+ 
+-ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
++ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
+ 
+ if(builtin_freetype)
+   add_dependencies(${libname} FREETYPE)
+diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
+--- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
+@@ -86,9 +86,8 @@
+    static FT_BBox        fgCBox;                  // string control box
+    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
+    static Int_t          fgCurFontIdx;            // current font index
+-   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
+    static Int_t          fgFontCount;             // number of fonts loaded
+-   static char          *fgFontName[kTTMaxFonts]; // font name
++   static Int_t          fgFontID[kTTMaxFonts];   // font ID
+    static FT_Face        fgFace[kTTMaxFonts];     // font face
+    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
+    static Bool_t         fgHinting;               // use hinting (true by default)
+diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
+--- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -58,49 +66,45 @@ diff -ur root-5.34.32.orig/graf2d/graf/Module.mk root-5.34.32/graf2d/graf/Module
 -		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
 +		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
  
- $(GRAFDS):      $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
-diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/TTF.cxx
---- root-5.34.32.orig/graf2d/graf/src/TTF.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/graf/src/TTF.cxx	2015-07-02 10:10:03.352185217 +0200
-@@ -26,6 +26,7 @@
+ $(call pcmrule,GRAF)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
+@@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
  
 +#include <fontconfig/fontconfig.h>
- 
++
  // to scale fonts to the same size as the old TT version
  const Float_t kScale = 0.93376068;
-@@ -40,10 +41,9 @@
- Int_t       TTF::fgWidth          = 0;
- Int_t       TTF::fgAscent         = 0;
- Int_t       TTF::fgCurFontIdx     = -1;
--Int_t       TTF::fgSymbItaFontIdx = -1;
- Int_t       TTF::fgFontCount      = 0;
- Int_t       TTF::fgNumGlyphs      = 0;
--char       *TTF::fgFontName[kTTMaxFonts];
-+Int_t       TTF::fgFontID[kTTMaxFonts];
- FT_Matrix  *TTF::fgRotMatrix;
- FT_Library  TTF::fgLibrary;
- FT_BBox     TTF::fgCBox;
-@@ -75,6 +75,16 @@
+ 
+@@ -38,10 +40,9 @@
+ Int_t          TTF::fgWidth          = 0;
+ Int_t          TTF::fgAscent         = 0;
+ Int_t          TTF::fgCurFontIdx     = -1;
+-Int_t          TTF::fgSymbItaFontIdx = -1;
+ Int_t          TTF::fgFontCount      = 0;
+ Int_t          TTF::fgNumGlyphs      = 0;
+-char          *TTF::fgFontName[kTTMaxFonts];
++Int_t          TTF::fgFontID[kTTMaxFonts];
+ FT_Matrix     *TTF::fgRotMatrix;
+ FT_Library     TTF::fgLibrary;
+ FT_BBox        TTF::fgCBox;
+@@ -72,6 +73,11 @@
        return;
     }
  
 +   // Add root's font directory
 +   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
-+# ifdef TTFFONTDIR
-+                                       TTFFONTDIR
-+# else
-+                                       "$(ROOTSYS)/fonts"
-+# endif
-+                                      );
++                                       TROOT::GetTTFFontDir());
 +   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
 +
     // load default font (arialbd)
     SetTextFont(62);
  }
-@@ -87,7 +97,6 @@
+@@ -84,7 +90,6 @@
     if (!fgInit) return;
  
     for (int i = 0; i < fgFontCount; i++) {
@@ -108,7 +112,7 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
        FT_Done_Face(fgFace[i]);
     }
     if (fgRotMatrix) delete fgRotMatrix;
-@@ -112,12 +121,19 @@
+@@ -109,12 +114,19 @@
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
@@ -132,7 +136,7 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
           {
              fgCharMap[fgCurFontIdx] = charmap;
              if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -381,27 +397,147 @@
+@@ -378,27 +390,147 @@
  
     if (!fontname || !fontname[0]) {
        Warning("TTF::SetTextFont",
@@ -293,7 +297,7 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
        }
     }
  
-@@ -409,161 +545,216 @@
+@@ -406,151 +538,215 @@
     if (fgFontCount >= kTTMaxFonts) {
        Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
              kTTMaxFonts);
@@ -306,13 +310,7 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
  
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                       TTFFONTDIR
--# else
--                                       "$(ROOTSYS)/fonts"
--# endif
--                                      );
- 
+-                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
 +   char *ttfont = NULL;
 +   int ttindex = 0;
@@ -541,29 +539,30 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
 -   return 0;
 -}
 -
--//______________________________________________________________________________
+-////////////////////////////////////////////////////////////////////////////////
+-/// Set specified font.
+-/// List of the currently supported fonts (screen and PostScript)
+-///
+-/// | Font ID |   X11                     |     TTF          |
+-/// |---------|---------------------------|------------------|
+-/// |      1  | times-medium-i-normal     | timesi.ttf       |
+-/// |      2  | times-bold-r-normal       | timesbd.ttf      |
+-/// |      3  | times-bold-i-normal       | timesi.ttf       |
+-/// |      4  | helvetica-medium-r-normal | arial.ttf        |
+-/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
+-/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
+-/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
+-/// |      8  | courier-medium-r-normal   | cour.ttf         |
+-/// |      9  | courier-medium-o-normal   | couri.ttf        |
+-/// |     10  | courier-bold-r-normal     | courbd.ttf       |
+-/// |     11  | courier-bold-o-normal     | courbi.ttf       |
+-/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
+-/// |     13  | times-medium-r-normal     | times.ttf        |
+-/// |     14  |                           | wingding.ttf     |
+-/// |     15  | symbol oblique is emulated from symbol.ttf | |
+-
 -void TTF::SetTextFont(Font_t fontnumber)
 -{
--   // Set specified font.
--   // List of the currently supported fonts (screen and PostScript)
--   // =============================================================
--   //   Font ID       X11                        TTF
--   //        1 : times-medium-i-normal       timesi.ttf
--   //        2 : times-bold-r-normal         timesbd.ttf
--   //        3 : times-bold-i-normal         timesi.ttf
--   //        4 : helvetica-medium-r-normal   arial.ttf
--   //        5 : helvetica-medium-o-normal   ariali.ttf
--   //        6 : helvetica-bold-r-normal     arialbd.ttf
--   //        7 : helvetica-bold-o-normal     arialbi.ttf
--   //        8 : courier-medium-r-normal     cour.ttf
--   //        9 : courier-medium-o-normal     couri.ttf
--   //       10 : courier-bold-r-normal       courbd.ttf
--   //       11 : courier-bold-o-normal       courbi.ttf
--   //       12 : symbol-medium-r-normal      symbol.ttf
--   //       13 : times-medium-r-normal       times.ttf
--   //       14 :                             wingding.ttf
--   //       15 : symbol oblique is emulated from symbol.ttf
--
 -   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
 -   // Table of Microsoft and (for non-MSFT operating systems) backup
 -   // FreeFont TTF fonts.
@@ -612,12 +611,7 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
 -      // try to load font (font must be in Root.TTFontPath resource)
 -      // to see which fontset we have available
 -      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR
--#else
--                                          "$(ROOTSYS)/fonts"
--#endif
--                                         );
+-                                          TROOT::GetTTFFontDir());
 -      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
 -      if (ttfont) {
 -         delete [] ttfont;
@@ -636,10 +630,20 @@ diff -ur root-5.34.32.orig/graf2d/graf/src/TTF.cxx root-5.34.32/graf2d/graf/src/
 -   if (ret == 0 && fontid != 12) fontset = thisset;
  }
  
- //______________________________________________________________________________
-diff -ur root-5.34.32.orig/graf2d/postscript/Module.mk root-5.34.32/graf2d/postscript/Module.mk
---- root-5.34.32.orig/graf2d/postscript/Module.mk	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/postscript/Module.mk	2015-06-30 00:15:36.361566558 +0200
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
+@@ -5,5 +5,5 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
++ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
+ ROOT_INSTALL_HEADERS()
+diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
+--- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -647,12 +651,12 @@ diff -ur root-5.34.32.orig/graf2d/postscript/Module.mk root-5.34.32/graf2d/posts
 -		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
 +		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
  
- $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
-diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/graf2d/postscript/src/TPostScript.cxx
---- root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/postscript/src/TPostScript.cxx	2015-07-02 10:07:45.737737725 +0200
-@@ -238,6 +238,7 @@
+ $(call pcmrule,POSTSCRIPT)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
+@@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
  #include <wchar.h>
@@ -660,10 +664,10 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1511,63 +1512,179 @@
- {
-    // Embed font in PS file.
+@@ -1528,56 +1529,179 @@
  
+ void TPostScript::FontEmbed(void)
+ {
 -   static const char *fonttable[32][2] = {
 -      { "Root.TTFont.0", "FreeSansBold.otf" },
 -      { "Root.TTFont.1", "FreeSerifItalic.otf" },
@@ -703,19 +707,13 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
  
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR
--#else // TTFFONTDIR
--                                       "$(ROOTSYS)/fonts"
--#endif // TTFFONTDIR
--                                       );
+-                                       TROOT::GetTTFFontDir());
 -
     for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
 -         const char *filename = gEnv->GetValue(
 -                                               fonttable[fontid][0], fonttable[fontid][1]);
--         char *ttfont = gSystem->Which(ttpath, filename,
--                                       kReadPermission);
+-         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
 +
 +         char *ttfont = NULL;
 +
@@ -881,8 +879,8 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
 +         FcPatternDestroy (match);
 +         FcPatternDestroy (pat);
 +         if (set) FcCharSetDestroy (set);
- 
-          if(!ttfont) {
++
+          if (!ttfont) {
 -            Error("TPostScript::FontEmbed",
 -                  "font %d (filename `%s') not found in path",
 -                  fontid, filename);
@@ -891,7 +889,7 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1576,9 +1693,8 @@
+@@ -1586,9 +1710,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -903,7 +901,7 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
              }
              delete [] ttfont;
           }
-@@ -2571,10 +2687,10 @@
+@@ -2536,10 +2659,10 @@
        { "Root.PSFont.5",             "/Helvetica-Oblique" },
        { "Root.PSFont.6",             "/Helvetica-Bold" },
        { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
@@ -918,7 +916,7 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
        { "Root.PSFont.12",            "/Symbol" },
        { "Root.PSFont.13",            "/Times-Roman" },
        { "Root.PSFont.14",            "/ZapfDingbats" },
-@@ -2781,10 +2897,10 @@
+@@ -2745,10 +2868,10 @@
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -932,9 +930,20 @@ diff -ur root-5.34.32.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.32/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-5.34.32.orig/graf3d/gl/Module.mk root-5.34.32/graf3d/gl/Module.mk
---- root-5.34.32.orig/graf3d/gl/Module.mk	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf3d/gl/Module.mk	2015-06-30 00:15:36.362566546 +0200
+diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
+@@ -32,6 +32,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -942,20 +951,20 @@ diff -ur root-5.34.32.orig/graf3d/gl/Module.mk root-5.34.32/graf3d/gl/Module.mk
 -		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
 +		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
  
- $(GLDS):	$(GLH2) $(GLL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
-diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/gl/src/TGLFontManager.cxx
---- root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf3d/gl/src/TGLFontManager.cxx	2015-07-02 10:19:18.521853256 +0200
-@@ -36,6 +36,7 @@
+ $(call pcmrule,GL)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
+@@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
  
 +#include <fontconfig/fontconfig.h>
  
- //______________________________________________________________________________
- // TGLFont
-@@ -413,7 +414,7 @@
+ /** \class TGLFont
+ \ingroup opengl
+@@ -420,7 +421,7 @@
  ClassImp(TGLFontManager);
  
  TObjArray   TGLFontManager::fgFontFileArray;
@@ -964,16 +973,12 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/
  TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
  Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
  
-@@ -444,21 +445,175 @@
+@@ -451,17 +452,175 @@
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
 -      TString ttpath, file;
--# ifdef TTFFONTDIR
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
--# else
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
--# endif
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
 -      {
 -         //For extenede we have both ttf and otf.
 -         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
@@ -1153,7 +1158,7 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/
        FTFont* ftfont = 0;
        switch (mode)
        {
-@@ -482,10 +637,14 @@
+@@ -485,10 +644,14 @@
              ftfont = new FTGLTextureFont(file);
              break;
           default:
@@ -1168,16 +1173,16 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-@@ -567,8 +726,6 @@
+@@ -571,8 +734,6 @@
  {
     if (fgStaticInitDone == kFALSE) InitStatics();
  
 -   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
--   
+-
     return fgExtendedFontStart;
  }
  
-@@ -636,28 +793,6 @@
+@@ -642,28 +803,6 @@
     fgFontFileArray.Add(new TObjString("wingding")); // 140
     fgFontFileArray.Add(new TObjString("symbol"));   // 150
  
@@ -1206,9 +1211,9 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.32/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/TGLText.cxx
---- root-5.34.32.orig/graf3d/gl/src/TGLText.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf3d/gl/src/TGLText.cxx	2015-07-02 10:23:10.490205011 +0200
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1218,7 +1223,7 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -173,33 +175,92 @@
+@@ -178,27 +180,92 @@
  {
     int fontid = fontnumber / 10;
  
@@ -1241,12 +1246,8 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/
 -
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                        TTFFONTDIR
--# else
--                                        "$(ROOTSYS)/fonts"
--# endif
--                                        );
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
 +   FcPattern *pat, *match;
 +   FcResult result;
 +   char *ttfont;
@@ -1327,8 +1328,7 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
 +   }
- 
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++
 +   FcConfigSubstitute (NULL, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
 +   match = FcFontMatch (NULL, pat, &result);
@@ -1337,7 +1337,7 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -207,7 +268,9 @@
+@@ -206,7 +273,9 @@
  
     fGLTextFont = new FTGLPolygonFont(ttfont);
  
@@ -1345,24 +1345,18 @@ diff -ur root-5.34.32.orig/graf3d/gl/src/TGLText.cxx root-5.34.32/graf3d/gl/src/
 +   FcPatternDestroy (pat);
 +
     if (!fGLTextFont->FaceSize(1))
--      Error("SetGLTextFont","Cannot set FTGL::FaceSize"),
+       Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
-+      Error("SetGLTextFont","Cannot set FTGL::FaceSize");
  }
-diff -ur root-5.34.32.orig/gui/gui/src/TGApplication.cxx root-5.34.32/gui/gui/src/TGApplication.cxx
---- root-5.34.32.orig/gui/gui/src/TGApplication.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/gui/gui/src/TGApplication.cxx	2015-06-30 00:15:36.363566535 +0200
-@@ -83,25 +83,12 @@
+diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
+@@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
     if (strcmp(appClassName, "proofserv")) {
 -      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR);
--#else
--                                          "$(ROOTSYS)/fonts");
--#endif
--
+-                                          TROOT::GetTTFFontDir());
 -      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
 -      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
 -      if (!ttfont)
@@ -1379,11 +1373,11 @@ diff -ur root-5.34.32.orig/gui/gui/src/TGApplication.cxx root-5.34.32/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-5.34.32.orig/gui/gui/src/TGSpeedo.cxx root-5.34.32/gui/gui/src/TGSpeedo.cxx
---- root-5.34.32.orig/gui/gui/src/TGSpeedo.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/gui/gui/src/TGSpeedo.cxx	2015-06-30 00:15:36.363566535 +0200
+diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
+--- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
 @@ -119,8 +119,7 @@
- 
+ {
     TString sc;
     Float_t step, mark[5];
 -   TString fp = gEnv->GetValue("Root.TTFontPath", "");
diff --git a/root-ftgl.patch b/root-ftgl.patch
deleted file mode 100644
index b4bf1e4..0000000
--- a/root-ftgl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur root-trunk.orig/configure root-trunk/configure
---- root-trunk.orig/configure	2010-12-04 00:23:49.000000000 +0100
-+++ root-trunk/configure	2010-12-04 19:40:46.810052008 +0100
-@@ -2502,13 +2502,13 @@
-          message "Checking for libftgl"
-          if pkg-config --exists ftgl ; then
-             result "ok"
--            message "Checking for ftgl version > 2.1.2"
-+            message "Checking for ftgl"
-             ftgl_version=`pkg-config --modversion ftgl | \
-             tr '.' ' ' | \
-             awk 'BEGIN { FS = " "; } \
-                { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-             # Use FTGL/ftgl.h when > 2.1.2
--            if test $ftgl_version -gt 2001002 ; then
-+            if test $ftgl_version -gt 0 ; then
-                result "ok"
-                ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
-                ftgllibs=`pkg-config --libs-only-l ftgl`
-diff -ur root-trunk.orig/graf3d/gl/src/TGLFontManager.cxx root-trunk/graf3d/gl/src/TGLFontManager.cxx
---- root-trunk.orig/graf3d/gl/src/TGLFontManager.cxx	2010-11-03 22:51:45.000000000 +0100
-+++ root-trunk/graf3d/gl/src/TGLFontManager.cxx	2010-12-04 19:36:46.716052000 +0100
-@@ -25,7 +25,13 @@
- // Direct inclussion of FTGL headers is deprecated in ftgl-2.1.3 while
- // ftgl-2.1.2 shipped with ROOT requires manual inclusion.
- #ifndef BUILTIN_FTGL
--# include <FTGL/ftgl.h>
-+# include <FTGL/FTFont.h>
-+# include <FTGL/FTGLExtrdFont.h>
-+# include <FTGL/FTGLOutlineFont.h>
-+# include <FTGL/FTGLPolygonFont.h>
-+# include <FTGL/FTGLTextureFont.h>
-+# include <FTGL/FTGLPixmapFont.h>
-+# include <FTGL/FTGLBitmapFont.h>
- #else
- # include "FTFont.h"
- # include "FTGLExtrdFont.h"
-diff -ur root-trunk.orig/graf3d/gl/src/TGLText.cxx root-trunk/graf3d/gl/src/TGLText.cxx
---- root-trunk.orig/graf3d/gl/src/TGLText.cxx	2010-11-03 22:51:45.000000000 +0100
-+++ root-trunk/graf3d/gl/src/TGLText.cxx	2010-12-04 19:36:46.716052000 +0100
-@@ -23,7 +23,13 @@
- // Direct inclussion of FTGL headers is deprecated in ftgl-2.1.3 while
- // ftgl-2.1.2 shipped with ROOT requires manual inclusion.
- #ifndef BUILTIN_FTGL
--# include <FTGL/ftgl.h>
-+# include <FTGL/FTFont.h>
-+# include <FTGL/FTGLExtrdFont.h>
-+# include <FTGL/FTGLOutlineFont.h>
-+# include <FTGL/FTGLPolygonFont.h>
-+# include <FTGL/FTGLTextureFont.h>
-+# include <FTGL/FTGLPixmapFont.h>
-+# include <FTGL/FTGLBitmapFont.h>
- #else
- # include "FTFont.h"
- # include "FTGLExtrdFont.h"
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
new file mode 100644
index 0000000..c0f9e07
--- /dev/null
+++ b/root-gl2ps.patch
@@ -0,0 +1,254 @@
+diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
+--- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
+@@ -0,0 +1,21 @@
++# - Locate gl2ps library
++# Defines:
++#
++#  GL2PS_FOUND
++#  GL2PS_INCLUDE_DIR
++#  GL2PS_INCLUDE_DIRS (not cached)
++#  GL2PS_LIBRARIES
++
++find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
++find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
++
++set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
++set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
++
++mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
+@@ -70,6 +70,7 @@
+ ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
+ ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
+ ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
++ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
+@@ -153,6 +153,11 @@
+ set(opengllib ${OPENGL_gl_LIBRARY})
+ set(openglincdir ${OPENGL_INCLUDE_DIR})
+ 
++set(builtingl2ps ${value${builtin_gl2ps}})
++set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
++set(gl2pslib ${GL2PS_LIBRARY})
++set(gl2psincdir ${GL2PS_INCLUDE_DIR})
++
+ set(buildldap ${value${ldap}})
+ set(ldaplibdir ${LDAP_LIBRARY_DIR})
+ set(ldaplib ${LDAP_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
+@@ -334,6 +334,16 @@
+   endif()
+ endif()
+ 
++#---Check for gl2ps ------------------------------------------------------------------
++if(NOT builtin_gl2ps)
++  message(STATUS "Looking for gl2ps")
++  find_Package(gl2ps)
++  if(NOT GL2PS_FOUND)
++    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
++    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Graphviz installation-------------------------------------------------------
+ if(gviz)
+   message(STATUS "Looking for Graphviz")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
+@@ -142,6 +142,11 @@
+ OPENGLLIB      := @opengllib@
+ OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
+ 
++BUILTINGL2PS   := @builtingl2ps@
++GL2PSLIBDIR    := @gl2pslibdir@
++GL2PSCLILIB    := @gl2pslib@
++GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
++
+ BUILDLDAP      := @buildldap@
+ LDAPLIBDIR     := @ldaplibdir@
+ LDAPCLILIB     := @ldaplib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
++++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
+@@ -53,6 +53,7 @@
+    enable_builtin_afterimage \
+    enable_builtin_ftgl       \
+    enable_builtin_freetype   \
++   enable_builtin_gl2ps      \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
+    enable_builtin_unuran     \
+@@ -182,6 +183,7 @@
+ enable_winrtdebug=
+ enable_builtin_freetype=no
+ enable_builtin_ftgl=no
++enable_builtin_gl2ps=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
+ enable_builtin_unuran=no
+@@ -1704,6 +1706,7 @@
+   builtin-afterimage Build included libAfterImage, or use system libAfterImage
+   builtin-ftgl       Build included libFTGL, or use system libftgl
+   builtin-freetype   Build included libfreetype, or use system libfreetype
++  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
+   builtin-unuran     Build included libunuran, or use system libunuran
+@@ -2047,6 +2050,7 @@
+    logmsg "Will use by default builtin versions of libraries on Win32"
+    enable_builtin_freetype="yes"
+    enable_builtin_ftgl="yes"
++   enable_builtin_gl2ps="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
+    enable_builtin_unuran="yes"
+@@ -3180,6 +3184,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libgl2ps (builtin or system)
++#
++if test "x$enable_builtin_gl2ps" = "xno" ; then
++    check_header "gl2ps.h" "" \
++        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_gl2ps=yes
++    else
++        gl2psinc=$found_hdr
++        gl2psincdir=$found_dir
++    fi
++
++    check_library "libgl2ps" "$enable_shared" "" \
++        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        gl2pslib=""
++        gl2pslibdir=""
++        enable_builtin_gl2ps="yes"
++    else
++        gl2pslib="$found_lib"
++        gl2pslibdir="$found_dir"
++    fi
++
++    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
++        enable_builtin_gl2ps="yes"
++    fi
++fi
++message "Checking whether to build included gl2ps"
++result "$enable_builtin_gl2ps"
++
++######################################################################
++#
+ ### echo %%% libpcre (builtin or system) - Mandatory lib
+ #
+ # Mandatory test, must succeed (see http://www.pcre.org/)
+@@ -7593,6 +7629,10 @@
+     -e "s|@ftglincdir@|$ftglincdir|"            \
+     -e "s|@ftgllibdir@|$ftgllibdir|"            \
+     -e "s|@ftgllibs@|$ftgllibs|"                \
++    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
++    -e "s|@gl2psincdir@|$gl2psincdir|"          \
++    -e "s|@gl2pslib@|$gl2pslib|"                \
++    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
+     -e "s|@glewincdir@|$glewincdir|"            \
+     -e "s|@glewlibdir@|$glewlibdir|"            \
+     -e "s|@glewlibs@|$glewlibs|"                \
+diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
+@@ -7,12 +7,20 @@
+ ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
+ list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
+                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
++set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
+ ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
+ 
+ if(WIN32 OR cocoa)
+   list(REMOVE_ITEM headers TX11GL.h)
+   list(REMOVE_ITEM sources TX11GL.cxx)
+-  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
++  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
++endif()
++
++if(builtin_gl2ps)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++else()
++  list(REMOVE_ITEM sources gl2ps.cxx)
++  include_directories(${GL2PS_INCLUDE_DIRS})
+ endif()
+ 
+ if(WIN32)
+@@ -32,6 +40,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
+@@ -19,6 +19,7 @@
+ GLDH         := $(GLDS:.cxx=.h)
+ 
+ GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
++GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
+ GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
+ 
+ # Excluded from win32 builds
+@@ -42,6 +43,13 @@
+ # Used by rootcint
+ GLH2         := $(filter-out $(GLH1), $(GLH))
+ 
++ifeq ($(BUILTINGL2PS),yes)
++GL2PSFLAGS   := -I$(MODDIRI)
++else()
++GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
++GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
++endif()
++
+ ifneq ($(OPENGLLIB),)
+ GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
+                 $(XLIBS) -lm
+@@ -78,6 +86,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
+ 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
++		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
+ 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ 
+ $(call pcmrule,GL)
+@@ -107,12 +116,12 @@
+ ##### extra rules ######
+ ifeq ($(ARCH),win32)
+ $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ else
+-$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
+-$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
++$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
++$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
+ endif
+ 
+ $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-hdfs.patch b/root-hdfs.patch
deleted file mode 100644
index cf9d5f1..0000000
--- a/root-hdfs.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ur root-5.34.09.orig/io/hdfs/src/THDFSFile.cxx root-5.34.09/io/hdfs/src/THDFSFile.cxx
---- root-5.34.09.orig/io/hdfs/src/THDFSFile.cxx	2013-06-26 17:05:06.000000000 +0200
-+++ root-5.34.09/io/hdfs/src/THDFSFile.cxx	2013-08-31 03:00:10.323742733 +0200
-@@ -40,6 +40,7 @@
- 
- #include "syslog.h"
- #include "assert.h"
-+#include "stdlib.h"
- 
- #include "THDFSFile.h"
- #include "TError.h"
-@@ -93,8 +94,7 @@
-    if (has_authn) {
-       UserGroup_t *ugi = gSystem->GetUserInfo(0);
-       const char *user = (ugi->fUser).Data();
--      const char * groups[1] = {(ugi->fGroup.Data())};
--      fFS = hdfsConnectAsUser("default", 0, user, groups, 1);
-+      fFS = hdfsConnectAsUser("default", 0, user);
-       delete ugi;
-    } else {
-       fFS = hdfsConnect("default", 0);
-@@ -167,7 +167,7 @@
-    // See documentation for TFile::SysRead().
- 
-    TRACE("READ")
--   tSize num_read = hdfsPread(fFS, (hdfsFile)fHdfsFH, fSysOffset, buf, len);
-+   tSize num_read = hdfsPread((hdfsFS)fFS, (hdfsFile)fHdfsFH, fSysOffset, buf, len);
-    fSysOffset += len;
-    if (num_read < 0) {
-       gSystem->SetErrorStr(strerror(errno));
-@@ -192,7 +192,7 @@
-          return -1;
-       }
-       if (fSize == -1) {
--         hdfsFileInfo *info = hdfsGetPathInfo(fFS, fPath);
-+         hdfsFileInfo *info = hdfsGetPathInfo((hdfsFS)fFS, fPath);
-          if (info != 0) {
-             fSize = info->mSize;
-             free(info);
-@@ -224,7 +224,7 @@
-       SysError("THDFSFile", "Unable to allocate memory for path.");
-    }
-    strlcpy(fPath, file,path_size+1);
--   if ((fHdfsFH = hdfsOpenFile(fFS, fPath, flags, 0, 0, 0)) == 0) {
-+   if ((fHdfsFH = hdfsOpenFile((hdfsFS)fFS, fPath, flags, 0, 0, 0)) == 0) {
-       SysError("THDFSFile", "Unable to open file %s in HDFS", pathname);
-       return -1;
-    }
-@@ -236,7 +236,7 @@
- {
-    // Close the file in HDFS.
- 
--   int result = hdfsCloseFile(fFS, (hdfsFile)fHdfsFH);
-+   int result = hdfsCloseFile((hdfsFS)fFS, (hdfsFile)fHdfsFH);
-    fFS = 0;
-    fHdfsFH = 0;
-    return result;
-@@ -258,7 +258,7 @@
- 
-    *id = ::Hash(fPath);
- 
--   hdfsFileInfo *info = hdfsGetPathInfo(fFS, fPath);
-+   hdfsFileInfo *info = hdfsGetPathInfo((hdfsFS)fFS, fPath);
-    if (info != 0) {
-       fSize = info->mSize;
-       *size = fSize;
-@@ -306,8 +306,7 @@
-    if (has_authn) {
-       UserGroup_t *ugi = gSystem->GetUserInfo(0);
-       const char *user = (ugi->fUser).Data();
--      const char * groups[1] = {(ugi->fGroup.Data())};
--      fFH = hdfsConnectAsUser("default", 0, user, groups, 1);
-+      fFH = hdfsConnectAsUser("default", 0, user);
-       delete ugi;
-    } else {
-       fFH = hdfsConnect("default", 0);
-@@ -339,7 +338,7 @@
-    }
- 
-    if (R__HDFS_ALLOW_CHANGES == kTRUE) {
--      return hdfsCreateDirectory(fFH, path);
-+      return hdfsCreateDirectory((hdfsFS)fFH, path);
-    } else {
-       return -1;
-    }
-@@ -366,14 +365,14 @@
- */
- 
-    hdfsFileInfo * dir = 0;
--   if ((dir = hdfsGetPathInfo(fFH, path)) == 0) {
-+   if ((dir = hdfsGetPathInfo((hdfsFS)fFH, path)) == 0) {
-       return 0;
-    }
-    if (dir->mKind != kObjectKindDirectory) {
-       return 0;
-    }
- 
--   fDirp = (void *)hdfsListDirectory(fFH, path, &fDirEntries);
-+   fDirp = (void *)hdfsListDirectory((hdfsFS)fFH, path, &fDirEntries);
-    fDirCtr = 0;
- 
-    fUrlp = new TUrl[fDirEntries];
-@@ -449,7 +448,7 @@
-       Error("GetPathInfo", "No filesystem handle (should never happen)");
-       return 1;
-    }
--   hdfsFileInfo *fileInfo = hdfsGetPathInfo(fFH, path);
-+   hdfsFileInfo *fileInfo = hdfsGetPathInfo((hdfsFS)fFH, path);
- 
-    if (fileInfo == 0)
-       return 1;
-@@ -481,7 +480,7 @@
-       return kTRUE;
-    }
- 
--   if (hdfsExists(fFH, path) == 0)
-+   if (hdfsExists((hdfsFS)fFH, path) == 0)
-       return kFALSE;
-    else
-       return kTRUE;
-@@ -499,7 +498,7 @@
-    }
- 
-    if (R__HDFS_ALLOW_CHANGES == kTRUE) {
--      return hdfsDelete(fFH, path);
-+      return hdfsDelete((hdfsFS)fFH, path, 1);
-    } else {
-       return -1;
-    }
diff --git a/root-html-markup.patch b/root-html-markup.patch
new file mode 100644
index 0000000..d6b9d1e
--- /dev/null
+++ b/root-html-markup.patch
@@ -0,0 +1,1031 @@
+diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
+@@ -42,7 +42,6 @@
+ //
+ // This enum type describes the ways in which TGTextEntry can display
+ // its contents. The currently defined values are:
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kNormal - display characters as they are entered. This is the default.
+@@ -50,14 +49,12 @@
+ <li>  kPassword - display asterisks instead of the characters actually entered.
+ </ul>
+ */
+-//End_Html
+ // See also SetEchoMode(), GetEchoMode().
+ //
+ // enum TGTextEntry::EInsertMode
+ //
+ // This enum type describes the way how typed characters are
+ // inserted in the text entry. This mode is switched by "Insert" key.
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kInsert - typed character are inserted (cursor has shape of short line).
+@@ -65,13 +62,11 @@
+                  (cursor has the shape of filled rectangle).
+ </ul>
+ */
+-//End_Html
+ //
+ // enum TGWidget::ETextJustification
+ //
+ // This enum type (defined in TGWidget.h) describes the text alignment modes.
+ // These modes are valid untill text fits the frame width
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kTextLeft    - left-side text alignment
+@@ -79,12 +74,10 @@
+ <li>  kTextCenterX - center text alignment
+ </ul>
+ */
+-//End_Html
+ //
+ //
+ // The key press event handler converts a key press to some line editor action.
+ // Here are the default key bindings:
+-//Begin_Html
+ /*
+ <ul>
+ <li><i> Left Arrow </i>
+@@ -153,7 +146,6 @@
+ </ul>
+ All other keys with valid ASCII codes insert themselves into the line.
+ */
+-//End_Html
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+@@ -658,13 +650,11 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The echo modes available are:
+-///Begin_Html
+ /// <ul>
+ /// <li> kNormal   - display characters as they are entered.  This is the default.
+ /// <li> kNoEcho   - do not display anything.
+ /// <li> kPassword - display asterisks instead of the characters actually entered.
+ /// </ul>
+-///End_Html
+ /// It is always possible to cut and paste any marked text;  only the widget's own
+ /// display is affected.
+ /// See also GetEchoMode(), GetDisplayText().
+@@ -1154,7 +1144,6 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The key press event handler converts a key press to some line editor
+ /// action. Here are the default key bindings:
+-///Begin_Html
+ ///  <ul>
+ ///  <li><i> Left Arrow </i>
+ ///          Move the cursor one character leftwards.
+@@ -1220,7 +1209,6 @@
+ ///  <li><i> Control-Y </i>
+ ///          Paste the clipboard text into line edit.
+ ///  </ul>
+-///End_Html
+ ///  All other keys with valid ASCII codes insert themselves into the line.
+ 
+ Bool_t TGTextEntry::HandleKey(Event_t* event)
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
+@@ -938,17 +938,10 @@
+ ///  NOTE: To access the generated histograms in the current directory, do eg:
+ ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
+ ///
+-/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
+-/// with the following output:
+-///Begin_Html
++/// A complete example of this function is given in tutorial fitslicesy.C.
+ 
+ void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
+ {
+-   /*
+-   <img src="gif/fitslicesy.gif">
+-   */
+-   //End_Html
+-
+    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
+ 
+ }
+diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
+--- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
+@@ -603,7 +603,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -682,7 +682,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -986,7 +986,7 @@
+ ///     None so far
+ ///
+ /// For detailed description of what this entails, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::FindParameterization(Option_t *)
+ {
+@@ -1005,7 +1005,7 @@
+ ///     M     use Minuit to improve coefficients
+ ///
+ /// Also, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::Fit(Option_t *option)
+ {
+@@ -1097,7 +1097,7 @@
+ /// PRIVATE METHOD:
+ /// Create list of candidate functions for the parameterisation. See
+ /// also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeCandidates()
+ {
+@@ -1354,7 +1354,7 @@
+ /// PRIVATE METHOD:
+ /// Invert the model matrix B, and compute final coefficients. For a
+ /// more thorough discussion of what this means, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ ///
+ /// First we invert the lower triangle matrix fOrthCurvatureMatrix
+ /// and store the inverted matrix in the upper triangle.
+@@ -1496,7 +1496,7 @@
+ /// Make Gram-Schmidt orthogonalisation. The class description gives
+ /// a thorough account of this algorithm, as well as
+ /// references. Please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
+ {
+@@ -1589,7 +1589,7 @@
+ ///     R4        Residuals computed on test sample
+ ///
+ /// For a description of these quantities, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeHistograms(Option_t *option)
+ {
+@@ -1800,7 +1800,7 @@
+ /// PRIVATE METHOD:
+ /// Find the parameterization over the training sample. A full account
+ /// of the algorithm is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeParameterization()
+ {
+@@ -2365,7 +2365,7 @@
+ /// be fitted, and the new candidate function to be included in the
+ /// fit.  By default it is 0, which automatically chooses another
+ /// selection criteria. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxAngle(Double_t ang)
+ {
+@@ -2381,7 +2381,7 @@
+ /// Set the min angle (in degrees) between a new candidate function
+ /// and the subspace spanned by the previously accepted
+ /// functions. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinAngle(Double_t ang)
+ {
+@@ -2401,7 +2401,7 @@
+ /// Where N is the dimension of the data sample, L is the number of
+ /// terms (given in terms) and the first number, labels the term, the
+ /// second the variable.  More information is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
+ {
+@@ -2421,7 +2421,7 @@
+ /// Set the user parameter for the function selection. The bigger the
+ /// limit, the more functions are used. The meaning of this variable
+ /// is defined in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowerLimit(Double_t limit)
+ {
+@@ -2431,7 +2431,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Set the maximum power to be considered in the fit for each
+ /// variable. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxPowers(const Int_t* powers)
+ {
+@@ -2446,7 +2446,7 @@
+ /// Set the acceptable relative error for when sum of square
+ /// residuals is considered minimized. For a full account, refer to
+ /// the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinRelativeError(Double_t error)
+ {
+@@ -2458,7 +2458,7 @@
+ /// PRIVATE METHOD:
+ /// Test whether the currently considered function contributes to the
+ /// fit. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
+                                   Double_t dResidur)
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
+@@ -71,8 +71,6 @@
+ //
+ //</div>
+ //
+-//<!-- */
+-// --> End_Html
+ 
+ //______________________________________________________________________________
+ /** \class TSpectrum2
+@@ -372,7 +370,6 @@
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Background(Double_t **spectrum,
+                        Int_t ssizex, Int_t ssizey,
+@@ -381,7 +378,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
+@@ -523,10 +520,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
+@@ -835,8 +830,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, x, y, sampling, r1, r2;
+    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
+@@ -1022,11 +1016,10 @@
+ ///   averWindow-width of averaging smoothing window
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
+@@ -1134,10 +1127,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
+@@ -1239,8 +1230,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t xmin, xmax, ymin, ymax, i, j, l;
+    Double_t a, b, maxch;
+    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
+@@ -1439,7 +1429,6 @@
+ ///   boost, boosting factor, for details we refer to manual
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
+                                        Int_t ssizex, Int_t ssizey,
+@@ -1447,7 +1436,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
+@@ -1602,10 +1591,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
+@@ -1982,8 +1969,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
+        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2177,8 +2163,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
+@@ -2311,10 +2296,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
+@@ -2856,8 +2839,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k, lindex, priz;
+    Double_t lda, ldb, ldc, area, maximum;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
+@@ -162,11 +162,10 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
+@@ -178,8 +177,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    if (numberPeaks <= 0){
+       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
+       return;
+@@ -1793,11 +1791,10 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrum2Fit::FitAwmi(Double_t **source)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
+@@ -2686,8 +2683,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, pw,
+@@ -4697,8 +4693,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+ //
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
+@@ -4928,8 +4923,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
+@@ -1748,8 +1748,7 @@
+ /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -2018,8 +2017,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j;
+    Int_t size;
+    Double_t *working_vector = 0, **working_matrix = 0;
+@@ -2324,8 +2322,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -2481,8 +2478,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+@@ -2768,8 +2764,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2908,8 +2903,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
+@@ -273,7 +273,6 @@
+ ///                                                                           //
+ ///                                                                           //
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Background(Double_t***spectrum,
+                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -283,7 +282,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
+@@ -674,8 +673,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, x, y, z, sampling, q1, q2, q3;
+    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
+    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
+@@ -1069,11 +1067,10 @@
+ /// averWindow-width of averaging smoothing window                          //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section2>
+ 
+@@ -1302,8 +1299,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
+    Double_t a,b,maxch;
+@@ -1868,7 +1864,6 @@
+ /// boost, boosting factor, for details we refer to manual                  //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
+                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -1876,7 +1871,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section3>
+ 
+@@ -2357,8 +2352,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2590,8 +2584,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ 
+ <div class=Section4>
+ 
+@@ -2901,8 +2894,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k,lindex;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
+@@ -113,7 +113,6 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
+ {
+@@ -162,7 +161,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    if (numberPeaks <= 0){
+       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
+@@ -847,7 +845,6 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitAwmi(Double_t *source)
+ {
+@@ -1343,7 +1340,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
+@@ -2312,7 +2308,6 @@
+ ///        source-pointer to the vector of source spectrum
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitStiefel(Double_t *source)
+ {
+@@ -2546,7 +2541,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
+@@ -739,11 +739,10 @@
+ ///             need 2*size length to store real and imaginary coefficients
+ ///
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -989,8 +988,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t a, b, pi = 3.14159265358979323846;
+@@ -1482,11 +1480,10 @@
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -1618,8 +1615,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+@@ -2091,11 +2087,10 @@
+ ///           need 2*size length to store real and imaginary coefficients
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2226,8 +2221,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
+--- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
+@@ -1162,7 +1162,6 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Paints histogram according to preset parameters.
+-///Begin_Html <!--
+ 
+ void TSpectrum2Painter::Paint(Option_t * /*option*/)
+ {
+@@ -1524,7 +1523,6 @@
+ }
+ </pre>
+ <!-- */
+-// --> End_Html
+ 
+    Int_t turni,turnj,w1,w2,x,y;
+    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
+@@ -7654,14 +7652,12 @@
+ ///                               * * *
+ ///
+ /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
+-///Begin_Html
+ 
+ void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
+ {
+    /*
+    <img src="gif/spectrumpainter.gif">
+    */
+-   //End_Html
+ 
+    TString opt = option;
+ 
+diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
+--- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
+@@ -25,20 +25,15 @@
+ // Monte Carlo event generator (integrator) FOAM.
+ // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
+ // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_MapCamel1000.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_MapCamel1000.gif">
++//
+ // FOAM is now fully integrated with the ROOT package.
+ // The important bonus of the ROOT use is persistency of the FOAM objects!
+ //
+ // For more sophisticated problems full version of FOAM may be more appropriate:
+-//BEGIN_HTML <!--
+-/* -->
+-  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
+-<!--*/
+-// -->END_HTML
++// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
++//
+ // Simple example of the use of FOAM:
+ // ==================================
+ // Int_t kanwa(){
+@@ -81,11 +76,9 @@
+ //   return 0.5*Dist;
+ // }// Camel2
+ // Two-dim. histogram of the MC points generated with the above program looks as follows:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_cKanwa.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_cKanwa.gif">
++//
+ // Canonical nine steering parameters of FOAM
+ // ===========================================
+ //------------------------------------------------------------------------------
+@@ -266,10 +259,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Default destructor
+-///  std::cout<<" DESTRUCTOR entered "<<std::endl;
+ 
+ TFoam::~TFoam()
+ {
++   //std::cout<<" DESTRUCTOR entered "<<std::endl;
+    Int_t i;
+ 
+    if(fCells!= 0) {
+@@ -321,42 +314,35 @@
+ /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
+ /// and reseting (optionally) its internal parameters/switches.
+ /// The overall operational scheme of the FOAM is the following:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_schema2.gif">
++///
++/// This method invokes several other methods:
++/// ==========================================
++/// InitCells initializes memory storage for cells and begins exploration process
++/// from the root cell. The empty cells are allocated/filled using  CellFill.
++/// The procedure Grow which loops over cells, picks up the cell with the biggest
++/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
++/// with the help of PeekMax procedure. The chosen cell is split using Divide.
++/// Subsequently, the procedure Explore called by the Divide
++/// (and by InitCells for the root cell) does the most important
++/// job in the FOAM object build-up: it performs a small MC run for each
++/// newly allocated daughter cell.
++/// Explore calculates how profitable the future split of the cell will be
++/// and defines the optimal cell division geometry with the help of Carver or Varedu
++/// procedures, for maximum weight or variance optimization respectively.
++/// All essential results of the exploration are written into
++/// the explored cell object. At the very end of the foam build-up,
++/// Finally, MakeActiveList is invoked to create a list of pointers to
++/// all active cells, for the purpose of the quick access during the MC generation.
++/// The procedure Explore employs MakeAlpha to generate random coordinates
++/// inside a given cell with the uniform distribution.
++/// The above sequence of the procedure calls is depicted in the following figure:
++///
++//  <img src="gif/foam_Initialize_schema.gif">
+ 
+ void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
+ {
+-/* -->
+-<img src="gif/foam_schema2.gif">
+-<!--*/
+-// -->END_HTML
+-//
+-// This method invokes several other methods:
+-// ==========================================
+-// InitCells initializes memory storage for cells and begins exploration process
+-// from the root cell. The empty cells are allocated/filled using  CellFill.
+-// The procedure Grow which loops over cells, picks up the cell with the biggest
+-// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
+-// with the help of PeekMax procedure. The chosen cell is split using Divide.
+-// Subsequently, the procedure Explore called by the Divide
+-// (and by InitCells for the root cell) does the most important
+-// job in the FOAM object build-up: it performs a small MC run for each
+-// newly allocated daughter cell.
+-// Explore calculates how profitable the future split of the cell will be
+-// and defines the optimal cell division geometry with the help of Carver or Varedu
+-// procedures, for maximum weight or variance optimization respectively.
+-// All essential results of the exploration are written into
+-// the explored cell object. At the very end of the foam build-up,
+-// Finally, MakeActiveList is invoked to create a list of pointers to
+-// all active cells, for the purpose of the quick access during the MC generation.
+-// The procedure Explore employs MakeAlpha to generate random coordinates
+-// inside a given cell with the uniform distribution.
+-// The above sequence of the procedure calls is depicted in the following figure:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_Initialize_schema.gif">
+-<!--*/
+-// -->END_HTML
+-
+    SetPseRan(PseRan);
+    SetRho(fun);
+    Initialize();
+@@ -1363,15 +1349,11 @@
+ /// It defines which variables are excluded in the process of the cell division.
+ /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
+ /// The resulting map of cells in 2-dim. case will look as follows:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map2.gif">
+ 
+ void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
+ {
+-/* -->
+-<img src="gif/foam_Map2.gif">
+-<!--*/
+-// -->END_HTML
+-
+    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
+    if(fInhiDiv == 0) {
+       fInhiDiv = new Int_t[ fDim ];
+@@ -1391,15 +1373,11 @@
+ ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
+ ///     FoamX->SetXdivPRD(0,3,xDiv);
+ /// results in the following 2-dim. pattern of the cells:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map3.gif">
+ 
+ void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
+ {
+-/* -->
+-<img src="gif/foam_Map3.gif">
+-<!--*/
+-// -->END_HTML
+-
+    Int_t i;
+ 
+    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
+diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
+@@ -238,19 +238,14 @@
+ /// PDG convention already)
+ /// Source: BaBar User Guide, Neil I. Geddes,
+ ///
+-///Begin_Html
++/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
++/// with some fixes by PB, marked with (PB) below. Checked against
++/// PDG listings from 2000.
++///
++/// Paul Balm, Nov 19, 2001
+ 
+ Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
+ {
+-  /*
+-   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
+-  */
+-  //End_Html
+-  // with some fixes by PB, marked with (PB) below. Checked against
+-  // PDG listings from 2000.
+-  //
+-  // Paul Balm, Nov 19, 2001
+-
+    switch(Geant3number) {
+ 
+       case 1   : return 22;       // photon
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
+@@ -50,7 +50,7 @@
+ 
+ The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
+ 
+-The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
++The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
+ 
+ */
+ 
+diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
+--- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
+@@ -3,13 +3,11 @@
+ TCanvas *timeonaxis()
+ {
+ // This macro illustrates the use of the time mode on the axis
+-// with different time intervals and time formats. It's result can
+-// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
++// with different time intervals and time formats.
+ // Through all this script, the time is expressed in UTC. some
+ // information about this format (and others like GPS) may be found at
+-// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
+-//  or
+-// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
++// http://tycho.usno.navy.mil/systime.html or
++// http://www.topology.org/sci/time.html
+ //
+ // The start time is : almost NOW (the time at which the script is executed)
+ // actualy, the nearest preceding hour beginning.
diff --git a/root-html.C b/root-html.C
deleted file mode 100644
index 06dbcf5..0000000
--- a/root-html.C
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  gSystem->AddIncludePath("-I@PWD@/include");
-  gSystem->AddIncludePath("-I@PWD@/cint/cint/include");
-  gSystem->AddIncludePath("-I@PWD@/cint/cint/stl");
-  gSystem->AddIncludePath("-I@PWD@/cint/cint/lib");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/include");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/include");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/stl");
-  TInterpreter::Instance()->AddIncludePath("@PWD@/cint/cint/lib");
-  #include <RtypesCint.h>
-  #include <iostream>
-  #include <string>
-  #include <DllImport.h>
-  gROOT->GetPluginManager()->LoadHandlersFromPluginDirs("");
-  gROOT->GetPluginManager()->AddHandler("TVirtualPS","image",
-					"TImageDump","Postscript",
-					"TImageDump()");
-  gROOT->GetPluginManager()->AddHandler("TVirtualStreamerInfo",
-					"*","TStreamerInfo",
-					"RIO","TStreamerInfo()");
-  gROOT->GetPluginManager()->AddHandler("TVirtualGraphPainter", "*",
-					"TGraphPainter","GraphPainter",
-					"TGraphPainter()");
-  delete (TFile*) gROOT->ProcessLine(".x tutorials/hsimple.C");
-  gSystem->Exec("mv hsimple.root tutorials/hsimple.root");
-  THtml html;
-  html.SetEtcDir("@PWD@/etc/html");
-  html.SetSourceDir(".");
-  html.LoadAllLibs();
-  html.SetBatch(kTRUE);
-  html.MakeAll();
-}
diff --git a/root-includelist b/root-includelist
deleted file mode 100644
index 3faece8..0000000
--- a/root-includelist
+++ /dev/null
@@ -1,12 +0,0 @@
-include config/Makefile.config
-include $(MODULE)/Module.mk
-includelist:
-	@list=includelist-`tr / - <<< $(MODULE)` ; \
-	rm -f $$list ; \
-	for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \
-	    sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
-	done ; \
-	if [ -r $$list ] ; then \
-	    sort -u $$list > $$list.unique ; \
-	    mv $$list.unique $$list ; \
-	fi
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
new file mode 100644
index 0000000..1edd1d4
--- /dev/null
+++ b/root-latex-markup.patch
@@ -0,0 +1,877 @@
+diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
+@@ -185,14 +185,19 @@
+ ## <a name="L8"></a> Accents
+ Several kind of accents are available:
+ 
+-   #hat    = Begin_Latex #hat{a} End_Latex
+-   #check  = Begin_Latex #check{a} End_Latex
+-   #acute  = Begin_Latex #acute{a} End_Latex
+-   #grave  = Begin_Latex #grave{a} End_Latex
+-   #dot    = Begin_Latex #dot{a} End_Latex
+-   #ddot   = Begin_Latex #ddot{a} End_Latex
+-   #tilde  = Begin_Latex #tilde{a} End_Latex
+-
++Begin_Macro(source)
++{
++   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
++   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
++   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
++   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
++   Tl.DrawText(.1, .6, "#acure{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
++   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
++   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
++   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
++   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
++}
++End_Macro
+ 
+ The special sign: `#slash` draws a slash on top of the text between brackets:
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
+--- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
+@@ -949,9 +949,9 @@
+ /// Getting the error via TF1::DerivativeError:
+ ///   (total error = roundoff error + interpolation error)
+ /// the estimate of the roundoff error is taken as follows:
+-///Begin_Latex
+-///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-///End_Latex
++/// \f[
++///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++/// \f]
+ /// where k is the double precision, ai are coefficients used in
+ /// central difference formulas
+ /// interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
+--- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -360,27 +360,33 @@
+ ///
+ /// If the histograms are not filled with unit weights, the number of effective
+ /// entries is used to normalise the bin contents which might lead to wrong results.
+-/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
+-///
++/// \f[
++/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
++/// \f]
+ /// The points are assigned a x value at the center of each histogram bin.
+-/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
++/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
++/// for all options except for the
+ /// bayesian methods where the result depends on the chosen option.
+ ///
+-/// If the denominator becomes 0 or pass >  total, the corresponding bin is
++/// If the denominator becomes 0 or pass > total, the corresponding bin is
+ /// skipped.
+ ///
+ /// 2) calculating ratios of two Poisson means (option 'pois'):
+ /// --------------------------------------------------------------
+ ///
+ /// The two histograms are interpreted as independent Poisson processes and the ratio
+-/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
+-/// The histogram 'pass' is interpreted as n_{1} and the total histogram
+-/// is used for n_{2}
++/// \f[
++/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
++/// \f]
++/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
++/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
++/// is used for \f$n_{2}\f$.
+ ///
+ /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
+ /// of efficiency by a parameter transformation:
+-/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
+-///
++/// \f[
++/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
++/// \f]
+ /// The x errors span each histogram bin (lowedge ... lowedge+width)
+ /// The y errors depend on the chosen statistic methode which can be determined
+ /// by the options given below. For a detailed description of the used statistic
+@@ -413,8 +419,7 @@
+ /// oscillation on the actual coverage probability a couple of approximations and
+ /// methodes has been developped. For a detailed discussion, please have a look at
+ /// this statistical paper:
+-/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
+-/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
++/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
+ 
+ void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
+ {
+diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
+--- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -764,8 +764,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Get square of the error of bin addressed by linidx as
+-/// BEGIN_LATEX #sum weight^{2}
+-/// END_LATEX
++/// \f$\sum weight^{2}\f$
+ /// If errors are not enabled (via Sumw2() or CalculateErrors())
+ /// return contents.
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -92,31 +92,28 @@
+     Method:
+        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
+        and 16-point Gaussian quadrature approximations to
+-   Begin_Latex
+-      I = #int^{b}_{a} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{b}_{a} f(x)dx
++   \f]
+       and define
+-   Begin_Latex
+-      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
+-   End_Latex
++   \f[
++      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
++   \f]
+       Then,
+-   Begin_Latex
+-      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
+-   End_Latex
+-      where, starting with x0 = A and finishing with xk = B,
+-      the subdivision points xi(i=1,2,...) are given by
+-   Begin_Latex
+-      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
+-   End_Latex
+-   Begin_Latex
+-      #lambda
+-   End_Latex
+-      is equal to the first member of the
+-      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
++   \f[
++      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
++   \f]
++      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
++      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
++   \f[
++      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
++   \f]
++      \f$\lambda\f$ is equal to the first member of the
++      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
+       If, at any stage in the process of subdivision, the ratio
+-  Begin_Latex
+-      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
+-  End_Latex
++  \f[
++      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
++  \f]
+       is so small that 1+0.005q is indistinguishable from 1 to
+       machine accuracy, an error exit occurs with the function value
+       set equal to zero.
+@@ -131,13 +128,13 @@
+       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
+       precisely, if k is the number of sub-intervals contributing to the
+       approximation (see Method), and if
+-      Begin_Latex
+-      I_{abs} = #int^{B}_{A} #||{f(x)}dx
+-      End_Latex
++   \f[
++      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
++   \f]
+       then the relation
+-   Begin_Latex
+-    #frac{#||{G-I}}{I_{abs}+k} < EPS
+-   End_Latex
++   \f[
++      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
++   \f]
+       will nearly always be true, provided the routine terminates without
+       printing an error message. For functions f having no singularities in
+       the closed interval [A,B] the accuracy will usually be much higher than
+@@ -156,9 +153,9 @@
+ 
+    /** Returns Integral of function on an infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{-#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{-\infty} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -169,9 +166,9 @@
+ 
+    /** Returns Integral of function on an upper semi-infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{A} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{A} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -183,9 +180,9 @@
+ 
+    /** Returns Integral of function on a lower semi-infinite interval.
+        This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{B}_{#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{B}_{-\infty} f(x)dx
++   \f]
+       Usage:
+          In any arithmetic expression, this function has the approximate value
+          of the integral I.
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -88,10 +88,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-      D(h) = #frac{f(x+h) - f(x-h)}{2h}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++      D(h) = \frac{f(x+h) - f(x-h)}{2h}
++     \f]
++      the final estimate
++     \f[
++      D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -103,9 +106,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -141,10 +144,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -156,9 +162,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -177,10 +183,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -192,9 +201,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
+--- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
+@@ -34,35 +34,33 @@
+ double kEulerGamma = 0.577215664901532860606512090082402431042;
+ 
+ 
+-/* Begin_Html
+-<center><h2>KelvinFunctions</h2></center>
++/**
++\class KelvinFunctions
+ 
+-<p>
+ This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
+ Kei(x), and their first derivatives.
+-</p>
+-
+-End_Html */
++*/
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
++/// \f]
+ /// For x > fgMin, Ber(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -102,24 +100,25 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
++/// \f]
+ /// For x > fgMin, Bei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -161,29 +160,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Ker(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -227,29 +227,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Kei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -298,10 +299,10 @@
+ /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ber(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -343,10 +344,10 @@
+ /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
+ /// the polynomial approximation of Bei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -388,10 +389,10 @@
+ /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ker(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -436,10 +437,10 @@
+ /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
+ /// the polynomial approximation of Kei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -481,9 +482,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
+-/// Begin_Latex
+-/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F1(double x)
+ {
+@@ -510,9 +511,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
+-/// Begin_Latex
+-/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F2(double x)
+ {
+@@ -541,9 +542,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
+-/// Begin_Latex
+-/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G1(double x)
+ {
+@@ -568,9 +569,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
+-/// Begin_Latex
+-/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G2(double x)
+ {
+@@ -597,9 +598,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+ /// DBei(x). M(x) is given by
+-/// Begin_Latex
+-/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// \f[
++/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::M(double x)
+ {
+@@ -612,10 +613,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+-/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DBei(x). \f$\theta(x)\f$ is given by
++/// \f[
++/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Theta(double x)
+ {
+@@ -628,10 +629,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). (x) is given by
+-/// Begin_Latex
+-/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// DKei(x). N(x) is given by
++/// \f[
++/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::N(double x)
+ {
+@@ -644,10 +645,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DKei(x). \f$\phi(x)\f$ is given by
++/// \f[
++/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Phi(double x)
+ {
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
+@@ -85,7 +85,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+       
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+    private:
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
+@@ -37,11 +37,12 @@
+    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
+    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
+    and an alternate hypothesis (eg. signal+background).  
+-   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
+-   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
+-   not a probability.
+-   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
+-   Significance method.
++   The p-values can also be transformed into confidence levels
++   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
++   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
++   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
++   Finally, the p-value of the null can be transformed into a number of
++   equivalent Gaussian sigma using the Significance method.
+ 
+    The p-value of the null for a given test statistic is rigorously defined and
+    this is the starting point for the following conventions.
+@@ -52,17 +53,17 @@
+ observed value of the test statistic. This is the more standard
+ convention and avoids confusion when doing inverted tests.
+ 
+-For exclusion, we also want the formula
+-CLs = CLs+b / CLb to hold which therefore defines our conventions
+-for CLs+b and CLb. CLs was specifically invented for exclusion
++For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
++to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
++\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
+ and therefore all quantities need be related through the assignments
+-as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
++as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
+ is derived by considering the scenarios of a powerful and not powerful
+-inverted test, where for the not so powerful test, CLs must be
++inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
+ close to one.
+ 
+ For results of Hypothesis tests,
+-CLs has no similar direct interpretation as for exclusion and can
++\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
+ be larger than one.
+ 
+ */
+@@ -101,7 +102,7 @@
+       /// Convert  AlternatePValue into a "confidence level"
+       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
+ 
+-      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
++      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
+       virtual Double_t CLs() const {
+          double thisCLb = CLb();
+          if (thisCLb == 0) {
+@@ -144,7 +145,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+ 
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+       /// The error on the Null p-value
+diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -100,11 +100,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$1 - CL_{b}\f$ : the B p-value
+ double HybridResult::NullPValue() const
+ {
+-   // return 1-CL_b : the B p-value
+-
+    if (fComputationsNulDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -131,11 +129,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$CL_{s+b}\f$ : the S+B p-value
+ double HybridResult::AlternatePValue() const
+ {
+-   // return CL_s+b : the S+B p-value
+-
+    if (fComputationsAltDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -162,40 +158,37 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
++/// error on \f$CL_{b}\f$:
++/// \f[
++/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLbError() const
+ {
+-  // Returns an estimate of the error on CLb assuming a binomial error on
+-  // CLb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_b.size();
+   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
++/// error on \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLsplusbError() const
+ {
+-  // Returns an estimate of the error on CLsplusb assuming a binomial
+-  // error on CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_sb.size();
+   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
++/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ Double_t HybridResult::CLsError() const
+ {
+-  // Returns an estimate of the error on CLs through combination of the
+-  // errors on CLb and CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-  // END_LATEX
+   unsigned const int n_b = fTestStat_b.size();
+   unsigned const int n_sb = fTestStat_sb.size();
+   
+diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -229,8 +229,8 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// compute CLb error
+-/// Clb =  1 - NullPValue() 
++/// compute \f$CL_{b}\f$ error
++/// \f$CL_{b}\f$ = 1 - NullPValue()
+ /// must use opposite condition that routine above
+ 
+ Double_t HypoTestResult::CLbError() const {
+@@ -251,12 +251,12 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Returns an estimate of the error on CLs through combination of the
+-/// errors on CLb and CLsplusb:
+-/// BEGIN_LATEX
+-/// #sigma_{CL_s} = CL_s
+-/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-/// END_LATEX
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
++/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s
++/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ 
+ Double_t HypoTestResult::CLsError() const {
+    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
new file mode 100644
index 0000000..2af5c42
--- /dev/null
+++ b/root-libgfortranbegin.patch
@@ -0,0 +1,182 @@
+diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
+--- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
+--- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
+--- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
+@@ -55,8 +55,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
+--- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
+--- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
+--- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
+@@ -53,8 +53,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
+--- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
+@@ -43,8 +43,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
+--- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
+--- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
+@@ -50,8 +50,10 @@
+ endif
+ F77FLAGS      = -m32 -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
+--- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -54,8 +54,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
+--- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -62,8 +62,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
+--- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
+--- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
new file mode 100644
index 0000000..4dfbc44
--- /dev/null
+++ b/root-links.patch
@@ -0,0 +1,376 @@
+diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
+--- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
+@@ -5,7 +5,7 @@
+ and their rotation algorithms. The classes were ported to root from
+ CLHEP see:
+ 
+-<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
++<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
+ 
+ ## The Physics Vector Classes
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
+--- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
+@@ -331,7 +331,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the maximum number of function calls for the minimization algorithm
+ /// For example for MIGRAD this is the maxcalls value passed as first argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetMaxIterations(Int_t niter)
+ {
+@@ -341,7 +341,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the Error Definition (default=1)
+ /// For Minuit this is the value passed with the "SET ERR" command
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
+ 
+ void TVirtualFitter::SetErrorDef(Double_t errdef)
+ {
+@@ -356,7 +356,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the tolerance used in the minimization algorithm
+ /// For example for MIGRAD this is tolerance value passed as second argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetPrecision(Double_t prec)
+ {
+diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
+--- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
++++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
+@@ -13,7 +13,7 @@
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
+--- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
++++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
+@@ -5,15 +5,15 @@
+ .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+ .\" other parms are allowed: see man(7), man(1)
+ .SH NAME
+-g2rootold \- convert GEANT geomtry files to ROOT files
++g2rootold \- convert GEANT geometry files to ROOT files
+ .SH SYNOPSIS
+-.B g2rootoldd
++.B g2rootold
+ .I [-f map_name] geant_name macro_name
+ .SH "DESCRIPTION"
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+@@ -103,9 +103,9 @@
+ .I JDIGI.
+ .SH "SEE ALSO"
+ .RS
+-.IR root (1),
+-.IR g2root (1),
+-.IR h2root(1),
++.IR root(1) ,
++.IR g2root(1) ,
++.IR h2root(1) ,
+ .RE
+ and
+ .RS
+diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
+--- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
+@@ -74,7 +74,7 @@
+ 
+     <ul>
+   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
+-  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
++  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
+   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
+ New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
+ </li>
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -301,7 +301,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DENLAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -381,7 +381,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DISLAN) is used.
+ 
+    @param x The argument \f$x\f$
+@@ -756,7 +756,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+@@ -783,7 +783,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -528,7 +528,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (RANLAN) is used.
+ 
+    @param z The argument \f$z\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
+@@ -193,7 +193,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+@@ -219,7 +219,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
+@@ -193,7 +193,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+@@ -408,7 +408,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
+@@ -81,7 +81,7 @@
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
+@@ -90,7 +90,7 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
+@@ -92,14 +92,14 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    - VavilovAccurate uses the algorithm by
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
+@@ -103,7 +103,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+@@ -239,7 +239,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
+--- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
+@@ -5,7 +5,7 @@
+ <li>The main TMinuit class is documented in class TMinuit.</li>
+ <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
+     </a></li>
+-<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
++<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
+     </a></li>
+ <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
+       </A></li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
+--- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
+@@ -13,7 +13,7 @@
+ <p>
+ <ol>
+ <li>
+-F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
++F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
+ <li>
+ F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
+ <li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
+@@ -32,7 +32,7 @@
+ 
+ <h2>References</h2>
+ <ol>
+-<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
++<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
+ <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
+   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
+ <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
+@@ -14,7 +14,7 @@
+ 
+ ## References
+ 
+-1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
++1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
+ 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
+ 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
+ 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
+@@ -163,7 +163,7 @@
+ <h3>Linear Algebra Functions</h3>
+ 
+ Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
+-In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
++In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
+ <pre>
+ <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
+ bool ret = m.<strong>Invert</strong>()
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
+@@ -132,7 +132,7 @@
+ 
+ ### Linear Algebra Functions
+ 
+-Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
++Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
+ 
+ <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
+ bool ret = m.**Invert**()  
+diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
+--- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
+@@ -47,8 +47,8 @@
+ //           V               v      v                     v      v                  //
+ //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
+ //       |        ^                                                                 //
+-//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
+-//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
++//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
++//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
+ // St_PolyLine3D  |                                                                 //
+ //                |                                                                 //
+ //           TPoints3DABC                                                           //
+diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
+--- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
+@@ -142,7 +142,7 @@
+ ///                            10 - this unvisible, but sons are visible
+ ///                            01 - this visible but sons
+ ///                            11 - neither this nor its sons are visible
+-/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
++/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
+ 
+ Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
+ {
+@@ -150,11 +150,12 @@
+    return mapVis[vis];
+ }
+ 
+-//______________________________________________________________________________
+-//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++////////////////////////////////////////////////////////////////////////////////
++/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
++
+ Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
+ {
+-// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
+    const Int_t mapVis[4] = {1, -2, 0, -1 };
+    Int_t i;
+ //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
new file mode 100644
index 0000000..39d7510
--- /dev/null
+++ b/root-llvm-static.patch
@@ -0,0 +1,11 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
+@@ -59,6 +59,7 @@
+   endif()
+ endif()
+ set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
++set(BUILD_SHARED_LIBS "NO")
+ #--- Do not build cling as part of llvm.
+ set(LLVM_NOCLING "YES")
+ 
diff --git a/root-macro-align.patch b/root-macro-align.patch
new file mode 100644
index 0000000..f8ef9eb
--- /dev/null
+++ b/root-macro-align.patch
@@ -0,0 +1,36 @@
+diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
+--- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
+@@ -329,7 +329,7 @@
+ parameters are shown in the plot below.
+ 
+ Begin_Macro(source)
+-   {
++{
+       //canvas only needed for the documentation
+       TCanvas* c1 = new TCanvas("c1","",600,400);
+       c1->SetFillStyle(1001);
+@@ -363,7 +363,7 @@
+ 
+       //only for this documentation
+       return c1;
+-   }
++}
+ End_Macro
+ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
+@@ -1809,9 +1809,9 @@
+ /// of comparison of the unweighted histogram with 217 events (minimal expected
+ /// frequency equal to one) and the weighted histogram with 500 events (minimal
+ /// expected frequency equal to 25)
+-///Begin_Macro
++/// Begin_Macro
+ /// ../../../tutorials/math/chi2test.C(17)
+-///End_Macro
++/// End_Macro
+ /// Fig 2. An example of comparison of the unweighted histogram with 217 events
+ /// and the weighted histogram with 500 events:
+ ///   a) unweighted histogram;
diff --git a/root-meta.patch b/root-meta.patch
deleted file mode 100644
index 02dc37d..0000000
--- a/root-meta.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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,25 +320,29 @@
-    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;
--  }
--  // We cannot autoload this but ROOT needs it (ROOT-7103)
--  ProcessLine("#include <iostream>");
-+      // 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;
-+      }
-+      // We cannot autoload this but ROOT needs it (ROOT-7103)
-+      ProcessLine("#include <iostream>");
-+   }
- }
- 
- //______________________________________________________________________________
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
new file mode 100644
index 0000000..cfc6a3b
--- /dev/null
+++ b/root-missing-cmake-config.patch
@@ -0,0 +1,187 @@
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
+@@ -252,6 +252,12 @@
+   endif()
+   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
+                          REGEX system.rootrc EXCLUDE
++                         REGEX system.rootauthrc EXCLUDE
++                         REGEX system.rootdaemonrc EXCLUDE
++                         REGEX rootd.rc.d EXCLUDE
++                         REGEX proofd.rc.d EXCLUDE
++                         REGEX rootd.xinetd EXCLUDE
++                         REGEX proofd.xinetd EXCLUDE
+                          REGEX root.mimes EXCLUDE)
+   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
+   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
+@@ -404,7 +404,13 @@
+ set(dicttype ${ROOT_DICTTYPE})
+ 
+ #---RConfigure-------------------------------------------------------------------------------------------------
+-set(setresuid undef)
++CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
++  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
++if(found_setresuid)
++  set(setresuid define)
++else()
++  set(setresuid undef)
++endif()
+ if(mathmore)
+   set(hasmathmore define)
+ else()
+@@ -523,7 +529,16 @@
+ execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
+ 
+ configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
++
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
++
+ configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
++
+ if(ruby)
+   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
+ endif()
+@@ -665,8 +680,21 @@
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
+               ${CMAKE_BINARY_DIR}/etc/system.rootrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
+               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
++              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
++                          GROUP_EXECUTE GROUP_READ
++                          WORLD_EXECUTE WORLD_READ
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
+ install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
+ 
+ if(NOT gnuinstall)
+diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
+@@ -9,4 +9,9 @@
+ ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+ ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
+-ROOT_INSTALL_HEADERS()
++
++if(AIX)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++endif()
++
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
+@@ -7,6 +7,7 @@
+   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
+   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
+   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
++  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
+ endif()
+ ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
+ ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
+diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
+--- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
+@@ -1,6 +1,7 @@
+ 
+ add_subdirectory(net)
+ add_subdirectory(auth)  # special CMakeListst.txt
++add_subdirectory(rootd)
+ 
+ if(bonjour)
+   add_subdirectory(bonjour)
+diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
+--- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
+@@ -0,0 +1,9 @@
++############################################################################
++# CMakeLists.txt file for building ROOT net/rootd package
++# @author Pere Mato, CERN
++############################################################################
++
++ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
++                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
+--- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
+@@ -3,4 +3,7 @@
+ # @author Pere Mato, CERN
+ ############################################################################
+ 
+-ROOT_INSTALL_HEADERS()
+\ No newline at end of file
++ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
++  RIO Net Thread MathCore)
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
+@@ -4,6 +4,7 @@
+ ############################################################################
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ add_definitions(${XROOTD_CFLAGS})
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
+ 
+@@ -11,14 +12,16 @@
+   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
+ else()
+   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
+-                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
++                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
+   if (NOT XROOTD_NOMAIN)
+      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
+   endif ()
+   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+-  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
++  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
++  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
++                         LIBRARIES ${SYSLIBS})
+ endif()
+ 
+ if(builtin_xrootd)
+@@ -38,4 +41,4 @@
+ endif()
+ 
+ 
+-ROOT_INSTALL_HEADERS()
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
+diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
+@@ -1,4 +1,3 @@
+-
+ ############################################################################
+ # CMakeLists.txt file for building ROOT proof/proofx package
+ # @author Pere Mato, CERN
+@@ -14,6 +13,7 @@
+ endif()
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
+ link_directories(${XROOTD_LIBRARY_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ 
diff --git a/root-no-hexfloat-const.patch b/root-no-hexfloat-const.patch
new file mode 100644
index 0000000..e92ed6e
--- /dev/null
+++ b/root-no-hexfloat-const.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/math/mathcore/src/mixmax.h root-6.06.02/math/mathcore/src/mixmax.h
+--- root-6.06.02.orig/math/mathcore/src/mixmax.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/mixmax.h	2016-04-05 23:27:14.026856518 +0200
+@@ -134,7 +134,7 @@
+ #define MOD_REM(k) ((k) % MERSBASE )  // latest Intel CPU is supposed to do this in one CPU cycle, but on my machines it seems to be 20% slower than the best tricks
+ #define MOD_MERSENNE(k) MOD_PAYNE(k)
+ 
+-#define INV_MERSBASE (0x1p-61)
++#define INV_MERSBASE (4.336808689942017736029811203479766845703125e-19) // (0x1p-61)
+ 
+ 
+ // the charpoly is irreducible for the combinations of N and SPECIAL and has maximal period for N=508, 256, half period for 1260, and 1/12 period for 3150
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
new file mode 100644
index 0000000..1157d56
--- /dev/null
+++ b/root-no-testdata.patch
@@ -0,0 +1,20 @@
+diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
+--- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
+@@ -239,13 +239,14 @@
+ 
+ #--stressProof-------------------------------------------------------------------------------
+ if(NOT WIN32)
+-  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
++  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
+   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
+   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
+                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
+                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
+                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
+-                                         FAILREGEX "FAILED|Error in")
++                                         FAILREGEX "FAILED|Error in"
++                                         DEPENDS TestData)
+ endif()
+ 
+ #--testbits----------------------------------------------------------------------------------
diff --git a/root-ppc64.patch b/root-ppc64.patch
new file mode 100644
index 0000000..cab115c
--- /dev/null
+++ b/root-ppc64.patch
@@ -0,0 +1,38 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
+@@ -30,8 +30,8 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
+-  message(STATUS "Found a 64bit ppc64 little endian system")
++elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
++  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
+@@ -205,17 +205,12 @@
+    ;;
+ linuxppcgcc)
+    # PPC Linux with gcc
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
++   auxldflags="-m32"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
+ linuxppc64gcc)
+-   # PPC64 (64 bit mode) Linux with gcc 3.x
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+-   auxldflags="-m64"
+-   auxlibs="-lm -ldl -rdynamic"
+-   ;;
+-ppc64le)
+-   # PPC64 (64 bit mode) little endian
++   # PPC64/PPC64LE (64 bit mode) Linux with gcc
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
index 40c2b6b..cb30e30 100644
--- a/root-private-public.patch
+++ b/root-private-public.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.04.02.orig/proof/proofx/inc/TXSocket.h root-6.04.02/proof/proofx/inc/TXSocket.h
---- root-6.04.02.orig/proof/proofx/inc/TXSocket.h	2015-07-14 12:54:01.000000000 +0200
-+++ root-6.04.02/proof/proofx/inc/TXSocket.h	2015-07-24 23:17:46.482814148 +0200
+diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
+--- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
 @@ -43,8 +43,8 @@
  #ifndef ROOT_TSocket
  #include "TSocket.h"
@@ -48,7 +48,7 @@ diff -ur root-6.04.02.orig/proof/proofx/inc/TXSocket.h root-6.04.02/proof/proofx
     Bool_t              IsServProofd();
     virtual void        RemoveClientID() { }
     virtual void        SetClientID(Int_t) { }
-@@ -215,10 +216,7 @@
+@@ -215,11 +216,9 @@
     void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
  
     // Interrupt the low level socket
@@ -58,12 +58,14 @@ diff -ur root-6.04.02.orig/proof/proofx/inc/TXSocket.h root-6.04.02/proof/proofx
 -                                        if (i && fAWait) fASem.Post(); }
 +   void                SetInterrupt(Bool_t i = kTRUE);
     inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
++
     // Set / Check async msg queue waiting status
     inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
-diff -ur root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.04.02/proof/proofx/src/TXProofMgr.cxx
---- root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx	2015-07-14 12:54:01.000000000 +0200
-+++ root-6.04.02/proof/proofx/src/TXProofMgr.cxx	2015-07-25 00:18:56.528053529 +0200
-@@ -39,6 +39,8 @@
+    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
+diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
+@@ -40,6 +40,8 @@
  #include "TSysEvtHandler.h"
  #include "XProofProtocol.h"
  
@@ -72,50 +74,61 @@ diff -ur root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.04.02/proof/pr
  ClassImp(TXProofMgr)
  
  //
-diff -ur root-6.04.02.orig/proof/proofx/src/TXSocket.cxx root-6.04.02/proof/proofx/src/TXSocket.cxx
---- root-6.04.02.orig/proof/proofx/src/TXSocket.cxx	2015-07-14 12:54:01.000000000 +0200
-+++ root-6.04.02/proof/proofx/src/TXSocket.cxx	2015-07-24 23:23:46.982746510 +0200
-@@ -924,6 +924,36 @@
+diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
+@@ -912,6 +912,46 @@
  }
  
- //____________________________________________________________________________
+ ////////////////////////////////////////////////////////////////////////////////
++/// Getter for logical connection ID
++
 +Int_t TXSocket::GetLogConnID() const
 +{
 +   return (fConn ? fConn->GetLogConnID() : -1);
 +}
 +
-+//____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for last error
++
 +Int_t TXSocket::GetOpenError() const
 +{
 +   return (fConn ? fConn->GetOpenError() : -1);
 +}
 +
-+//____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for server type
++
 +Int_t TXSocket::GetServType() const
 +{
 +   return (fConn ? fConn->GetServType() : -1);
 +}
 +
-+//____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for session ID
++
 +Int_t TXSocket::GetSessionID() const
 +{
 +   return (fConn ? fConn->GetSessionID() : -1);
 +}
 +
-+//____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for validity status
++
 +Bool_t TXSocket::IsValid() const
 +{
 +   return (fConn ? (fConn->IsValid()) : kFALSE);
 +}
 +
-+//____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
+ /// Return kTRUE if the remote server is a 'proofd'
+ 
  Bool_t TXSocket::IsServProofd()
- {
-    // Return kTRUE if the remote server is a 'proofd'
-@@ -1643,6 +1673,15 @@
+@@ -1633,6 +1673,16 @@
  }
  
- //______________________________________________________________________________
+ ////////////////////////////////////////////////////////////////////////////////
++
 +void TXSocket::SetInterrupt(Bool_t i)
 +{
 +   R__LOCKGUARD(fAMtx);
@@ -124,19 +137,20 @@ diff -ur root-6.04.02.orig/proof/proofx/src/TXSocket.cxx root-6.04.02/proof/proo
 +   if (i && fAWait) fASem.Post();
 +}
 +
-+//______________________________________________________________________________
- Int_t TXSocket::Send(const TMessage &mess)
- {
-    // Send a TMessage object. Returns the number of bytes in the TMessage
-@@ -1933,6 +1972,11 @@
++////////////////////////////////////////////////////////////////////////////////
+ /// Send a TMessage object. Returns the number of bytes in the TMessage
+ /// that were sent and -1 in case of error.
+ 
+@@ -1923,6 +1973,12 @@
  }
  
- //_____________________________________________________________________________
+ ////////////////////////////////////////////////////////////////////////////////
++
 +Int_t TXSocket::GetLowSocket() const {
 +   return (fConn ? fConn->GetLowSocket() : -1);
 +}
 +
-+//_____________________________________________________________________________
++////////////////////////////////////////////////////////////////////////////////
+ /// Init environment variables for XrdClient
+ 
  void TXSocket::InitEnvs()
- {
-    // Init environment variables for XrdClient
diff --git a/root-s390x.patch b/root-s390x.patch
new file mode 100644
index 0000000..39f0b98
--- /dev/null
+++ b/root-s390x.patch
@@ -0,0 +1,147 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
+@@ -54,6 +54,32 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390x)
++  message(STATUS "Found a 64bit system")
++  set(BIT_ENVIRONMENT "-m64")
++  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390)
++  message(STATUS "Found a 31bit system")
++  set(BIT_ENVIRONMENT "-m31")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
++++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
+@@ -215,6 +215,18 @@
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
++linuxs390gcc)
++   # s390 (31 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
++   auxldflags="-m31"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
++linuxs390xgcc)
++   # s390x (64 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
++   auxldflags="-m64"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
+ linuxx8664gcc)
+    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
+diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
+--- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
+@@ -202,6 +202,19 @@
+ #   define NEED_SIGJMP
+ #endif
+ 
++#if defined(linux) && defined(__s390__)
++#   define R__LINUX
++#   define R__UNIX
++#   define NEED_SIGJMP
++#endif
++
++#if defined(linux) && defined(__s390x__)
++#   define R__LINUX
++#   define R__UNIX
++#   define R__B64
++#   define NEED_SIGJMP
++#endif
++
+ #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
+ #   define R__HURD
+ #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
+@@ -54,6 +54,10 @@
+     set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(PCRE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(PCRE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
+@@ -49,6 +49,10 @@
+     set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(AFTER_CC "${AFTER_CC} -m64")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(AFTER_CC "${AFTER_CC} .m31")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
+@@ -56,6 +56,10 @@
+     set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(FREETYPE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
+@@ -21,6 +21,8 @@
+   set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
++elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++  set(ROOT_CLING_TARGET "SystemZ")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
+   set(ROOT_CLING_TARGET "X86")
+ elseif(ROOT_ARCHITECTURE MATCHES macosx)
+diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
+--- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
+@@ -372,6 +372,8 @@
+   set(LLVM_NATIVE_ARCH Hexagon)
+ elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
+   set(LLVM_NATIVE_ARCH SystemZ)
++elseif (LLVM_NATIVE_ARCH MATCHES "s390")
++  set(LLVM_NATIVE_ARCH SystemZ)
+ else ()
+   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
+ endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
new file mode 100644
index 0000000..4952a92
--- /dev/null
+++ b/root-save-memory.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
+@@ -36,7 +36,9 @@
+                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                                     ${corelinklibs})
+ 
+-add_dependencies(rootcling CLING LLVMRES)
++# The dependency on Cling was added to prevent Cling (libCling) and
++# rootcling from being linked in parallel.
++add_dependencies(rootcling CLING LLVMRES Cling)
+ 
+ ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
+ 
+diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
+--- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
+@@ -25,9 +25,11 @@
+ 
+ CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
+ ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
++# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
++# $(ROOTCLINGEXE) from being linked in parallel.
+ $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
+ 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
+-           $(PCREDEP) $(CORELIBDEP)
++           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
+ 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
+ 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
+ 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
new file mode 100644
index 0000000..35b828c
--- /dev/null
+++ b/root-see-macro-output.patch
@@ -0,0 +1,266 @@
+diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
+--- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
+@@ -13,7 +13,6 @@
+ 
+ void fit1() {
+    //Simple fitting example (1-d histogram with an interpreted function)
+-   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
+--- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ void fitslicesy() {
+ //
+ // Illustrates how to use the TH1::FitSlicesY function
+-// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
+ //    It uses the TH2F histogram generated in macro hsimple.C
+ //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
+ //    in 2 sepate pads.
+diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
+--- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
+@@ -3,7 +3,6 @@
+ 
+ void multifit() {
+ //  Fitting multiple functions to different ranges of a 1-D histogram
+-// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ //      Example showing how to fit in a sub-range of an histogram
+ //  An histogram is created and filled with the bin contents and errors
+ //  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
+--- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
+@@ -3,7 +3,6 @@
+ 
+ void shapes() {
+ //The old geometry shapes (see script geodemo.C)
+-//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
+--- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,6 +1,5 @@
+ void basic3d(){
+    // Show 3-D polylines and markers
+-   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
+    //
+ 
+    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
+--- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void canvas(){
+ //Example of primitives in a canvas
+-// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
+ // One of the first actions in a ROOT session is the creation of a Canvas.
+ // Here we create a Canvas named "c1"
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
+--- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,7 +1,6 @@
+ void feynman()
+ {
+    //Draw Feynman diagrams
+-   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
+    //Author: Otto Schaile
+ 
+    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
+diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
+--- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
+@@ -1,6 +1,5 @@
+ void gaxis(){
+ //Simple example illustrating how to draw TGaxis objects in various formats.
+-//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
+--- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
+@@ -1,6 +1,5 @@
+ void tornado() {
+ //Show 3-d polymarkers
+-// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+     gBenchmark->Start("tornado");
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void gerrors2() {
+    //Draw two graphs with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void gerrors() {
+    //Draw a graph with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
+--- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void graph() {
+    //Draw a simple graph
+-   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
+--- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void surfaces() {
+    //Draw 2-Dim functions
+-   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
+--- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
+@@ -1,6 +1,5 @@
+ void fillrandom() {
+    //Fill a 1-D histogram from a parametric function
+-   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
+--- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ // histograms filled and drawn in a loop
+ void hsum() {
+ //
+-// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ //    Simple example illustrating how to use the C++ interpreter
+ //    to fill histograms in a loop and show the graphics results
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
+--- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
+@@ -9,7 +9,6 @@
+ {
+    //example of macro illustrating how to superimpose two histograms
+    //with different scales in the "same" pad.
+-   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
+diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
+--- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
+diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
+--- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+ #
+ from os import path
+ from ROOT import TCanvas, TFile, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
+--- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraphErrors
+diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
+--- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraph
+diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
+--- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
+--- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ #    Simple example illustrating how to use the C++ interpreter	
+ #    to fill histograms in a loop and show the graphics results
+ #
+diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
+--- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ #      Example showing how to fit in a sub-range of an histogram
+ #  An histogram is created and filled with the bin contents and errors
+ #  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
+--- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ #
+ 
+ import ROOT
+diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
+--- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPaveText, TPad, TF2
+diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
+--- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ 
+ from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
+ from ROOT import gROOT, gBenchmark
+diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
+--- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
+@@ -4,7 +4,6 @@
+ # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
+ #
+ # original header:
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ # Simple example illustrating how to use the C++ interpreter	
+ # to fill histograms in a loop and show the graphics results
+ 
diff --git a/root-soname.patch b/root-soname.patch
new file mode 100644
index 0000000..3367bad
--- /dev/null
+++ b/root-soname.patch
@@ -0,0 +1,11 @@
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
+@@ -39,7 +39,7 @@
+ if(soversion)
+   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
+       VERSION ${ROOT_VERSION}
+-      SOVERSION ${ROOT_MAJOR_VERSION}
++      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
+       SUFFIX ${libsuffix}
+       PREFIX ${libprefix} )
+ else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
new file mode 100644
index 0000000..73b36e9
--- /dev/null
+++ b/root-stressgraphics.patch
@@ -0,0 +1,56 @@
+diff -ur root-6.06.02.orig/test/stressGraphics.ref root-6.06.02/test/stressGraphics.ref
+--- root-6.06.02.orig/test/stressGraphics.ref	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressGraphics.ref	2016-04-09 16:20:33.234593347 +0200
+@@ -3,18 +3,18 @@
+     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
+     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
+     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
+-    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
++    5      1025       200     12802       200     19715      2900     33468      9900     30846      5000      1072       200
+     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
+     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
+-    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
+-    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
+-   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
+-   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
+-   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
+-   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
+-   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
+-   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
+-   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
++    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
++    9      9253       100     14310        50      9664       600     19851      2400     12199      1000      9449       100
++   10      8863        70     13539       100     14622      1200     25627      1200     25264      1800      8894        70
++   11     12971       100     14377        50     20508      1400     34063      2000     32033      1400     12864       150
++   12      7674       100     13482        50     27519      2500     83557      2800     38505      4000      7720       150
++   13      5600       400     13242       400      9805       400     16881       400     15063       800      5638       400
++   14  14190539   3500000     12926       100     15663       800     23076      9500     25987      2400  14190704   3500000
++   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
++   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
+    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
+    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
+@@ -25,7 +25,7 @@
+    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
+    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
+    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
+-   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
++   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
+    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
+    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
+    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
+@@ -35,11 +35,11 @@
+    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
+    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
+    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
+-   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
++   37   1456993     10000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
+    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
+-   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
++   39     15025      3200     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
+-   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
++   41      4846       200     14075       100     24281       200     33239       600     25636       300      4877       200
+    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
+    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
+    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-template-files.patch b/root-template-files.patch
new file mode 100644
index 0000000..086b8a7
--- /dev/null
+++ b/root-template-files.patch
@@ -0,0 +1,28 @@
+diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
+--- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
+@@ -15,8 +15,8 @@
+    // equal to 1 for the signal and 0 for the background is added.
+    const char *fname = "mlpHiggs.root";
+    TFile *input = 0;
+-   if (!gSystem->AccessPathName(fname)) {
+-      input = TFile::Open(fname);
++   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    } else {
+       printf("accessing %s file from http://root.cern.ch/files\n",fname);
+       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
+--- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
+@@ -273,8 +273,8 @@
+ 
+   const char *fname = "stock.root";
+   TFile *f = 0;
+-  if (!gSystem->AccessPathName(fname)) {
+-     f = TFile::Open(fname);
++  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+   } else {
+      printf("accessing %s file from http://root.cern.ch/files\n",fname);
+      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff --git a/root-test-install.patch b/root-test-install.patch
new file mode 100644
index 0000000..e9ddc87
--- /dev/null
+++ b/root-test-install.patch
@@ -0,0 +1,3091 @@
+diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
+--- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
+@@ -37,12 +37,12 @@
+   install(FILES ${pyfile} DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+-  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY ${pyfile} DESTINATION ${localruntimedir})
+ endforeach()
+ 
+-set( ROOTaaSDirName "ROOTaaS")
++set(ROOTaaSDirName "ROOTaaS")
+ install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
+-file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
+ 
+ #---Install headers----------------------------------------------------------
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
+--- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
+@@ -508,7 +508,7 @@
+ 
+           # system logon, user logon, and local logon (skip Rint.Logon)
+             name = '.rootlogon.C'
+-            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
++            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
+                        os.path.expanduser( os.path.join( '~', name ) ) ]
+             if logons[-1] != os.path.join( os.getcwd(), name ):
+                logons.append( name )
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
+@@ -222,7 +222,7 @@
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
+ 
+ # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
+-if(rpath OR gnuinstall)
++if(rpath)
+   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
+   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
+ elseif(APPLE)
+diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
+@@ -19,6 +19,7 @@
+   set(libprefix lib)
+   set(ld_library_path PATH)
+   set(libsuffix .dll)
++  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_BINDIR})
+ elseif(APPLE)
+   set(ld_library_path DYLD_LIBRARY_PATH)
+@@ -26,6 +27,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ else()
+   set(ld_library_path LD_LIBRARY_PATH)
+@@ -33,6 +35,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+@@ -322,7 +325,15 @@
+     set(pcm_name)
+   else()
+     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
+-      set(command rootcling -rootbuild)
++      if(gnuinstall)
++        if(WIN32)
++          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
++        else()
++          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
++        endif()
++      else()
++        set(command rootcling -rootbuild)
++      endif()
+       set(ROOTCINTDEP rootcling)
+     else()
+       set(command rootcling)
+@@ -431,9 +442,6 @@
+   if(TARGET G__${library})
+     add_dependencies(${library} G__${library})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
+   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
+   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
+@@ -468,9 +476,6 @@
+   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
+      add_dependencies(${library} ${CMAKE_MATCH_2})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+ 
+   #--- Only for building shared libraries
+   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
+@@ -511,9 +516,6 @@
+   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
+   include_directories(${CMAKE_BINARY_DIR}/include)
+   add_library( ${library} SHARED ${lib_srcs})
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
+   target_link_libraries(${library} ${ARG_LIBRARIES})
+   #----Installation details-------------------------------------------------------
+@@ -590,6 +592,10 @@
+                            PATTERN ".svn" EXCLUDE
+                            REGEX "LinkDef" EXCLUDE
+                            ${ARG_OPTIONS})
++    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
++                   PATTERN ".svn" EXCLUDE
++                   REGEX "LinkDef" EXCLUDE
++                   ${ARG_OPTIONS})
+     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
+   endforeach()
+ endfunction()
+@@ -629,9 +635,6 @@
+   if (ARG_ADDITIONAL_COMPILE_FLAGS)
+     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${executable} move_headers)
+-  endif()
+ 
+   #----Installation details------------------------------------------------------
+   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+@@ -849,6 +852,9 @@
+     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
+   else()
+     add_test(NAME ${test} COMMAND ${_command})
++    if (gnuinstall)
++      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
++    endif()
+   endif()
+ 
+   #- Handle TIMOUT and DEPENDS arguments
+diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
+--- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
+@@ -1,20 +0,0 @@
+-# Arguments:
+-#  PREFIX    - Installation prefix
+-#  COMPONENTS - Installation component
+-
+-set(COMPONENTS ${COMPONENTS})
+-set(ENV{DESTDIR} "")
+-foreach(component ${COMPONENTS})
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
+-                             -DCMAKE_INSTALL_COMPONENT=${component}
+-                             -P cmake_install.cmake
+-    RESULT_VARIABLE result
+-    OUTPUT_QUIET
+-  )
+-
+-  if(result)
+-    set(msg "Local installation of ${component} failed: ${result}\n")
+-    message(FATAL_ERROR "${msg}")
+-  endif()
+-endforeach()
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
+@@ -135,7 +135,7 @@
+   endif()
+ endforeach()
+ 
+-#---Move (copy) the headers and other directories to binary tree---------------------------------
++#---Move (copy) directories to binary tree------------------------------------------------------
+ set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
+ add_custom_command(OUTPUT ${stamp_file}
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
+@@ -147,11 +147,7 @@
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
+                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
+                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
+-add_custom_target(move_headers DEPENDS ${stamp_file}
+-                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
+-                                                        -DCOMPONENTS="headers"
+-                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
+-include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
++add_custom_target(move_artifacts DEPENDS ${stamp_file})
+ 
+ 
+ #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
+@@ -199,13 +195,23 @@
+                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
+                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
+ 
+-add_custom_command(OUTPUT etc/allDict.cxx.pch
+-                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+-                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
+-                           etc/dictpch/allLinkDefs.h
+-                           etc/dictpch/allHeaders.h
+-                           etc/dictpch/allCppflags.txt
+-                           rootcling)
++if (WIN32)
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++else()
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++endif()
+ add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
+ set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
+ add_dependencies(onepcm ${__allTargets})
+@@ -213,22 +219,20 @@
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+ #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
+-  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-  add_dependencies(hsimple onepcm)
+-  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
+-  if(WIN32)
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  else()
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+-                               $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  endif()
+-  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
++add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
++add_dependencies(hsimple onepcm)
++if(WIN32)
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
++else()
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+ endif()
++install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+ 
+ #---version--------------------------------------------------------------------------------------
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
+@@ -266,9 +270,6 @@
+ #---Configure Testing using CTest----------------------------------------------------------------
+ configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
+ if(testing)
+-  if(gnuinstall)
+-    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
+-  endif()
+   include(RootCTest)
+   if(roottest)
+     find_package(Git REQUIRED)
+diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
+--- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
+@@ -14,10 +14,11 @@
+ #define ROOTTUTDIR    "@tutdir@"
+ #define ROOTSRCDIR    "@srcdir@"
+ #define ROOTICONPATH  "@iconpath@"
+-#define EXTRAICONPATH "@extraiconpath@"
+ #define TTFFONTDIR    "@ttffontdir@"
+ #endif
+ 
++#define EXTRAICONPATH "@extraiconpath@"
++
+ #@setresuid@ R__HAS_SETRESUID   /**/
+ #@hasmathmore@ R__HAS_MATHMORE   /**/
+ #@haspthread@ R__HAS_PTHREAD    /**/
+diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
+--- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
+@@ -9,24 +9,24 @@
+ # and to PATH on Windows.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.DynamicPath:    .:@libdir@:
+-WinNT.*.Root.DynamicPath:   .;@bindir@;
++#Unix.*.Root.DynamicPath:    .:@libdir@
++#WinNT.*.Root.DynamicPath:   .;@bindir@
+ 
+ # Path used to find macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.MacroPath:      .:@macrodir@:
+-WinNT.*.Root.MacroPath:     .;@macrodir@;
++#Unix.*.Root.MacroPath:      .:@macrodir@
++#WinNT.*.Root.MacroPath:     .;@macrodir@
+ 
+ # Path used to find plugin macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.PluginPath:      :@plugindir@:
+-WinNT.*.Root.PluginPath:     ;@plugindir@;
++#Unix.*.Root.PluginPath:     @plugindir@
++#WinNT.*.Root.PluginPath:    @plugindir@
+ 
+ # Path where to look for TrueType fonts.
+ Unix.*.Root.UseTTFonts:     true
+-*.*.Root.TTFontPath:        @ttffontdir@
++#*.*.Root.TTFontPath:        @ttffontdir@
+ 
+ # Use Net* API functions.
+ WinNT.UseNetAPI:         true
+@@ -222,7 +222,8 @@
+ Gui.DocumentForegroundColor: black
+ Gui.TooltipBackgroundColor:  LightYellow
+ Gui.TooltipForegroundColor:  black
+-Gui.IconPath:                $(HOME)/icons:@iconpath@:.
++#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
++#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
+ Gui.MimeTypeFile:            $(HOME)/.root.mimes
+ # If above does not exists defaults to this:
+ #Gui.MimeTypeFile:            @etcdir@/root.mimes
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
+@@ -8018,6 +8018,7 @@
+     -e "s|@bindir@|$bindir|"               \
+     -e "s|@etcdir@|$etcdir|"               \
+     -e "s|@ttffontdir@|$fontdir|"          \
++    -e "s|@extraiconpath@|$extraiconpath|" \
+     -e "s|@iconpath@|$iconpath|"           \
+     -e "s|@hasxrd@|$hasxrd|"               \
+     -e "s|@hasnotxrd@|$hasnotxrd|"         \
+diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
+--- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
+@@ -325,7 +325,19 @@
+    static Int_t       ConvertVersionInt2Code(Int_t v);
+    static Int_t       RootVersionCode();
+    static const char**&GetExtraInterpreterArgs();
+-   static const char *GetTutorialsDir();
++
++   static const TString& GetRootSys();
++   static const TString& GetBinDir();
++   static const TString& GetLibDir();
++   static const TString& GetIncludeDir();
++   static const TString& GetEtcDir();
++   static const TString& GetDataDir();
++   static const TString& GetDocDir();
++   static const TString& GetMacroDir();
++   static const TString& GetTutorialsDir();
++   static const TString& GetSourceDir();
++   static const TString& GetIconPath();
++   static const TString& GetTTFFontDir();
+ 
+    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
+ };
+diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -268,11 +268,7 @@
+    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
+    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR);
+-#else
+-                                       "$(ROOTSYS)/fonts");
+-#endif
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+    // Check for use of DFSG - fonts
+    if (!ttfont)
+@@ -880,29 +876,19 @@
+          Error("ProcessLine", "Cannot show demos in batch mode!");
+          return 1;
+       }
+-#ifdef ROOTTUTDIR
+-      ProcessLine(".x " ROOTTUTDIR "/demos.C");
+-#else
+-      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
+-#endif
++      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
+       return 0;
+    }
+ 
+    if (!strncmp(line, ".license", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/LICENSE");
+-#else
+-      return PrintFile("$(ROOTSYS)/LICENSE");
+-#endif
++      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
+    }
+ 
+    if (!strncmp(line, ".credits", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/CREDITS");
+-#else
+-      return PrintFile("$(ROOTSYS)/README/CREDITS");
+-#endif
+-
++      TString credits = TROOT::GetDocDir() + "/CREDITS";
++      if (gSystem->AccessPathName(credits, kReadPermission))
++         credits = TROOT::GetDocDir() + "/README/CREDITS";
++      return PrintFile(credits);
+    }
+ 
+    if (!strncmp(line, ".pwd", 4)) {
+diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
+--- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -399,21 +399,7 @@
+ 
+       TString sname = "system";
+       sname += name;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-      // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-      etc = gRootDir;
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       ReadFile(s, kEnvGlobal);
+       delete [] s;
+       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
+@@ -683,17 +669,7 @@
+ 
+       TString sname = "system";
+       sname += fRcName;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       rootrcdir = s;
+       delete [] s;
+    } else if (level == kEnvUser) {
+diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
+--- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -468,6 +468,10 @@
+       TPH__IsReadingDirs() = kTRUE;
+ 
+       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
++      if (plugindirs.Length() == 0) {
++         plugindirs = "plugins";
++         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
++      }
+ #ifdef WIN32
+       dirs = plugindirs.Tokenize(";");
+ #else
+diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
+--- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
+@@ -1722,21 +1722,9 @@
+                "after the call to TROOT::InitInterpreter()!");
+       }
+ 
+-      const char *libcling = 0;
+-      char *libclingStorage = 0;
+-#ifdef ROOTLIBDIR
+-      libcling = ROOTLIBDIR "/libCling."
+-# ifdef R__WIN32
+-      "dll";
+-# else
+-      "so";
+-# endif
+-#else
+-      libclingStorage = gSystem->DynamicPathName("libCling");
+-      libcling = libclingStorage;
+-#endif
++      char *libcling = gSystem->DynamicPathName("libCling");
+       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
+-      delete [] libclingStorage;
++      delete [] libcling;
+ 
+       if (!gInterpreterLib) {
+          TString err = dlerror();
+@@ -2082,22 +2070,7 @@
+ #endif
+ 
+    TString gitinfo = "gitinfo.txt";
+-   char *filename = 0;
+-#ifdef ROOTETCDIR
+-   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   filename = gSystem->ConcatFileName(etc, gitinfo);
+-#endif
++   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
+ 
+    FILE *fp = fopen(filename, "r");
+    if (fp) {
+@@ -2415,17 +2388,9 @@
+ #endif
+       if (macroPath.Length() == 0)
+ #if !defined(R__WIN32)
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".:" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".:") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".:" + TROOT::GetMacroDir();
+ #else
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".;" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".;") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".;" + TROOT::GetMacroDir();
+ #endif
+    }
+ 
+@@ -2521,14 +2486,258 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++#ifdef ROOTPREFIX
++static Bool_t IgnorePrefix() {
++   static Bool_t ignorePrefix = kFALSE;
++   static Bool_t init = kFALSE;
++   if (!init) {
++      if (gSystem->Getenv("ROOTIGNOREPREFIX"))
++         ignorePrefix = kTRUE;
++      init = kTRUE;
++   }
++   return ignorePrefix;
++}
++#endif
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the rootsys directory in the installation. Static utility function.
++
++const TString& TROOT::GetRootSys() {
++#ifdef ROOTPREFIX
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsys;
++      if (rootsys.IsNull())
++         rootsys = gSystem->Getenv("ROOTSYS");
++      if (rootsys.IsNull())
++         rootsys = gRootDir;
++      return rootsys;
++#ifdef ROOTPREFIX
++   } else {
++      const static TString rootsys = ROOTPREFIX;
++      return rootsys;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the binary directory in the installation. Static utility function.
++
++const TString& TROOT::GetBinDir() {
++#ifdef ROOTBINDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootbindir;
++      if (rootbindir.IsNull()) {
++         rootbindir = "bin";
++         gSystem->PrependPathName(GetRootSys(), rootbindir);
++      }
++      return rootbindir;
++#ifdef ROOTBINDIR
++   } else {
++      const static TString rootbindir = ROOTBINDIR;
++      return rootbindir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the library directory in the installation. Static utility function.
++
++const TString& TROOT::GetLibDir() {
++#ifdef ROOTLIBDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootlibdir;
++      if (rootlibdir.IsNull()) {
++         rootlibdir = "lib";
++         gSystem->PrependPathName(GetRootSys(), rootlibdir);
++      }
++      return rootlibdir;
++#ifdef ROOTLIBDIR
++   } else {
++      const static TString rootlibdir = ROOTLIBDIR;
++      return rootlibdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the include directory in the installation. Static utility function.
++
++const TString& TROOT::GetIncludeDir() {
++#ifdef ROOTINCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootincdir;
++      if (rootincdir.IsNull()) {
++         rootincdir = "include";
++         gSystem->PrependPathName(GetRootSys(), rootincdir);
++      }
++      return rootincdir;
++#ifdef ROOTINCDIR
++   } else {
++      const static TString rootincdir = ROOTINCDIR;
++      return rootincdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the sysconfig directory in the installation. Static utility function.
++
++const TString& TROOT::GetEtcDir() {
++#ifdef ROOTETCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootetcdir;
++      if (rootetcdir.IsNull()) {
++         rootetcdir = "etc";
++         gSystem->PrependPathName(GetRootSys(), rootetcdir);
++      }
++      return rootetcdir;
++#ifdef ROOTETCDIR
++   } else {
++      const static TString rootetcdir = ROOTETCDIR;
++      return rootetcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the data directory in the installation. Static utility function.
++
++const TString& TROOT::GetDataDir() {
++#ifdef ROOTDATADIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDATADIR
++   } else {
++      const static TString rootdatadir = ROOTDATADIR;
++      return rootdatadir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the documentation directory in the installation. Static utility function.
++
++const TString& TROOT::GetDocDir() {
++#ifdef ROOTDOCDIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDOCDIR
++   } else {
++      const static TString rootdocdir = ROOTDOCDIR;
++      return rootdocdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the macro directory in the installation. Static utility function.
++
++const TString& TROOT::GetMacroDir() {
++#ifdef ROOTMACRODIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootmacrodir;
++      if (rootmacrodir.IsNull()) {
++         rootmacrodir = "macros";
++         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
++      }
++      return rootmacrodir;
++#ifdef ROOTMACRODIR
++   } else {
++      const static TString rootmacrodir = ROOTMACRODIR;
++      return rootmacrodir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Get the tutorials directory in the installation. Static utility function.
+ 
+-const char *TROOT::GetTutorialsDir()
+-{
++const TString& TROOT::GetTutorialsDir() {
+ #ifdef ROOTTUTDIR
+-   return ROOTTUTDIR;
+-#else
+-   static TString tutdir = TString(gRootDir) + "/tutorials";
+-   return tutdir;
++   if (IgnorePrefix()) {
++#endif
++      static TString roottutdir;
++      if (roottutdir.IsNull()) {
++         roottutdir = "tutorials";
++         gSystem->PrependPathName(GetRootSys(), roottutdir);
++      }
++      return roottutdir;
++#ifdef ROOTTUTDIR
++   } else {
++      const static TString roottutdir = ROOTTUTDIR;
++      return roottutdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the source directory in the installation. Static utility function.
++
++const TString& TROOT::GetSourceDir() {
++#ifdef ROOTSRCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsrcdir;
++      if (rootsrcdir.IsNull()) {
++         rootsrcdir = "src";
++         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
++      }
++      return rootsrcdir;
++#ifdef ROOTSRCDIR
++   } else {
++      const static TString rootsrcdir = ROOTSRCDIR;
++      return rootsrcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the icon path in the installation. Static utility function.
++
++const TString& TROOT::GetIconPath() {
++#ifdef ROOTICONPATH
++   if (IgnorePrefix()) {
++#endif
++      static TString rooticonpath;
++      if (rooticonpath.IsNull()) {
++         rooticonpath = "icons";
++         gSystem->PrependPathName(GetRootSys(), rooticonpath);
++      }
++      return rooticonpath;
++#ifdef ROOTICONPATH
++   } else {
++      const static TString rooticonpath = ROOTICONPATH;
++      return rooticonpath;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the fonts directory in the installation. Static utility function.
++
++const TString& TROOT::GetTTFFontDir() {
++#ifdef TTFFONTDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString ttffontdir;
++      if (ttffontdir.IsNull()) {
++         ttffontdir = "fonts";
++         gSystem->PrependPathName(GetRootSys(), ttffontdir);
++      }
++      return ttffontdir;
++#ifdef TTFFONTDIR
++   } else {
++      const static TString ttffontdir = TTFFONTDIR;
++      return ttffontdir;
++   }
+ #endif
+ }
+diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
+@@ -1852,22 +1852,10 @@
+       if (!system) {
+          // Mark the library in $ROOTSYS/lib as system.
+          const char *dirname = DirName(path);
+-#ifdef ROOTLIBDIR
+-         TString rootlibdir = ROOTLIBDIR;
+-#else
+-         TString rootlibdir = "lib";
+-         PrependPathName(gRootDir, rootlibdir);
+-#endif
+-         system = R__MatchFilename(rootlibdir,dirname);
++         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
+ 
+          if (!system) {
+-#ifdef ROOTBINDIR
+-            TString rootbindir = ROOTBINDIR;
+-#else
+-            TString rootbindir = "bin";
+-            PrependPathName(gRootDir, rootbindir);
+-#endif
+-            system = R__MatchFilename(rootbindir,dirname);
++            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
+          }
+       }
+ 
+@@ -2492,12 +2480,9 @@
+ #else
+    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
+ #endif
+-#ifdef ROOTBINDIR
+-   TString builddep = ROOTBINDIR;
+-#else
+-   TString builddep = TString(gRootDir) + "/bin";
+-#endif
+-   builddep += "/rmkdepend \"-f";
++   TString builddep = "rmkdepend";
++   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
++   builddep += " \"-f";
+    builddep += depfilename;
+    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
+    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
+@@ -2519,12 +2504,7 @@
+       builddep += "/\" ";
+    }
+    builddep += " -Y -- ";
+-#ifndef ROOTINCDIR
+-   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
+-   rootsysInclude += "/include";
+-#else
+-   TString rootsysInclude = ROOTINCDIR;
+-#endif
++   TString rootsysInclude = TROOT::GetIncludeDir();
+    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
+    builddep += includes;
+    builddep += defines;
+@@ -3345,27 +3325,17 @@
+       TString name = ".rootmap";
+       TString sname = "system.rootmap";
+       TString file;
+-#ifdef ROOTETCDIR
+-      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      AssignAndDelete(file, ConcatFileName(etc, sname));
++      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
+       if (gSystem->AccessPathName(file)) {
+          // for backward compatibility check also $ROOTSYS/system<name> if
+          // $ROOTSYS/etc/system<name> does not exist
+-         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
++         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
+          if (gSystem->AccessPathName(file)) {
+             // for backward compatibility check also $ROOTSYS/<name> if
+             // $ROOTSYS/system<name> does not exist
+-            AssignAndDelete(file, ConcatFileName(gRootDir, name));
++            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
+          }
+       }
+-#endif
+       mapfileStream << file << std::endl;
+       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
+       mapfileStream << file << std::endl;
+@@ -3379,23 +3349,9 @@
+    mapfileStream.close();
+ 
+    // ======= Generate the rootcling command line
+-   TString rcling;
+-#ifndef ROOTBINDIR
+-   rcling = gSystem->Getenv("ROOTSYS");
+-#ifndef R__WIN32
+-   rcling += "/bin/";
+-#else
+-   rcling += "\\bin\\";
+-#endif
+-#else
+-   rcling = ROOTBINDIR;
+-#ifndef R__WIN32
+-   rcling += "/";
+-#else
+-   rcling += "\\";
+-#endif
+-#endif
+-   rcling += "rootcling -v0 \"--lib-list-prefix=";
++   TString rcling = "rootcling";
++   PrependPathName(TROOT::GetBinDir(), rcling);
++   rcling += " -v0 \"--lib-list-prefix=";
+    rcling += mapfile;
+    rcling += "\" -f \"";
+    rcling.Append(dict).Append("\" -c -p ");
+diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
+--- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
+@@ -66,14 +66,14 @@
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ else()
+   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ endif()
+ add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
+diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
+--- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
+@@ -1719,17 +1719,7 @@
+ {
+    static const char *suffix = "class.rules";
+    TString sname = suffix;
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   gSystem->PrependPathName(etc, sname);
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t res = -1;
+ 
+diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
+--- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
+@@ -1049,10 +1049,10 @@
+    if (!fromRootCling) {
+       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
+ 
+-      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
+-      clingArgsStorage.push_back(interpInclude);
++      interpInclude = TROOT::GetEtcDir();
++      clingArgsStorage.push_back("-I" + interpInclude);
+ 
+-      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
++      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
+       if (gSystem->Getenv("ROOT_PCH")) {
+          pchFilename = gSystem->Getenv("ROOT_PCH");
+       }
+@@ -1063,14 +1063,8 @@
+       // clingArgsStorage.push_back("-fmodules");
+ 
+       std::string include;
+-#ifndef ROOTINCDIR
+-      include = gSystem->Getenv("ROOTSYS");
+-      include += "/include";
+-#else // ROOTINCDIR
+-      include = ROOTINCDIR;
+-#endif // ROOTINCDIR
+-      clingArgsStorage.push_back("-I");
+-      clingArgsStorage.push_back(include);
++      include = TROOT::GetIncludeDir();
++      clingArgsStorage.push_back("-I" + include);
+       clingArgsStorage.push_back("-Wno-undefined-inline");
+       clingArgsStorage.push_back("-fsigned-char");
+    }
+@@ -1080,7 +1074,11 @@
+            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
+       interpArgs.push_back(iArg->c_str());
+ 
+-   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
++#ifdef R__EXTERN_LLVMDIR
++   TString llvmResourceDir = R__EXTERN_LLVMDIR;
++#else
++   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
++#endif
+    // Add statically injected extra arguments, usually coming from rootcling.
+    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
+         extraArgs && *extraArgs; ++extraArgs) {
+@@ -1094,7 +1092,7 @@
+ 
+    fInterpreter = new cling::Interpreter(interpArgs.size(),
+                                          &(interpArgs[0]),
+-                                         llvmResourceDir.c_str());
++                                         llvmResourceDir);
+ 
+    if (!fromRootCling) {
+       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
+@@ -1103,13 +1101,13 @@
+       // llvm/clang header files shouldn't be there at all. We have to get rid of
+       // that dependency and avoid copying the header files.
+       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
+-      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
++      TCling::AddIncludePath((interpInclude + "/cling").c_str());
+ 
+       // Add the current path to the include path
+       // TCling::AddIncludePath(".");
+ 
+       // Add the root include directory and etc/ to list searched by default.
+-      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
++      TCling::AddIncludePath(TROOT::GetIncludeDir());
+    }
+ 
+    // Don't check whether modules' files exist.
+@@ -4515,21 +4513,7 @@
+ 
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t ret = ReadRootmapFile(s);
+    if (ret == -3) // old format
+diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
+--- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
+@@ -339,10 +339,6 @@
+ //______________________________________________________________________________
+ llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
+ 
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+ enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
+ 
+ //______________________________________________________________________________
+@@ -549,18 +545,6 @@
+                                  const char* headers[]);
+ 
+ //______________________________________________________________________________
+-// Return the -I needed to find RuntimeUniverse.h
+-std::string GetInterpreterExtraIncludePath(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the LLVM / clang resource directory
+-std::string GetLLVMResourceDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+ // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
+ // that can be used in C++ as a variable name.
+ void GetCppName(std::string &output, const char *input);
+diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
+--- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -3407,40 +3407,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Return the -I needed to find RuntimeUniverse.h
+-
+-std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
+-{
+-#ifdef ROOTETCDIR
+-   if (rootbuild) {
+-      // Building ROOT, ignore ROOTETCDIR!
+-#endif
+-      const char* rootsys = getenv("ROOTSYS");
+-      if (!rootsys) {
+-         Error(0, "Environment variable ROOTSYS not set!");
+-         return "-Ietc";
+-      }
+-      return std::string("-I") + rootsys + "/etc";
+-#ifdef ROOTETCDIR
+-   }
+-   return std::string("-I") + ROOTETCDIR;
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Return the LLVM / clang resource directory
+-
+-std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
+-{
+-#ifdef R__EXTERN_LLVMDIR
+-   return R__EXTERN_LLVMDIR;
+-#else
+-   return GetInterpreterExtraIncludePath(rootbuild)
+-      .substr(2, std::string::npos) + "/cling";
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Get the template specialisation decl and template decl behind the qualtype
+ /// Returns true if successfully found, false otherwise
+ 
+@@ -3957,29 +3923,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-
+-std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
+-{
+-   const std::string defaultInclude ("include");
+-   if (!rootbuild) {
+-#ifndef ROOTINCDIR
+-      const char* rootSysContent = getenv("ROOTSYS");
+-      if (rootSysContent) {
+-         std::string incl_rootsys (rootSysContent);
+-         return incl_rootsys + "/" + defaultInclude;
+-      } else {
+-         Error(0,"Environment variable ROOTSYS not set");
+-         return defaultInclude;
+-      }
+-#else
+-      return ROOTINCDIR;
+-#endif
+-   }
+-
+-   return defaultInclude;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Return the dictionary file name for a module
+ 
+ std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
+diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
+--- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -301,17 +301,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
+--- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
+@@ -1663,8 +1663,7 @@
+    case kROOT_Load:
+       {
+          const TString fileName = s3("[^\"]*$");
+-//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
+-         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
++         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
+          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
+ 
+ //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
+diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
+--- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
+@@ -445,7 +445,9 @@
+ 
+ static void SetRootSys()
+ {
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+    void *addr = (void *)SetRootSys;
+    Dl_info info;
+    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
+@@ -458,8 +460,8 @@
+          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
+       }
+    }
+-#else
+-   return;
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ #endif
+@@ -487,7 +489,9 @@
+    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
+    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+ #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+    // first loaded is the app so set ROOTSYS to app bundle
+    if (i == 1) {
+@@ -513,6 +517,8 @@
+       }
+    }
+ #endif
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // when libSystem.B.dylib is loaded we have finished loading all dylibs
+@@ -600,13 +606,9 @@
+    SetRootSys();
+ #endif
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0)
+-      gRootDir= "/usr/local/root";
+-#else
+-   gRootDir = ROOTPREFIX;
+-#endif
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   gRootDir = "/usr/local/root";
++   gRootDir = TROOT::GetRootSys().Data();
+ 
+    return kFALSE;
+ }
+@@ -2138,22 +2140,17 @@
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
+          gdbscript = "";
+-      } else {
+-         gdbscript += " ";
+       }
+    }
+    if (gdbscript == "") {
+-#ifdef ROOTETCDIR
+-      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
+-#else
+-      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
+-#endif
++      gdbscript = "gdb-backtrace.sh";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
+          return;
+       }
+-      gdbscript += " ";
+    }
++   gdbscript += " ";
+ 
+    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
+    gdbmess = gdbmess.Strip();
+@@ -4471,11 +4468,7 @@
+       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
+       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
+       if (rdynpath.IsNull()) {
+-#ifdef ROOTLIBDIR
+-         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
+-#else
+-         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
+-#endif
++         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
+       }
+       TString ldpath;
+ #if defined (R__AIX)
+@@ -4496,16 +4489,9 @@
+       else {
+          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
+       }
+-
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ":"; dynpath += ROOTLIBDIR;
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ":"; dynpath += TROOT::GetLibDir();
+       }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
+-      }
+-#endif
+       if (gCling) {
+          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
+       } else
+diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
+@@ -64,27 +64,27 @@
+                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+ endif()
+ 
+-set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
+-configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
++configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
+ 
+ if(WIN32)
+-  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
+ else()
+   if(CXX_HAS_fno_rtti)
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
+   else()
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
+   endif()
+ endif()
+ 
+ ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
+-                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
++                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
+                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
+                               $<TARGET_OBJECTS:Clib>
+                               $<TARGET_OBJECTS:MetaUtils>
+                               $<TARGET_OBJECTS:MetaUtilsLLVM>
+                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                               NOINSTALL)
++set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
+ add_dependencies(rootcling_tmp CLING LLVMRES)
+ set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+ set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
+--- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
+@@ -48,7 +48,7 @@
+ ROOTCINTEXE     := bin/rootcint$(EXEEXT)
+ GENREFLEXEXE    := bin/genreflex$(EXEEXT)
+ ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
+-ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
++ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
+ 
+ ##### Dependencies for all dictionaries
+ ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
+diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
+--- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -295,12 +295,6 @@
+ bool buildingROOT = false;
+ #endif
+ 
+-#ifdef R__EXTERN_LLVMDIR
+-# define R__LLVMDIR R__EXTERN_LLVMDIR
+-#else
+-# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
+-#endif
+-
+ namespace {
+    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
+    template <typename T> struct IsPointerTClassCopy {
+@@ -3977,11 +3971,6 @@
+       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
+    }
+ 
+-#if defined(ROOTINCDIR)
+-   if (!buildingROOT)
+-      SetRootSys();
+-#endif
+-
+    if (ic < argc && !strcmp(argv[ic], "-c")) {
+       // Simply ignore the -c options.
+       ic++;
+@@ -4131,7 +4120,11 @@
+    }
+ 
+    ic = nextStart;
+-   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
++#endif
+ 
+    std::vector<std::string> pcmArgs;
+    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
+@@ -4140,7 +4133,11 @@
+    }
+ 
+    // cling-only arguments
+-   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
++#endif
+    clingArgs.push_back("-D__ROOTCLING__");
+    clingArgs.push_back("-fsyntax-only");
+    clingArgs.push_back("-Xclang");
+@@ -4162,10 +4159,14 @@
+    }
+ 
+    std::string resourceDir;
+-#ifdef R__LLVMRESOURCEDIR
+-   resourceDir = "@R__LLVMRESOURCEDIR@";
++#ifdef R__EXTERN_LLVMDIR
++   resourceDir = R__EXTERN_LLVMDIR;
+ #else
+-   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
++#ifdef ROOT_STAGE1_BUILD
++   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
++#else
++   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
++#endif
+ #endif
+ 
+ #ifndef ROOT_STAGE1_BUILD
+@@ -4184,11 +4185,6 @@
+ 
+    interp.getOptions().ErrorOut = true;
+    interp.enableRawInput(true);
+-#ifdef ROOTINCDIR
+-   const bool useROOTINCDIR = !buildingROOT;
+-#else
+-   const bool useROOTINCDIR = false;
+-#endif
+    if (isGenreflex) {
+       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
+          // There was an error.
+@@ -4205,17 +4201,10 @@
+                               "#include <math.h>\n"
+                               "#include <string.h>\n"
+                              ) != cling::Interpreter::kSuccess
+-            || (!useROOTINCDIR
+-                && interp.declare("#include \"Rtypes.h\"\n"
+-                                  "#include \"TClingRuntime.h\"\n"
+-                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
+-#ifdef ROOTINCDIR
+-            || (useROOTINCDIR
+-                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
+-               )
+-#endif
++            || interp.declare("#include \"Rtypes.h\"\n"
++                              "#include \"TClingRuntime.h\"\n"
++                              "#include \"TObject.h\""
++                             ) != cling::Interpreter::kSuccess
+          ) {
+          // There was an error.
+          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -37,6 +37,18 @@
+ }
+ 
+ extern "C"
++const char *TROOT__GetIncludeDir()
++{
++   return TROOT::GetIncludeDir().Data();
++}
++
++extern "C"
++const char *TROOT__GetEtcDir()
++{
++   return TROOT::GetEtcDir().Data();
++}
++
++extern "C"
+ cling::Interpreter *TCling__GetInterpreter()
+ {
+    static bool sInitialized = false;
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
+@@ -21,6 +21,8 @@
+ 
+ extern "C" {
+    const char ** *TROOT__GetExtraInterpreterArgs();
++   const char *TROOT__GetIncludeDir();
++   const char *TROOT__GetEtcDir();
+    cling::Interpreter *TCling__GetInterpreter();
+    void InitializeStreamerInfoROOTFile(const char *filename);
+    void AddStreamerInfoToROOTFile(const char *normName);
+diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
+--- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
+@@ -362,11 +362,7 @@
+          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
+          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
+          if (rdynpath == "") {
+-#ifdef ROOTBINDIR
+-            rdynpath = ".;"; rdynpath += ROOTBINDIR;
+-#else
+-            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
+-#endif
++            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
+          }
+          TString path = gSystem->Getenv("PATH");
+          if (path == "")
+@@ -376,15 +372,10 @@
+          }
+ 
+       }
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ";"; dynpath += ROOTLIBDIR;
+-      }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
++
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ";"; dynpath += TROOT::GetLibDir();
+       }
+-#endif
+ 
+       return dynpath;
+    }
+@@ -823,16 +814,8 @@
+       }
+ 
+       // determine the fileopen.C file path:
+-      TString fileopen;
+-#ifndef ROOT_PREFIX
+-      fileopen += sys->TWinNTSystem::DriveName(buf);
+-      fileopen += ":";
+-      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
+-      fileopen += "\\macros";
+-#else
+-      fileopen += ROOTMACRODIR;
+-#endif
+-      fileopen += "\\fileopen.C";
++      TString fileopen = "fileopen.C";
++      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
+ 
+       if (regROOTwrite) {
+          // only write to registry if fileopen.C is readable
+@@ -1007,7 +990,9 @@
+ 
+    char *buf = new char[MAX_MODULE_NAME32 + 1];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
++#endif
+    // set ROOTSYS
+    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
+    if (hModCore) {
+@@ -1035,6 +1020,8 @@
+          }
+       }
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    UpdateRegistry(this, buf);
+@@ -1112,23 +1099,19 @@
+ 
+    fSigcnt = 0;
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0) {
+-      static char lpFilename[MAX_PATH];
+-      if (::GetModuleFileName(NULL,               // handle to module to find filename for
+-                            lpFilename,           // pointer to buffer to receive module path
+-                            sizeof(lpFilename)))  // size of buffer, in characters
+-      {
+-         const char *dirName = DirName(DirName(lpFilename));
+-         gRootDir = StrDup(dirName);
+-      } else {
+-         gRootDir = 0;
+-      }
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   static char lpFilename[MAX_PATH];
++   if (::GetModuleFileName(
++          NULL,                   // handle to module to find filename for
++          lpFilename,             // pointer to buffer to receive module path
++          sizeof(lpFilename))) {  // size of buffer, in characters
++      const char *dirName = DirName(DirName(lpFilename));
++      gRootDir = StrDup(dirName);
++   } else {
++      gRootDir = 0;
+    }
+-#else
+-   gRootDir= ROOTPREFIX;
+-#endif
++
++   gRootDir = TROOT::GetRootSys().Data();
+ 
+    // Increase the accuracy of Sleep() without needing to link to winmm.lib
+    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
+diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
+--- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
+@@ -50,6 +50,7 @@
+ # Define all the header files which should be installed when
+ # doing a "make install"
+ install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
++file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
+ set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ 
+ ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
+diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
+--- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
+@@ -24,6 +24,7 @@
+ #include "Riostream.h"
+ 
+ #include "TSystem.h"
++#include "TROOT.h"
+ #include "TObjArray.h"
+ #include "TVirtualGeoPainter.h"
+ #include "TGeoManager.h"
+@@ -1113,12 +1114,8 @@
+ {
+    if (HasRNElements()) return;
+    TGeoElementRN *elem;
+-   TString rnf;
+-#ifdef ROOTETCDIR
+-   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
+-#else
+-   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++   TString rnf = "RadioNuclides.txt";
++   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
+    FILE *fp = fopen(rnf, "r");
+    if (!fp) {
+       Error("ImportElementsRN","File RadioNuclides.txt not found");
+diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
+@@ -359,33 +359,33 @@
+ 
+ static void init_icon_paths()
+ {
+-   const char *icons = "/icons";
+-#ifdef R__WIN32
+-      icons = "\\icons";
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
++#ifndef R__WIN32
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
+ #endif
++   }
+ 
+-   TString homeIcons = gSystem->HomeDirectory();
+-   homeIcons += icons;
+-
+-   TString rootIcons = gSystem->Getenv("ROOTSYS");
+-   rootIcons += icons;
+-
+-   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
+-
+-   gIconPaths[0] = StrDup(".");
+-   gIconPaths[1] = StrDup(homeIcons.Data());
+-   gIconPaths[2] = StrDup(rootIcons.Data());
+-   gIconPaths[3] = StrDup(guiIcons.Data());
+-
+-#ifdef ROOTICONPATH
+-   gIconPaths[4] = StrDup(ROOTICONPATH);
++   Int_t cnt = 0;
++   Ssiz_t from = 0;
++   TString token;
++#ifndef R__WIN32
++   const char *delim = "/";
++#else
++   const char *delim = "\\";
+ #endif
+-
+-#ifdef EXTRAICONPATH
+-   gIconPaths[5] = StrDup(EXTRAICONPATH);
+-#endif
+-
+-   gIconPaths[6] = 0;
++   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
++      char *path = gSystem->ExpandPathName(token.Data());
++      if (path) {
++         gIconPaths[cnt] = path;
++         cnt++;
++      }
++   }
++   gIconPaths[cnt] = 0;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
+--- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
+@@ -811,11 +811,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+@@ -3077,11 +3073,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
+--- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
+@@ -195,11 +195,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -225,11 +221,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ 
+    // draw list of classes (if specified)
+    if (classes && strlen(classes)) {
+diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
+@@ -15,12 +15,10 @@
+ Interface to the freetype 2 library.
+ */
+ 
+-// RConfigure.h is needed for TTFFONTDIR
+-#include "RConfigure.h"
+-
+ #  include <ft2build.h>
+ #  include FT_FREETYPE_H
+ #  include FT_GLYPH_H
++#include "TROOT.h"
+ #include "TTF.h"
+ #include "TSystem.h"
+ #include "TEnv.h"
+@@ -415,13 +413,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-# else
+-                                       "$(ROOTSYS)/fonts"
+-# endif
+-                                      );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (!ttfont) {
+@@ -543,12 +535,7 @@
+       // try to load font (font must be in Root.TTFontPath resource)
+       // to see which fontset we have available
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR
+-#else
+-                                          "$(ROOTSYS)/fonts"
+-#endif
+-                                         );
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
+       if (ttfont) {
+          delete [] ttfont;
+diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
+@@ -1567,12 +1567,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-#else // TTFFONTDIR
+-                                       "$(ROOTSYS)/fonts"
+-#endif // TTFFONTDIR
+-                                       );
++                                       TROOT::GetTTFFontDir());
+ 
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
+diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
+--- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -699,13 +699,6 @@
+                           GetSystemMetrics(SM_CYSMICON));
+    HDC dc = tempIcon->handle();
+    DrawIcon (dc, 0, 0, icon);
+-#else
+-# ifdef ROOTICONPATH
+-   gSystem->ExpandPathName(ROOTICONPATH);
+-# else
+-   gSystem->ExpandPathName("$ROOTSYS/icons/");
+-//   tempIcon =new QPixmap (16,16),
+-# endif
+ #endif
+    return tempIcon;
+ }
+@@ -795,13 +788,7 @@
+    static TQtApplication *app = 0;
+    if (!app) {
+       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
+-      static TString argvString (
+-#ifdef ROOTBINDIR
+-             ROOTBINDIR "/root.exe"
+-#else
+-             "$ROOTSYS/bin/root.exe"
+-#endif
+-             );
++      static TString argvString (TROOT::GetBinDir() + "/root.exe");
+       gSystem->ExpandPathName(argvString);
+       static char *argv[] = {(char *)argvString.Data()};
+       static int nArg = 1;
+@@ -989,14 +976,8 @@
+     }
+ 
+     if (isXdfSupport && !symbolFontFound) {
+-// Load the local ROOT font
+-       QString fontdir =
+-#ifdef TTFFONTDIR
+-         TTFFONTDIR
+-#else
+-         "$ROOTSYS/fonts"
+-#endif
+-        ;
++        // Load the local ROOT font
++        QString fontdir = TROOT::GetTTFFontDir().Data();
+         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
+         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
+     }
+@@ -1006,12 +987,7 @@
+         fontFamily = fSymbolFontFamily = "Arial";
+         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
+         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
+-                 <<
+-#ifdef TTFFONTDIR
+-               TTFFONTDIR
+-#else
+-               "$ROOTSYS/fonts"
+-#endif
++                 << TROOT::GetTTFFontDir()
+                  << "\" directory to get the proper support for ROOT TLatex class";
+         // create a custom codec
+         new QSymbolCodec();
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -14,6 +14,7 @@
+ #include "TGLFontManager.h"
+ 
+ 
++#include "TROOT.h"
+ #include "TVirtualX.h"
+ #include "TMath.h"
+ #include "TSystem.h"
+@@ -451,11 +452,7 @@
+    if (it == fFontMap.end())
+    {
+       TString ttpath, file;
+-# ifdef TTFFONTDIR
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
+-# else
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
+-# endif
++      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
+       {
+          //For extenede we have both ttf and otf.
+          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -669,14 +669,7 @@
+          switch (parm1) {
+          case kGLHelpAbout: {
+ #ifdef R__UNIX
+-            TString rootx;
+-#ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-#else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-#endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -197,13 +197,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                        TTFFONTDIR
+-# else
+-                                        "$(ROOTSYS)/fonts"
+-# endif
+-                                        );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (fGLTextFont) delete fGLTextFont;
+diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -84,12 +84,7 @@
+ 
+    if (strcmp(appClassName, "proofserv")) {
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR);
+-#else
+-                                          "$(ROOTSYS)/fonts");
+-#endif
+-
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
+       if (!ttfont)
+diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
+--- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -83,46 +83,29 @@
+    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
+    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
+ 
+-   TString icon_path;
+-   TString mime_file;
+-   TString line;
+-
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
+ #ifndef R__WIN32
+-# ifdef ROOTICONPATH
+-   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
+-                               ROOTICONPATH);
+-#  ifdef EXTRAICONPATH
+-   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
+-#  else
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-#  endif
+-# else
+-   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
+-                                                       gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-# endif
+-   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
++#endif
++   }
+ 
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
++   TString mime_file = ".root.mimes";
++   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
++   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
+    char *mf = gSystem->ExpandPathName(mime_file.Data());
+    if (mf) {
+       mime_file = mf;
+       delete [] mf;
+    }
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-#ifdef ROOTETCDIR
+-      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
+-#else
+-      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
+-#else // R__WIN32
+-   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
++   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
++      mime_file = "root.mimes";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
++   }
+ 
+    // Setup colors...
+    fClient->GetColorByName("white", fWhite);  // white and black always exist
+diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -842,14 +842,7 @@
+ void TGTextEditor::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -702,14 +702,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1962,14 +1962,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1192,14 +1192,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
+--- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
+@@ -629,14 +629,7 @@
+                   case kM_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
+--- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -5812,14 +5812,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++		         TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
+--- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -1348,18 +1348,7 @@
+    R__LOCKGUARD(GetMakeClassMutex());
+ 
+    fPathInfo.fEtcDir = "html";
+-
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
+-#else
+-   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
+-# ifdef ROOTPREFIX
+-   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
+-# else
+-   if (getenv("ROOTSYS"))
+-      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
+-# endif
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
+ 
+    return fPathInfo.fEtcDir;
+ }
+@@ -1666,12 +1655,7 @@
+                   if (posSpace != std::string::npos)
+                      lib.erase(posSpace);
+                   if (rootLibs.find(lib) == rootLibs.end()) {
+-#ifdef ROOTLIBDIR
+-                     TString rootlibdir = ROOTLIBDIR;
+-#else
+-                     TString rootlibdir = "lib";
+-                     gSystem->PrependPathName(gRootDir, rootlibdir);
+-#endif
++                     TString rootlibdir = TROOT::GetLibDir();
+                      TString sLib(lib);
+                      if (sLib.Index('.') == -1) {
+                         sLib += ".";
+diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
+--- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
+@@ -3047,11 +3047,7 @@
+          return;
+       }
+       // Get Makefile.arch
+-#ifdef ROOTETCDIR
+-      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
+-#else
+-      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
+-#endif
++      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(mkarchsrc))
+          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
+       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
+@@ -40,5 +40,5 @@
+   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+-  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
+ endif()
+diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
+--- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
+@@ -173,15 +173,9 @@
+ 
+ int main()
+ {
+-#ifdef ROOTPREFIX
+-   string rootbin(ROOTBINDIR);
+-   string rootlib(ROOTLIBDIR);
+-   string rootetc(ROOTETCDIR);
+-#else
+-   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
+-   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
+-   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
+-#endif
++   string rootbin(TROOT::GetBinDir());
++   string rootlib(TROOT::GetLibDir());
++   string rootetc(TROOT::GetEtcDir());
+ 
+    // If needed, install ROOT notebook files in the user's home directory
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
+--- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
+@@ -690,11 +690,9 @@
+ .NOTPARALLEL:
+ endif
+ 
+-ifeq ($(USECONFIG),FALSE)
+ all: tutorials/hsimple.root
+ tutorials/hsimple.root: rootexecs postbin
+-	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
+-endif
++	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
+ 
+ all:            rootexecs postbin
+ 	@echo " "
+@@ -1119,7 +1117,7 @@
+ 
+ $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
+ 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
+-	@$(MAKEPCH) $@
++	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
+ 
+ $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
+ 	@mkdir -p $(dir $@)
+@@ -1224,8 +1222,6 @@
+ 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
+ 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
+ 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
+-	   (cd $(DESTDIR)$(TUTDIR); \
+-	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+ 	fi
+ 
+ uninstall:
+@@ -1352,7 +1348,6 @@
+ 		--exclude proofd.xinetd \
+ 		--exclude rootd.rc.d \
+ 		--exclude rootd.xinetd \
+-		--exclude gitinfo.txt \
+ 		$(ROOT_SRCDIR)/etc . ; \
+ 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
+ 	$(RSYNC) \
+diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
+--- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
+@@ -22,9 +22,6 @@
+ 
+ 
+ #include "RConfigure.h"
+-// #ifndef ROOTINCDIR
+-// #define MATH_NO_PLUGIN_MANAGER
+-// #endif
+ 
+ #include <algorithm>
+ #include <functional>
+diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
+@@ -551,11 +551,8 @@
+    const char *fn;
+ 
+    if (!FileName[0]) {
+-#ifdef ROOTETCDIR
+-      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
+-#else
+-      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++      default_name = "pdg_table.txt";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
+       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
+    } else {
+       fn = FileName;
+diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
+--- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
+@@ -23,7 +23,6 @@
+ add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
+-add_dependencies(rsa move_headers)
+ 
+ if(ssl)
+   include_directories(${OPENSSL_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
+--- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
+@@ -95,18 +95,8 @@
+ {
+    // Executables and conf dirs
+ 
+-   string execdir, etcdir;
+-#ifdef ROOTBINDIR
+-   execdir = string(ROOTBINDIR);
+-#endif
+-#ifdef ROOTETCDIR
+-   etcdir = string(ROOTETCDIR);
+-#endif
+-
+-   // Define rootbindir if not done already
+-   if (!execdir.length())
+-      execdir = string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
++   string execdir = TROOT::GetBinDir().Data();
+    if (execdir.length()) {
+       int len = 15 + execdir.length();
+       char *tmp = new char[len+1];
+@@ -117,10 +107,8 @@
+          return -1;
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!etcdir.length())
+-      etcdir = string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
++   string etcdir = TROOT::GetEtcDir().Data();
+    if (etcdir.length()) {
+       int len = 15 + etcdir.length();
+       char *tmp = new char[len+1];
+diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
+--- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -4110,19 +4110,9 @@
+          ::Info("TAuthenticate::ReadRootAuthrc",
+                 "file %s cannot be read (errno: %d)", authrc, errno);
+       delete [] authrc;
+-#ifdef ROOTETCDIR
+-      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
+-#else
+-      char etc[1024];
+-#ifdef WIN32
+-      snprintf(etc, 1024, "%s\\etc", gRootDir);
+-#else
+-      snprintf(etc, 1024, "%s/etc", gRootDir);
+-#endif
+-      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
+-#endif
++      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
+       if (gDebug > 2)
+-         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
++         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
+       if (gSystem->AccessPathName(authrc, kReadPermission)) {
+          if (gDebug > 1)
+             ::Info("TAuthenticate::ReadRootAuthrc",
+diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
+--- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -147,11 +147,7 @@
+    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
+ 
+    if (fJSROOTSYS.Length() == 0) {
+-#ifdef ROOTETCDIR
+-      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
+-#else
+-      TString jsdir("$(ROOTSYS)/etc/http");
+-#endif
++      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(jsdir)) {
+          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
+          fJSROOTSYS = ".";
+@@ -162,18 +158,7 @@
+ 
+    AddLocation("currentdir/", ".");
+    AddLocation("jsrootsys/", fJSROOTSYS);
+-
+-   const char *rootsys = gSystem->Getenv("ROOTSYS");
+-   if (rootsys != 0) {
+-      AddLocation("rootsys/", rootsys);
+-   } else {
+-#ifdef ROOTPREFIX
+-      TString sysdir = ROOTPREFIX;
+-#else
+-      TString sysdir = "$(ROOTSYS)";
+-#endif
+-      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
+-   }
++   AddLocation("rootsys/", TROOT::GetRootSys());
+ 
+    fDefaultPage = fJSROOTSYS + "/files/online.htm";
+    fDrawPage = fJSROOTSYS + "/files/draw.htm";
+diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
+--- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -1275,17 +1275,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
+--- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -335,22 +335,7 @@
+       }
+    }
+ 
+-   TString confdir;
+-#ifndef ROOTPREFIX
+-   // try to guess the config directory...
+-   if (gSystem->Getenv("ROOTSYS")) {
+-      confdir = TString(gSystem->Getenv("ROOTSYS"));
+-   } else {
+-      // Try to guess it from 'root.exe' path
+-      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
+-                                     "root.exe", kExecutePermission);
+-      confdir = rootexe;
+-      confdir.Resize(confdir.Last('/'));
+-      delete [] rootexe;
+-   }
+-#else
+-   confdir = TString(ROOTPREFIX);
+-#endif
++   TString confdir = TROOT::GetRootSys();
+    if (!confdir.Length()) {
+       Error("Authenticate", "config dir undefined");
+       return kFALSE;
+diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
+--- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
+@@ -2528,10 +2528,13 @@
+ 
+    if (argc > 0) {
+       confdir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTPREFIX
++   }
++
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
+       if (!confdir.length()) {
++         // try to guess the config directory...
+          if (getenv("ROOTSYS")) {
+             confdir = getenv("ROOTSYS");
+             if (gDebug > 0)
+@@ -2542,31 +2545,26 @@
+                ErrorInfo("main: no config directory specified");
+          }
+       }
+-#else
+-      confdir = ROOTPREFIX;
+-#endif
++      rootbindir = std::string(confdir).append("/bin");
++      rootetcdir = std::string(confdir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else {
++      if (!confdir.length())
++         confdir = ROOTPREFIX;
++      rootbindir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
+    }
+-#ifdef ROOTBINDIR
+-   rootbindir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+ #endif
+ 
+-   // Define rootbindir if not done already
+-   if (!rootbindir.length())
+-      rootbindir = std::string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
+    if (rootbindir.length()) {
+       char *tmp1 = new char[15 + rootbindir.length()];
+       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
+       putenv(tmp1);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp1 = new char[15 + rootetcdir.length()];
+       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
+--- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
+@@ -31,7 +31,6 @@
+ 
+ #---static library needed for rootd and proofd --------------------------------------------
+ add_library(rpdutil STATIC ${rpdutilsrcs})
+-add_dependencies(rpdutil move_headers)
+ 
+ ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
+ 
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
+@@ -436,17 +436,7 @@
+    if (fgWrksMax == -2) {
+       // Find the max number of workers, if any
+       TString sysname = "system.rootrc";
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sysname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
+       TEnv sysenv(0);
+       sysenv.ReadFile(s, kEnvGlobal);
+       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
+@@ -792,17 +782,9 @@
+       return -1;
+    }
+    // ROOTSYS
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
+-#else
+-   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
+    // Conf dir
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
+-#else
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
+    // TMPDIR
+    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
+    // Log file in the log dir
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
+@@ -3026,13 +3026,7 @@
+ #ifdef R__UNIX
+    // Add bindir to PATH
+    TString path(gSystem->Getenv("PATH"));
+-   TString bindir;
+-# ifdef ROOTBINDIR
+-   bindir = ROOTBINDIR;
+-# else
+-   bindir = gSystem->Getenv("ROOTSYS");
+-   if (!bindir.IsNull()) bindir += "/bin";
+-# endif
++   TString bindir(TROOT::GetBinDir());
+    // Augment PATH, if required
+    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
+    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
+diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
+@@ -78,13 +78,8 @@
+ {
+    // Command to be executed
+    TString cmd;
+-#ifdef R__HAVE_CONFIG
+    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
+-#else
+-   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
+-#endif
++            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
+             gSystem->GetPid(), gDebug);
+    // Execute
+    if (gSystem->Exec(cmd) != 0) {
+diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
+@@ -14,7 +14,7 @@
+ # Generation and installation of the PAR files required by the benchmark 
+ add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
+-add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
++add_dependencies(ProofBenchPARFiles move_artifacts)
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
+     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
+@@ -1331,11 +1331,7 @@
+       // Is it the default selector?
+       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("MakeDataSet", "uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
+@@ -26,6 +26,7 @@
+ #include "TMap.h"
+ #include "TProof.h"
+ #include "TProofBenchTypes.h"
++#include "TROOT.h"
+ 
+ 
+ ClassImp(TProofBenchDataSet)
+@@ -145,11 +146,7 @@
+    TString selName("TSelHandleDataSet");
+    if (!TClass::GetClass(selName)) {
+       // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+       Info("Handle", "Uploading '%s' ...", par.Data());
+       if (fProof->UploadPackage(par) != 0) {
+          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
+@@ -275,11 +275,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelCPUDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
+@@ -163,11 +163,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelDataDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
+--- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
+@@ -1005,49 +1005,48 @@
+ 
+    if (argc > 0) {
+       gConfDir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTDATADIR
+-      if (getenv("ROOTSYS")) {
+-         gConfDir = getenv("ROOTSYS");
+-         if (gDebug > 0)
+-            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
+-                      gConfDir.c_str());
+-      } else {
+-         Error(ErrFatal, -1, "main: no config directory specified");
+-      }
+-#else
+-      gConfDir = ROOTDATADIR;
+-#endif
+    }
+-#ifdef ROOTBINDIR
+-   gRootBinDir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+-#endif
+ 
+-   // Define gRootBinDir if not done already
+-   if (!gRootBinDir.length())
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
++      if (!gConfDir.length()) {
++         // try to guess the config directory...
++         if (getenv("ROOTSYS")) {
++            gConfDir = getenv("ROOTSYS");
++            if (gDebug > 0)
++               ErrorInfo("main: no config directory specified using"
++                         " ROOTSYS (%s)", gConfDir.c_str());
++         } else {
++            Error(ErrFatal, -1, "main: no config directory specified");
++         }
++      }
+       gRootBinDir = std::string(gConfDir).append("/bin");
++      rootetcdir = std::string(gConfDir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else  {
++      if (!gConfDir.length())
++         gConfDir = ROOTPREFIX;
++      gRootBinDir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
++   }
++#endif
+ 
+-   // make sure it contains the executable we want to run
++   // make sure gRootBinDir contains the executable we want to run
+    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
+    if (access(arg0.c_str(), X_OK) == -1) {
+       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
+                         gConfDir.c_str());
+    }
+-   // Make it available to all the session via env
++   // Make gRootBinDir available to all the session via env
+    if (gRootBinDir.length()) {
+       char *tmp = new char[15 + gRootBinDir.length()];
+       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
+       putenv(tmp);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(gConfDir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp = new char[15 + rootetcdir.length()];
+       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
+--- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
+@@ -384,11 +384,19 @@
+    } else {
+       // Check the ROOT dirs
+       if (fROOT.size() <= 0) {
++         XrdOucString dir, bd, ld, id, dd;
+ #ifdef R__HAVE_CONFIG
+-         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
+-                      id(ROOTINCDIR), dd(ROOTDATADIR);
+-#else
+-         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
++         if (getenv("ROOTIGNOREPREFIX"))
++#endif
++            dir = getenv("ROOTSYS");
++#ifdef R__HAVE_CONFIG
++         else {
++            dir = ROOTPREFIX;
++            bd = ROOTBINDIR;
++            ld = ROOTLIBDIR;
++            id = ROOTINCDIR;
++            dd = ROOTDATADIR;
++         }
+ #endif
+          // None defined: use ROOTSYS as default, if any; otherwise we fail
+          if (dir.length() > 0) {
+diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
+--- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -25,10 +25,4 @@
+                             WORLD_EXECUTE WORLD_READ
+                 DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
+--- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -8,9 +8,4 @@
+ ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
+                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
+ 
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
+--- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -200,7 +200,6 @@
+    return 0;
+ }
+ 
+-#ifndef ROOTPREFIX
+ static const char *GetExePath()
+ {
+    static std::string exepath;
+@@ -247,7 +246,6 @@
+       delete [] ep;
+    }
+ }
+-#endif
+ 
+ static void SetDisplay()
+ {
+@@ -296,7 +294,9 @@
+ 
+ static void SetLibraryPath()
+ {
+-#ifndef ROOTLIBDIR
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Set library path for the different platforms.
+ 
+    char *msg;
+@@ -343,6 +343,8 @@
+    }
+ #  endif
+    putenv(msg);
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ 
+@@ -440,7 +442,9 @@
+    char **argvv;
+    char  arg0[kMAXPATHLEN];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Try to set ROOTSYS depending on pathname of the executable
+    SetRootSys();
+ 
+@@ -449,6 +453,8 @@
+               argv[0], argv[0]);
+       return 1;
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // In batch mode don't show splash screen, idem for no logo mode,
+@@ -473,23 +479,20 @@
+    if (notebook) {
+       // Build command
+ #ifdef ROOTBINDIR
+-      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+-#else
+-      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++      if (getenv("ROOTIGNOREPREFIX"))
++#endif
++         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++#ifdef ROOTBINDIR
++      else
++         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+ #endif
+ 
+       // Execute ROOT notebook binary
+       execl(arg0, arg0, NULL);
+-  
++
+       // Exec failed
+-#ifndef ROOTBINDIR
+-      fprintf(stderr,
+-              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
+-              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
+-#else
+-      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
+-              argv[0], ROOTBINDIR, ROOTNBBINARY);
+-#endif
++      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
++              argv[0], arg0);
+ 
+       return 1;
+    }
+@@ -586,9 +589,12 @@
+    // Build argv vector
+    argvv = new char* [argc+2];
+ #ifdef ROOTBINDIR
+-   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+-#else
+-   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++   if (getenv("ROOTIGNOREPREFIX"))
++#endif
++      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++#ifdef ROOTBINDIR
++   else
++      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+ #endif
+    argvv[0] = arg0;
+    argvv[1] = (char *) "-splash";
+@@ -604,14 +610,8 @@
+    execv(arg0, argvv);
+ 
+    // Exec failed
+-#ifndef ROOTBINDIR
+-   fprintf(stderr,
+-           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
+-           argv[0], getenv("ROOTSYS"), ROOTBINARY);
+-#else
+-   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
+-           argv[0], ROOTBINDIR, ROOTBINARY);
+-#endif
++   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
++           argv[0], arg0);
+ 
+    return 1;
+ }
+diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
+--- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -475,14 +475,7 @@
+                   case M_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
+--- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -1270,14 +1270,7 @@
+ void TGRootIDE::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -48,11 +48,7 @@
+ ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -31,11 +31,7 @@
+ ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
+--- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
+@@ -2049,14 +2049,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
+--- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
+@@ -1017,14 +1017,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
diff --git a/root-testfiles.sh b/root-testfiles.sh
new file mode 100755
index 0000000..e7160b8
--- /dev/null
+++ b/root-testfiles.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+
+SITE="http://root.cern.ch/files"
+
+mkdir files
+pushd files
+
+wget -N ${SITE}/aleph_ref_4.root
+wget -N ${SITE}/aleph.root
+wget -N ${SITE}/alice3_ref_4.root
+wget -N ${SITE}/alice3.root
+wget -N ${SITE}/ams_ref_3.root
+wget -N ${SITE}/ams.root
+wget -N ${SITE}/babar2_ref_3.root
+wget -N ${SITE}/babar2.root
+wget -N ${SITE}/barres_ref_3.root
+wget -N ${SITE}/barres.root
+wget -N ${SITE}/belle_ref_3.root
+wget -N ${SITE}/belle.root
+wget -N ${SITE}/bes_ref_3.root
+wget -N ${SITE}/bes.root
+wget -N ${SITE}/brahms_ref_3.root
+wget -N ${SITE}/brahms.root
+wget -N ${SITE}/btev_ref_3.root
+wget -N ${SITE}/btev.root
+wget -N ${SITE}/cdf_ref_4.root
+wget -N ${SITE}/cdf.root
+wget -N ${SITE}/chambers_ref_3.root
+wget -N ${SITE}/chambers.root
+wget -N ${SITE}/cms_ref_3.root
+wget -N ${SITE}/cms.root
+wget -N ${SITE}/dubna_ref_3.root
+wget -N ${SITE}/dubna.root
+wget -N ${SITE}/e907_ref_3.root
+wget -N ${SITE}/e907.root
+wget -N ${SITE}/felix_ref_3.root
+wget -N ${SITE}/felix.root
+wget -N ${SITE}/ganil_ref_3.root
+wget -N ${SITE}/ganil.root
+wget -N ${SITE}/gem_ref_3.root
+wget -N ${SITE}/gem.root
+wget -N ${SITE}/hades2_ref_4.root
+wget -N ${SITE}/hades2.root
+wget -N ${SITE}/hermes_ref_3.root
+wget -N ${SITE}/hermes.root
+wget -N ${SITE}/integral_ref_3.root
+wget -N ${SITE}/integral.root
+wget -N ${SITE}/lhcbfull_ref_3.root
+wget -N ${SITE}/lhcbfull.root
+wget -N ${SITE}/na35_ref_3.root
+wget -N ${SITE}/na35.root
+wget -N ${SITE}/na47_ref_3.root
+wget -N ${SITE}/na47.root
+wget -N ${SITE}/na49_ref_3.root
+wget -N ${SITE}/na49.root
+wget -N ${SITE}/p326_ref_3.root
+wget -N ${SITE}/p326.root
+wget -N ${SITE}/phenix_ref_3.root
+wget -N ${SITE}/phenix.root
+wget -N ${SITE}/phobos2_ref_4.root
+wget -N ${SITE}/phobos2.root
+wget -N ${SITE}/sdc_ref_3.root
+wget -N ${SITE}/sdc.root
+wget -N ${SITE}/sld_ref_3.root
+wget -N ${SITE}/sld.root
+wget -N ${SITE}/star_ref_3.root
+wget -N ${SITE}/star.root
+wget -N ${SITE}/tesla_ref_3.root
+wget -N ${SITE}/tesla.root
+wget -N ${SITE}/wa91_ref_3.root
+wget -N ${SITE}/wa91.root
+
+wget -N ${SITE}/europe.root
+wget -N ${SITE}/linearIO.root
+wget -N ${SITE}/stressHistogram.5.18.00.root
+wget -N ${SITE}/stressRooFit_v534_ref.root
+wget -N ${SITE}/tmva_class_example.root
+wget -N ${SITE}/tmva_reg_example.root
+wget -N ${SITE}/usa.root
+
+for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
+
+popd
+
+tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-tildes.patch b/root-tildes.patch
new file mode 100644
index 0000000..bb03674
--- /dev/null
+++ b/root-tildes.patch
@@ -0,0 +1,194 @@
+diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
+--- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
+@@ -810,7 +810,7 @@
+ ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
+ /// ~~~
+ ///  Note: We recommend using the method TDirectory::GetObject:
+-/// ~~~ {.cpp}~
++/// ~~~ {.cpp}
+ ///      MyClass *obj = 0;
+ ///      directory->GetObject("some object inheriting from MyClass",obj);
+ ///      if (obj) { ... we found what we are looking for ... }
+diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
+--- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
+@@ -1040,7 +1040,7 @@
+ ///
+ ///       TQObject::Connect("TGButton", "Clicked()",
+ ///                         "TH2F", myHist, "Draw(Option_t*)");
+-///~~~
++/// ~~~
+ /// cl == 0 - corresponds to function (interpereted or global)
+ ///           the name of the function is defined by the slot string,
+ ///           parameter receiver should be 0.
+diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -2677,7 +2677,7 @@
+ /// We allow them to type:
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C++(arg1,arg2)
+-///  ~~~
++/// ~~~
+ /// or
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C+(arg1,arg2)
+@@ -3843,7 +3843,7 @@
+ /// the use of ';' to separate several instructions. However, shell specific
+ /// construct should be avoided. In particular this description can contain
+ /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ /// Five special variables will be expanded before execution:
+ ///   Variable name       Expands to
+ ///   -------------       ----------
+@@ -3915,7 +3915,7 @@
+ /// IncludePath should contain the list of compiler flags to indicate where
+ /// to find user defined header files. It is used to expand $IncludePath in
+ /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
+-/// ~~~ {.cpp}
++///  ~~~ {.cpp}
+ ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
+ ///  ~~~
+ /// the default value of IncludePath on Unix is:
+diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
+--- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -663,7 +663,7 @@
+ /// Create an array of clone objects of class cl. The class must inherit from
+ /// TObject. If the class defines an own operator delete(), make sure that
+ /// it looks like this:
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///    void MyClass::operator delete(void *vp)
+ ///    {
+ ///       if ((Long_t) vp != TObject::GetDtorOnly())
+diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
+--- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
+@@ -321,7 +321,7 @@
+ /// ~~~
+ /// Otherwise override the `Print(Option_t *option, Int_t)`
+ /// variant. Remember to declare:
+-/// ~~~ {.cpp]
++/// ~~~ {.cpp}
+ ///   using TCollection::Print;
+ /// ~~~
+ /// somewhere close to the method declaration.
+diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
+--- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
+@@ -189,7 +189,7 @@
+  int i;
+  i = TMath::LocMin(10, &v[0]);
+  std::cout << v[i] << std::endl;
+- ```
++```
+  
+ Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
+ 
+@@ -233,7 +233,7 @@
+ 
+  // old-style
+  mean = TMath::Mean(n, &v[0], &w[0]);
+- ```
++```
+  
+ ### Special and Statistical Functions.
+ 
+diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
+@@ -5964,7 +5964,7 @@
+ ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
+ ///       TImage *im2 = TImage::Create();
+ ///       im2->SetImageBuffer(&buf, TImage::kXpm);
+-///  ~~~
++/// ~~~
+ ///      2.  xpm as an array of strings (pre-parsed)
+ /// ~~~ {.cpp}
+ ///    For example:
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -132,7 +132,7 @@
+ because we clear only the pads and not the main canvas.
+ Note that `c1->Update` must be called at the end of the first picture.
+ 
+-~~~ {.cpp}
++ ~~~ {.cpp}
+      {
+         TFile *f1 = new TFile("hsimple.root");
+         TCanvas *c1 = new TCanvas("c1");
+diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
+--- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -330,7 +330,7 @@
+ ///    | 2-----|-3
+ ///    |/      |/
+ ///    1-------0
+-///~~~
++/// ~~~
+ 
+ void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
+ {
+diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
+--- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -71,7 +71,7 @@
+ To change attributes of the rulers attached to the current Pad, one may
+ query its pointer first:
+ 
+-~~~ {.cpp]
++~~~ {.cpp}
+ TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
+ if (axis) {
+   TAxis3D::ToggleRulers()     // To pop axes down
+diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
+@@ -80,7 +80,7 @@
+ many times.
+ 
+ The following very simple macro shows how to build and fill a `TH2Poly`:
+-~~~ {.cpp]
++~~~ {.cpp}
+ {
+     TH2Poly *h2p = new TH2Poly();
+ 
+diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
+--- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
+@@ -2584,9 +2584,9 @@
+ ///     T->Fill(); //loop
+ ///     file->Write();
+ ///     file->Close();
+-///~~~
++/// ~~~
+ /// but do the following:
+-///~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///     TFile *file = new TFile("myfile.root","recreate");
+ ///     TTree *T = new TTree("T","title");
+ ///     T->Fill(); //loop
+@@ -6487,7 +6487,7 @@
+ /// ~~~ {.cpp}
+ ///     TPrincipal *principal =
+ ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
+-///  ~~~
++/// ~~~
+ 
+ TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
+ {
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
+@@ -3004,6 +3004,7 @@
+ /// The function return the status of the fit in the following form
+ /// ~~~{.cpp}
+ ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
++/// ~~~
+ /// -  The fitResult is 0 is the fit is OK.
+ /// -  The fitResult is negative in case of an error not connected with the fit.
+ /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
new file mode 100644
index 0000000..20209ec
--- /dev/null
+++ b/root-tmath-doc.patch
@@ -0,0 +1,274 @@
+diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
+--- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
+@@ -359,9 +359,9 @@
+ /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
+ /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
+ ///
+-///  Begin_Latex
+-///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
+-///   End_Latex
++///  \f[
++///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
++///  \f]
+ ///
+ ///
+ ///--- Nve 14-nov-1998 UU-SAP Utrecht
+@@ -559,15 +559,16 @@
+ /// see TMath::PoissonI to get a non-smooth function.
+ /// Note that for large values of par, it is better to call
+ ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
++///   poisson->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Poisson(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/Poisson.gif">
+-*/
+-//End_Html
+-
+    if (x<0)
+       return 0;
+    else if (x == 0.0)
+@@ -587,15 +588,17 @@
+ /// compute the Poisson distribution function for (x,par)
+ /// This is a non-smooth function.
+ /// This function is equivalent to ROOT::Math::poisson_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
++///   poissoni->SetNpx(1000);
++///   poissoni->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::PoissonI(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/PoissonI.gif">
+-*/
+-//End_Html
+-
+    Int_t ix = Int_t(x);
+    return Poisson(ix,par);
+ }
+@@ -630,36 +633,33 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculates the Kolmogorov distribution function,
+-///Begin_Html
++/// \f[
++/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
++/// \f]
++/// which gives the probability that Kolmogorov's test statistic will exceed
++/// the value z assuming the null hypothesis. This gives a very powerful
++/// test for comparing two one-dimensional distributions.
++/// see, for example, Eadie et al, "statistocal Methods in Experimental
++/// Physics', pp 269-270).
++///
++/// This function returns the confidence level for the null hypothesis, where:
++///   z = dn*sqrt(n), and
++///   dn  is the maximum deviation between a hypothetical distribution
++///       function and an experimental distribution with
++///   n   events
++///
++/// NOTE: To compare two experimental distributions with m and n events,
++///       use z = sqrt(m*n/(m+n))*dn
++///
++/// Accuracy: The function is far too accurate for any imaginable application.
++///           Probabilities less than 10^-15 are returned as zero.
++///           However, remember that the formula is only valid for "large" n.
++/// Theta function inversion formula is used for z <= 1
++///
++/// This function was translated by Rene Brun from PROBKL in CERNLIB.
+ 
+ Double_t TMath::KolmogorovProb(Double_t z)
+ {
+-   /*
+-   <img src="gif/kolmogorov.gif">
+-   */
+-   //End_Html
+-   // which gives the probability that Kolmogorov's test statistic will exceed
+-   // the value z assuming the null hypothesis. This gives a very powerful
+-   // test for comparing two one-dimensional distributions.
+-   // see, for example, Eadie et al, "statistocal Methods in Experimental
+-   // Physics', pp 269-270).
+-   //
+-   // This function returns the confidence level for the null hypothesis, where:
+-   //   z = dn*sqrt(n), and
+-   //   dn  is the maximum deviation between a hypothetical distribution
+-   //       function and an experimental distribution with
+-   //   n    events
+-   //
+-   // NOTE: To compare two experimental distributions with m and n events,
+-   //       use z = sqrt(m*n/(m+n))*dn
+-   //
+-   // Accuracy: The function is far too accurate for any imaginable application.
+-   //           Probabilities less than 10^-15 are returned as zero.
+-   //           However, remember that the formula is only valid for "large" n.
+-   // Theta function inversion formula is used for z <= 1
+-   //
+-   // This function was translated by Rene Brun from PROBKL in CERNLIB.
+-
+    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
+    const Double_t w = 2.50662827;
+    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
+@@ -2254,15 +2254,40 @@
+ /// The definition can be found in "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
+ /// use now implementation in ROOT::Math::gamma_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
++///
++///   gdist->SetParameters(0.5, 0., 1.);
++///   gdist->SetLineColor(2);
++///   TF1 *gdist1 = gdist->DrawCopy("L");
++///   gdist->SetParameters(1.0, 0., 1.);
++///   gdist->SetLineColor(3);
++///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(2.0, 0., 1.);
++///   gdist->SetLineColor(4);
++///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(5.0, 0., 1.);
++///   gdist->SetLineColor(6);
++///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
+ {
+-   /*
+-   <img src="gif/gammadist.gif">
+-   */
+-   //End_Html
+-
+    if ((x<mu) || (gamma<=0) || (beta <=0)) {
+       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
+       return 0;
+@@ -2308,21 +2333,47 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Computes the density of LogNormal distribution at point x.
+ /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
+-/// sigma is the shape parameter
+-/// theta is the location parameter
+-/// m is the scale parameter
++/// - sigma is the shape parameter
++/// - theta is the location parameter
++/// - m is the scale parameter
+ /// The formula was taken from "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
+ /// Implementation using ROOT::Math::lognormal_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
++///   logn->SetMinimum(1e-3);
++///
++///   logn->SetParameters(0.5, 0., 1.);
++///   logn->SetLineColor(2);
++///   TF1 *logn1 = logn->DrawCopy("L");
++///   logn->SetParameters(1.0, 0., 1.);
++///   logn->SetLineColor(3);
++///   TF1 *logn2 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(2.0, 0., 1.);
++///   logn->SetLineColor(4);
++///   TF1 *logn3 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(5.0, 0., 1.);
++///   logn->SetLineColor(6);
++///   TF1 *logn4 = logn->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
+ {
+-   /*
+-   <img src="gif/lognormal.gif">
+-   */
+-   //End_Html
+-
+    if ((x<theta) || (sigma<=0) || (m<=0)) {
+       Error("TMath::Lognormal", "illegal parameter values");
+       return 0;
+@@ -2615,15 +2666,39 @@
+ ///density function computed numerically in an accurate way: our approximation
+ ///shows a difference of less than 3% around the peak of the density function, slowly
+ ///increasing going towards the extreme tails to the right and to the left"
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
++///
++///   vavilov->SetParameters(0.5, 0.);
++///   vavilov->SetLineColor(2);
++///   TF1 *vavilov1 = vavilov->DrawCopy("L");
++///   vavilov->SetParameters(0.3, 0.);
++///   vavilov->SetLineColor(3);
++///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.2, 0.);
++///   vavilov->SetLineColor(4);
++///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.1, 0.);
++///   vavilov->SetLineColor(6);
++///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
++///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
++///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
++///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
++///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
+ {
+-/*
+-<img src="gif/Vavilov.gif">
+-*/
+-//End_Html
+-
+    Double_t *ac = new Double_t[14];
+    Double_t *hc = new Double_t[9];
+ 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
new file mode 100644
index 0000000..95090d6
--- /dev/null
+++ b/root-tprincipal-doc.patch
@@ -0,0 +1,483 @@
+diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
+index 76bb5d4..d5bab47 100644
+--- a/hist/hist/src/TPrincipal.cxx
++++ b/hist/hist/src/TPrincipal.cxx
+@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
+ error \f$E_N\f$ is minimized.
+ 
+ The transformation matrix to go from the pattern space to the feature
+-space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
++space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
+ \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
+ \f[
+   \mathsf{T} = \left[
+@@ -207,10 +207,6 @@ in the transformed space.
+ Christian Holm August 2000, CERN
+ */
+ 
+-// $Id$
+-// $Date: 2006/05/24 14:55:26 $
+-// $Author: brun $
+-
+ #include "TPrincipal.h"
+ 
+ #include "TVectorD.h"
+@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
+ ClassImp(TPrincipal);
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Empty CTOR, Do not use.
++/// Empty constructor. Do not use.
+ 
+ TPrincipal::TPrincipal()
+   : fMeanValues(0),
+@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Ctor. Argument is number of variables in the sample of data
++/// Constructor. Argument is number of variables in the sample of data
+ /// Options are:
+-///   N       Normalize the covariance matrix (default)
+-///   D       Store input data (default)
++///  - N       Normalize the covariance matrix (default)
++///  - D       Store input data (default)
+ ///
+ /// The created object is  named "principal" by default.
+ 
+@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///copy constructor
++/// Copy constructor.
+ 
+ TPrincipal::TPrincipal(const TPrincipal& pr) :
+   TNamed(pr),
+@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///assignement operator
++/// Assignment operator.
+ 
+ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ {
+@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// destructor
++/// Destructor.
+ 
+ TPrincipal::~TPrincipal()
+ {
+@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Html
++/// Add a data point and update the covariance matrix. The input
++/// array must be <TT>fNumberOfVariables</TT> long.
++///
++///
++/// The Covariance matrix and mean values of the input data is calculated
++/// on the fly by the following equations:
++///
++/// \f[
++/// \left<x_i\right>^{(0)}  = x_{i0}
++/// \f]
++///
++///
++/// \f[
++/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
++/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
++/// \f]
++///
++/// \f[
++/// C_{ij}^{(0)} = 0
++/// \f]
++///
++///
++///
++/// \f[
++/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
++/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
++///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
++/// - \frac1n C_{ij}^{(n-1)}
++/// \f]
++///
++/// since this is a really fast method, with no rounding errors (please
++/// refer to CERN 72-21 pp. 54-106).
++///
++///
++/// The data is stored internally in a <TT>TVectorD</TT>, in the following
++/// way:
++///
++/// \f[
++/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
++///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
++/// \f]
++///
++/// With \f$P\f$ as defined in the class description.
+ 
+ void TPrincipal::AddRow(const Double_t *p)
+ {
+-  /*
+-     </PRE>
+-Add a data point and update the covariance matrix. The input
+-array must be <TT>fNumberOfVariables</TT> long.
+-
+-<P>
+-The Covariance matrix and mean values of the input data is caculated
+-on the fly by the following equations:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(0)}  = x_{i0}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="90" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img36.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(0)} = x_{i0}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
+-+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="302" HEIGHT="42" BORDER="0"
+- SRC="gif/principal_img37.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
+-+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="62" HEIGHT="34" BORDER="0"
+- SRC="gif/principal_img38.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
+-  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="504" HEIGHT="43" BORDER="0"
+- SRC="gif/principal_img39.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{i...
+-...\left&lt;x_j\right&gt;^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-since this is a really fast method, with no rounding errors (please
+-refer to CERN 72-21 pp. 54-106).
+-
+-<P>
+-The data is stored internally in a <TT>TVectorD</TT>, in the following
+-way:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="319" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img40.gif"
+- ALT="\begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-With <IMG
+- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+- SRC="gif/principal_img6.gif"
+- ALT="$P$"> as defined in the class description.
+-     <PRE>
+-  */
+-  // End_Html
+    if (!p)
+       return;
+ 
+@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Generates the file <filename>, with .C appended if it does
++/// Generates the file `<filename>`, with `.C` appended if it does
+ /// argument doesn't end in .cxx or .C.
+ ///
+ /// The file contains the implementation of two functions
+-///
++/// ~~~ {.cpp}
+ ///    void X2P(Double_t *x, Double *p)
+ ///    void P2X(Double_t *p, Double *x, Int_t nTest)
+-///
+-/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
++/// ~~~
++/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
+ /// respectively. Please refer to these methods.
+ ///
+ /// Further, the static variables:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    gNVariables
+ ///    Double_t gEigenValues[]
+ ///    Double_t gEigenVectors[]
+ ///    Double_t gMeanValues[]
+ ///    Double_t gSigmaValues[]
+-///
++/// ~~~
+ /// are initialized. The only ROOT header file needed is Rtypes.h
+ ///
+ /// See TPrincipal::MakeRealCode for a list of options
+@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Make histograms of the result of the analysis.
+ /// The option string say which histograms to create
+-///      X         Histogram original data
+-///      P         Histogram principal components corresponding to
+-///                original data
+-///      D         Histogram the difference between the original data
+-///                and the projection of principal unto a lower
+-///                dimensional subspace (2D histograms)
+-///      E         Histogram the eigenvalues
+-///      S         Histogram the square of the residues
+-///                (see TPrincipal::SumOfSquareResidues)
+-/// The histograms will be named <name>_<type><number>, where <name>
+-/// is the first argument, <type> is one of X,P,D,E,S, and <number>
++///     - X         Histogram original data
++///     - P         Histogram principal components corresponding to
++///                 original data
++///     - D         Histogram the difference between the original data
++///                 and the projection of principal unto a lower
++///                 dimensional subspace (2D histograms)
++///     - E         Histogram the eigenvalues
++///     - S         Histogram the square of the residues
++///                 (see `TPrincipal::SumOfSquareResiduals`)
++/// The histograms will be named `<name>_<type><number>`, where `<name>`
++/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
+ /// is the variable.
+ 
+ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD: Normalize the covariance matrix
++/// Normalize the covariance matrix
+ 
+ void TPrincipal::MakeNormalised()
+ {
+@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Generate the file <classname>PCA.cxx which contains the
+ /// implementation of two methods:
+-///
++/// ~~~ {.cpp}
+ ///    void <classname>::X2P(Double_t *x, Double *p)
+ ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
+-///
++/// ~~~
+ /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
+-/// respectivly. Please refer to these methods.
++/// respectively. Please refer to these methods.
+ ///
+ /// Further, the public static members:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    <classname>::fgNVariables
+ ///    Double_t <classname>::fgEigenValues[]
+ ///    Double_t <classname>::fgEigenVectors[]
+ ///    Double_t <classname>::fgMeanValues[]
+ ///    Double_t <classname>::fgSigmaValues[]
+-///
++/// ~~~
+ /// are initialized, and assumed to exist. The class declaration is
+ /// assumed to be in <classname>.h and assumed to be provided by the
+ /// user.
+@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
+ /// See TPrincipal::MakeRealCode for a list of options
+ ///
+ /// The minimal class definition is:
+-///
++/// ~~~ {.cpp}
+ ///   class <classname> {
+ ///   public:
+ ///     static Int_t    fgNVariables;
+@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
+ ///     void X2P(Double_t *x, Double_t *p);
+ ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
+ ///   };
+-///
++/// ~~~
+ /// Whether the methods <classname>::X2P and <classname>::P2X should
+ /// be static or not, is up to the user.
+ 
+@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Perform the principal components analysis.
+ /// This is done in several stages in the TMatrix::EigenVectors method:
+-/// * Transform the covariance matrix into a tridiagonal matrix.
+-/// * Find the eigenvalues and vectors of the tridiagonal matrix.
++///  - Transform the covariance matrix into a tridiagonal matrix.
++///  - Find the eigenvalues and vectors of the tridiagonal matrix.
+ 
+ void TPrincipal::MakePrincipals()
+ {
+@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+ /// This is the method that actually generates the code for the
+ /// transformations to and from feature space and pattern space
+ /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
+@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Print the statistics
+ /// Options are
+-///      M            Print mean values of original data
+-///      S            Print sigma values of original data
+-///      E            Print eigenvalues of covariance matrix
+-///      V            Print eigenvectors of covariance matrix
++///  - M            Print mean values of original data
++///  - S            Print sigma values of original data
++///  - E            Print eigenvalues of covariance matrix
++///  - V            Print eigenvectors of covariance matrix
+ /// Default is MSE
+ 
+ void TPrincipal::Print(Option_t *opt) const
+@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+-/// Begin_html
++/// Calculates the sum of the square residuals, that is
++///
++/// \f[
++/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
++/// \f]
++///
++/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
++/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
++/// \f$x_i\f$, the original data; I.e., the square distance to the space
++/// spanned by \f$N\f$ eigenvectors.
+ 
+ void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
+ {
+-   /*
+-    </PRE>
+-    Calculates the sum of the square residuals, that is
+-    <BR><P></P>
+-    <DIV ALIGN="CENTER">
+-
+-    <!-- MATH
+-    \begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}
+-    -->
+-
+-
+-    <IMG
+-    WIDTH="147" HEIGHT="58" BORDER="0"
+-    SRC="gif/principal_img52.gif"
+-    ALT="\begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}">
+-    </DIV>
+-    <BR CLEAR="ALL">
+-    <P></P>
+-    where
+-    <!-- MATH
+-    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
+-    -->
+-    <IMG
+-    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img53.gif"
+-    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
+-    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img54.gif"
+-    ALT="$p_i$"> is the
+-    <IMG
+-    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img55.gif"
+-    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
+-    <IMG
+-    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img56.gif"
+-    ALT="$x_i$">, the original data; I.e., the square distance to the space
+-    spanned by <IMG
+-    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img12.gif"
+-    ALT="$N$"> eigenvectors.
+-    <BR>
+-    <PRE>
+-   */
+-   // End_Html
++
+    if (!x)
+       return;
+ 
+@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculate the principal components from the original data vector
+ /// x, and return it in p.
++///
+ /// It's the users responsibility to make sure that both x and p are
+ /// of the right size (i.e., memory must be allocated for p).
+ 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
new file mode 100644
index 0000000..4a4177b
--- /dev/null
+++ b/root-tvector2-comment.patch
@@ -0,0 +1,13 @@
+diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
+--- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
+@@ -96,7 +96,8 @@
+    TVector2 Rotate (Double_t phi) const;
+ 
+                                         // returns phi angle in the interval [0,2*PI)
+-   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
++   static Double_t Phi_0_2pi(Double_t x);
++
+                                         // returns phi angle in the interval [-PI,PI)
+    static Double_t Phi_mpi_pi(Double_t x);
+ 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
index 14a6cfd..f4f3681 100644
--- a/root-type1-embed.patch
+++ b/root-type1-embed.patch
@@ -1,6 +1,6 @@
-diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf2d/mathtext/src/fontembedps.cxx
---- root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/graf2d/mathtext/src/fontembedps.cxx	2015-07-02 09:10:36.740969892 +0200
+diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
+--- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
 @@ -30,14 +30,14 @@
  #ifndef LITTLE_ENDIAN
  #define LITTLE_ENDIAN 1
@@ -19,7 +19,7 @@ diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf
  
  // References:
  //
-@@ -225,27 +225,25 @@
+@@ -236,29 +236,26 @@
        if(magic_number[0] == '\200') {
           // IBM PC format printer font binary
  
@@ -28,23 +28,27 @@ diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf
 -         font_name = "";
 -
           struct pfb_segment_header_s segment_header;
--         size_t offset = 2;
-+         size_t offset = 0;
+          size_t offset = 0;
  
-          // The two char elements of struct pfb_segment_header_s
-          // are most likely aligned to larger than 1 byte
-          // boundaries, so copy all the elements individually
-          segment_header.always_128 = font_data[offset];
-          segment_header.type = font_data[offset + 1];
--         memcpy(&segment_header.length, &font_data[offset + 2],
--                sizeof(unsigned int));
--         offset += sizeof(unsigned int) + 2;
+-         segment_header.type = 0;
++         // The two char elements of struct
++         // pfb_segment_header_s are most likely aligned to
++         // larger than 1 byte boundaries, so copy all the
++         // elements individually
++         segment_header.always_128 = font_data[offset];
++         segment_header.type = font_data[offset + 1];
 +
           while (segment_header.type != TYPE_EOF) {
+-            // The two char elements of struct
+-            // pfb_segment_header_s are most likely aligned to
+-            // larger than 1 byte boundaries, so copy all the
+-            // elements individually
+-            segment_header.always_128 = font_data[offset];
+-            segment_header.type = font_data[offset + 1];
+             memcpy(&segment_header.length, &font_data[offset + 2],
+                    sizeof(unsigned int));
+             offset += sizeof(unsigned int) + 2;
 -#ifdef LITTLE_ENDIAN
-+            memcpy(&segment_header.length, &font_data[offset + 2],
-+                   sizeof(unsigned int));
-+            offset += sizeof(unsigned int) + 2;
 +#ifndef LITTLE_ENDIAN
              segment_header.length =
              bswap_32(segment_header.length);
@@ -54,7 +58,7 @@ diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf
  
              memcpy(buffer, &font_data[offset],
                     segment_header.length);
-@@ -265,6 +263,26 @@
+@@ -278,6 +275,26 @@
                       buffer[segment_header.length - 1] = '\n';
                    }
                    ret.append(buffer, segment_header.length);
@@ -81,7 +85,7 @@ diff -ur root-5.34.32.orig/graf2d/mathtext/src/fontembedps.cxx root-5.34.32/graf
                    break;
                 case TYPE_BINARY:
                    append_asciihex(
-@@ -276,6 +294,9 @@
+@@ -289,6 +306,9 @@
              }
  
              delete [] buffer;
diff --git a/root-unuran.patch b/root-unuran.patch
index e0557e5..0e78176 100644
--- a/root-unuran.patch
+++ b/root-unuran.patch
@@ -1,39 +1,305 @@
-diff -ur root-5.34.13.orig/math/unuran/Module.mk root-5.34.13/math/unuran/Module.mk
---- root-5.34.13.orig/math/unuran/Module.mk	2013-12-01 11:58:21.000000000 +0100
-+++ root-5.34.13/math/unuran/Module.mk	2013-12-03 20:11:58.916479324 +0100
-@@ -31,7 +31,7 @@
-                 $(wildcard $(UNRDIRS)/src/uniform/*.c) \
-                 $(wildcard $(UNRDIRS)/src/urng/*.c)
- else
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS         := $(filter %.c, \
-                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -81,10 +81,9 @@
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
+--- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
+@@ -0,0 +1,21 @@
++# - Locate Unuran library
++# Defines:
++#
++#  UNURAN_FOUND
++#  UNURAN_INCLUDE_DIR
++#  UNURAN_INCLUDE_DIRS (not cached)
++#  UNURAN_LIBRARIES
++
++find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
++find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
++
++set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
++set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
++
++mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
+@@ -73,6 +73,7 @@
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
++ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
+ ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
+ ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
+ ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -142,6 +142,11 @@
+ set(zliblib ${ZLIB_LIBRARY})
+ set(zlibincdir ${ZLIB_INCLUDE_DIR})
  
--include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: 	$(UNURANDIRI)/%.h
++set(builtinunuran ${value${builtin_unuran}})
++set(unuranlibdir ${UNURAN_LIBRARY_DIR})
++set(unuranlib ${UNURAN_LIBRARY})
++set(unuranincdir ${UNURAN_INCLUDE_DIR})
++
+ set(buildgl ${value${opengl}})
+ set(opengllibdir ${OPENGL_LIBRARY_DIR})
+ set(openglulib ${OPENGL_glu_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -40,6 +40,16 @@
+   endif()
+ endif()
+ 
++#---Check for Unuran ------------------------------------------------------------------
++if(NOT builtin_unuran)
++  message(STATUS "Looking for Unuran")
++  find_Package(Unuran)
++  if(NOT UNURAN_FOUND)
++    message(STATUS "Unuran not found. Switching on builtin_unuran option")
++    set(builtin_unuran ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Freetype---------------------------------------------------------------
+ if(NOT builtin_freetype)
+   message(STATUS "Looking for Freetype")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
+@@ -121,6 +121,11 @@
+ 
+ BUILTINPCRE    := @builtinpcre@
+ 
++BUILTINUNURAN  := @builtinunuran@
++UNURANLIBDIR   := @unuranlibdir@
++UNURANLIB      := @unuranlib@
++UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
++
+ BUILTINZLIB    := @builtinzlib@
+ ZLIBLIBDIR     := @zliblibdir@
+ ZLIBCLILIB     := @zliblib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
++++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
+@@ -55,6 +55,7 @@
+    enable_builtin_freetype   \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
++   enable_builtin_unuran     \
+    enable_builtin_zlib       \
+    enable_builtin_lzma       \
+    enable_builtin_llvm       \
+@@ -183,6 +184,7 @@
+ enable_builtin_ftgl=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
++enable_builtin_unuran=no
+ enable_builtin_zlib=no
+ enable_builtin_lzma=no
+ enable_builtin_llvm=yes
+@@ -1704,6 +1706,7 @@
+   builtin-freetype   Build included libfreetype, or use system libfreetype
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
++  builtin-unuran     Build included libunuran, or use system libunuran
+   builtin-zlib       Build included libz, or use system libz
+   builtin-lzma       Build included liblzma, or use system liblzma
+   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
+@@ -2046,6 +2049,7 @@
+    enable_builtin_ftgl="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
++   enable_builtin_unuran="yes"
+    enable_builtin_zlib="yes"
+    enable_builtin_lzma="yes"
+    top_builddir=`cygpath -u $top_builddir`
+@@ -3210,6 +3214,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libunuran (builtin or system)
++#
++if test "x$enable_builtin_unuran" = "xno" ; then
++    check_header "unuran.h" "" \
++        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_unuran=yes
++    else
++        unuraninc=$found_hdr
++        unuranincdir=$found_dir
++    fi
++
++    check_library "libunuran" "$enable_shared" "" \
++        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        unuranlib=""
++        unuranlibdir=""
++        enable_builtin_unuran="yes"
++    else
++        unuranlib="$found_lib"
++        unuranlibdir="$found_dir"
++    fi
++
++    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
++        enable_builtin_unuran="yes"
++    fi
++fi
++message "Checking whether to build included unuran"
++result "$enable_builtin_unuran"
++
++######################################################################
++#
+ ### echo %%% Use included zLib or use systems
+ #
+ if test "x$enable_builtin_zlib" = "xno" ; then
+@@ -7720,6 +7756,10 @@
+     -e "s|@top_srcdir@|$top_srcdir|"            \
+     -e "s|@ttffontdir@|$fontdir|"               \
+     -e "s|@tutdir@|$tutdir|"                    \
++    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
++    -e "s|@unuranincdir@|$unuranincdir|"        \
++    -e "s|@unuranlib@|$unuranlib|"              \
++    -e "s|@unuranlibdir@|$unuranlibdir|"        \
+     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
+     -e "s|@xmlincdir@|$xmlincdir|"              \
+     -e "s|@xmllib@|$xmllib|"                    \
+diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
+--- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
+@@ -3,6 +3,9 @@
+ ############################################################################
+ 
+ #---Define package related variables-----------------------------------------------------------------
++
++if(builtin_unuran)
++
+ set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ set(UNR_VERSION "1.8.0-root")
+ set(UNR_TARNAME "unuran-${UNR_VERSION}")
+@@ -62,8 +65,17 @@
+                ${UNR_UNTARDIR}/src/tests/*.c
+                ${UNR_UNTARDIR}/src/uniform/*.c
+                ${UNR_UNTARDIR}/src/urng/*.c )
++set(unrconfig ${UNR_UNTARDIR}/config.h)
++
++else()
++
++include_directories(${UNURAN_INCLUDE_DIRS})
++set(unrsources)
++set(unrconfig)
++
++endif()
+ 
+ ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
+ 
+-ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
++ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
+--- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
+@@ -12,6 +12,8 @@
+ UNURANDIRS   := $(UNURANDIR)/src
+ UNURANDIRI   := $(UNURANDIR)/inc
+ 
++ifeq ($(BUILTINUNURAN),yes)
++
+ UNRVERS      := unuran-1.8.0-root
+ 
+ UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
+@@ -43,15 +45,18 @@
+                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
+ endif
+-UNRO         := $(UNRS:.c=.o)
++UNRFLAGS     := -I$(UNRDIRS)/src
+ 
+-ifeq ($(PLATFORM),win32)
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
+ else
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
++
++UNURANETAG   :=
++UNRCFG       :=
++UNRS         :=
++UNRFLAGS     := $(UNURANINCDIR:%=-I%)
++
+ endif
+ 
+-UNRFLAGS     :=  -I$(UNRDIRS)/src
++UNRO         := $(UNRS:.c=.o)
+ 
+ ##### libUnuran #####
+ UNURANL      := $(MODDIRI)/LinkDef.h
+@@ -84,6 +89,8 @@
+ include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
  		cp $< $@
  
--$(UNURANDEP):   $(UNRCFG)
++ifeq ($(BUILTINUNURAN),yes)
++
+ $(UNURANDEP):   $(UNRCFG)
  $(UNRS):        $(UNURANETAG)
  
- $(UNURANETAG):	$(UNRSRCS)
-@@ -137,12 +136,12 @@
+@@ -134,12 +141,14 @@
  		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
  		CFLAGS="$$ACFLAGS");
  
--$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
++endif
++
+ $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
                  $(MAINLIBS) $(UNURANLIBDEP)
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
  		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
  		   "$(UNURANO) $(UNURANDO)"             \
 -		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) -lunuran"
++		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
  
- $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)
+ $(call pcmrule,UNURAN)
+ 	$(noop)
+@@ -158,16 +167,19 @@
+ 
+ clean-$(MODNAME):
+ 		@rm -f $(UNURANO) $(UNURANDO)
++ifeq ($(BUILTINUNURAN),yes)
+ 		-@(if [ -d $(UNRDIRS) ]; then \
+ 			cd $(UNRDIRS); \
+ 			$(MAKE) clean; \
+ 		fi)
++endif
+ 
+ clean::         clean-$(MODNAME)
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
+ 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
++ifeq ($(BUILTINUNURAN),yes)
+ 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
+ ifeq ($(UNURKEEP),yes)
+ 		@mv $(UNRDIRS) $(UNRDIRS).keep
+@@ -177,6 +189,7 @@
+ 		@mv $(UNRDIRS).keep $(UNRDIRS)
+ endif
+ 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
++endif
+ 
+ distclean::     distclean-$(MODNAME)
+ 
+@@ -184,6 +197,7 @@
+ 
+ $(UNURANO): CXXFLAGS += $(UNRFLAGS)
+ 
++ifeq ($(BUILTINUNURAN),yes)
+ ifeq ($(PLATFORM),win32)
+ $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
+ else
+@@ -194,3 +208,4 @@
+ ifeq ($(CC),icc)
+ $(UNRO): CFLAGS += -mp
+ endif
++endif
diff --git a/root-usa.patch b/root-usa.patch
deleted file mode 100644
index d34da18..0000000
--- a/root-usa.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx root-5.34.30/hist/histpainter/src/THistPainter.cxx
---- root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx	2015-04-23 18:30:25.000000000 +0200
-+++ root-5.34.30/hist/histpainter/src/THistPainter.cxx	2015-04-24 20:05:03.349081003 +0200
-@@ -2367,7 +2367,10 @@
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
-    TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   if (!gSystem->AccessPathName("$(ROOTSYS)/tutorials/hist/usa.root"))
-+      f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
-+   else
-+      f = TFile::Open("http://root.cern.ch/files/usa.root");
- 
-    TMultiGraph *mg;
-    TKey *key;
diff --git a/root-werror.patch b/root-werror.patch
new file mode 100644
index 0000000..06e49f1
--- /dev/null
+++ b/root-werror.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
+@@ -40,7 +40,7 @@
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
+ 
+ #---Do not transform warnings in errors-------------------------------------------------------------
+-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+ #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root-xrootd.patch b/root-xrootd.patch
deleted file mode 100644
index 6837a81..0000000
--- a/root-xrootd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur root-5.34.14.orig/configure root-5.34.14/configure
---- root-5.34.14.orig/configure	2013-12-16 12:19:34.000000000 +0100
-+++ root-5.34.14/configure	2013-12-19 03:47:25.973920954 +0100
-@@ -4926,10 +4926,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
-+         # 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
- 
diff --git a/root.spec b/root.spec
index 618fe54..537ee55 100644
--- a/root.spec
+++ b/root.spec
@@ -1,32 +1,9 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%if %{?rhel}%{!?rhel:0} == 5
-%global __python26 /usr/bin/python26
-%{!?python26_sitearch: %global python26_sitearch %(%{__python26} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-# Disable the default python byte code compilation
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
 %global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
-%endif
 
-%{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
-
-%if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
-%global ruby_installdir %{ruby_vendorarchdir}
-%else
-%if %{?fedora}%{!?fedora:0} >= 17
-%global ruby_installdir %{ruby_vendorarchdir}
-%global ruby_abi 1.9.1
-%else
-%global ruby_installdir %{ruby_sitearchdir}
-%global ruby_abi 1.8
-%endif
-%endif
-
-%{!?_emacs_sitelispdir: %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp}
+# Ruby support not yet ported to root version 6
+%global ruby 0
 
+%global oce 1
 %global xrootd 1
 
 %if %{?fedora}%{!?fedora:0} >= 20
@@ -43,67 +20,134 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.36
+Version:	6.06.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
-Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		https://root.cern.ch/
 #		The upstream source is modified to exclude proprietary fonts:
 #		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
 #		tar -z -x -f root_v%{version}.source.tar.gz
-#		find root/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
-#		mv root root-%{version}
+#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
 #		tar -J -c -f root-%{version}.tar.xz root-%{version}
 Source0:	%{name}-%{version}.tar.xz
-#		Script to extract the list of include files in a subpackage
-Source1:	root-includelist
-#		Documentation generation script
-Source2:	root-html.C
-#		Images included in order to make documentation selfcontained
-Source3:	http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-Source4:	http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-Source5:	http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png
-#		Use local copy of input file during documentation generation
-Source6:	http://root.cern.ch/files/usa.root
-#		Patch for ftgl older than version 2.1.3:
-Patch0:		%{name}-ftgl.patch
-#		Use system fonts:
-Patch1:		%{name}-fontconfig.patch
-#		Use system unuran:
-Patch2:		%{name}-unuran.patch
-#		Remove broken xrootd test:
-Patch3:		%{name}-xrootd.patch
-#		Fix hardcoded include path:
-#		https://savannah.cern.ch/bugs/index.php?91463
-Patch4:		%{name}-meta.patch
-#		Use TLatex in doc generation:
-Patch5:		%{name}-doc-latex.patch
+#		Input data for the tests
+Source1:	%{name}-testfiles.tar.xz
+#		Script to generate above source
+Source2:	%{name}-testfiles.sh
+#		Adapt to gcc's ABI tags
+#		https://github.com/root-mirror/root/pull/124
+Patch0:		%{name}-abitags.patch
+#		Allow running tests
+#		https://github.com/root-mirror/root/pull/130
+Patch1:		%{name}-test-install.patch
+#		Use system fonts
+Patch2:		%{name}-fontconfig.patch
 #		Fix segfault when embedding Type 1 fonts
-Patch6:		%{name}-type1-embed.patch
-#		Fixes for HDFS module
-Patch7:		%{name}-hdfs.patch
+#		https://github.com/root-mirror/root/pull/90
+Patch3:		%{name}-type1-embed.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
-Patch8:		%{name}-dont-link-jvm.patch
-#		Use local copy of input file during documentation generation
-Patch9:		%{name}-usa.patch
+Patch4:		%{name}-dont-link-jvm.patch
 #		Adapt to GFAL 2.10
 #		https://github.com/root-mirror/root/pull/106
-Patch10:	%{name}-gfal2.patch
+Patch5:		%{name}-gfal2.patch
 #		Public header #includes private header
 #		https://github.com/root-mirror/root/pull/88
-Patch11:	%{name}-private-public.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#		The build segfaults on ppc(64) during an invocation of cint:
-#		https://savannah.cern.ch/bugs/index.php?70542
-ExcludeArch:	ppc %{power64}
-#		The cint interpreter is not fully ported to arm
-#		https://sft.its.cern.ch/jira/browse/ROOT-5398
-#		https://sft.its.cern.ch/jira/browse/ROOT-5399
-ExcludeArch:	%{arm}
+Patch6:		%{name}-private-public.patch
+#		Fix problems with the cmake configuration
+Patch7:		%{name}-broken-cmake-config.patch
+#		Missing stuff in the cmake configuration
+Patch8:		%{name}-missing-cmake-config.patch
+#		Fix broken deprecation check (configure)
+Patch9:		%{name}-deprecated-options.patch
+#		Only link to libgfortranbegin.a if it exists (configure)
+Patch10:	%{name}-libgfortranbegin.patch
+#		Make sure the removal of -Werror doesn't do more than intended
+Patch11:	%{name}-werror.patch
+#		Properly remove -Wall (must also remove Werror=*)
+Patch12:	%{name}-compiledata.patch
+#		Don't overwrite FFLAGS
+Patch13:	%{name}-fflags.patch
+#		Use system unuran
+Patch14:	%{name}-unuran.patch
+#		Use systme gl2ps
+Patch15:	%{name}-gl2ps.patch
+#		Hex float constants are c++17 (can not use with c++11/c++14)
+Patch16:	%{name}-no-hexfloat-const.patch
+#		Use the same soname for cmake and configure
+Patch17:	%{name}-soname.patch
+#		Save memory during build
+Patch18:	%{name}-save-memory.patch
+#		Fix build configuration for ppc64/ppc64le
+Patch19:	%{name}-ppc64.patch
+#		Fix build configuration for ARM
+Patch20:	%{name}-arm.patch
+#		Fix build configuration for s390/s390x
+Patch21:	%{name}-s390x.patch
+#		Always build the bundled llvm as static libraries
+Patch22:	%{name}-llvm-static.patch
 
+#		Documentation fixes
+
+#		Fixes for doxygen parsing issues:
+#		- warning: Found ';' while parsing initializer list
+#		- warning: Illegal member name found
+#		- warning: no matching file member found for ClassImp()
+#		- warning: documented symbol 'X' was not declared or defined
+Patch23:	%{name}-doxyfile.patch
+#		Improvements to the doxygen filter
+Patch24:	%{name}-dox-filter.patch
+#		Align macros so the doxygen filter works
+Patch25:	%{name}-macro-align.patch
+#		Fix broken ~~~ for doxygen
+#		https://github.com/root-mirror/root/pull/127
+Patch26:	%{name}-tildes.patch
+#		Convert old latex markup to doxygen
+Patch27:	%{name}-latex-markup.patch
+#		Remove some old html markup
+Patch28:	%{name}-html-markup.patch
+#		Fix broken links (cernlib, clhep, geant)
+Patch29:	%{name}-links.patch
+#		Remove duplicated comment
+Patch30:	%{name}-tvector2-comment.patch
+#		Remove links to tutorial macro results
+Patch31:	%{name}-see-macro-output.patch
+#		Fix TMath doxygen
+Patch32:	%{name}-tmath-doc.patch
+#		Fix cernlib doxygen
+Patch33:	%{name}-cernlib-doc.patch
+#		Backported doxygen updates for TPrincipal class
+Patch34:	%{name}-tprincipal-doc.patch
+#		Don't run gui macros
+Patch35:	%{name}-avoid-gui-crash.patch
+#		Doxygen warnings
+Patch36:	%{name}-doxygen-warnings.patch
+
+#		Test fixes
+
+#		User files in source tree during tests
+Patch37:	%{name}-template-files.patch
+#		Use cache read option
+Patch38:	%{name}-cache-test.patch
+#		Fixes for tests on ix86
+Patch39:	%{name}-32bit.patch
+#		Fixes for stressGraphics.ref
+Patch40:	%{name}-stressgraphics.patch
+#		Don't download testdata
+Patch41:	%{name}-no-testdata.patch
+#		Avoid using std::bind with lambdas (fixed upstream)
+Patch42:	%{name}-avoid-std-bind-lambda.patch
+
+#		Building on s390 runs out of memory in koji
+ExcludeArch:	s390
+#		ppc/ppc64/ppc64le does not yet work
+#		https://sft.its.cern.ch/jira/browse/ROOT-6434
+#		https://sft.its.cern.ch/jira/browse/ROOT-7314
+ExcludeArch:	ppc %{power64}
+
+BuildRequires:	cmake
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -117,13 +161,7 @@ BuildRequires:	gl2ps-devel
 BuildRequires:	pcre-devel
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	libAfterImage-devel >= 1.20
-%else
-BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
-BuildRequires:	libtiff-devel
-%endif
 BuildRequires:	ncurses-devel
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	avahi-devel
@@ -141,17 +179,19 @@ BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	python-devel
-%if %{?rhel}%{!?rhel:0} == 5
-BuildRequires:	python26-devel
-%endif
 %if %{?fedora}%{!?fedora:0} >= 15
 BuildRequires:	python3-devel
+%global python3pkg python3
+%endif
+%if %{?rhel}%{!?rhel:0} == 7
+BuildRequires:	python34-devel
+%global python3pkg python34
 %endif
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	qt4-devel
-%endif
+%if %{ruby}
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
+%endif
 BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
 BuildRequires:	globus-gsi-credential-devel
@@ -171,47 +211,37 @@ BuildRequires:	srm-ifce-devel
 %if %{hadoop}
 BuildRequires:	hadoop-devel
 %endif
+%if %{oce}
+BuildRequires:	OCE-devel
+%endif
+BuildRequires:	R-Rcpp-devel
+BuildRequires:	R-RInside-devel
+BuildRequires:	readline-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
-%if %{?rhel}%{!?rhel:0} == 5
-BuildRequires:	graphviz-gd
-%endif
 BuildRequires:	expat-devel
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	pythia8-devel >= 8.1.80
-%endif
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	numpy
+BuildRequires:	dos2unix
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+#		Some of the tests call lsb_release
+BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
-%else
-BuildRequires:	freefont
-%endif
 #		Provides "symbol" and "dingbats"
 BuildRequires:	urw-fonts
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
 BuildRequires:	font(droidsansfallback)
 %endif
-#		TMathText requires STIX fonts version 0.9
-#		Fedora has newer versions that are not backwards compatible
-#		Fedora 18-   and EPEL 7 have STIX fonts version 1.1 (*)
-#		Fedora 14-17		have STIX fonts version 1.0
-#		Fedora 11-13 and EPEL 6 have STIX fonts version 0.9
-#		(*) TeXlive in addition provides STIX 1.0 (not in EPEL 7)
-#		The root-fonts package provides STIX 0.9 where it is missing
-%if %{?rhel}%{!?rhel:0} == 6
-BuildRequires:	font(stixgeneral)
-BuildRequires:	font(stixsize1)
-%endif
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
-%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
 Requires:	emacs-filesystem >= %{_emacs_version}
-%endif
 Provides:	emacs-%{name} = %{version}-%{release}
 Provides:	emacs-%{name}-el = %{version}-%{release}
 Obsoletes:	emacs-%{name} < 5.34.28
@@ -223,32 +253,31 @@ the functionality needed to handle and analyze large amounts of data
 in a very efficient way. Having the data defined as a set of objects,
 specialized storage methods are used to get direct access to the
 separate attributes of the selected objects, without having to touch
-the bulk of the data. Included are histogramming methods in 1, 2 and 3
-dimensions, curve fitting, function evaluation, minimization, graphics
-and visualization classes to allow the easy setup of an analysis
-system that can query and process the data interactively or in batch
-mode.
+the bulk of the data. Included are histograming methods in an
+arbitrary number of dimensions, curve fitting, function evaluation,
+minimization, graphics and visualization classes to allow the easy
+setup of an analysis system that can query and process the data
+interactively or in batch mode, as well as a general parallel
+processing framework, PROOF, that can considerably speed up an
+analysis.
 
-Thanks to the built in CINT C++ interpreter the command language, the
-scripting, or macro, language and the programming language are all
-C++. The interpreter allows for fast prototyping of the macros since
-it removes the time consuming compile/link cycle. It also provides a
-good environment to learn C++. If more performance is needed the
-interactively developed macros can be compiled using a C++ compiler.
+Thanks to the built-in C++ interpreter cling, the command, the
+scripting and the programming language are all C++. The interpreter
+allows for fast prototyping of the macros since it removes the, time
+consuming, compile/link cycle. It also provides a good environment to
+learn C++. If more performance is needed the interactively developed
+macros can be compiled using a C++ compiler via a machine independent
+transparent compiler interface called ACliC.
 
 The system has been designed in such a way that it can query its
-databases in parallel on MPP machines or on clusters of workstations
-or high-end PCs. ROOT is an open system that can be dynamically
-extended by linking external libraries. This makes ROOT a premier
-platform on which to build data acquisition, simulation and data
-analysis systems.
+databases in parallel on clusters of workstations or many-core
+machines. ROOT is an open system that can be dynamically extended by
+linking external libraries. This makes ROOT a premier platform on
+which to build data acquisition, simulation and data analysis systems.
 
 %package icons
 Summary:	ROOT icon collection
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
-%endif
 Requires:	%{name}-core = %{version}-%{release}
 
 %description icons
@@ -256,14 +285,7 @@ This package contains icons used by the ROOT GUI.
 
 %package fonts
 Summary:	ROOT font collection
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
-%endif
-%if %{?rhel}%{!?rhel:0} == 6
-#		Driod Sans Fallback only
-License:	ASL 2.0
-%else
 %if %{?rhel}%{!?rhel:0}
 #		STIX version 0.9 and Driod Sans Fallback
 License:	OFL and ASL 2.0
@@ -271,7 +293,6 @@ License:	OFL and ASL 2.0
 #		STIX version 0.9 only
 License:	OFL
 %endif
-%endif
 Requires:	%{name}-core = %{version}-%{release}
 
 %description fonts
@@ -283,11 +304,9 @@ For EPEL it also provides the Google Droid Sans Fallback font.
 
 %package doc
 Summary:	Documentation for the ROOT system
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
-%endif
 License:	LGPLv2+ and GPLv2+ and BSD
+Requires:	mathjax
 
 %description doc
 This package contains the automatically generated ROOT class
@@ -295,10 +314,7 @@ documentation.
 
 %package tutorial
 Summary:	ROOT tutorial scripts and test suite
-Group:		Applications/Engineering
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
-%endif
 Requires:	%{name} = %{version}-%{release}
 
 %description tutorial
@@ -306,94 +322,62 @@ This package contains the tutorial scripts and test suite for ROOT.
 
 %package core
 Summary:	ROOT core libraries
-Group:		Applications/Engineering
 License:	LGPLv2+ and BSD
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-fonts = %{version}-%{release}
 Requires:	%{name}-icons = %{version}-%{release}
-#		Dynamic dependency
+#		Dynamic dependencies
+Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
-%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 Requires:	font(freesans)
 Requires:	font(freeserif)
 Requires:	font(freemono)
-%else
-Requires:	freefont
-%endif
 #		Provides "symbol" and "dingbats"
 Requires:	urw-fonts
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
 Requires:	font(droidsansfallback)
 %endif
-#		TMathText requires STIX fonts version 0.9
-#		Fedora has newer versions that are not backwards compatible
-#		Fedora 18-   and EPEL 7 have STIX fonts version 1.1 (*)
-#		Fedora 14-17		have STIX fonts version 1.0
-#		Fedora 11-13 and EPEL 6 have STIX fonts version 0.9
-#		(*) TeXlive in addition provides STIX 1.0 (not in EPEL 7)
-#		The root-fonts package provides STIX 0.9 where it is missing
-%if %{?rhel}%{!?rhel:0} == 6
-Requires:	font(stixgeneral)
-Requires:	font(stixsize1)
+%if %{ruby} == 0
+Obsoletes:	%{name}-ruby < 6.00.00
 %endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
 libRint and libThread.
 
-%package cint
-Summary:	CINT C++ interpreter
-Group:		Applications/Engineering
-License:	MIT
+%package multiproc
+Summary:	Multi-processor support for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description multiproc
+This package provides ROOT's multi-processor support library: libMultiProc.
+
+%package cling
+Summary:	Cling C++ interpreter
+License:	NCSA and (NCSA or LGPLv2+)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+#		Root's cling interpreter uses a particular git commit of
+#		llvm and clang with application specific changes. It does
+#		not work with the system libraries. The bundled llvm and
+#		clang are compiled using -fvisibility=hidden, and are not
+#		visible outside of the libCling module.
+Provides:	bundled(clang-libs)
+Provides:	bundled(llvm-libs)
 Obsoletes:	%{name}-cint7 < 5.26.00c
+Obsoletes:	%{name}-cint < 6.00.00
+Obsoletes:	%{name}-cintex < 6.00.00
+Obsoletes:	%{name}-reflex < 6.00.00
 
-%description cint
-This package contains the CINT C++ interpreter version 5.
-
-%package reflex
-Summary:	Reflex dictionary generator
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 23
-#		In Fedora 23+ gccxml has been replaced by castxml
-#		Some of the scripts in root needs to be adapted for this change
-#		This is still not done, so e.g. genreflex is a bit broken
-Requires:	castxml
-%else
-#		gccxml is not available in aarch64
-%ifnarch aarch64
-Requires:	gccxml
-%endif
-%endif
-
-%description reflex
-This package contains the reflex dictionary generator for ROOT.
-
-%ifarch %{ix86} x86_64 aarch64
-#		Cintex does not work on ppc
-#		https://savannah.cern.ch/bugs/?22003#comment16
-#		./configure only allows --enable-cintex for ix86 and x86_64
-%package cintex
-Summary:	Reflex to CINT dictionary converter
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-reflex%{?_isa} = %{version}-%{release}
-#		For PyCintex.py
-Requires:	%{name}-python%{?_isa} = %{version}-%{release}
-
-%description cintex
-Cintex is a library that converts Reflex dictionary information to
-CINT data structures used by ROOT. This package allows to interact
-with CINT with any class for which a Reflex dictionary is provided.
-%endif
+%description cling
+Cling is an interactive C++ interpreter, built on top of Clang and
+LLVM compiler infrastructure.
 
 %package proofd
 Summary:	Parallel ROOT Facility - distributed, parallel computing
-Group:		Applications/Engineering
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
@@ -413,7 +397,6 @@ transparent interface.
 
 %package rootd
 Summary:	ROOT remote file server
-Group:		Applications/Engineering
 #		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires(preun):	chkconfig
@@ -429,8 +412,6 @@ transparent interface.
 
 %package python
 Summary:	Python extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -439,55 +420,57 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
-%if %{?rhel}%{!?rhel:0} == 5
-%package python26
+%package %{python3pkg}
 Summary:	Python extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
-%description python26
+%description %{python3pkg}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
-%package python3
-Summary:	Python extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description python3
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-%endif
 
+%if %{ruby}
 %package ruby
 Summary:	Ruby extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Provides:	ruby(libRuby) = %{version}
-%if %{?ruby_abi:1}%{!?ruby_abi:0}
-Requires:	ruby(abi) = %{ruby_abi}
-%endif
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
 goes both ways - that is, you can call ROOT functions from Ruby, and
 invoke the Ruby interpreter from ROOT.
+%endif
+
+%package r
+Summary:	R interface for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description r
+ROOT R is an interface in ROOT to call R functions using an R C++
+interface. This interface opens the possibility in ROOT to use the
+very large set of mathematical and statistical tools provided by R.
+With ROOT R you can perform a conversion from ROOT's C++ objects to
+R's objects, transform the returned R objects into ROOT's C++ objects,
+then the R functionality can be used directly for statistical studies
+in ROOT.
+
+%package r-tools
+Summary:	R Tools
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+
+%description r-tools
+This package contains a minimizer module for ROOT that uses the ROOT
+R interface.
 
 %package genetic
 Summary:	Genetic algorithms for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
@@ -497,8 +480,6 @@ This package contains a genetic minimizer module for ROOT.
 
 %package geom
 Summary:	Geometry library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
@@ -514,22 +495,26 @@ This package contains a library for defining geometries in ROOT.
 
 %package gdml
 Summary:	GDML import/export for ROOT geometries
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-#		For ROOTwriter.py
-Requires:	%{name}-python%{?_isa} = %{version}-%{release}
 
 %description gdml
 This package contains an import/export module for ROOT geometries.
 
+%if %{oce}
+%package geocad
+Summary:	OpenCascade import/export for ROOT geometries
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+
+%description geocad
+This package contains an import/export module for ROOT geometries.
+%endif
+
 %package graf
 Summary:	2D graphics library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -540,8 +525,6 @@ This package contains the 2-dimensional graphics library for ROOT.
 
 %package graf-asimage
 Summary:	AfterImage graphics renderer for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
@@ -556,8 +539,6 @@ TIFF.
 
 %package graf-fitsio
 Summary:	ROOT interface for the Flexible Image Transport System (FITS)
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -570,8 +551,6 @@ System (FITS) data format in root.
 
 %package graf-gpad
 Summary:	Canvas and pad library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
@@ -583,8 +562,6 @@ This package contains a library for canvas and pad manipulations.
 
 %package graf-gviz
 Summary:	Graphviz 2D library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
@@ -594,8 +571,6 @@ This package contains the 2-dimensional graphviz library for ROOT.
 
 %package graf-postscript
 Summary:	Postscript/PDF renderer library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 
@@ -603,23 +578,17 @@ Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 This package contains a library for ROOT, which allows rendering
 postscript and PDF output.
 
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %package graf-qt
 Summary:	Qt renderer for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 
 %description graf-qt
 This package contains the Qt renderer for ROOT.
-%endif
 
 %package graf-x11
 Summary:	X window system renderer for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 
@@ -629,8 +598,6 @@ X display for showing graphics.
 
 %package graf3d
 Summary:	Basic 3D shapes library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -643,8 +610,6 @@ a more full-blown geometry library, see the root-geom package.
 
 %package graf3d-eve
 Summary:	Event display library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
@@ -666,8 +631,6 @@ This package contains a library for defining event displays in ROOT.
 
 %package graf3d-gl
 Summary:	GL renderer for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -686,8 +649,6 @@ rendering of histograms, and similar. Included is also a high quality
 
 %package graf3d-gviz3d
 Summary:	Graphviz 3D library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -701,8 +662,6 @@ This package contains the 3-dimensional graphviz library for ROOT.
 
 %package graf3d-x3d
 Summary:	X 3D renderer for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
@@ -714,8 +673,6 @@ a low quality 3D viewer for ROOT defined geometries.
 
 %package gui
 Summary:	GUI library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -731,8 +688,6 @@ This package contains a library for defining graphical user interfaces.
 
 %package gui-fitpanel
 Summary:	GUI element for fits in ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
@@ -746,8 +701,6 @@ various kinds of data.
 
 %package gui-ged
 Summary:	GUI element for editing various ROOT objects
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -763,8 +716,6 @@ various ROOT objects.
 
 %package guibuilder
 Summary:	GUI editor library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
@@ -774,11 +725,8 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This package contains a library for editing graphical user interfaces
 in ROOT.
 
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %package gui-qt
 Summary:	Qt GUI for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
@@ -786,12 +734,9 @@ Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 
 %description gui-qt
 This package contains the Qt GUI for ROOT.
-%endif
 
 %package gui-recorder
 Summary:	Interface for recording and replaying events in ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -807,8 +752,6 @@ and can be replayed again anytime.
 
 %package hbook
 Summary:	Hbook library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -820,8 +763,6 @@ access legacy Hbook files (NTuples and Histograms from PAW).
 
 %package hist
 Summary:	Histogram library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
@@ -833,8 +774,6 @@ This package contains a library for histogramming in ROOT.
 
 %package hist-painter
 Summary:	Histogram painter plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -847,8 +786,6 @@ This package contains a painter of histograms for ROOT.
 
 %package spectrum
 Summary:	Spectra analysis library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 
@@ -857,8 +794,6 @@ This package contains the Spectrum library for ROOT.
 
 %package spectrum-painter
 Summary:	Spectrum painter plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
@@ -868,8 +803,6 @@ This package contains a painter of spectra for ROOT.
 
 %package hist-factory
 Summary:	RooFit PDFs from ROOT histograms
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -885,8 +818,6 @@ Create RooFit probability density functions from ROOT histograms.
 
 %package html
 Summary:	HTML documentation generator for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	graphviz
@@ -897,8 +828,6 @@ from marked up sources.
 
 %package io
 Summary:	Input/output of ROOT objects
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description io
@@ -906,8 +835,6 @@ This package provides I/O routines for ROOT objects.
 
 %package io-dcache
 Summary:	dCache input/output library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -916,8 +843,6 @@ This package contains the dCache extension for ROOT.
 
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -927,8 +852,6 @@ This package contains the Grid File Access Library extension for ROOT.
 %if %{hadoop}
 %package io-hdfs
 Summary:	Hadoop File System input/output library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -938,8 +861,6 @@ This package contains the Hadoop File System extension for ROOT.
 
 %package io-rfio
 Summary:	Remote File input/output library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -948,8 +869,6 @@ This package contains the Remote File IO extension for ROOT.
 
 %package io-sql
 Summary:	SQL input/output library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
@@ -961,8 +880,6 @@ TFile interface.
 
 %package io-xml
 Summary:	XML reader library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -971,8 +888,6 @@ This package contains the XML reader library for ROOT.
 
 %package foam
 Summary:	A Compact Version of the Cellular Event Generator
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -986,9 +901,7 @@ easier to use for the average user.
 
 %package fftw
 Summary:	FFTW library for ROOT
-Group:		Applications/Engineering
 License:	GPLv2+
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description fftw
@@ -997,8 +910,6 @@ It uses the very fast fftw (version 3) library.
 
 %package fumili
 Summary:	Fumili library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1009,8 +920,6 @@ alternative fitting algorithm for ROOT.
 
 %package genvector
 Summary:	Generalized vector library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description genvector
@@ -1019,8 +928,6 @@ a generalized vector library.
 
 %package mathcore
 Summary:	Core mathematics library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
@@ -1030,9 +937,7 @@ This package contains the MathCore library for ROOT.
 
 %package mathmore
 Summary:	GSL interface library for ROOT
-Group:		Applications/Engineering
 License:	GPLv2+
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
@@ -1044,8 +949,6 @@ is licensed under GPLv2+ due to its use of GSL.
 
 %package matrix
 Summary:	Matrix library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
@@ -1054,8 +957,6 @@ This package contains the Matrix library for ROOT.
 
 %package minuit
 Summary:	Minuit library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1067,8 +968,6 @@ fitting algorithm for ROOT.
 
 %package minuit2
 Summary:	Minuit version 2 library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1079,8 +978,6 @@ provides an fitting algorithm for ROOT.
 
 %package mlp
 Summary:	Multi-layer perceptron extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1096,8 +993,6 @@ a multi-layer perceptron neural network package for ROOT.
 
 %package physics
 Summary:	Physics library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
@@ -1107,8 +1002,6 @@ This package contains the physics library for ROOT.
 
 %package quadp
 Summary:	QuadP library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
@@ -1120,8 +1013,6 @@ subject to linear constraints.
 
 %package smatrix
 Summary:	Sparse matrix library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description smatrix
@@ -1129,11 +1020,8 @@ This package contains the Smatrix library for ROOT.
 
 %package splot
 Summary:	Splot library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
@@ -1168,9 +1056,7 @@ discriminating variables.
 
 %package unuran
 Summary:	Random number generator library
-Group:		Applications/Engineering
 License:	GPLv2+
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1192,7 +1078,6 @@ variates from the desired distribution.
 
 %package vdt
 Summary:	VDT mathematical library
-Group:		Applications/Engineering
 
 %description vdt
 VDT is a library of mathematical functions, implemented in double and
@@ -1201,8 +1086,6 @@ modern compilers (e.g. gcc 4.7) vectorisable.
 
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1214,8 +1097,6 @@ leaks and such.
 
 %package table
 Summary:	Table library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
@@ -1229,8 +1110,6 @@ This package contains the Table library for ROOT.
 
 %package montecarlo-eg
 Summary:	Event generator library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1240,11 +1119,8 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 %description montecarlo-eg
 This package contains an event generator library for ROOT.
 
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 %package montecarlo-pythia8
 Summary:	Pythia version 8 plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
 
@@ -1253,12 +1129,9 @@ This package contains the Pythia version 8 plug-in for ROOT. This
 package provide the ROOT user with transparent interface to the Pythia
 (version 8) event generators for hadronic interactions. If the term
 "hadronic" does not ring any bells, this package is not for you.
-%endif
 
 %package montecarlo-vmc
 Summary:	Virtual Monte-Carlo (simulation) library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1269,28 +1142,21 @@ This package contains the VMC library for ROOT.
 
 %package net
 Summary:	Net library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description net
 This package contains the ROOT networking library.
 
 %package net-rpdutils
 Summary:	Authentication utilities used by rootd and proofd
-Group:		Applications/Engineering
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-rpdutils
 This package contains authentication utilities used by rootd and proofd.
 
 %package net-bonjour
 Summary:	Bonjour extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description net-bonjour
@@ -1298,8 +1164,6 @@ This package contains a bonjour extension for ROOT.
 
 %package net-auth
 Summary:	Authentication extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
@@ -1309,9 +1173,7 @@ This package contains the basic authentication algorithms used by ROOT.
 
 %package net-davix
 Summary:	Davix extension for ROOT
-Group:		Applications/Engineering
 Requires:	davix-libs%{?_isa} >= 0.2.8
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -1321,7 +1183,6 @@ access to http based storage such as webdav and S3.
 
 %package net-globus
 Summary:	Globus extension for ROOT
-Group:		Applications/Engineering
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
@@ -1333,8 +1194,6 @@ authentication and authorization against Globus.
 
 %package net-krb5
 Summary:	Kerberos (version 5) extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
@@ -1346,8 +1205,6 @@ allows authentication and authorization using Kerberos tokens.
 
 %package net-ldap
 Summary:	LDAP extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description net-ldap
@@ -1356,8 +1213,6 @@ access to LDAP directories via ROOT.
 
 %package net-http
 Summary:	HTTP server extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1373,8 +1228,6 @@ an http interface to arbitrary ROOT applications.
 %if %{xrootd}
 %package netx
 Summary:	NetX extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
@@ -1387,8 +1240,6 @@ provided.
 
 %package proof
 Summary:	PROOF extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
@@ -1407,8 +1258,6 @@ client to use in a PROOF environment.
 
 %package proof-bench
 Summary:	PROOF benchmarking
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1422,7 +1271,6 @@ This package contains the steering class for PROOF benchmarks.
 
 %package proof-pq2
 Summary:	PROOF Quick Query (pq2)
-Group:		Applications/Engineering
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1434,8 +1282,6 @@ Shell-based interface to the PROOF dataset handling.
 
 %package proof-sessionviewer
 Summary:	GUI to browse an interactive PROOF session
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1452,8 +1298,6 @@ session in ROOT.
 %if %{xrootd}
 %package xproof
 Summary:	XPROOF extension for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
@@ -1469,9 +1313,7 @@ client to be used in a PROOF environment.
 
 %package roofit
 Summary:	ROOT extension for modeling expected distributions
-Group:		Applications/Engineering
 License:	BSD
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
@@ -1499,8 +1341,6 @@ suitable for adoption in different disciplines as well.
 
 %package sql-mysql
 Summary:	MySQL client plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
@@ -1512,8 +1352,6 @@ ROOT environment.
 
 %package sql-odbc
 Summary:	ODBC plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
@@ -1524,8 +1362,6 @@ supports the ODBC protocol.
 
 %package sql-sqlite
 Summary:	Sqlite client plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
@@ -1537,8 +1373,6 @@ ROOT environment.
 
 %package sql-pgsql
 Summary:	PostgreSQL client plugin for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
@@ -1550,9 +1384,7 @@ ROOT environment.
 
 %package tmva
 Summary:	Toolkit for multivariate data analysis
-Group:		Applications/Engineering
 License:	BSD
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1584,10 +1416,45 @@ evaluation). In addition all these methods can be tested in parallel,
 and hence their performance on a particular data set may easily be
 compared.
 
+%package tmva-python
+Summary:	Toolkit for multivariate data analysis (Python)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-python
+Python integration with TMVA.
+
+%package tmva-r
+Summary:	Toolkit for multivariate data analysis (R)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-r
+R integration with TMVA.
+
+%package tmva-gui
+Summary:	Toolkit for multivariate data analysis GUI
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
+
+%description tmva-gui
+GUI for the Toolkit for Multivariate Analysis (TMVA)
+
 %package tree
 Summary:	Tree library for ROOT
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
@@ -1597,8 +1464,6 @@ This package contains the Tree library for ROOT.
 
 %package tree-player
 Summary:	Library to loop over a ROOT tree
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1613,8 +1478,6 @@ This package contains a plugin to loop over a ROOT tree.
 
 %package tree-viewer
 Summary:	GUI to browse a ROOT tree
-Group:		Applications/Engineering
-Requires:	%{name}-cint%{?_isa} = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1629,11 +1492,43 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description tree-viewer
 This package contains a plugin for browsing a ROOT tree in ROOT.
 
+%package cli
+Summary:	ROOT command line utilities
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+
+%description cli
+The ROOT command line utilities is a set of scripts for common tasks
+written in python.
+
+%package notebook
+Summary:	ROOT as an IPython Notebook
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-rootaas = %{version}-%{release}
+Requires:	/usr/bin/ipython
+
+%description notebook
+ROOT as an IPython Notebook.
+
+%package rootaas
+Summary:	ROOT as a Service
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+Requires:	python-ipython-console
+
+%description rootaas
+ROOT as a Service - the IPython kernel for the ROOT notebook.
+
 %prep
-%setup -q
-if pkg-config --max-version 2.1.2 ftgl ; then
+%setup -q -a 1
+
+# Convert from mac line terminators (and remove trailing spaces)
+mac2unix math/smatrix/doc/SMatrixClass.html
+sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
+mac2unix math/smatrix/doc/SVector.html
+sed 's! *$!!' -i math/smatrix/doc/SVector.html
+
 %patch0 -p1
-fi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -1645,36 +1540,47 @@ fi
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -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 \
-	   -name '*.html' -o -name '*.js' -o -name '*.css' -o \
-	   -name '*.xpm' -o -name '*.gif' -o -name '*.png' \
-       ')' -exec chmod 644 {} ';'
+# Avoid installing original files changed by patches
+find -path '*/inc/*' -a -name '*.orig' -exec rm {} ';'
+find cmake/modules -name '*.orig' -exec rm {} ';'
 
-chmod 644 cint/cint/include/makehpib \
-	  cint/cint/stl/_climits \
-	  test/DrawTest.sh \
-	  test/dt_RunDrawTest.sh \
-	  test/dt_MakeFiles.sh \
-	  test/ProofBench/make_event_par.sh \
-	  test/RootIDE/Makefile \
-	  tutorials/fitsio/sample1.fits
+chmod 644 math/mathcore/src/mixmax.h math/mathcore/src/mixmax.cxx
 
-# Badly named file - not python - aborts python byte compilation
-mv tutorials/pyroot/fit1_py.py tutorials/pyroot/fit1_py.txt
-sed s/fit1_py.py/fit1_py.txt/ -i tutorials/pyroot/fit1.py
-
-# Remove embedded sources in order to be sure they are not used
+# Remove bundled sources in order to be sure they are not used
 #  * afterimage
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
 rm -rf graf2d/asimage/src/libAfterImage
-%else
-rm -rf graf2d/asimage/src/libAfterImage/libjpeg
-rm -rf graf2d/asimage/src/libAfterImage/libpng
-rm -rf graf2d/asimage/src/libAfterImage/zlib
-sed '/zlib\/zlib.h/d' -i graf2d/asimage/src/libAfterImage/.depend
-%endif
 #  * ftgl
 rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 #  * freetype
@@ -1689,210 +1595,189 @@ rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
 rm -rf core/lzma/src/*.tar.gz
 #  * gl2ps
 rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
-sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
 #  * unuran
 rm -rf math/unuran/src/*.tar.gz
 #  * xrootd-private-devel headers
 rm -rf proof/xrdinc
+#  * x11 extension headers
+rm -rf graf2d/x11/inc/X11
+#  * mathjax
+rm -rf documentation/doxygen/mathjax.tar.gz
+sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
+sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
+    -i documentation/doxygen/Doxyfile
 
 # Remove bundled fonts provided by the OS distributions
 %if %{?fedora}%{!?fedora:0} >= 11
 rm fonts/DroidSansFallback.ttf
 %endif
-%if %{?rhel}%{!?rhel:0} == 6
-rm fonts/STIX*
-%endif
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
-# Make images local
-sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-    -i etc/html/ROOT.css
-sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-    -i etc/html/ROOT.css
-sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-    -i etc/html/header.html
-install -p -m 644 %{SOURCE3} %{SOURCE4} %{SOURCE5} etc/html
-sed '/CopyFileFromEtcDir("ROOT.css");/a\
-   CopyFileFromEtcDir("info.png");\
-   CopyFileFromEtcDir("root-banner.png");\
-   CopyFileFromEtcDir("rootdrawing-logo.png");' -i html/src/THtml.cxx
-
-# Use local copy of input file during documentation generation
-install -p -m 644 %{SOURCE6} tutorials/hist/usa.root
-
-# Rename canvases to avoid name conflicts during doc generation
-sed s/c1/c1c/g -i tutorials/graphics/earth.C
-sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
-sed s/c1/c1simp/g -i tutorials/hsimple.C
-
-%if %{?rhel}%{!?rhel:0} == 5
-# Build PyROOT for python 2.6
-# Use "python" as name for the build directory
-# THTML ignores directories named "python"
-cp -pr bindings/pyroot bindings/python
-sed -e 's/python /python26 /' -e 's/= pyroot/= python/' \
-    -i bindings/python/Module.mk
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
 # Build PyROOT for python 3
-# Use "python" as name for the build directory
-# THTML ignores directories named "python"
 cp -pr bindings/pyroot bindings/python
-sed -e 's/python /python3 /' -e 's/= pyroot/= python/' \
-    -i bindings/python/Module.mk
-%endif
 
 %build
 unset QTDIR
 unset QTLIB
 unset QTINC
-./configure --prefix=%{_prefix} \
-	    --libdir=%{_libdir}/%{name} \
-	    --etcdir=%{_datadir}/%{name} \
-	    --docdir=%{_pkgdocdir} \
-	    --elispdir=%{_emacs_sitelispdir}/%{name} \
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
-	    --disable-builtin-afterimage \
-%else
-	    --enable-builtin-afterimage \
+
+mkdir builddir
+pushd builddir
+
+# Avoid overlinking (this used to be the default with the old configure script)
+LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
+
+%ifarch s390x
+# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
+CFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags}"`
+CXXFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags}"`
+FFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags} -I%{_fmoddir}"`
+FCFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags} -I%{_fmoddir}"`
 %endif
-	    --disable-builtin-ftgl \
-	    --disable-builtin-freetype \
-	    --disable-builtin-glew \
-	    --disable-builtin-lzma \
-	    --disable-builtin-pcre \
-	    --disable-builtin-zlib \
-	    --disable-afdsmgrd \
-	    --disable-afs \
-	    --disable-alien \
-	    --disable-alloc \
-	    --enable-asimage \
-	    --enable-astiff \
-	    --enable-bonjour \
-	    --disable-castor \
-	    --disable-chirp \
-%ifarch %{ix86} x86_64 aarch64
-	    --enable-cintex \
+
+%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
+       -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
+       -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
+       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
+       -Dgnuinstall:BOOL=ON \
+       -Dbuiltin_afterimage:BOOL=OFF \
+       -Dbuiltin_ftgl:BOOL=OFF \
+       -Dbuiltin_freetype:BOOL=OFF \
+       -Dbuiltin_gl2ps:BOOL=OFF \
+       -Dbuiltin_glew:BOOL=OFF \
+       -Dbuiltin_lzma:BOOL=OFF \
+       -Dbuiltin_pcre:BOOL=OFF \
+       -Dbuiltin_unuran:BOOL=OFF \
+       -Dbuiltin_zlib:BOOL=OFF \
+       -Dafdsmgrd:BOOL=OFF \
+       -Dafs:BOOL=OFF \
+       -Dalien:BOOL=OFF \
+       -Dalloc:BOOL=OFF \
+       -Dasimage:BOOL=ON \
+       -Dastiff:BOOL=ON \
+       -Dbonjour:BOOL=ON \
+       -Dcastor:BOOL=OFF \
+       -Dchirp:BOOL=OFF \
+%if %{?fedora}%{!?fedora:0} >= 24
+       -Dcxx14:BOOL=ON \
 %else
-	    --disable-cintex \
+       -Dcxx14:BOOL=OFF \
 %endif
-	    --disable-cling \
-	    --disable-cxx11 \
-	    --disable-cxx14 \
-	    --enable-davix \
-	    --enable-dcache \
-	    --enable-explicitlink \
-	    --enable-fftw3 \
-	    --enable-fitsio \
-	    --enable-gdml \
-	    --enable-genvector \
-	    --enable-gfal \
-	    --disable-glite \
-	    --enable-globus \
-	    --enable-gsl-shared \
-	    --enable-gviz \
+       -Ddavix:BOOL=ON \
+       -Ddcache:BOOL=ON \
+       -Dexplicitlink:BOOL=ON \
+       -Dfftw3:BOOL=ON \
+       -Dfitsio:BOOL=ON \
+       -Dgdml:BOOL=ON \
+       -Dgenvector:BOOL=ON \
+%if %{oce}
+       -Dgeocad:BOOL=ON \
+%else
+       -Dgeocad:BOOL=OFF \
+%endif
+       -Dgfal:BOOL=ON \
+       -Dglite:BOOL=OFF \
+       -Dglobus:BOOL=ON \
+       -Dgsl-shared:BOOL=ON \
+       -Dgviz:BOOL=ON \
 %if %{hadoop}
-	    --enable-hdfs \
+       -Dhdfs:BOOL=ON \
 %else
-	    --disable-hdfs \
+       -Dhdfs:BOOL=OFF \
 %endif
-	    --enable-http \
-	    --enable-krb5 \
-	    --enable-ldap \
-	    --disable-libcxx \
-	    --enable-mathmore \
-	    --enable-memstat \
-	    --enable-minuit2 \
-	    --disable-monalisa \
-	    --enable-mysql \
-	    --enable-odbc \
-	    --enable-opengl \
-	    --disable-oracle \
-	    --enable-pgsql \
-	    --disable-pythia6 \
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
-	    --enable-pythia8 \
+       -Dhttp:BOOL=ON \
+       -Dkrb5:BOOL=ON \
+       -Dldap:BOOL=ON \
+       -Dlibcxx:BOOL=OFF \
+       -Dmathmore:BOOL=ON \
+       -Dmemstat:BOOL=ON \
+       -Dminuit2:BOOL=ON \
+       -Dmonalisa:BOOL=OFF \
+       -Dmysql:BOOL=ON \
+       -Dodbc:BOOL=ON \
+       -Dopengl:BOOL=ON \
+       -Doracle:BOOL=OFF \
+       -Dpgsql:BOOL=ON \
+       -Dpythia6:BOOL=OFF \
+       -Dpythia8:BOOL=ON \
+       -Dpython:BOOL=ON \
+       -Dqt:BOOL=ON \
+       -Dqtgsi:BOOL=ON \
+       -Dr:BOOL=ON \
+       -Drfio:BOOL=ON \
+       -Droofit:BOOL=ON \
+       -Drpath:BOOL=OFF \
+%if %{ruby}
+       -Druby:BOOL=ON \
 %else
-	    --disable-pythia8 \
+       -Druby:BOOL=OFF \
 %endif
-	    --enable-python \
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
-	    --enable-qt \
-	    --enable-qtgsi \
-%else
-	    --disable-qt \
-	    --disable-qtgsi \
-%endif
-	    --enable-reflex \
-	    --enable-rfio \
-	    --enable-roofit \
-	    --disable-rpath \
-	    --enable-ruby \
-	    --disable-sapdb \
-	    --enable-shadowpw \
-	    --enable-shared \
-	    --enable-soversion \
-	    --enable-sqlite \
-	    --disable-srp \
-	    --enable-ssl \
-	    --enable-table \
-	    --enable-tmva \
-	    --enable-unuran \
-	    --disable-vc \
-	    --enable-vdt \
-	    --disable-werror \
-	    --enable-x11 \
-	    --enable-xft \
-	    --enable-xml \
+       -Dsapdb:BOOL=OFF \
+       -Dsearch-usrlocal:BOOL=OFF \
+       -Dshadowpw:BOOL=ON \
+       -Dshared:BOOL=ON \
+       -Dsoversion:BOOL=ON \
+       -Dsqlite:BOOL=ON \
+       -Dsrp:BOOL=OFF \
+       -Dssl:BOOL=ON \
+       -Dtable:BOOL=ON \
+       -Dtmva:BOOL=ON \
+       -Dunuran:BOOL=ON \
+       -Dvc:BOOL=OFF \
+       -Dvdt:BOOL=ON \
+       -Dwerror:BOOL=OFF \
+       -Dx11:BOOL=ON \
+       -Dxft:BOOL=ON \
+       -Dxml:BOOL=ON \
 %if %{xrootd}
-	    --enable-xrootd \
+       -Dxrootd:BOOL=ON \
 %else
-	    --disable-xrootd \
+       -Dxrootd:BOOL=OFF \
 %endif
-	    --fail-on-missing
+       -Dfail-on-missing:BOOL=ON \
+       -Dtesting:BOOL=ON \
+       ..
 
-make %{?_smp_mflags} \
-	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}"
+# Build PyROOT for python 3 (prep)
+cp -pr bindings/pyroot bindings/python
 
-%if %{?rhel}%{!?rhel:0} == 5
-# Build PyROOT for python 2.6
-mkdir python
-cp bindings/python/ROOT.py python
-cp bindings/python/cppyy.py python
-make %{?_smp_mflags} \
-	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" \
-	MODULES="build cint/cint core/utils bindings/python" \
-	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
-	PYROOTLIB=python/libPyROOT.so \
-	ROOTPY="python/ROOT.py python/cppyy.py" python/libPyROOT.so
-%endif
+make %{?_smp_mflags}
 
-%if %{?fedora}%{!?fedora:0} >= 15
 # Build PyROOT for python 3
 mkdir python
-cp bindings/python/ROOT.py python
-cp bindings/python/cppyy.py python
-make %{?_smp_mflags} \
-	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" \
-	MODULES="build cint/cint core/utils bindings/python" \
-	PYTHONINCDIR=`pkg-config --cflags python3 | sed 's/-I//'` \
-	PYTHONLIB=`pkg-config --libs python3` \
-	PYROOTLIB=python/libPyROOT.so \
-	ROOTPY="python/ROOT.py python/cppyy.py" python/libPyROOT.so
-%endif
+mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
+sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
+    > CMakeFiles/Makefile2
+py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
+py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
+py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
+make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
+mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+
+popd
 
 %install
-rm -rf %{buildroot}
-make %{?_smp_mflags} install DESTDIR=%{buildroot} \
-	OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}"
+pushd builddir
+make %{?_smp_mflags} install DESTDIR=%{buildroot}
+popd
 
 # Move python modules to the sitelib
+mkdir -p %{buildroot}%{python_sitelib}
 mkdir -p %{buildroot}%{python_sitearch}
+
+mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
 
+rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
+mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
+
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
     %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
@@ -1938,39 +1823,24 @@ mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
 # Turn off services by default
 sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
 
-# The Python interface library must be in two places
+# The Python interface library is handled by alternatives
 mkdir -p %{buildroot}%{python_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python_sitearch}/libPyROOT.so
-%if %{?rhel}%{!?rhel:0} == 5
-touch %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%else
-ln -s ..`sed 's!%{_libdir}!!' <<< %{python_sitearch}`/libPyROOT.so \
-   %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%endif
 
-%if %{?rhel}%{!?rhel:0} == 5
-mkdir -p %{buildroot}%{python26_sitearch}
-install python/libPyROOT.so.%{libversion} \
-   %{buildroot}%{python26_sitearch}/libPyROOT.so
-install -m 644 python/ROOT.py* %{buildroot}%{python26_sitearch}
-install -m 644 python/cppyy.py* %{buildroot}%{python26_sitearch}
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
 mkdir -p %{buildroot}%{python3_sitearch}
-install python/libPyROOT.so.%{libversion} \
+install builddir/python/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
-install -m 644 python/ROOT.py* %{buildroot}%{python3_sitearch}
-install -m 644 python/cppyy.py* %{buildroot}%{python3_sitearch}
-%endif
+install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
 
-# Same for the Ruby interface library
-mkdir -p %{buildroot}%{ruby_installdir}
-mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion} \
-   %{buildroot}%{ruby_installdir}/libRuby.so
-ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_installdir}`/libRuby.so \
-   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion}
+%if %{ruby}
+# The Ruby interface library must be in two places
+mkdir -p %{buildroot}%{ruby_vendorarchdir}
+mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
+   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
+ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
+   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
+%endif
 
 # These should be in PATH
 mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
@@ -1985,25 +1855,21 @@ rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
 rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
-%if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
-rm %{buildroot}%{_libdir}/%{name}/libAfterImage.a
-%endif
 rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
+rm %{buildroot}%{_libdir}/%{name}/libminicern.a
+rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
-rm %{buildroot}%{_mandir}/man1/cint.1
 rm %{buildroot}%{_mandir}/man1/g2rootold.1
-rm %{buildroot}%{_mandir}/man1/makecint.1
+rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
 rm %{buildroot}%{_mandir}/man1/roota.1
 rm %{buildroot}%{_mandir}/man1/setup-pq2.1
 %if %{xrootd} == 0
 rm %{buildroot}%{_mandir}/man1/xproofd.1
 %endif
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 rm %{buildroot}%{_includedir}/%{name}/*.cw
 rm %{buildroot}%{_includedir}/%{name}/*.pri
-%endif
 rm %{buildroot}%{_includedir}/%{name}/proofdp.h
 rm %{buildroot}%{_includedir}/%{name}/rootdp.h
 rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
@@ -2012,9 +1878,6 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
-# Remove cintdll sources - keep the prec_stl directory
-rm -rf %{buildroot}%{_libdir}/%{name}/cint/cint/lib/{[^p],p[^r]}*
-
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
@@ -2033,9 +1896,6 @@ rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
 rm TGrid/P020_TGLite.C
-%if %{?fedora}%{!?fedora:0} < 9 && %{?rhel}%{!?rhel:0} < 6
-rm TGuiFactory/P020_TQtRootGuiFactory.C
-%endif
 rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
@@ -2047,9 +1907,6 @@ rm TViewerX3D/P020_TQtViewerX3D.C
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
-%if %{?fedora}%{!?fedora:0} < 9 && %{?rhel}%{!?rhel:0} < 6
-rm TVirtualX/P040_TGQt.C
-%endif
 rm TVirtualX/P050_TGQuartz.C
 %if %{xrootd} == 0
 rm TFile/P100_TXNetFile.C
@@ -2070,29 +1927,35 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo %{_libdir}/%{name} > \
      %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
+# Rename to avoid name clashes
+cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
+cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
+cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
+
 # 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
-echo Unix.*.Root.DynamicPath: ${PWD}/lib >> .rootrc
-echo Unix.*.Root.MacroPath: .:${PWD}/macros >> .rootrc
-echo Unix.*.Root.PluginPath: ${PWD}/etc/plugins >> .rootrc
-echo *.*.Root.TTFontPath: ${PWD}/fonts >> .rootrc
-sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
-LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
-PATH=${PWD}/bin:${PATH} ROOTSYS=${PWD} ./bin/root.exe -b -l -n -q -x html.C
-rm .rootrc html.C
-mv htmldoc %{buildroot}%{_pkgdocdir}/html
+pushd documentation/doxygen
+ln -s ../../files files
+sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
+    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
+    ROOTSYS=${PWD}/../../builddir \
+    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
+mv doc/html %{buildroot}%{_pkgdocdir}/html
+popd
 
 # Create includelist files ...
-for module in `find * -name Module.mk` ; do
-    module=`dirname $module`
-    make -f %{SOURCE1} includelist MODULE=$module
+for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
+    l=`tr / - <<< $l`
+    tmpdir=`mktemp -d`
+    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
+	sort | sed 's!^\.!!' > $l
+    rm -rf $tmpdir
 done
 
 # ... and merge some of them
-cat includelist-core-{[^mw],m[^a]}* > includelist-core
+cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
 cat includelist-roofit-roo* > includelist-roofit
 cat includelist-gui-qt* > includelist-gui-qt
@@ -2102,18 +1965,23 @@ cat includelist-io-xmlparser >> includelist-io-xml
 cat includelist-proof-proofplayer >> includelist-proof-proof
 cat includelist-net-netx* > includelist-netx
 
-%if %{?rhel}%{!?rhel:0} == 5
-# Python byte code compilation
-%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
-%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null
-%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null
-%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null
-%{__python26} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null
-%{__python26} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null
-%endif
-
-%clean
-rm -rf %{buildroot}
+%check
+pushd builddir
+pushd test
+ln -s ../../files files
+popd
+pushd runtutorials
+ln -s ../../files files
+popd
+# Exclude some tests that can not be run
+# - test-stressIOPlugins-*
+#   requires network access
+# - test-stressproof and tutorial-tree-run_h1analysis
+#   uses huge indata files - more than 3 GB (srpm would be too big)
+# - tutorial-multicore-mp*
+#   currently fails on ix86 (works on x86_64)
+make test ARGS="%{?_smp_mflags} --output-on-failure -E 'test-stressIOPlugins-.*|test-stressproof|tutorial-tree-run_h1analysis|tutorial-multicore-mp.*'"
+popd
 
 %post
 touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
@@ -2159,13 +2027,20 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service proofd condrestart >/dev/null 2>&1 || :
 fi
 
-%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %post python
-[ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
-    readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
-    grep -q site-packages && rm %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
 %{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
@@ -2174,67 +2049,56 @@ if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python_sitearch}/libPyROOT.so
 fi
-%else
-%post python -p /sbin/ldconfig
-%endif
+
 %postun python -p /sbin/ldconfig
 
-%if %{?rhel}%{!?rhel:0} == 5
-%post python26
-[ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
-    readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
-    grep -q site-packages && rm %{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{libversion} \
-    libPyROOT.so %{python26_sitearch}/libPyROOT.so 10
-/sbin/ldconfig
-
-%preun python26
-if [ $1 = 0 ]; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python26_sitearch}/libPyROOT.so
+%post %{python3pkg}
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
 fi
-
-%postun python26 -p /sbin/ldconfig
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
-%post python3
-[ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
-    readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
-    grep -q site-packages && rm %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
 /sbin/ldconfig
 
-%preun python3
+%preun %{python3pkg}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
 fi
 
-%postun python3 -p /sbin/ldconfig
-%endif
+%postun %{python3pkg} -p /sbin/ldconfig
 
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
-%post cint -p /sbin/ldconfig
-%postun cint -p /sbin/ldconfig
-%post reflex -p /sbin/ldconfig
-%postun reflex -p /sbin/ldconfig
-%ifarch %{ix86} x86_64 aarch64
-%post cintex -p /sbin/ldconfig
-%postun cintex -p /sbin/ldconfig
-%endif
+%post cling -p /sbin/ldconfig
+%postun cling -p /sbin/ldconfig
+%if %{ruby}
 %post ruby -p /sbin/ldconfig
 %postun ruby -p /sbin/ldconfig
+%endif
+%post r -p /sbin/ldconfig
+%postun r -p /sbin/ldconfig
+%post r-tools -p /sbin/ldconfig
+%postun r-tools -p /sbin/ldconfig
 %post genetic -p /sbin/ldconfig
 %postun genetic -p /sbin/ldconfig
 %post geom -p /sbin/ldconfig
 %postun geom -p /sbin/ldconfig
 %post gdml -p /sbin/ldconfig
 %postun gdml -p /sbin/ldconfig
+%if %{oce}
+%post geocad -p /sbin/ldconfig
+%postun geocad -p /sbin/ldconfig
+%endif
 %post graf -p /sbin/ldconfig
 %postun graf -p /sbin/ldconfig
 %post graf-asimage -p /sbin/ldconfig
@@ -2247,10 +2111,8 @@ fi
 %postun graf-gviz -p /sbin/ldconfig
 %post graf-postscript -p /sbin/ldconfig
 %postun graf-postscript -p /sbin/ldconfig
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %post graf-qt -p /sbin/ldconfig
 %postun graf-qt -p /sbin/ldconfig
-%endif
 %post graf-x11 -p /sbin/ldconfig
 %postun graf-x11 -p /sbin/ldconfig
 %post graf3d -p /sbin/ldconfig
@@ -2271,10 +2133,8 @@ fi
 %postun gui-ged -p /sbin/ldconfig
 %post guibuilder -p /sbin/ldconfig
 %postun guibuilder -p /sbin/ldconfig
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %post gui-qt -p /sbin/ldconfig
 %postun gui-qt -p /sbin/ldconfig
-%endif
 %post gui-recorder -p /sbin/ldconfig
 %postun gui-recorder -p /sbin/ldconfig
 %post hbook -p /sbin/ldconfig
@@ -2343,10 +2203,8 @@ fi
 %postun table -p /sbin/ldconfig
 %post montecarlo-eg -p /sbin/ldconfig
 %postun montecarlo-eg -p /sbin/ldconfig
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 %post montecarlo-pythia8 -p /sbin/ldconfig
 %postun montecarlo-pythia8 -p /sbin/ldconfig
-%endif
 %post montecarlo-vmc -p /sbin/ldconfig
 %postun montecarlo-vmc -p /sbin/ldconfig
 %post net -p /sbin/ldconfig
@@ -2391,6 +2249,12 @@ fi
 %postun sql-pgsql -p /sbin/ldconfig
 %post tmva -p /sbin/ldconfig
 %postun tmva -p /sbin/ldconfig
+%post tmva-python -p /sbin/ldconfig
+%postun tmva-python -p /sbin/ldconfig
+%post tmva-r -p /sbin/ldconfig
+%postun tmva-r -p /sbin/ldconfig
+%post tmva-gui -p /sbin/ldconfig
+%postun tmva-gui -p /sbin/ldconfig
 %post tree -p /sbin/ldconfig
 %postun tree -p /sbin/ldconfig
 %post tree-player -p /sbin/ldconfig
@@ -2416,11 +2280,6 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/root.png
 %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
 %{_datadir}/mime/packages/root.xml
-%if %{?fedora}%{!?fedora:0} < 15 && %{?rhel}%{!?rhel:0} < 7
-# No emacs-filesystem package
-%dir %{_datadir}/emacs
-%dir %{_emacs_sitelispdir}
-%endif
 %dir %{_emacs_sitelispdir}/%{name}
 %{_emacs_sitelispdir}/%{name}/*.elc
 %{_emacs_sitelispdir}/%{name}/*.el
@@ -2438,14 +2297,15 @@ fi
 %{_bindir}/root-config
 %{_mandir}/man1/memprobe.1*
 %{_mandir}/man1/rmkdepend.1*
-%{_mandir}/man1/rlibmap.1*
 %{_mandir}/man1/root-config.1*
+%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libCore.*
 %{_libdir}/%{name}/libNew.*
 %{_libdir}/%{name}/libRint.*
 %{_libdir}/%{name}/libThread.*
-%{_libdir}/%{name}/lib[^R]*Dict.*
+%{_libdir}/%{name}/lib*Dict.*
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/allDict.cxx.pch
 %{_datadir}/%{name}/class.rules
 %{_datadir}/%{name}/gdb-backtrace.sh
 %{_datadir}/%{name}/helgrind-root.supp
@@ -2454,54 +2314,51 @@ fi
 %{_datadir}/%{name}/system.rootauthrc
 %{_datadir}/%{name}/system.rootdaemonrc
 %{_datadir}/%{name}/system.rootrc
+%{_datadir}/%{name}/valgrind-root-python.supp
 %{_mandir}/man1/system.rootdaemonrc.1*
 %dir %{_datadir}/%{name}/cmake
-%{_datadir}/%{name}/cmake/FindROOT.cmake
+%{_datadir}/%{name}/cmake/*.cmake
+%dir %{_datadir}/%{name}/cmake/modules
+%{_datadir}/%{name}/cmake/modules/*.cmake
+%{_datadir}/%{name}/cmake/modules/*.cmake.in
 %dir %{_datadir}/%{name}/macros
 %{_datadir}/%{name}/macros/Dialogs.C
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/plugins/*
+%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/RConfigOptions.h
 %{_includedir}/%{name}/RConfigure.h
+%{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
-%{_includedir}/%{name}/rmain.cxx
 %dir %{_includedir}/%{name}/Math
 %{_datadir}/aclocal/root.m4
-%doc %{_pkgdocdir}/CREDITS
-%doc %{_pkgdocdir}/LICENSE
-%doc %{_pkgdocdir}/README
-
-%files cint -f includelist-cint-cint
-%{_bindir}/rootcint
-%{_mandir}/man1/rootcint.1*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libCint.*
-%{_libdir}/%{name}/cint
-%dir %{_includedir}/%{name}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%doc %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/COPYING.CINT
+%dir %{_pkgdocdir}
+# CREDITS and LICENSE are used at runtime by the .credits and .license commands
+# They therefore should not be marked doc.
+%{_pkgdocdir}/CREDITS
+%{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/ReleaseNotes
+%license LICENSE
 
-%ifarch %{ix86} x86_64 aarch64
-%files cintex -f includelist-cint-cintex
-%{_libdir}/%{name}/libCintex.*
-%{python_sitearch}/PyCintex.py*
-%dir %{_includedir}/%{name}/Cintex
-%endif
+%files multiproc -f includelist-core-multiproc
+%{_libdir}/%{name}/libMultiProc.*
+%{_libdir}/%{name}/libMultiProc_rdict.pcm
 
-%files reflex -f includelist-cint-reflex
-%{_bindir}/genmap
+%files cling
 %{_bindir}/genreflex
-%{_bindir}/genreflex-rootcint
-%{_mandir}/man1/genmap.1*
-%{_mandir}/man1/genreflex.1*
-%{_mandir}/man1/genreflex-rootcint.1*
-%{_libdir}/%{name}/libReflex.*
-%{_libdir}/%{name}/libReflexDict.*
-%{_libdir}/%{name}/python
-%dir %{_includedir}/%{name}/Reflex
-%dir %{_includedir}/%{name}/Reflex/Builder
-%dir %{_includedir}/%{name}/Reflex/internal
+%{_bindir}/rootcint
+%{_bindir}/rootcling
+%{_libdir}/%{name}/libCling.*
+%{_datadir}/%{name}/cling
+%{_datadir}/%{name}/dictpch
+%doc interpreter/cling/CREDITS.txt
+%doc interpreter/cling/README.md
+%license interpreter/cling/LICENSE.TXT
+%doc interpreter/llvm/src/llvm-CREDITS.TXT
+%doc interpreter/llvm/src/llvm-README.txt
+%license interpreter/llvm/src/llvm-LICENSE.TXT
 
 %files doc
 %doc %{_pkgdocdir}/html
@@ -2526,111 +2383,131 @@ fi
 %{_initrddir}/rootd
 
 %files python -f includelist-bindings-pyroot
-%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.5
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%else
-%{_libdir}/%{name}/libPyROOT.*
-%endif
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python_sitearch}/libPyROOT.so
 %{python_sitearch}/ROOT.py*
 %{python_sitearch}/cppyy.py*
+%{python_sitearch}/_pythonization.py*
 
-%if %{?rhel}%{!?rhel:0} == 5
-%files python26 -f includelist-bindings-pyroot
+%files %{python3pkg} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.5
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%{python26_sitearch}/libPyROOT.so
-%{python26_sitearch}/ROOT.py*
-%{python26_sitearch}/cppyy.py*
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 15
-%files python3 -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.5
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python3_sitearch}/libPyROOT%{py3soabi}.so
 %{python3_sitearch}/ROOT.py
 %{python3_sitearch}/cppyy.py
+%{python3_sitearch}/_pythonization.py
 %{python3_sitearch}/__pycache__
-%endif
 
+%if %{ruby}
 %files ruby -f includelist-bindings-ruby
 %{_libdir}/%{name}/libRuby.*
-%{ruby_installdir}/libRuby.*
+%{_libdir}/%{name}/libRuby_rdict.pcm
+%{ruby_vendorarchdir}/libRuby.*
+%endif
+
+%files r -f includelist-bindings-r
+%{_libdir}/%{name}/libRInterface.*
+%{_libdir}/%{name}/libRInterface_rdict.pcm
+%doc bindings/r/doc/users-guide/*.md
+
+%files r-tools -f includelist-math-rtools
+%{_libdir}/%{name}/libRtools.*
+%{_libdir}/%{name}/libRtools_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
 
 %files genetic -f includelist-math-genetic
 %{_libdir}/%{name}/libGenetic.*
+%{_libdir}/%{name}/libGenetic_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
 
 %files geom -f includelist-geom
 %{_libdir}/%{name}/libGeom.*
+%{_libdir}/%{name}/libGeom_rdict.pcm
 %{_libdir}/%{name}/libGeomBuilder.*
+%{_libdir}/%{name}/libGeomBuilder_rdict.pcm
 %{_libdir}/%{name}/libGeomPainter.*
+%{_libdir}/%{name}/libGeomPainter_rdict.pcm
 %{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
 %{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
 %{_datadir}/%{name}/RadioNuclides.txt
 
 %files gdml -f includelist-geom-gdml
 %{_libdir}/%{name}/libGdml.*
-%{python_sitearch}/ROOTwriter.py*
-%{python_sitearch}/writer.py*
+%{_libdir}/%{name}/libGdml_rdict.pcm
+
+%if %{oce}
+%files geocad -f includelist-geom-geocad
+%{_libdir}/%{name}/libGeoCad.*
+%{_libdir}/%{name}/libGeoCad_rdict.pcm
+%endif
 
 %files graf -f includelist-graf2d-graf
 %{_libdir}/%{name}/libGraf.*
+%{_libdir}/%{name}/libGraf_rdict.pcm
 %{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
 
 %files graf-asimage -f includelist-graf2d-asimage
 %{_libdir}/%{name}/libASImage.*
+%{_libdir}/%{name}/libASImage_rdict.pcm
 %{_libdir}/%{name}/libASImageGui.*
+%{_libdir}/%{name}/libASImageGui_rdict.pcm
 %{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
 %{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
 
 %files graf-fitsio -f includelist-graf2d-fitsio
 %{_libdir}/%{name}/libFITSIO.*
+%{_libdir}/%{name}/libFITSIO_rdict.pcm
 
 %files graf-gpad -f includelist-graf2d-gpad
 %{_libdir}/%{name}/libGpad.*
+%{_libdir}/%{name}/libGpad_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
 
 %files graf-gviz -f includelist-graf2d-gviz
 %{_libdir}/%{name}/libGviz.*
+%{_libdir}/%{name}/libGviz_rdict.pcm
 
 %files graf-postscript -f includelist-graf2d-postscript
 %{_libdir}/%{name}/libPostscript.*
+%{_libdir}/%{name}/libPostscript_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
 
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %files graf-qt -f includelist-graf2d-qt
 %{_libdir}/%{name}/libGQt.*
+%{_libdir}/%{name}/libGQt_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
-%endif
 
 %files graf-x11 -f includelist-graf2d-x11
 %{_libdir}/%{name}/libGX11.*
+%{_libdir}/%{name}/libGX11_rdict.pcm
 %{_libdir}/%{name}/libGX11TTF.*
+%{_libdir}/%{name}/libGX11TTF_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
 %{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
 
 %files graf3d -f includelist-graf3d-g3d
 %{_libdir}/%{name}/libGraf3d.*
+%{_libdir}/%{name}/libGraf3d_rdict.pcm
 %{_datadir}/%{name}/plugins/TView/P010_TView3D.C
 
 %files graf3d-eve -f includelist-graf3d-eve
 %{_libdir}/%{name}/libEve.*
+%{_libdir}/%{name}/libEve_rdict.pcm
 
 %files graf3d-gl -f includelist-graf3d-gl
 %{_libdir}/%{name}/libRGL.*
+%{_libdir}/%{name}/libRGL_rdict.pcm
 %{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
 %{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
 %{_datadir}/%{name}/plugins/TVirtualGLImp/P010_TX11GL.C
@@ -2640,15 +2517,19 @@ fi
 
 %files graf3d-gviz3d -f includelist-graf3d-gviz3d
 %{_libdir}/%{name}/libGviz3d.*
+%{_libdir}/%{name}/libGviz3d_rdict.pcm
 
 %files graf3d-x3d -f includelist-graf3d-x3d
 %{_libdir}/%{name}/libX3d.*
+%{_libdir}/%{name}/libX3d_rdict.pcm
 %{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TViewerX3D.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TVirtualViewerX3D.C
 
 %files gui -f includelist-gui-gui
 %{_libdir}/%{name}/libGui.*
+%{_libdir}/%{name}/libGui_rdict.pcm
 %{_libdir}/%{name}/libGuiHtml.*
+%{_libdir}/%{name}/libGuiHtml_rdict.pcm
 %{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
 %{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
 %{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
@@ -2656,48 +2537,56 @@ fi
 
 %files gui-fitpanel -f includelist-gui-fitpanel
 %{_libdir}/%{name}/libFitPanel.*
+%{_libdir}/%{name}/libFitPanel_rdict.pcm
 %{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
 
 %files gui-ged -f includelist-gui-ged
 %{_libdir}/%{name}/libGed.*
+%{_libdir}/%{name}/libGed_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
 
 %files guibuilder -f includelist-gui-guibuilder
 %{_libdir}/%{name}/libGuiBld.*
+%{_libdir}/%{name}/libGuiBld_rdict.pcm
 %{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
 %{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
 
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 %files gui-qt -f includelist-gui-qt
 %{_libdir}/%{name}/libQtRoot.*
+%{_libdir}/%{name}/libQtRoot_rdict.pcm
 %{_libdir}/%{name}/libQtGSI.*
+%{_libdir}/%{name}/libQtGSI_rdict.pcm
 %{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
-%endif
 
 %files gui-recorder -f includelist-gui-recorder
 %{_libdir}/%{name}/libRecorder.*
+%{_libdir}/%{name}/libRecorder_rdict.pcm
 
 %files hbook -f includelist-hist-hbook
 %{_bindir}/g2root
 %{_bindir}/h2root
 %{_mandir}/man1/g2root.1*
 %{_mandir}/man1/h2root.1*
-%{_libdir}/%{name}/libminicern.*
 %{_libdir}/%{name}/libHbook.*
+%{_libdir}/%{name}/libHbook_rdict.pcm
 
 %files hist -f includelist-hist-hist
 %{_libdir}/%{name}/libHist.*
+%{_libdir}/%{name}/libHist_rdict.pcm
 
 %files hist-painter -f includelist-hist-histpainter
 %{_libdir}/%{name}/libHistPainter.*
+%{_libdir}/%{name}/libHistPainter_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
 %{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
 
 %files spectrum -f includelist-hist-spectrum
 %{_libdir}/%{name}/libSpectrum.*
+%{_libdir}/%{name}/libSpectrum_rdict.pcm
 
 %files spectrum-painter -f includelist-hist-spectrumpainter
 %{_libdir}/%{name}/libSpectrumPainter.*
+%{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
 
 %files hist-factory -f includelist-roofit-histfactory
 %{_bindir}/hist2workspace
@@ -2705,14 +2594,15 @@ fi
 %{_mandir}/man1/hist2workspace.1*
 %{_mandir}/man1/prepareHistFactory.1*
 %{_libdir}/%{name}/libHistFactory.*
+%{_libdir}/%{name}/libHistFactory_rdict.pcm
 %{_datadir}/%{name}/HistFactorySchema.dtd
 %dir %{_includedir}/%{name}/RooStats/HistFactory
 %doc roofit/histfactory/doc/README
 
 %files html -f includelist-html
 %{_libdir}/%{name}/libHtml.*
+%{_libdir}/%{name}/libHtml_rdict.pcm
 %{_datadir}/%{name}/html
-%{_datadir}/%{name}/macros/html.C
 
 %files io -f includelist-io-io
 %{_libdir}/%{name}/libRIO.*
@@ -2721,40 +2611,49 @@ fi
 
 %files io-dcache -f includelist-io-dcache
 %{_libdir}/%{name}/libDCache.*
+%{_libdir}/%{name}/libDCache_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
 %files io-gfal -f includelist-io-gfal
 %{_libdir}/%{name}/libGFAL.*
+%{_libdir}/%{name}/libGFAL_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 
 %if %{hadoop}
 %files io-hdfs -f includelist-io-hdfs
 %{_libdir}/%{name}/libHDFS.*
+%{_libdir}/%{name}/libHDFS_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
 %{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
 %endif
 
 %files io-rfio -f includelist-io-rfio
 %{_libdir}/%{name}/libRFIO.*
+%{_libdir}/%{name}/libRFIO_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
 %{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
 
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
+%{_libdir}/%{name}/libSQLIO_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
 
 %files io-xml -f includelist-io-xml
 %{_libdir}/%{name}/libXMLIO.*
+%{_libdir}/%{name}/libXMLIO_rdict.pcm
 %{_libdir}/%{name}/libXMLParser.*
+%{_libdir}/%{name}/libXMLParser_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
 
 %files foam -f includelist-math-foam
 %{_libdir}/%{name}/libFoam.*
+%{_libdir}/%{name}/libFoam_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
 
 %files fftw -f includelist-math-fftw
 %{_libdir}/%{name}/libFFTW.*
+%{_libdir}/%{name}/libFFTW_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
 %{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
 %{_datadir}/%{name}/plugins/TVirtualFFT/P030_TFFTRealComplex.C
@@ -2762,19 +2661,25 @@ fi
 
 %files fumili -f includelist-math-fumili
 %{_libdir}/%{name}/libFumili.*
+%{_libdir}/%{name}/libFumili_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
 %{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
 
 %files genvector -f includelist-math-genvector
 %{_libdir}/%{name}/libGenVector.*
+%{_libdir}/%{name}/libGenVector_rdict.pcm
+%{_libdir}/%{name}/libGenVector32.rootmap
+%{_libdir}/%{name}/libGenVector_G__GenVector32_rdict.pcm
 %dir %{_includedir}/%{name}/Math/GenVector
 
 %files mathcore -f includelist-math-mathcore
 %{_libdir}/%{name}/libMathCore.*
+%{_libdir}/%{name}/libMathCore_rdict.pcm
 %dir %{_includedir}/%{name}/Fit
 
 %files mathmore -f includelist-math-mathmore
 %{_libdir}/%{name}/libMathMore.*
+%{_libdir}/%{name}/libMathMore_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
 %{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
 %{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P030_FalsePos.C
@@ -2789,15 +2694,18 @@ fi
 
 %files matrix -f includelist-math-matrix
 %{_libdir}/%{name}/libMatrix.*
+%{_libdir}/%{name}/libMatrix_rdict.pcm
 
 %files minuit -f includelist-math-minuit
 %{_libdir}/%{name}/libMinuit.*
+%{_libdir}/%{name}/libMinuit_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
 %{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
 
 %files minuit2 -f includelist-math-minuit2
 %{_libdir}/%{name}/libMinuit2.*
+%{_libdir}/%{name}/libMinuit2_rdict.pcm
 %dir %{_includedir}/%{name}/Minuit2
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
 %{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
@@ -2805,49 +2713,63 @@ fi
 
 %files mlp -f includelist-math-mlp
 %{_libdir}/%{name}/libMLP.*
+%{_libdir}/%{name}/libMLP_rdict.pcm
 
 %files physics -f includelist-math-physics
 %{_libdir}/%{name}/libPhysics.*
+%{_libdir}/%{name}/libPhysics_rdict.pcm
 
 %files quadp -f includelist-math-quadp
 %{_libdir}/%{name}/libQuadp.*
+%{_libdir}/%{name}/libQuadp_rdict.pcm
 
 %files smatrix -f includelist-math-smatrix
 %{_libdir}/%{name}/libSmatrix.*
+%{_libdir}/%{name}/libSmatrix_rdict.pcm
+%{_libdir}/%{name}/libSmatrix32.rootmap
+%{_libdir}/%{name}/libSmatrix_G__Smatrix32_rdict.pcm
 
 %files splot -f includelist-math-splot
 %{_libdir}/%{name}/libSPlot.*
+%{_libdir}/%{name}/libSPlot_rdict.pcm
 
 %files unuran -f includelist-math-unuran
 %{_libdir}/%{name}/libUnuran.*
+%{_libdir}/%{name}/libUnuran_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
 
 %files vdt -f includelist-math-vdt
+%dir %{_includedir}/%{name}
 %dir %{_includedir}/%{name}/vdt
-%doc math/vdt/Licence.md math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
+%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
+%license math/vdt/Licence.md
 
 %files memstat -f includelist-misc-memstat
 %{_libdir}/%{name}/libMemStat.*
+%{_libdir}/%{name}/libMemStat_rdict.pcm
 
 %files table -f includelist-misc-table
 %{_libdir}/%{name}/libTable.*
+%{_libdir}/%{name}/libTable_rdict.pcm
 
 %files montecarlo-eg -f includelist-montecarlo-eg
 %{_libdir}/%{name}/libEG.*
+%{_libdir}/%{name}/libEG_rdict.pcm
 %{_datadir}/%{name}/pdg_table.txt
 %doc %{_pkgdocdir}/cfortran.doc
 
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
 %{_libdir}/%{name}/libEGPythia8.*
-%endif
+%{_libdir}/%{name}/libEGPythia8_rdict.pcm
 
 %files montecarlo-vmc -f includelist-montecarlo-vmc
 %{_libdir}/%{name}/libVMC.*
+%{_libdir}/%{name}/libVMC_rdict.pcm
 %{_datadir}/%{name}/vmc
 
 %files net -f includelist-net-net
 %{_libdir}/%{name}/libNet.*
+%{_libdir}/%{name}/libNet_rdict.pcm
 %{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
 %{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
@@ -2863,14 +2785,17 @@ fi
 
 %files net-bonjour -f includelist-net-bonjour
 %{_libdir}/%{name}/libBonjour.*
+%{_libdir}/%{name}/libBonjour_rdict.pcm
 
 %files net-auth -f includelist-net-auth
 %{_libdir}/%{name}/libRootAuth.*
+%{_libdir}/%{name}/libRootAuth_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
 %doc %{_pkgdocdir}/README.AUTH
 
 %files net-davix -f includelist-net-davix
 %{_libdir}/%{name}/libRDAVIX.*
+%{_libdir}/%{name}/libRDAVIX_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
 %{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
 
@@ -2880,19 +2805,24 @@ fi
 
 %files net-krb5 -f includelist-net-krb5auth
 %{_libdir}/%{name}/libKrb5Auth.*
+%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
 
 %files net-ldap -f includelist-net-ldap
 %{_libdir}/%{name}/libRLDAP.*
+%{_libdir}/%{name}/libRLDAP_rdict.pcm
 
 %files net-http -f includelist-net-http
 %{_libdir}/%{name}/libRHTTP.*
+%{_libdir}/%{name}/libRHTTP_rdict.pcm
 %{_datadir}/%{name}/http
 %doc net/http/README.txt net/http/civetweb/*.md
 
 %if %{xrootd}
 %files netx -f includelist-netx
 %{_libdir}/%{name}/libNetx.*
+%{_libdir}/%{name}/libNetx_rdict.pcm
 %{_libdir}/%{name}/libNetxNG.*
+%{_libdir}/%{name}/libNetxNG_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
@@ -2900,12 +2830,16 @@ fi
 
 %files proof -f includelist-proof-proof
 %{_libdir}/%{name}/libProof.*
+%{_libdir}/%{name}/libProof_rdict.pcm
 %{_libdir}/%{name}/libProofDraw.*
+%{_libdir}/%{name}/libProofDraw_rdict.pcm
 %{_libdir}/%{name}/libProofPlayer.*
+%{_libdir}/%{name}/libProofPlayer_rdict.pcm
 %{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
 %{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
 %{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
 %{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
+%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
 %{_datadir}/%{name}/plugins/TProof/P040_TProof.C
 %{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
 %{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
@@ -2920,6 +2854,7 @@ fi
 
 %files proof-bench -f includelist-proof-proofbench
 %{_libdir}/%{name}/libProofBench.*
+%{_libdir}/%{name}/libProofBench_rdict.pcm
 %{_datadir}/%{name}/proof
 
 %files proof-pq2 -f includelist-proof-pq2
@@ -2928,6 +2863,7 @@ fi
 
 %files proof-sessionviewer -f includelist-gui-sessionviewer
 %{_libdir}/%{name}/libSessionViewer.*
+%{_libdir}/%{name}/libSessionViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
@@ -2938,6 +2874,7 @@ fi
 %{_bindir}/xproofd
 %{_mandir}/man1/xproofd.1*
 %{_libdir}/%{name}/libProofx.*
+%{_libdir}/%{name}/libProofx_rdict.pcm
 %{_libdir}/%{name}/libXrdProofd.*
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
 %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
@@ -2946,45 +2883,98 @@ fi
 
 %files roofit -f includelist-roofit
 %{_libdir}/%{name}/libRooFit.*
+%{_libdir}/%{name}/libRooFit_rdict.pcm
 %{_libdir}/%{name}/libRooFitCore.*
+%{_libdir}/%{name}/libRooFitCore_rdict.pcm
 %{_libdir}/%{name}/libRooStats.*
+%{_libdir}/%{name}/libRooStats_rdict.pcm
 %dir %{_includedir}/%{name}/RooStats
 
 %files sql-mysql -f includelist-sql-mysql
 %{_libdir}/%{name}/libRMySQL.*
+%{_libdir}/%{name}/libRMySQL_rdict.pcm
 %{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
 
 %files sql-odbc -f includelist-sql-odbc
 %{_libdir}/%{name}/libRODBC.*
+%{_libdir}/%{name}/libRODBC_rdict.pcm
 %{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
 
 %files sql-sqlite -f includelist-sql-sqlite
 %{_libdir}/%{name}/libRSQLite.*
+%{_libdir}/%{name}/libRSQLite_rdict.pcm
 %{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
 
 %files sql-pgsql -f includelist-sql-pgsql
 %{_libdir}/%{name}/libPgSQL.*
+%{_libdir}/%{name}/libPgSQL_rdict.pcm
 %{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
 
-%files tmva -f includelist-tmva
+%files tmva -f includelist-tmva-tmva
 %{_libdir}/%{name}/libTMVA.*
+%{_libdir}/%{name}/libTMVA_rdict.pcm
 %dir %{_includedir}/%{name}/TMVA
-%doc tmva/doc/LICENSE
+%license tmva/doc/LICENSE
+
+%files tmva-python -f includelist-tmva-pymva
+%{_libdir}/%{name}/libPyMVA.*
+%{_libdir}/%{name}/libPyMVA_rdict.pcm
+
+%files tmva-r -f includelist-tmva-rmva
+%{_libdir}/%{name}/libRMVA.*
+%{_libdir}/%{name}/libRMVA_rdict.pcm
+
+%files tmva-gui -f includelist-tmva-tmvagui
+%{_libdir}/%{name}/libTMVAGui.*
+%{_libdir}/%{name}/libTMVAGui_rdict.pcm
 
 %files tree -f includelist-tree-tree
 %{_libdir}/%{name}/libTree.*
+%{_libdir}/%{name}/libTree_rdict.pcm
 %doc %{_pkgdocdir}/README.SELECTOR
 
 %files tree-player -f includelist-tree-treeplayer
 %{_libdir}/%{name}/libTreePlayer.*
+%{_libdir}/%{name}/libTreePlayer_rdict.pcm
 %{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
 %{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
 
 %files tree-viewer -f includelist-tree-treeviewer
 %{_libdir}/%{name}/libTreeViewer.*
+%{_libdir}/%{name}/libTreeViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
+%files cli
+%{_bindir}/rootbrowse
+%{_bindir}/rootcp
+%{_bindir}/rooteventselector
+%{_bindir}/rootls
+%{_bindir}/rootmkdir
+%{_bindir}/rootmv
+%{_bindir}/rootprint
+%{_bindir}/rootrm
+%{python_sitelib}/cmdLineUtils.py*
+
+%files notebook
+%{_bindir}/rootnb.exe
+%{_datadir}/%{name}/notebook
+
+%files rootaas
+%{python_sitelib}/ROOTaaS
+
 %changelog
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
+- Update to 6.06.02 (F24+, EPEL7)
+- Change to cmake configuration (was using ./configure)
+- Change to doxygen documentation generation (was using THTML)
+- Run the test suite
+- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
+- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
+  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
+  root-notebook and root-rootaas
+- New subpackage for EPEL7: root-python34
+- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
+
 * Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
 - Update to 5.34.36
 
diff --git a/rootdrawing-logo.png b/rootdrawing-logo.png
deleted file mode 100644
index 20ac823f6eec9b3e894eeea35dc5fb2fd30fa13c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15051
zcmV;+IyA+JP)<h;3K|Lk000e1NJLTq003bC004jp1^@s68y*LQ00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z001xcNkl<Zc-ripcYIV;+Q)zA+<WIvpGh+5m5>k;LX+M>K~QY0qS!@U+pc9@*KNA$
z7S~;UExWp|y`zW~RC;d$A@q<yNJ0|QGrit&&iltCh`zguN+kI5d_MV*GR(bmzvrpv
zIp+}0IZn&T6>=KFX$Ys~G=$R-PRnTsy%2(;D?NNE4h|8rAPB&o830WH?0%p+2N3Om
zrApQMtP%yghjRu1px^*V*PQ|&<k(yP+G~AD*q481U;3UOeL3&?BLDeazLyvT!w(0c
z`vV9BpdbLH-M@+dqb#~-)z-Hj)S^C1O3Hw+(-Ac9+1rj$!%C5oHs)Di#_z$Hu0k^_
zgc=#=OlMpS>AF?noD#<MsLl*6jHfcrMM4M#zzLvnK-M^PJ0<=k3J;-#iBzCwfkZ`+
zh#*iH2sDvH6-n1KCsYB525=5Q1E~6C4E)PD7y|=`&c7X`9)losJ#0_`0PRLV0d5AE
zy<Ju9?J?CHVBGH4Ao)ad%Kl}KKdf!_<y1Ac!sgJBokbCBv7sX+9Z7R9-P#&9Y)B_O
zDicE6IP5YIO{YBK*O|?&GqJ!dHz!I$ur8*jXq+2FLP-1*aGiiiD(BoTP=A&rxEo@s
zvmvTvrAtCUCh#3$#3^!)1cGQMhwSG}$fm?c3Dw$&V9t=J*G3RL9El}bBoSFAV{@`d
zI~|mSt)k#}P()m^6iJdqKOp!368-`O1JiYA-vNU7t<{PWfJj|G>B(Nk5-WV+yoyLH
zEub@tFQ%kNb#Brq;Tol)9*KnrXS&sBVJ??{xXIQxr_=vA^jH{MHg1HwWGMP)n=pNN
z)^m9Y`OhkLztceoHxr^T&WS{zTSOr!5~33TW>E;rf)MJmD&&}9dd&Bn0t7K#w}e#P
z$pFs5c~E0kl`)Z0f*|8^fOFBnIE!(J9uA9<5G|_f64Q0jqw0z6k!Y%$lH{POTf$LA
z)g?ia4F;3M88dUPf>N(pHuzkWMEaWzhlkkB)dq;|02F`$Oh=6KuQi;<tqB}}NC1Hv
z(5Wg#i`u;-4@8t4g~MtUh^%w2i&ShigLx7tc$!i6X2@box@_<zNrKlvh#ypnAn?lL
zWtFkpw=@*tv$vi@acK#hf(^qn>O3=U{L2);x(m>cxoX#QJtlZy9AI5Pe~AG3(#yI`
zBKe9NA^*Xbkgr&O(xuf$&5;Da1g06H945D_+uIb?(Hd1#4o70n7EUZG=Sec>7Jx?y
zL&Rhd!uck{;fs=;TLGb2(PJ<O^7n&42_RCz_+gv(qIs>}Ny&l`8k=C*U2K*QW=MiB
z-7L2NqWjC(y2l>}BN7Ax>?yzbqs_I$F3c{y1k_g#M`8}%xOD>l{Et8XHlcXdBZ{tl
z#clS2$mM8EK;mAFkS>_?D?s(+nm{<cCaR`2C~Ds4-f(dcpm$~`zdzD$UJp?Iz08qF
zMXdJ*Mn2itamAuReV(_AhEKXK3~&yOF);q$Aqo_Leqd^4Mau*wu>`dT_F(G733&SU
zOL6^eS3j0eJnK=F>GAjbM&<3PM=f>@0R8`10S*A1$NzFv-M;)f3bg0jOzrtL%Wi;T
zZYHqBAGqoMgAI4QT%6mOX*Sn<F9@776q@A5Qj1)3|Dl$#Q=C?Pn#;D|B1rWhU?O2(
zm}t(y7=wOP$>Sqv*UGo1?yF2s9CO=fjLH!4@k=jZct82=VY7boD~$u3Yd<gm-Zh#f
zPzs1dm32rlT^9hvzVTit0I^#uzN{HilxfLpyrF)}+uZ%eSdDcF2GReugZy}IS7kcV
zWU1zvep!G1S3~=`TfBj>RpIcsu*L&vvgpY+8agt}a;r_y{V9?dc8HcR1$+R)-R}_#
z=~?3@U4m&DB0k?#hG@-ep`YIO+KWJ3Q5od8UB~}5(F6eJ%2%TJ@0+tw7z7Cfo-sh#
z<+Tm915*;Ml_vSzKT*Na1n6J6l<?JSTcb=#YKo}#7EN~@3`Mh=6wMh{HD`iI1&<Ei
zS2k4KmYe!92s%$lvc>_(UqnXYk#Mk}%pb}3>UvsBRLxWXLl|MSLviS;!ImtWeP)Bt
zV-khtRI5=fTf5}f{R^fSm1ZSl^|SY4?(DOXmviAtDBCw{#8SbCyoZYEJ`S@k0Y0ET
z2?!?ux&{y*(5LackNE$V;O(4!;P9@e50o{hw6rB))a3mbSp1V)eEP)CT9t5GkTHV@
zz^`-rk#N-15mRMGg_JO7)_|s)B8-Uwr#b;M5XO~ki?KFO5*i0t<@#)k?H~XZTt$pA
z$lup7|L3@u9y>Y=V5(hVFdtTw<m!Mgqm$FbdM#iHl8B+UefzACYM(fIz(_P6KENft
zvpTEKkbn?T`@W~%;P|O&;HJ5bU;Vx9!^PS1yUT|+4lZ(UoHioMLgfU(m=^O$!5A|S
z+-uT!SRtH<N-S)*nYF0JV$}R05rpcJ$%s%mObwDj6IE65FlGW^;)2M*IRU_JoW&xH
z>0xt9$mI}hhhDhj=X>AUmKzy16A#~c6I#Mme3LC<fk8>Ah!Wi%0@NJY;123c3@e&K
zbv^2mB{9J$2VE4cB{ow-jx2eM0u6&mo_Mmy0q9V4)^mA6x5O{Py2qD72<Z?hP-vFx
z3(XnZ<F85sz>-&Qc=Nh~Vb{SCaAD=Dd&xOBTr{tftM9kVBr8+8qi}#B)2r%6x0ITi
zAPgC?Th7hq$%56+lyIg_{YDkZwM-)slNyZ}9A<?mAxB+p>!3Xz|LoE}SyD_7qv}94
zN=r*oUAYT+$w^Di8JWv<T?=V|S!aw=PMA%g-UOq~-`=o!{JI4jujtdBpLpwC6Onbv
zCGfWSQ2WfH&=tS@#fNF>u8mg8n1K+LQW60nDj>uF!oRFxIymFdIKY|moy#2JiE?qA
z^EeWn$8!}>7z7b(Ry}@AwVFP7N<j(MEn5pwi&PqolitgOeQze$_6#8<i@{V|RIkag
zjhoue#?9$00AdC3CIL|!;AjS@7m!r|fZJPosNH$5J7hg$q5`R()s8?wM5{R$MS=;^
zfIcv%rwxF~_BMdmzNi*;2b-O)+C7_Zy0~;$;-K+U0RZ#fTa4ya?_k=Lq6MWHN%H}T
za~8jx-W6tZ&d^h(PO+zA4@nRajx^-#-rscd*|Y8g0Qiq=LEpiXmjY>f6`g;PPe2Gz
zp=cjtaij{@0XY1CJ#Op>fk=VsP3xz>@apD&D7Kt_wUx^-Wy*y>b~gMT6^z-jsoKwr
ziyb7-WXn>t$YX7-9f9Q3)DI+4gr+Mn2r`t00|O2oj*TBTHxA&lRa;T^=+AJ^<F~w#
zG49@bR1VJd*jI{$Ju9@Q;%)+9$Iex=v-^xF?4OZ{7=XIEN|=%|D!O8>xC!n4;!4+-
z+66|9t2;ChN<a|F+3?m2Po?!q={Ib=88a^(hqjh_Ec<W?!Xdz5WJpSO5`T<yPsFE-
zqU>^ax?fqbbjeSZSPX>33y9Tif_ymY<U~~vWkBOAPvO2lU;jqNxO;C>INXf=umE~Y
z6XGA33Bh1wv@NM9?nA;V90@jWYR-TP{+%M5mMNMkQj|NY2p69@1`NQFmNsl!vkB$p
zOJH(Z;Bq)Ia6q9JO|$BD5Mj`u!S=0N%SHu5!53VK$?$qTbp5XVb1%H&8rduv@X3OO
zu-n@z5~scX8x@Fx#kz*i4=X*Q350S0L=Q)ufuw{)06=5yLGWm#&g|$@qkkI+!~hYn
z2J6?%Hf9Y#aY-@sF8#?$OTlGxE<#pX0yLi$TF8VQJC2C{fNB&#uz1N5Pv4@Vg|5V8
z0Kl5HYi~be<j^^34m$v#qkJ(Rbn&H+0YVeg)svL1_YedD1d&)oYH5vFlM>?}*ynDC
z$e0H(2aa14hy;OhXEglTQ}^HhubHhh4@Jo~j30IeUVZfy=-}W0MvX2(#M^+~WtFfx
z?L0G8X2D<wEC#bV918RYfE6p34T&=Sff1#H008?dDq%}DeNuAfPv2BI138H`tDZ4O
zps1^@Nu~nNPj#im9kr?;D<vxgAl5x|_DxzKPznK6XMXV78`swa2V?F9ld+@bFp4Ie
z4U;n&_1*v+W(k9b48q_cgYe$s74RPM>-D<>Xs&Oe!$%L7_aEN%i)WtsS1=_b{k#ii
zo|mA2!2pV~g|DM@_~3Z}RK~QEVupIyF#~>Iz+{$<mhL<;5(>dUt%0Mp_T#uU0YJ=q
zU{v*<Ac~5Mp)vxNoQ*pkdju2CKM#axkk}W-?d)lz;R|+3%NOmI!af21&JYaTl2&)P
z{-0CMI_n(KAVUN}b@gE&e57jV)C<>YC(Q``03oU%N-&vBM=eh<5&~7V$npCX37iE>
zw=Dnsg4KIN$SOI2fIkFR8b!z*05>w&DS_Q+MKI`rClmm&B%=R_0+>QTUPdCCT0B^@
zem!o!;})7^x1&P|A=zL-)vAxsw_oN;z}c+p+K(3k2<O2--2Ause0cGddAMr$piBUw
zfry$e06J3v&i><Aqy*4nhX(K8UDbci9rxqHvxh>q+u#jFk(o#lQvq4FVCnM3*tPEv
z`VX884Kbvr<-%q&!tYkFdD|*XI%fz9vhv`Cj%0%c8_V~ht!7(j%H6+Q5HAPnCtVkM
z3<77IcNeBMZP)}?VSgB0>Ejpv@sU>wN1X9V@%S-ig3We_15ot;8ya#BNXEPxOM=$w
zZ>dX7vQL3W2_w}=5$1rxMeN*j0NX2@(Wht%Oy*Pwx`>wjby&K6F#?QY+_<3_IAkz3
z?%V}IATS%uc=ze2aCSe-Ds#%v4GQPIz!(9-gAYE~m7eP-?oFwHrsk%kn4(@)+`qre
zYB6Ez^s`VnVZ7mRYulje@|~CL_~_FMLUr}283p+V3>K?jr}24<ZWx>cgqoTM4|n9P
z{$Rlfo-+zLsV)dqz_P9TuwwZJbhNgCK!%{EBjSx>{iknX(PwW!C`iYs^QPmB!Tli;
z3PF<Kve^)daj=~q<AR^w^n1~nyN`91CVr3yO@$v`6BI=ukyz9M09lz?M=Q1G&A9{s
zP;sz2Z|^5dfBVwCzdrBG*_Zvb-}JNI)&vS&SGquG;1G1KyEdow&A5#SCa8K0-lz&&
zN*-J}AspPW6y7Fa$j}fDH|;=GM<cFy@IFkKJRC^?EYLy0!OcdbP#N3adkO`El0Goy
zP54CNy=NM=$D*Um%uIK4W6RzhJ9l>loD906K-CpQ)d)%o3vlT#eulGu_nUz$*RFhP
z)2na)Q3N5PU^qH?BLL`VZR2*E3yG=82x%&0ks>K60Z!HeA>4@B*W_Zx%pe@O$+-22
zH!*hNa5$9+XfyyN7DIzC3_F#v>XYU0)ql`9>BdLy*MJy)KrJ{a5LBijFDK7^*`=4<
zzH`Tp`(AkYl_Tz82qu#iq98yNL@2rfg(=9-&&Lf9KTOIGR^7k&nHTO7KwuDL2txeU
z3>K@Zl1Lm26#;=m4J*)f1$X~?9EOx6VBW_eSclF<X_gt8S`bFcA&MeeLJCBO9c?wO
zs9E<oX5Ia}KL808x~}yKU(lmIfrEo_h6HDVXXwx&>%DIG#)Y4LI?|Pso0@EQfPjIs
z_-I#k6|x{=$XSz6zGKJOjhi>C#2_^#B)YtkD8gv$nDgSZ?@ipaqXlP97zvSbsFD$N
zEuH8%ScbAnI~*nFWBQ03WYQ=gNC+r8VwwtA?I7+5mjB}yIOm30k0$5NdQ@TBNr{NQ
z&L{L}FDeHhPzsTV*u86K(b83GA1N3z^rCa8OoR+T*A?hpjR8i32>`He!v+L{f&Ffe
zzf2GKNk?P#RM<1q()05$W5!t!3=~Z<0kw@jEPU>tn0@^X7*U!FSqniHEvWW*q3Rk$
zqX`zP1<U?&9|jB#eLCX2C*~*&LGai~(Sjee7xn9I!te74ixw@pwJEIp;qogkP0q5K
zptBeli%*^if&hueyZbu59cXE8K}-`-GN2GfDj>#Uh$t%BHG;-wFM?5u;RDi<KteDQ
z3$|A5#inh0G4sN6knMC}<$E6jO>gX;dB?n2DmT_}rkpgB(<>lw@S~I6%a<-YbH&!3
ze?RMjnZu?H9so^?f)EN(kPuVj^?ZY9I3{=Ch^R3T8ZTu8l^7HvAf!<wNje;|1y%L+
zc>d+LaQ?*?W6;2UsH<+l&ZlnFul~yeb42@y_Y_?P0ssFEp&NuCh!7#*(7~#d4?kP}
zJ7Y%vowH}3i&Ow>*KI&jvI_(H_k+qb5JKWjwyFj}6hK80TxSpk3RTwta2O>cqQNkp
zoA(ZKhK$Dek)`l!3`_6+8KzE7o!9Rt4_>J-9pER|8GjuF`a|9bLHwb{^ceaU7PZ}V
z>y38_?xvqFdjHe5HD%ke>rf3+Gc&=N4yNf)6cwr(?^-8>9({y5=Mbp?k%|B)_8h8)
zDKQgMMwUVZ(7dM#$x=&8zn|Rtqz0UH04FU^_$C-JEe6qG#H}~q_{`Akq)Y$)@S}Cb
zgU>*+-G-o|#2XTI9h$C#Pzp-p00|{WTN4F=LeXQ8Q?oH*;y9>E2nGN(8$ZK<v!}ia
zq;6xZcLO+S5P*1t?NJj*h<@?a*I6c=QHrn<1_M9|fk8F^gn)4lRnq}NKnMXPU*Oaz
z0hJ9%wh4$apt>Ur+HfG8Ghp<hc;5g+Zx?zpFK!Sdv@{<{Tehv@?-yP$Jz3-`Vu}Wt
z(s)0srh_6r`@p(dPrw)?LJ(sN9f2S^+T5@R455eygVBQOP3w`AY+Gr~8dj#`)L4&4
zPwwRj)@|A{%?s-oQ6SKD6|yLTFa}MJKSDv0;)@b^d`*-B29KhGL5JJt!}jtD`1~4T
zL`H}K{(b8(@T}?c04Q8nPYDR($-aR@b%)cNqgHT@fp7vU#LbV`mF-bVKm-a7hLFNg
z=T>o`*^j<y7C0D($L~kJXoNGth$U|<Knjbk&Ki2=r>BY*^a4!)`sL>zEKaeq1d#%i
z#wR`r0Tl%ZA_XOYWRSo`g8gkVtgLFmkxmbs4i`KfZSaSJNJz8bKt&T;S1r)S|76Z1
zfDq7`dK$v<<_%LOO<0j<#cG`~P(g%9DGY)DN-03%k&w<gB*_GaRY3oo1l%xV2+WaI
zeD>K&<PJOoVF3F+dIc9=GUd;%;^E8UdBG{e;D=4t{#z2WeC6_ULZQgp7hQ0HLuCp$
zkN37xN+A#d%U7&IP}MPF+$d-ouy^ZLY}vLGqo+>A=&@&D$-7HoZTeu{th=6@p#u?J
z`{BFjPMKuwKZ(XQOqo1oacgVyD+g;2L81n5#y|*(M?(bYS5ycAK-uS8v9o+T+9OfS
zyz(-fKlTh9In<26j@Q(wmtOZ6fQYWEy$(RHcgz4F3L=IN8yQPTaDpM8oS`elQZ*HQ
za&nQGlZ(cH2Nqd^#bAXI@h-gb_x_3L7ndxwWsLbGrn8e;A39|nvq(hjKTzp9(podg
z<xKk04hY?=$`mbzkP?B(XaoU;u0|jN_+-Hn^v(A-^c{Zt!zu$O|8*(%X$apa?XB(E
z(Qro}AU?NnY?*;~WyuyQz)mR4gu)@2uw`#8+PA-q@#kIf7=xpna}}qm^a^uix7#Gy
z)JM|chsF$$1S!5S0~~}C=v@mWWkR7LzP7S%^9oF!(SN;Q8vClky4N|7)0*&I#cH*3
zi#35OEC!L1qw@%a$9G{-IXk+1*g!?>K6C_zXca4*eBD1az#m`JKu%dr=oJtm(I^Rq
zqlAD%)xur9*6|`AAp|16DB4jFMC$92p5WXC<gI2ug6*1m1q63zCu^uX1euz_SOoD^
zIzm_D3xUuTaxxyrV-x&vW@oJiXa|^f8p4SXmn*qZ*Nt^CJq$(zU|q9nU&KgV-*wp}
z$zfB(w4$}~-?CF4!bx|`I&>8D>)R3uN6XqeeP;;f2#kWzm8`}0%n+yvynAm608Dad
zo{-|jk3>$oCg@CuEXweBy!Gv^tuTpZ2!aG~K-I%g^)OhM;}yDGHq%sdb5lcpcm3%!
zgcBs;NR)&l0f<xt<MGZ2fgrw&iO1VuC?U|fj^yMNP(d6C0J0#T@*qw+1c3^ODlwSN
za-J*Eg&2!M(ZkR=gU(~1L;!~h-qn{R5CQ4wX-H2`zjX1krL%qvAWl962ylBk%^tTq
z&*rd#5)Oe9s4NN&0U!c&t^g#Au;NGkktPI#VGJ8GG)WSK7Z$v~;37qdozftBg*j3c
zMfUnUrkJXN5g?+4!4U!>B4RwABM5?y*7jz6v~U5sUG&tmrY5DPq`$G?gAX3Bt*do?
z-A*c}A$)@v&8Bc}Zh^mYUky6jnjsPm5zPaI1was=)FB{<#r%*6gJk5;5Cwydi4(?K
z&zf@PFV=6|^j3Avp>%^_IOQ~=SIj545|UyLr=_aCx*oOFZrBZp5UB(L2@(+z)w~cO
zp|0i#T!~pQiy}05p=uhUY5-}esW^Y;%(GW6U-@EVW256#GfllBL=~tAzu)(HXQxls
z6b=PpFv1}V25_!Glr(gP+^F1Ji&5jppsH>^%6FE-Ac$Z@MMMiA!Rf>~GiRK;b^EqE
z06-wZX$Z$F-Nm{-`2}SuX_+-nry1^WD>zr6F@`7)!zpHC@v_g5nU#W^j4YJx*oROc
z0FY=`YrTq?>OoFc4n!(kx20@re!NBUG=y&@DJdzf*;yG)N>qfVQBW#@L4ZRxVR!X*
zG}pId#<}N1Rbx=2DlB#j6lh?26bg5Pk@zN1`2~IRBcbTDQz?<_H4rET0pZ-&>4QX!
z5G4zYA_akp^=sE+^7yInx+7S<el469Cn%A?IETi)P<0<-EP{~kL1Dj4aLz^t!U3Er
z+R$qt_<TMa<D$c4G-At!a<sR$LZ()%*|-iOmoQ}L2yEW45nN>;RD#85fJh=B!~#)B
zfy(>{C{2(B8EviYgKKJQU8jm)=rs`9+uE#}rZ_mE*tfe120?_5Fq)18kzd#shYr<1
zV=*KrC%_;|AjALx6p$iN)OH9kgFu9aDEb%oPmm=;;%T4oEyd|{1k5ILxTDRD^t2RY
zx-zi8W*@*fh725m)}|JiO$JB?8G*1H8i^r{0BUQ>p%D&H0s%27sD&rkOqoXMX$apY
zOyxQ<GqalPcIQsUDQXT^!V~r(;E%v+GQn)IfP+9$6fm8^>kET$j*T1FVcn{INVTMZ
zauqrZppa3vW2@@*x|P!qzD>f$G#Eq!jI!aAmeyvSQ4Ra|?T0HN6&`O4L4OFYltlRa
zUL2~eMRTJMHMO;<uBk<8RyqV2!9ZY?OgQ5ABF4q~zJ2>NpN8-qas`{syzgLDRokRV
z6H!}t5Ro8-#c0K$>N=Dbmm)8}A3phH5ft8vmR2ufVG-w^IRhRofCvk~A=>cShl|iw
z-?=e0H8rAf?KFgMPlNDaFwD|3(lB}a*(lq(1xieT$>PM}hIZ`Qu?-^i!D=?5VrLD`
zC@F%|L=jb+kYr-0IJ^#Pmh9bs!&TS40-&phsrO5-2&B7{Dv!sLYc$CzO--FBoiGWP
zUXhE(|L0lk*gFquunykNCgcqqjEcP#m^P{ilP3&8i@OFk(SWw*N?d)z{rb;;`sd#c
z8Z@9rJ%w81dq*!S6~VyZ_XaK;GIWU4uU`Qgy){@ke+guz2?sX4kEs`*4d*!*;?VZJ
zxa!P-m_B_B8Y*^U+rBCYf`Wg&u@o20yzSn(SIqfX=Ni~C+xGN!Iq9wOK)h{y`>yQ+
zcWm3a?96H7)3)r~j1}*_1GV)CN=FZat0WImrXf=zNMZ)q6H-v`JA&5W5%{7EAFQpw
z_+b}4^~kS&dlvx2wAeA-8ofh$WW(|kEe9&A#)0Z-3*LJVD?fY_1!;Cny!<@0X$sQq
zCbaCTM`c4jlJk=x2OANyaOjpqY}r?jDWhk<_@}$>`3(TX^xg-c_nV`x=art8=6d&o
z_woLlui@@nW+8J>9<*2hc3%)%=I?<i5<pUs6_&mVoSDg3v!(^xb{>w-KL5h!Zod4=
zUja~KdhC=jLA?q>cag2RrLADY%2l}P;%Ue$F2SLyN(g>0NShZn#e=lcWN3vs=!6v?
zFKEQR@&=qWeB}0<FTe7)0954^1#r?K#1B=WXlQB8d;86oCSN$N5IOw|u;l$^NO#Ie
zRK2jPLD14%_zJVp<_8W``jKW%MPeTVjQ()Jp~{NkefyWJk2i~*k_=96o<K?b@}Gac
zd6psAmg{sHv9F>I$)XOIyB2l>MRa6;9C10}H9AlmmQg@bFt^W8WH=oNyK7T7EL?P}
z%9$XXLX$YX3W7u>gcU7m>zajEr`ss%eL6Ua!Ra{+tILJx=mGHNr=!uBj*1-$W@+iT
zqfaSTR#l^|b2lcB=!3fb72^-rH}t2Vry+dT1Z~ZRb>~#9|7>VNRt^+{1Eh8*l2YtA
zn4OFItSs!Wl#yGh;l9KS6!^keP+f&~(u`4gRtO>m*8{G$hQ=(M!gA6ebUWm2D?d8d
z%5>~&i9+bCL0_t&Oio9A|Ndy+(Sft;I&m$PP+xZ#D<lbxk_I%_V)M2mX!H0XQ4%wn
z%#qU&zJnGBM8N)<+F_NO*G)HN79imFVW1d8onpt4L1)0(>cyPu4opr+z?ztf_2vW^
z5;TPNY(!m^7h%DHykr{`BG;w&$vb!|L-@hH8Rs0b81Ix@_{NLB$gr@);^Bo*!eP{}
z-Hu%*0}?&WxGZ2qazYB8s_%fBV#UY=4;rctK#`JA=c&c5=k`HoOFJ9|LpP@<CN!Ta
z71NWh2^<^-F`mB9|KNi=)_wHSm3FI$L8)d8D(Hh?f(0IbJI-s1LJcuIxNA3((o~GM
zw_^3mwcshE5H%*FsGl8UhxWzB>R4pLx#zwE#QT>{RXHge5iVM`a_-;ny85~EhNMgR
z1BarvBaHf*W{A;RNKp|^xgYkMB>ZHw4VI`I|60+279kZyMI}g)V|e7wbMZe<z5`>y
zgnRG2^R`Dd7BATKW;v-F5pr;df(RjgkgoB;zy9scW%FNpU}kZWsiN7Bh%W*O0{RwZ
zAXr%rLX%NvO~c*SjzFZ-hvznRfZEfLm7a`(3?t@@%EJ5)*PzKz_|J#`^oKhE@Kd2&
zancHS$BzD8d-hKK!vhc8<KDM+`qh(5uxf7$TKrL<z5zwK**L2t2k+J&!Hy0cf4Hm=
z?M<C{Y(*<(o-+duGr^D?0|weW`1f;f!<{zfp}+s>4-cIx08Xk;kOdj-o$l;^{m&o&
zIeW(B4=jyar$2VfH0<_@^{K<od*+!ZADK7fiVGuArxOiLjo9lGFk?aq#+7E_o$Y?)
z^y!1rz80KYDnV@AjtBm|!tEG))y<Fo^-m8HfXB2`A3%?3LR<q3@I`gk!q*>v{mrMJ
zn0)2<!MJ36E<TT>Exh5r2Yx?%VE?@ufbEraZ!|X^y6T`OhTMLIxOVnLEH5vIEhz<m
zy=OL*>Wx^nq#WDY<z1KD^W+^<Mh#sDaKtp_lq*^PpqdchoSR_7lKHo^Z(lL_?6E^|
z?&usWZ+9-AdFx-V8$PiAUL6`l07a!E7B@7vu<`?kkz!+@p;km_5^ld_C@Pn}g@^y=
zHPjmiz47qB-<dUK)X;Sr*AUZxJOFx36GS4yr|9;&9jm7M+M994z<#I*nJUiv*<Wr>
zvl%_zL4Y6t0VV{zLB_0hBeke*?ATciv#T#QEqDXv^|6{ufB)=5Gp5aW{n+5)$6$hf
z5XT${hHOl<*%C9d0HYB(V=j5EAT_bJdjh_@b`%K(veTU|(UsK)kx(mIRVSkR_re>s
zRQ%!P_piyz$=nWf&6xej9)6EIW{X)4#&r0@!5})LA{?%?-SLc>9jzU4fGG7<;|64=
zBH{~!r1Xa@addhEH8(vu@0z@v%<U>up&UKp1*ah#uV`FDf>HMM%P%bVx3r<I_Arc6
zcfp?=tsPZWSB{<k@26){STJeCXvDywMclaf_WPg7OiA6YG41G93O{D)5eVHSgyL~$
zzn@uLtO{BfO2||AWycNdTD@Yn!(w#w9WVd|Iax>)BIpS5NK)RQtpIv`7Tl{L5D@5`
zAv?cded@5YK2*bDtX{lq5(gwv5Fro&I$-Q*tQ|6FXerW@T+qC3Bqt>!B-o=JK7S1V
zkEF+Zg2q%B2{3r#MK3xs^I3gO)dY7ql21Y7TlfPaWxCu@Ta7Sh$jvK)rZLD?i#0PN
z+i|S(J`Le}XafM06c5<K(g#%R*|#sTx?)dXAl?cu0wFmm<zO@z#lfa#Sj=`LIJ42&
zd{ElG?vp9q^_Kq+AbPZH!N5QPe}q_TIu9H~xU<z9*Afi`;Nvd3{9kGP26@`*4xp;B
z9v2K93oT^8>redtwz73gFDD?71^H`>Uq1%vkt4pkO-c75Me|;N{pZe5bIx_Y`Qty#
z7Fz@33=9k@2}zAH+2XC<wfVf-#u}tr5>Z-MiUakBjq8`aHbY~~;7rTy&<z%!Rg!dp
z3J|COjccb|$oh3heDx57FRG`XeY)_big%y7B|X1i<Jik?e8OTd_;nsXQ=C$Yf`X#$
zrqryavdybTd|tlAI=r|9qGUsiNrqVC{>k&-dTti;Hcpj@Ua;%X5h)`t@34`IoSkAj
ze*IwQtPx5ek@)D30*;SfdirO}|91DElZ+r!?tku|GiJ}dLqBE$hI1ZY1PF@S#)ctf
ztCwB9ciWb8c*l|A%;X%HYzb&-sYAuVa!ebW2b;s8gpx)r7(Df|`%3y`)+tOmWi}@7
z(Mg?S=L`U#v8|(U=gJSKZ+z$ZD?4_Sjn2q&A!+PI<<~s;#3fFvr8f4J?3aUs5_;5h
z)wi|EEwu-yuYUEJ`+cqL!_S#M8?`O%_;BfboLS<64FT}{QF|s|^Sf*NWM%F+RY3Fz
z1P%^^5Ff=+K-#@|-L&0H-kr5~-KW!Ijdj_H5)d;wku`Jfk}K|c=*|>}?ZAJ#M!X%8
zKoSfH={k&pV1ISqYu7X{pZ{o|tp3JSXFAF%wjroSp>)=xD3u`4@B9_F-uvK%21>%}
z2|6)E6hu(axX&R3x~}(L2w$2pE8B2>*@rLPTfThZ_{ae_>`8!_*B^a`jM<($V$%Cl
z=3M)X1@M2}`x8PSQ3)G2Zk)aD<G1cFbU95C!4j!=cNWGPYmG`<5Q!OPSVa|;?J-2c
zesI}@UqAlBoWj0E^S`$#C4hk%;0yXdC^g#6wrEU?K^A4GOg$l`lM_0<*$qGe>~B2v
z=O^C#<NensIe_GW<2ol@Jbq_lX5LnNe(|P$BgSoVN}~ICDxeaT5Ykjj)#q#P%%`z|
zJ6A7-$(4b@lV;+x-IcIQ8U#It2qS<jBa9TJ$zkl@vihvTzD4r|LHJ&ymT-b#Br>kG
zrR~nLty|@&sx28Ye8iUA?92m_(GV0xu}5oI-x@-f?Uo<8{hF7afBKC}ZoT!o&(6I3
zhG()1`|e9hOK&m7x3UHRbRS4@JmF+RLw%OJu{ukQdLd@^LvcnPQd^r)+$RTKcMVvu
z4K+a#bsa%)B?QG`M0NSP;l5edI2|UlSBL(cM`$n-wmkRTi+2#P*{Twac>Mk$9qk>J
zQ>IM5Z}6aj+elZ@u~$IocB0!iEWKjUzu&mzk1ss`(DgU|^uaIw4k%2;cj-}Qx-P1r
zh#)5?W7>cT$m0wz&wm~@E&DKX%s5a}3D|)q5VaXeDXCD5R_rO?HrRW(YPzHU(D_FX
zy*S>{-(>;;z-lswCQcap+~TFn>uffAc-+9j&X%T@pd=eS2FcLl?LgnkCx}!8AymHQ
zg7F^}oiVcQ?gt;g_IS+Aag9bLmiW@|?^tFxuwl6={h|0e@z&Z!wP&7l{*vAGzVkcV
zj%0;A&G2-%(LXy2g{1?rXw_;=9bUTQ#`_+>G9@K_fA>I8kNGU*=mB{YU+vruYMLV)
z4kpCHv4p)9d$S9RN}BB!>yZ?vtr-CK2D~tv%{}gzzm+CXLebXRIFOjE^xC`s@HB8@
z7U`*6h1DRt6AMe$99p|*n91NmO;rV411Bz<d(XqSz54p=s~&yux6eylOK=%w&|o{@
zYlTBHVBW`zhaPTjdH=S1|Mbw{5#u)!z-<r=;s5J;VTmfy%=N2R4s$m(4wne>wryIM
z<8EzDjYT7l_D(MyIehq@q2oqZ%FdL%#Y2aGnv<1Vc_Iec3DX1)Ko$&G_|}UzmzQlF
z_TUrG-==e2I}z=N-Ohe*Rpsyx9{t_Y)YQ~O79yzkv~QjJ(BH1=mzRGq9E+B$_;CL0
ziXGegC1hqa=9dhu+_QS|73-FMGBu#aAPNRJQ_|`cmDF5*?G0Oo4k>lFH#M8;8ygd9
z>KoD;8k@~YHlrmR@FXTCB$_SuM8qP2CWFb`>~J_blM)hQ`*-ijZtG~x(<n_8MUyaY
z^0ZH9U3t}m0?_$=^N|x0qSCGt#(#eG#V<ONUGBd;{@lGM(pFMJAyN^q{`(()-}KSz
zzZzFE26C_sZ>?VwoO#2YkKJ<5?;iT<|7q>?^?Cn=r=Bd|xN>TXCun9$6rF9I$Vjvz
zD>IWt7->w+%iovVe?Sv4m>P>qiuaEkGqzeIv{O~ph}~#*llT_(M<t}|79|`>+qQAT
zrHkgj`3tMXbm-P!|Nd7w*?Ak{!NzwBSx*QANicu_Ne|q9{p(XNob}0sspmg?A|Z5l
zYuB~47ruV~?Th7bxNmM&p<W*iRW1MQgMyh?T)+I5`yRg7DA1V3wfG*}@le^adBeuR
zW&=%hB_<|{l4xpbYz&4J-IH5bP@kKXQzHW5|5oK?oW)Nq={izOBwtwQ+J=UKFF*PB
z2g}R0lw5f6oOiCg{-<wSthNJReV^lb4&NI>x4Ae}cWB%bcU=9%{m;Ms>(sQ|)h9Y?
z5CjndD4zM-pI+`LUpu$e5A7GvzB&hb$obIq7r%J>U!VTvsIikD@4oI=OD6yA-oH~u
z-Ic%rAj_64zVhRD-<(x{xXv{3teHC#Qd1A+WM?+z_36`|n3&LRcRG*Y8_p2;-j2E3
z@h*So<@4%l4^oFKb5Bn=C>}oq7+#+zVi19()I@Q~d-KNKe$Tyk4;Xvq%y*u7;;P|e
zCqF9*Qbg5N5Rje=A9>s%%Yw|$o^j5bXU{n2;|&|uOloOv$v)iFVqd;ug$tmTzJ-NV
zbFaPTBT*6~-_<{g$K^Ds3;<c%*Djqs=hl1QGm2uziQd42gG21Pos>jJK?1UHxGjjL
zgH_WwfQzrc?VoqgIe$^*{ypaoC?5EJck*<sCUEc*+8)ylIbJ6-1jdh_{K+wYmQ}7f
zB9RCq0#UwCfI`2~PIrCC=O4cJZ(IqBXJ3BP%fN~2gy7(i1nKB?7A{*hC)(aT#$dH$
z_paU0l&Bj3`W5zHJ#gfhgY*9J$O9a(%YqD9kP!pK=C;<sZ5^${35cmDb_XUPQ1y8K
zQ}>s~wU|g~o6T(L0Pwv+MDagA6cIGOo&Zsf)F*Dg=JDlky)pZ-CF`$ANpKucx=g`$
zwfSE)mpWkGw`b45&zF93&5^QY*B51{q2iDNFEwHIML&77`%2gS^8Vla>9%WM|K*LB
ze{|(dcRZ~`BgVB0-@T&!$l)<ukQ7aJF2CgJxlfLpII*08^=Q3^vH0xZ3C|ObadhTQ
zn>P;HzkS=pO-tsVAE>L!xa%KpKRou#=`U$q17kXl=SVFM4uMjLT@yV34DFq5d95w2
z+1qz)&)_<YHlr-p9@v+AX#ei<g1fCWIl&^@GV?k$(OlPm)TDXm&AQ}8&UJ-x28l|j
zK2$wv-oKyvd2?G+Zph<t4(?abRyt<#YMU#iWAmmB3AV(Pt=HXf<5EEo^xm|D>bRpL
zfeL79Y_@;!;lhc#$~RBQbjTTJ3>$i2#+5g{Z4#tvoomo^{TnmnudL2NZA1MTm0LDU
zE#F=?rE1^4^z4GdDtl_?*1<!DR%B+R1tpP6uEaz=s<E)bh-xsIl*B}5y_t%^?yMXn
zZWg*fjN9iPq^PPT(UrQ-0Qir+eoT)M0K7NNLw_p>b#;f60)ar{kU@jJ0KDi*X1+}n
zA_xMw&gF`V%2A)b^~z13FaCIZI2IPBUv|yr;bSK)A2EL18jHpLjmuvD+cgD2I12cy
zwW3pgX6@LxTL%MU`nR^Lq97m=j*|C3`1s828`oTFgKD4olS@}+6qRhq&B@*WZ4#Ux
zlN>Ju(iJTU$NbBWDS+{=D1d)MP9dnODtf&>gVkc9cB?Z2APRu!&;?D`D2X4K%mFC)
h&xdB}|DPcI?*Pjj9?(p5aozv`002ovPDHLkV1nMRdy4=7


From d2f1cd66d0e105f6eeb1641bda25813e35b5ce15 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sun, 10 Apr 2016 23:24:27 +0200
Subject: [PATCH 080/344] Update sources

---
 sources | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index c19ad71..9fff1e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-eb9d4a4c6becba8dc591c7945a0b2544  root-5.34.36.tar.xz
-afb35390554c43a7d92576a6d9d3ae8a  usa.root
+efc971800c1ab365c309c02c4d1e0aeb  root-6.06.02.tar.xz
+7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From a1278b5ac149d350f05b2b450e4c28a5660bb777 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 15 Apr 2016 22:13:42 +0200
Subject: [PATCH 081/344] Rebuild for OCE-0.17.1

---
 root.spec | 60 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/root.spec b/root.spec
index 537ee55..d1f0d6b 100644
--- a/root.spec
+++ b/root.spec
@@ -4,6 +4,7 @@
 %global ruby 0
 
 %global oce 1
+%global pythia8 1
 %global xrootd 1
 
 %if %{?fedora}%{!?fedora:0} >= 20
@@ -19,10 +20,13 @@
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+# Do not create .orig files when patching source
+%global _default_patch_flags --no-backup-if-mismatch
+
 Name:		root
 Version:	6.06.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -140,7 +144,8 @@ Patch41:	%{name}-no-testdata.patch
 #		Avoid using std::bind with lambdas (fixed upstream)
 Patch42:	%{name}-avoid-std-bind-lambda.patch
 
-#		Building on s390 runs out of memory in koji
+#		s390 is not supported by cling: "error: unknown target
+#		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
 #		ppc/ppc64/ppc64le does not yet work
 #		https://sft.its.cern.ch/jira/browse/ROOT-6434
@@ -222,7 +227,9 @@ BuildRequires:	emacs-el
 BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
+%if %{pythia8}
 BuildRequires:	pythia8-devel >= 8.1.80
+%endif
 BuildRequires:	numpy
 BuildRequires:	dos2unix
 BuildRequires:	doxygen
@@ -1119,6 +1126,7 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 %description montecarlo-eg
 This package contains an event generator library for ROOT.
 
+%if %{pythia8}
 %package montecarlo-pythia8
 Summary:	Pythia version 8 plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1129,6 +1137,7 @@ This package contains the Pythia version 8 plug-in for ROOT. This
 package provide the ROOT user with transparent interface to the Pythia
 (version 8) event generators for hadronic interactions. If the term
 "hadronic" does not ring any bells, this package is not for you.
+%endif
 
 %package montecarlo-vmc
 Summary:	Virtual Monte-Carlo (simulation) library for ROOT
@@ -1572,10 +1581,6 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch41 -p1
 %patch42 -p1
 
-# Avoid installing original files changed by patches
-find -path '*/inc/*' -a -name '*.orig' -exec rm {} ';'
-find cmake/modules -name '*.orig' -exec rm {} ';'
-
 chmod 644 math/mathcore/src/mixmax.h math/mathcore/src/mixmax.cxx
 
 # Remove bundled sources in order to be sure they are not used
@@ -1629,12 +1634,18 @@ pushd builddir
 # Avoid overlinking (this used to be the default with the old configure script)
 LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 
-%ifarch s390x
+%ifarch s390 s390x
 # llvm/clang does not support -march=z900, z990, z9-109, z9-ec
-CFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags}"`
-CXXFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags}"`
-FFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags} -I%{_fmoddir}"`
-FCFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags} -I%{_fmoddir}"`
+%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
+%endif
+
+%ifarch ppc %{power64} s390 s390x
+# On some architectures JIT compilation fails if the stack protector is used
+# https://llvm.org/bugs/show_bug.cgi?id=22248
+# https://llvm.org/bugs/show_bug.cgi?id=26226
+# IncrementalExecutor::executeFunction:
+#   symbol '__stack_chk_guard' unresolved while linking
+%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
 %endif
 
 %cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
@@ -1702,7 +1713,11 @@ FCFLAGS=`sed 's!-march=z9\S* !-march=z10 !g' <<< "%{optflags} -I%{_fmoddir}"`
        -Doracle:BOOL=OFF \
        -Dpgsql:BOOL=ON \
        -Dpythia6:BOOL=OFF \
+%if %{pythia8}
        -Dpythia8:BOOL=ON \
+%else
+       -Dpythia8:BOOL=OFF \
+%endif
        -Dpython:BOOL=ON \
        -Dqt:BOOL=ON \
        -Dqtgsi:BOOL=ON \
@@ -1975,12 +1990,18 @@ ln -s ../../files files
 popd
 # Exclude some tests that can not be run
 # - test-stressIOPlugins-*
-#   requires network access
-# - test-stressproof and tutorial-tree-run_h1analysis
-#   uses huge indata files - more than 3 GB (srpm would be too big)
+#   requires network access (by design since they test the remote file IO)
+# - tutorial-tree-run_h1analysis
+#   requires network access: http://root.cern.ch/files/h1/
+# - tutorial-r-*
+#   occasionally causes random crashes
 # - tutorial-multicore-mp*
-#   currently fails on ix86 (works on x86_64)
-make test ARGS="%{?_smp_mflags} --output-on-failure -E 'test-stressIOPlugins-.*|test-stressproof|tutorial-tree-run_h1analysis|tutorial-multicore-mp.*'"
+#   currently fails on ix86 and arm
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
+%ifarch %{ix86} %{arm}
+excluded="${excluded}|tutorial-multicore-mp.*"
+%endif
+make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
 %post
@@ -2203,8 +2224,10 @@ fi
 %postun table -p /sbin/ldconfig
 %post montecarlo-eg -p /sbin/ldconfig
 %postun montecarlo-eg -p /sbin/ldconfig
+%if %{pythia8}
 %post montecarlo-pythia8 -p /sbin/ldconfig
 %postun montecarlo-pythia8 -p /sbin/ldconfig
+%endif
 %post montecarlo-vmc -p /sbin/ldconfig
 %postun montecarlo-vmc -p /sbin/ldconfig
 %post net -p /sbin/ldconfig
@@ -2758,9 +2781,11 @@ fi
 %{_datadir}/%{name}/pdg_table.txt
 %doc %{_pkgdocdir}/cfortran.doc
 
+%if %{pythia8}
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
 %{_libdir}/%{name}/libEGPythia8.*
 %{_libdir}/%{name}/libEGPythia8_rdict.pcm
+%endif
 
 %files montecarlo-vmc -f includelist-montecarlo-vmc
 %{_libdir}/%{name}/libVMC.*
@@ -2963,6 +2988,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
+- Rebuild for OCE-0.17.1
+
 * Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
 - Update to 6.06.02 (F24+, EPEL7)
 - Change to cmake configuration (was using ./configure)

From dcf271fa3c8de892d3349c5b85a3da4300dfc3a9 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Tue, 10 May 2016 13:29:26 +0200
Subject: [PATCH 082/344] Update to 6.06.04

- Drop patch root-no-hexfloat-const.patch
- Add requires on gcc-c++ to root-cling
---
 root-broken-cmake-config.patch  | 12 ----------
 root-missing-cmake-config.patch |  2 +-
 root-no-hexfloat-const.patch    | 12 ----------
 root-test-install.patch         | 40 +++++++++++++++++++++----------
 root.spec                       | 42 +++++++++++++++++++++++++--------
 sources                         |  2 +-
 6 files changed, 61 insertions(+), 49 deletions(-)
 delete mode 100644 root-no-hexfloat-const.patch

diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
index 3b01f2d..d21a76e 100644
--- a/root-broken-cmake-config.patch
+++ b/root-broken-cmake-config.patch
@@ -84,18 +84,6 @@ diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modu
  find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
  
  set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/cmake/modules/FindOCC.cmake root-6.06.02/cmake/modules/FindOCC.cmake
---- root-6.06.02.orig/cmake/modules/FindOCC.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindOCC.cmake	2016-03-20 17:08:52.184461642 +0100
-@@ -11,7 +11,7 @@
- 
- find_path(OCC_INCLUDE_DIR
-           NAMES Standard_Real.hxx
--          HINTS ${_occdirs} /usr/include/opencascade
-+          HINTS ${_occdirs} /usr/include/opencascade /usr/include/oce
-           PATH_SUFFIXES inc
-           DOC "Specify the directory containing Standard_Real.hxx")
- 
 diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
 --- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
index cfc6a3b..48085d6 100644
--- a/root-missing-cmake-config.patch
+++ b/root-missing-cmake-config.patch
@@ -18,7 +18,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/c
 --- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
 @@ -404,7 +404,13 @@
- set(dicttype ${ROOT_DICTTYPE})
+ set(perl ${PERL_EXECUTABLE})
  
  #---RConfigure-------------------------------------------------------------------------------------------------
 -set(setresuid undef)
diff --git a/root-no-hexfloat-const.patch b/root-no-hexfloat-const.patch
deleted file mode 100644
index e92ed6e..0000000
--- a/root-no-hexfloat-const.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathcore/src/mixmax.h root-6.06.02/math/mathcore/src/mixmax.h
---- root-6.06.02.orig/math/mathcore/src/mixmax.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/mixmax.h	2016-04-05 23:27:14.026856518 +0200
-@@ -134,7 +134,7 @@
- #define MOD_REM(k) ((k) % MERSBASE )  // latest Intel CPU is supposed to do this in one CPU cycle, but on my machines it seems to be 20% slower than the best tricks
- #define MOD_MERSENNE(k) MOD_PAYNE(k)
- 
--#define INV_MERSBASE (0x1p-61)
-+#define INV_MERSBASE (4.336808689942017736029811203479766845703125e-19) // (0x1p-61)
- 
- 
- // the charpoly is irreducible for the combinations of N and SPECIAL and has maximal period for N=508, 256, half period for 1260, and 1/12 period for 3150
diff --git a/root-test-install.patch b/root-test-install.patch
index e9ddc87..5b3afb4 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -482,6 +482,29 @@ diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/b
 diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
 --- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
+@@ -543,6 +543,22 @@ TROOT::TROOT(const char *name, const char *title, VoidFuncPtr_t *initfunc)
+    // Initialize Operating System interface
+    InitSystem();
+ 
++   // Initialize static directory functions
++   GetRootSys();
++   GetBinDir();
++   GetLibDir();
++   GetIncludeDir();
++   GetEtcDir();
++   GetDataDir();
++   GetDocDir();
++   GetMacroDir();
++   GetTutorialsDir();
++   GetSourceDir();
++   GetIconPath();
++   GetTTFFontDir();
++
++   gRootDir = GetRootSys().Data();
++
+    TDirectory::Build();
+ 
+    // Initialize interface to CINT C++ interpreter
 @@ -1722,21 +1722,9 @@
                 "after the call to TROOT::InitInterpreter()!");
        }
@@ -550,20 +573,14 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
  #endif
     }
  
-@@ -2521,14 +2486,258 @@
+@@ -2521,14 +2486,252 @@
  }
  
  ////////////////////////////////////////////////////////////////////////////////
 +
 +#ifdef ROOTPREFIX
 +static Bool_t IgnorePrefix() {
-+   static Bool_t ignorePrefix = kFALSE;
-+   static Bool_t init = kFALSE;
-+   if (!init) {
-+      if (gSystem->Getenv("ROOTIGNOREPREFIX"))
-+         ignorePrefix = kTRUE;
-+      init = kTRUE;
-+   }
++   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
 +   return ignorePrefix;
 +}
 +#endif
@@ -1255,7 +1272,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  #endif
  
     // when libSystem.B.dylib is loaded we have finished loading all dylibs
-@@ -600,13 +606,9 @@
+@@ -600,13 +606,8 @@
     SetRootSys();
  #endif
  
@@ -1268,7 +1285,6 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
 -#endif
 +   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
 +   gRootDir = "/usr/local/root";
-+   gRootDir = TROOT::GetRootSys().Data();
  
     return kFALSE;
  }
@@ -1593,7 +1609,7 @@ diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/wi
  #endif
  
     UpdateRegistry(this, buf);
-@@ -1112,23 +1099,19 @@
+@@ -1112,23 +1099,17 @@
  
     fSigcnt = 0;
  
@@ -1624,8 +1640,6 @@ diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/wi
 -#else
 -   gRootDir= ROOTPREFIX;
 -#endif
-+
-+   gRootDir = TROOT::GetRootSys().Data();
  
     // Increase the accuracy of Sleep() without needing to link to winmm.lib
     typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
diff --git a/root.spec b/root.spec
index d1f0d6b..22e0d6d 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.06.02
+Version:	6.06.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -78,8 +78,6 @@ Patch13:	%{name}-fflags.patch
 Patch14:	%{name}-unuran.patch
 #		Use systme gl2ps
 Patch15:	%{name}-gl2ps.patch
-#		Hex float constants are c++17 (can not use with c++11/c++14)
-Patch16:	%{name}-no-hexfloat-const.patch
 #		Use the same soname for cmake and configure
 Patch17:	%{name}-soname.patch
 #		Save memory during build
@@ -222,8 +220,10 @@ BuildRequires:	OCE-devel
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
+BuildRequires:	tbb-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
+BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
@@ -372,6 +372,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 #		not work with the system libraries. The bundled llvm and
 #		clang are compiled using -fvisibility=hidden, and are not
 #		visible outside of the libCling module.
+Requires:	gcc-c++
 Provides:	bundled(clang-libs)
 Provides:	bundled(llvm-libs)
 Obsoletes:	%{name}-cint7 < 5.26.00c
@@ -1553,7 +1554,6 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -1655,23 +1655,33 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_afterimage:BOOL=OFF \
-       -Dbuiltin_ftgl:BOOL=OFF \
+       -Dbuiltin_cfitsio:BOOL=OFF \
+       -Dbuiltin_davix:BOOL=OFF \
+       -Dbuiltin_fftw3:BOOL=OFF \
        -Dbuiltin_freetype:BOOL=OFF \
+       -Dbuiltin_ftgl:BOOL=OFF \
        -Dbuiltin_gl2ps:BOOL=OFF \
        -Dbuiltin_glew:BOOL=OFF \
+       -Dbuiltin_gsl:BOOL=OFF \
+       -Dbuiltin_llvm:BOOL=ON \
        -Dbuiltin_lzma:BOOL=OFF \
+       -Dbuiltin_openssl:BOOL=OFF \
        -Dbuiltin_pcre:BOOL=OFF \
+       -Dbuiltin_tbb:BOOL=OFF \
        -Dbuiltin_unuran:BOOL=OFF \
+       -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dafdsmgrd:BOOL=OFF \
        -Dafs:BOOL=OFF \
        -Dalien:BOOL=OFF \
-       -Dalloc:BOOL=OFF \
        -Dasimage:BOOL=ON \
        -Dastiff:BOOL=ON \
        -Dbonjour:BOOL=ON \
        -Dcastor:BOOL=OFF \
+       -Dccache:BOOL=OFF \
        -Dchirp:BOOL=OFF \
+       -Dcling:BOOL=ON \
+       -Dcocoa:BOOL=OFF \
 %if %{?fedora}%{!?fedora:0} >= 24
        -Dcxx14:BOOL=ON \
 %else
@@ -1679,9 +1689,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %endif
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
+       -Dexceptions:BOOL=ON \
        -Dexplicitlink:BOOL=ON \
        -Dfftw3:BOOL=ON \
        -Dfitsio:BOOL=ON \
+       -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
        -Dgenvector:BOOL=ON \
 %if %{oce}
@@ -1692,7 +1704,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dgfal:BOOL=ON \
        -Dglite:BOOL=OFF \
        -Dglobus:BOOL=ON \
-       -Dgsl-shared:BOOL=ON \
+       -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
 %if %{hadoop}
        -Dhdfs:BOOL=ON \
@@ -1700,6 +1712,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dhdfs:BOOL=OFF \
 %endif
        -Dhttp:BOOL=ON \
+       -Djemalloc:BOOL=OFF \
        -Dkrb5:BOOL=ON \
        -Dldap:BOOL=ON \
        -Dlibcxx:BOOL=OFF \
@@ -1707,10 +1720,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dmemstat:BOOL=ON \
        -Dminuit2:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
+       -Dmt:BOOL=ON \
        -Dmysql:BOOL=ON \
        -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
        -Doracle:BOOL=OFF \
+       -Dpch:BOOL=ON \
        -Dpgsql:BOOL=ON \
        -Dpythia6:BOOL=OFF \
 %if %{pythia8}
@@ -1724,6 +1739,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dr:BOOL=ON \
        -Drfio:BOOL=ON \
        -Droofit:BOOL=ON \
+       -Droot7:BOOL=OFF \
        -Drpath:BOOL=OFF \
 %if %{ruby}
        -Druby:BOOL=ON \
@@ -1731,7 +1747,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Druby:BOOL=OFF \
 %endif
        -Dsapdb:BOOL=OFF \
-       -Dsearch-usrlocal:BOOL=OFF \
        -Dshadowpw:BOOL=ON \
        -Dshared:BOOL=ON \
        -Dsoversion:BOOL=ON \
@@ -1739,11 +1754,13 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dsrp:BOOL=OFF \
        -Dssl:BOOL=ON \
        -Dtable:BOOL=ON \
+       -Dtbb:BOOL=ON \
+       -Dtcmalloc:BOOL=OFF \
+       -Dthread:BOOL=ON \
        -Dtmva:BOOL=ON \
        -Dunuran:BOOL=ON \
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=ON \
-       -Dwerror:BOOL=OFF \
        -Dx11:BOOL=ON \
        -Dxft:BOOL=ON \
        -Dxml:BOOL=ON \
@@ -2988,6 +3005,11 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
+- Update to 6.06.04
+- Drop patch root-no-hexfloat-const.patch
+- Add requires on gcc-c++ to root-cling
+
 * Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
 - Rebuild for OCE-0.17.1
 
diff --git a/sources b/sources
index 9fff1e1..8882937 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-efc971800c1ab365c309c02c4d1e0aeb  root-6.06.02.tar.xz
+f7d457dfc37fd560507efd47824010f1  root-6.06.04.tar.xz
 7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From 3900297baa4969a1663f906b44e3b73a64cfc43b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sat, 4 Jun 2016 11:49:55 +0200
Subject: [PATCH 083/344] Disable hadoop/hdfs support for F24+ (hadoop was
 retired)

---
 root-test-install.patch |  2 +-
 root.spec               | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/root-test-install.patch b/root-test-install.patch
index 5b3afb4..7ae7c3a 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -482,7 +482,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/b
 diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
 --- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
-@@ -543,6 +543,22 @@ TROOT::TROOT(const char *name, const char *title, VoidFuncPtr_t *initfunc)
+@@ -543,6 +543,22 @@
     // Initialize Operating System interface
     InitSystem();
  
diff --git a/root.spec b/root.spec
index 22e0d6d..9f1d18f 100644
--- a/root.spec
+++ b/root.spec
@@ -7,7 +7,7 @@
 %global pythia8 1
 %global xrootd 1
 
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} <= 23
 # libhdfs is currently only available on intel architectures in Fedora
 %ifarch %{ix86} x86_64
 %global hadoop 1
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -348,6 +348,9 @@ Requires:	font(droidsansfallback)
 %if %{ruby} == 0
 Obsoletes:	%{name}-ruby < 6.00.00
 %endif
+%if %{hadoop} == 0
+Obsoletes:	%{name}-io-hdfs < 6.06.04-2
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -3005,6 +3008,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
+- Disable hadoop/hdfs support for F24+ (hadoop was retired)
+
 * Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
 - Update to 6.06.04
 - Drop patch root-no-hexfloat-const.patch

From a95a6d6f131e55c9b20b3ce85fba04e89279ea53 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 13 Jun 2016 21:19:41 +0200
Subject: [PATCH 084/344] Remove mathtext and minicern references from cmake
 files

- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
---
 root-latex-markup.patch |  2 +-
 root-more-fflags.patch  | 33 +++++++++++++++++++++++++++++++++
 root.spec               | 17 ++++++++++++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 root-more-fflags.patch

diff --git a/root-latex-markup.patch b/root-latex-markup.patch
index 1edd1d4..48e2a28 100644
--- a/root-latex-markup.patch
+++ b/root-latex-markup.patch
@@ -19,7 +19,7 @@ diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/s
 +   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
 +   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
 +   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
-+   Tl.DrawText(.1, .6, "#acure{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
++   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
 +   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
 +   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
 +   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
new file mode 100644
index 0000000..5332043
--- /dev/null
+++ b/root-more-fflags.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index f51bcbe..1ee0602 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
+ #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
+-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
++string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+ set(ROOT_COMPILER_FLAG_HINTS "#
+ set(ROOT_CXX_FLAGS \"${__cxxflags}\")
+ set(ROOT_C_FLAGS \"${__cflags}\")
+diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
+index 045926d..a419744 100644
+--- a/cmake/scripts/RootUseFile.cmake.in
++++ b/cmake/scripts/RootUseFile.cmake.in
+@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
+index b9a8e34..f931ad3 100644
+--- a/etc/cmake/RootUseFile.cmake
++++ b/etc/cmake/RootUseFile.cmake
+@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root.spec b/root.spec
index 9f1d18f..0133bcf 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -78,6 +78,8 @@ Patch13:	%{name}-fflags.patch
 Patch14:	%{name}-unuran.patch
 #		Use systme gl2ps
 Patch15:	%{name}-gl2ps.patch
+#		More CMAKE_Fortran_FLAGS case issues
+Patch16:	%{name}-more-fflags.patch
 #		Use the same soname for cmake and configure
 Patch17:	%{name}-soname.patch
 #		Save memory during build
@@ -1557,6 +1559,7 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -1913,6 +1916,14 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
+# Remove mathtext and minicern references from cmake files
+sed -e 's/ mathtext / /' -e /mathtext/d \
+    -e 's/ minicern / /' -e /minicern/d \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
+    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
+
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
@@ -3008,6 +3019,10 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
+- Remove mathtext and minicern references from cmake files
+- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
+
 * Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
 - Disable hadoop/hdfs support for F24+ (hadoop was retired)
 

From 8c8b88f79b45547ad05310e509fe9b9084c03abd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 20 Jun 2016 15:38:08 +0200
Subject: [PATCH 085/344] Add GuiTypes.h, KeySymbols.h and Buttons.h to dict
 (backport)

- Minor updates to patches - mostly backported from upstream
- Reenable hadoop/hdfs support for F24+
---
 root-broken-cmake-config.patch | 40 +++++++++++++++++++++++-----------
 root-cache-test.patch          |  9 +++++---
 root-gfal2.patch               |  2 +-
 root-keysymbols.patch          | 16 ++++++++++++++
 root.spec                      | 13 +++++++++--
 5 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 root-keysymbols.patch

diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
index d21a76e..c1bf91f 100644
--- a/root-broken-cmake-config.patch
+++ b/root-broken-cmake-config.patch
@@ -28,29 +28,43 @@ diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modul
 diff -Nur root-6.06.02.orig/cmake/modules/FindGFAL.cmake root-6.06.02/cmake/modules/FindGFAL.cmake
 --- root-6.06.02.orig/cmake/modules/FindGFAL.cmake	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/cmake/modules/FindGFAL.cmake	2016-03-20 17:08:52.162461425 +0100
-@@ -6,15 +6,18 @@
+@@ -4,17 +4,29 @@
+ #  GFAL_FOUND
+ #  GFAL_INCLUDE_DIR
  #  GFAL_INCLUDE_DIRS (not cached)
- #  GFAL_LIBRARIES
+-#  GFAL_LIBRARIES
++#  GFAL_LIBRARIES (not cached)
  
 -find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
-+find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include /usr/include/gfal2 /usr/include)
- find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
+-find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
 -find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
-+find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include /usr/include)
++find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h
++          PATH_SUFFIXES . gfal gfal2
++          HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
++find_library(GFAL_LIBRARY NAMES gfal gfal2
++             HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
++find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h 
++          HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
  
--set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
-+find_package(PkgConfig)
-+pkg_check_modules (GLIB2 glib-2.0)
++set(GFAL_LIBRARIES ${GFAL_LIBRARY})
+ set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
+ 
++if(GFAL_LIBRARY MATCHES gfal2)
++  # use pkg-config to get the directories for glib and then use these values
++  find_package(PkgConfig)
++  pkg_check_modules(GLIB2 glib-2.0)
++  list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS})
++endif()
 +
-+set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS})
- 
  # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
  # all listed variables are TRUE
- INCLUDE(FindPackageHandleStandardArgs)
+-INCLUDE(FindPackageHandleStandardArgs)
 -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARIES)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_LIBRARIES GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS)
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY)
  
- mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR)
+-mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR)
++mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR)
 diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
 --- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
diff --git a/root-cache-test.patch b/root-cache-test.patch
index ca24479..1cf437e 100644
--- a/root-cache-test.patch
+++ b/root-cache-test.patch
@@ -41,16 +41,19 @@ diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHist
 diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
 --- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
-@@ -78,7 +78,8 @@
+@@ -78,9 +78,10 @@
           cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
           return 1;
        }
 -      fref = new TWebFile(refFile) ;
 +      TFile::SetCacheFileDir(".");
-+      fref = new TFile(refFile,"CACHEREAD") ;
++      fref = TFile::Open(refFile,"CACHEREAD") ;
      } else {
-       fref = new TFile(refFile,writeRef?"RECREATE":"") ;
+-      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
++      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
      }
+     if (fref->IsZombie()) {
+       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
 diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
 --- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
diff --git a/root-gfal2.patch b/root-gfal2.patch
index cdf06ac..a6f765a 100644
--- a/root-gfal2.patch
+++ b/root-gfal2.patch
@@ -6,7 +6,7 @@ diff -ur root-5.34.32.orig/io/gfal/src/TGFALFile.cxx root-5.34.32/io/gfal/src/TG
  
  // GFAL2 doesn't use special names for 64 bit versions
 -#ifdef _GFAL2_API_
-+#if defined(_GFAL2_API_) || defined(GFAL2_API_H_)
++#if defined(_GFAL2_API_) || defined(GFAL2_API_) || defined(_GFAL2_API) || defined(_GFAL2_API_H_) || defined(GFAL2_API_H_) || defined(_GFAL2_API_H)
  #define gfal_lseek64   gfal_lseek
  #define gfal_open64    gfal_open
  #define gfal_readdir64 gfal_readdir
diff --git a/root-keysymbols.patch b/root-keysymbols.patch
new file mode 100644
index 0000000..e8ee549
--- /dev/null
+++ b/root-keysymbols.patch
@@ -0,0 +1,16 @@
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index b80f366..35e0f70 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -2,7 +2,10 @@
+ # CMakeLists.txt file for building ROOT core/base package
+ ############################################################################
+ 
+-ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h)
++ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h
++                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h 
++                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h 
++                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/Buttons.h)
+ 
+ if(root7)
+     set(root7src v7/src/*.cxx)
diff --git a/root.spec b/root.spec
index 0133bcf..4110b46 100644
--- a/root.spec
+++ b/root.spec
@@ -7,7 +7,7 @@
 %global pythia8 1
 %global xrootd 1
 
-%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} <= 23
+%if %{?fedora}%{!?fedora:0} >= 20
 # libhdfs is currently only available on intel architectures in Fedora
 %ifarch %{ix86} x86_64
 %global hadoop 1
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -144,6 +144,9 @@ Patch41:	%{name}-no-testdata.patch
 #		Avoid using std::bind with lambdas (fixed upstream)
 Patch42:	%{name}-avoid-std-bind-lambda.patch
 
+#		Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
+Patch43:	%{name}-keysymbols.patch
+
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
@@ -1586,6 +1589,7 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
 
 chmod 644 math/mathcore/src/mixmax.h math/mathcore/src/mixmax.cxx
 
@@ -3019,6 +3023,11 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
+- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
+- Minor updates to patches - mostly backported from upstream
+- Reenable hadoop/hdfs support for F24+
+
 * Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
 - Remove mathtext and minicern references from cmake files
 - Fix the spelling of CMAKE_Fortran_FLAGS in a few places

From 0fbfae57cfbeaa8bb804971414b16e25414cb7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 24 Jun 2016 09:48:07 +0200
Subject: [PATCH 086/344] Mandatory Perl build-requires added
 <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>

---
 root.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/root.spec b/root.spec
index 4110b46..be8da7f 100644
--- a/root.spec
+++ b/root.spec
@@ -167,6 +167,7 @@ BuildRequires:	ftgl-devel
 BuildRequires:	glew-devel
 BuildRequires:	gl2ps-devel
 BuildRequires:	pcre-devel
+BuildRequires:	perl-generators
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:	libAfterImage-devel >= 1.20

From 29a5baca4e411fd676c7581bb1c1ff53d6353ce9 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Sun, 10 Jul 2016 13:06:29 +0200
Subject: [PATCH 087/344] Update to 6.06.06

- Drop patches root-gfal2.patch and root-keysymbols.patch
- Make root-vdt package noarch
---
 root-broken-cmake-config.patch | 40 ----------------------------------
 root-dox-filter.patch          |  2 +-
 root-gfal2.patch               | 12 ----------
 root-keysymbols.patch          | 16 --------------
 root-more-fflags.patch         |  4 ++--
 root-no-abi-check.patch        | 28 ++++++++++++++++++++++++
 root-stressgraphics.patch      | 26 +++++++++++-----------
 root-test-install.patch        |  8 +++----
 root.spec                      | 33 ++++++++++++++++------------
 sources                        |  2 +-
 10 files changed, 68 insertions(+), 103 deletions(-)
 delete mode 100644 root-gfal2.patch
 delete mode 100644 root-keysymbols.patch
 create mode 100644 root-no-abi-check.patch

diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
index c1bf91f..aaa4a6c 100644
--- a/root-broken-cmake-config.patch
+++ b/root-broken-cmake-config.patch
@@ -25,46 +25,6 @@ diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modul
 +endif()
 +
 +mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/FindGFAL.cmake root-6.06.02/cmake/modules/FindGFAL.cmake
---- root-6.06.02.orig/cmake/modules/FindGFAL.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindGFAL.cmake	2016-03-20 17:08:52.162461425 +0100
-@@ -4,17 +4,29 @@
- #  GFAL_FOUND
- #  GFAL_INCLUDE_DIR
- #  GFAL_INCLUDE_DIRS (not cached)
--#  GFAL_LIBRARIES
-+#  GFAL_LIBRARIES (not cached)
- 
--find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
--find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
--find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
-+find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h
-+          PATH_SUFFIXES . gfal gfal2
-+          HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
-+find_library(GFAL_LIBRARY NAMES gfal gfal2
-+             HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
-+find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h 
-+          HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
- 
-+set(GFAL_LIBRARIES ${GFAL_LIBRARY})
- set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
- 
-+if(GFAL_LIBRARY MATCHES gfal2)
-+  # use pkg-config to get the directories for glib and then use these values
-+  find_package(PkgConfig)
-+  pkg_check_modules(GLIB2 glib-2.0)
-+  list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS})
-+endif()
-+
- # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
- # all listed variables are TRUE
--INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARIES)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY)
- 
--mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR)
-+mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR)
 diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
 --- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
index 90df77e..1bf85d2 100644
--- a/root-dox-filter.patch
+++ b/root-dox-filter.patch
@@ -55,7 +55,7 @@ diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documen
 +         do {
 +            size_t e = gLineString.find('\n', b);
 +            if (e != string::npos) e++;
-+            if (spos) printf("%-*s%s", spos, "///",
++            if (spos) printf("%-*s%s", (int)spos, "///",
 +                              gLineString.substr(b, e - b).c_str());
 +            else printf("%s", gLineString.substr(b, e - b).c_str());
 +            b = e;
diff --git a/root-gfal2.patch b/root-gfal2.patch
deleted file mode 100644
index a6f765a..0000000
--- a/root-gfal2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-5.34.32.orig/io/gfal/src/TGFALFile.cxx root-5.34.32/io/gfal/src/TGFALFile.cxx
---- root-5.34.32.orig/io/gfal/src/TGFALFile.cxx	2015-06-23 17:56:20.000000000 +0200
-+++ root-5.34.32/io/gfal/src/TGFALFile.cxx	2015-11-17 14:33:31.069759901 +0100
-@@ -68,7 +68,7 @@
- }
- 
- // GFAL2 doesn't use special names for 64 bit versions
--#ifdef _GFAL2_API_
-+#if defined(_GFAL2_API_) || defined(GFAL2_API_) || defined(_GFAL2_API) || defined(_GFAL2_API_H_) || defined(GFAL2_API_H_) || defined(_GFAL2_API_H)
- #define gfal_lseek64   gfal_lseek
- #define gfal_open64    gfal_open
- #define gfal_readdir64 gfal_readdir
diff --git a/root-keysymbols.patch b/root-keysymbols.patch
deleted file mode 100644
index e8ee549..0000000
--- a/root-keysymbols.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index b80f366..35e0f70 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -2,7 +2,10 @@
- # CMakeLists.txt file for building ROOT core/base package
- ############################################################################
- 
--ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h)
-+ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h
-+                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h 
-+                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h 
-+                                    ${CMAKE_CURRENT_SOURCE_DIR}/inc/Buttons.h)
- 
- if(root7)
-     set(root7src v7/src/*.cxx)
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
index 5332043..5ce9485 100644
--- a/root-more-fflags.patch
+++ b/root-more-fflags.patch
@@ -8,9 +8,9 @@ index f51bcbe..1ee0602 100644
  string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
 -string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
 +string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+ string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
  set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_CXX_FLAGS \"${__cxxflags}\")
- set(ROOT_C_FLAGS \"${__cflags}\")
+ set(ROOT_DEFINITIONS \"${__defs}\")
 diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
 index 045926d..a419744 100644
 --- a/cmake/scripts/RootUseFile.cmake.in
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
new file mode 100644
index 0000000..afad777
--- /dev/null
+++ b/root-no-abi-check.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
+index 896ca4c..51e01905 100644
+--- a/cmake/modules/CheckCompiler.cmake
++++ b/cmake/modules/CheckCompiler.cmake
+@@ -1,7 +1,6 @@
+ #---------------------------------------------------------------------------------------------------
+ #  CheckCompiler.cmake
+ #---------------------------------------------------------------------------------------------------
+-include (CheckCXXSourceCompiles)
+ 
+ #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
+ if(fortran)
+@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
+   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
+-  CHECK_CXX_SOURCE_COMPILES("
+-    #include <string>
+-    #if _GLIBCXX_USE_CXX11_ABI
+-    #error \"cling does not support GCC 5 ABI.\"
+-    #endif
+-    int main() {}" CXX_SUPPORTS_OLD_ABI)
+-  if(NOT CXX_SUPPORTS_OLD_ABI)
+-     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
+-  endif()
+ else()
+   set(GCC_MAJOR 0)
+   set(GCC_MINOR 0)
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
index 73b36e9..8834aa4 100644
--- a/root-stressgraphics.patch
+++ b/root-stressgraphics.patch
@@ -1,12 +1,12 @@
-diff -ur root-6.06.02.orig/test/stressGraphics.ref root-6.06.02/test/stressGraphics.ref
---- root-6.06.02.orig/test/stressGraphics.ref	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressGraphics.ref	2016-04-09 16:20:33.234593347 +0200
+diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
+--- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
++++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
 @@ -3,18 +3,18 @@
      2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
      3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
      4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
 -    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
-+    5      1025       200     12802       200     19715      2900     33468      9900     30846      5000      1072       200
++    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
      6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
      7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
 -    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
@@ -19,12 +19,12 @@ diff -ur root-6.06.02.orig/test/stressGraphics.ref root-6.06.02/test/stressGraph
 -   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
 -   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
 +    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
-+    9      9253       100     14310        50      9664       600     19851      2400     12199      1000      9449       100
-+   10      8863        70     13539       100     14622      1200     25627      1200     25264      1800      8894        70
-+   11     12971       100     14377        50     20508      1400     34063      2000     32033      1400     12864       150
-+   12      7674       100     13482        50     27519      2500     83557      2800     38505      4000      7720       150
-+   13      5600       400     13242       400      9805       400     16881       400     15063       800      5638       400
-+   14  14190539   3500000     12926       100     15663       800     23076      9500     25987      2400  14190704   3500000
++    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
++   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
++   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
++   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
++   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
++   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
 +   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
 +   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
     17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
@@ -44,13 +44,13 @@ diff -ur root-6.06.02.orig/test/stressGraphics.ref root-6.06.02/test/stressGraph
     35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
     36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
 -   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
-+   37   1456993     10000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
++   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
     38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
 -   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
-+   39     15025      3200     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
++   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
     40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
 -   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
-+   41      4846       200     14075       100     24281       200     33239       600     25636       300      4877       200
++   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
     42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
     43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
     44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-test-install.patch b/root-test-install.patch
index 7ae7c3a..0b61f68 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -1446,9 +1446,9 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
 +#else
 +   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
 +#endif
-    clingArgs.push_back("-D__ROOTCLING__");
-    clingArgs.push_back("-fsyntax-only");
-    clingArgs.push_back("-Xclang");
+    // We do not want __ROOTCLING__ in the pch!
+    if (!onepcm) {
+       clingArgs.push_back("-D__ROOTCLING__");
 @@ -4162,10 +4159,14 @@
     }
  
@@ -3038,7 +3038,7 @@ diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMak
 +++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
 @@ -48,11 +48,7 @@
  ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO)
+                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
  
 -install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
 -                            COMPONENT headers
diff --git a/root.spec b/root.spec
index be8da7f..89ba905 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.06.04
+Version:	6.06.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -54,9 +54,9 @@ Patch2:		%{name}-fontconfig.patch
 Patch3:		%{name}-type1-embed.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch4:		%{name}-dont-link-jvm.patch
-#		Adapt to GFAL 2.10
-#		https://github.com/root-mirror/root/pull/106
-Patch5:		%{name}-gfal2.patch
+#		Remove gcc ABI check
+#		with the abitags patch above it is not needed
+Patch5:		%{name}-no-abi-check.patch
 #		Public header #includes private header
 #		https://github.com/root-mirror/root/pull/88
 Patch6:		%{name}-private-public.patch
@@ -144,9 +144,6 @@ Patch41:	%{name}-no-testdata.patch
 #		Avoid using std::bind with lambdas (fixed upstream)
 Patch42:	%{name}-avoid-std-bind-lambda.patch
 
-#		Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
-Patch43:	%{name}-keysymbols.patch
-
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
@@ -167,7 +164,6 @@ BuildRequires:	ftgl-devel
 BuildRequires:	glew-devel
 BuildRequires:	gl2ps-devel
 BuildRequires:	pcre-devel
-BuildRequires:	perl-generators
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:	libAfterImage-devel >= 1.20
@@ -240,6 +236,7 @@ BuildRequires:	numpy
 BuildRequires:	dos2unix
 BuildRequires:	doxygen
 BuildRequires:	graphviz
+BuildRequires:	perl-generators
 #		Some of the tests call lsb_release
 BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
@@ -1095,11 +1092,12 @@ variates from the desired distribution.
 
 %package vdt
 Summary:	VDT mathematical library
+BuildArch:	noarch
 
 %description vdt
-VDT is a library of mathematical functions, implemented in double and
+VDT is a library of mathematical functions implemented in double and
 single precision. The implementation is fast and with the aid of
-modern compilers (e.g. gcc 4.7) vectorisable.
+modern compilers (e.g. gcc 4.7) vectorizable.
 
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
@@ -1590,9 +1588,6 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
-%patch43 -p1
-
-chmod 644 math/mathcore/src/mixmax.h math/mathcore/src/mixmax.cxx
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1622,6 +1617,11 @@ rm -rf documentation/doxygen/mathjax.tar.gz
 sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
 sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
     -i documentation/doxygen/Doxyfile
+%if %{?fedora}%{!?fedora:0} >= 24
+#  * string_view
+rm core/metautils/inc/libcpp_string_view.h \
+   core/metautils/inc/RWrap_libcpp_string_view.h
+%endif
 
 # Remove bundled fonts provided by the OS distributions
 %if %{?fedora}%{!?fedora:0} >= 11
@@ -3024,6 +3024,11 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
+- Update to 6.06.06
+- Drop patches root-gfal2.patch and root-keysymbols.patch
+- Make root-vdt package noarch
+
 * Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
 - Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
 - Minor updates to patches - mostly backported from upstream
diff --git a/sources b/sources
index 8882937..5330ee7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f7d457dfc37fd560507efd47824010f1  root-6.06.04.tar.xz
+8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
 7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From bf23f84c803f1f5b73f30463bd2b1a1ac86a4eea Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 18 Jul 2016 17:35:08 +0200
Subject: [PATCH 088/344] Add requires on redhat-rpm-config to root-cling

---
 root.spec | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 89ba905..80fd7e3 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -379,6 +379,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 #		clang are compiled using -fvisibility=hidden, and are not
 #		visible outside of the libCling module.
 Requires:	gcc-c++
+Requires:	redhat-rpm-config
 Provides:	bundled(clang-libs)
 Provides:	bundled(llvm-libs)
 Obsoletes:	%{name}-cint7 < 5.26.00c
@@ -1888,6 +1889,20 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
 # These should be in PATH
 mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
+# Avoid /usr/bin/env shebangs
+sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
+sed 's!/usr/bin/env python!/usr/bin/python!' \
+    -i %{buildroot}%{_bindir}/rootbrowse \
+       %{buildroot}%{_bindir}/rootcp \
+       %{buildroot}%{_bindir}/rooteventselector \
+       %{buildroot}%{_bindir}/rootls \
+       %{buildroot}%{_bindir}/rootmkdir \
+       %{buildroot}%{_bindir}/rootmv \
+       %{buildroot}%{_bindir}/rootprint \
+       %{buildroot}%{_bindir}/rootrm \
+       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
+       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
+
 # Remove some junk
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
@@ -3024,6 +3039,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
+- Add requires on redhat-rpm-config to root-cling
+
 * Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
 - Update to 6.06.06
 - Drop patches root-gfal2.patch and root-keysymbols.patch

From ed55b4fe587199cf81131403a306091ddefa9c32 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 12:31:16 +0000
Subject: [PATCH 089/344] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 80fd7e3..1078ad4 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3039,6 +3039,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
 - Add requires on redhat-rpm-config to root-cling
 

From f23b63a03fa4f62bbb6dafaefe2821b80ceed9e8 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Sat, 30 Jul 2016 15:07:31 +0530
Subject: [PATCH 090/344] Retire packages without systemd support, See FESCo
 ticket 1605

---
 .gitignore                       |    3 -
 dead.package                     |    1 +
 root-32bit.patch                 |   78 -
 root-abitags.patch               | 1267 -----------
 root-arm.patch                   |   81 -
 root-avoid-gui-crash.patch       |   59 -
 root-avoid-std-bind-lambda.patch |   42 -
 root-broken-cmake-config.patch   |  156 --
 root-cache-test.patch            |  284 ---
 root-cernlib-doc.patch           | 1307 -----------
 root-compiledata.patch           |   12 -
 root-deprecated-options.patch    |   30 -
 root-dont-link-jvm.patch         |  123 --
 root-dox-filter.patch            |   86 -
 root-doxyfile.patch              |   30 -
 root-doxygen-warnings.patch      |  723 -------
 root-fflags.patch                |   78 -
 root-fontconfig.patch            | 1408 ------------
 root-gl2ps.patch                 |  254 ---
 root-html-markup.patch           | 1031 ---------
 root-latex-markup.patch          |  877 --------
 root-libgfortranbegin.patch      |  182 --
 root-links.patch                 |  376 ----
 root-llvm-static.patch           |   11 -
 root-macro-align.patch           |   36 -
 root-missing-cmake-config.patch  |  187 --
 root-more-fflags.patch           |   33 -
 root-no-abi-check.patch          |   28 -
 root-no-testdata.patch           |   20 -
 root-ppc64.patch                 |   38 -
 root-private-public.patch        |  156 --
 root-s390x.patch                 |  147 --
 root-save-memory.patch           |   30 -
 root-see-macro-output.patch      |  266 ---
 root-soname.patch                |   11 -
 root-stressgraphics.patch        |   56 -
 root-template-files.patch        |   28 -
 root-test-install.patch          | 3105 ---------------------------
 root-testfiles.sh                |   85 -
 root-tildes.patch                |  194 --
 root-tmath-doc.patch             |  274 ---
 root-tprincipal-doc.patch        |  483 -----
 root-tvector2-comment.patch      |   13 -
 root-type1-embed.patch           |   97 -
 root-unuran.patch                |  305 ---
 root-werror.patch                |   12 -
 root.spec                        | 3462 ------------------------------
 sources                          |    2 -
 48 files changed, 1 insertion(+), 17566 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 root-32bit.patch
 delete mode 100644 root-abitags.patch
 delete mode 100644 root-arm.patch
 delete mode 100644 root-avoid-gui-crash.patch
 delete mode 100644 root-avoid-std-bind-lambda.patch
 delete mode 100644 root-broken-cmake-config.patch
 delete mode 100644 root-cache-test.patch
 delete mode 100644 root-cernlib-doc.patch
 delete mode 100644 root-compiledata.patch
 delete mode 100644 root-deprecated-options.patch
 delete mode 100644 root-dont-link-jvm.patch
 delete mode 100644 root-dox-filter.patch
 delete mode 100644 root-doxyfile.patch
 delete mode 100644 root-doxygen-warnings.patch
 delete mode 100644 root-fflags.patch
 delete mode 100644 root-fontconfig.patch
 delete mode 100644 root-gl2ps.patch
 delete mode 100644 root-html-markup.patch
 delete mode 100644 root-latex-markup.patch
 delete mode 100644 root-libgfortranbegin.patch
 delete mode 100644 root-links.patch
 delete mode 100644 root-llvm-static.patch
 delete mode 100644 root-macro-align.patch
 delete mode 100644 root-missing-cmake-config.patch
 delete mode 100644 root-more-fflags.patch
 delete mode 100644 root-no-abi-check.patch
 delete mode 100644 root-no-testdata.patch
 delete mode 100644 root-ppc64.patch
 delete mode 100644 root-private-public.patch
 delete mode 100644 root-s390x.patch
 delete mode 100644 root-save-memory.patch
 delete mode 100644 root-see-macro-output.patch
 delete mode 100644 root-soname.patch
 delete mode 100644 root-stressgraphics.patch
 delete mode 100644 root-template-files.patch
 delete mode 100644 root-test-install.patch
 delete mode 100755 root-testfiles.sh
 delete mode 100644 root-tildes.patch
 delete mode 100644 root-tmath-doc.patch
 delete mode 100644 root-tprincipal-doc.patch
 delete mode 100644 root-tvector2-comment.patch
 delete mode 100644 root-type1-embed.patch
 delete mode 100644 root-unuran.patch
 delete mode 100644 root-werror.patch
 delete mode 100644 root.spec
 delete mode 100644 sources

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9ff0650..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.tar.gz
-/*.tar.xz
-/usa.root
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1186b4b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Retire packages without systemd support, See FESCo ticket 1605
diff --git a/root-32bit.patch b/root-32bit.patch
deleted file mode 100644
index 326a8d8..0000000
--- a/root-32bit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
---- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
-@@ -179,7 +179,7 @@
- 
-    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
- 
--   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
-+   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
- 
-    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
- 
-diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
---- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
-@@ -1121,7 +1121,7 @@
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
- #if defined (R__LINUX) && !defined(R__B64)
-    // problem of precision on linux 32
--   if (Dim ==4) scale = 1000000000;
-+   if (Dim ==4) scale = 5000000000;
- #endif
-    // for problem with PtEtaPhiE
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
-diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
---- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
-@@ -312,7 +312,7 @@
-    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
-    double par[2] = {3,4};
-    double xx[2] = {0.8,1.6};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -326,7 +326,7 @@
-    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
-    double par[2] = {3,4};
-    double xx[3] = {0.8,1.6,2.2};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -369,12 +369,12 @@
-    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
-    f2.SetParameters(10,1,0,1);
-    f0.SetParameters(f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
- 
-    TF1 f3("f3","f1+[0]");
-    // param order should be the same
-    f3.SetParameters( f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
-    return ok;
- }
- 
-@@ -465,7 +465,7 @@
-    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
-    TF1 f6("f6",func,-10,10,4);
-    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
--   ok &= (f5.Eval(2) == f6.Eval(2) );
-+   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
-    return ok;
- }
- 
-@@ -485,7 +485,7 @@
-    // keep same order in evaluation
-    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
-    f0.SetParameters(1.1,2.1);
--   ok &= (fsincos.Eval(2) == f0.Eval(2) );
-+   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
-    return ok;
- 
- }
diff --git a/root-abitags.patch b/root-abitags.patch
deleted file mode 100644
index 040474a..0000000
--- a/root-abitags.patch
+++ /dev/null
@@ -1,1267 +0,0 @@
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
---- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
-@@ -0,0 +1,90 @@
-+========
-+Abi Tags
-+========
-+
-+Introduction
-+============
-+
-+This text tries to describe gcc semantic for mangling "abi_tag" attributes
-+described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
-+
-+There is no guarantee the following rules are correct, complete or make sense
-+in any way as they were determined empirically by experiments with gcc5.
-+
-+Declaration
-+===========
-+
-+Abi tags are declared in an abi_tag attribute and can be applied to a
-+function, variable, class or inline namespace declaration. The attribute takes
-+one or more strings (called tags); the order does not matter.
-+
-+See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
-+details.
-+
-+Tags on an inline namespace are called "implicit tags", all other tags are
-+"explicit tags".
-+
-+Mangling
-+========
-+
-+All tags that are "active" on a <unqualified-name> are emitted after the
-+<unqualified-name>, before <template-args> or <discriminator>, and are part of
-+the same <substitution> the <unqualified-name> is.
-+
-+They are mangled as:
-+
-+    <abi-tags> ::= <abi-tag>*   # sort by name
-+    <abi-tag> ::= B <tag source-name>
-+
-+Example:
-+
-+    __attribute__((abi_tag("test")))
-+    void Func();
-+
-+    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
-+
-+Active tags
-+===========
-+
-+A namespace has never any active tags; for types (class / struct / union /
-+enum) the explicit tags are the active tags.
-+
-+For variables and functions the active tags are the explicit tags plus any
-+"required tags" which are not in the "available tags" set:
-+
-+    derived-tags := (required-tags - available-tags)
-+    active-tags := explicit-tags + derived-tags
-+
-+Required tags for a function
-+============================
-+
-+If a function is used as a local scope for another name, and is part of
-+another function as local scope, it doesn't have any required tags.
-+
-+If a function is used as a local scope for a guard variable name, it doesn't
-+have any required tags.
-+
-+Otherwise the function requires any implicit or explicit tag used in the name
-+for the return type.
-+
-+Required tags for a variable
-+============================
-+
-+A variable requires any implicit or explicit tag used in its type.
-+
-+Available tags
-+==============
-+
-+All tags used in the prefix and in the template arguments for a name are
-+available; for functions also all  tags from the <bare-function-type> (which
-+might include the return type for template functions) are available.
-+
-+For <local-name>s all active tags used in the local part (<function-
-+encoding>) are available, but not implicit tags which were not active!
-+
-+Implicit and explicit tags used in the <unqualified-name> for a function (as
-+in the type of a cast operator) are NOT available.
-+
-+Example: a cast operator to std::string (which is
-+std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
-+required from the return type `std::string` but not available.
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
-@@ -144,6 +144,7 @@
- class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
- class VariadicUnsignedArgument<string name> : Argument<name, 1>;
- class VariadicExprArgument<string name> : Argument<name, 1>;
-+class VariadicStringArgument<string name> : Argument<name, 1>;
- 
- // A version of the form major.minor[.subminor].
- class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
-@@ -336,6 +337,14 @@
- // Attributes begin here
- //
- 
-+def AbiTag : Attr {
-+  let Spellings = [GCC<"abi_tag">];
-+  let Args = [VariadicStringArgument<"Tags">];
-+  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
-+                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
-+  let Documentation = [Undocumented];
-+}
-+
- def AddressSpace : TypeAttr {
-   let Spellings = [GNU<"address_space">];
-   let Args = [IntArgument<"AddressSpace">];
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
-@@ -2255,7 +2255,8 @@
-   "Objective-C instance methods|init methods of interface or class extension declarations|"
-   "variables, functions and classes|Objective-C protocols|"
-   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
--  "interface or protocol declarations|kernel functions}1">,
-+  "interface or protocol declarations|kernel functions|"
-+  "structs, classes, variables, functions, methods and inline namespaces}1">,
-   InGroup<IgnoredAttributes>;
- def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
- def warn_type_attribute_wrong_type : Warning<
-@@ -3922,6 +3923,12 @@
- def err_redefinition_extern_inline : Error<
-   "redefinition of a 'extern inline' function %0 is not supported in "
-   "%select{C99 mode|C++}1">;
-+def err_attr_abi_tag_only_on_inline_namespace :
-+  Error<"abi_tag attribute only allowed on inline namespaces">;
-+def err_abi_tag_on_redeclaration :
-+  Error<"cannot add abi_tag attribute in redeclaration">;
-+def err_new_abi_tag_on_redeclaration :
-+  Error<"abi_tag %0 missing in original declaration">;
- 
- def note_deleted_dtor_no_operator_delete : Note<
-   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
-@@ -846,7 +846,8 @@
-   ExpectedStructOrUnionOrTypedef,
-   ExpectedStructOrTypedef,
-   ExpectedObjectiveCInterfaceOrProtocol,
--  ExpectedKernelFunction
-+  ExpectedKernelFunction,
-+  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
- };
- 
- }  // end namespace clang
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
-@@ -202,6 +202,8 @@
- class CXXNameMangler {
-   ItaniumMangleContextImpl &Context;
-   raw_ostream &Out;
-+  bool NullOut = false;
-+  bool DisableDerivedAbiTags = false;
- 
-   /// The "structor" is the top-level declaration being mangled, if
-   /// that's not a template specialization; otherwise it's the pattern
-@@ -251,6 +253,167 @@
- 
-   } FunctionTypeDepth;
- 
-+  // abi_tag is a gcc attribute, taking one or more strings called "tags".
-+  //
-+  // the goal is to annotage against which version of a library an object was
-+  // build and to be able to provide backwards compatibility ("dual abi").
-+  //
-+  // for this the emitted mangled names have to be different, while you don't
-+  // want the user to have to use different names in the source.
-+  //
-+  // the abi_tag can be present on Struct, Var and Function  declarations as
-+  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
-+  // are always emitted after the unqualified name, and (implicit) tags on
-+  // namespace are not.
-+  //
-+  // For functions and variables there is a set of "implicitly available"
-+  // tags. These tags are: all tags from the namespace/structs the name is
-+  // embedded in, all tags from any template arguments of the name, and, for
-+  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
-+  // parameters and sometimes the return type).
-+  //
-+  // For functions this is basically the list of all tags from the signature
-+  // without the unqualified name and usually without the return type of the
-+  // function. In `operator Type()` Type is NOT part of that list, as it is
-+  // part of the unqualified name!
-+  //
-+  // Now all tags from the function return type/variable type which are not
-+  // "implicitly available" must be added to the explicit list of tags, and
-+  // are emitted after the unqualified name.
-+  //
-+  // Example:
-+  // namespace std {
-+  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
-+  //   inline namespace __cxx11 {
-+  //     struct string { };
-+  //   }
-+  // }
-+  //
-+  // std::string foo(); // needs abi tag "cxx11" on foo
-+  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
-+  // __attribute__((__abi_tag__("cxx11")))
-+  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
-+  //
-+  // The tags are sorted by name before emitting, and are serialized as
-+  //   <abitag> ::= B <"tag" source-name>
-+
-+  typedef SmallVector<StringRef, 4> AbiTagList;
-+
-+  // state to gather all implicit and explicit tags used in a mangled name.
-+  // must always have an instance of this while emitting any name to keep
-+  // track.
-+  //
-+  // TODO(abitags): how to handle substituted names? they should add the tags used in
-+  // the substitution to the list of available tags.
-+  class AbiTagState final {
-+  public:
-+    //! all abi tags used implicitly or explicitly
-+    std::set<StringRef> UsedAbiTags;
-+    //! all explicit abi tags (i.e. not from namespace)
-+    std::set<StringRef> EmittedAbiTags;
-+
-+    AbiTagState* &LinkHead;
-+    AbiTagState *Parent{nullptr};
-+
-+    bool LinkActive{false};
-+
-+    explicit AbiTagState(AbiTagState* &linkHead)
-+      : LinkHead(linkHead) {
-+      Parent = LinkHead;
-+      LinkHead = this;
-+      LinkActive = true;
-+    }
-+
-+    // no copy, no move
-+    AbiTagState(AbiTagState const&) = delete;
-+    AbiTagState& operator=(AbiTagState const&) = delete;
-+
-+    ~AbiTagState() {
-+      pop();
-+    }
-+
-+    void pop() {
-+      if (!LinkActive) return;
-+
-+      assert(LinkHead == this && "abi tag link head must point to us on destruction");
-+      LinkActive = false;
-+      if (Parent) {
-+        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
-+        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
-+      }
-+      LinkHead = Parent;
-+    }
-+
-+    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+      ND = cast<NamedDecl>(ND->getCanonicalDecl());
-+
-+      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
-+        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
-+      } else {
-+        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
-+        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
-+          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
-+            for (const auto& Tag: AbiTag->tags()) {
-+              UsedAbiTags.insert(Tag);
-+            }
-+          }
-+          // don't emit abi tags for namespaces
-+          return;
-+        }
-+      }
-+
-+      AbiTagList TagList;
-+      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
-+        for (const auto& Tag: AbiTag->tags()) {
-+          UsedAbiTags.insert(Tag);
-+          // AbiTag->tags() is sorted and has no duplicates
-+          TagList.push_back(Tag);
-+        }
-+      }
-+
-+      if (AdditionalAbiTags) {
-+        for (const auto& Tag: *AdditionalAbiTags) {
-+          UsedAbiTags.insert(Tag);
-+          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
-+            // don't insert duplicates
-+            TagList.push_back(Tag);
-+          }
-+        }
-+        // AbiTag->tags() are already sorted; only add if we had additional tags
-+        std::sort(TagList.begin(), TagList.end());
-+      }
-+
-+      writeSortedUniqueAbiTags(Out, TagList);
-+    }
-+
-+  protected:
-+    template<typename TagList>
-+    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
-+      for (const auto& Tag: AbiTags) {
-+        EmittedAbiTags.insert(Tag);
-+        Out << "B";
-+        Out << Tag.size();
-+        Out << Tag;
-+      }
-+    }
-+  } *AbiTags = nullptr;
-+  AbiTagState AbiTagsRoot{AbiTags};
-+
-+  struct TemporaryDisableDerivedAbiTags {
-+    bool& StateRef;
-+    bool OldState;
-+
-+    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
-+    : StateRef(State) {
-+      OldState = StateRef;
-+      StateRef = Disable;
-+    }
-+    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
-+    ~TemporaryDisableDerivedAbiTags() {
-+      StateRef = OldState;
-+    }
-+  };
-+
-   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
- 
-   ASTContext &getASTContext() const { return Context.getASTContext(); }
-@@ -273,6 +436,10 @@
-     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
-       SeqID(0) { }
- 
-+  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
-+    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
-+      SeqID(Outer.SeqID) { }
-+
- #if MANGLE_CHECKER
-   ~CXXNameMangler() {
-     if (Out.str()[0] == '\01')
-@@ -286,18 +453,21 @@
- #endif
-   raw_ostream &getStream() { return Out; }
- 
-+  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
-+
-   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
-   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
-   void mangleNumber(const llvm::APSInt &I);
-   void mangleNumber(int64_t Number);
-   void mangleFloat(const llvm::APFloat &F);
--  void mangleFunctionEncoding(const FunctionDecl *FD);
-+  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
-   void mangleSeqID(unsigned SeqID);
--  void mangleName(const NamedDecl *ND);
-+  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
-   void mangleType(QualType T);
-   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
-   
- private:
-+  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
- 
-   bool mangleSubstitution(const NamedDecl *ND);
-   bool mangleSubstitution(QualType T);
-@@ -326,31 +496,49 @@
-                             DeclarationName name,
-                             unsigned KnownArity = UnknownArity);
- 
--  void mangleName(const TemplateDecl *TD,
-+  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
-+
-+  void mangleNameWithAbiTags(const NamedDecl *ND,
-+                             const AbiTagList *AdditionalAbiTags,
-+                             bool ExcludeUnqualifiedName);
-+  void mangleTemplateName(const TemplateDecl *TD,
-+                  const AbiTagList *AdditionalAbiTags,
-+                  bool ExcludeUnqualifiedName,
-                   const TemplateArgument *TemplateArgs,
-                   unsigned NumTemplateArgs);
--  void mangleUnqualifiedName(const NamedDecl *ND) {
--    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
-+  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
-   }
-   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
--                             unsigned KnownArity);
--  void mangleUnscopedName(const NamedDecl *ND);
--  void mangleUnscopedTemplateName(const TemplateDecl *ND);
--  void mangleUnscopedTemplateName(TemplateName);
-+                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                  const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(TemplateName,
-+                                  const AbiTagList *AdditionalAbiTags);
-   void mangleSourceName(const IdentifierInfo *II);
--  void mangleLocalName(const Decl *D);
-+  void mangleLocalName(const Decl *D,
-+                       const AbiTagList *AdditionalAbiTags,
-+                       bool ExcludeUnqualifiedName);
-   void mangleBlockForPrefix(const BlockDecl *Block);
-   void mangleUnqualifiedBlock(const BlockDecl *Block);
-   void mangleLambda(const CXXRecordDecl *Lambda);
-   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
--                        bool NoFunction=false);
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool NoFunction,
-+                        bool ExcludeUnqualifiedName);
-   void mangleNestedName(const TemplateDecl *TD,
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool ExcludeUnqualifiedName,
-                         const TemplateArgument *TemplateArgs,
-                         unsigned NumTemplateArgs);
-   void manglePrefix(NestedNameSpecifier *qualifier);
-   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
-   void manglePrefix(QualType type);
--  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
-+  void mangleTemplatePrefix(const TemplateDecl *ND,
-+                            const AbiTagList *AdditionalAbiTags,
-+                            bool NoFunction = false,
-+                            bool ExcludeUnqualifiedName = false);
-   void mangleTemplatePrefix(TemplateName Template);
-   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
-   void mangleQualifiers(Qualifiers Quals);
-@@ -391,6 +579,10 @@
-   void mangleTemplateParameter(unsigned Index);
- 
-   void mangleFunctionParam(const ParmVarDecl *parm);
-+
-+  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
-+  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
-+  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
- };
- 
- }
-@@ -441,6 +633,11 @@
-   return true;
- }
- 
-+void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+  assert(AbiTags && "require AbiTagState");
-+  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
-+}
-+
- void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
-   // <mangled-name> ::= _Z <encoding>
-   //            ::= <data name>
-@@ -456,14 +653,28 @@
-     mangleName(cast<FieldDecl>(D));
- }
- 
--void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
--  // <encoding> ::= <function name> <bare-function-type>
--  mangleName(FD);
--
-+void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
-   // Don't mangle in the type if this isn't a decl we should typically mangle.
--  if (!Context.shouldMangleDeclName(FD))
-+  if (!Context.shouldMangleDeclName(FD)) {
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-     return;
-+  }
-+
-+  // <encoding> ::= <function name> <bare-function-type>
-+
-+  if (ExcludeUnqualifiedName)
-+  {
-+    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-+  } else {
-+    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
-+    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
-+  }
-+
-+  mangleFunctionEncodingBareType(FD);
-+}
- 
-+void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
-   if (FD->hasAttr<EnableIfAttr>()) {
-     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
-     Out << "Ua9enable_ifI";
-@@ -509,7 +720,7 @@
-     FD = PrimaryTemplate->getTemplatedDecl();
-   }
- 
--  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
-+  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
-                          MangleReturnType);
- }
- 
-@@ -567,7 +778,21 @@
-   return nullptr;
- }
- 
--void CXXNameMangler::mangleName(const NamedDecl *ND) {
-+// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
-+void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
-+  if (!ExcludeUnqualifiedName) {
-+    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
-+      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
-+      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
-+      return;
-+    }
-+  }
-+  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
-+}
-+
-+void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
-+                                           const AbiTagList *AdditionalAbiTags,
-+                                           bool ExcludeUnqualifiedName) {
-   //  <name> ::= <nested-name>
-   //         ::= <unscoped-name>
-   //         ::= <unscoped-template-name> <template-args>
-@@ -583,7 +808,7 @@
-     while (!DC->isNamespace() && !DC->isTranslationUnit())
-       DC = getEffectiveParentContext(DC);
-   else if (GetLocalClassDecl(ND)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
-@@ -593,76 +818,88 @@
-     // Check if we have a template.
-     const TemplateArgumentList *TemplateArgs = nullptr;
-     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--      mangleUnscopedTemplateName(TD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-       mangleTemplateArgs(*TemplateArgs);
-       return;
-     }
- 
--    mangleUnscopedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedName(ND, AdditionalAbiTags);
-     return;
-   }
- 
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
--  mangleNestedName(ND, DC);
-+  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
- }
--void CXXNameMangler::mangleName(const TemplateDecl *TD,
--                                const TemplateArgument *TemplateArgs,
--                                unsigned NumTemplateArgs) {
-+
-+void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
-+                                        const AbiTagList *AdditionalAbiTags,
-+                                        bool ExcludeUnqualifiedName,
-+                                        const TemplateArgument *TemplateArgs,
-+                                        unsigned NumTemplateArgs) {
-   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
- 
-   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
--    mangleUnscopedTemplateName(TD);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
-   } else {
--    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
-+    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
-   }
- }
- 
--void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
-+void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-   //  <unscoped-name> ::= <unqualified-name>
-   //                  ::= St <unqualified-name>   # ::std::
- 
-   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
-     Out << "St";
- 
--  mangleUnqualifiedName(ND);
-+  mangleUnqualifiedName(ND, AdditionalAbiTags);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
-+void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (mangleSubstitution(ND))
-     return;
- 
-   // <template-template-param> ::= <template-param>
--  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
-+  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
-     mangleTemplateParameter(TTP->getIndex());
--  else
--    mangleUnscopedName(ND->getTemplatedDecl());
-+  } else {
-+    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-+  }
- 
-   addSubstitution(ND);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
-+void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleUnscopedTemplateName(TD);
-+    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-   
-   if (mangleSubstitution(Template))
-     return;
- 
-+  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
-+
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Not a dependent template name?");
-   if (const IdentifierInfo *Id = Dependent->getIdentifier())
-     mangleSourceName(Id);
-   else
-     mangleOperatorName(Dependent->getOperator(), UnknownArity);
--  
-+
-   addSubstitution(Template);
- }
- 
-@@ -824,6 +1061,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespace());
-     break;
-   case NestedNameSpecifier::NamespaceAlias:
-     if (qualifier->getPrefix())
-@@ -832,6 +1070,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
- 
-   case NestedNameSpecifier::TypeSpec:
-@@ -917,15 +1156,18 @@
- 
-     case Type::Typedef:
-       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TypedefType>(type)->getDecl());
-       break;
- 
-     case Type::UnresolvedUsing:
-       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
-       break;
- 
-     case Type::Record:
-       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TagType>(type)->getDecl());
-       break;
- 
-     case Type::TemplateSpecialization: {
-@@ -943,6 +1185,7 @@
-         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
- 
-         mangleSourceName(temp->getIdentifier());
-+        writeAbiTags(temp);
-         break;
-       }
- 
-@@ -974,16 +1217,19 @@
-     case Type::InjectedClassName:
-       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
-       break;
- 
-     case Type::DependentName:
-       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
-+      // writeAbiTags(cast<DependentNameType>(type));
-       break;
- 
-     case Type::DependentTemplateSpecialization: {
-       const DependentTemplateSpecializationType *tst
-         = cast<DependentTemplateSpecializationType>(type);
-       mangleSourceName(tst->getIdentifier());
-+      // writeAbiTags(tst);
-       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
-       break;
-     }
-@@ -1033,6 +1279,7 @@
-     }
- 
-     mangleSourceName(qualifier->getAsIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
-   }
- 
-@@ -1049,12 +1296,14 @@
-                                           DeclarationName name,
-                                           unsigned knownArity) {
-   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
--  mangleUnqualifiedName(nullptr, name, knownArity);
-+  mangleUnqualifiedName(nullptr, name, knownArity,
-+                        /*AdditionalAbiTags*/ nullptr);
- }
- 
- void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
-                                            DeclarationName Name,
--                                           unsigned KnownArity) {
-+                                           unsigned KnownArity,
-+                                           const AbiTagList *AdditionalAbiTags) {
-   //  <unqualified-name> ::= <operator-name>
-   //                     ::= <ctor-dtor-name>
-   //                     ::= <source-name>
-@@ -1072,6 +1321,8 @@
-         Out << 'L';
- 
-       mangleSourceName(II);
-+      if (ND)
-+        writeAbiTags(ND, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1111,6 +1362,7 @@
-       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
- 
-       mangleSourceName(FD->getIdentifier());
-+      // TODO(abitags): not emitting abi tags: internal name anyway
-       break;
-     }
- 
-@@ -1131,6 +1383,9 @@
-       assert(D->getDeclName().getAsIdentifierInfo() &&
-              "Typedef was not named!");
-       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
-+      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
-+      // explicit abi tags are still possible; take from underlying type, not from typedef.
-+      writeAbiTags(TD, nullptr);
-       break;
-     }
- 
-@@ -1140,6 +1395,7 @@
-     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
-     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
-       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
-+        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
-         mangleLambda(Record);
-         break;
-       }
-@@ -1151,6 +1407,7 @@
-       if (UnnamedMangle > 1)
-         Out << llvm::utostr(UnnamedMangle - 2);
-       Out << '_';
-+      writeAbiTags(TD, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1183,6 +1440,7 @@
-       // Otherwise, use the complete constructor name. This is relevant if a
-       // class with a constructor is declared within a constructor.
-       mangleCXXCtorType(Ctor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXDestructorName:
-@@ -1194,12 +1452,14 @@
-       // Otherwise, use the complete destructor name. This is relevant if a
-       // class with a destructor is declared within a destructor.
-       mangleCXXDtorType(Dtor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXConversionFunctionName:
-     // <operator-name> ::= cv <type>    # (cast)
-     Out << "cv";
-     mangleType(Name.getCXXNameType());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXOperatorName: {
-@@ -1223,6 +1483,7 @@
-     // FIXME: This mangling is not yet official.
-     Out << "li";
-     mangleSourceName(Name.getCXXLiteralIdentifier());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXUsingDirective:
-@@ -1239,7 +1500,9 @@
- 
- void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
-                                       const DeclContext *DC,
--                                      bool NoFunction) {
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool NoFunction,
-+                                      bool ExcludeUnqualifiedName) {
-   // <nested-name> 
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
-@@ -1259,30 +1522,35 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD, NoFunction);
-+    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
-     mangleTemplateArgs(*TemplateArgs);
-   }
-   else {
-     manglePrefix(DC, NoFunction);
--    mangleUnqualifiedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND, AdditionalAbiTags);
-   }
- 
-   Out << 'E';
- }
- void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool ExcludeUnqualifiedName,
-                                       const TemplateArgument *TemplateArgs,
-                                       unsigned NumTemplateArgs) {
-   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
- 
-   Out << 'N';
- 
--  mangleTemplatePrefix(TD);
-+  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
-   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
- 
-   Out << 'E';
- }
- 
--void CXXNameMangler::mangleLocalName(const Decl *D) {
-+void CXXNameMangler::mangleLocalName(const Decl *D,
-+                                     const AbiTagList *AdditionalAbiTags,
-+                                     bool ExcludeUnqualifiedName) {
-   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
-   //              := Z <function encoding> E s [<discriminator>]
-   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
-@@ -1294,15 +1562,25 @@
- 
-   Out << 'Z';
- 
--  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
--    mangleObjCMethodName(MD);
--  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
--    mangleBlockForPrefix(BD);
--  else
--    mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+  {
-+    AbiTagState localAbiTags(AbiTags);
-+
-+    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
-+      mangleObjCMethodName(MD);
-+    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
-+      mangleBlockForPrefix(BD);
-+    else
-+      mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+
-+    // implicit abi tags (from namespace) are not available in the following
-+    // entity; reset to actually emitted tags, which are available.
-+    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
-+  }
- 
-   Out << 'E';
- 
-+  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
-+
-   if (RD) {
-     // The parameter number is omitted for the last parameter, 0 for the 
-     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
-@@ -1327,13 +1605,17 @@
-     // Mangle the name relative to the closest enclosing function.
-     // equality ok because RD derived from ND above
-     if (D == RD)  {
--      mangleUnqualifiedName(RD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedName(RD, AdditionalAbiTags);
-     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
--      mangleUnqualifiedBlock(BD);
-+      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedBlock(BD);
-     } else {
-       const NamedDecl *ND = cast<NamedDecl>(D);
--      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
-+      mangleNestedName(ND, getEffectiveDeclContext(ND),
-+                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
-     }
-   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-     // Mangle a block in a default parameter; see above explanation for
-@@ -1350,30 +1632,35 @@
-       }
-     }
- 
--    mangleUnqualifiedBlock(BD);
-+    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedBlock(BD);
-   } else {
--    mangleUnqualifiedName(cast<NamedDecl>(D));
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
-   }
- 
--  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
--    unsigned disc;
--    if (Context.getNextDiscriminator(ND, disc)) {
--      if (disc < 10)
--        Out << '_' << disc;
--      else
--        Out << "__" << disc << '_';
-+  if (!ExcludeUnqualifiedName) {
-+    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
-+      unsigned disc;
-+      if (Context.getNextDiscriminator(ND, disc)) {
-+        if (disc < 10)
-+          Out << '_' << disc;
-+        else
-+          Out << "__" << disc << '_';
-+      }
-     }
-   }
- }
- 
- void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
-   if (GetLocalClassDecl(Block)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   const DeclContext *DC = getEffectiveDeclContext(Block);
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   manglePrefix(getEffectiveDeclContext(Block));
-@@ -1384,10 +1671,11 @@
-   if (Decl *Context = Block->getBlockManglingContextDecl()) {
-     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
-         Context->getDeclContext()->isRecord()) {
--      if (const IdentifierInfo *Name
--            = cast<NamedDecl>(Context)->getIdentifier()) {
-+      const auto *ND = cast<NamedDecl>(Context);
-+      if (const IdentifierInfo *Name = ND->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1420,7 +1708,7 @@
-       if (const IdentifierInfo *Name
-             = cast<NamedDecl>(Context)->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1502,11 +1790,11 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD);
-+    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
-     mangleTemplateArgs(*TemplateArgs);
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND);
-+    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
-   }
- 
-   addSubstitution(ND);
-@@ -1517,7 +1805,7 @@
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleTemplatePrefix(TD);
-+    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
- 
-   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
-     manglePrefix(Qualified->getQualifier());
-@@ -1525,18 +1813,21 @@
-   if (OverloadedTemplateStorage *Overloaded
-                                       = Template.getAsOverloadedTemplate()) {
-     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
--                          UnknownArity);
-+                          UnknownArity,
-+                          /* AdditionalAbiTags */ nullptr);
-     return;
-   }
-    
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Unknown template name kind?");
-   manglePrefix(Dependent->getQualifier());
--  mangleUnscopedTemplateName(Template);
-+  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
- }
- 
- void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
--                                          bool NoFunction) {
-+                                          const AbiTagList *AdditionalAbiTags,
-+                                          bool NoFunction,
-+                                          bool ExcludeUnqualifiedName) {
-   // <template-prefix> ::= <prefix> <template unqualified-name>
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-@@ -1548,10 +1839,12 @@
- 
-   // <template-template-param> ::= <template-param>
-   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    // TODO(abitags): ???
-     mangleTemplateParameter(TTP->getIndex());
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND->getTemplatedDecl());
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-   }
- 
-   addSubstitution(ND);
-@@ -1595,6 +1888,7 @@
-     // <name> ::= <nested-name>
-     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
-     mangleSourceName(Dependent->getIdentifier());
-+    // writeAbiTags(Dependent);
-     break;
-   }
- 
-@@ -2370,7 +2664,11 @@
- 
- void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
-   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
--    mangleName(TD, T->getArgs(), T->getNumArgs());
-+    // types only have explicit abi tags, no addition tags
-+    mangleTemplateName(TD,
-+                       /* AdditionalAbiTags */ nullptr,
-+                       /* ExcludeUnqualifiedName */ false,
-+                       T->getArgs(), T->getNumArgs());
-   } else {
-     if (mangleSubstitution(QualType(T, 0)))
-       return;
-@@ -2417,6 +2715,7 @@
-   Out << 'N';
-   manglePrefix(T->getQualifier());
-   mangleSourceName(T->getIdentifier());
-+  // writeAbiTags(T); // TODO(abitags)
-   Out << 'E';
- }
- 
-@@ -3722,6 +4021,74 @@
-   Substitutions[Ptr] = SeqID++;
- }
- 
-+std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
-+  llvm::raw_null_ostream NullOutStream;
-+  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
-+
-+  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
-+    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
-+  } else {
-+    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
-+  }
-+
-+  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
-+  std::set<StringRef> ReturnTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
-+
-+    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
-+    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
-+    TrackReturnTypeTags.mangleType(Proto->getReturnType());
-+    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
-+
-+    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: ReturnTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
-+  std::set<StringRef> VariableTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackVariableType(*this, NullOutStream);
-+
-+    TrackVariableType.mangleType(VD->getType());
-+
-+    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: VariableTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
- //
- 
- /// \brief Mangles the name of the declaration D and emits that name to the
-@@ -3824,6 +4191,7 @@
-   //  <special-name> ::= GV <object name>       # Guard variable for one-time
-   //                                            # initialization
-   CXXNameMangler Mangler(*this, Out);
-+  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
-   Mangler.getStream() << "_ZGV";
-   Mangler.mangleName(D);
- }
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -3948,6 +3948,58 @@
-       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
- }
- 
-+static void handleAbiTagAttr(Sema &S, Decl *D,
-+                             const AttributeList &Attr) {
-+  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
-+    return;
-+
-+  SmallVector<std::string, 4> Tags;
-+
-+  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
-+    StringRef Tag;
-+
-+    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
-+      return;
-+
-+    Tags.push_back(Tag);
-+  }
-+  // store tags sorted and without duplicates
-+  std::sort(Tags.begin(), Tags.end());
-+  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
-+
-+  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
-+    if (!NS->isInline()) {
-+      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
-+      return;
-+    }
-+  }
-+
-+  const auto *CD = D->getCanonicalDecl();
-+  if (CD != D) {
-+    // redeclarations must not add new abi tags, or abi tags in the first place
-+    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
-+    if (nullptr == OldAbiTagAttr) {
-+      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
-+      S.Diag(CD->getLocation(), diag::note_previous_definition);
-+      return;
-+    }
-+    for (const auto& NewTag: Tags) {
-+      if (std::find(OldAbiTagAttr->tags_begin(),
-+                    OldAbiTagAttr->tags_end(),
-+                    NewTag) == OldAbiTagAttr->tags_end()) {
-+        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
-+        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
-+        return;
-+      }
-+    }
-+    return;
-+  }
-+
-+  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
-+                                          Tags.data(), Tags.size(),
-+                                          Attr.getAttributeSpellingListIndex()));
-+}
-+
- static void handleARMInterruptAttr(Sema &S, Decl *D,
-                                    const AttributeList &Attr) {
-   // Check the attribute arguments.
-@@ -4707,6 +4759,9 @@
-   case AttributeList::AT_Thread:
-     handleDeclspecThreadAttr(S, D, Attr);
-     break;
-+  case AttributeList::AT_AbiTag:
-+    handleAbiTagAttr(S, D, Attr);
-+    break;
- 
-   // Thread safety attributes:
-   case AttributeList::AT_AssertExclusiveLock:
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -79,6 +79,7 @@
-     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
-     .Case("Expr *", "ReadExpr(F)")
-     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
-+    .Case("std::string", "ReadString(Record, Idx)")
-     .Default("Record[Idx++]");
- }
- 
-@@ -92,6 +93,7 @@
-     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
-     .Case("IdentifierInfo *", 
-           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
-+    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
-     .Default("Record.push_back(" + std::string(name) + ");\n");
- }
- 
-@@ -986,6 +988,16 @@
-     }
-   };
- 
-+  class VariadicStringArgument : public VariadicArgument {
-+  public:
-+    VariadicStringArgument(const Record &Arg, StringRef Attr)
-+      : VariadicArgument(Arg, Attr, "std::string")
-+    {}
-+    void writeValueImpl(raw_ostream &OS) const override {
-+      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
-+    }
-+  };
-+
-   class TypeArgument : public SimpleArgument {
-   public:
-     TypeArgument(const Record &Arg, StringRef Attr)
-@@ -1047,6 +1059,8 @@
-     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
-   else if (ArgName == "VariadicUnsignedArgument")
-     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
-+  else if (ArgName == "VariadicStringArgument")
-+    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
-   else if (ArgName == "VariadicEnumArgument")
-     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
-   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
deleted file mode 100644
index d865e30..0000000
--- a/root-arm.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-@@ -19,7 +19,7 @@
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
- elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
--  message(STATUS "Found a 64bit system")
-+  message(STATUS "Found a 64bit ARM system")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-@@ -42,6 +42,18 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES arm)
-+  message(STATUS "Found a 32bit ARM system")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-@@ -52,6 +52,8 @@
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-@@ -47,6 +47,8 @@
-     set(AFTER_CC "${AFTER_CC} -m64")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-@@ -52,6 +52,10 @@
-     set(FREETYPE_CFLAGS "-m64 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-     set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-+    set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-@@ -17,6 +17,8 @@
- 
- if(ROOT_ARCHITECTURE MATCHES linuxarm64)
-   set(ROOT_CLING_TARGET "AArch64")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+  set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
deleted file mode 100644
index 776e79a..0000000
--- a/root-avoid-gui-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
---- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
-@@ -30,7 +30,7 @@
- shape, size, angle.</h2></center>
- The picture below shows this interface.
- End_Html
--Begin_Macro(GUI)
-+~~~
- {
-    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
-    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
-@@ -41,7 +41,8 @@
-    r->SetWindowSize(700,500);
-    return r->GetMainFrame();
- }
--End_Macro */
-+~~~
-+*/
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
---- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
-@@ -72,7 +72,7 @@
- <br><br>
- A simple macro to use a TGTable with a TGSimpleTableInterface:
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    Int_t i = 0, j = 0;
-    UInt_t nrows = 6, ncolumns = 5;
-@@ -111,13 +111,13 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- Begin_Html
- 
- It is also possible to visualise data from a tree. A simple macro
- showing the use of a TTreeTableInterface follows.
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    // Open a root file.
-    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
-@@ -153,7 +153,7 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- */
- 
- // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
deleted file mode 100644
index 5cbff77..0000000
--- a/root-avoid-std-bind-lambda.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
---- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
-@@ -33,6 +33,9 @@
-    // Total amount of numbers
-    const UInt_t nNumbers = 20000000U;
- 
-+   // We split the work in equal parts
-+   const auto workSize = nNumbers / nWorkers;
-+
-    // A simple function to fill ntuples randomly
- 
-    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
-@@ -57,7 +60,7 @@
-    // We now go MP! ------------------------------------------------------------
- 
-    // We define our work item
--   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
-+   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
-       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
-@@ -74,18 +77,10 @@
-    {
-       TimerRAII t("Parallel execution");
- 
--      // We split the work in equal parts
--      const auto workSize = nNumbers / nWorkers;
--
--      // The work item requires two arguments, the map infrastructure offer
--      // an interface to use only one. A standard solution is to use std::bind
--      using namespace std::placeholders;
--      auto workItemOneArg = std::bind(workItem, _1, workSize);
--
-       // Fill the pool with work
-       std::forward_list<UInt_t> workerIDs(nWorkers);
-       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
--      workers.Map(workItemOneArg, workerIDs);
-+      workers.Map(workItem, workerIDs);
-    }
- 
-    return 0;
diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
deleted file mode 100644
index aaa4a6c..0000000
--- a/root-broken-cmake-config.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
---- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
-@@ -0,0 +1,23 @@
-+# - Locate dpm library
-+# Defines:
-+#
-+#  DPM_FOUND
-+#  DPM_INCLUDE_DIR
-+#  DPM_INCLUDE_DIRS (not cached)
-+#  DPM_LIBRARIES
-+
-+set(DPM_FOUND FALSE)
-+
-+find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
-+find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+
-+set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
-+set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
-+
-+if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
-+  set(DPM_FOUND TRUE)
-+  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
-+endif()
-+
-+mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
---- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
-@@ -9,7 +9,7 @@
- 
- find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
-           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
--                /opt/globus/include
-+                /opt/globus/include /usr/include
-           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
-                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
- 
-@@ -24,7 +24,7 @@
-               openssl gsi_proxy_core callout)
- 
- foreach( lib ${libraries})
--  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
-+  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
-                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
-   if(GLOBUS_${lib}_LIBRARY)
-     set(GLOBUS_${lib}_FOUND 1)
-diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
---- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
-@@ -6,7 +6,7 @@
- #  HDFS_INCLUDE_DIRS (not cached)
- #  HDFS_LIBRARIES
- 
--find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
-+find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
- find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
- 
- set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
---- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
-@@ -2,8 +2,8 @@
- #
- # This module defines
- # PCRE_INCLUDE_DIR, where to locate PCRE header files
--# PCRE_LIBRARIES, the libraries to link against to use Pythia6
--# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
-+# PCRE_LIBRARIES, the libraries to link against to use PCRE
-+# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
- 
- if(PCRE_CONFIG_EXECUTABLE)
-   set(PCRE_FIND_QUIETLY 1)
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-@@ -446,15 +446,29 @@
- endif()
- 
- #---Check for Castor-------------------------------------------------------------------
--if(castor OR rfio)
-+if(castor)
-   message(STATUS "Looking for Castor")
-   find_package(Castor)
-   if(NOT CASTOR_FOUND)
-     if(fail-on-missing)
-       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
-     else()
--      message(STATUS "Castor not found. Switching off castor/rfio option")
-+      message(STATUS "Castor not found. Switching off castor option")
-       set(castor OFF CACHE BOOL "" FORCE)
-+    endif()
-+  endif()
-+endif()
-+
-+#---Check for RFIO-------------------------------------------------------------------
-+if(rfio)
-+  message(STATUS "Looking for RFIO")
-+  find_package(Castor)
-+  find_package(DPM)
-+  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
-+    if(fail-on-missing)
-+      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
-+    else()
-+      message(STATUS "Castor or DPM not found. Switching off rfio option")
-       set(rfio OFF CACHE BOOL "" FORCE)
-     endif()
-   endif()
-diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
---- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -0,0 +1,10 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT io/hdfs package
-+############################################################################
-+
-+include_directories(${HDFS_INCLUDE_DIRS})
-+
-+ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
-+
-+ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
---- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -2,10 +2,16 @@
- # CMakeLists.txt file for building ROOT io/rfio package
- ############################################################################
- 
--include_directories(${CASTOR_INCLUDE_DIR})
--
- ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
- 
-+if(CASTOR_FOUND)
-+include_directories(${CASTOR_INCLUDE_DIR})
- ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
-     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
-+else()
-+include_directories(${DPM_INCLUDE_DIR})
-+ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
-+    DEPENDENCIES Net RIO)
-+endif()
-+
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
---- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
-@@ -8,7 +8,6 @@
- endif()
- 
- ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
--ROOT_INSTALL_HEADERS()
- 
- if(builtin_openssl)
-   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
deleted file mode 100644
index 1cf437e..0000000
--- a/root-cache-test.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
-@@ -1907,8 +1907,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    TMultiGraph *mg;
-    TKey *key;
-diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
---- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
-@@ -1956,7 +1956,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
---- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
-@@ -10164,7 +10164,8 @@
-       refFile = TFile::Open(refFileName, "RECREATE");
-    }
-    else {
--      refFile = TFile::Open(refFileName);
-+      TFile::SetCacheFileDir(".");
-+      refFile = TFile::Open(refFileName, "CACHEREAD");
-    }
- 
-    if ( refFile != 0 ) {
-diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
---- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
-@@ -78,9 +78,10 @@
-          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
-          return 1;
-       }
--      fref = new TWebFile(refFile) ;
-+      TFile::SetCacheFileDir(".");
-+      fref = TFile::Open(refFile,"CACHEREAD") ;
-     } else {
--      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
-+      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
-     }
-     if (fref->IsZombie()) {
-       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
-diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
---- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
-@@ -2011,21 +2011,15 @@
-   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
- 
-   TFile* input(0);
--
-   FileStat_t stat;
- 
--  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
--  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
-+  TString fname = "./tmva_class_example.root";
-   if(!gSystem->GetPathInfo(fname,stat)) {
-      input = TFile::Open( fname );
--  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--     input = TFile::Open( "../"+fname );
--  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
--     input = TFile::Open( fcname );
-   } else {
--     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
-+     TFile::SetCacheFileDir(".");
-+     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-   }
--  delete [] fcname;
-   if (input == NULL) {
-      cerr << "broken/inaccessible input file" << endl;
-   }
-@@ -2440,14 +2434,12 @@
-    TFile* input(0);
-    FileStat_t stat;
- 
--   // FIXME:: give the filename of the sample somewhere else?
--   TString fname = "../tmva/test/tmva_reg_example.root";
-+   TString fname = "./tmva_reg_example.root";
-    if(!gSystem->GetPathInfo(fname,stat)) {
-       input = TFile::Open( fname );
--   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--      input = TFile::Open( "../"+fname );
-    } else {
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
-    }
-    if (input == NULL) {
-       cerr << "broken/inaccessible input file" << endl;
-diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
---- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
-@@ -27,23 +27,26 @@
-    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
-          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
- 
--
-    factory->AddVariable("myvar1 := var1+var2", 'F');
-    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
-    factory->AddVariable("var3",                "Variable 3", "units", 'F');
-    factory->AddVariable("var4",                "Variable 4", "units", 'F');
--
--
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
--
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
---- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
-@@ -36,12 +36,19 @@
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
---- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
-@@ -44,8 +44,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
-@@ -221,14 +221,16 @@
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
--   TString fname = "./tmva_example.root";   
--   if (!gSystem->AccessPathName( fname )) 
-+   TString fname = "./tmva_class_example.root";
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else    
--      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
-@@ -201,13 +201,19 @@
- 
-    // Read training and test data
-    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--   
--   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--   
--   TFile *input = TFile::Open( fname );
--   
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
-    
-    // --- Register the training and test trees
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
-@@ -123,16 +123,16 @@
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
-    if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   } 
--   else { 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
-    }
--   
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
-@@ -158,11 +158,13 @@
-    // load the signal and background event samples from ROOT trees
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
--   if (!gSystem->AccessPathName( fname )) 
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
deleted file mode 100644
index eb05d5d..0000000
--- a/root-cernlib-doc.patch
+++ /dev/null
@@ -1,1307 +0,0 @@
-diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
---- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
-@@ -15,7 +15,7 @@
- #include "Rtypes.h"
- #include <string.h>
- 
--// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
-+// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
- 
- ///////////////////////////////////////////////////////////////////////////////////////
- //                                                                                   //
-@@ -25,8 +25,9 @@
- // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
- // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
- // add the result to another matrix, add to square matrix the multiple of a diagonal //
--// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
--// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
-+// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
-+// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
-+// Fortran convention.                                                               //
- //                                                                                   //
- ///////////////////////////////////////////////////////////////////////////////////////
- 
-diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
---- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
-@@ -11,8 +11,8 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- // The set of methods to work with the plain matrix / vector
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
- //
- // Revision 1.7  2006/05/21 18:05:26  brun
- // Fix more coding conventions violations
-@@ -33,7 +33,7 @@
- //
- // Revision 1.3  2003/04/03 17:39:39  fine
- // Make merge with ROOT 3.05.03 and add TR package
--//122
-+//
- // Revision 1.2  2003/02/04 23:35:20  fine
- // Clean up
- //
-@@ -154,27 +154,24 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication
-+///
- /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-+// --      ENTRY MXMLRT
-+// --                C = A(I,J) X B(J,J) X A*(J,I)
-+// --                A* TANDS FOR A-TRANSPOSED
-+//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
-+//             CALL MXMPY (A,B,X,NI,NJ,NJ)
-+//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
- 
--// --      ENTRY MXMLRT */
--// --                C = A(I,J) X B(J,J) X A*(J,I) */
--// --                A* TANDS FOR A-TRANSPOSED */
--//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
--//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
--//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
--
--/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
--/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
-+//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
-+//             CALL MXMPY (A,Y,C,NI,NJ,NI)
- 
- 
- // --                C = A*(I,J) X B(J,J) X A(J,I)
-@@ -191,6 +188,12 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication (double precision)
-+///
-+/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
-+/// ORIG. 01/01/64 RKB
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
- {
-@@ -215,36 +218,31 @@
-     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Matrix Transposition
- ///
--///  Matrix Transposition
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxtrp(const float *a, float *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- } /* mxtrp */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Matrix Transposition (double precision)
-+/// Matrix Transposition (double precision)
-+///
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxtrp(const double *a, double *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- 
-@@ -283,38 +281,35 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::traat(const float *a, float *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Symmetric Multiplication of Rectangular Matrices
-+/// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::traat(const double *a, double *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
-@@ -346,34 +341,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
-+/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
-@@ -405,34 +400,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
-@@ -470,34 +465,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
-@@ -543,51 +538,51 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
-@@ -596,17 +591,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trata.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trata(const float *a, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
-@@ -636,22 +629,21 @@
-    return r__;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -684,25 +676,22 @@
-    return b;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
--{
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
-+{
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -743,26 +732,23 @@
-    return r__;
- } /* tratsa_ */
- 
--//____________________________________________________________
--// trchlu.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchlu.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trchlu(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -806,15 +792,17 @@
-    return b;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trchul(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -823,11 +811,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -875,17 +858,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trinv(const float *t, float *s, int n)
-+{
-    int lhor, ipiv, lver, j;
-    double sum = 0;
-    double r__ = 0;
-@@ -934,22 +915,20 @@
-    return s;
- } /* trinv_ */
- 
--//____________________________________________________________
--// trla.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trla.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, ia, ib, iu;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -981,22 +960,19 @@
- } /* trla_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trlta.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trlta.F -- translated by f2c (version 19970219).
--// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
-+float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -1036,16 +1012,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trpck(const float *s, float *u, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1072,17 +1047,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1140,16 +1113,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1190,17 +1162,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
-+float *TCL::trsinv(const float *g, float *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -1209,17 +1179,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmlu(const float *u, float *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -1246,17 +1214,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmul(const float *g, float *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -1284,18 +1250,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trupck(const float *u, float *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -1336,25 +1299,20 @@
- } /* trupck_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trsat.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trsat.F -- translated by f2c (version 19970219).
--// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
-+float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --s;
- 
-@@ -1391,25 +1349,21 @@
- 
- // ------  double
- 
--//____________________________________________________________
--// trata.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trata.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trata(const double *a, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --a;
- 
-@@ -1437,23 +1391,21 @@
-    return 0;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -1487,24 +1439,22 @@
-    return 0;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -1547,25 +1497,21 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trchlu.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trchlu(const double *a, double *b, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1609,15 +1555,17 @@
-    return 0;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trchul(const double *a, double *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -1626,11 +1574,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1677,17 +1620,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trinv(const double *t, double *s, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int lhor, ipiv, lver,  j;
-    double r__;
-    int mx, ndTep, ind;
-@@ -1735,19 +1676,16 @@
- } /* trinv_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// trla.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
-+double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int ipiv, ia, ib, iu;
-    double sum;
- 
-@@ -1782,17 +1720,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trlta.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
-@@ -1834,16 +1770,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::trpck(const double *s, double *u, int n)
-+{
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1869,17 +1804,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1936,16 +1869,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1985,17 +1917,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
-+double *TCL::trsinv(const double *g, double *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -2006,17 +1936,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmlu(const double *u, double *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -2043,17 +1971,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmul(const double *g, double *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -2081,18 +2007,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
-+double *TCL::trupck(const double *u, double *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -2133,17 +2056,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsat.F -- translated by f2c (version 19970219)
-+///
- /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
deleted file mode 100644
index 4f30e9b..0000000
--- a/root-compiledata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
---- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
-@@ -75,7 +75,7 @@
- 
- # Remove the flags turning warnings into errors or extending
- # the number of warnings.
--CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
-+CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
- 
- # Determine the compiler version
- BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
deleted file mode 100644
index 0049c46..0000000
--- a/root-deprecated-options.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
-+++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
-@@ -202,7 +202,7 @@
-     enable_unuran=yes
-     enable_vc=yes
-     enable_vdt=yes
--    #enable_r=yes
-+    enable_r=yes
- fi
- 
- # Remove old log file
-@@ -2288,7 +2288,7 @@
-         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "yes:"; then
-@@ -2318,7 +2318,7 @@
-         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
deleted file mode 100644
index fdc0091..0000000
--- a/root-dont-link-jvm.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-@@ -263,10 +263,6 @@
- set(hdfslib ${HDFS_LIBRARY})
- set(hdfsincdir ${HDFS_INCLUDE_DIR})
- 
--set(jniincdir ${Java_INCLUDE_DIRS})
--set(jvmlib ${Java_LIBRARIES})
--set(jvmlibdir ${Java_LIBRARY_DIR})
--
- set(buildalien ${value${alien}})
- set(alienlibdir ${ALIEN_LIBRARY_DIR})
- set(alienlib ${ALIEN_LIBRARY})
-diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-@@ -251,9 +251,6 @@
- HDFSLIBDIR     := @hdfslibdir@
- HDFSCLILIB     := @hdfslib@
- HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
--JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
--JVMCLILIB      := @jvmlib@
--JVMLIBDIR      := @jvmlibdir@
- 
- BUILDALIEN     := @buildalien@
- ALIENLIBDIR    := @alienlibdir@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
-+++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
-@@ -1822,8 +1822,6 @@
-   hdfs-incdir        HDFS support, location of hdfs.h
-   hdfs-libdir        HDFS support, location of libhdfs
-   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
--  jni-incdir         HDFS support, location of JNI headers
--  jvm-libdir         HDFS support, location of JVM library
-   krb5               Kerberos5 support, location of Kerberos distribution
-   krb5-incdir        Kerberos5 support, location of krb5.h
-   krb5-libdir        Kerberos5 support, location of libkrb5
-@@ -2214,8 +2212,6 @@
-       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-iosvers=*)        iosvers=$optarg       ;;
--      --with-jni-incdir=*)     jniincdir=$optarg     ;;
--      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
-       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
-       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
-       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
-@@ -4535,17 +4531,6 @@
-     hdfsinc=$found_hdr
-     hdfsincdir=$found_dir
- 
--    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
--       JAVA_HOME=`/usr/libexec/java_home`
--    fi
--
--    keepincdir=$jniincdir
--    check_header "jni.h" "$jniincdir" \
--        ${JAVA_HOME:+$JAVA_HOME/include} \
--        /usr/java/default/include /usr/include /usr/local/include
--    jniinc=$found_hdr
--    jniincdir=$found_dir
--
-     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
-         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
-         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
-@@ -4553,26 +4538,12 @@
-     hdfslib=$found_lib
-     hdfslibdir=$found_dir
- 
--    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
--        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
--        /usr/java/default/jre/lib/amd64/server \
--        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
--    jvmlib=$found_lib
--    jvmlibdir=$found_dir
--
--    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
-+    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
-         enable_hdfs="no"
-     else
-         case $platform in
-             linux)
--                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
--                if test $link_result -eq 0 ; then
--                    enable_hdfs="no"
--                fi
--
--                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
-+                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
-                 if test $link_result -eq 0 ; then
-                     enable_hdfs="no"
-                 fi
-@@ -7641,9 +7612,6 @@
-     -e "s|@iosvers@|$iosvers|"                  \
-     -e "s|@iconpath@|$iconpath|"                \
-     -e "s|@incdir@|$incdir|"                    \
--    -e "s|@jniincdir@|$jniincdir|g"             \
--    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
--    -e "s|@jvmlib@|$jvmlib|g"                   \
-     -e "s|@krb5incdir@|$krb5incdir|"            \
-     -e "s|@krb5lib@|$krb5lib|"                  \
-     -e "s|@krb5libdir@|$krb5libdir|"            \
-diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
---- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
-@@ -44,7 +44,7 @@
- $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
--		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
-+		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
- 
- $(call pcmrule,HDFS)
- 	$(noop)
-@@ -72,4 +72,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
-+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
deleted file mode 100644
index 1bf85d2..0000000
--- a/root-dox-filter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
---- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
-@@ -98,6 +98,7 @@
- 
-    // Source file.
-    if (gSource) {
-+      size_t spos = 0;
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
- 
-@@ -106,10 +107,11 @@
-              gLineString.find("/** \\class")  != string::npos ||
-              gLineString.find("///! \\class") != string::npos) gClass = true;
- 
--         if (gLineString.find("End_Macro") != string::npos) {
-+         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
-             ReplaceAll(gLineString,"End_Macro","");
-             gImageSource = false;
-             gInMacro = 0;
-+            spos = 0;
-             if (m) {
-                fclose(m);
-                m = 0;
-@@ -122,8 +124,9 @@
-          }
- 
-          if (gInMacro) {
-+            if (spos) gLineString = gLineString.substr(spos);
-             if (gInMacro == 1) {
--               if (EndsWith(gLineString,".C\n")) {
-+               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
-                   ExecuteMacro();
-                   gInMacro++;
-                } else {
-@@ -153,14 +156,27 @@
-             }
-          }
- 
--         if (gLineString.find("Begin_Macro") != string::npos) {
-+         if (gLineString.find("Begin_Macro") != string::npos &&
-+             gLineString.find("End_Macro") == string::npos) {
-+            if (BeginsWith(gLineString, "///")) {
-+               spos = gLineString.find_first_not_of(' ', 3);
-+            }
-             if (gLineString.find("source") != string::npos) gImageSource = true;
-             gImageID++;
-             gInMacro++;
-             gLineString = "\n";
-          }
- 
--         printf("%s",gLineString.c_str());
-+         size_t l = gLineString.length();
-+         size_t b = 0;
-+         do {
-+            size_t e = gLineString.find('\n', b);
-+            if (e != string::npos) e++;
-+            if (spos) printf("%-*s%s", (int)spos, "///",
-+                              gLineString.substr(b, e - b).c_str());
-+            else printf("%s", gLineString.substr(b, e - b).c_str());
-+            b = e;
-+         } while (b < l);
-       }
-       fclose(f);
-       return 0;
-@@ -203,7 +219,8 @@
-    if (gSource) {
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
--         if (gLineString.find("ClassImp") != string::npos) {
-+         if (gLineString.find("ClassImp") != string::npos ||
-+             gLineString.find("NamespaceImp") != string::npos) {
-             i1         = gLineString.find("(")+1;
-             i2         = gLineString.find(")")-1;
-             gClassName = gLineString.substr(i1,i2-i1+1);
-@@ -238,8 +255,8 @@
- 
-    // Build the ROOT command to be executed.
-    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
--   int l = gLineString.length();
--   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
-+   size_t l = gLineString.length();
-+   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
- 
-    ExecuteCommand(gLineString);
- 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
deleted file mode 100644
index 46d6dde..0000000
--- a/root-doxyfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
---- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
-@@ -2058,7 +2058,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--MACRO_EXPANSION        = NO
-+MACRO_EXPANSION        = YES
- 
- # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
- # the macro expansion is limited to the macros specified with the PREDEFINED and
-@@ -2066,7 +2066,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--EXPAND_ONLY_PREDEF     = NO
-+EXPAND_ONLY_PREDEF     = YES
- 
- # If the SEARCH_INCLUDES tag is set to YES the includes files in the
- # INCLUDE_PATH will be searched if a #include is found.
-@@ -2098,7 +2098,7 @@
- # recursively expanded use the := operator instead of the = operator.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--PREDEFINED             =
-+PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
- 
- # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
- # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
deleted file mode 100644
index 35814e2..0000000
--- a/root-doxygen-warnings.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
-@@ -1,4 +1,4 @@
--/// \file impl_tuple_apply.h
-+/// \file ROOT/impl_tuple_apply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RArrayView.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
-@@ -1,4 +1,4 @@
--/// \file rhysd_array_view.h
-+/// \file ROOT/rhysd_array_view.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RTupleApply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
-@@ -1,4 +1,4 @@
--/// \file TCoopPtr
-+/// \file ROOT/TCoopPtr.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDirectory.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDrawable.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-08-07
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
-@@ -1,4 +1,4 @@
--/// \file TKey.h
-+/// \file ROOT/TKey.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TLogger.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-29
-diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
---- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
-@@ -57,7 +57,7 @@
-       // Same value as TVirtualCollectionProxy.
-       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
- 
--   /** @class template TCollectionProxyInfo::IteratorValue
-+   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
-     *
-     * Small helper to encapsulate whether to return the value
-     * pointed to by the iterator or its address.
-@@ -76,7 +76,7 @@
-          }
-       };
- 
--   /** @class template TCollectionProxyInfo::Iterators
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
-     *
-     * Small helper to implement the function to create,access and destroy
-     * iterators.
-@@ -204,7 +204,7 @@
-          }
-       };
- 
--  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
-+  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
-     *
-     * Small helper to save proxy environment in the event of
-     * recursive calls.
-@@ -276,7 +276,7 @@
-       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
-    };
- 
--   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Type
-     *
-     * Small helper to encapsulate basic data accesses for
-     * all STL continers.
-@@ -356,7 +356,7 @@
- 
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like vector, list, deque
-@@ -389,7 +389,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like forward_list
-@@ -425,7 +425,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-@@ -457,7 +457,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
---- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
-@@ -1,4 +1,4 @@
--/// \file TCanvas.h
-+/// \file ROOT/TCanvas.h
- /// \ingroup Gpad ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-08
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
-@@ -26,7 +26,7 @@
- #include "TClass.h"
- #include "TError.h"
- 
--/** \class
-+/** \class TGLPolyMarker
- \ingroup opengl
- To draw a 3D polymarker in a GL window.
- */
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
-@@ -14,7 +14,7 @@
- 
- #include <string.h>
- 
--/** \class
-+/** \class TGLSelectRecordBase
- \ingroup opengl TGLSelectRecordBase
- Base class for select records.
- Supports initialization from a raw GL record (UInt_t*) and
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
-@@ -15,7 +15,7 @@
- #include "TGLPlotCamera.h"
- #include "TGLIncludes.h"
- 
--/** \class
-+/** \class TGLVoxelPainter
- \ingroup opengl
- Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
- */
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
-@@ -49,11 +49,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
--\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
--\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
--\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
--\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
-+\class TH1C
-+\brief 1-D histogram with a byte per channel (see TH1 documentation)
-+\class TH1S
-+\brief 1-D histogram with a short per channel (see TH1 documentation)
-+\class TH1I
-+\brief 1-D histogram with an int per channel (see TH1 documentation)}
-+\class TH1F
-+\brief 1-D histogram with a float per channel (see TH1 documentation)}
-+\class TH1D
-+\brief 1-D histogram with a double per channel (see TH1 documentation)}
- @}
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
-@@ -30,11 +30,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
--\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
--\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
--\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
--\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
-+\class TH2C
-+\brief 2-D histogram with a byte per channel (see TH1 documentation)
-+\class TH2S
-+\brief 2-D histogram with a short per channel (see TH1 documentation)
-+\class TH2I
-+\brief 2-D histogram with an int per channel (see TH1 documentation)}
-+\class TH2F
-+\brief 2-D histogram with a float per channel (see TH1 documentation)}
-+\class TH2D
-+\brief 2-D histogram with a double per channel (see TH1 documentation)}
- @}
- */ 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
---- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
-@@ -28,11 +28,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
--\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
--\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
--\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
--\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
-+\class TH3C
-+\brief 3-D histogram with a byte per channel (see TH1 documentation)
-+\class TH3S
-+\brief 3-D histogram with a short per channel (see TH1 documentation)
-+\class TH3I
-+\brief 3-D histogram with an int per channel (see TH1 documentation)}
-+\class TH3F
-+\brief 3-D histogram with a float per channel (see TH1 documentation)}
-+\class TH3D
-+\brief 3-D histogram with a double per channel (see TH1 documentation)}
- @} 
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
---- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistDrawable.cxx
-+/// \file THistDrawable.cxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-11
-diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistPainter.cxx
-+/// \file THistPainter.cxx
- /// \ingroup HistPainter ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
---- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
-@@ -2463,7 +2463,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Write the first part of the links shown ontop of each doc page;
--/// one <div> has to be closed by caller so additional items can still
-+/// one \<div\> has to be closed by caller so additional items can still
- /// be added.
- 
- void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
-diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
---- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
-@@ -63,7 +63,7 @@
-                        const char *location = 0);
-    static Bool_t CheckFile(const char *path, const char *location = 0);
- 
--   /// Note: This must be kept in sync with values #defined in dcap.h
-+   /// Note: This must be kept in sync with values \#defined in dcap.h
-    enum EOnErrorAction {
-       kOnErrorRetry   =  1,
-       kOnErrorFail    =  0,
-diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
---- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
-@@ -160,7 +160,7 @@
- };
- 
- /**
-- \class TCollectionClassStreamer TCollectionProxy.h
-+ \class TCollectionClassStreamer TCollectionProxyFactory.h
-  \ingroup IO
- 
-  Class streamer object to implement TClassStreamer functionality
-diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
---- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
-@@ -434,7 +434,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include needed for the argument of
-+/// Add to the header file, the \#include needed for the argument of
- /// this template.
- 
- UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
-@@ -587,7 +587,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Add to the header file anything that need to appear after the class
--/// declaration (this includes some #pragma link).
-+/// declaration (this includes some \#pragma link).
- 
- void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
- {
-diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
---- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
-@@ -3645,7 +3645,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include need for this class.
-+/// Add to the header file, the \#include need for this class.
- 
- UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
- {
-diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
---- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
-@@ -1,4 +1,4 @@
--/// \file TFile.h
-+/// \file ROOT/TFile.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
---- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
-@@ -4,7 +4,7 @@
- 
- \brief The %ROOT Mathematical Libraries.
- 
--See the \subpage MathPage "Mathematical Libraries" description page.
-+See the \ref MathPage "Mathematical Libraries" description page.
- 
- 
- \page MathPage The ROOT Mathematical Libraries 
-@@ -39,7 +39,7 @@
- - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
- 
-    - Physics: library with the TVector3 and TLorentzVector classes.
--   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
-+   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
- 
- - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
---- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
-@@ -18,9 +18,7 @@
- #define ROOT_Math_Random
- 
- /**
--@defgroup Random 
--
-- Interface class for Random number generation
-+@defgroup Random Interface class for Random number generation
- */
- 
- #include "Math/RandomFunctions.h"
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
-@@ -209,7 +209,7 @@
- 
-   /**
- 
--  Calculates the real part of the cosine integral \Re(Ci).
-+  Calculates the real part of the cosine integral Re(Ci).
- 
-   For x<0, the imaginary part is \pi i and has to be added by the user,
-   for x>0 the imaginary part of Ci(x) is 0.
-diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
---- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
-@@ -21,7 +21,8 @@
- 
- /**
- 
--\class TKDTree class implementing a kd-tree
-+\class TKDTree
-+\brief Class implementing a kd-tree
- 
- 
- 
-diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
---- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
-@@ -1,4 +1,4 @@
--/// \file TFit.h
-+/// \file ROOT/TFit.h
- /// \ingroup MathCore ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
---- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
-@@ -83,9 +83,6 @@
- 
-     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
-     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
--
--    @ingroup MCIntegration
--
-    */
- 
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
-@@ -51,7 +51,7 @@
-    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
-                \cdot \left ( \int \limits_{0}^{1}
-                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
--               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
-+               - \kappa \, e^{\frac{-s}{\kappa}}\f].
-    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
- 
-    The parameters are:
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
-@@ -84,16 +84,17 @@
- // [5.2.1.6] (complete) elliptic integral of the third kind
- // (26.x.17.2)
- /**
-+Complete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-@@ -220,16 +221,17 @@
- // phi in radians
- // (26.x.17.1)
- /**
-+Incomplete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
---- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
-@@ -38,7 +38,7 @@
-     - The user can optionally provide the
- 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
- 	  - the mode via **TUnuranContDist::SetMode**,
--      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
-+	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
- 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
- 
- Some of this information is required depending on the chosen UNURAN generation method.
-diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
---- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.h
-+/*! \file TGLiteResult.h
- *//*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
---- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.cxx
-+/*! \file TGLiteResult.cxx
-  */ /*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
---- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
-@@ -60,8 +60,8 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// method used to get or set http header in the string buffer
- /// Header has following format:
--///   field1 : value1\r\n
--///   field2 : value2\r\n
-+///   field1 : value1\\r\\n
-+///   field2 : value2\\r\\n
- /// Such format corresponds to header format in HTTP requests
- 
- TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
-diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
---- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
-@@ -1195,7 +1195,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
--/// line [\r]\n. If so, return the pointer to the position after the line,
-+/// line [\\r]\\n. If so, return the pointer to the position after the line,
- /// otherwise return 0. This is used as callback to GetHunk(). The data
- /// between START and PEEKED has been read and cannot be "unread"; the
- /// data after PEEKED has only been peeked.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
---- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
-@@ -813,7 +813,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-@@ -826,7 +826,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
-@@ -1002,7 +1002,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
- 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
-@@ -1264,7 +1264,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- 
- RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
-@@ -21,7 +21,7 @@
-    RooAbsReal is the common abstract base class for objects that represent a
-    real value and implements functionality common to all real-valued objects
-    such as the ability to plot them, to construct integrals of them, the
--   ability to advertise (partial) analytical integrals etc..
-+   ability to advertise (partial) analytical integrals etc.
-    
-    Implementation of RooAbsReal may be derived, thus no interface
-    is provided to modify the contents.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
-@@ -838,7 +838,7 @@
- /// L = TLatex mode
- /// X = Latex mode
- /// Y = Latex table mode ( '=' replaced by '&' )
--/// V = Make name \verbatim in Latex mode
-+/// V = Make name \\verbatim in Latex mode
- /// P = use error to control shown precision
- /// F = force fixed precision
- ///
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
-@@ -55,7 +55,7 @@
-    confidence level is reached within an acceptable neighborhood as defined by
-    SetEpsilon(). More specifically: we calculate the following for different
-    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
--   d{normset} \$.
-+   d{normset} \f$.
-    Important note: this is not the default method because of a bug in constructing
-    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
-    calling SetUseKeys(true), and the data set will be interpreted without weights.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
-@@ -53,7 +53,7 @@
- To make Propose(xPrime, x) dependent on x, configure with
- PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
- 
--````{.cpp}
-+~~~{.cpp}
- // our parameter
- RooRealVar p("p", "p", 5, 0, 10);
- 
-@@ -74,7 +74,7 @@
- // number of proposals. If you don't call this function, the default cache size
- // is 1, which can be slow.
- pdfProposal.SetCacheSize(desiredCacheSize);
--````
-+~~~
- 
- PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
- for future versions.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
-@@ -40,8 +40,8 @@
- By default the calculation is:
- 
- \f[
--	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
--   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
-+        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
- \f]
- 
- where \f$ \lambda \f$ is the profile likeihood ratio, so the 
-@@ -50,11 +50,11 @@
- If ``SetSubtractMLE(false)`` then it calculates:
- 
- \f[
-+        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
-+\f]
- 
--	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
--                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
--
--where \f$ L\$ is the Likelihood function. 
-+where \f$ L \f$ is the Likelihood function.
- 
- The values of the parameters of interest for the alternative 
- hypothesis are taken at the time of the construction.
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
-@@ -9,7 +9,7 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
--/** \class Detail::TBranchProxy
-+/** \class ROOT::Detail::TBranchProxy
- Base class for all the proxy object. It includes the imeplemtation
- of the autoloading of branches as well as all the generic setup routine.
- */
diff --git a/root-fflags.patch b/root-fflags.patch
deleted file mode 100644
index 3fd6f0e..0000000
--- a/root-fflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
-@@ -70,7 +70,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -107,7 +107,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -144,7 +144,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
---- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
-@@ -37,12 +37,12 @@
-        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
-     else(${SYSCTL_OUTPUT} MATCHES 64)
-        MESSAGE(STATUS "Found a 32bit system")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
-     endif(${SYSCTL_OUTPUT} MATCHES 64)
-   endif()
- 
-@@ -65,7 +65,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-@@ -101,7 +101,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
---- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
-@@ -13,7 +13,7 @@
- 
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
deleted file mode 100644
index b60ac0d..0000000
--- a/root-fontconfig.patch
+++ /dev/null
@@ -1,1408 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
-@@ -265,18 +265,11 @@
-    LoadGraphicsLibs();
- 
-    // Try to load TrueType font renderer. Only try to load if not in batch
--   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-+   // mode and Root.UseTTFonts is true. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--   // Check for use of DFSG - fonts
--   if (!ttfont)
--      ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--
- #if !defined(R__WIN32)
-    if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
--       ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+       gEnv->GetValue("Root.UseTTFonts", 1)) {
-       if (gClassTable->GetDict("TGX11TTF")) {
-          // in principle we should not have linked anything against libGX11TTF
-          // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -290,7 +283,6 @@
-       }
-    }
- #endif
--   delete [] ttfont;
- 
-    // Create WM dependent application environment
-    if (fAppImp)
-diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
---- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
-@@ -12,7 +12,7 @@
- 
- include_directories(${FREETYPE_INCLUDE_DIRS})
- 
--ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
-+ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
- 
- if(builtin_freetype)
-   add_dependencies(${libname} FREETYPE)
-diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
---- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
-@@ -86,9 +86,8 @@
-    static FT_BBox        fgCBox;                  // string control box
-    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
-    static Int_t          fgCurFontIdx;            // current font index
--   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
-    static Int_t          fgFontCount;             // number of fonts loaded
--   static char          *fgFontName[kTTMaxFonts]; // font name
-+   static Int_t          fgFontID[kTTMaxFonts];   // font ID
-    static FT_Face        fgFace[kTTMaxFonts];     // font face
-    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
-    static Bool_t         fgHinting;               // use hinting (true by default)
-diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
---- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
-@@ -46,7 +46,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
- 		   "$(GRAFO) $(GRAFDO)" \
--		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,GRAF)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
-@@ -25,6 +25,8 @@
- #include "TMath.h"
- #include "TError.h"
- 
-+#include <fontconfig/fontconfig.h>
-+
- // to scale fonts to the same size as the old TT version
- const Float_t kScale = 0.93376068;
- 
-@@ -38,10 +40,9 @@
- Int_t          TTF::fgWidth          = 0;
- Int_t          TTF::fgAscent         = 0;
- Int_t          TTF::fgCurFontIdx     = -1;
--Int_t          TTF::fgSymbItaFontIdx = -1;
- Int_t          TTF::fgFontCount      = 0;
- Int_t          TTF::fgNumGlyphs      = 0;
--char          *TTF::fgFontName[kTTMaxFonts];
-+Int_t          TTF::fgFontID[kTTMaxFonts];
- FT_Matrix     *TTF::fgRotMatrix;
- FT_Library     TTF::fgLibrary;
- FT_BBox        TTF::fgCBox;
-@@ -72,6 +73,11 @@
-       return;
-    }
- 
-+   // Add root's font directory
-+   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
-+                                       TROOT::GetTTFFontDir());
-+   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
-+
-    // load default font (arialbd)
-    SetTextFont(62);
- }
-@@ -84,7 +90,6 @@
-    if (!fgInit) return;
- 
-    for (int i = 0; i < fgFontCount; i++) {
--      delete [] fgFontName[i];
-       FT_Done_Face(fgFace[i]);
-    }
-    if (fgRotMatrix) delete fgRotMatrix;
-@@ -109,12 +114,19 @@
-          charmap  = fgFace[fgCurFontIdx]->charmaps[i];
-          platform = charmap->platform_id;
-          encoding = charmap->encoding_id;
--         if ((platform == 3 && encoding == 1) ||
-+         if ((platform == 3 && encoding == 1 &&
-+              (fgFontID[fgCurFontIdx] != 12 &&
-+               fgFontID[fgCurFontIdx] != 14 &&
-+               fgFontID[fgCurFontIdx] != 15)) ||
-              (platform == 0 && encoding == 0) ||
-+             (platform == 7 && encoding == 2 &&
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)) ||
-              (platform == 1 && encoding == 0 &&
--              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
--             (platform == 1 && encoding == 0 &&
--              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)))
-          {
-             fgCharMap[fgCurFontIdx] = charmap;
-             if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -378,27 +390,147 @@
- 
-    if (!fontname || !fontname[0]) {
-       Warning("TTF::SetTextFont",
--              "no font name specified, using default font %s", fgFontName[0]);
-+              "no font name specified, using default font");
-       fgCurFontIdx = 0;
-       return 0;
-    }
-    const char *basename = gSystem->BaseName(fontname);
- 
-+   if (strcmp(basename, "timesi.ttf") == 0 ||
-+       strcmp(basename, "FreeSerifItalic.otf") == 0) {
-+      SetTextFont(12);
-+   }
-+   else if (strcmp(basename, "timesbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBold.otf") == 0) {
-+      SetTextFont(22);
-+   }
-+   else if (strcmp(basename, "timesbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
-+      SetTextFont(32);
-+   }
-+   else if (strcmp(basename, "arial.ttf") == 0 ||
-+            strcmp(basename, "FreeSans.otf") == 0) {
-+      SetTextFont(42);
-+   }
-+   else if (strcmp(basename, "ariali.ttf") == 0 ||
-+            strcmp(basename, "FreeSansOblique.otf") == 0) {
-+      SetTextFont(52);
-+   }
-+   else if (strcmp(basename, "arialbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBold.otf") == 0) {
-+      SetTextFont(62);
-+   }
-+   else if (strcmp(basename, "arialbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
-+      SetTextFont(72);
-+   }
-+   else if (strcmp(basename, "cour.ttf") == 0 ||
-+            strcmp(basename, "FreeMono.otf") == 0) {
-+      SetTextFont(82);
-+   }
-+   else if (strcmp(basename, "couri.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoOblique.otf") == 0) {
-+      SetTextFont(92);
-+   }
-+   else if (strcmp(basename, "courbd.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBold.otf") == 0) {
-+      SetTextFont(102);
-+   }
-+   else if (strcmp(basename, "courbi.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
-+      SetTextFont(112);
-+   }
-+   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      if (italic)
-+         SetTextFont(152);
-+      else
-+         SetTextFont(122);
-+   }
-+   else if (strcmp(basename, "times.ttf") == 0 ||
-+            strcmp(basename, "FreeSerif.otf") == 0) {
-+      SetTextFont(132);
-+   }
-+   else if (strcmp(basename, "wingding.ttf") == 0) {
-+      SetTextFont(142);
-+   }
-+   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
-+      SetTextFont(162);
-+   }
-+   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
-+      SetTextFont(172);
-+   }
-+   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
-+      SetTextFont(182);
-+   }
-+   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
-+      SetTextFont(192);
-+   }
-+   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
-+      SetTextFont(202);
-+   }
-+   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
-+      SetTextFont(212);
-+   }
-+   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
-+      SetTextFont(222);
-+   }
-+   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
-+      SetTextFont(232);
-+   }
-+   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
-+      SetTextFont(242);
-+   }
-+   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
-+      SetTextFont(252);
-+   }
-+   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
-+      SetTextFont(262);
-+   }
-+   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
-+      SetTextFont(272);
-+   }
-+   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
-+      SetTextFont(282);
-+   }
-+   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
-+      SetTextFont(292);
-+   }
-+   else {
-+      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
-+      if (fgFontCount) {
-+         Warning("TTF::SetTextFont", "using default font");
-+         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+         return 0;
-+      } else {
-+         return 1;
-+      }
-+   }
-+
-+   return 0;
-+}
-+
-+//______________________________________________________________________________
-+void TTF::SetTextFont(Font_t fontnumber)
-+{
-+   int fontid = fontnumber / 10;
-+   if (fontid < 0 || fontid > 31) fontid = 0;
-+
-+   Int_t italic = 0;
-+   if (fontid==15) italic = 1;
-+
-+   if (!fgInit) Init();
-+
-+   if (fontid == 0) {
-+      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
-+      return;
-+   }
-+
-    // check if font is in cache
-    int i;
-    for (i = 0; i < fgFontCount; i++) {
--      if (!strcmp(fgFontName[i], basename)) {
--         if (italic) {
--            if (i==fgSymbItaFontIdx) {
--               fgCurFontIdx = i;
--               return 0;
--            }
--         } else {
--            if (i!=fgSymbItaFontIdx) {
--               fgCurFontIdx = i;
--               return 0;
--            }
--         }
-+      if (fgFontID[i] == fontid) {
-+         fgCurFontIdx = i;
-+         return;
-       }
-    }
- 
-@@ -406,151 +538,215 @@
-    if (fgFontCount >= kTTMaxFonts) {
-       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
-             kTTMaxFonts);
--      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-+      Warning("TTF::SetTextFont", "using default font");
-       fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--      return 0;
-+      return;
-    }
- 
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   char *ttfont = NULL;
-+   int ttindex = 0;
- 
--   if (!ttfont) {
--      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
--      if (fgFontCount) {
--         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--         return 0;
--      } else {
--         return 1;
--      }
-+   FcPattern *pat, *match;
-+   FcCharSet *set = NULL;
-+   FcResult result;
-+
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 16:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 17:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 18:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 19:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 20:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 21:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 22:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 23:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 24:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 25:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 26:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 27:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 28:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 29:
-+   case 30:
-+   case 31:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      set = FcCharSetCreate ();
-+      FcCharSetAddChar (set, 0x0410); // Cyrillic
-+      FcCharSetAddChar (set, 0x4e00); // CJK
-+      FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   default:
-+      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
-+      FcPatternDestroy (pat);
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+      return;
-+      break;
-    }
- 
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
-+   char *ttfnt;
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+   ttfont = StrDup (ttfnt);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
-+   if (set) FcCharSetDestroy (set);
-+
-    FT_Face  tface = 0;
- 
--   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
-+   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
-       Error("TTF::SetTextFont", "error loading font %s", ttfont);
-       delete [] ttfont;
-       if (tface) FT_Done_Face(tface);
--      if (fgFontCount) {
--         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;
--         return 0;
--      } else {
--         return 1;
--      }
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;
-+      return;
-    }
- 
-    delete [] ttfont;
- 
--   fgFontName[fgFontCount] = StrDup(basename);
-+   fgFontID[fgFontCount]   = fontid;
-    fgCurFontIdx            = fgFontCount;
-    fgFace[fgCurFontIdx]    = tface;
-    fgCharMap[fgCurFontIdx] = 0;
-    fgFontCount++;
- 
-    if (italic) {
--      fgSymbItaFontIdx = fgCurFontIdx;
-       FT_Matrix slantMat;
-       slantMat.xx = (1 << 16);
-       slantMat.xy = ((1 << 16) >> 2);
-       slantMat.yx = 0;
-       slantMat.yy = (1 << 16);
--      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
--   }
--
--   return 0;
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Set specified font.
--/// List of the currently supported fonts (screen and PostScript)
--///
--/// | Font ID |   X11                     |     TTF          |
--/// |---------|---------------------------|------------------|
--/// |      1  | times-medium-i-normal     | timesi.ttf       |
--/// |      2  | times-bold-r-normal       | timesbd.ttf      |
--/// |      3  | times-bold-i-normal       | timesi.ttf       |
--/// |      4  | helvetica-medium-r-normal | arial.ttf        |
--/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
--/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
--/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
--/// |      8  | courier-medium-r-normal   | cour.ttf         |
--/// |      9  | courier-medium-o-normal   | couri.ttf        |
--/// |     10  | courier-bold-r-normal     | courbd.ttf       |
--/// |     11  | courier-bold-o-normal     | courbi.ttf       |
--/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
--/// |     13  | times-medium-r-normal     | times.ttf        |
--/// |     14  |                           | wingding.ttf     |
--/// |     15  | symbol oblique is emulated from symbol.ttf | |
--
--void TTF::SetTextFont(Font_t fontnumber)
--{
--   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
--   // Table of Microsoft and (for non-MSFT operating systems) backup
--   // FreeFont TTF fonts.
--   static const char *fonttable[][2] = {
--     { "Root.TTFont.0", "FreeSansBold.otf" },
--     { "Root.TTFont.1", "FreeSerifItalic.otf" },
--     { "Root.TTFont.2", "FreeSerifBold.otf" },
--     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--     { "Root.TTFont.4", "FreeSans.otf" },
--     { "Root.TTFont.5", "FreeSansOblique.otf" },
--     { "Root.TTFont.6", "FreeSansBold.otf" },
--     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--     { "Root.TTFont.8", "FreeMono.otf" },
--     { "Root.TTFont.9", "FreeMonoOblique.otf" },
--     { "Root.TTFont.10", "FreeMonoBold.otf" },
--     { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--     { "Root.TTFont.12", "symbol.ttf" },
--     { "Root.TTFont.13", "FreeSerif.otf" },
--     { "Root.TTFont.14", "wingding.ttf" },
--     { "Root.TTFont.15", "symbol.ttf" },
--     { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--     { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--     { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--     { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--     { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--     { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--     { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--     { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--     { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--     { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--     { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--     { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--     { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
--   };
--
--   static int fontset = -1;
--   int        thisset = fontset;
--
--   int fontid = fontnumber / 10;
--   if (fontid < 0 || fontid > 31) fontid = 0;
--
--   if (thisset == -1) {
--      // try to load font (font must be in Root.TTFontPath resource)
--      // to see which fontset we have available
--      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                          TROOT::GetTTFFontDir());
--      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
--      if (ttfont) {
--         delete [] ttfont;
--         thisset = 0;
--      } else {
--         // try backup free font
--         thisset = 1;
--      }
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
-    }
--   Int_t italic = 0;
--   if (fontid==15) italic = 1;
--   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
--   // Do not define font set is we're loading the symbol.ttf - it's
--   // the same in both cases.
--   if (ret == 0 && fontid != 12) fontset = thisset;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
---- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
-@@ -5,5 +5,5 @@
- 
- ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
-+ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
- ROOT_INSTALL_HEADERS()
-diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
---- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
-@@ -50,7 +50,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
- 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
--		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,POSTSCRIPT)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
-@@ -229,6 +229,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <wchar.h>
-+#include <fontconfig/fontconfig.h>
- 
- #include "Riostream.h"
- #include "Byteswap.h"
-@@ -1528,56 +1529,179 @@
- 
- void TPostScript::FontEmbed(void)
- {
--   static const char *fonttable[32][2] = {
--      { "Root.TTFont.0", "FreeSansBold.otf" },
--      { "Root.TTFont.1", "FreeSerifItalic.otf" },
--      { "Root.TTFont.2", "FreeSerifBold.otf" },
--      { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--      { "Root.TTFont.4", "FreeSans.otf" },
--      { "Root.TTFont.5", "FreeSansOblique.otf" },
--      { "Root.TTFont.6", "FreeSansBold.otf" },
--      { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--      { "Root.TTFont.8", "FreeMono.otf" },
--      { "Root.TTFont.9", "FreeMonoOblique.otf" },
--      { "Root.TTFont.10", "FreeMonoBold.otf" },
--      { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--      { "Root.TTFont.12", "symbol.ttf" },
--      { "Root.TTFont.13", "FreeSerif.otf" },
--      { "Root.TTFont.14", "wingding.ttf" },
--      { "Root.TTFont.15", "symbol.ttf" },
--      { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--      { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--      { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--      { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--      { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--      { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--      { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--      { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--      { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--      { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--      { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--      { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--      { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
--   };
--
-    PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
- 
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--
-    for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15 && MustEmbed[fontid-1]) {
--         const char *filename = gEnv->GetValue(
--                                               fonttable[fontid][0], fonttable[fontid][1]);
--         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
-+
-+         char *ttfont = NULL;
-+
-+         FcPattern *pat, *match;
-+         FcCharSet *set = NULL;
-+         FcResult result;
-+
-+         pat = FcPatternCreate ();
-+
-+         switch (fontid) {
-+         case 1:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 2:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 3:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 4:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 5:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 6:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 7:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 8:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 9:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 10:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 11:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 13:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 14:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 16:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 17:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 18:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 19:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 20:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 21:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 22:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 23:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 24:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 25:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 26:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 27:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 28:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 29:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            set = FcCharSetCreate ();
-+            FcCharSetAddChar (set, 0x0410); // Cyrillic
-+            FcCharSetAddChar (set, 0x4e00); // CJK
-+            FcPatternAddCharSet (pat, FC_CHARSET, set);
-+            break;
-+         }
-+
-+         FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+         FcDefaultSubstitute (pat);
-+         match = FcFontMatch (NULL, pat, &result);
-+         char *ttfnt;
-+         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+         ttfont = StrDup(ttfnt);
-+         FcPatternDestroy (match);
-+         FcPatternDestroy (pat);
-+         if (set) FcCharSetDestroy (set);
-+
-          if (!ttfont) {
--            Error("TPostScript::FontEmbed",
--                  "font %d (filename `%s') not found in path",
--                  fontid, filename);
-+            Error("TPostScript::FontEmbed", "font %d not found in path",
-+                  fontid);
-          } else {
-             if (FontEmbedType2(ttfont)) {
-                // nothing
-@@ -1586,9 +1710,8 @@
-             } else if(FontEmbedType42(ttfont)) {
-                // nothing
-             } else {
--               Error("TPostScript::FontEmbed",
--                     "failed to embed font %d (filename `%s')",
--                     fontid, filename);
-+               Error("TPostScript::FontEmbed", "failed to embed font %d)",
-+                     fontid);
-             }
-             delete [] ttfont;
-          }
-@@ -2536,10 +2659,10 @@
-       { "Root.PSFont.5",             "/Helvetica-Oblique" },
-       { "Root.PSFont.6",             "/Helvetica-Bold" },
-       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
--      { "Root.PSFont.8",             "/Courrier" },
--      { "Root.PSFont.9",             "/Courrier-Oblique" },
--      { "Root.PSFont.10",            "/Courrier-Bold" },
--      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
-+      { "Root.PSFont.8",             "/Courier" },
-+      { "Root.PSFont.9",             "/Courier-Oblique" },
-+      { "Root.PSFont.10",            "/Courier-Bold" },
-+      { "Root.PSFont.11",            "/Courier-BoldOblique" },
-       { "Root.PSFont.12",            "/Symbol" },
-       { "Root.PSFont.13",            "/Times-Roman" },
-       { "Root.PSFont.14",            "/ZapfDingbats" },
-@@ -2745,10 +2868,10 @@
-       { "Root.PSFont.9", "/FreeMonoOblique" },
-       { "Root.PSFont.10", "/FreeMonoBold" },
-       { "Root.PSFont.11", "/FreeMonoBoldOblique" },
--      { "Root.PSFont.12", "/SymbolMT" },
-+      { "Root.PSFont.12", "/StandardSymbolsL" },
-       { "Root.PSFont.13", "/FreeSerif" },
--      { "Root.PSFont.14", "/Wingdings-Regular" },
--      { "Root.PSFont.15", "/SymbolMT" },
-+      { "Root.PSFont.14", "/Dingbats" },
-+      { "Root.PSFont.15", "/StandardSymbolsL" },
-       { "Root.PSFont.STIXGen", "/STIXGeneral" },
-       { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
-       { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
-@@ -32,6 +32,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
-@@ -78,7 +78,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
--		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
-+		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
-@@ -37,6 +37,7 @@
- # include "FTGLBitmapFont.h"
- #endif
- 
-+#include <fontconfig/fontconfig.h>
- 
- /** \class TGLFont
- \ingroup opengl
-@@ -420,7 +421,7 @@
- ClassImp(TGLFontManager);
- 
- TObjArray   TGLFontManager::fgFontFileArray;
--Int_t TGLFontManager::fgExtendedFontStart;
-+Int_t TGLFontManager::fgExtendedFontStart = 0;
- TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
- Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
- 
-@@ -451,17 +452,175 @@
-    FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
-    if (it == fFontMap.end())
-    {
--      TString ttpath, file;
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
--      {
--         //For extenede we have both ttf and otf.
--         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
--                                   ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
--                                   ((TObjString*)fgFontFileArray[fileID])->String());
--         file = fp;
--         delete [] fp;
-+      char *file = NULL;
-+      int ttindex = 0;
-+
-+      FcPattern *pat, *match;
-+      FcCharSet *set = NULL;
-+      FcResult result;
-+
-+      pat = FcPatternCreate ();
-+
-+      switch (fileID) {
-+      case 0:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 1:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 2:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 3:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 4:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 5:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 6:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 7:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 8:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 9:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 10:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 11:
-+      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 12:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 13:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 15:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 16:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 17:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 18:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 19:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 20:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 21:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 22:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 23:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 24:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 25:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 26:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 27:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 28:
-+      case 29:
-+      case 30:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         set = FcCharSetCreate ();
-+         FcCharSetAddChar (set, 0x0410); // Cyrillic
-+         FcCharSetAddChar (set, 0x4e00); // CJK
-+         FcPatternAddCharSet (pat, FC_CHARSET, set);
-       }
- 
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
-+      char *ttfnt;
-+      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+      file = StrDup (ttfnt);
-+      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+      FcPatternDestroy (match);
-+      FcPatternDestroy (pat);
-+      if (set) FcCharSetDestroy (set);
-+
-       FTFont* ftfont = 0;
-       switch (mode)
-       {
-@@ -485,10 +644,14 @@
-             ftfont = new FTGLTextureFont(file);
-             break;
-          default:
-+            delete [] file;
-             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
-             return;
-             break;
-       }
-+
-+      delete [] file;
-+
-       ftfont->FaceSize(size);
-       const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
-       out.CopyAttributes(mf);
-@@ -571,8 +734,6 @@
- {
-    if (fgStaticInitDone == kFALSE) InitStatics();
- 
--   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
--
-    return fgExtendedFontStart;
- }
- 
-@@ -642,28 +803,6 @@
-    fgFontFileArray.Add(new TObjString("wingding")); // 140
-    fgFontFileArray.Add(new TObjString("symbol"));   // 150
- 
--   fgExtendedFontStart = fgFontFileArray.GetEntries();
--   //"Extended" fonts for gl-pad.
--   //fgPadFontStart + ...
--   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
--   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
--   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
--
--   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
--   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
--   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
--   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
--
--   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
--   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
--   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
--   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
--
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
--   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
--   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
--
-    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
-    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
-    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
-@@ -34,6 +34,8 @@
- # include "FTGLBitmapFont.h"
- #endif
- 
-+#include <fontconfig/fontconfig.h>
-+
- #define FTGL_BITMAP  0
- #define FTGL_PIXMAP  1
- #define FTGL_OUTLINE 2
-@@ -178,27 +180,92 @@
- {
-    int fontid = fontnumber / 10;
- 
--   const char *fontname=0;
--   if (fontid == 0)  fontname = "arialbd.ttf";
--   if (fontid == 1)  fontname = "timesi.ttf";
--   if (fontid == 2)  fontname = "timesbd.ttf";
--   if (fontid == 3)  fontname = "timesbi.ttf";
--   if (fontid == 4)  fontname = "arial.ttf";
--   if (fontid == 5)  fontname = "ariali.ttf";
--   if (fontid == 6)  fontname = "arialbd.ttf";
--   if (fontid == 7)  fontname = "arialbi.ttf";
--   if (fontid == 8)  fontname = "cour.ttf";
--   if (fontid == 9)  fontname = "couri.ttf";
--   if (fontid == 10) fontname = "courbd.ttf";
--   if (fontid == 11) fontname = "courbi.ttf";
--   if (fontid == 12) fontname = "symbol.ttf";
--   if (fontid == 13) fontname = "times.ttf";
--   if (fontid == 14) fontname = "wingding.ttf";
--
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   FcPattern *pat, *match;
-+   FcResult result;
-+   char *ttfont;
-+   int ttindex;
-+
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 0:
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   }
-+
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
- 
-    if (fGLTextFont) delete fGLTextFont;
- 
-@@ -206,7 +273,9 @@
- 
-    fGLTextFont = new FTGLPolygonFont(ttfont);
- 
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
-+
-    if (!fGLTextFont->FaceSize(1))
-       Error("SetGLTextFont","Cannot set FTGL::FaceSize");
--   delete [] ttfont;
- }
-diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
-@@ -83,20 +83,12 @@
-    gROOT->SetBatch(kFALSE);
- 
-    if (strcmp(appClassName, "proofserv")) {
--      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                          TROOT::GetTTFFontDir());
--      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
--      if (!ttfont)
--         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--      if (ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+      if (gEnv->GetValue("Root.UseTTFonts", 1)) {
-          TPluginHandler *h;
-          if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualX", "x11ttf")))
-             if (h->LoadPlugin() == -1)
-                Info("TGApplication", "no TTF support");
-       }
--
--      delete [] ttfont;
-    }
- 
-    // Create the canvas colors early so they are allocated before
-diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
---- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
-@@ -119,8 +119,7 @@
- {
-    TString sc;
-    Float_t step, mark[5];
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arialbd.ttf";
-+   TString ar = "arialbd.ttf";
-    Int_t i, nexe, offset;
- 
-    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -528,8 +527,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-@@ -609,8 +607,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
deleted file mode 100644
index c0f9e07..0000000
--- a/root-gl2ps.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
---- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
-@@ -0,0 +1,21 @@
-+# - Locate gl2ps library
-+# Defines:
-+#
-+#  GL2PS_FOUND
-+#  GL2PS_INCLUDE_DIR
-+#  GL2PS_INCLUDE_DIRS (not cached)
-+#  GL2PS_LIBRARIES
-+
-+find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
-+find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
-+
-+set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
-+set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
-+
-+mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
-@@ -70,6 +70,7 @@
- ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
- ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
- ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
-+ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
-@@ -153,6 +153,11 @@
- set(opengllib ${OPENGL_gl_LIBRARY})
- set(openglincdir ${OPENGL_INCLUDE_DIR})
- 
-+set(builtingl2ps ${value${builtin_gl2ps}})
-+set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
-+set(gl2pslib ${GL2PS_LIBRARY})
-+set(gl2psincdir ${GL2PS_INCLUDE_DIR})
-+
- set(buildldap ${value${ldap}})
- set(ldaplibdir ${LDAP_LIBRARY_DIR})
- set(ldaplib ${LDAP_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
-@@ -334,6 +334,16 @@
-   endif()
- endif()
- 
-+#---Check for gl2ps ------------------------------------------------------------------
-+if(NOT builtin_gl2ps)
-+  message(STATUS "Looking for gl2ps")
-+  find_Package(gl2ps)
-+  if(NOT GL2PS_FOUND)
-+    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
-+    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Graphviz installation-------------------------------------------------------
- if(gviz)
-   message(STATUS "Looking for Graphviz")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
-@@ -142,6 +142,11 @@
- OPENGLLIB      := @opengllib@
- OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
- 
-+BUILTINGL2PS   := @builtingl2ps@
-+GL2PSLIBDIR    := @gl2pslibdir@
-+GL2PSCLILIB    := @gl2pslib@
-+GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
-+
- BUILDLDAP      := @buildldap@
- LDAPLIBDIR     := @ldaplibdir@
- LDAPCLILIB     := @ldaplib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
-+++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
-@@ -53,6 +53,7 @@
-    enable_builtin_afterimage \
-    enable_builtin_ftgl       \
-    enable_builtin_freetype   \
-+   enable_builtin_gl2ps      \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-    enable_builtin_unuran     \
-@@ -182,6 +183,7 @@
- enable_winrtdebug=
- enable_builtin_freetype=no
- enable_builtin_ftgl=no
-+enable_builtin_gl2ps=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
- enable_builtin_unuran=no
-@@ -1704,6 +1706,7 @@
-   builtin-afterimage Build included libAfterImage, or use system libAfterImage
-   builtin-ftgl       Build included libFTGL, or use system libftgl
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-+  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-   builtin-unuran     Build included libunuran, or use system libunuran
-@@ -2047,6 +2050,7 @@
-    logmsg "Will use by default builtin versions of libraries on Win32"
-    enable_builtin_freetype="yes"
-    enable_builtin_ftgl="yes"
-+   enable_builtin_gl2ps="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-    enable_builtin_unuran="yes"
-@@ -3180,6 +3184,38 @@
- 
- ######################################################################
- #
-+### echo %%% libgl2ps (builtin or system)
-+#
-+if test "x$enable_builtin_gl2ps" = "xno" ; then
-+    check_header "gl2ps.h" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_gl2ps=yes
-+    else
-+        gl2psinc=$found_hdr
-+        gl2psincdir=$found_dir
-+    fi
-+
-+    check_library "libgl2ps" "$enable_shared" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        gl2pslib=""
-+        gl2pslibdir=""
-+        enable_builtin_gl2ps="yes"
-+    else
-+        gl2pslib="$found_lib"
-+        gl2pslibdir="$found_dir"
-+    fi
-+
-+    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
-+        enable_builtin_gl2ps="yes"
-+    fi
-+fi
-+message "Checking whether to build included gl2ps"
-+result "$enable_builtin_gl2ps"
-+
-+######################################################################
-+#
- ### echo %%% libpcre (builtin or system) - Mandatory lib
- #
- # Mandatory test, must succeed (see http://www.pcre.org/)
-@@ -7593,6 +7629,10 @@
-     -e "s|@ftglincdir@|$ftglincdir|"            \
-     -e "s|@ftgllibdir@|$ftgllibdir|"            \
-     -e "s|@ftgllibs@|$ftgllibs|"                \
-+    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
-+    -e "s|@gl2psincdir@|$gl2psincdir|"          \
-+    -e "s|@gl2pslib@|$gl2pslib|"                \
-+    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
-     -e "s|@glewincdir@|$glewincdir|"            \
-     -e "s|@glewlibdir@|$glewlibdir|"            \
-     -e "s|@glewlibs@|$glewlibs|"                \
-diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
-@@ -7,12 +7,20 @@
- ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
- list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
-                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
-+set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
- ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
- 
- if(WIN32 OR cocoa)
-   list(REMOVE_ITEM headers TX11GL.h)
-   list(REMOVE_ITEM sources TX11GL.cxx)
--  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
-+  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
-+endif()
-+
-+if(builtin_gl2ps)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+else()
-+  list(REMOVE_ITEM sources gl2ps.cxx)
-+  include_directories(${GL2PS_INCLUDE_DIRS})
- endif()
- 
- if(WIN32)
-@@ -32,6 +40,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
-@@ -19,6 +19,7 @@
- GLDH         := $(GLDS:.cxx=.h)
- 
- GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
-+GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
- GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
- 
- # Excluded from win32 builds
-@@ -42,6 +43,13 @@
- # Used by rootcint
- GLH2         := $(filter-out $(GLH1), $(GLH))
- 
-+ifeq ($(BUILTINGL2PS),yes)
-+GL2PSFLAGS   := -I$(MODDIRI)
-+else()
-+GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
-+GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
-+endif()
-+
- ifneq ($(OPENGLLIB),)
- GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
-                 $(XLIBS) -lm
-@@ -78,6 +86,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
-+		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
- 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
-@@ -107,12 +116,12 @@
- ##### extra rules ######
- ifeq ($(ARCH),win32)
- $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- else
--$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
--$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
-+$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
-+$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
- endif
- 
- $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-html-markup.patch b/root-html-markup.patch
deleted file mode 100644
index d6b9d1e..0000000
--- a/root-html-markup.patch
+++ /dev/null
@@ -1,1031 +0,0 @@
-diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
-@@ -42,7 +42,6 @@
- //
- // This enum type describes the ways in which TGTextEntry can display
- // its contents. The currently defined values are:
--//Begin_Html
- /*
- <ul>
- <li>  kNormal - display characters as they are entered. This is the default.
-@@ -50,14 +49,12 @@
- <li>  kPassword - display asterisks instead of the characters actually entered.
- </ul>
- */
--//End_Html
- // See also SetEchoMode(), GetEchoMode().
- //
- // enum TGTextEntry::EInsertMode
- //
- // This enum type describes the way how typed characters are
- // inserted in the text entry. This mode is switched by "Insert" key.
--//Begin_Html
- /*
- <ul>
- <li>  kInsert - typed character are inserted (cursor has shape of short line).
-@@ -65,13 +62,11 @@
-                  (cursor has the shape of filled rectangle).
- </ul>
- */
--//End_Html
- //
- // enum TGWidget::ETextJustification
- //
- // This enum type (defined in TGWidget.h) describes the text alignment modes.
- // These modes are valid untill text fits the frame width
--//Begin_Html
- /*
- <ul>
- <li>  kTextLeft    - left-side text alignment
-@@ -79,12 +74,10 @@
- <li>  kTextCenterX - center text alignment
- </ul>
- */
--//End_Html
- //
- //
- // The key press event handler converts a key press to some line editor action.
- // Here are the default key bindings:
--//Begin_Html
- /*
- <ul>
- <li><i> Left Arrow </i>
-@@ -153,7 +146,6 @@
- </ul>
- All other keys with valid ASCII codes insert themselves into the line.
- */
--//End_Html
- //
- ////////////////////////////////////////////////////////////////////////////////
- 
-@@ -658,13 +650,11 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// The echo modes available are:
--///Begin_Html
- /// <ul>
- /// <li> kNormal   - display characters as they are entered.  This is the default.
- /// <li> kNoEcho   - do not display anything.
- /// <li> kPassword - display asterisks instead of the characters actually entered.
- /// </ul>
--///End_Html
- /// It is always possible to cut and paste any marked text;  only the widget's own
- /// display is affected.
- /// See also GetEchoMode(), GetDisplayText().
-@@ -1154,7 +1144,6 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// The key press event handler converts a key press to some line editor
- /// action. Here are the default key bindings:
--///Begin_Html
- ///  <ul>
- ///  <li><i> Left Arrow </i>
- ///          Move the cursor one character leftwards.
-@@ -1220,7 +1209,6 @@
- ///  <li><i> Control-Y </i>
- ///          Paste the clipboard text into line edit.
- ///  </ul>
--///End_Html
- ///  All other keys with valid ASCII codes insert themselves into the line.
- 
- Bool_t TGTextEntry::HandleKey(Event_t* event)
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
-@@ -938,17 +938,10 @@
- ///  NOTE: To access the generated histograms in the current directory, do eg:
- ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
- ///
--/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
--/// with the following output:
--///Begin_Html
-+/// A complete example of this function is given in tutorial fitslicesy.C.
- 
- void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
- {
--   /*
--   <img src="gif/fitslicesy.gif">
--   */
--   //End_Html
--
-    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
- 
- }
-diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
---- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
-@@ -603,7 +603,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -682,7 +682,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -986,7 +986,7 @@
- ///     None so far
- ///
- /// For detailed description of what this entails, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::FindParameterization(Option_t *)
- {
-@@ -1005,7 +1005,7 @@
- ///     M     use Minuit to improve coefficients
- ///
- /// Also, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::Fit(Option_t *option)
- {
-@@ -1097,7 +1097,7 @@
- /// PRIVATE METHOD:
- /// Create list of candidate functions for the parameterisation. See
- /// also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeCandidates()
- {
-@@ -1354,7 +1354,7 @@
- /// PRIVATE METHOD:
- /// Invert the model matrix B, and compute final coefficients. For a
- /// more thorough discussion of what this means, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- ///
- /// First we invert the lower triangle matrix fOrthCurvatureMatrix
- /// and store the inverted matrix in the upper triangle.
-@@ -1496,7 +1496,7 @@
- /// Make Gram-Schmidt orthogonalisation. The class description gives
- /// a thorough account of this algorithm, as well as
- /// references. Please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
- {
-@@ -1589,7 +1589,7 @@
- ///     R4        Residuals computed on test sample
- ///
- /// For a description of these quantities, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeHistograms(Option_t *option)
- {
-@@ -1800,7 +1800,7 @@
- /// PRIVATE METHOD:
- /// Find the parameterization over the training sample. A full account
- /// of the algorithm is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeParameterization()
- {
-@@ -2365,7 +2365,7 @@
- /// be fitted, and the new candidate function to be included in the
- /// fit.  By default it is 0, which automatically chooses another
- /// selection criteria. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxAngle(Double_t ang)
- {
-@@ -2381,7 +2381,7 @@
- /// Set the min angle (in degrees) between a new candidate function
- /// and the subspace spanned by the previously accepted
- /// functions. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinAngle(Double_t ang)
- {
-@@ -2401,7 +2401,7 @@
- /// Where N is the dimension of the data sample, L is the number of
- /// terms (given in terms) and the first number, labels the term, the
- /// second the variable.  More information is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
- {
-@@ -2421,7 +2421,7 @@
- /// Set the user parameter for the function selection. The bigger the
- /// limit, the more functions are used. The meaning of this variable
- /// is defined in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowerLimit(Double_t limit)
- {
-@@ -2431,7 +2431,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Set the maximum power to be considered in the fit for each
- /// variable. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxPowers(const Int_t* powers)
- {
-@@ -2446,7 +2446,7 @@
- /// Set the acceptable relative error for when sum of square
- /// residuals is considered minimized. For a full account, refer to
- /// the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinRelativeError(Double_t error)
- {
-@@ -2458,7 +2458,7 @@
- /// PRIVATE METHOD:
- /// Test whether the currently considered function contributes to the
- /// fit. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
-                                   Double_t dResidur)
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
-@@ -71,8 +71,6 @@
- //
- //</div>
- //
--//<!-- */
--// --> End_Html
- 
- //______________________________________________________________________________
- /** \class TSpectrum2
-@@ -372,7 +370,6 @@
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- const char *TSpectrum2::Background(Double_t **spectrum,
-                        Int_t ssizex, Int_t ssizey,
-@@ -381,7 +378,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
-@@ -523,10 +520,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
-@@ -835,8 +830,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, x, y, sampling, r1, r2;
-    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
-@@ -1022,11 +1016,10 @@
- ///   averWindow-width of averaging smoothing window
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
-@@ -1134,10 +1127,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
-@@ -1239,8 +1230,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t xmin, xmax, ymin, ymax, i, j, l;
-    Double_t a, b, maxch;
-    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
-@@ -1439,7 +1429,6 @@
- ///   boost, boosting factor, for details we refer to manual
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
-                                        Int_t ssizex, Int_t ssizey,
-@@ -1447,7 +1436,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
-@@ -1602,10 +1591,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
-@@ -1982,8 +1969,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
-        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2177,8 +2163,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
-@@ -2311,10 +2296,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
-@@ -2856,8 +2839,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k, lindex, priz;
-    Double_t lda, ldb, ldc, area, maximum;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
-@@ -162,11 +162,10 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
-@@ -178,8 +177,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    if (numberPeaks <= 0){
-       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
-       return;
-@@ -1793,11 +1791,10 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrum2Fit::FitAwmi(Double_t **source)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
-@@ -2686,8 +2683,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, pw,
-@@ -4697,8 +4693,7 @@
- //
- /////////////////////////////////////////////////////////////////////////////
- //
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
-@@ -4928,8 +4923,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
-@@ -1748,8 +1748,7 @@
- /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -2018,8 +2017,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j;
-    Int_t size;
-    Double_t *working_vector = 0, **working_matrix = 0;
-@@ -2324,8 +2322,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -2481,8 +2478,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-@@ -2768,8 +2764,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2908,8 +2903,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
-@@ -273,7 +273,6 @@
- ///                                                                           //
- ///                                                                           //
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Background(Double_t***spectrum,
-                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -283,7 +282,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
-@@ -674,8 +673,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, x, y, z, sampling, q1, q2, q3;
-    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
-    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
-@@ -1069,11 +1067,10 @@
- /// averWindow-width of averaging smoothing window                          //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
- {
--/* -->
-+/* 
- 
- <div class=Section2>
- 
-@@ -1302,8 +1299,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
-    Double_t a,b,maxch;
-@@ -1868,7 +1864,6 @@
- /// boost, boosting factor, for details we refer to manual                  //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
-                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -1876,7 +1871,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- 
- <div class=Section3>
- 
-@@ -2357,8 +2352,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2590,8 +2584,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- 
- <div class=Section4>
- 
-@@ -2901,8 +2894,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k,lindex;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
-@@ -113,7 +113,6 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
- {
-@@ -162,7 +161,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    if (numberPeaks <= 0){
-       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
-@@ -847,7 +845,6 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumFit::FitAwmi(Double_t *source)
- {
-@@ -1343,7 +1340,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
-@@ -2312,7 +2308,6 @@
- ///        source-pointer to the vector of source spectrum
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumFit::FitStiefel(Double_t *source)
- {
-@@ -2546,7 +2541,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
-@@ -739,11 +739,10 @@
- ///             need 2*size length to store real and imaginary coefficients
- ///
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -989,8 +988,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t a, b, pi = 3.14159265358979323846;
-@@ -1482,11 +1480,10 @@
- ///
- /////////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -1618,8 +1615,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-@@ -2091,11 +2087,10 @@
- ///           need 2*size length to store real and imaginary coefficients
- ///
- /////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2226,8 +2221,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
---- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
-@@ -1162,7 +1162,6 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Paints histogram according to preset parameters.
--///Begin_Html <!--
- 
- void TSpectrum2Painter::Paint(Option_t * /*option*/)
- {
-@@ -1524,7 +1523,6 @@
- }
- </pre>
- <!-- */
--// --> End_Html
- 
-    Int_t turni,turnj,w1,w2,x,y;
-    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
-@@ -7654,14 +7652,12 @@
- ///                               * * *
- ///
- /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
--///Begin_Html
- 
- void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
- {
-    /*
-    <img src="gif/spectrumpainter.gif">
-    */
--   //End_Html
- 
-    TString opt = option;
- 
-diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
---- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
-@@ -25,20 +25,15 @@
- // Monte Carlo event generator (integrator) FOAM.
- // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
- // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_MapCamel1000.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_MapCamel1000.gif">
-+//
- // FOAM is now fully integrated with the ROOT package.
- // The important bonus of the ROOT use is persistency of the FOAM objects!
- //
- // For more sophisticated problems full version of FOAM may be more appropriate:
--//BEGIN_HTML <!--
--/* -->
--  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
--<!--*/
--// -->END_HTML
-+// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
-+//
- // Simple example of the use of FOAM:
- // ==================================
- // Int_t kanwa(){
-@@ -81,11 +76,9 @@
- //   return 0.5*Dist;
- // }// Camel2
- // Two-dim. histogram of the MC points generated with the above program looks as follows:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_cKanwa.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_cKanwa.gif">
-+//
- // Canonical nine steering parameters of FOAM
- // ===========================================
- //------------------------------------------------------------------------------
-@@ -266,10 +259,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Default destructor
--///  std::cout<<" DESTRUCTOR entered "<<std::endl;
- 
- TFoam::~TFoam()
- {
-+   //std::cout<<" DESTRUCTOR entered "<<std::endl;
-    Int_t i;
- 
-    if(fCells!= 0) {
-@@ -321,42 +314,35 @@
- /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
- /// and reseting (optionally) its internal parameters/switches.
- /// The overall operational scheme of the FOAM is the following:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_schema2.gif">
-+///
-+/// This method invokes several other methods:
-+/// ==========================================
-+/// InitCells initializes memory storage for cells and begins exploration process
-+/// from the root cell. The empty cells are allocated/filled using  CellFill.
-+/// The procedure Grow which loops over cells, picks up the cell with the biggest
-+/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
-+/// with the help of PeekMax procedure. The chosen cell is split using Divide.
-+/// Subsequently, the procedure Explore called by the Divide
-+/// (and by InitCells for the root cell) does the most important
-+/// job in the FOAM object build-up: it performs a small MC run for each
-+/// newly allocated daughter cell.
-+/// Explore calculates how profitable the future split of the cell will be
-+/// and defines the optimal cell division geometry with the help of Carver or Varedu
-+/// procedures, for maximum weight or variance optimization respectively.
-+/// All essential results of the exploration are written into
-+/// the explored cell object. At the very end of the foam build-up,
-+/// Finally, MakeActiveList is invoked to create a list of pointers to
-+/// all active cells, for the purpose of the quick access during the MC generation.
-+/// The procedure Explore employs MakeAlpha to generate random coordinates
-+/// inside a given cell with the uniform distribution.
-+/// The above sequence of the procedure calls is depicted in the following figure:
-+///
-+//  <img src="gif/foam_Initialize_schema.gif">
- 
- void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
- {
--/* -->
--<img src="gif/foam_schema2.gif">
--<!--*/
--// -->END_HTML
--//
--// This method invokes several other methods:
--// ==========================================
--// InitCells initializes memory storage for cells and begins exploration process
--// from the root cell. The empty cells are allocated/filled using  CellFill.
--// The procedure Grow which loops over cells, picks up the cell with the biggest
--// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
--// with the help of PeekMax procedure. The chosen cell is split using Divide.
--// Subsequently, the procedure Explore called by the Divide
--// (and by InitCells for the root cell) does the most important
--// job in the FOAM object build-up: it performs a small MC run for each
--// newly allocated daughter cell.
--// Explore calculates how profitable the future split of the cell will be
--// and defines the optimal cell division geometry with the help of Carver or Varedu
--// procedures, for maximum weight or variance optimization respectively.
--// All essential results of the exploration are written into
--// the explored cell object. At the very end of the foam build-up,
--// Finally, MakeActiveList is invoked to create a list of pointers to
--// all active cells, for the purpose of the quick access during the MC generation.
--// The procedure Explore employs MakeAlpha to generate random coordinates
--// inside a given cell with the uniform distribution.
--// The above sequence of the procedure calls is depicted in the following figure:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_Initialize_schema.gif">
--<!--*/
--// -->END_HTML
--
-    SetPseRan(PseRan);
-    SetRho(fun);
-    Initialize();
-@@ -1363,15 +1349,11 @@
- /// It defines which variables are excluded in the process of the cell division.
- /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
- /// The resulting map of cells in 2-dim. case will look as follows:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map2.gif">
- 
- void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
- {
--/* -->
--<img src="gif/foam_Map2.gif">
--<!--*/
--// -->END_HTML
--
-    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
-    if(fInhiDiv == 0) {
-       fInhiDiv = new Int_t[ fDim ];
-@@ -1391,15 +1373,11 @@
- ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
- ///     FoamX->SetXdivPRD(0,3,xDiv);
- /// results in the following 2-dim. pattern of the cells:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map3.gif">
- 
- void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
- {
--/* -->
--<img src="gif/foam_Map3.gif">
--<!--*/
--// -->END_HTML
--
-    Int_t i;
- 
-    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
-diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
-@@ -238,19 +238,14 @@
- /// PDG convention already)
- /// Source: BaBar User Guide, Neil I. Geddes,
- ///
--///Begin_Html
-+/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
-+/// with some fixes by PB, marked with (PB) below. Checked against
-+/// PDG listings from 2000.
-+///
-+/// Paul Balm, Nov 19, 2001
- 
- Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
- {
--  /*
--   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
--  */
--  //End_Html
--  // with some fixes by PB, marked with (PB) below. Checked against
--  // PDG listings from 2000.
--  //
--  // Paul Balm, Nov 19, 2001
--
-    switch(Geant3number) {
- 
-       case 1   : return 22;       // photon
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
-@@ -50,7 +50,7 @@
- 
- The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
- 
--The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
-+The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
- 
- */
- 
-diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
---- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
-@@ -3,13 +3,11 @@
- TCanvas *timeonaxis()
- {
- // This macro illustrates the use of the time mode on the axis
--// with different time intervals and time formats. It's result can
--// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
-+// with different time intervals and time formats.
- // Through all this script, the time is expressed in UTC. some
- // information about this format (and others like GPS) may be found at
--// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
--//  or
--// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
-+// http://tycho.usno.navy.mil/systime.html or
-+// http://www.topology.org/sci/time.html
- //
- // The start time is : almost NOW (the time at which the script is executed)
- // actualy, the nearest preceding hour beginning.
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
deleted file mode 100644
index 48e2a28..0000000
--- a/root-latex-markup.patch
+++ /dev/null
@@ -1,877 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
---- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
-@@ -185,14 +185,19 @@
- ## <a name="L8"></a> Accents
- Several kind of accents are available:
- 
--   #hat    = Begin_Latex #hat{a} End_Latex
--   #check  = Begin_Latex #check{a} End_Latex
--   #acute  = Begin_Latex #acute{a} End_Latex
--   #grave  = Begin_Latex #grave{a} End_Latex
--   #dot    = Begin_Latex #dot{a} End_Latex
--   #ddot   = Begin_Latex #ddot{a} End_Latex
--   #tilde  = Begin_Latex #tilde{a} End_Latex
--
-+Begin_Macro(source)
-+{
-+   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
-+   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
-+   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
-+   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
-+   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
-+   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
-+   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
-+   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
-+   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
-+}
-+End_Macro
- 
- The special sign: `#slash` draws a slash on top of the text between brackets:
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
---- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
-@@ -949,9 +949,9 @@
- /// Getting the error via TF1::DerivativeError:
- ///   (total error = roundoff error + interpolation error)
- /// the estimate of the roundoff error is taken as follows:
--///Begin_Latex
--///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--///End_Latex
-+/// \f[
-+///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+/// \f]
- /// where k is the double precision, ai are coefficients used in
- /// central difference formulas
- /// interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
---- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -360,27 +360,33 @@
- ///
- /// If the histograms are not filled with unit weights, the number of effective
- /// entries is used to normalise the bin contents which might lead to wrong results.
--/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
--///
-+/// \f[
-+/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
-+/// \f]
- /// The points are assigned a x value at the center of each histogram bin.
--/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
-+/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
-+/// for all options except for the
- /// bayesian methods where the result depends on the chosen option.
- ///
--/// If the denominator becomes 0 or pass >  total, the corresponding bin is
-+/// If the denominator becomes 0 or pass > total, the corresponding bin is
- /// skipped.
- ///
- /// 2) calculating ratios of two Poisson means (option 'pois'):
- /// --------------------------------------------------------------
- ///
- /// The two histograms are interpreted as independent Poisson processes and the ratio
--/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
--/// The histogram 'pass' is interpreted as n_{1} and the total histogram
--/// is used for n_{2}
-+/// \f[
-+/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
-+/// \f]
-+/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
-+/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
-+/// is used for \f$n_{2}\f$.
- ///
- /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
- /// of efficiency by a parameter transformation:
--/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
--///
-+/// \f[
-+/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
-+/// \f]
- /// The x errors span each histogram bin (lowedge ... lowedge+width)
- /// The y errors depend on the chosen statistic methode which can be determined
- /// by the options given below. For a detailed description of the used statistic
-@@ -413,8 +419,7 @@
- /// oscillation on the actual coverage probability a couple of approximations and
- /// methodes has been developped. For a detailed discussion, please have a look at
- /// this statistical paper:
--/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
--/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
-+/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
- 
- void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
- {
-diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
---- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -764,8 +764,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Get square of the error of bin addressed by linidx as
--/// BEGIN_LATEX #sum weight^{2}
--/// END_LATEX
-+/// \f$\sum weight^{2}\f$
- /// If errors are not enabled (via Sumw2() or CalculateErrors())
- /// return contents.
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -92,31 +92,28 @@
-     Method:
-        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
-        and 16-point Gaussian quadrature approximations to
--   Begin_Latex
--      I = #int^{b}_{a} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{b}_{a} f(x)dx
-+   \f]
-       and define
--   Begin_Latex
--      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
--   End_Latex
-+   \f[
-+      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
-+   \f]
-       Then,
--   Begin_Latex
--      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
--   End_Latex
--      where, starting with x0 = A and finishing with xk = B,
--      the subdivision points xi(i=1,2,...) are given by
--   Begin_Latex
--      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
--   End_Latex
--   Begin_Latex
--      #lambda
--   End_Latex
--      is equal to the first member of the
--      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
-+   \f[
-+      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
-+   \f]
-+      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
-+      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
-+   \f[
-+      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
-+   \f]
-+      \f$\lambda\f$ is equal to the first member of the
-+      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
-       If, at any stage in the process of subdivision, the ratio
--  Begin_Latex
--      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
--  End_Latex
-+  \f[
-+      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
-+  \f]
-       is so small that 1+0.005q is indistinguishable from 1 to
-       machine accuracy, an error exit occurs with the function value
-       set equal to zero.
-@@ -131,13 +128,13 @@
-       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
-       precisely, if k is the number of sub-intervals contributing to the
-       approximation (see Method), and if
--      Begin_Latex
--      I_{abs} = #int^{B}_{A} #||{f(x)}dx
--      End_Latex
-+   \f[
-+      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
-+   \f]
-       then the relation
--   Begin_Latex
--    #frac{#||{G-I}}{I_{abs}+k} < EPS
--   End_Latex
-+   \f[
-+      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
-+   \f]
-       will nearly always be true, provided the routine terminates without
-       printing an error message. For functions f having no singularities in
-       the closed interval [A,B] the accuracy will usually be much higher than
-@@ -156,9 +153,9 @@
- 
-    /** Returns Integral of function on an infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{-#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -169,9 +166,9 @@
- 
-    /** Returns Integral of function on an upper semi-infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{A} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{A} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -183,9 +180,9 @@
- 
-    /** Returns Integral of function on a lower semi-infinite interval.
-        This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{B}_{#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{B}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-          In any arithmetic expression, this function has the approximate value
-          of the integral I.
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -88,10 +88,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--      D(h) = #frac{f(x+h) - f(x-h)}{2h}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+      D(h) = \frac{f(x+h) - f(x-h)}{2h}
-+     \f]
-+      the final estimate
-+     \f[
-+      D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -103,9 +106,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -141,10 +144,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -156,9 +162,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -177,10 +183,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -192,9 +201,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
---- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
-@@ -34,35 +34,33 @@
- double kEulerGamma = 0.577215664901532860606512090082402431042;
- 
- 
--/* Begin_Html
--<center><h2>KelvinFunctions</h2></center>
-+/**
-+\class KelvinFunctions
- 
--<p>
- This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
- Kei(x), and their first derivatives.
--</p>
--
--End_Html */
-+*/
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
-+/// \f]
- /// For x > fgMin, Ber(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -102,24 +100,25 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
-+/// \f]
- /// For x > fgMin, Bei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -161,29 +160,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Ker(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -227,29 +227,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Kei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -298,10 +299,10 @@
- /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
- /// the polynomial approximation of Ber(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -343,10 +344,10 @@
- /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
- /// the polynomial approximation of Bei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -388,10 +389,10 @@
- /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
- /// the polynomial approximation of Ker(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -436,10 +437,10 @@
- /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
- /// the polynomial approximation of Kei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -481,9 +482,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
--/// Begin_Latex
--/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F1(double x)
- {
-@@ -510,9 +511,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
--/// Begin_Latex
--/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F2(double x)
- {
-@@ -541,9 +542,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
--/// Begin_Latex
--/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G1(double x)
- {
-@@ -568,9 +569,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
--/// Begin_Latex
--/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G2(double x)
- {
-@@ -597,9 +598,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
- /// DBei(x). M(x) is given by
--/// Begin_Latex
--/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// \f[
-+/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::M(double x)
- {
-@@ -612,10 +613,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
--/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
--/// Begin_Latex
--/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DBei(x). \f$\theta(x)\f$ is given by
-+/// \f[
-+/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Theta(double x)
- {
-@@ -628,10 +629,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). (x) is given by
--/// Begin_Latex
--/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// DKei(x). N(x) is given by
-+/// \f[
-+/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::N(double x)
- {
-@@ -644,10 +645,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
--/// Begin_Latex
--/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DKei(x). \f$\phi(x)\f$ is given by
-+/// \f[
-+/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Phi(double x)
- {
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
-@@ -85,7 +85,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
-       
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-    private:
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
-@@ -37,11 +37,12 @@
-    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
-    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
-    and an alternate hypothesis (eg. signal+background).  
--   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
--   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
--   not a probability.
--   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
--   Significance method.
-+   The p-values can also be transformed into confidence levels
-+   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
-+   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
-+   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
-+   Finally, the p-value of the null can be transformed into a number of
-+   equivalent Gaussian sigma using the Significance method.
- 
-    The p-value of the null for a given test statistic is rigorously defined and
-    this is the starting point for the following conventions.
-@@ -52,17 +53,17 @@
- observed value of the test statistic. This is the more standard
- convention and avoids confusion when doing inverted tests.
- 
--For exclusion, we also want the formula
--CLs = CLs+b / CLb to hold which therefore defines our conventions
--for CLs+b and CLb. CLs was specifically invented for exclusion
-+For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
-+to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
-+\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
- and therefore all quantities need be related through the assignments
--as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
-+as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
- is derived by considering the scenarios of a powerful and not powerful
--inverted test, where for the not so powerful test, CLs must be
-+inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
- close to one.
- 
- For results of Hypothesis tests,
--CLs has no similar direct interpretation as for exclusion and can
-+\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
- be larger than one.
- 
- */
-@@ -101,7 +102,7 @@
-       /// Convert  AlternatePValue into a "confidence level"
-       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
- 
--      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
-+      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
-       virtual Double_t CLs() const {
-          double thisCLb = CLb();
-          if (thisCLb == 0) {
-@@ -144,7 +145,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
- 
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-       /// The error on the Null p-value
-diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -100,11 +100,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$1 - CL_{b}\f$ : the B p-value
- double HybridResult::NullPValue() const
- {
--   // return 1-CL_b : the B p-value
--
-    if (fComputationsNulDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -131,11 +129,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$CL_{s+b}\f$ : the S+B p-value
- double HybridResult::AlternatePValue() const
- {
--   // return CL_s+b : the S+B p-value
--
-    if (fComputationsAltDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -162,40 +158,37 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
-+/// error on \f$CL_{b}\f$:
-+/// \f[
-+/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLbError() const
- {
--  // Returns an estimate of the error on CLb assuming a binomial error on
--  // CLb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_b.size();
-   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
-+/// error on \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLsplusbError() const
- {
--  // Returns an estimate of the error on CLsplusb assuming a binomial
--  // error on CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_sb.size();
-   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
-+/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- Double_t HybridResult::CLsError() const
- {
--  // Returns an estimate of the error on CLs through combination of the
--  // errors on CLb and CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--  // END_LATEX
-   unsigned const int n_b = fTestStat_b.size();
-   unsigned const int n_sb = fTestStat_sb.size();
-   
-diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -229,8 +229,8 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// compute CLb error
--/// Clb =  1 - NullPValue() 
-+/// compute \f$CL_{b}\f$ error
-+/// \f$CL_{b}\f$ = 1 - NullPValue()
- /// must use opposite condition that routine above
- 
- Double_t HypoTestResult::CLbError() const {
-@@ -251,12 +251,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Returns an estimate of the error on CLs through combination of the
--/// errors on CLb and CLsplusb:
--/// BEGIN_LATEX
--/// #sigma_{CL_s} = CL_s
--/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--/// END_LATEX
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
-+/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s
-+/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- 
- Double_t HypoTestResult::CLsError() const {
-    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
deleted file mode 100644
index 2af5c42..0000000
--- a/root-libgfortranbegin.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
---- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
---- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
---- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
-@@ -55,8 +55,10 @@
- else
- F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
---- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
---- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
---- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
-@@ -53,8 +53,10 @@
- else
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
---- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
-@@ -43,8 +43,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
---- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
---- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
-@@ -50,8 +50,10 @@
- endif
- F77FLAGS      = -m32 -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
---- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -54,8 +54,10 @@
- else
- F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
---- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -62,8 +62,10 @@
- else
- F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
---- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
---- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
deleted file mode 100644
index 4dfbc44..0000000
--- a/root-links.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
---- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
-@@ -5,7 +5,7 @@
- and their rotation algorithms. The classes were ported to root from
- CLHEP see:
- 
--<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
-+<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
- 
- ## The Physics Vector Classes
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
---- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
-@@ -331,7 +331,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the maximum number of function calls for the minimization algorithm
- /// For example for MIGRAD this is the maxcalls value passed as first argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetMaxIterations(Int_t niter)
- {
-@@ -341,7 +341,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the Error Definition (default=1)
- /// For Minuit this is the value passed with the "SET ERR" command
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
- 
- void TVirtualFitter::SetErrorDef(Double_t errdef)
- {
-@@ -356,7 +356,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the tolerance used in the minimization algorithm
- /// For example for MIGRAD this is tolerance value passed as second argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetPrecision(Double_t prec)
- {
-diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
---- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
-+++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
-@@ -13,7 +13,7 @@
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
---- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
-+++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
-@@ -5,15 +5,15 @@
- .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
- .\" other parms are allowed: see man(7), man(1)
- .SH NAME
--g2rootold \- convert GEANT geomtry files to ROOT files
-+g2rootold \- convert GEANT geometry files to ROOT files
- .SH SYNOPSIS
--.B g2rootoldd
-+.B g2rootold
- .I [-f map_name] geant_name macro_name
- .SH "DESCRIPTION"
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-@@ -103,9 +103,9 @@
- .I JDIGI.
- .SH "SEE ALSO"
- .RS
--.IR root (1),
--.IR g2root (1),
--.IR h2root(1),
-+.IR root(1) ,
-+.IR g2root(1) ,
-+.IR h2root(1) ,
- .RE
- and
- .RS
-diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
---- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
-@@ -74,7 +74,7 @@
- 
-     <ul>
-   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
--  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-+  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
- New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
- </li>
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -301,7 +301,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DENLAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -381,7 +381,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DISLAN) is used.
- 
-    @param x The argument \f$x\f$
-@@ -756,7 +756,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-@@ -783,7 +783,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -528,7 +528,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (RANLAN) is used.
- 
-    @param z The argument \f$z\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
-@@ -193,7 +193,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-@@ -219,7 +219,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
---- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
-@@ -193,7 +193,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-@@ -408,7 +408,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
-@@ -81,7 +81,7 @@
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
-@@ -90,7 +90,7 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
---- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
-@@ -92,14 +92,14 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    - VavilovAccurate uses the algorithm by
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
-@@ -103,7 +103,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-@@ -239,7 +239,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
---- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
-@@ -5,7 +5,7 @@
- <li>The main TMinuit class is documented in class TMinuit.</li>
- <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
-     </a></li>
--<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
-+<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
-     </a></li>
- <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
-       </A></li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
---- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
-@@ -13,7 +13,7 @@
- <p>
- <ol>
- <li>
--F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
-+F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
- <li>
- F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
- <li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
-@@ -32,7 +32,7 @@
- 
- <h2>References</h2>
- <ol>
--<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
-+<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
- <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
-   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
- <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
-@@ -14,7 +14,7 @@
- 
- ## References
- 
--1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
-+1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
- 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
- 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
- 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
-@@ -163,7 +163,7 @@
- <h3>Linear Algebra Functions</h3>
- 
- Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
--In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
-+In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
- <pre>
- <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
- bool ret = m.<strong>Invert</strong>()
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
-@@ -132,7 +132,7 @@
- 
- ### Linear Algebra Functions
- 
--Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
-+Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
- 
- <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
- bool ret = m.**Invert**()  
-diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
---- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
-@@ -47,8 +47,8 @@
- //           V               v      v                     v      v                  //
- //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
- //       |        ^                                                                 //
--//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
--//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
-+//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
-+//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
- // St_PolyLine3D  |                                                                 //
- //                |                                                                 //
- //           TPoints3DABC                                                           //
-diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
---- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
-@@ -142,7 +142,7 @@
- ///                            10 - this unvisible, but sons are visible
- ///                            01 - this visible but sons
- ///                            11 - neither this nor its sons are visible
--/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
-+/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
- 
- Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
- {
-@@ -150,11 +150,12 @@
-    return mapVis[vis];
- }
- 
--//______________________________________________________________________________
--//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+////////////////////////////////////////////////////////////////////////////////
-+/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
-+
- Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
- {
--// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
-    const Int_t mapVis[4] = {1, -2, 0, -1 };
-    Int_t i;
- //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
deleted file mode 100644
index 39d7510..0000000
--- a/root-llvm-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
-@@ -59,6 +59,7 @@
-   endif()
- endif()
- set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
-+set(BUILD_SHARED_LIBS "NO")
- #--- Do not build cling as part of llvm.
- set(LLVM_NOCLING "YES")
- 
diff --git a/root-macro-align.patch b/root-macro-align.patch
deleted file mode 100644
index f8ef9eb..0000000
--- a/root-macro-align.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
---- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
-@@ -329,7 +329,7 @@
- parameters are shown in the plot below.
- 
- Begin_Macro(source)
--   {
-+{
-       //canvas only needed for the documentation
-       TCanvas* c1 = new TCanvas("c1","",600,400);
-       c1->SetFillStyle(1001);
-@@ -363,7 +363,7 @@
- 
-       //only for this documentation
-       return c1;
--   }
-+}
- End_Macro
- 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
-@@ -1809,9 +1809,9 @@
- /// of comparison of the unweighted histogram with 217 events (minimal expected
- /// frequency equal to one) and the weighted histogram with 500 events (minimal
- /// expected frequency equal to 25)
--///Begin_Macro
-+/// Begin_Macro
- /// ../../../tutorials/math/chi2test.C(17)
--///End_Macro
-+/// End_Macro
- /// Fig 2. An example of comparison of the unweighted histogram with 217 events
- /// and the weighted histogram with 500 events:
- ///   a) unweighted histogram;
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
deleted file mode 100644
index 48085d6..0000000
--- a/root-missing-cmake-config.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
-@@ -252,6 +252,12 @@
-   endif()
-   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
-                          REGEX system.rootrc EXCLUDE
-+                         REGEX system.rootauthrc EXCLUDE
-+                         REGEX system.rootdaemonrc EXCLUDE
-+                         REGEX rootd.rc.d EXCLUDE
-+                         REGEX proofd.rc.d EXCLUDE
-+                         REGEX rootd.xinetd EXCLUDE
-+                         REGEX proofd.xinetd EXCLUDE
-                          REGEX root.mimes EXCLUDE)
-   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
-   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
-@@ -404,7 +404,13 @@
- set(perl ${PERL_EXECUTABLE})
- 
- #---RConfigure-------------------------------------------------------------------------------------------------
--set(setresuid undef)
-+CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
-+  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
-+if(found_setresuid)
-+  set(setresuid define)
-+else()
-+  set(setresuid undef)
-+endif()
- if(mathmore)
-   set(hasmathmore define)
- else()
-@@ -523,7 +529,16 @@
- execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
- 
- configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
-+
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+
- configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
-+
- if(ruby)
-   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
- endif()
-@@ -665,8 +680,21 @@
- 
- install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
-               ${CMAKE_BINARY_DIR}/etc/system.rootrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
-               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- 
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
-+              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-+                          GROUP_EXECUTE GROUP_READ
-+                          WORLD_EXECUTE WORLD_READ
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
- install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
- 
- if(NOT gnuinstall)
-diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
---- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
-@@ -9,4 +9,9 @@
- ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
- ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
--ROOT_INSTALL_HEADERS()
-+
-+if(AIX)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+endif()
-+
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
-@@ -7,6 +7,7 @@
-   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
-   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
-   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
-+  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
- endif()
- ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
- ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
-diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
---- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
-@@ -1,6 +1,7 @@
- 
- add_subdirectory(net)
- add_subdirectory(auth)  # special CMakeListst.txt
-+add_subdirectory(rootd)
- 
- if(bonjour)
-   add_subdirectory(bonjour)
-diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
---- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
-@@ -0,0 +1,9 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT net/rootd package
-+# @author Pere Mato, CERN
-+############################################################################
-+
-+ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
-+                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
---- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
-@@ -3,4 +3,7 @@
- # @author Pere Mato, CERN
- ############################################################################
- 
--ROOT_INSTALL_HEADERS()
-\ No newline at end of file
-+ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
-+  RIO Net Thread MathCore)
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
---- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
-@@ -4,6 +4,7 @@
- ############################################################################
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- add_definitions(${XROOTD_CFLAGS})
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
- 
-@@ -11,14 +12,16 @@
-   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
- else()
-   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
--                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
-+                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-   if (NOT XROOTD_NOMAIN)
-      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
-   endif ()
-   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
--  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
-+  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
-+  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
-+                         LIBRARIES ${SYSLIBS})
- endif()
- 
- if(builtin_xrootd)
-@@ -38,4 +41,4 @@
- endif()
- 
- 
--ROOT_INSTALL_HEADERS()
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
-diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
---- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
-@@ -1,4 +1,3 @@
--
- ############################################################################
- # CMakeLists.txt file for building ROOT proof/proofx package
- # @author Pere Mato, CERN
-@@ -14,6 +13,7 @@
- endif()
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
- link_directories(${XROOTD_LIBRARY_DIR})
- add_definitions(${XROOTD_CFLAGS})
- 
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
deleted file mode 100644
index 5ce9485..0000000
--- a/root-more-fflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index f51bcbe..1ee0602 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
- #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
--string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
-+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
- string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
-diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
-index 045926d..a419744 100644
---- a/cmake/scripts/RootUseFile.cmake.in
-+++ b/cmake/scripts/RootUseFile.cmake.in
-@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
-index b9a8e34..f931ad3 100644
---- a/etc/cmake/RootUseFile.cmake
-+++ b/etc/cmake/RootUseFile.cmake
-@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
deleted file mode 100644
index afad777..0000000
--- a/root-no-abi-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
-index 896ca4c..51e01905 100644
---- a/cmake/modules/CheckCompiler.cmake
-+++ b/cmake/modules/CheckCompiler.cmake
-@@ -1,7 +1,6 @@
- #---------------------------------------------------------------------------------------------------
- #  CheckCompiler.cmake
- #---------------------------------------------------------------------------------------------------
--include (CheckCXXSourceCompiles)
- 
- #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
- if(fortran)
-@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-   endif()
-   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
-   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
--  CHECK_CXX_SOURCE_COMPILES("
--    #include <string>
--    #if _GLIBCXX_USE_CXX11_ABI
--    #error \"cling does not support GCC 5 ABI.\"
--    #endif
--    int main() {}" CXX_SUPPORTS_OLD_ABI)
--  if(NOT CXX_SUPPORTS_OLD_ABI)
--     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
--  endif()
- else()
-   set(GCC_MAJOR 0)
-   set(GCC_MINOR 0)
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
deleted file mode 100644
index 1157d56..0000000
--- a/root-no-testdata.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
---- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
-@@ -239,13 +239,14 @@
- 
- #--stressProof-------------------------------------------------------------------------------
- if(NOT WIN32)
--  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-+  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
-   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
-                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
-                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
-                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
--                                         FAILREGEX "FAILED|Error in")
-+                                         FAILREGEX "FAILED|Error in"
-+                                         DEPENDS TestData)
- endif()
- 
- #--testbits----------------------------------------------------------------------------------
diff --git a/root-ppc64.patch b/root-ppc64.patch
deleted file mode 100644
index cab115c..0000000
--- a/root-ppc64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-@@ -30,8 +30,8 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
--elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
--  message(STATUS "Found a 64bit ppc64 little endian system")
-+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
-+  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-@@ -205,17 +205,12 @@
-    ;;
- linuxppcgcc)
-    # PPC Linux with gcc
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
-+   auxldflags="-m32"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
- linuxppc64gcc)
--   # PPC64 (64 bit mode) Linux with gcc 3.x
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
--   auxldflags="-m64"
--   auxlibs="-lm -ldl -rdynamic"
--   ;;
--ppc64le)
--   # PPC64 (64 bit mode) little endian
-+   # PPC64/PPC64LE (64 bit mode) Linux with gcc
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
deleted file mode 100644
index cb30e30..0000000
--- a/root-private-public.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
---- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
-@@ -43,8 +43,8 @@
- #ifndef ROOT_TSocket
- #include "TSocket.h"
- #endif
--#ifndef ROOT_XrdProofConn
--#include "XrdProofConn.h"
-+#ifndef __XPTYPES_H
-+#include "XProtocol/XPtypes.hh"
- #endif
- #ifndef XRC_UNSOLMSG_H
- #include "XrdClient/XrdClientUnsolMsg.hh"
-@@ -58,6 +58,7 @@
- class TXHandler;
- class TXSocketHandler;
- class XrdClientMessage;
-+class XrdProofConn;
- 
- // To transmit info to Handlers
- typedef struct {
-@@ -140,7 +141,7 @@
-    void                PostMsg(Int_t type, const char *msg = 0);
- 
-    // Auxilliary
--   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
-+   Int_t               GetLowSocket() const;
- 
-    static void         SetLocation(const char *loc = ""); // Set location string
- 
-@@ -170,13 +171,13 @@
- 
-    virtual Int_t       GetClientID() const { return -1; }
-    virtual Int_t       GetClientIDSize() const { return 1; }
--   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
--   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
--   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
--   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
-+   Int_t               GetLogConnID() const;
-+   Int_t               GetOpenError() const;
-+   Int_t               GetServType() const;
-+   Int_t               GetSessionID() const;
-    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
- 
--   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
-+   Bool_t              IsValid() const;
-    Bool_t              IsServProofd();
-    virtual void        RemoveClientID() { }
-    virtual void        SetClientID(Int_t) { }
-@@ -215,11 +216,9 @@
-    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
- 
-    // Interrupt the low level socket
--   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
--                                        fRDInterrupt = i;
--                                        if (i && fConn) fConn->SetInterrupt();
--                                        if (i && fAWait) fASem.Post(); }
-+   void                SetInterrupt(Bool_t i = kTRUE);
-    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
-+
-    // Set / Check async msg queue waiting status
-    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
-    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
-diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
---- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
-@@ -40,6 +40,8 @@
- #include "TSysEvtHandler.h"
- #include "XProofProtocol.h"
- 
-+#include "XrdProofConn.h"
-+
- ClassImp(TXProofMgr)
- 
- //
-diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
---- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
-@@ -912,6 +912,46 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Getter for logical connection ID
-+
-+Int_t TXSocket::GetLogConnID() const
-+{
-+   return (fConn ? fConn->GetLogConnID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for last error
-+
-+Int_t TXSocket::GetOpenError() const
-+{
-+   return (fConn ? fConn->GetOpenError() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for server type
-+
-+Int_t TXSocket::GetServType() const
-+{
-+   return (fConn ? fConn->GetServType() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for session ID
-+
-+Int_t TXSocket::GetSessionID() const
-+{
-+   return (fConn ? fConn->GetSessionID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for validity status
-+
-+Bool_t TXSocket::IsValid() const
-+{
-+   return (fConn ? (fConn->IsValid()) : kFALSE);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Return kTRUE if the remote server is a 'proofd'
- 
- Bool_t TXSocket::IsServProofd()
-@@ -1633,6 +1673,16 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+void TXSocket::SetInterrupt(Bool_t i)
-+{
-+   R__LOCKGUARD(fAMtx);
-+   fRDInterrupt = i;
-+   if (i && fConn) fConn->SetInterrupt();
-+   if (i && fAWait) fASem.Post();
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Send a TMessage object. Returns the number of bytes in the TMessage
- /// that were sent and -1 in case of error.
- 
-@@ -1923,6 +1973,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+Int_t TXSocket::GetLowSocket() const {
-+   return (fConn ? fConn->GetLowSocket() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Init environment variables for XrdClient
- 
- void TXSocket::InitEnvs()
diff --git a/root-s390x.patch b/root-s390x.patch
deleted file mode 100644
index 39f0b98..0000000
--- a/root-s390x.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
-@@ -54,6 +54,32 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390x)
-+  message(STATUS "Found a 64bit system")
-+  set(BIT_ENVIRONMENT "-m64")
-+  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390)
-+  message(STATUS "Found a 31bit system")
-+  set(BIT_ENVIRONMENT "-m31")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-+++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
-@@ -215,6 +215,18 @@
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
-+linuxs390gcc)
-+   # s390 (31 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
-+   auxldflags="-m31"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
-+linuxs390xgcc)
-+   # s390x (64 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-+   auxldflags="-m64"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
- linuxx8664gcc)
-    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
-diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
---- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
-@@ -202,6 +202,19 @@
- #   define NEED_SIGJMP
- #endif
- 
-+#if defined(linux) && defined(__s390__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define NEED_SIGJMP
-+#endif
-+
-+#if defined(linux) && defined(__s390x__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define R__B64
-+#   define NEED_SIGJMP
-+#endif
-+
- #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
- #   define R__HURD
- #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
-@@ -54,6 +54,10 @@
-     set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(PCRE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(PCRE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
-@@ -49,6 +49,10 @@
-     set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(AFTER_CC "${AFTER_CC} -m64")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(AFTER_CC "${AFTER_CC} .m31")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
-@@ -56,6 +56,10 @@
-     set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(FREETYPE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
-@@ -21,6 +21,8 @@
-   set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+  set(ROOT_CLING_TARGET "SystemZ")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
-   set(ROOT_CLING_TARGET "X86")
- elseif(ROOT_ARCHITECTURE MATCHES macosx)
-diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
---- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
-@@ -372,6 +372,8 @@
-   set(LLVM_NATIVE_ARCH Hexagon)
- elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
-   set(LLVM_NATIVE_ARCH SystemZ)
-+elseif (LLVM_NATIVE_ARCH MATCHES "s390")
-+  set(LLVM_NATIVE_ARCH SystemZ)
- else ()
-   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
- endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
deleted file mode 100644
index 4952a92..0000000
--- a/root-save-memory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
-@@ -36,7 +36,9 @@
-                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                                     ${corelinklibs})
- 
--add_dependencies(rootcling CLING LLVMRES)
-+# The dependency on Cling was added to prevent Cling (libCling) and
-+# rootcling from being linked in parallel.
-+add_dependencies(rootcling CLING LLVMRES Cling)
- 
- ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
- 
-diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
---- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
-@@ -25,9 +25,11 @@
- 
- CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
- ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
-+# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
-+# $(ROOTCLINGEXE) from being linked in parallel.
- $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
- 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
--           $(PCREDEP) $(CORELIBDEP)
-+           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
- 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
- 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
- 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
deleted file mode 100644
index 35b828c..0000000
--- a/root-see-macro-output.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
---- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
-@@ -13,7 +13,6 @@
- 
- void fit1() {
-    //Simple fitting example (1-d histogram with an interpreted function)
--   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
---- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- void fitslicesy() {
- //
- // Illustrates how to use the TH1::FitSlicesY function
--// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
- //    It uses the TH2F histogram generated in macro hsimple.C
- //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
- //    in 2 sepate pads.
-diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
---- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
-@@ -3,7 +3,6 @@
- 
- void multifit() {
- //  Fitting multiple functions to different ranges of a 1-D histogram
--// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- //      Example showing how to fit in a sub-range of an histogram
- //  An histogram is created and filled with the bin contents and errors
- //  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
---- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
-@@ -3,7 +3,6 @@
- 
- void shapes() {
- //The old geometry shapes (see script geodemo.C)
--//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
---- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,6 +1,5 @@
- void basic3d(){
-    // Show 3-D polylines and markers
--   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
-    //
- 
-    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
---- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void canvas(){
- //Example of primitives in a canvas
--// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
- // One of the first actions in a ROOT session is the creation of a Canvas.
- // Here we create a Canvas named "c1"
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
---- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,7 +1,6 @@
- void feynman()
- {
-    //Draw Feynman diagrams
--   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
-    //Author: Otto Schaile
- 
-    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
-diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
---- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
-@@ -1,6 +1,5 @@
- void gaxis(){
- //Simple example illustrating how to draw TGaxis objects in various formats.
--//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
- //Author: Rene Brun
- 
-   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
---- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
-@@ -1,6 +1,5 @@
- void tornado() {
- //Show 3-d polymarkers
--// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- //Author: Rene Brun
- 
-     gBenchmark->Start("tornado");
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
---- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void gerrors2() {
-    //Draw two graphs with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
---- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void gerrors() {
-    //Draw a graph with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
---- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void graph() {
-    //Draw a simple graph
--   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
---- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void surfaces() {
-    //Draw 2-Dim functions
--   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
---- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
-@@ -1,6 +1,5 @@
- void fillrandom() {
-    //Fill a 1-D histogram from a parametric function
--   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
---- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- // histograms filled and drawn in a loop
- void hsum() {
- //
--// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- //    Simple example illustrating how to use the C++ interpreter
- //    to fill histograms in a loop and show the graphics results
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
---- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
-@@ -9,7 +9,6 @@
- {
-    //example of macro illustrating how to superimpose two histograms
-    //with different scales in the "same" pad.
--   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
-diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
---- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
-diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
---- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
- #
- from os import path
- from ROOT import TCanvas, TFile, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
---- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraphErrors
-diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
---- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraph
-diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
---- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
---- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- #    Simple example illustrating how to use the C++ interpreter	
- #    to fill histograms in a loop and show the graphics results
- #
-diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
---- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- #      Example showing how to fit in a sub-range of an histogram
- #  An histogram is created and filled with the bin contents and errors
- #  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
---- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- #
- 
- import ROOT
-diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
---- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPaveText, TPad, TF2
-diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
---- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- 
- from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
- from ROOT import gROOT, gBenchmark
-diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
---- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
-@@ -4,7 +4,6 @@
- # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
- #
- # original header:
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- # Simple example illustrating how to use the C++ interpreter	
- # to fill histograms in a loop and show the graphics results
- 
diff --git a/root-soname.patch b/root-soname.patch
deleted file mode 100644
index 3367bad..0000000
--- a/root-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
-@@ -39,7 +39,7 @@
- if(soversion)
-   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
-       VERSION ${ROOT_VERSION}
--      SOVERSION ${ROOT_MAJOR_VERSION}
-+      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
-       SUFFIX ${libsuffix}
-       PREFIX ${libprefix} )
- else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
deleted file mode 100644
index 8834aa4..0000000
--- a/root-stressgraphics.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
---- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
-+++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
-@@ -3,18 +3,18 @@
-     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
-     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
-     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
--    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
-+    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
-     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
-     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
--    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
--    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
--   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
--   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
--   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
--   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
--   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
--   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
--   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
-+    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
-+    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
-+   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
-+   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
-+   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
-+   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
-+   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
-+   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
-+   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
-    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
-    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
-@@ -25,7 +25,7 @@
-    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
-    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
-    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
--   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
-+   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
-    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
-    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
-    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
-@@ -35,11 +35,11 @@
-    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
-    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
-    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
--   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
-+   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
-    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
--   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
-+   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
--   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
-+   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
-    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
-    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
-    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-template-files.patch b/root-template-files.patch
deleted file mode 100644
index 086b8a7..0000000
--- a/root-template-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
---- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
-@@ -15,8 +15,8 @@
-    // equal to 1 for the signal and 0 for the background is added.
-    const char *fname = "mlpHiggs.root";
-    TFile *input = 0;
--   if (!gSystem->AccessPathName(fname)) {
--      input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
-    } else {
-       printf("accessing %s file from http://root.cern.ch/files\n",fname);
-       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
---- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
-@@ -273,8 +273,8 @@
- 
-   const char *fname = "stock.root";
-   TFile *f = 0;
--  if (!gSystem->AccessPathName(fname)) {
--     f = TFile::Open(fname);
-+  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
-   } else {
-      printf("accessing %s file from http://root.cern.ch/files\n",fname);
-      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff --git a/root-test-install.patch b/root-test-install.patch
deleted file mode 100644
index 0b61f68..0000000
--- a/root-test-install.patch
+++ /dev/null
@@ -1,3105 +0,0 @@
-diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
---- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
-@@ -37,12 +37,12 @@
-   install(FILES ${pyfile} DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
-   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
--  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  file(COPY ${pyfile} DESTINATION ${localruntimedir})
- endforeach()
- 
--set( ROOTaaSDirName "ROOTaaS")
-+set(ROOTaaSDirName "ROOTaaS")
- install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
--file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
- 
- #---Install headers----------------------------------------------------------
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
---- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
-@@ -508,7 +508,7 @@
- 
-           # system logon, user logon, and local logon (skip Rint.Logon)
-             name = '.rootlogon.C'
--            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
-+            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
-                        os.path.expanduser( os.path.join( '~', name ) ) ]
-             if logons[-1] != os.path.join( os.getcwd(), name ):
-                logons.append( name )
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-@@ -222,7 +222,7 @@
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
- 
- # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
--if(rpath OR gnuinstall)
-+if(rpath)
-   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
-   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
- elseif(APPLE)
-diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
-@@ -19,6 +19,7 @@
-   set(libprefix lib)
-   set(ld_library_path PATH)
-   set(libsuffix .dll)
-+  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_BINDIR})
- elseif(APPLE)
-   set(ld_library_path DYLD_LIBRARY_PATH)
-@@ -26,6 +27,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- else()
-   set(ld_library_path LD_LIBRARY_PATH)
-@@ -33,6 +35,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
-@@ -322,7 +325,15 @@
-     set(pcm_name)
-   else()
-     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
--      set(command rootcling -rootbuild)
-+      if(gnuinstall)
-+        if(WIN32)
-+          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
-+        else()
-+          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
-+        endif()
-+      else()
-+        set(command rootcling -rootbuild)
-+      endif()
-       set(ROOTCINTDEP rootcling)
-     else()
-       set(command rootcling)
-@@ -431,9 +442,6 @@
-   if(TARGET G__${library})
-     add_dependencies(${library} G__${library})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
-   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
-   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
-@@ -468,9 +476,6 @@
-   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
-      add_dependencies(${library} ${CMAKE_MATCH_2})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
- 
-   #--- Only for building shared libraries
-   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
-@@ -511,9 +516,6 @@
-   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
-   include_directories(${CMAKE_BINARY_DIR}/include)
-   add_library( ${library} SHARED ${lib_srcs})
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
-   target_link_libraries(${library} ${ARG_LIBRARIES})
-   #----Installation details-------------------------------------------------------
-@@ -590,6 +592,10 @@
-                            PATTERN ".svn" EXCLUDE
-                            REGEX "LinkDef" EXCLUDE
-                            ${ARG_OPTIONS})
-+    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
-+                   PATTERN ".svn" EXCLUDE
-+                   REGEX "LinkDef" EXCLUDE
-+                   ${ARG_OPTIONS})
-     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
-   endforeach()
- endfunction()
-@@ -629,9 +635,6 @@
-   if (ARG_ADDITIONAL_COMPILE_FLAGS)
-     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${executable} move_headers)
--  endif()
- 
-   #----Installation details------------------------------------------------------
-   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-@@ -849,6 +852,9 @@
-     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
-   else()
-     add_test(NAME ${test} COMMAND ${_command})
-+    if (gnuinstall)
-+      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
-+    endif()
-   endif()
- 
-   #- Handle TIMOUT and DEPENDS arguments
-diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
---- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,20 +0,0 @@
--# Arguments:
--#  PREFIX    - Installation prefix
--#  COMPONENTS - Installation component
--
--set(COMPONENTS ${COMPONENTS})
--set(ENV{DESTDIR} "")
--foreach(component ${COMPONENTS})
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
--                             -DCMAKE_INSTALL_COMPONENT=${component}
--                             -P cmake_install.cmake
--    RESULT_VARIABLE result
--    OUTPUT_QUIET
--  )
--
--  if(result)
--    set(msg "Local installation of ${component} failed: ${result}\n")
--    message(FATAL_ERROR "${msg}")
--  endif()
--endforeach()
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
-@@ -135,7 +135,7 @@
-   endif()
- endforeach()
- 
--#---Move (copy) the headers and other directories to binary tree---------------------------------
-+#---Move (copy) directories to binary tree------------------------------------------------------
- set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
- add_custom_command(OUTPUT ${stamp_file}
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
-@@ -147,11 +147,7 @@
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
-                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
-                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
--add_custom_target(move_headers DEPENDS ${stamp_file}
--                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
--                                                        -DCOMPONENTS="headers"
--                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
--include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
-+add_custom_target(move_artifacts DEPENDS ${stamp_file})
- 
- 
- #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
-@@ -199,13 +195,23 @@
-                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
-                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
- 
--add_custom_command(OUTPUT etc/allDict.cxx.pch
--                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
--                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
--                           etc/dictpch/allLinkDefs.h
--                           etc/dictpch/allHeaders.h
--                           etc/dictpch/allCppflags.txt
--                           rootcling)
-+if (WIN32)
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+else()
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+endif()
- add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
- set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
- add_dependencies(onepcm ${__allTargets})
-@@ -213,22 +219,20 @@
- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- 
- #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
--if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
--  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
--  add_dependencies(hsimple onepcm)
--  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
--  if(WIN32)
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
--  else()
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
--                               $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
--  endif()
--  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-+add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
-+add_dependencies(hsimple onepcm)
-+if(WIN32)
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
-+else()
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
- endif()
-+install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
- 
- #---version--------------------------------------------------------------------------------------
- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
-@@ -266,9 +270,6 @@
- #---Configure Testing using CTest----------------------------------------------------------------
- configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
- if(testing)
--  if(gnuinstall)
--    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
--  endif()
-   include(RootCTest)
-   if(roottest)
-     find_package(Git REQUIRED)
-diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
---- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
-@@ -14,10 +14,11 @@
- #define ROOTTUTDIR    "@tutdir@"
- #define ROOTSRCDIR    "@srcdir@"
- #define ROOTICONPATH  "@iconpath@"
--#define EXTRAICONPATH "@extraiconpath@"
- #define TTFFONTDIR    "@ttffontdir@"
- #endif
- 
-+#define EXTRAICONPATH "@extraiconpath@"
-+
- #@setresuid@ R__HAS_SETRESUID   /**/
- #@hasmathmore@ R__HAS_MATHMORE   /**/
- #@haspthread@ R__HAS_PTHREAD    /**/
-diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
---- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
-@@ -9,24 +9,24 @@
- # and to PATH on Windows.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.DynamicPath:    .:@libdir@:
--WinNT.*.Root.DynamicPath:   .;@bindir@;
-+#Unix.*.Root.DynamicPath:    .:@libdir@
-+#WinNT.*.Root.DynamicPath:   .;@bindir@
- 
- # Path used to find macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.MacroPath:      .:@macrodir@:
--WinNT.*.Root.MacroPath:     .;@macrodir@;
-+#Unix.*.Root.MacroPath:      .:@macrodir@
-+#WinNT.*.Root.MacroPath:     .;@macrodir@
- 
- # Path used to find plugin macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.PluginPath:      :@plugindir@:
--WinNT.*.Root.PluginPath:     ;@plugindir@;
-+#Unix.*.Root.PluginPath:     @plugindir@
-+#WinNT.*.Root.PluginPath:    @plugindir@
- 
- # Path where to look for TrueType fonts.
- Unix.*.Root.UseTTFonts:     true
--*.*.Root.TTFontPath:        @ttffontdir@
-+#*.*.Root.TTFontPath:        @ttffontdir@
- 
- # Use Net* API functions.
- WinNT.UseNetAPI:         true
-@@ -222,7 +222,8 @@
- Gui.DocumentForegroundColor: black
- Gui.TooltipBackgroundColor:  LightYellow
- Gui.TooltipForegroundColor:  black
--Gui.IconPath:                $(HOME)/icons:@iconpath@:.
-+#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
-+#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
- Gui.MimeTypeFile:            $(HOME)/.root.mimes
- # If above does not exists defaults to this:
- #Gui.MimeTypeFile:            @etcdir@/root.mimes
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
-@@ -8018,6 +8018,7 @@
-     -e "s|@bindir@|$bindir|"               \
-     -e "s|@etcdir@|$etcdir|"               \
-     -e "s|@ttffontdir@|$fontdir|"          \
-+    -e "s|@extraiconpath@|$extraiconpath|" \
-     -e "s|@iconpath@|$iconpath|"           \
-     -e "s|@hasxrd@|$hasxrd|"               \
-     -e "s|@hasnotxrd@|$hasnotxrd|"         \
-diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
---- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
-@@ -325,7 +325,19 @@
-    static Int_t       ConvertVersionInt2Code(Int_t v);
-    static Int_t       RootVersionCode();
-    static const char**&GetExtraInterpreterArgs();
--   static const char *GetTutorialsDir();
-+
-+   static const TString& GetRootSys();
-+   static const TString& GetBinDir();
-+   static const TString& GetLibDir();
-+   static const TString& GetIncludeDir();
-+   static const TString& GetEtcDir();
-+   static const TString& GetDataDir();
-+   static const TString& GetDocDir();
-+   static const TString& GetMacroDir();
-+   static const TString& GetTutorialsDir();
-+   static const TString& GetSourceDir();
-+   static const TString& GetIconPath();
-+   static const TString& GetTTFFontDir();
- 
-    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
- };
-diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -268,11 +268,7 @@
-    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR);
--#else
--                                       "$(ROOTSYS)/fonts");
--#endif
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-    // Check for use of DFSG - fonts
-    if (!ttfont)
-@@ -880,29 +876,19 @@
-          Error("ProcessLine", "Cannot show demos in batch mode!");
-          return 1;
-       }
--#ifdef ROOTTUTDIR
--      ProcessLine(".x " ROOTTUTDIR "/demos.C");
--#else
--      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
--#endif
-+      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
-       return 0;
-    }
- 
-    if (!strncmp(line, ".license", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/LICENSE");
--#else
--      return PrintFile("$(ROOTSYS)/LICENSE");
--#endif
-+      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
-    }
- 
-    if (!strncmp(line, ".credits", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/CREDITS");
--#else
--      return PrintFile("$(ROOTSYS)/README/CREDITS");
--#endif
--
-+      TString credits = TROOT::GetDocDir() + "/CREDITS";
-+      if (gSystem->AccessPathName(credits, kReadPermission))
-+         credits = TROOT::GetDocDir() + "/README/CREDITS";
-+      return PrintFile(credits);
-    }
- 
-    if (!strncmp(line, ".pwd", 4)) {
-diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
---- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -399,21 +399,7 @@
- 
-       TString sname = "system";
-       sname += name;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--      // on iOS etc does not exist and system<name> resides in $ROOTSYS
--      etc = gRootDir;
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       ReadFile(s, kEnvGlobal);
-       delete [] s;
-       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
-@@ -683,17 +669,7 @@
- 
-       TString sname = "system";
-       sname += fRcName;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       rootrcdir = s;
-       delete [] s;
-    } else if (level == kEnvUser) {
-diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
---- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -468,6 +468,10 @@
-       TPH__IsReadingDirs() = kTRUE;
- 
-       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
-+      if (plugindirs.Length() == 0) {
-+         plugindirs = "plugins";
-+         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
-+      }
- #ifdef WIN32
-       dirs = plugindirs.Tokenize(";");
- #else
-diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
---- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
-@@ -543,6 +543,22 @@
-    // Initialize Operating System interface
-    InitSystem();
- 
-+   // Initialize static directory functions
-+   GetRootSys();
-+   GetBinDir();
-+   GetLibDir();
-+   GetIncludeDir();
-+   GetEtcDir();
-+   GetDataDir();
-+   GetDocDir();
-+   GetMacroDir();
-+   GetTutorialsDir();
-+   GetSourceDir();
-+   GetIconPath();
-+   GetTTFFontDir();
-+
-+   gRootDir = GetRootSys().Data();
-+
-    TDirectory::Build();
- 
-    // Initialize interface to CINT C++ interpreter
-@@ -1722,21 +1722,9 @@
-                "after the call to TROOT::InitInterpreter()!");
-       }
- 
--      const char *libcling = 0;
--      char *libclingStorage = 0;
--#ifdef ROOTLIBDIR
--      libcling = ROOTLIBDIR "/libCling."
--# ifdef R__WIN32
--      "dll";
--# else
--      "so";
--# endif
--#else
--      libclingStorage = gSystem->DynamicPathName("libCling");
--      libcling = libclingStorage;
--#endif
-+      char *libcling = gSystem->DynamicPathName("libCling");
-       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
--      delete [] libclingStorage;
-+      delete [] libcling;
- 
-       if (!gInterpreterLib) {
-          TString err = dlerror();
-@@ -2082,22 +2070,7 @@
- #endif
- 
-    TString gitinfo = "gitinfo.txt";
--   char *filename = 0;
--#ifdef ROOTETCDIR
--   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   filename = gSystem->ConcatFileName(etc, gitinfo);
--#endif
-+   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
- 
-    FILE *fp = fopen(filename, "r");
-    if (fp) {
-@@ -2415,17 +2388,9 @@
- #endif
-       if (macroPath.Length() == 0)
- #if !defined(R__WIN32)
--   #ifdef ROOTMACRODIR
--         macroPath = ".:" ROOTMACRODIR;
--   #else
--         macroPath = TString(".:") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".:" + TROOT::GetMacroDir();
- #else
--   #ifdef ROOTMACRODIR
--         macroPath = ".;" ROOTMACRODIR;
--   #else
--         macroPath = TString(".;") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".;" + TROOT::GetMacroDir();
- #endif
-    }
- 
-@@ -2521,14 +2486,252 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+#ifdef ROOTPREFIX
-+static Bool_t IgnorePrefix() {
-+   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
-+   return ignorePrefix;
-+}
-+#endif
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the rootsys directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetRootSys() {
-+#ifdef ROOTPREFIX
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsys;
-+      if (rootsys.IsNull())
-+         rootsys = gSystem->Getenv("ROOTSYS");
-+      if (rootsys.IsNull())
-+         rootsys = gRootDir;
-+      return rootsys;
-+#ifdef ROOTPREFIX
-+   } else {
-+      const static TString rootsys = ROOTPREFIX;
-+      return rootsys;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the binary directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetBinDir() {
-+#ifdef ROOTBINDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootbindir;
-+      if (rootbindir.IsNull()) {
-+         rootbindir = "bin";
-+         gSystem->PrependPathName(GetRootSys(), rootbindir);
-+      }
-+      return rootbindir;
-+#ifdef ROOTBINDIR
-+   } else {
-+      const static TString rootbindir = ROOTBINDIR;
-+      return rootbindir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the library directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetLibDir() {
-+#ifdef ROOTLIBDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootlibdir;
-+      if (rootlibdir.IsNull()) {
-+         rootlibdir = "lib";
-+         gSystem->PrependPathName(GetRootSys(), rootlibdir);
-+      }
-+      return rootlibdir;
-+#ifdef ROOTLIBDIR
-+   } else {
-+      const static TString rootlibdir = ROOTLIBDIR;
-+      return rootlibdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the include directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetIncludeDir() {
-+#ifdef ROOTINCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootincdir;
-+      if (rootincdir.IsNull()) {
-+         rootincdir = "include";
-+         gSystem->PrependPathName(GetRootSys(), rootincdir);
-+      }
-+      return rootincdir;
-+#ifdef ROOTINCDIR
-+   } else {
-+      const static TString rootincdir = ROOTINCDIR;
-+      return rootincdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the sysconfig directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetEtcDir() {
-+#ifdef ROOTETCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootetcdir;
-+      if (rootetcdir.IsNull()) {
-+         rootetcdir = "etc";
-+         gSystem->PrependPathName(GetRootSys(), rootetcdir);
-+      }
-+      return rootetcdir;
-+#ifdef ROOTETCDIR
-+   } else {
-+      const static TString rootetcdir = ROOTETCDIR;
-+      return rootetcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the data directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDataDir() {
-+#ifdef ROOTDATADIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDATADIR
-+   } else {
-+      const static TString rootdatadir = ROOTDATADIR;
-+      return rootdatadir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the documentation directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDocDir() {
-+#ifdef ROOTDOCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDOCDIR
-+   } else {
-+      const static TString rootdocdir = ROOTDOCDIR;
-+      return rootdocdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the macro directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetMacroDir() {
-+#ifdef ROOTMACRODIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootmacrodir;
-+      if (rootmacrodir.IsNull()) {
-+         rootmacrodir = "macros";
-+         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
-+      }
-+      return rootmacrodir;
-+#ifdef ROOTMACRODIR
-+   } else {
-+      const static TString rootmacrodir = ROOTMACRODIR;
-+      return rootmacrodir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Get the tutorials directory in the installation. Static utility function.
- 
--const char *TROOT::GetTutorialsDir()
--{
-+const TString& TROOT::GetTutorialsDir() {
- #ifdef ROOTTUTDIR
--   return ROOTTUTDIR;
--#else
--   static TString tutdir = TString(gRootDir) + "/tutorials";
--   return tutdir;
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString roottutdir;
-+      if (roottutdir.IsNull()) {
-+         roottutdir = "tutorials";
-+         gSystem->PrependPathName(GetRootSys(), roottutdir);
-+      }
-+      return roottutdir;
-+#ifdef ROOTTUTDIR
-+   } else {
-+      const static TString roottutdir = ROOTTUTDIR;
-+      return roottutdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the source directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetSourceDir() {
-+#ifdef ROOTSRCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsrcdir;
-+      if (rootsrcdir.IsNull()) {
-+         rootsrcdir = "src";
-+         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
-+      }
-+      return rootsrcdir;
-+#ifdef ROOTSRCDIR
-+   } else {
-+      const static TString rootsrcdir = ROOTSRCDIR;
-+      return rootsrcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the icon path in the installation. Static utility function.
-+
-+const TString& TROOT::GetIconPath() {
-+#ifdef ROOTICONPATH
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rooticonpath;
-+      if (rooticonpath.IsNull()) {
-+         rooticonpath = "icons";
-+         gSystem->PrependPathName(GetRootSys(), rooticonpath);
-+      }
-+      return rooticonpath;
-+#ifdef ROOTICONPATH
-+   } else {
-+      const static TString rooticonpath = ROOTICONPATH;
-+      return rooticonpath;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the fonts directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetTTFFontDir() {
-+#ifdef TTFFONTDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString ttffontdir;
-+      if (ttffontdir.IsNull()) {
-+         ttffontdir = "fonts";
-+         gSystem->PrependPathName(GetRootSys(), ttffontdir);
-+      }
-+      return ttffontdir;
-+#ifdef TTFFONTDIR
-+   } else {
-+      const static TString ttffontdir = TTFFONTDIR;
-+      return ttffontdir;
-+   }
- #endif
- }
-diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
-@@ -1852,22 +1852,10 @@
-       if (!system) {
-          // Mark the library in $ROOTSYS/lib as system.
-          const char *dirname = DirName(path);
--#ifdef ROOTLIBDIR
--         TString rootlibdir = ROOTLIBDIR;
--#else
--         TString rootlibdir = "lib";
--         PrependPathName(gRootDir, rootlibdir);
--#endif
--         system = R__MatchFilename(rootlibdir,dirname);
-+         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
- 
-          if (!system) {
--#ifdef ROOTBINDIR
--            TString rootbindir = ROOTBINDIR;
--#else
--            TString rootbindir = "bin";
--            PrependPathName(gRootDir, rootbindir);
--#endif
--            system = R__MatchFilename(rootbindir,dirname);
-+            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
-          }
-       }
- 
-@@ -2492,12 +2480,9 @@
- #else
-    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
- #endif
--#ifdef ROOTBINDIR
--   TString builddep = ROOTBINDIR;
--#else
--   TString builddep = TString(gRootDir) + "/bin";
--#endif
--   builddep += "/rmkdepend \"-f";
-+   TString builddep = "rmkdepend";
-+   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
-+   builddep += " \"-f";
-    builddep += depfilename;
-    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
-    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
-@@ -2519,12 +2504,7 @@
-       builddep += "/\" ";
-    }
-    builddep += " -Y -- ";
--#ifndef ROOTINCDIR
--   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
--   rootsysInclude += "/include";
--#else
--   TString rootsysInclude = ROOTINCDIR;
--#endif
-+   TString rootsysInclude = TROOT::GetIncludeDir();
-    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
-    builddep += includes;
-    builddep += defines;
-@@ -3345,27 +3325,17 @@
-       TString name = ".rootmap";
-       TString sname = "system.rootmap";
-       TString file;
--#ifdef ROOTETCDIR
--      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      AssignAndDelete(file, ConcatFileName(etc, sname));
-+      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
-       if (gSystem->AccessPathName(file)) {
-          // for backward compatibility check also $ROOTSYS/system<name> if
-          // $ROOTSYS/etc/system<name> does not exist
--         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
-+         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
-          if (gSystem->AccessPathName(file)) {
-             // for backward compatibility check also $ROOTSYS/<name> if
-             // $ROOTSYS/system<name> does not exist
--            AssignAndDelete(file, ConcatFileName(gRootDir, name));
-+            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
-          }
-       }
--#endif
-       mapfileStream << file << std::endl;
-       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
-       mapfileStream << file << std::endl;
-@@ -3379,23 +3349,9 @@
-    mapfileStream.close();
- 
-    // ======= Generate the rootcling command line
--   TString rcling;
--#ifndef ROOTBINDIR
--   rcling = gSystem->Getenv("ROOTSYS");
--#ifndef R__WIN32
--   rcling += "/bin/";
--#else
--   rcling += "\\bin\\";
--#endif
--#else
--   rcling = ROOTBINDIR;
--#ifndef R__WIN32
--   rcling += "/";
--#else
--   rcling += "\\";
--#endif
--#endif
--   rcling += "rootcling -v0 \"--lib-list-prefix=";
-+   TString rcling = "rootcling";
-+   PrependPathName(TROOT::GetBinDir(), rcling);
-+   rcling += " -v0 \"--lib-list-prefix=";
-    rcling += mapfile;
-    rcling += "\" -f \"";
-    rcling.Append(dict).Append("\" -c -p ");
-diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
---- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
-@@ -66,14 +66,14 @@
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- else()
-   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- endif()
- add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
-diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
---- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
-@@ -1719,17 +1719,7 @@
- {
-    static const char *suffix = "class.rules";
-    TString sname = suffix;
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   gSystem->PrependPathName(etc, sname);
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
- 
-    Int_t res = -1;
- 
-diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
---- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
-@@ -1049,10 +1049,10 @@
-    if (!fromRootCling) {
-       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
- 
--      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
--      clingArgsStorage.push_back(interpInclude);
-+      interpInclude = TROOT::GetEtcDir();
-+      clingArgsStorage.push_back("-I" + interpInclude);
- 
--      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
-+      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
-       if (gSystem->Getenv("ROOT_PCH")) {
-          pchFilename = gSystem->Getenv("ROOT_PCH");
-       }
-@@ -1063,14 +1063,8 @@
-       // clingArgsStorage.push_back("-fmodules");
- 
-       std::string include;
--#ifndef ROOTINCDIR
--      include = gSystem->Getenv("ROOTSYS");
--      include += "/include";
--#else // ROOTINCDIR
--      include = ROOTINCDIR;
--#endif // ROOTINCDIR
--      clingArgsStorage.push_back("-I");
--      clingArgsStorage.push_back(include);
-+      include = TROOT::GetIncludeDir();
-+      clingArgsStorage.push_back("-I" + include);
-       clingArgsStorage.push_back("-Wno-undefined-inline");
-       clingArgsStorage.push_back("-fsigned-char");
-    }
-@@ -1080,7 +1074,11 @@
-            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
-       interpArgs.push_back(iArg->c_str());
- 
--   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
-+#ifdef R__EXTERN_LLVMDIR
-+   TString llvmResourceDir = R__EXTERN_LLVMDIR;
-+#else
-+   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
-+#endif
-    // Add statically injected extra arguments, usually coming from rootcling.
-    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
-         extraArgs && *extraArgs; ++extraArgs) {
-@@ -1094,7 +1092,7 @@
- 
-    fInterpreter = new cling::Interpreter(interpArgs.size(),
-                                          &(interpArgs[0]),
--                                         llvmResourceDir.c_str());
-+                                         llvmResourceDir);
- 
-    if (!fromRootCling) {
-       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
-@@ -1103,13 +1101,13 @@
-       // llvm/clang header files shouldn't be there at all. We have to get rid of
-       // that dependency and avoid copying the header files.
-       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
--      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
-+      TCling::AddIncludePath((interpInclude + "/cling").c_str());
- 
-       // Add the current path to the include path
-       // TCling::AddIncludePath(".");
- 
-       // Add the root include directory and etc/ to list searched by default.
--      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
-+      TCling::AddIncludePath(TROOT::GetIncludeDir());
-    }
- 
-    // Don't check whether modules' files exist.
-@@ -4515,21 +4513,7 @@
- 
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and system<name> resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
- 
-    Int_t ret = ReadRootmapFile(s);
-    if (ret == -3) // old format
-diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
---- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
-@@ -339,10 +339,6 @@
- //______________________________________________________________________________
- llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
- 
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
- enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
- 
- //______________________________________________________________________________
-@@ -549,18 +545,6 @@
-                                  const char* headers[]);
- 
- //______________________________________________________________________________
--// Return the -I needed to find RuntimeUniverse.h
--std::string GetInterpreterExtraIncludePath(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the LLVM / clang resource directory
--std::string GetLLVMResourceDir(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
--//______________________________________________________________________________
- // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
- // that can be used in C++ as a variable name.
- void GetCppName(std::string &output, const char *input);
-diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
---- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -3407,40 +3407,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Return the -I needed to find RuntimeUniverse.h
--
--std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
--{
--#ifdef ROOTETCDIR
--   if (rootbuild) {
--      // Building ROOT, ignore ROOTETCDIR!
--#endif
--      const char* rootsys = getenv("ROOTSYS");
--      if (!rootsys) {
--         Error(0, "Environment variable ROOTSYS not set!");
--         return "-Ietc";
--      }
--      return std::string("-I") + rootsys + "/etc";
--#ifdef ROOTETCDIR
--   }
--   return std::string("-I") + ROOTETCDIR;
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Return the LLVM / clang resource directory
--
--std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
--{
--#ifdef R__EXTERN_LLVMDIR
--   return R__EXTERN_LLVMDIR;
--#else
--   return GetInterpreterExtraIncludePath(rootbuild)
--      .substr(2, std::string::npos) + "/cling";
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Get the template specialisation decl and template decl behind the qualtype
- /// Returns true if successfully found, false otherwise
- 
-@@ -3957,29 +3923,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--
--std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
--{
--   const std::string defaultInclude ("include");
--   if (!rootbuild) {
--#ifndef ROOTINCDIR
--      const char* rootSysContent = getenv("ROOTSYS");
--      if (rootSysContent) {
--         std::string incl_rootsys (rootSysContent);
--         return incl_rootsys + "/" + defaultInclude;
--      } else {
--         Error(0,"Environment variable ROOTSYS not set");
--         return defaultInclude;
--      }
--#else
--      return ROOTINCDIR;
--#endif
--   }
--
--   return defaultInclude;
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Return the dictionary file name for a module
- 
- std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
-diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
---- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -301,17 +301,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
---- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
-@@ -1663,8 +1663,7 @@
-    case kROOT_Load:
-       {
-          const TString fileName = s3("[^\"]*$");
--//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
--         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
-+         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
-          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
- 
- //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
-diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
---- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
-@@ -445,7 +445,9 @@
- 
- static void SetRootSys()
- {
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    void *addr = (void *)SetRootSys;
-    Dl_info info;
-    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
-@@ -458,8 +460,8 @@
-          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
-       }
-    }
--#else
--   return;
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- #endif
-@@ -487,7 +489,9 @@
-    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
-    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
- #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-    // first loaded is the app so set ROOTSYS to app bundle
-    if (i == 1) {
-@@ -513,6 +517,8 @@
-       }
-    }
- #endif
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // when libSystem.B.dylib is loaded we have finished loading all dylibs
-@@ -600,13 +606,8 @@
-    SetRootSys();
- #endif
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0)
--      gRootDir= "/usr/local/root";
--#else
--   gRootDir = ROOTPREFIX;
--#endif
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   gRootDir = "/usr/local/root";
- 
-    return kFALSE;
- }
-@@ -2138,22 +2140,17 @@
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
-          gdbscript = "";
--      } else {
--         gdbscript += " ";
-       }
-    }
-    if (gdbscript == "") {
--#ifdef ROOTETCDIR
--      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
--#else
--      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
--#endif
-+      gdbscript = "gdb-backtrace.sh";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
-          return;
-       }
--      gdbscript += " ";
-    }
-+   gdbscript += " ";
- 
-    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
-    gdbmess = gdbmess.Strip();
-@@ -4471,11 +4468,7 @@
-       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
-       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
-       if (rdynpath.IsNull()) {
--#ifdef ROOTLIBDIR
--         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
--#else
--         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
--#endif
-+         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
-       }
-       TString ldpath;
- #if defined (R__AIX)
-@@ -4496,16 +4489,9 @@
-       else {
-          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
-       }
--
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ":"; dynpath += ROOTLIBDIR;
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ":"; dynpath += TROOT::GetLibDir();
-       }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
--      }
--#endif
-       if (gCling) {
-          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
-       } else
-diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
-@@ -64,27 +64,27 @@
-                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
- endif()
- 
--set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
--configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
-+configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
- 
- if(WIN32)
--  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
- else()
-   if(CXX_HAS_fno_rtti)
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
-   else()
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
-   endif()
- endif()
- 
- ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
--                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
-+                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
-                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
-                               $<TARGET_OBJECTS:Clib>
-                               $<TARGET_OBJECTS:MetaUtils>
-                               $<TARGET_OBJECTS:MetaUtilsLLVM>
-                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                               NOINSTALL)
-+set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
- add_dependencies(rootcling_tmp CLING LLVMRES)
- set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
- set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
-diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
---- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
-@@ -48,7 +48,7 @@
- ROOTCINTEXE     := bin/rootcint$(EXEEXT)
- GENREFLEXEXE    := bin/genreflex$(EXEEXT)
- ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
--ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
-+ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
- 
- ##### Dependencies for all dictionaries
- ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
-diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
---- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -295,12 +295,6 @@
- bool buildingROOT = false;
- #endif
- 
--#ifdef R__EXTERN_LLVMDIR
--# define R__LLVMDIR R__EXTERN_LLVMDIR
--#else
--# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
--#endif
--
- namespace {
-    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
-    template <typename T> struct IsPointerTClassCopy {
-@@ -3977,11 +3971,6 @@
-       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
-    }
- 
--#if defined(ROOTINCDIR)
--   if (!buildingROOT)
--      SetRootSys();
--#endif
--
-    if (ic < argc && !strcmp(argv[ic], "-c")) {
-       // Simply ignore the -c options.
-       ic++;
-@@ -4131,7 +4120,11 @@
-    }
- 
-    ic = nextStart;
--   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
-+#endif
- 
-    std::vector<std::string> pcmArgs;
-    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
-@@ -4140,7 +4133,11 @@
-    }
- 
-    // cling-only arguments
--   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
-+#endif
-    // We do not want __ROOTCLING__ in the pch!
-    if (!onepcm) {
-       clingArgs.push_back("-D__ROOTCLING__");
-@@ -4162,10 +4159,14 @@
-    }
- 
-    std::string resourceDir;
--#ifdef R__LLVMRESOURCEDIR
--   resourceDir = "@R__LLVMRESOURCEDIR@";
-+#ifdef R__EXTERN_LLVMDIR
-+   resourceDir = R__EXTERN_LLVMDIR;
- #else
--   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
-+#ifdef ROOT_STAGE1_BUILD
-+   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
-+#else
-+   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
-+#endif
- #endif
- 
- #ifndef ROOT_STAGE1_BUILD
-@@ -4184,11 +4185,6 @@
- 
-    interp.getOptions().ErrorOut = true;
-    interp.enableRawInput(true);
--#ifdef ROOTINCDIR
--   const bool useROOTINCDIR = !buildingROOT;
--#else
--   const bool useROOTINCDIR = false;
--#endif
-    if (isGenreflex) {
-       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
-          // There was an error.
-@@ -4205,17 +4201,10 @@
-                               "#include <math.h>\n"
-                               "#include <string.h>\n"
-                              ) != cling::Interpreter::kSuccess
--            || (!useROOTINCDIR
--                && interp.declare("#include \"Rtypes.h\"\n"
--                                  "#include \"TClingRuntime.h\"\n"
--                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
--#ifdef ROOTINCDIR
--            || (useROOTINCDIR
--                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
--               )
--#endif
-+            || interp.declare("#include \"Rtypes.h\"\n"
-+                              "#include \"TClingRuntime.h\"\n"
-+                              "#include \"TObject.h\""
-+                             ) != cling::Interpreter::kSuccess
-          ) {
-          // There was an error.
-          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
---- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -37,6 +37,18 @@
- }
- 
- extern "C"
-+const char *TROOT__GetIncludeDir()
-+{
-+   return TROOT::GetIncludeDir().Data();
-+}
-+
-+extern "C"
-+const char *TROOT__GetEtcDir()
-+{
-+   return TROOT::GetEtcDir().Data();
-+}
-+
-+extern "C"
- cling::Interpreter *TCling__GetInterpreter()
- {
-    static bool sInitialized = false;
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
---- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
-@@ -21,6 +21,8 @@
- 
- extern "C" {
-    const char ** *TROOT__GetExtraInterpreterArgs();
-+   const char *TROOT__GetIncludeDir();
-+   const char *TROOT__GetEtcDir();
-    cling::Interpreter *TCling__GetInterpreter();
-    void InitializeStreamerInfoROOTFile(const char *filename);
-    void AddStreamerInfoToROOTFile(const char *normName);
-diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
---- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
-@@ -362,11 +362,7 @@
-          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
-          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
-          if (rdynpath == "") {
--#ifdef ROOTBINDIR
--            rdynpath = ".;"; rdynpath += ROOTBINDIR;
--#else
--            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
--#endif
-+            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
-          }
-          TString path = gSystem->Getenv("PATH");
-          if (path == "")
-@@ -376,15 +372,10 @@
-          }
- 
-       }
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ";"; dynpath += ROOTLIBDIR;
--      }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
-+
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ";"; dynpath += TROOT::GetLibDir();
-       }
--#endif
- 
-       return dynpath;
-    }
-@@ -823,16 +814,8 @@
-       }
- 
-       // determine the fileopen.C file path:
--      TString fileopen;
--#ifndef ROOT_PREFIX
--      fileopen += sys->TWinNTSystem::DriveName(buf);
--      fileopen += ":";
--      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
--      fileopen += "\\macros";
--#else
--      fileopen += ROOTMACRODIR;
--#endif
--      fileopen += "\\fileopen.C";
-+      TString fileopen = "fileopen.C";
-+      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
- 
-       if (regROOTwrite) {
-          // only write to registry if fileopen.C is readable
-@@ -1007,7 +990,9 @@
- 
-    char *buf = new char[MAX_MODULE_NAME32 + 1];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
-+#endif
-    // set ROOTSYS
-    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
-    if (hModCore) {
-@@ -1035,6 +1020,8 @@
-          }
-       }
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    UpdateRegistry(this, buf);
-@@ -1112,23 +1099,17 @@
- 
-    fSigcnt = 0;
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0) {
--      static char lpFilename[MAX_PATH];
--      if (::GetModuleFileName(NULL,               // handle to module to find filename for
--                            lpFilename,           // pointer to buffer to receive module path
--                            sizeof(lpFilename)))  // size of buffer, in characters
--      {
--         const char *dirName = DirName(DirName(lpFilename));
--         gRootDir = StrDup(dirName);
--      } else {
--         gRootDir = 0;
--      }
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   static char lpFilename[MAX_PATH];
-+   if (::GetModuleFileName(
-+          NULL,                   // handle to module to find filename for
-+          lpFilename,             // pointer to buffer to receive module path
-+          sizeof(lpFilename))) {  // size of buffer, in characters
-+      const char *dirName = DirName(DirName(lpFilename));
-+      gRootDir = StrDup(dirName);
-+   } else {
-+      gRootDir = 0;
-    }
--#else
--   gRootDir= ROOTPREFIX;
--#endif
- 
-    // Increase the accuracy of Sleep() without needing to link to winmm.lib
-    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
-diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
---- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
-@@ -50,6 +50,7 @@
- # Define all the header files which should be installed when
- # doing a "make install"
- install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
-+file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
- set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- 
- ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
-diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
---- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
-@@ -24,6 +24,7 @@
- #include "Riostream.h"
- 
- #include "TSystem.h"
-+#include "TROOT.h"
- #include "TObjArray.h"
- #include "TVirtualGeoPainter.h"
- #include "TGeoManager.h"
-@@ -1113,12 +1114,8 @@
- {
-    if (HasRNElements()) return;
-    TGeoElementRN *elem;
--   TString rnf;
--#ifdef ROOTETCDIR
--   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
--#else
--   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+   TString rnf = "RadioNuclides.txt";
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
-    FILE *fp = fopen(rnf, "r");
-    if (!fp) {
-       Error("ImportElementsRN","File RadioNuclides.txt not found");
-diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
-@@ -359,33 +359,33 @@
- 
- static void init_icon_paths()
- {
--   const char *icons = "/icons";
--#ifdef R__WIN32
--      icons = "\\icons";
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
-+#ifndef R__WIN32
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
- #endif
-+   }
- 
--   TString homeIcons = gSystem->HomeDirectory();
--   homeIcons += icons;
--
--   TString rootIcons = gSystem->Getenv("ROOTSYS");
--   rootIcons += icons;
--
--   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
--
--   gIconPaths[0] = StrDup(".");
--   gIconPaths[1] = StrDup(homeIcons.Data());
--   gIconPaths[2] = StrDup(rootIcons.Data());
--   gIconPaths[3] = StrDup(guiIcons.Data());
--
--#ifdef ROOTICONPATH
--   gIconPaths[4] = StrDup(ROOTICONPATH);
-+   Int_t cnt = 0;
-+   Ssiz_t from = 0;
-+   TString token;
-+#ifndef R__WIN32
-+   const char *delim = "/";
-+#else
-+   const char *delim = "\\";
- #endif
--
--#ifdef EXTRAICONPATH
--   gIconPaths[5] = StrDup(EXTRAICONPATH);
--#endif
--
--   gIconPaths[6] = 0;
-+   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
-+      char *path = gSystem->ExpandPathName(token.Data());
-+      if (path) {
-+         gIconPaths[cnt] = path;
-+         cnt++;
-+      }
-+   }
-+   gIconPaths[cnt] = 0;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
---- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
-@@ -811,11 +811,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-@@ -3077,11 +3073,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
---- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
-@@ -195,11 +195,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -225,11 +221,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- 
-    // draw list of classes (if specified)
-    if (classes && strlen(classes)) {
-diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
-@@ -15,12 +15,10 @@
- Interface to the freetype 2 library.
- */
- 
--// RConfigure.h is needed for TTFFONTDIR
--#include "RConfigure.h"
--
- #  include <ft2build.h>
- #  include FT_FREETYPE_H
- #  include FT_GLYPH_H
-+#include "TROOT.h"
- #include "TTF.h"
- #include "TSystem.h"
- #include "TEnv.h"
-@@ -415,13 +413,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                       TTFFONTDIR
--# else
--                                       "$(ROOTSYS)/fonts"
--# endif
--                                      );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (!ttfont) {
-@@ -543,12 +535,7 @@
-       // try to load font (font must be in Root.TTFontPath resource)
-       // to see which fontset we have available
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR
--#else
--                                          "$(ROOTSYS)/fonts"
--#endif
--                                         );
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
-       if (ttfont) {
-          delete [] ttfont;
-diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
-@@ -1567,12 +1567,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR
--#else // TTFFONTDIR
--                                       "$(ROOTSYS)/fonts"
--#endif // TTFFONTDIR
--                                       );
-+                                       TROOT::GetTTFFontDir());
- 
-    for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15 && MustEmbed[fontid-1]) {
-diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
---- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
-@@ -699,13 +699,6 @@
-                           GetSystemMetrics(SM_CYSMICON));
-    HDC dc = tempIcon->handle();
-    DrawIcon (dc, 0, 0, icon);
--#else
--# ifdef ROOTICONPATH
--   gSystem->ExpandPathName(ROOTICONPATH);
--# else
--   gSystem->ExpandPathName("$ROOTSYS/icons/");
--//   tempIcon =new QPixmap (16,16),
--# endif
- #endif
-    return tempIcon;
- }
-@@ -795,13 +788,7 @@
-    static TQtApplication *app = 0;
-    if (!app) {
-       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
--      static TString argvString (
--#ifdef ROOTBINDIR
--             ROOTBINDIR "/root.exe"
--#else
--             "$ROOTSYS/bin/root.exe"
--#endif
--             );
-+      static TString argvString (TROOT::GetBinDir() + "/root.exe");
-       gSystem->ExpandPathName(argvString);
-       static char *argv[] = {(char *)argvString.Data()};
-       static int nArg = 1;
-@@ -989,14 +976,8 @@
-     }
- 
-     if (isXdfSupport && !symbolFontFound) {
--// Load the local ROOT font
--       QString fontdir =
--#ifdef TTFFONTDIR
--         TTFFONTDIR
--#else
--         "$ROOTSYS/fonts"
--#endif
--        ;
-+        // Load the local ROOT font
-+        QString fontdir = TROOT::GetTTFFontDir().Data();
-         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
-         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
-     }
-@@ -1006,12 +987,7 @@
-         fontFamily = fSymbolFontFamily = "Arial";
-         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
-         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
--                 <<
--#ifdef TTFFONTDIR
--               TTFFONTDIR
--#else
--               "$ROOTSYS/fonts"
--#endif
-+                 << TROOT::GetTTFFontDir()
-                  << "\" directory to get the proper support for ROOT TLatex class";
-         // create a custom codec
-         new QSymbolCodec();
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
-@@ -14,6 +14,7 @@
- #include "TGLFontManager.h"
- 
- 
-+#include "TROOT.h"
- #include "TVirtualX.h"
- #include "TMath.h"
- #include "TSystem.h"
-@@ -451,11 +452,7 @@
-    if (it == fFontMap.end())
-    {
-       TString ttpath, file;
--# ifdef TTFFONTDIR
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
--# else
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
--# endif
-+      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
-       {
-          //For extenede we have both ttf and otf.
-          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -669,14 +669,7 @@
-          switch (parm1) {
-          case kGLHelpAbout: {
- #ifdef R__UNIX
--            TString rootx;
--#ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--#else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--#endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -197,13 +197,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                        TTFFONTDIR
--# else
--                                        "$(ROOTSYS)/fonts"
--# endif
--                                        );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (fGLTextFont) delete fGLTextFont;
-diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -84,12 +84,7 @@
- 
-    if (strcmp(appClassName, "proofserv")) {
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR);
--#else
--                                          "$(ROOTSYS)/fonts");
--#endif
--
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
-       if (!ttfont)
-diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
---- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -83,46 +83,29 @@
-    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
-    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
- 
--   TString icon_path;
--   TString mime_file;
--   TString line;
--
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
- #ifndef R__WIN32
--# ifdef ROOTICONPATH
--   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
--                               ROOTICONPATH);
--#  ifdef EXTRAICONPATH
--   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
--#  else
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--#  endif
--# else
--   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
--                                                       gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--# endif
--   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
-+#endif
-+   }
- 
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
-+   TString mime_file = ".root.mimes";
-+   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
-+   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
-    char *mf = gSystem->ExpandPathName(mime_file.Data());
-    if (mf) {
-       mime_file = mf;
-       delete [] mf;
-    }
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--#ifdef ROOTETCDIR
--      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
--#else
--      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
--#else // R__WIN32
--   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
-+   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
-+      mime_file = "root.mimes";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
-+   }
- 
-    // Setup colors...
-    fClient->GetColorByName("white", fWhite);  // white and black always exist
-diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -842,14 +842,7 @@
- void TGTextEditor::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -702,14 +702,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
-@@ -1962,14 +1962,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
---- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
-@@ -1192,14 +1192,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
---- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
-@@ -629,14 +629,7 @@
-                   case kM_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
---- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
-@@ -5812,14 +5812,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+		         TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
---- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
-@@ -1348,18 +1348,7 @@
-    R__LOCKGUARD(GetMakeClassMutex());
- 
-    fPathInfo.fEtcDir = "html";
--
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
--#else
--   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
--# ifdef ROOTPREFIX
--   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
--# else
--   if (getenv("ROOTSYS"))
--      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
--# endif
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
- 
-    return fPathInfo.fEtcDir;
- }
-@@ -1666,12 +1655,7 @@
-                   if (posSpace != std::string::npos)
-                      lib.erase(posSpace);
-                   if (rootLibs.find(lib) == rootLibs.end()) {
--#ifdef ROOTLIBDIR
--                     TString rootlibdir = ROOTLIBDIR;
--#else
--                     TString rootlibdir = "lib";
--                     gSystem->PrependPathName(gRootDir, rootlibdir);
--#endif
-+                     TString rootlibdir = TROOT::GetLibDir();
-                      TString sLib(lib);
-                      if (sLib.Index('.') == -1) {
-                         sLib += ".";
-diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
---- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
-@@ -3047,11 +3047,7 @@
-          return;
-       }
-       // Get Makefile.arch
--#ifdef ROOTETCDIR
--      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
--#else
--      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
--#endif
-+      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(mkarchsrc))
-          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
-       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
-@@ -40,5 +40,5 @@
-   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
--  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
- endif()
-diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
---- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
-@@ -173,15 +173,9 @@
- 
- int main()
- {
--#ifdef ROOTPREFIX
--   string rootbin(ROOTBINDIR);
--   string rootlib(ROOTLIBDIR);
--   string rootetc(ROOTETCDIR);
--#else
--   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
--   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
--   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
--#endif
-+   string rootbin(TROOT::GetBinDir());
-+   string rootlib(TROOT::GetLibDir());
-+   string rootetc(TROOT::GetEtcDir());
- 
-    // If needed, install ROOT notebook files in the user's home directory
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
---- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
-@@ -690,11 +690,9 @@
- .NOTPARALLEL:
- endif
- 
--ifeq ($(USECONFIG),FALSE)
- all: tutorials/hsimple.root
- tutorials/hsimple.root: rootexecs postbin
--	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
--endif
-+	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
- 
- all:            rootexecs postbin
- 	@echo " "
-@@ -1119,7 +1117,7 @@
- 
- $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
- 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
--	@$(MAKEPCH) $@
-+	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
- 
- $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
- 	@mkdir -p $(dir $@)
-@@ -1224,8 +1222,6 @@
- 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
- 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
- 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
--	   (cd $(DESTDIR)$(TUTDIR); \
--	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
- 	fi
- 
- uninstall:
-@@ -1352,7 +1348,6 @@
- 		--exclude proofd.xinetd \
- 		--exclude rootd.rc.d \
- 		--exclude rootd.xinetd \
--		--exclude gitinfo.txt \
- 		$(ROOT_SRCDIR)/etc . ; \
- 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
- 	$(RSYNC) \
-diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
---- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
-@@ -22,9 +22,6 @@
- 
- 
- #include "RConfigure.h"
--// #ifndef ROOTINCDIR
--// #define MATH_NO_PLUGIN_MANAGER
--// #endif
- 
- #include <algorithm>
- #include <functional>
-diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
-@@ -551,11 +551,8 @@
-    const char *fn;
- 
-    if (!FileName[0]) {
--#ifdef ROOTETCDIR
--      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
--#else
--      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+      default_name = "pdg_table.txt";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
-       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
-    } else {
-       fn = FileName;
-diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
---- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
-@@ -23,7 +23,6 @@
- add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
--add_dependencies(rsa move_headers)
- 
- if(ssl)
-   include_directories(${OPENSSL_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
---- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
-@@ -95,18 +95,8 @@
- {
-    // Executables and conf dirs
- 
--   string execdir, etcdir;
--#ifdef ROOTBINDIR
--   execdir = string(ROOTBINDIR);
--#endif
--#ifdef ROOTETCDIR
--   etcdir = string(ROOTETCDIR);
--#endif
--
--   // Define rootbindir if not done already
--   if (!execdir.length())
--      execdir = string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-+   string execdir = TROOT::GetBinDir().Data();
-    if (execdir.length()) {
-       int len = 15 + execdir.length();
-       char *tmp = new char[len+1];
-@@ -117,10 +107,8 @@
-          return -1;
-    }
- 
--   // Define rootetcdir if not done already
--   if (!etcdir.length())
--      etcdir = string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-+   string etcdir = TROOT::GetEtcDir().Data();
-    if (etcdir.length()) {
-       int len = 15 + etcdir.length();
-       char *tmp = new char[len+1];
-diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
---- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -4110,19 +4110,9 @@
-          ::Info("TAuthenticate::ReadRootAuthrc",
-                 "file %s cannot be read (errno: %d)", authrc, errno);
-       delete [] authrc;
--#ifdef ROOTETCDIR
--      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
--#else
--      char etc[1024];
--#ifdef WIN32
--      snprintf(etc, 1024, "%s\\etc", gRootDir);
--#else
--      snprintf(etc, 1024, "%s/etc", gRootDir);
--#endif
--      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
--#endif
-+      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
-       if (gDebug > 2)
--         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
-+         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
-       if (gSystem->AccessPathName(authrc, kReadPermission)) {
-          if (gDebug > 1)
-             ::Info("TAuthenticate::ReadRootAuthrc",
-diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
---- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -147,11 +147,7 @@
-    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
- 
-    if (fJSROOTSYS.Length() == 0) {
--#ifdef ROOTETCDIR
--      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
--#else
--      TString jsdir("$(ROOTSYS)/etc/http");
--#endif
-+      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(jsdir)) {
-          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
-          fJSROOTSYS = ".";
-@@ -162,18 +158,7 @@
- 
-    AddLocation("currentdir/", ".");
-    AddLocation("jsrootsys/", fJSROOTSYS);
--
--   const char *rootsys = gSystem->Getenv("ROOTSYS");
--   if (rootsys != 0) {
--      AddLocation("rootsys/", rootsys);
--   } else {
--#ifdef ROOTPREFIX
--      TString sysdir = ROOTPREFIX;
--#else
--      TString sysdir = "$(ROOTSYS)";
--#endif
--      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
--   }
-+   AddLocation("rootsys/", TROOT::GetRootSys());
- 
-    fDefaultPage = fJSROOTSYS + "/files/online.htm";
-    fDrawPage = fJSROOTSYS + "/files/draw.htm";
-diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
---- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
-@@ -1275,17 +1275,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
---- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
-@@ -335,22 +335,7 @@
-       }
-    }
- 
--   TString confdir;
--#ifndef ROOTPREFIX
--   // try to guess the config directory...
--   if (gSystem->Getenv("ROOTSYS")) {
--      confdir = TString(gSystem->Getenv("ROOTSYS"));
--   } else {
--      // Try to guess it from 'root.exe' path
--      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
--                                     "root.exe", kExecutePermission);
--      confdir = rootexe;
--      confdir.Resize(confdir.Last('/'));
--      delete [] rootexe;
--   }
--#else
--   confdir = TString(ROOTPREFIX);
--#endif
-+   TString confdir = TROOT::GetRootSys();
-    if (!confdir.Length()) {
-       Error("Authenticate", "config dir undefined");
-       return kFALSE;
-diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
---- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
-@@ -2528,10 +2528,13 @@
- 
-    if (argc > 0) {
-       confdir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTPREFIX
-+   }
-+
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-       if (!confdir.length()) {
-+         // try to guess the config directory...
-          if (getenv("ROOTSYS")) {
-             confdir = getenv("ROOTSYS");
-             if (gDebug > 0)
-@@ -2542,31 +2545,26 @@
-                ErrorInfo("main: no config directory specified");
-          }
-       }
--#else
--      confdir = ROOTPREFIX;
--#endif
-+      rootbindir = std::string(confdir).append("/bin");
-+      rootetcdir = std::string(confdir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else {
-+      if (!confdir.length())
-+         confdir = ROOTPREFIX;
-+      rootbindir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-    }
--#ifdef ROOTBINDIR
--   rootbindir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
- #endif
- 
--   // Define rootbindir if not done already
--   if (!rootbindir.length())
--      rootbindir = std::string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-    if (rootbindir.length()) {
-       char *tmp1 = new char[15 + rootbindir.length()];
-       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
-       putenv(tmp1);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp1 = new char[15 + rootetcdir.length()];
-       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
---- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
-@@ -31,7 +31,6 @@
- 
- #---static library needed for rootd and proofd --------------------------------------------
- add_library(rpdutil STATIC ${rpdutilsrcs})
--add_dependencies(rpdutil move_headers)
- 
- ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
- 
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
---- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
-@@ -436,17 +436,7 @@
-    if (fgWrksMax == -2) {
-       // Find the max number of workers, if any
-       TString sysname = "system.rootrc";
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sysname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
-       TEnv sysenv(0);
-       sysenv.ReadFile(s, kEnvGlobal);
-       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
-@@ -792,17 +782,9 @@
-       return -1;
-    }
-    // ROOTSYS
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
--#else
--   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
-    // Conf dir
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
--#else
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
-    // TMPDIR
-    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
-    // Log file in the log dir
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
---- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
-@@ -3026,13 +3026,7 @@
- #ifdef R__UNIX
-    // Add bindir to PATH
-    TString path(gSystem->Getenv("PATH"));
--   TString bindir;
--# ifdef ROOTBINDIR
--   bindir = ROOTBINDIR;
--# else
--   bindir = gSystem->Getenv("ROOTSYS");
--   if (!bindir.IsNull()) bindir += "/bin";
--# endif
-+   TString bindir(TROOT::GetBinDir());
-    // Augment PATH, if required
-    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
-    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
-diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
---- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
-@@ -78,13 +78,8 @@
- {
-    // Command to be executed
-    TString cmd;
--#ifdef R__HAVE_CONFIG
-    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
--#else
--   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
--#endif
-+            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
-             gSystem->GetPid(), gDebug);
-    // Execute
-    if (gSystem->Exec(cmd) != 0) {
-diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
---- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
-@@ -14,7 +14,7 @@
- # Generation and installation of the PAR files required by the benchmark 
- add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
--add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
-+add_dependencies(ProofBenchPARFiles move_artifacts)
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
-     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
-@@ -1331,11 +1331,7 @@
-       // Is it the default selector?
-       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("MakeDataSet", "uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
-@@ -26,6 +26,7 @@
- #include "TMap.h"
- #include "TProof.h"
- #include "TProofBenchTypes.h"
-+#include "TROOT.h"
- 
- 
- ClassImp(TProofBenchDataSet)
-@@ -145,11 +146,7 @@
-    TString selName("TSelHandleDataSet");
-    if (!TClass::GetClass(selName)) {
-       // Load the parfile
--#ifdef R__HAVE_CONFIG
--      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-       Info("Handle", "Uploading '%s' ...", par.Data());
-       if (fProof->UploadPackage(par) != 0) {
-          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
-@@ -275,11 +275,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelCPUDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
-@@ -163,11 +163,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelDataDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
---- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
-@@ -1005,49 +1005,48 @@
- 
-    if (argc > 0) {
-       gConfDir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTDATADIR
--      if (getenv("ROOTSYS")) {
--         gConfDir = getenv("ROOTSYS");
--         if (gDebug > 0)
--            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
--                      gConfDir.c_str());
--      } else {
--         Error(ErrFatal, -1, "main: no config directory specified");
--      }
--#else
--      gConfDir = ROOTDATADIR;
--#endif
-    }
--#ifdef ROOTBINDIR
--   gRootBinDir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
--#endif
- 
--   // Define gRootBinDir if not done already
--   if (!gRootBinDir.length())
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-+      if (!gConfDir.length()) {
-+         // try to guess the config directory...
-+         if (getenv("ROOTSYS")) {
-+            gConfDir = getenv("ROOTSYS");
-+            if (gDebug > 0)
-+               ErrorInfo("main: no config directory specified using"
-+                         " ROOTSYS (%s)", gConfDir.c_str());
-+         } else {
-+            Error(ErrFatal, -1, "main: no config directory specified");
-+         }
-+      }
-       gRootBinDir = std::string(gConfDir).append("/bin");
-+      rootetcdir = std::string(gConfDir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else  {
-+      if (!gConfDir.length())
-+         gConfDir = ROOTPREFIX;
-+      gRootBinDir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-+   }
-+#endif
- 
--   // make sure it contains the executable we want to run
-+   // make sure gRootBinDir contains the executable we want to run
-    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
-    if (access(arg0.c_str(), X_OK) == -1) {
-       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
-                         gConfDir.c_str());
-    }
--   // Make it available to all the session via env
-+   // Make gRootBinDir available to all the session via env
-    if (gRootBinDir.length()) {
-       char *tmp = new char[15 + gRootBinDir.length()];
-       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
-       putenv(tmp);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(gConfDir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp = new char[15 + rootetcdir.length()];
-       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
---- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
-@@ -384,11 +384,19 @@
-    } else {
-       // Check the ROOT dirs
-       if (fROOT.size() <= 0) {
-+         XrdOucString dir, bd, ld, id, dd;
- #ifdef R__HAVE_CONFIG
--         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
--                      id(ROOTINCDIR), dd(ROOTDATADIR);
--#else
--         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
-+         if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+            dir = getenv("ROOTSYS");
-+#ifdef R__HAVE_CONFIG
-+         else {
-+            dir = ROOTPREFIX;
-+            bd = ROOTBINDIR;
-+            ld = ROOTLIBDIR;
-+            id = ROOTINCDIR;
-+            dd = ROOTDATADIR;
-+         }
- #endif
-          // None defined: use ROOTSYS as default, if any; otherwise we fail
-          if (dir.length() > 0) {
-diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
---- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
-@@ -25,10 +25,4 @@
-                             WORLD_EXECUTE WORLD_READ
-                 DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
---- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
-@@ -8,9 +8,4 @@
- ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
-                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
- 
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
---- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -200,7 +200,6 @@
-    return 0;
- }
- 
--#ifndef ROOTPREFIX
- static const char *GetExePath()
- {
-    static std::string exepath;
-@@ -247,7 +246,6 @@
-       delete [] ep;
-    }
- }
--#endif
- 
- static void SetDisplay()
- {
-@@ -296,7 +294,9 @@
- 
- static void SetLibraryPath()
- {
--#ifndef ROOTLIBDIR
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Set library path for the different platforms.
- 
-    char *msg;
-@@ -343,6 +343,8 @@
-    }
- #  endif
-    putenv(msg);
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- 
-@@ -440,7 +442,9 @@
-    char **argvv;
-    char  arg0[kMAXPATHLEN];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Try to set ROOTSYS depending on pathname of the executable
-    SetRootSys();
- 
-@@ -449,6 +453,8 @@
-               argv[0], argv[0]);
-       return 1;
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // In batch mode don't show splash screen, idem for no logo mode,
-@@ -473,23 +479,20 @@
-    if (notebook) {
-       // Build command
- #ifdef ROOTBINDIR
--      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
--#else
--      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+      if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+#ifdef ROOTBINDIR
-+      else
-+         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
- #endif
- 
-       // Execute ROOT notebook binary
-       execl(arg0, arg0, NULL);
--  
-+
-       // Exec failed
--#ifndef ROOTBINDIR
--      fprintf(stderr,
--              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
--              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
--#else
--      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
--              argv[0], ROOTBINDIR, ROOTNBBINARY);
--#endif
-+      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
-+              argv[0], arg0);
- 
-       return 1;
-    }
-@@ -586,9 +589,12 @@
-    // Build argv vector
-    argvv = new char* [argc+2];
- #ifdef ROOTBINDIR
--   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
--#else
--   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+   if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+#ifdef ROOTBINDIR
-+   else
-+      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
- #endif
-    argvv[0] = arg0;
-    argvv[1] = (char *) "-splash";
-@@ -604,14 +610,8 @@
-    execv(arg0, argvv);
- 
-    // Exec failed
--#ifndef ROOTBINDIR
--   fprintf(stderr,
--           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
--           argv[0], getenv("ROOTSYS"), ROOTBINARY);
--#else
--   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
--           argv[0], ROOTBINDIR, ROOTBINARY);
--#endif
-+   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
-+           argv[0], arg0);
- 
-    return 1;
- }
-diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
---- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -475,14 +475,7 @@
-                   case M_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
---- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -1270,14 +1270,7 @@
- void TGRootIDE::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
-@@ -48,11 +48,7 @@
- ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
-@@ -31,11 +31,7 @@
- ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
---- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
-@@ -2049,14 +2049,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
---- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
-@@ -1017,14 +1017,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
diff --git a/root-testfiles.sh b/root-testfiles.sh
deleted file mode 100755
index e7160b8..0000000
--- a/root-testfiles.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-SITE="http://root.cern.ch/files"
-
-mkdir files
-pushd files
-
-wget -N ${SITE}/aleph_ref_4.root
-wget -N ${SITE}/aleph.root
-wget -N ${SITE}/alice3_ref_4.root
-wget -N ${SITE}/alice3.root
-wget -N ${SITE}/ams_ref_3.root
-wget -N ${SITE}/ams.root
-wget -N ${SITE}/babar2_ref_3.root
-wget -N ${SITE}/babar2.root
-wget -N ${SITE}/barres_ref_3.root
-wget -N ${SITE}/barres.root
-wget -N ${SITE}/belle_ref_3.root
-wget -N ${SITE}/belle.root
-wget -N ${SITE}/bes_ref_3.root
-wget -N ${SITE}/bes.root
-wget -N ${SITE}/brahms_ref_3.root
-wget -N ${SITE}/brahms.root
-wget -N ${SITE}/btev_ref_3.root
-wget -N ${SITE}/btev.root
-wget -N ${SITE}/cdf_ref_4.root
-wget -N ${SITE}/cdf.root
-wget -N ${SITE}/chambers_ref_3.root
-wget -N ${SITE}/chambers.root
-wget -N ${SITE}/cms_ref_3.root
-wget -N ${SITE}/cms.root
-wget -N ${SITE}/dubna_ref_3.root
-wget -N ${SITE}/dubna.root
-wget -N ${SITE}/e907_ref_3.root
-wget -N ${SITE}/e907.root
-wget -N ${SITE}/felix_ref_3.root
-wget -N ${SITE}/felix.root
-wget -N ${SITE}/ganil_ref_3.root
-wget -N ${SITE}/ganil.root
-wget -N ${SITE}/gem_ref_3.root
-wget -N ${SITE}/gem.root
-wget -N ${SITE}/hades2_ref_4.root
-wget -N ${SITE}/hades2.root
-wget -N ${SITE}/hermes_ref_3.root
-wget -N ${SITE}/hermes.root
-wget -N ${SITE}/integral_ref_3.root
-wget -N ${SITE}/integral.root
-wget -N ${SITE}/lhcbfull_ref_3.root
-wget -N ${SITE}/lhcbfull.root
-wget -N ${SITE}/na35_ref_3.root
-wget -N ${SITE}/na35.root
-wget -N ${SITE}/na47_ref_3.root
-wget -N ${SITE}/na47.root
-wget -N ${SITE}/na49_ref_3.root
-wget -N ${SITE}/na49.root
-wget -N ${SITE}/p326_ref_3.root
-wget -N ${SITE}/p326.root
-wget -N ${SITE}/phenix_ref_3.root
-wget -N ${SITE}/phenix.root
-wget -N ${SITE}/phobos2_ref_4.root
-wget -N ${SITE}/phobos2.root
-wget -N ${SITE}/sdc_ref_3.root
-wget -N ${SITE}/sdc.root
-wget -N ${SITE}/sld_ref_3.root
-wget -N ${SITE}/sld.root
-wget -N ${SITE}/star_ref_3.root
-wget -N ${SITE}/star.root
-wget -N ${SITE}/tesla_ref_3.root
-wget -N ${SITE}/tesla.root
-wget -N ${SITE}/wa91_ref_3.root
-wget -N ${SITE}/wa91.root
-
-wget -N ${SITE}/europe.root
-wget -N ${SITE}/linearIO.root
-wget -N ${SITE}/stressHistogram.5.18.00.root
-wget -N ${SITE}/stressRooFit_v534_ref.root
-wget -N ${SITE}/tmva_class_example.root
-wget -N ${SITE}/tmva_reg_example.root
-wget -N ${SITE}/usa.root
-
-for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
-
-popd
-
-tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-tildes.patch b/root-tildes.patch
deleted file mode 100644
index bb03674..0000000
--- a/root-tildes.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
---- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
-@@ -810,7 +810,7 @@
- ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
- /// ~~~
- ///  Note: We recommend using the method TDirectory::GetObject:
--/// ~~~ {.cpp}~
-+/// ~~~ {.cpp}
- ///      MyClass *obj = 0;
- ///      directory->GetObject("some object inheriting from MyClass",obj);
- ///      if (obj) { ... we found what we are looking for ... }
-diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
---- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
-@@ -1040,7 +1040,7 @@
- ///
- ///       TQObject::Connect("TGButton", "Clicked()",
- ///                         "TH2F", myHist, "Draw(Option_t*)");
--///~~~
-+/// ~~~
- /// cl == 0 - corresponds to function (interpereted or global)
- ///           the name of the function is defined by the slot string,
- ///           parameter receiver should be 0.
-diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -2677,7 +2677,7 @@
- /// We allow them to type:
- /// ~~~ {.cpp}
- ///  .X myfunc.C++(arg1,arg2)
--///  ~~~
-+/// ~~~
- /// or
- /// ~~~ {.cpp}
- ///  .X myfunc.C+(arg1,arg2)
-@@ -3843,7 +3843,7 @@
- /// the use of ';' to separate several instructions. However, shell specific
- /// construct should be avoided. In particular this description can contain
- /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- /// Five special variables will be expanded before execution:
- ///   Variable name       Expands to
- ///   -------------       ----------
-@@ -3915,7 +3915,7 @@
- /// IncludePath should contain the list of compiler flags to indicate where
- /// to find user defined header files. It is used to expand $IncludePath in
- /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
--/// ~~~ {.cpp}
-+///  ~~~ {.cpp}
- ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
- ///  ~~~
- /// the default value of IncludePath on Unix is:
-diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
---- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -663,7 +663,7 @@
- /// Create an array of clone objects of class cl. The class must inherit from
- /// TObject. If the class defines an own operator delete(), make sure that
- /// it looks like this:
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///    void MyClass::operator delete(void *vp)
- ///    {
- ///       if ((Long_t) vp != TObject::GetDtorOnly())
-diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
---- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
-@@ -321,7 +321,7 @@
- /// ~~~
- /// Otherwise override the `Print(Option_t *option, Int_t)`
- /// variant. Remember to declare:
--/// ~~~ {.cpp]
-+/// ~~~ {.cpp}
- ///   using TCollection::Print;
- /// ~~~
- /// somewhere close to the method declaration.
-diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
---- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
-@@ -189,7 +189,7 @@
-  int i;
-  i = TMath::LocMin(10, &v[0]);
-  std::cout << v[i] << std::endl;
-- ```
-+```
-  
- Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
- 
-@@ -233,7 +233,7 @@
- 
-  // old-style
-  mean = TMath::Mean(n, &v[0], &w[0]);
-- ```
-+```
-  
- ### Special and Statistical Functions.
- 
-diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
-@@ -5964,7 +5964,7 @@
- ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
- ///       TImage *im2 = TImage::Create();
- ///       im2->SetImageBuffer(&buf, TImage::kXpm);
--///  ~~~
-+/// ~~~
- ///      2.  xpm as an array of strings (pre-parsed)
- /// ~~~ {.cpp}
- ///    For example:
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -132,7 +132,7 @@
- because we clear only the pads and not the main canvas.
- Note that `c1->Update` must be called at the end of the first picture.
- 
--~~~ {.cpp}
-+ ~~~ {.cpp}
-      {
-         TFile *f1 = new TFile("hsimple.root");
-         TCanvas *c1 = new TCanvas("c1");
-diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
---- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -330,7 +330,7 @@
- ///    | 2-----|-3
- ///    |/      |/
- ///    1-------0
--///~~~
-+/// ~~~
- 
- void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
- {
-diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
---- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -71,7 +71,7 @@
- To change attributes of the rulers attached to the current Pad, one may
- query its pointer first:
- 
--~~~ {.cpp]
-+~~~ {.cpp}
- TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
- if (axis) {
-   TAxis3D::ToggleRulers()     // To pop axes down
-diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
---- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
-@@ -80,7 +80,7 @@
- many times.
- 
- The following very simple macro shows how to build and fill a `TH2Poly`:
--~~~ {.cpp]
-+~~~ {.cpp}
- {
-     TH2Poly *h2p = new TH2Poly();
- 
-diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
---- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
-@@ -2584,9 +2584,9 @@
- ///     T->Fill(); //loop
- ///     file->Write();
- ///     file->Close();
--///~~~
-+/// ~~~
- /// but do the following:
--///~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///     TFile *file = new TFile("myfile.root","recreate");
- ///     TTree *T = new TTree("T","title");
- ///     T->Fill(); //loop
-@@ -6487,7 +6487,7 @@
- /// ~~~ {.cpp}
- ///     TPrincipal *principal =
- ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
--///  ~~~
-+/// ~~~
- 
- TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
- {
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
-@@ -3004,6 +3004,7 @@
- /// The function return the status of the fit in the following form
- /// ~~~{.cpp}
- ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
-+/// ~~~
- /// -  The fitResult is 0 is the fit is OK.
- /// -  The fitResult is negative in case of an error not connected with the fit.
- /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
deleted file mode 100644
index 20209ec..0000000
--- a/root-tmath-doc.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
---- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
-@@ -359,9 +359,9 @@
- /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
- /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
- ///
--///  Begin_Latex
--///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
--///   End_Latex
-+///  \f[
-+///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
-+///  \f]
- ///
- ///
- ///--- Nve 14-nov-1998 UU-SAP Utrecht
-@@ -559,15 +559,16 @@
- /// see TMath::PoissonI to get a non-smooth function.
- /// Note that for large values of par, it is better to call
- ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
-+///   poisson->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Poisson(Double_t x, Double_t par)
- {
--/*
--<img src="gif/Poisson.gif">
--*/
--//End_Html
--
-    if (x<0)
-       return 0;
-    else if (x == 0.0)
-@@ -587,15 +588,17 @@
- /// compute the Poisson distribution function for (x,par)
- /// This is a non-smooth function.
- /// This function is equivalent to ROOT::Math::poisson_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
-+///   poissoni->SetNpx(1000);
-+///   poissoni->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::PoissonI(Double_t x, Double_t par)
- {
--/*
--<img src="gif/PoissonI.gif">
--*/
--//End_Html
--
-    Int_t ix = Int_t(x);
-    return Poisson(ix,par);
- }
-@@ -630,36 +633,33 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculates the Kolmogorov distribution function,
--///Begin_Html
-+/// \f[
-+/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
-+/// \f]
-+/// which gives the probability that Kolmogorov's test statistic will exceed
-+/// the value z assuming the null hypothesis. This gives a very powerful
-+/// test for comparing two one-dimensional distributions.
-+/// see, for example, Eadie et al, "statistocal Methods in Experimental
-+/// Physics', pp 269-270).
-+///
-+/// This function returns the confidence level for the null hypothesis, where:
-+///   z = dn*sqrt(n), and
-+///   dn  is the maximum deviation between a hypothetical distribution
-+///       function and an experimental distribution with
-+///   n   events
-+///
-+/// NOTE: To compare two experimental distributions with m and n events,
-+///       use z = sqrt(m*n/(m+n))*dn
-+///
-+/// Accuracy: The function is far too accurate for any imaginable application.
-+///           Probabilities less than 10^-15 are returned as zero.
-+///           However, remember that the formula is only valid for "large" n.
-+/// Theta function inversion formula is used for z <= 1
-+///
-+/// This function was translated by Rene Brun from PROBKL in CERNLIB.
- 
- Double_t TMath::KolmogorovProb(Double_t z)
- {
--   /*
--   <img src="gif/kolmogorov.gif">
--   */
--   //End_Html
--   // which gives the probability that Kolmogorov's test statistic will exceed
--   // the value z assuming the null hypothesis. This gives a very powerful
--   // test for comparing two one-dimensional distributions.
--   // see, for example, Eadie et al, "statistocal Methods in Experimental
--   // Physics', pp 269-270).
--   //
--   // This function returns the confidence level for the null hypothesis, where:
--   //   z = dn*sqrt(n), and
--   //   dn  is the maximum deviation between a hypothetical distribution
--   //       function and an experimental distribution with
--   //   n    events
--   //
--   // NOTE: To compare two experimental distributions with m and n events,
--   //       use z = sqrt(m*n/(m+n))*dn
--   //
--   // Accuracy: The function is far too accurate for any imaginable application.
--   //           Probabilities less than 10^-15 are returned as zero.
--   //           However, remember that the formula is only valid for "large" n.
--   // Theta function inversion formula is used for z <= 1
--   //
--   // This function was translated by Rene Brun from PROBKL in CERNLIB.
--
-    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
-    const Double_t w = 2.50662827;
-    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
-@@ -2254,15 +2254,40 @@
- /// The definition can be found in "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
- /// use now implementation in ROOT::Math::gamma_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
-+///
-+///   gdist->SetParameters(0.5, 0., 1.);
-+///   gdist->SetLineColor(2);
-+///   TF1 *gdist1 = gdist->DrawCopy("L");
-+///   gdist->SetParameters(1.0, 0., 1.);
-+///   gdist->SetLineColor(3);
-+///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(2.0, 0., 1.);
-+///   gdist->SetLineColor(4);
-+///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(5.0, 0., 1.);
-+///   gdist->SetLineColor(6);
-+///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
- {
--   /*
--   <img src="gif/gammadist.gif">
--   */
--   //End_Html
--
-    if ((x<mu) || (gamma<=0) || (beta <=0)) {
-       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
-       return 0;
-@@ -2308,21 +2333,47 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Computes the density of LogNormal distribution at point x.
- /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
--/// sigma is the shape parameter
--/// theta is the location parameter
--/// m is the scale parameter
-+/// - sigma is the shape parameter
-+/// - theta is the location parameter
-+/// - m is the scale parameter
- /// The formula was taken from "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
- /// Implementation using ROOT::Math::lognormal_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
-+///   logn->SetMinimum(1e-3);
-+///
-+///   logn->SetParameters(0.5, 0., 1.);
-+///   logn->SetLineColor(2);
-+///   TF1 *logn1 = logn->DrawCopy("L");
-+///   logn->SetParameters(1.0, 0., 1.);
-+///   logn->SetLineColor(3);
-+///   TF1 *logn2 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(2.0, 0., 1.);
-+///   logn->SetLineColor(4);
-+///   TF1 *logn3 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(5.0, 0., 1.);
-+///   logn->SetLineColor(6);
-+///   TF1 *logn4 = logn->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
- {
--   /*
--   <img src="gif/lognormal.gif">
--   */
--   //End_Html
--
-    if ((x<theta) || (sigma<=0) || (m<=0)) {
-       Error("TMath::Lognormal", "illegal parameter values");
-       return 0;
-@@ -2615,15 +2666,39 @@
- ///density function computed numerically in an accurate way: our approximation
- ///shows a difference of less than 3% around the peak of the density function, slowly
- ///increasing going towards the extreme tails to the right and to the left"
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
-+///
-+///   vavilov->SetParameters(0.5, 0.);
-+///   vavilov->SetLineColor(2);
-+///   TF1 *vavilov1 = vavilov->DrawCopy("L");
-+///   vavilov->SetParameters(0.3, 0.);
-+///   vavilov->SetLineColor(3);
-+///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.2, 0.);
-+///   vavilov->SetLineColor(4);
-+///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.1, 0.);
-+///   vavilov->SetLineColor(6);
-+///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
-+///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
- {
--/*
--<img src="gif/Vavilov.gif">
--*/
--//End_Html
--
-    Double_t *ac = new Double_t[14];
-    Double_t *hc = new Double_t[9];
- 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
deleted file mode 100644
index 95090d6..0000000
--- a/root-tprincipal-doc.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
-index 76bb5d4..d5bab47 100644
---- a/hist/hist/src/TPrincipal.cxx
-+++ b/hist/hist/src/TPrincipal.cxx
-@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
- error \f$E_N\f$ is minimized.
- 
- The transformation matrix to go from the pattern space to the feature
--space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
-+space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
- \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
- \f[
-   \mathsf{T} = \left[
-@@ -207,10 +207,6 @@ in the transformed space.
- Christian Holm August 2000, CERN
- */
- 
--// $Id$
--// $Date: 2006/05/24 14:55:26 $
--// $Author: brun $
--
- #include "TPrincipal.h"
- 
- #include "TVectorD.h"
-@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
- ClassImp(TPrincipal);
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Empty CTOR, Do not use.
-+/// Empty constructor. Do not use.
- 
- TPrincipal::TPrincipal()
-   : fMeanValues(0),
-@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Ctor. Argument is number of variables in the sample of data
-+/// Constructor. Argument is number of variables in the sample of data
- /// Options are:
--///   N       Normalize the covariance matrix (default)
--///   D       Store input data (default)
-+///  - N       Normalize the covariance matrix (default)
-+///  - D       Store input data (default)
- ///
- /// The created object is  named "principal" by default.
- 
-@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///copy constructor
-+/// Copy constructor.
- 
- TPrincipal::TPrincipal(const TPrincipal& pr) :
-   TNamed(pr),
-@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///assignement operator
-+/// Assignment operator.
- 
- TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- {
-@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// destructor
-+/// Destructor.
- 
- TPrincipal::~TPrincipal()
- {
-@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Html
-+/// Add a data point and update the covariance matrix. The input
-+/// array must be <TT>fNumberOfVariables</TT> long.
-+///
-+///
-+/// The Covariance matrix and mean values of the input data is calculated
-+/// on the fly by the following equations:
-+///
-+/// \f[
-+/// \left<x_i\right>^{(0)}  = x_{i0}
-+/// \f]
-+///
-+///
-+/// \f[
-+/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
-+/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
-+/// \f]
-+///
-+/// \f[
-+/// C_{ij}^{(0)} = 0
-+/// \f]
-+///
-+///
-+///
-+/// \f[
-+/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
-+/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
-+///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
-+/// - \frac1n C_{ij}^{(n-1)}
-+/// \f]
-+///
-+/// since this is a really fast method, with no rounding errors (please
-+/// refer to CERN 72-21 pp. 54-106).
-+///
-+///
-+/// The data is stored internally in a <TT>TVectorD</TT>, in the following
-+/// way:
-+///
-+/// \f[
-+/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
-+///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
-+/// \f]
-+///
-+/// With \f$P\f$ as defined in the class description.
- 
- void TPrincipal::AddRow(const Double_t *p)
- {
--  /*
--     </PRE>
--Add a data point and update the covariance matrix. The input
--array must be <TT>fNumberOfVariables</TT> long.
--
--<P>
--The Covariance matrix and mean values of the input data is caculated
--on the fly by the following equations:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(0)}  = x_{i0}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="90" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img36.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(0)} = x_{i0}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
--+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="302" HEIGHT="42" BORDER="0"
-- SRC="gif/principal_img37.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
--+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="62" HEIGHT="34" BORDER="0"
-- SRC="gif/principal_img38.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
--  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="504" HEIGHT="43" BORDER="0"
-- SRC="gif/principal_img39.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{i...
--...\left&lt;x_j\right&gt;^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--since this is a really fast method, with no rounding errors (please
--refer to CERN 72-21 pp. 54-106).
--
--<P>
--The data is stored internally in a <TT>TVectorD</TT>, in the following
--way:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="319" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img40.gif"
-- ALT="\begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--With <IMG
-- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
-- SRC="gif/principal_img6.gif"
-- ALT="$P$"> as defined in the class description.
--     <PRE>
--  */
--  // End_Html
-    if (!p)
-       return;
- 
-@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Generates the file <filename>, with .C appended if it does
-+/// Generates the file `<filename>`, with `.C` appended if it does
- /// argument doesn't end in .cxx or .C.
- ///
- /// The file contains the implementation of two functions
--///
-+/// ~~~ {.cpp}
- ///    void X2P(Double_t *x, Double *p)
- ///    void P2X(Double_t *p, Double *x, Int_t nTest)
--///
--/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
-+/// ~~~
-+/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
- /// respectively. Please refer to these methods.
- ///
- /// Further, the static variables:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    gNVariables
- ///    Double_t gEigenValues[]
- ///    Double_t gEigenVectors[]
- ///    Double_t gMeanValues[]
- ///    Double_t gSigmaValues[]
--///
-+/// ~~~
- /// are initialized. The only ROOT header file needed is Rtypes.h
- ///
- /// See TPrincipal::MakeRealCode for a list of options
-@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Make histograms of the result of the analysis.
- /// The option string say which histograms to create
--///      X         Histogram original data
--///      P         Histogram principal components corresponding to
--///                original data
--///      D         Histogram the difference between the original data
--///                and the projection of principal unto a lower
--///                dimensional subspace (2D histograms)
--///      E         Histogram the eigenvalues
--///      S         Histogram the square of the residues
--///                (see TPrincipal::SumOfSquareResidues)
--/// The histograms will be named <name>_<type><number>, where <name>
--/// is the first argument, <type> is one of X,P,D,E,S, and <number>
-+///     - X         Histogram original data
-+///     - P         Histogram principal components corresponding to
-+///                 original data
-+///     - D         Histogram the difference between the original data
-+///                 and the projection of principal unto a lower
-+///                 dimensional subspace (2D histograms)
-+///     - E         Histogram the eigenvalues
-+///     - S         Histogram the square of the residues
-+///                 (see `TPrincipal::SumOfSquareResiduals`)
-+/// The histograms will be named `<name>_<type><number>`, where `<name>`
-+/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
- /// is the variable.
- 
- void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
-@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD: Normalize the covariance matrix
-+/// Normalize the covariance matrix
- 
- void TPrincipal::MakeNormalised()
- {
-@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
- ////////////////////////////////////////////////////////////////////////////////
- /// Generate the file <classname>PCA.cxx which contains the
- /// implementation of two methods:
--///
-+/// ~~~ {.cpp}
- ///    void <classname>::X2P(Double_t *x, Double *p)
- ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
--///
-+/// ~~~
- /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
--/// respectivly. Please refer to these methods.
-+/// respectively. Please refer to these methods.
- ///
- /// Further, the public static members:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    <classname>::fgNVariables
- ///    Double_t <classname>::fgEigenValues[]
- ///    Double_t <classname>::fgEigenVectors[]
- ///    Double_t <classname>::fgMeanValues[]
- ///    Double_t <classname>::fgSigmaValues[]
--///
-+/// ~~~
- /// are initialized, and assumed to exist. The class declaration is
- /// assumed to be in <classname>.h and assumed to be provided by the
- /// user.
-@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
- /// See TPrincipal::MakeRealCode for a list of options
- ///
- /// The minimal class definition is:
--///
-+/// ~~~ {.cpp}
- ///   class <classname> {
- ///   public:
- ///     static Int_t    fgNVariables;
-@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
- ///     void X2P(Double_t *x, Double_t *p);
- ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
- ///   };
--///
-+/// ~~~
- /// Whether the methods <classname>::X2P and <classname>::P2X should
- /// be static or not, is up to the user.
- 
-@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Perform the principal components analysis.
- /// This is done in several stages in the TMatrix::EigenVectors method:
--/// * Transform the covariance matrix into a tridiagonal matrix.
--/// * Find the eigenvalues and vectors of the tridiagonal matrix.
-+///  - Transform the covariance matrix into a tridiagonal matrix.
-+///  - Find the eigenvalues and vectors of the tridiagonal matrix.
- 
- void TPrincipal::MakePrincipals()
- {
-@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
- /// This is the method that actually generates the code for the
- /// transformations to and from feature space and pattern space
- /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
-@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
- ////////////////////////////////////////////////////////////////////////////////
- /// Print the statistics
- /// Options are
--///      M            Print mean values of original data
--///      S            Print sigma values of original data
--///      E            Print eigenvalues of covariance matrix
--///      V            Print eigenvectors of covariance matrix
-+///  - M            Print mean values of original data
-+///  - S            Print sigma values of original data
-+///  - E            Print eigenvalues of covariance matrix
-+///  - V            Print eigenvectors of covariance matrix
- /// Default is MSE
- 
- void TPrincipal::Print(Option_t *opt) const
-@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
--/// Begin_html
-+/// Calculates the sum of the square residuals, that is
-+///
-+/// \f[
-+/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
-+/// \f]
-+///
-+/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
-+/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
-+/// \f$x_i\f$, the original data; I.e., the square distance to the space
-+/// spanned by \f$N\f$ eigenvectors.
- 
- void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
- {
--   /*
--    </PRE>
--    Calculates the sum of the square residuals, that is
--    <BR><P></P>
--    <DIV ALIGN="CENTER">
--
--    <!-- MATH
--    \begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}
--    -->
--
--
--    <IMG
--    WIDTH="147" HEIGHT="58" BORDER="0"
--    SRC="gif/principal_img52.gif"
--    ALT="\begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}">
--    </DIV>
--    <BR CLEAR="ALL">
--    <P></P>
--    where
--    <!-- MATH
--    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
--    -->
--    <IMG
--    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img53.gif"
--    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
--    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img54.gif"
--    ALT="$p_i$"> is the
--    <IMG
--    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img55.gif"
--    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
--    <IMG
--    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img56.gif"
--    ALT="$x_i$">, the original data; I.e., the square distance to the space
--    spanned by <IMG
--    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img12.gif"
--    ALT="$N$"> eigenvectors.
--    <BR>
--    <PRE>
--   */
--   // End_Html
-+
-    if (!x)
-       return;
- 
-@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculate the principal components from the original data vector
- /// x, and return it in p.
-+///
- /// It's the users responsibility to make sure that both x and p are
- /// of the right size (i.e., memory must be allocated for p).
- 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
deleted file mode 100644
index 4a4177b..0000000
--- a/root-tvector2-comment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
---- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
-@@ -96,7 +96,8 @@
-    TVector2 Rotate (Double_t phi) const;
- 
-                                         // returns phi angle in the interval [0,2*PI)
--   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
-+   static Double_t Phi_0_2pi(Double_t x);
-+
-                                         // returns phi angle in the interval [-PI,PI)
-    static Double_t Phi_mpi_pi(Double_t x);
- 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
deleted file mode 100644
index f4f3681..0000000
--- a/root-type1-embed.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
---- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
-@@ -30,14 +30,14 @@
- #ifndef LITTLE_ENDIAN
- #define LITTLE_ENDIAN 1
- #endif // LITTLE_ENDIAN
--#include "Byteswap.h"
--#define bswap_16(x)   Rbswap_16((x))
--#define bswap_32(x)   Rbswap_32((x))
- #else // R__BYTESWAP
- #ifdef LITTLE_ENDIAN
- #undef LITTLE_ENDIAN
- #endif // LITTLE_ENDIAN
- #endif // R__BYTESWAP
-+#include "Byteswap.h"
-+#define bswap_16(x)   Rbswap_16((x))
-+#define bswap_32(x)   Rbswap_32((x))
- 
- // References:
- //
-@@ -236,29 +236,26 @@
-       if(magic_number[0] == '\200') {
-          // IBM PC format printer font binary
- 
--         // FIXME: Maybe the real name can be parsed out of the
--         // file
--         font_name = "";
--
-          struct pfb_segment_header_s segment_header;
-          size_t offset = 0;
- 
--         segment_header.type = 0;
-+         // The two char elements of struct
-+         // pfb_segment_header_s are most likely aligned to
-+         // larger than 1 byte boundaries, so copy all the
-+         // elements individually
-+         segment_header.always_128 = font_data[offset];
-+         segment_header.type = font_data[offset + 1];
-+
-          while (segment_header.type != TYPE_EOF) {
--            // The two char elements of struct
--            // pfb_segment_header_s are most likely aligned to
--            // larger than 1 byte boundaries, so copy all the
--            // elements individually
--            segment_header.always_128 = font_data[offset];
--            segment_header.type = font_data[offset + 1];
-             memcpy(&segment_header.length, &font_data[offset + 2],
-                    sizeof(unsigned int));
-             offset += sizeof(unsigned int) + 2;
--#ifdef LITTLE_ENDIAN
-+#ifndef LITTLE_ENDIAN
-             segment_header.length =
-             bswap_32(segment_header.length);
- #endif // LITTLE_ENDIAN
-             char *buffer = new char[segment_header.length];
-+            char *fname;
- 
-             memcpy(buffer, &font_data[offset],
-                    segment_header.length);
-@@ -278,6 +275,26 @@
-                      buffer[segment_header.length - 1] = '\n';
-                   }
-                   ret.append(buffer, segment_header.length);
-+
-+                  fname = (char*)memmem(buffer, segment_header.length,
-+                                        "/FontName", 9);
-+                  if (fname) {
-+                     fname += 9;
-+                     while (fname < buffer + segment_header.length &&
-+                            isspace(*fname)) {
-+                        fname++;
-+                     }
-+                     if (fname < buffer + segment_header.length &&
-+                         *fname == '/') {
-+                        fname++;
-+                     }
-+                     int len = 0;
-+                     while (fname + len < buffer + segment_header.length &&
-+                            isgraph(*(fname + len))) {
-+                        len++;
-+                     }
-+                     font_name.assign(fname, len);
-+                  }
-                   break;
-                case TYPE_BINARY:
-                   append_asciihex(
-@@ -289,6 +306,9 @@
-             }
- 
-             delete [] buffer;
-+
-+            segment_header.always_128 = font_data[offset];
-+            segment_header.type = font_data[offset + 1];
-          }
- 
-          return ret;
diff --git a/root-unuran.patch b/root-unuran.patch
deleted file mode 100644
index 0e78176..0000000
--- a/root-unuran.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
---- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
-@@ -0,0 +1,21 @@
-+# - Locate Unuran library
-+# Defines:
-+#
-+#  UNURAN_FOUND
-+#  UNURAN_INCLUDE_DIR
-+#  UNURAN_INCLUDE_DIRS (not cached)
-+#  UNURAN_LIBRARIES
-+
-+find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
-+find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
-+
-+set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
-+set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
-+
-+mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-@@ -73,6 +73,7 @@
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-+ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
- ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
- ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
- ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -142,6 +142,11 @@
- set(zliblib ${ZLIB_LIBRARY})
- set(zlibincdir ${ZLIB_INCLUDE_DIR})
- 
-+set(builtinunuran ${value${builtin_unuran}})
-+set(unuranlibdir ${UNURAN_LIBRARY_DIR})
-+set(unuranlib ${UNURAN_LIBRARY})
-+set(unuranincdir ${UNURAN_INCLUDE_DIR})
-+
- set(buildgl ${value${opengl}})
- set(opengllibdir ${OPENGL_LIBRARY_DIR})
- set(openglulib ${OPENGL_glu_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -40,6 +40,16 @@
-   endif()
- endif()
- 
-+#---Check for Unuran ------------------------------------------------------------------
-+if(NOT builtin_unuran)
-+  message(STATUS "Looking for Unuran")
-+  find_Package(Unuran)
-+  if(NOT UNURAN_FOUND)
-+    message(STATUS "Unuran not found. Switching on builtin_unuran option")
-+    set(builtin_unuran ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Freetype---------------------------------------------------------------
- if(NOT builtin_freetype)
-   message(STATUS "Looking for Freetype")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-@@ -121,6 +121,11 @@
- 
- BUILTINPCRE    := @builtinpcre@
- 
-+BUILTINUNURAN  := @builtinunuran@
-+UNURANLIBDIR   := @unuranlibdir@
-+UNURANLIB      := @unuranlib@
-+UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
-+
- BUILTINZLIB    := @builtinzlib@
- ZLIBLIBDIR     := @zliblibdir@
- ZLIBCLILIB     := @zliblib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
-+++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
-@@ -55,6 +55,7 @@
-    enable_builtin_freetype   \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-+   enable_builtin_unuran     \
-    enable_builtin_zlib       \
-    enable_builtin_lzma       \
-    enable_builtin_llvm       \
-@@ -183,6 +184,7 @@
- enable_builtin_ftgl=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
-+enable_builtin_unuran=no
- enable_builtin_zlib=no
- enable_builtin_lzma=no
- enable_builtin_llvm=yes
-@@ -1704,6 +1706,7 @@
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-+  builtin-unuran     Build included libunuran, or use system libunuran
-   builtin-zlib       Build included libz, or use system libz
-   builtin-lzma       Build included liblzma, or use system liblzma
-   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
-@@ -2046,6 +2049,7 @@
-    enable_builtin_ftgl="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-+   enable_builtin_unuran="yes"
-    enable_builtin_zlib="yes"
-    enable_builtin_lzma="yes"
-    top_builddir=`cygpath -u $top_builddir`
-@@ -3210,6 +3214,38 @@
- 
- ######################################################################
- #
-+### echo %%% libunuran (builtin or system)
-+#
-+if test "x$enable_builtin_unuran" = "xno" ; then
-+    check_header "unuran.h" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_unuran=yes
-+    else
-+        unuraninc=$found_hdr
-+        unuranincdir=$found_dir
-+    fi
-+
-+    check_library "libunuran" "$enable_shared" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        unuranlib=""
-+        unuranlibdir=""
-+        enable_builtin_unuran="yes"
-+    else
-+        unuranlib="$found_lib"
-+        unuranlibdir="$found_dir"
-+    fi
-+
-+    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
-+        enable_builtin_unuran="yes"
-+    fi
-+fi
-+message "Checking whether to build included unuran"
-+result "$enable_builtin_unuran"
-+
-+######################################################################
-+#
- ### echo %%% Use included zLib or use systems
- #
- if test "x$enable_builtin_zlib" = "xno" ; then
-@@ -7720,6 +7756,10 @@
-     -e "s|@top_srcdir@|$top_srcdir|"            \
-     -e "s|@ttffontdir@|$fontdir|"               \
-     -e "s|@tutdir@|$tutdir|"                    \
-+    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
-+    -e "s|@unuranincdir@|$unuranincdir|"        \
-+    -e "s|@unuranlib@|$unuranlib|"              \
-+    -e "s|@unuranlibdir@|$unuranlibdir|"        \
-     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
-     -e "s|@xmlincdir@|$xmlincdir|"              \
-     -e "s|@xmllib@|$xmllib|"                    \
-diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
---- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
-@@ -3,6 +3,9 @@
- ############################################################################
- 
- #---Define package related variables-----------------------------------------------------------------
-+
-+if(builtin_unuran)
-+
- set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
- set(UNR_VERSION "1.8.0-root")
- set(UNR_TARNAME "unuran-${UNR_VERSION}")
-@@ -62,8 +65,17 @@
-                ${UNR_UNTARDIR}/src/tests/*.c
-                ${UNR_UNTARDIR}/src/uniform/*.c
-                ${UNR_UNTARDIR}/src/urng/*.c )
-+set(unrconfig ${UNR_UNTARDIR}/config.h)
-+
-+else()
-+
-+include_directories(${UNURAN_INCLUDE_DIRS})
-+set(unrsources)
-+set(unrconfig)
-+
-+endif()
- 
- ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
- 
--ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
-+ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
---- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
-@@ -12,6 +12,8 @@
- UNURANDIRS   := $(UNURANDIR)/src
- UNURANDIRI   := $(UNURANDIR)/inc
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- UNRVERS      := unuran-1.8.0-root
- 
- UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
-@@ -43,15 +45,18 @@
-                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
- endif
--UNRO         := $(UNRS:.c=.o)
-+UNRFLAGS     := -I$(UNRDIRS)/src
- 
--ifeq ($(PLATFORM),win32)
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
- else
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
-+
-+UNURANETAG   :=
-+UNRCFG       :=
-+UNRS         :=
-+UNRFLAGS     := $(UNURANINCDIR:%=-I%)
-+
- endif
- 
--UNRFLAGS     :=  -I$(UNRDIRS)/src
-+UNRO         := $(UNRS:.c=.o)
- 
- ##### libUnuran #####
- UNURANL      := $(MODDIRI)/LinkDef.h
-@@ -84,6 +89,8 @@
- include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
- 		cp $< $@
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- $(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
-@@ -134,12 +141,14 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
-+endif
-+
- $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
- 
- $(call pcmrule,UNURAN)
- 	$(noop)
-@@ -158,16 +167,19 @@
- 
- clean-$(MODNAME):
- 		@rm -f $(UNURANO) $(UNURANDO)
-+ifeq ($(BUILTINUNURAN),yes)
- 		-@(if [ -d $(UNRDIRS) ]; then \
- 			cd $(UNRDIRS); \
- 			$(MAKE) clean; \
- 		fi)
-+endif
- 
- clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
- 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
-+ifeq ($(BUILTINUNURAN),yes)
- 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
- ifeq ($(UNURKEEP),yes)
- 		@mv $(UNRDIRS) $(UNRDIRS).keep
-@@ -177,6 +189,7 @@
- 		@mv $(UNRDIRS).keep $(UNRDIRS)
- endif
- 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
-+endif
- 
- distclean::     distclean-$(MODNAME)
- 
-@@ -184,6 +197,7 @@
- 
- $(UNURANO): CXXFLAGS += $(UNRFLAGS)
- 
-+ifeq ($(BUILTINUNURAN),yes)
- ifeq ($(PLATFORM),win32)
- $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
- else
-@@ -194,3 +208,4 @@
- ifeq ($(CC),icc)
- $(UNRO): CFLAGS += -mp
- endif
-+endif
diff --git a/root-werror.patch b/root-werror.patch
deleted file mode 100644
index 06e49f1..0000000
--- a/root-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
-@@ -40,7 +40,7 @@
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
- 
- #---Do not transform warnings in errors-------------------------------------------------------------
--string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- 
- #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root.spec b/root.spec
deleted file mode 100644
index 1078ad4..0000000
--- a/root.spec
+++ /dev/null
@@ -1,3462 +0,0 @@
-%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
-
-# Ruby support not yet ported to root version 6
-%global ruby 0
-
-%global oce 1
-%global pythia8 1
-%global xrootd 1
-
-%if %{?fedora}%{!?fedora:0} >= 20
-# libhdfs is currently only available on intel architectures in Fedora
-%ifarch %{ix86} x86_64
-%global hadoop 1
-%else
-%global hadoop 0
-%endif
-%else
-%global hadoop 0
-%endif
-
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-# Do not create .orig files when patching source
-%global _default_patch_flags --no-backup-if-mismatch
-
-Name:		root
-Version:	6.06.06
-%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
-Summary:	Numerical data analysis framework
-
-License:	LGPLv2+
-URL:		https://root.cern.ch/
-#		The upstream source is modified to exclude proprietary fonts:
-#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
-#		tar -z -x -f root_v%{version}.source.tar.gz
-#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
-#		tar -J -c -f root-%{version}.tar.xz root-%{version}
-Source0:	%{name}-%{version}.tar.xz
-#		Input data for the tests
-Source1:	%{name}-testfiles.tar.xz
-#		Script to generate above source
-Source2:	%{name}-testfiles.sh
-#		Adapt to gcc's ABI tags
-#		https://github.com/root-mirror/root/pull/124
-Patch0:		%{name}-abitags.patch
-#		Allow running tests
-#		https://github.com/root-mirror/root/pull/130
-Patch1:		%{name}-test-install.patch
-#		Use system fonts
-Patch2:		%{name}-fontconfig.patch
-#		Fix segfault when embedding Type 1 fonts
-#		https://github.com/root-mirror/root/pull/90
-Patch3:		%{name}-type1-embed.patch
-#		Don't link to libjvm (handled properly inside libhdfs)
-Patch4:		%{name}-dont-link-jvm.patch
-#		Remove gcc ABI check
-#		with the abitags patch above it is not needed
-Patch5:		%{name}-no-abi-check.patch
-#		Public header #includes private header
-#		https://github.com/root-mirror/root/pull/88
-Patch6:		%{name}-private-public.patch
-#		Fix problems with the cmake configuration
-Patch7:		%{name}-broken-cmake-config.patch
-#		Missing stuff in the cmake configuration
-Patch8:		%{name}-missing-cmake-config.patch
-#		Fix broken deprecation check (configure)
-Patch9:		%{name}-deprecated-options.patch
-#		Only link to libgfortranbegin.a if it exists (configure)
-Patch10:	%{name}-libgfortranbegin.patch
-#		Make sure the removal of -Werror doesn't do more than intended
-Patch11:	%{name}-werror.patch
-#		Properly remove -Wall (must also remove Werror=*)
-Patch12:	%{name}-compiledata.patch
-#		Don't overwrite FFLAGS
-Patch13:	%{name}-fflags.patch
-#		Use system unuran
-Patch14:	%{name}-unuran.patch
-#		Use systme gl2ps
-Patch15:	%{name}-gl2ps.patch
-#		More CMAKE_Fortran_FLAGS case issues
-Patch16:	%{name}-more-fflags.patch
-#		Use the same soname for cmake and configure
-Patch17:	%{name}-soname.patch
-#		Save memory during build
-Patch18:	%{name}-save-memory.patch
-#		Fix build configuration for ppc64/ppc64le
-Patch19:	%{name}-ppc64.patch
-#		Fix build configuration for ARM
-Patch20:	%{name}-arm.patch
-#		Fix build configuration for s390/s390x
-Patch21:	%{name}-s390x.patch
-#		Always build the bundled llvm as static libraries
-Patch22:	%{name}-llvm-static.patch
-
-#		Documentation fixes
-
-#		Fixes for doxygen parsing issues:
-#		- warning: Found ';' while parsing initializer list
-#		- warning: Illegal member name found
-#		- warning: no matching file member found for ClassImp()
-#		- warning: documented symbol 'X' was not declared or defined
-Patch23:	%{name}-doxyfile.patch
-#		Improvements to the doxygen filter
-Patch24:	%{name}-dox-filter.patch
-#		Align macros so the doxygen filter works
-Patch25:	%{name}-macro-align.patch
-#		Fix broken ~~~ for doxygen
-#		https://github.com/root-mirror/root/pull/127
-Patch26:	%{name}-tildes.patch
-#		Convert old latex markup to doxygen
-Patch27:	%{name}-latex-markup.patch
-#		Remove some old html markup
-Patch28:	%{name}-html-markup.patch
-#		Fix broken links (cernlib, clhep, geant)
-Patch29:	%{name}-links.patch
-#		Remove duplicated comment
-Patch30:	%{name}-tvector2-comment.patch
-#		Remove links to tutorial macro results
-Patch31:	%{name}-see-macro-output.patch
-#		Fix TMath doxygen
-Patch32:	%{name}-tmath-doc.patch
-#		Fix cernlib doxygen
-Patch33:	%{name}-cernlib-doc.patch
-#		Backported doxygen updates for TPrincipal class
-Patch34:	%{name}-tprincipal-doc.patch
-#		Don't run gui macros
-Patch35:	%{name}-avoid-gui-crash.patch
-#		Doxygen warnings
-Patch36:	%{name}-doxygen-warnings.patch
-
-#		Test fixes
-
-#		User files in source tree during tests
-Patch37:	%{name}-template-files.patch
-#		Use cache read option
-Patch38:	%{name}-cache-test.patch
-#		Fixes for tests on ix86
-Patch39:	%{name}-32bit.patch
-#		Fixes for stressGraphics.ref
-Patch40:	%{name}-stressgraphics.patch
-#		Don't download testdata
-Patch41:	%{name}-no-testdata.patch
-#		Avoid using std::bind with lambdas (fixed upstream)
-Patch42:	%{name}-avoid-std-bind-lambda.patch
-
-#		s390 is not supported by cling: "error: unknown target
-#		triple 's390-ibm-linux', please use -triple or -arch"
-ExcludeArch:	s390
-#		ppc/ppc64/ppc64le does not yet work
-#		https://sft.its.cern.ch/jira/browse/ROOT-6434
-#		https://sft.its.cern.ch/jira/browse/ROOT-7314
-ExcludeArch:	ppc %{power64}
-
-BuildRequires:	cmake
-BuildRequires:	libX11-devel
-BuildRequires:	libXpm-devel
-BuildRequires:	libXft-devel
-BuildRequires:	libXext-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel
-BuildRequires:	fcgi-devel
-BuildRequires:	ftgl-devel
-BuildRequires:	glew-devel
-BuildRequires:	gl2ps-devel
-BuildRequires:	pcre-devel
-BuildRequires:	zlib-devel
-BuildRequires:	xz-devel
-BuildRequires:	libAfterImage-devel >= 1.20
-BuildRequires:	ncurses-devel
-BuildRequires:	avahi-compat-libdns_sd-devel
-BuildRequires:	avahi-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	fftw-devel
-BuildRequires:	gsl-devel
-BuildRequires:	unuran-devel
-BuildRequires:	krb5-devel
-BuildRequires:	krb5-workstation
-BuildRequires:	openldap-devel
-BuildRequires:	mysql-devel
-BuildRequires:	sqlite-devel
-BuildRequires:	unixODBC-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libGLU-devel
-BuildRequires:	postgresql-devel
-BuildRequires:	python-devel
-%if %{?fedora}%{!?fedora:0} >= 15
-BuildRequires:	python3-devel
-%global python3pkg python3
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
-BuildRequires:	python34-devel
-%global python3pkg python34
-%endif
-BuildRequires:	qt4-devel
-%if %{ruby}
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
-%endif
-BuildRequires:	openssl-devel
-BuildRequires:	globus-gss-assist-devel
-BuildRequires:	globus-gsi-credential-devel
-BuildRequires:	globus-proxy-utils
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	dcap-devel
-BuildRequires:	dpm-devel
-%if %{xrootd}
-BuildRequires:	xrootd-client-devel >= 1:3.3.5
-BuildRequires:	xrootd-private-devel >= 1:3.3.5
-%endif
-BuildRequires:	cfitsio-devel
-BuildRequires:	davix-devel >= 0.2.8
-BuildRequires:	gfal2-devel
-BuildRequires:	srm-ifce-devel
-%if %{hadoop}
-BuildRequires:	hadoop-devel
-%endif
-%if %{oce}
-BuildRequires:	OCE-devel
-%endif
-BuildRequires:	R-Rcpp-devel
-BuildRequires:	R-RInside-devel
-BuildRequires:	readline-devel
-BuildRequires:	tbb-devel
-BuildRequires:	emacs
-BuildRequires:	emacs-el
-BuildRequires:	gcc-c++
-BuildRequires:	gcc-gfortran
-BuildRequires:	graphviz-devel
-BuildRequires:	expat-devel
-%if %{pythia8}
-BuildRequires:	pythia8-devel >= 8.1.80
-%endif
-BuildRequires:	numpy
-BuildRequires:	dos2unix
-BuildRequires:	doxygen
-BuildRequires:	graphviz
-BuildRequires:	perl-generators
-#		Some of the tests call lsb_release
-BuildRequires:	redhat-lsb-core
-BuildRequires:	font(freesans)
-BuildRequires:	font(freeserif)
-BuildRequires:	font(freemono)
-#		Provides "symbol" and "dingbats"
-BuildRequires:	urw-fonts
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
-BuildRequires:	font(droidsansfallback)
-%endif
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	hicolor-icon-theme
-Requires:	emacs-filesystem >= %{_emacs_version}
-Provides:	emacs-%{name} = %{version}-%{release}
-Provides:	emacs-%{name}-el = %{version}-%{release}
-Obsoletes:	emacs-%{name} < 5.34.28
-Obsoletes:	emacs-%{name}-el < 5.34.28
-
-%description
-The ROOT system provides a set of object oriented frameworks with all
-the functionality needed to handle and analyze large amounts of data
-in a very efficient way. Having the data defined as a set of objects,
-specialized storage methods are used to get direct access to the
-separate attributes of the selected objects, without having to touch
-the bulk of the data. Included are histograming methods in an
-arbitrary number of dimensions, curve fitting, function evaluation,
-minimization, graphics and visualization classes to allow the easy
-setup of an analysis system that can query and process the data
-interactively or in batch mode, as well as a general parallel
-processing framework, PROOF, that can considerably speed up an
-analysis.
-
-Thanks to the built-in C++ interpreter cling, the command, the
-scripting and the programming language are all C++. The interpreter
-allows for fast prototyping of the macros since it removes the, time
-consuming, compile/link cycle. It also provides a good environment to
-learn C++. If more performance is needed the interactively developed
-macros can be compiled using a C++ compiler via a machine independent
-transparent compiler interface called ACliC.
-
-The system has been designed in such a way that it can query its
-databases in parallel on clusters of workstations or many-core
-machines. ROOT is an open system that can be dynamically extended by
-linking external libraries. This makes ROOT a premier platform on
-which to build data acquisition, simulation and data analysis systems.
-
-%package icons
-Summary:	ROOT icon collection
-BuildArch:	noarch
-Requires:	%{name}-core = %{version}-%{release}
-
-%description icons
-This package contains icons used by the ROOT GUI.
-
-%package fonts
-Summary:	ROOT font collection
-BuildArch:	noarch
-%if %{?rhel}%{!?rhel:0}
-#		STIX version 0.9 and Driod Sans Fallback
-License:	OFL and ASL 2.0
-%else
-#		STIX version 0.9 only
-License:	OFL
-%endif
-Requires:	%{name}-core = %{version}-%{release}
-
-%description fonts
-This package contains fonts used by ROOT that are not available in Fedora.
-In particular it contains STIX version 0.9 that is used by TMathText.
-%if %{?rhel}%{!?rhel:0}
-For EPEL it also provides the Google Droid Sans Fallback font.
-%endif
-
-%package doc
-Summary:	Documentation for the ROOT system
-BuildArch:	noarch
-License:	LGPLv2+ and GPLv2+ and BSD
-Requires:	mathjax
-
-%description doc
-This package contains the automatically generated ROOT class
-documentation.
-
-%package tutorial
-Summary:	ROOT tutorial scripts and test suite
-BuildArch:	noarch
-Requires:	%{name} = %{version}-%{release}
-
-%description tutorial
-This package contains the tutorial scripts and test suite for ROOT.
-
-%package core
-Summary:	ROOT core libraries
-License:	LGPLv2+ and BSD
-Requires:	%{name}-fonts = %{version}-%{release}
-Requires:	%{name}-icons = %{version}-%{release}
-#		Dynamic dependencies
-Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
-Requires:	xorg-x11-fonts-ISO8859-1-75dpi
-Requires:	font(freesans)
-Requires:	font(freeserif)
-Requires:	font(freemono)
-#		Provides "symbol" and "dingbats"
-Requires:	urw-fonts
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
-Requires:	font(droidsansfallback)
-%endif
-%if %{ruby} == 0
-Obsoletes:	%{name}-ruby < 6.00.00
-%endif
-%if %{hadoop} == 0
-Obsoletes:	%{name}-io-hdfs < 6.06.04-2
-%endif
-
-%description core
-This package contains the core libraries used by ROOT: libCore, libNew,
-libRint and libThread.
-
-%package multiproc
-Summary:	Multi-processor support for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description multiproc
-This package provides ROOT's multi-processor support library: libMultiProc.
-
-%package cling
-Summary:	Cling C++ interpreter
-License:	NCSA and (NCSA or LGPLv2+)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-#		Root's cling interpreter uses a particular git commit of
-#		llvm and clang with application specific changes. It does
-#		not work with the system libraries. The bundled llvm and
-#		clang are compiled using -fvisibility=hidden, and are not
-#		visible outside of the libCling module.
-Requires:	gcc-c++
-Requires:	redhat-rpm-config
-Provides:	bundled(clang-libs)
-Provides:	bundled(llvm-libs)
-Obsoletes:	%{name}-cint7 < 5.26.00c
-Obsoletes:	%{name}-cint < 6.00.00
-Obsoletes:	%{name}-cintex < 6.00.00
-Obsoletes:	%{name}-reflex < 6.00.00
-
-%description cling
-Cling is an interactive C++ interpreter, built on top of Clang and
-LLVM compiler infrastructure.
-
-%package proofd
-Summary:	Parallel ROOT Facility - distributed, parallel computing
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
-
-%description proofd
-This package contains the PROOF server. Proofd is the core daemon of
-the PROOF (Parallel ROOT Facility) system for distributed parallel
-computing. Installing this package on a machine makes it possible
-for the machine to participate in a parallel computing farm (cluster
-or via the Internet), either as a master or a slave, using a
-transparent interface.
-
-%package rootd
-Summary:	ROOT remote file server
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
-
-%description rootd
-This package contains the ROOT file server. Rootd is a server for ROOT
-files, serving files over the Internet. Using this daemon, you can
-access files on the machine from anywhere on the Internet, using a
-transparent interface.
-
-%package python
-Summary:	Python extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description python
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
-%package %{python3pkg}
-Summary:	Python extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description %{python3pkg}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
-%if %{ruby}
-%package ruby
-Summary:	Ruby extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Provides:	ruby(libRuby) = %{version}
-
-%description ruby
-This package contains the Ruby extension for ROOT. The interface
-goes both ways - that is, you can call ROOT functions from Ruby, and
-invoke the Ruby interpreter from ROOT.
-%endif
-
-%package r
-Summary:	R interface for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description r
-ROOT R is an interface in ROOT to call R functions using an R C++
-interface. This interface opens the possibility in ROOT to use the
-very large set of mathematical and statistical tools provided by R.
-With ROOT R you can perform a conversion from ROOT's C++ objects to
-R's objects, transform the returned R objects into ROOT's C++ objects,
-then the R functionality can be used directly for statistical studies
-in ROOT.
-
-%package r-tools
-Summary:	R Tools
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-r%{?_isa} = %{version}-%{release}
-
-%description r-tools
-This package contains a minimizer module for ROOT that uses the ROOT
-R interface.
-
-%package genetic
-Summary:	Genetic algorithms for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description genetic
-This package contains a genetic minimizer module for ROOT.
-
-%package geom
-Summary:	Geometry library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description geom
-This package contains a library for defining geometries in ROOT.
-
-%package gdml
-Summary:	GDML import/export for ROOT geometries
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-
-%description gdml
-This package contains an import/export module for ROOT geometries.
-
-%if %{oce}
-%package geocad
-Summary:	OpenCascade import/export for ROOT geometries
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-
-%description geocad
-This package contains an import/export module for ROOT geometries.
-%endif
-
-%package graf
-Summary:	2D graphics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf
-This package contains the 2-dimensional graphics library for ROOT.
-
-%package graf-asimage
-Summary:	AfterImage graphics renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf-asimage
-This package contains the AfterImage renderer for ROOT, which allows
-you to store output graphics in many formats, including JPEG, PNG and
-TIFF.
-
-%package graf-fitsio
-Summary:	ROOT interface for the Flexible Image Transport System (FITS)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description graf-fitsio
-This package contains a library for using the Flexible Image Transport
-System (FITS) data format in root.
-
-%package graf-gpad
-Summary:	Canvas and pad library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
-
-%description graf-gpad
-This package contains a library for canvas and pad manipulations.
-
-%package graf-gviz
-Summary:	Graphviz 2D library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description graf-gviz
-This package contains the 2-dimensional graphviz library for ROOT.
-
-%package graf-postscript
-Summary:	Postscript/PDF renderer library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-
-%description graf-postscript
-This package contains a library for ROOT, which allows rendering
-postscript and PDF output.
-
-%package graf-qt
-Summary:	Qt renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-
-%description graf-qt
-This package contains the Qt renderer for ROOT.
-
-%package graf-x11
-Summary:	X window system renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-
-%description graf-x11
-This package contains the X11 renderer for ROOT, which allows using an
-X display for showing graphics.
-
-%package graf3d
-Summary:	Basic 3D shapes library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf3d
-This library contains the basic 3D shapes and classes for ROOT. For
-a more full-blown geometry library, see the root-geom package.
-
-%package graf3d-eve
-Summary:	Event display library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description graf3d-eve
-This package contains a library for defining event displays in ROOT.
-
-%package graf3d-gl
-Summary:	GL renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description graf3d-gl
-This package contains the GL renderer for ROOT. This library provides
-3D rendering of volumes and shapes defined in ROOT, as well as 3D
-rendering of histograms, and similar. Included is also a high quality
-3D viewer for ROOT defined geometries.
-
-%package graf3d-gviz3d
-Summary:	Graphviz 3D library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-
-%description graf3d-gviz3d
-This package contains the 3-dimensional graphviz library for ROOT.
-
-%package graf3d-x3d
-Summary:	X 3D renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-
-%description graf3d-x3d
-This package contains the X 3D renderer for ROOT. This library provides
-3D rendering of volumes and shapes defined in ROOT. Included is also
-a low quality 3D viewer for ROOT defined geometries.
-
-%package gui
-Summary:	GUI library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-#		Dynamic dependencies
-Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-
-%description gui
-This package contains a library for defining graphical user interfaces.
-
-%package gui-fitpanel
-Summary:	GUI element for fits in ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description gui-fitpanel
-This package contains a library to show a pop-up dialog when fitting
-various kinds of data.
-
-%package gui-ged
-Summary:	GUI element for editing various ROOT objects
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description gui-ged
-This package contains a library to show a pop-up window for editing
-various ROOT objects.
-
-%package guibuilder
-Summary:	GUI editor library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description guibuilder
-This package contains a library for editing graphical user interfaces
-in ROOT.
-
-%package gui-qt
-Summary:	Qt GUI for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-
-%description gui-qt
-This package contains the Qt GUI for ROOT.
-
-%package gui-recorder
-Summary:	Interface for recording and replaying events in ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description gui-recorder
-This library provides interface for recording and replaying events in ROOT.
-Recorded events are:
- - Commands typed by user in command line ('new TCanvas')
- - GUI events (mouse movement, button clicks, ...)
-All the recorded events from one session are stored in one TFile
-and can be replayed again anytime.
-
-%package hbook
-Summary:	Hbook library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description hbook
-This package contains the Hbook library for ROOT, allowing you to
-access legacy Hbook files (NTuples and Histograms from PAW).
-
-%package hist
-Summary:	Histogram library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
-
-%description hist
-This package contains a library for histogramming in ROOT.
-
-%package hist-painter
-Summary:	Histogram painter plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description hist-painter
-This package contains a painter of histograms for ROOT.
-
-%package spectrum
-Summary:	Spectra analysis library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description spectrum
-This package contains the Spectrum library for ROOT.
-
-%package spectrum-painter
-Summary:	Spectrum painter plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description spectrum-painter
-This package contains a painter of spectra for ROOT.
-
-%package hist-factory
-Summary:	RooFit PDFs from ROOT histograms
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description hist-factory
-Create RooFit probability density functions from ROOT histograms.
-
-%package html
-Summary:	HTML documentation generator for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	graphviz
-
-%description html
-This package contains classes to automatically extract documentation
-from marked up sources.
-
-%package io
-Summary:	Input/output of ROOT objects
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description io
-This package provides I/O routines for ROOT objects.
-
-%package io-dcache
-Summary:	dCache input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-dcache
-This package contains the dCache extension for ROOT.
-
-%package io-gfal
-Summary:	Grid File Access Library input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-gfal
-This package contains the Grid File Access Library extension for ROOT.
-
-%if %{hadoop}
-%package io-hdfs
-Summary:	Hadoop File System input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-hdfs
-This package contains the Hadoop File System extension for ROOT.
-%endif
-
-%package io-rfio
-Summary:	Remote File input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-rfio
-This package contains the Remote File IO extension for ROOT.
-
-%package io-sql
-Summary:	SQL input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description io-sql
-This package contains the SQL extension for ROOT, that allows
-transparent access to files data via an SQL database, using ROOT's
-TFile interface.
-
-%package io-xml
-Summary:	XML reader library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-xml
-This package contains the XML reader library for ROOT.
-
-%package foam
-Summary:	A Compact Version of the Cellular Event Generator
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description foam
-The general-purpose self-adapting Monte Carlo (MC) event
-generator/simulator mFOAM (standing for mini-FOAM) is a new compact
-version of the FOAM program, with a slightly limited functionality
-with respect to its parent version. On the other hand, mFOAM is
-easier to use for the average user.
-
-%package fftw
-Summary:	FFTW library for ROOT
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description fftw
-This package contains the Fast Fourier Transform extension for ROOT.
-It uses the very fast fftw (version 3) library.
-
-%package fumili
-Summary:	Fumili library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description fumili
-This package contains the fumili library for ROOT. This provides an
-alternative fitting algorithm for ROOT.
-
-%package genvector
-Summary:	Generalized vector library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description genvector
-This package contains the Genvector library for ROOT. This provides
-a generalized vector library.
-
-%package mathcore
-Summary:	Core mathematics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-
-%description mathcore
-This package contains the MathCore library for ROOT.
-
-%package mathmore
-Summary:	GSL interface library for ROOT
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description mathmore
-This package contains the MathMore library for ROOT. This provides
-a partial GNU Scientific Library interface for ROOT.
-While the rest of root is licensed under LGPLv2+ this optional library
-is licensed under GPLv2+ due to its use of GSL.
-
-%package matrix
-Summary:	Matrix library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description matrix
-This package contains the Matrix library for ROOT.
-
-%package minuit
-Summary:	Minuit library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description minuit
-This package contains the MINUIT library for ROOT. This provides a
-fitting algorithm for ROOT.
-
-%package minuit2
-Summary:	Minuit version 2 library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description minuit2
-This package contains the MINUIT version 2 library for ROOT. This
-provides an fitting algorithm for ROOT.
-
-%package mlp
-Summary:	Multi-layer perceptron extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description mlp
-This package contains the mlp library for ROOT. This library provides
-a multi-layer perceptron neural network package for ROOT.
-
-%package physics
-Summary:	Physics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description physics
-This package contains the physics library for ROOT.
-
-%package quadp
-Summary:	QuadP library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description quadp
-This package contains the QuadP library for ROOT. This provides the a
-framework in which to do Quadratic Programming. The quadratic
-programming problem involves minimization of a quadratic function
-subject to linear constraints.
-
-%package smatrix
-Summary:	Sparse matrix library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description smatrix
-This package contains the Smatrix library for ROOT.
-
-%package splot
-Summary:	Splot library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description splot
-A common method used in High Energy Physics to perform measurements
-is the maximum Likelihood method, exploiting discriminating variables
-to disentangle signal from background. The crucial point for such an
-analysis to be reliable is to use an exhaustive list of sources of
-events combined with an accurate description of all the Probability
-Density Functions (PDF).
-
-To assess the validity of the fit, a convincing quality check is to
-explore further the data sample by examining the distributions of
-control variables. A control variable can be obtained for instance by
-removing one of the discriminating variables before performing again
-the maximum Likelihood fit: this removed variable is a control
-variable. The expected distribution of this control variable, for
-signal, is to be compared to the one extracted, for signal, from the
-data sample. In order to be able to do so, one must be able to unfold
-from the distribution of the whole data sample.
-
-The SPlot method allows to reconstruct the distributions for the
-control variable, independently for each of the various sources of
-events, without making use of any a priori knowledge on this
-variable. The aim is thus to use the knowledge available for the
-discriminating variables to infer the behavior of the individual
-sources of events with respect to the control variable.
-
-SPlot is optimal if the control variable is uncorrelated with the
-discriminating variables.
-
-%package unuran
-Summary:	Random number generator library
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description unuran
-Contains universal (also called automatic or black-box) algorithms
-that can generate random numbers from large classes of continuous or
-discrete distributions, and also from practically all standard
-distributions.
-
-To generate random numbers the user must supply some information
-about the desired distribution, especially a C-function that computes
-the density and - depending on the chosen methods - some additional
-information (like the borders of the domain, the mode, the derivative
-of the density ...). After a user has given this information an
-init-program computes all tables and constants necessary for the
-random variate generation. The sample program can then generate
-variates from the desired distribution.
-
-%package vdt
-Summary:	VDT mathematical library
-BuildArch:	noarch
-
-%description vdt
-VDT is a library of mathematical functions implemented in double and
-single precision. The implementation is fast and with the aid of
-modern compilers (e.g. gcc 4.7) vectorizable.
-
-%package memstat
-Summary:	Memory statistics tool for use with ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description memstat
-This package contains the memory statistics tool for debugging memory
-leaks and such.
-
-%package table
-Summary:	Table library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description table
-This package contains the Table library for ROOT.
-
-%package montecarlo-eg
-Summary:	Event generator library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description montecarlo-eg
-This package contains an event generator library for ROOT.
-
-%if %{pythia8}
-%package montecarlo-pythia8
-Summary:	Pythia version 8 plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-
-%description montecarlo-pythia8
-This package contains the Pythia version 8 plug-in for ROOT. This
-package provide the ROOT user with transparent interface to the Pythia
-(version 8) event generators for hadronic interactions. If the term
-"hadronic" does not ring any bells, this package is not for you.
-%endif
-
-%package montecarlo-vmc
-Summary:	Virtual Monte-Carlo (simulation) library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-
-%description montecarlo-vmc
-This package contains the VMC library for ROOT.
-
-%package net
-Summary:	Net library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description net
-This package contains the ROOT networking library.
-
-%package net-rpdutils
-Summary:	Authentication utilities used by rootd and proofd
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-rpdutils
-This package contains authentication utilities used by rootd and proofd.
-
-%package net-bonjour
-Summary:	Bonjour extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-bonjour
-This package contains a bonjour extension for ROOT.
-
-%package net-auth
-Summary:	Authentication extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description net-auth
-This package contains the basic authentication algorithms used by ROOT.
-
-%package net-davix
-Summary:	Davix extension for ROOT
-Requires:	davix-libs%{?_isa} >= 0.2.8
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description net-davix
-This package contains the davix extension for ROOT, that provides
-access to http based storage such as webdav and S3.
-
-%package net-globus
-Summary:	Globus extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	globus-proxy-utils
-
-%description net-globus
-This package contains the Globus extension for ROOT, that allows
-authentication and authorization against Globus.
-
-%package net-krb5
-Summary:	Kerberos (version 5) extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	krb5-workstation
-
-%description net-krb5
-This package contains the Kerberos (version 5) extension for ROOT, that
-allows authentication and authorization using Kerberos tokens.
-
-%package net-ldap
-Summary:	LDAP extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-ldap
-This package contains the LDAP extension for ROOT. This gives you
-access to LDAP directories via ROOT.
-
-%package net-http
-Summary:	HTTP server extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description net-http
-This package contains the HTTP server extension for ROOT. It provides
-an http interface to arbitrary ROOT applications.
-
-%if %{xrootd}
-%package netx
-Summary:	NetX extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description netx
-This package contains the NetX extension for ROOT, i.e. a client for
-the xrootd server. Both the old (NetX) and the new (NetXNG) version are
-provided.
-%endif
-
-%package proof
-Summary:	PROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-Obsoletes:	%{name}-clarens < 5.34.01
-Obsoletes:	%{name}-peac < 5.34.01
-
-%description proof
-This package contains the proof extension for ROOT. This provides a
-client to use in a PROOF environment.
-
-%package proof-bench
-Summary:	PROOF benchmarking
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-bench
-This package contains the steering class for PROOF benchmarks.
-
-%package proof-pq2
-Summary:	PROOF Quick Query (pq2)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-
-%description proof-pq2
-Shell-based interface to the PROOF dataset handling.
-
-%package proof-sessionviewer
-Summary:	GUI to browse an interactive PROOF session
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-sessionviewer
-This package contains a library for browsing an interactive PROOF
-session in ROOT.
-
-%if %{xrootd}
-%package xproof
-Summary:	XPROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires:	xrootd-server%{?_isa}
-
-%description xproof
-This package contains the xproof extension for ROOT. This provides a
-client to be used in a PROOF environment.
-%endif
-
-%package roofit
-Summary:	ROOT extension for modeling expected distributions
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description roofit
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-%package sql-mysql
-Summary:	MySQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-mysql
-This package contains the MySQL plugin for ROOT. This plugin
-provides a thin client (interface) to MySQL servers. Using this
-client, one can obtain information from a MySQL database into the
-ROOT environment.
-
-%package sql-odbc
-Summary:	ODBC plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-odbc
-This package contains the ODBC (Open DataBase Connectivity) plugin
-for ROOT, that allows transparent access to any kind of database that
-supports the ODBC protocol.
-
-%package sql-sqlite
-Summary:	Sqlite client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-sqlite
-This package contains the sqlite plugin for ROOT. This plugin
-provides a thin client (interface) to sqlite servers. Using this
-client, one can obtain information from a sqlite database into the
-ROOT environment.
-
-%package sql-pgsql
-Summary:	PostgreSQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-pgsql
-This package contains the PostGreSQL plugin for ROOT. This plugin
-provides a thin client (interface) to PostGreSQL servers. Using this
-client, one can obtain information from a PostGreSQL database into the
-ROOT environment.
-
-%package tmva
-Summary:	Toolkit for multivariate data analysis
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description tmva
-The Toolkit for Multivariate Analysis (TMVA) provides a
-ROOT-integrated environment for the parallel processing and
-evaluation of MVA techniques to discriminate signal from background
-samples. It presently includes (ranked by complexity):
-
-  * Rectangular cut optimization
-  * Correlated likelihood estimator (PDE approach)
-  * Multi-dimensional likelihood estimator (PDE - range-search approach)
-  * Fisher (and Mahalanobis) discriminant
-  * H-Matrix (chi-squared) estimator
-  * Artificial Neural Network (two different implementations)
-  * Boosted Decision Trees
-
-The TMVA package includes an implementation for each of these
-discrimination techniques, their training and testing (performance
-evaluation). In addition all these methods can be tested in parallel,
-and hence their performance on a particular data set may easily be
-compared.
-
-%package tmva-python
-Summary:	Toolkit for multivariate data analysis (Python)
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description tmva-python
-Python integration with TMVA.
-
-%package tmva-r
-Summary:	Toolkit for multivariate data analysis (R)
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-r%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description tmva-r
-R integration with TMVA.
-
-%package tmva-gui
-Summary:	Toolkit for multivariate data analysis GUI
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
-
-%description tmva-gui
-GUI for the Toolkit for Multivariate Analysis (TMVA)
-
-%package tree
-Summary:	Tree library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description tree
-This package contains the Tree library for ROOT.
-
-%package tree-player
-Summary:	Library to loop over a ROOT tree
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description tree-player
-This package contains a plugin to loop over a ROOT tree.
-
-%package tree-viewer
-Summary:	GUI to browse a ROOT tree
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description tree-viewer
-This package contains a plugin for browsing a ROOT tree in ROOT.
-
-%package cli
-Summary:	ROOT command line utilities
-BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
-
-%description cli
-The ROOT command line utilities is a set of scripts for common tasks
-written in python.
-
-%package notebook
-Summary:	ROOT as an IPython Notebook
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-rootaas = %{version}-%{release}
-Requires:	/usr/bin/ipython
-
-%description notebook
-ROOT as an IPython Notebook.
-
-%package rootaas
-Summary:	ROOT as a Service
-BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
-Requires:	python-ipython-console
-
-%description rootaas
-ROOT as a Service - the IPython kernel for the ROOT notebook.
-
-%prep
-%setup -q -a 1
-
-# Convert from mac line terminators (and remove trailing spaces)
-mac2unix math/smatrix/doc/SMatrixClass.html
-sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
-mac2unix math/smatrix/doc/SVector.html
-sed 's! *$!!' -i math/smatrix/doc/SVector.html
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-
-# Remove bundled sources in order to be sure they are not used
-#  * afterimage
-rm -rf graf2d/asimage/src/libAfterImage
-#  * ftgl
-rm -rf graf3d/ftgl/src graf3d/ftgl/inc
-#  * freetype
-rm -rf graf2d/freetype/src
-#  * glew
-rm -rf graf3d/glew/src graf3d/glew/inc
-#  * pcre
-rm -rf core/pcre/src
-#  * zlib
-rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
-#  * lzma
-rm -rf core/lzma/src/*.tar.gz
-#  * gl2ps
-rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
-#  * unuran
-rm -rf math/unuran/src/*.tar.gz
-#  * xrootd-private-devel headers
-rm -rf proof/xrdinc
-#  * x11 extension headers
-rm -rf graf2d/x11/inc/X11
-#  * mathjax
-rm -rf documentation/doxygen/mathjax.tar.gz
-sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
-sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
-    -i documentation/doxygen/Doxyfile
-%if %{?fedora}%{!?fedora:0} >= 24
-#  * string_view
-rm core/metautils/inc/libcpp_string_view.h \
-   core/metautils/inc/RWrap_libcpp_string_view.h
-%endif
-
-# Remove bundled fonts provided by the OS distributions
-%if %{?fedora}%{!?fedora:0} >= 11
-rm fonts/DroidSansFallback.ttf
-%endif
-
-# Remove unsupported man page macros
-sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
-
-# Build PyROOT for python 3
-cp -pr bindings/pyroot bindings/python
-
-%build
-unset QTDIR
-unset QTLIB
-unset QTINC
-
-mkdir builddir
-pushd builddir
-
-# Avoid overlinking (this used to be the default with the old configure script)
-LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-
-%ifarch s390 s390x
-# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
-%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
-%endif
-
-%ifarch ppc %{power64} s390 s390x
-# On some architectures JIT compilation fails if the stack protector is used
-# https://llvm.org/bugs/show_bug.cgi?id=22248
-# https://llvm.org/bugs/show_bug.cgi?id=26226
-# IncrementalExecutor::executeFunction:
-#   symbol '__stack_chk_guard' unresolved while linking
-%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
-%endif
-
-%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
-       -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
-       -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
-       -Dgnuinstall:BOOL=ON \
-       -Dbuiltin_afterimage:BOOL=OFF \
-       -Dbuiltin_cfitsio:BOOL=OFF \
-       -Dbuiltin_davix:BOOL=OFF \
-       -Dbuiltin_fftw3:BOOL=OFF \
-       -Dbuiltin_freetype:BOOL=OFF \
-       -Dbuiltin_ftgl:BOOL=OFF \
-       -Dbuiltin_gl2ps:BOOL=OFF \
-       -Dbuiltin_glew:BOOL=OFF \
-       -Dbuiltin_gsl:BOOL=OFF \
-       -Dbuiltin_llvm:BOOL=ON \
-       -Dbuiltin_lzma:BOOL=OFF \
-       -Dbuiltin_openssl:BOOL=OFF \
-       -Dbuiltin_pcre:BOOL=OFF \
-       -Dbuiltin_tbb:BOOL=OFF \
-       -Dbuiltin_unuran:BOOL=OFF \
-       -Dbuiltin_xrootd:BOOL=OFF \
-       -Dbuiltin_zlib:BOOL=OFF \
-       -Dafdsmgrd:BOOL=OFF \
-       -Dafs:BOOL=OFF \
-       -Dalien:BOOL=OFF \
-       -Dasimage:BOOL=ON \
-       -Dastiff:BOOL=ON \
-       -Dbonjour:BOOL=ON \
-       -Dcastor:BOOL=OFF \
-       -Dccache:BOOL=OFF \
-       -Dchirp:BOOL=OFF \
-       -Dcling:BOOL=ON \
-       -Dcocoa:BOOL=OFF \
-%if %{?fedora}%{!?fedora:0} >= 24
-       -Dcxx14:BOOL=ON \
-%else
-       -Dcxx14:BOOL=OFF \
-%endif
-       -Ddavix:BOOL=ON \
-       -Ddcache:BOOL=ON \
-       -Dexceptions:BOOL=ON \
-       -Dexplicitlink:BOOL=ON \
-       -Dfftw3:BOOL=ON \
-       -Dfitsio:BOOL=ON \
-       -Dfortran:BOOL=ON \
-       -Dgdml:BOOL=ON \
-       -Dgenvector:BOOL=ON \
-%if %{oce}
-       -Dgeocad:BOOL=ON \
-%else
-       -Dgeocad:BOOL=OFF \
-%endif
-       -Dgfal:BOOL=ON \
-       -Dglite:BOOL=OFF \
-       -Dglobus:BOOL=ON \
-       -Dgsl_shared:BOOL=ON \
-       -Dgviz:BOOL=ON \
-%if %{hadoop}
-       -Dhdfs:BOOL=ON \
-%else
-       -Dhdfs:BOOL=OFF \
-%endif
-       -Dhttp:BOOL=ON \
-       -Djemalloc:BOOL=OFF \
-       -Dkrb5:BOOL=ON \
-       -Dldap:BOOL=ON \
-       -Dlibcxx:BOOL=OFF \
-       -Dmathmore:BOOL=ON \
-       -Dmemstat:BOOL=ON \
-       -Dminuit2:BOOL=ON \
-       -Dmonalisa:BOOL=OFF \
-       -Dmt:BOOL=ON \
-       -Dmysql:BOOL=ON \
-       -Dodbc:BOOL=ON \
-       -Dopengl:BOOL=ON \
-       -Doracle:BOOL=OFF \
-       -Dpch:BOOL=ON \
-       -Dpgsql:BOOL=ON \
-       -Dpythia6:BOOL=OFF \
-%if %{pythia8}
-       -Dpythia8:BOOL=ON \
-%else
-       -Dpythia8:BOOL=OFF \
-%endif
-       -Dpython:BOOL=ON \
-       -Dqt:BOOL=ON \
-       -Dqtgsi:BOOL=ON \
-       -Dr:BOOL=ON \
-       -Drfio:BOOL=ON \
-       -Droofit:BOOL=ON \
-       -Droot7:BOOL=OFF \
-       -Drpath:BOOL=OFF \
-%if %{ruby}
-       -Druby:BOOL=ON \
-%else
-       -Druby:BOOL=OFF \
-%endif
-       -Dsapdb:BOOL=OFF \
-       -Dshadowpw:BOOL=ON \
-       -Dshared:BOOL=ON \
-       -Dsoversion:BOOL=ON \
-       -Dsqlite:BOOL=ON \
-       -Dsrp:BOOL=OFF \
-       -Dssl:BOOL=ON \
-       -Dtable:BOOL=ON \
-       -Dtbb:BOOL=ON \
-       -Dtcmalloc:BOOL=OFF \
-       -Dthread:BOOL=ON \
-       -Dtmva:BOOL=ON \
-       -Dunuran:BOOL=ON \
-       -Dvc:BOOL=OFF \
-       -Dvdt:BOOL=ON \
-       -Dx11:BOOL=ON \
-       -Dxft:BOOL=ON \
-       -Dxml:BOOL=ON \
-%if %{xrootd}
-       -Dxrootd:BOOL=ON \
-%else
-       -Dxrootd:BOOL=OFF \
-%endif
-       -Dfail-on-missing:BOOL=ON \
-       -Dtesting:BOOL=ON \
-       ..
-
-# Build PyROOT for python 3 (prep)
-cp -pr bindings/pyroot bindings/python
-
-make %{?_smp_mflags}
-
-# Build PyROOT for python 3
-mkdir python
-mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
-    > CMakeFiles/Makefile2
-py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
-py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
-sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
-make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
-mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
-
-popd
-
-%install
-pushd builddir
-make %{?_smp_mflags} install DESTDIR=%{buildroot}
-popd
-
-# Move python modules to the sitelib
-mkdir -p %{buildroot}%{python_sitelib}
-mkdir -p %{buildroot}%{python_sitearch}
-
-mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
-
-rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
-mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
-
-# Do emacs byte compilation
-emacs -batch -no-site-file -f batch-byte-compile \
-    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
-
-# Install desktop entry and icon
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-
-cat > root.desktop << EOF
-[Desktop Entry]
-Name=Root
-GenericName=Root
-Comment=Numerical data analysis framework
-Exec=root
-Icon=root
-Terminal=true
-Type=Application
-MimeType=application/x-root;
-Categories=Utility;
-Encoding=UTF-8
-EOF
-
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-		     --vendor "" root.desktop
-install -p -m 644 build/package/debian/root-system-bin.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
-
-# Install mime type and icon
-mkdir -p %{buildroot}%{_datadir}/mime/packages
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
-    %{buildroot}%{_datadir}/mime/packages/root.xml
-install -p -m 644 build/package/debian/application-x-root.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-
-# Init scripts for services
-mkdir -p %{buildroot}%{_initrddir}
-mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
-   %{buildroot}%{_initrddir}/proofd
-mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
-   %{buildroot}%{_initrddir}/rootd
-
-# Turn off services by default
-sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
-
-# The Python interface library is handled by alternatives
-mkdir -p %{buildroot}%{python_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python_sitearch}/libPyROOT.so
-
-mkdir -p %{buildroot}%{python3_sitearch}
-install builddir/python/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
-install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
-
-%if %{ruby}
-# The Ruby interface library must be in two places
-mkdir -p %{buildroot}%{ruby_vendorarchdir}
-mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
-   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
-ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
-   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
-%endif
-
-# These should be in PATH
-mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
-
-# Avoid /usr/bin/env shebangs
-sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed 's!/usr/bin/env python!/usr/bin/python!' \
-    -i %{buildroot}%{_bindir}/rootbrowse \
-       %{buildroot}%{_bindir}/rootcp \
-       %{buildroot}%{_bindir}/rooteventselector \
-       %{buildroot}%{_bindir}/rootls \
-       %{buildroot}%{_bindir}/rootmkdir \
-       %{buildroot}%{_bindir}/rootmv \
-       %{buildroot}%{_bindir}/rootprint \
-       %{buildroot}%{_bindir}/rootrm \
-       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
-       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
-
-# Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
-rm %{buildroot}%{_datadir}/%{name}/daemons/README
-rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
-rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
-rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
-rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
-rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
-rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
-rm %{buildroot}%{_libdir}/%{name}/libminicern.a
-rm %{buildroot}%{_bindir}/setenvwrap.csh
-rm %{buildroot}%{_bindir}/setxrd*
-rm %{buildroot}%{_bindir}/thisroot*
-rm %{buildroot}%{_mandir}/man1/g2rootold.1
-rm %{buildroot}%{_mandir}/man1/genmap.1
-rm %{buildroot}%{_mandir}/man1/proofserva.1
-rm %{buildroot}%{_mandir}/man1/roota.1
-rm %{buildroot}%{_mandir}/man1/setup-pq2.1
-%if %{xrootd} == 0
-rm %{buildroot}%{_mandir}/man1/xproofd.1
-%endif
-rm %{buildroot}%{_includedir}/%{name}/*.cw
-rm %{buildroot}%{_includedir}/%{name}/*.pri
-rm %{buildroot}%{_includedir}/%{name}/proofdp.h
-rm %{buildroot}%{_includedir}/%{name}/rootdp.h
-rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
-rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
-rm %{buildroot}%{_pkgdocdir}/INSTALL
-rm %{buildroot}%{_pkgdocdir}/README.ALIEN
-rm %{buildroot}%{_pkgdocdir}/README.MONALISA
-
-# Remove mathtext and minicern references from cmake files
-sed -e 's/ mathtext / /' -e /mathtext/d \
-    -e 's/ minicern / /' -e /minicern/d \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
-    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
-
-# Only used on Windows
-rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
-
-# Remove plugin definitions for non-built and obsolete plugins
-pushd %{buildroot}%{_datadir}/%{name}/plugins
-rm TAFS/P010_TAFS.C
-rm TDataProgressDialog/P010_TDataProgressDialog.C
-rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P030_TCastorFile.C
-rm TFile/P060_TChirpFile.C
-rm TFile/P070_TAlienFile.C
-%if %{hadoop} == 0
-rm TFile/P110_THDFSFile.C
-%endif
-rm TGLManager/P020_TGWin32GLManager.C
-rm TGLManager/P030_TGOSXGLManager.C
-rm TGrid/P010_TAlien.C
-rm TGrid/P020_TGLite.C
-rm TImagePlugin/P010_TASPluginGS.C
-rm TSQLServer/P030_TSapDBServer.C
-rm TSQLServer/P040_TOracleServer.C
-rm TSystem/P030_TAlienSystem.C
-%if %{hadoop} == 0
-rm TSystem/P060_THDFSSystem.C
-%endif
-rm TViewerX3D/P020_TQtViewerX3D.C
-rm TVirtualGLImp/P020_TGWin32GL.C
-rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
-rm TVirtualX/P030_TGWin32.C
-rm TVirtualX/P050_TGQuartz.C
-%if %{xrootd} == 0
-rm TFile/P100_TXNetFile.C
-rm TFileStager/P010_TXNetFileStager.C
-rm TProofMgr/P010_TXProofMgr.C
-rm TProofServ/P010_TXProofServ.C
-rm TSlave/P010_TXSlave.C
-rm TSystem/P040_TXNetSystem.C
-%endif
-rmdir TAFS
-rmdir TDataProgressDialog
-rmdir TGrid
-rmdir TImagePlugin
-popd
-
-# Create ldconfig configuration
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name} > \
-     %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-
-# Rename to avoid name clashes
-cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
-cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
-cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
-
-# Generate documentation
-pushd documentation/doxygen
-ln -s ../../files files
-sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
-    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
-    ROOTSYS=${PWD}/../../builddir \
-    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
-mv doc/html %{buildroot}%{_pkgdocdir}/html
-popd
-
-# Create includelist files ...
-for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
-    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
-    l=`tr / - <<< $l`
-    tmpdir=`mktemp -d`
-    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
-	sort | sed 's!^\.!!' > $l
-    rm -rf $tmpdir
-done
-
-# ... and merge some of them
-cat includelist-core-{[^mw],m[^au]}* > includelist-core
-cat includelist-geom-geom* > includelist-geom
-cat includelist-roofit-roo* > includelist-roofit
-cat includelist-gui-qt* > includelist-gui-qt
-cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
-cat includelist-gui-guihtml >> includelist-gui-gui
-cat includelist-io-xmlparser >> includelist-io-xml
-cat includelist-proof-proofplayer >> includelist-proof-proof
-cat includelist-net-netx* > includelist-netx
-
-%check
-pushd builddir
-pushd test
-ln -s ../../files files
-popd
-pushd runtutorials
-ln -s ../../files files
-popd
-# Exclude some tests that can not be run
-# - test-stressIOPlugins-*
-#   requires network access (by design since they test the remote file IO)
-# - tutorial-tree-run_h1analysis
-#   requires network access: http://root.cern.ch/files/h1/
-# - tutorial-r-*
-#   occasionally causes random crashes
-# - tutorial-multicore-mp*
-#   currently fails on ix86 and arm
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
-%ifarch %{ix86} %{arm}
-excluded="${excluded}|tutorial-multicore-mp.*"
-%endif
-make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
-popd
-
-%post
-touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
-    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-fi
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-
-%post rootd
-/sbin/chkconfig --add rootd
-
-%preun rootd
-if [ $1 = 0 ] ; then
-    /sbin/service rootd stop >/dev/null 2>&1
-    /sbin/chkconfig --del rootd
-fi
-
-%postun rootd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service rootd condrestart >/dev/null 2>&1 || :
-fi
-
-%post proofd
-/sbin/chkconfig --add proofd
-
-%preun proofd
-if [ $1 = 0 ] ; then
-    /sbin/service proofd stop >/dev/null 2>&1
-    /sbin/chkconfig --del proofd
-fi
-
-%postun proofd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service proofd condrestart >/dev/null 2>&1 || :
-fi
-
-%post python
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
-    done
-fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
-/sbin/ldconfig
-
-%preun python
-if [ $1 = 0 ]; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python_sitearch}/libPyROOT.so
-fi
-
-%postun python -p /sbin/ldconfig
-
-%post %{python3pkg}
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
-    done
-fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
-/sbin/ldconfig
-
-%preun %{python3pkg}
-if [ $1 = 0 ]; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
-fi
-
-%postun %{python3pkg} -p /sbin/ldconfig
-
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
-%post cling -p /sbin/ldconfig
-%postun cling -p /sbin/ldconfig
-%if %{ruby}
-%post ruby -p /sbin/ldconfig
-%postun ruby -p /sbin/ldconfig
-%endif
-%post r -p /sbin/ldconfig
-%postun r -p /sbin/ldconfig
-%post r-tools -p /sbin/ldconfig
-%postun r-tools -p /sbin/ldconfig
-%post genetic -p /sbin/ldconfig
-%postun genetic -p /sbin/ldconfig
-%post geom -p /sbin/ldconfig
-%postun geom -p /sbin/ldconfig
-%post gdml -p /sbin/ldconfig
-%postun gdml -p /sbin/ldconfig
-%if %{oce}
-%post geocad -p /sbin/ldconfig
-%postun geocad -p /sbin/ldconfig
-%endif
-%post graf -p /sbin/ldconfig
-%postun graf -p /sbin/ldconfig
-%post graf-asimage -p /sbin/ldconfig
-%postun graf-asimage -p /sbin/ldconfig
-%post graf-fitsio -p /sbin/ldconfig
-%postun graf-fitsio -p /sbin/ldconfig
-%post graf-gpad -p /sbin/ldconfig
-%postun graf-gpad -p /sbin/ldconfig
-%post graf-gviz -p /sbin/ldconfig
-%postun graf-gviz -p /sbin/ldconfig
-%post graf-postscript -p /sbin/ldconfig
-%postun graf-postscript -p /sbin/ldconfig
-%post graf-qt -p /sbin/ldconfig
-%postun graf-qt -p /sbin/ldconfig
-%post graf-x11 -p /sbin/ldconfig
-%postun graf-x11 -p /sbin/ldconfig
-%post graf3d -p /sbin/ldconfig
-%postun graf3d -p /sbin/ldconfig
-%post graf3d-eve -p /sbin/ldconfig
-%postun graf3d-eve -p /sbin/ldconfig
-%post graf3d-gl -p /sbin/ldconfig
-%postun graf3d-gl -p /sbin/ldconfig
-%post graf3d-gviz3d -p /sbin/ldconfig
-%postun graf3d-gviz3d -p /sbin/ldconfig
-%post graf3d-x3d -p /sbin/ldconfig
-%postun graf3d-x3d -p /sbin/ldconfig
-%post gui -p /sbin/ldconfig
-%postun gui -p /sbin/ldconfig
-%post gui-fitpanel -p /sbin/ldconfig
-%postun gui-fitpanel -p /sbin/ldconfig
-%post gui-ged -p /sbin/ldconfig
-%postun gui-ged -p /sbin/ldconfig
-%post guibuilder -p /sbin/ldconfig
-%postun guibuilder -p /sbin/ldconfig
-%post gui-qt -p /sbin/ldconfig
-%postun gui-qt -p /sbin/ldconfig
-%post gui-recorder -p /sbin/ldconfig
-%postun gui-recorder -p /sbin/ldconfig
-%post hbook -p /sbin/ldconfig
-%postun hbook -p /sbin/ldconfig
-%post hist -p /sbin/ldconfig
-%postun hist -p /sbin/ldconfig
-%post hist-painter -p /sbin/ldconfig
-%postun hist-painter -p /sbin/ldconfig
-%post spectrum -p /sbin/ldconfig
-%postun spectrum -p /sbin/ldconfig
-%post spectrum-painter -p /sbin/ldconfig
-%postun spectrum-painter -p /sbin/ldconfig
-%post hist-factory -p /sbin/ldconfig
-%postun hist-factory -p /sbin/ldconfig
-%post html -p /sbin/ldconfig
-%postun html -p /sbin/ldconfig
-%post io -p /sbin/ldconfig
-%postun io -p /sbin/ldconfig
-%post io-dcache -p /sbin/ldconfig
-%postun io-dcache -p /sbin/ldconfig
-%post io-gfal -p /sbin/ldconfig
-%postun io-gfal -p /sbin/ldconfig
-%if %{hadoop}
-%post io-hdfs -p /sbin/ldconfig
-%postun io-hdfs -p /sbin/ldconfig
-%endif
-%post io-rfio -p /sbin/ldconfig
-%postun io-rfio -p /sbin/ldconfig
-%post io-sql -p /sbin/ldconfig
-%postun io-sql -p /sbin/ldconfig
-%post io-xml -p /sbin/ldconfig
-%postun io-xml -p /sbin/ldconfig
-%post foam -p /sbin/ldconfig
-%postun foam -p /sbin/ldconfig
-%post fftw -p /sbin/ldconfig
-%postun fftw -p /sbin/ldconfig
-%post fumili -p /sbin/ldconfig
-%postun fumili -p /sbin/ldconfig
-%post genvector -p /sbin/ldconfig
-%postun genvector -p /sbin/ldconfig
-%post mathcore -p /sbin/ldconfig
-%postun mathcore -p /sbin/ldconfig
-%post mathmore -p /sbin/ldconfig
-%postun mathmore -p /sbin/ldconfig
-%post matrix -p /sbin/ldconfig
-%postun matrix -p /sbin/ldconfig
-%post minuit -p /sbin/ldconfig
-%postun minuit -p /sbin/ldconfig
-%post minuit2 -p /sbin/ldconfig
-%postun minuit2 -p /sbin/ldconfig
-%post mlp -p /sbin/ldconfig
-%postun mlp -p /sbin/ldconfig
-%post physics -p /sbin/ldconfig
-%postun physics -p /sbin/ldconfig
-%post quadp -p /sbin/ldconfig
-%postun quadp -p /sbin/ldconfig
-%post smatrix -p /sbin/ldconfig
-%postun smatrix -p /sbin/ldconfig
-%post splot -p /sbin/ldconfig
-%postun splot -p /sbin/ldconfig
-%post unuran -p /sbin/ldconfig
-%postun unuran -p /sbin/ldconfig
-%post memstat -p /sbin/ldconfig
-%postun memstat -p /sbin/ldconfig
-%post table -p /sbin/ldconfig
-%postun table -p /sbin/ldconfig
-%post montecarlo-eg -p /sbin/ldconfig
-%postun montecarlo-eg -p /sbin/ldconfig
-%if %{pythia8}
-%post montecarlo-pythia8 -p /sbin/ldconfig
-%postun montecarlo-pythia8 -p /sbin/ldconfig
-%endif
-%post montecarlo-vmc -p /sbin/ldconfig
-%postun montecarlo-vmc -p /sbin/ldconfig
-%post net -p /sbin/ldconfig
-%postun net -p /sbin/ldconfig
-%post net-rpdutils -p /sbin/ldconfig
-%postun net-rpdutils -p /sbin/ldconfig
-%post net-bonjour -p /sbin/ldconfig
-%postun net-bonjour -p /sbin/ldconfig
-%post net-auth -p /sbin/ldconfig
-%postun net-auth -p /sbin/ldconfig
-%post net-davix -p /sbin/ldconfig
-%postun net-davix -p /sbin/ldconfig
-%post net-globus -p /sbin/ldconfig
-%postun net-globus -p /sbin/ldconfig
-%post net-krb5 -p /sbin/ldconfig
-%postun net-krb5 -p /sbin/ldconfig
-%post net-ldap -p /sbin/ldconfig
-%postun net-ldap -p /sbin/ldconfig
-%post net-http -p /sbin/ldconfig
-%postun net-http -p /sbin/ldconfig
-%if %{xrootd}
-%post netx -p /sbin/ldconfig
-%postun netx -p /sbin/ldconfig
-%endif
-%post proof -p /sbin/ldconfig
-%postun proof -p /sbin/ldconfig
-%post proof-sessionviewer -p /sbin/ldconfig
-%postun proof-sessionviewer -p /sbin/ldconfig
-%if %{xrootd}
-%post xproof -p /sbin/ldconfig
-%postun xproof -p /sbin/ldconfig
-%endif
-%post roofit -p /sbin/ldconfig
-%postun roofit -p /sbin/ldconfig
-%post sql-mysql -p /sbin/ldconfig
-%postun sql-mysql -p /sbin/ldconfig
-%post sql-odbc -p /sbin/ldconfig
-%postun sql-odbc -p /sbin/ldconfig
-%post sql-sqlite -p /sbin/ldconfig
-%postun sql-sqlite -p /sbin/ldconfig
-%post sql-pgsql -p /sbin/ldconfig
-%postun sql-pgsql -p /sbin/ldconfig
-%post tmva -p /sbin/ldconfig
-%postun tmva -p /sbin/ldconfig
-%post tmva-python -p /sbin/ldconfig
-%postun tmva-python -p /sbin/ldconfig
-%post tmva-r -p /sbin/ldconfig
-%postun tmva-r -p /sbin/ldconfig
-%post tmva-gui -p /sbin/ldconfig
-%postun tmva-gui -p /sbin/ldconfig
-%post tree -p /sbin/ldconfig
-%postun tree -p /sbin/ldconfig
-%post tree-player -p /sbin/ldconfig
-%postun tree-player -p /sbin/ldconfig
-%post tree-viewer -p /sbin/ldconfig
-%postun tree-viewer -p /sbin/ldconfig
-
-%files
-%{_bindir}/hadd
-%{_bindir}/root
-%{_bindir}/root.exe
-%{_bindir}/rootn.exe
-%{_bindir}/roots
-%{_bindir}/roots.exe
-%{_bindir}/ssh2rpd
-%{_mandir}/man1/hadd.1*
-%{_mandir}/man1/root.1*
-%{_mandir}/man1/root.exe.1*
-%{_mandir}/man1/rootn.exe.1*
-%{_mandir}/man1/roots.exe.1*
-%{_mandir}/man1/ssh2rpd.1*
-%{_datadir}/applications/root.desktop
-%{_datadir}/icons/hicolor/48x48/apps/root.png
-%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
-%{_datadir}/mime/packages/root.xml
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitelispdir}/%{name}/*.el
-
-%files icons
-%{_datadir}/%{name}/icons
-
-%files fonts
-%{_datadir}/%{name}/fonts
-
-%files core -f includelist-core
-%{_bindir}/memprobe
-%{_bindir}/rlibmap
-%{_bindir}/rmkdepend
-%{_bindir}/root-config
-%{_mandir}/man1/memprobe.1*
-%{_mandir}/man1/rmkdepend.1*
-%{_mandir}/man1/root-config.1*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libCore.*
-%{_libdir}/%{name}/libNew.*
-%{_libdir}/%{name}/libRint.*
-%{_libdir}/%{name}/libThread.*
-%{_libdir}/%{name}/lib*Dict.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/allDict.cxx.pch
-%{_datadir}/%{name}/class.rules
-%{_datadir}/%{name}/gdb-backtrace.sh
-%{_datadir}/%{name}/helgrind-root.supp
-%{_datadir}/%{name}/Makefile.arch
-%{_datadir}/%{name}/root.mimes
-%{_datadir}/%{name}/system.rootauthrc
-%{_datadir}/%{name}/system.rootdaemonrc
-%{_datadir}/%{name}/system.rootrc
-%{_datadir}/%{name}/valgrind-root-python.supp
-%{_mandir}/man1/system.rootdaemonrc.1*
-%dir %{_datadir}/%{name}/cmake
-%{_datadir}/%{name}/cmake/*.cmake
-%dir %{_datadir}/%{name}/cmake/modules
-%{_datadir}/%{name}/cmake/modules/*.cmake
-%{_datadir}/%{name}/cmake/modules/*.cmake.in
-%dir %{_datadir}/%{name}/macros
-%{_datadir}/%{name}/macros/Dialogs.C
-%dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/plugins/*
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/RConfigOptions.h
-%{_includedir}/%{name}/RConfigure.h
-%{_includedir}/%{name}/RGitCommit.h
-%{_includedir}/%{name}/compiledata.h
-%dir %{_includedir}/%{name}/Math
-%{_datadir}/aclocal/root.m4
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%dir %{_pkgdocdir}
-# CREDITS and LICENSE are used at runtime by the .credits and .license commands
-# They therefore should not be marked doc.
-%{_pkgdocdir}/CREDITS
-%{_pkgdocdir}/LICENSE
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/ReleaseNotes
-%license LICENSE
-
-%files multiproc -f includelist-core-multiproc
-%{_libdir}/%{name}/libMultiProc.*
-%{_libdir}/%{name}/libMultiProc_rdict.pcm
-
-%files cling
-%{_bindir}/genreflex
-%{_bindir}/rootcint
-%{_bindir}/rootcling
-%{_libdir}/%{name}/libCling.*
-%{_datadir}/%{name}/cling
-%{_datadir}/%{name}/dictpch
-%doc interpreter/cling/CREDITS.txt
-%doc interpreter/cling/README.md
-%license interpreter/cling/LICENSE.TXT
-%doc interpreter/llvm/src/llvm-CREDITS.TXT
-%doc interpreter/llvm/src/llvm-README.txt
-%license interpreter/llvm/src/llvm-LICENSE.TXT
-
-%files doc
-%doc %{_pkgdocdir}/html
-
-%files tutorial
-%doc %{_pkgdocdir}/test
-%doc %{_pkgdocdir}/tutorials
-
-%files proofd
-%{_bindir}/proofd
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
-%{_mandir}/man1/proofd.1*
-%{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
-%{_initrddir}/proofd
-
-%files rootd
-%{_bindir}/rootd
-%{_mandir}/man1/rootd.1*
-%{_initrddir}/rootd
-
-%files python -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python_sitearch}/libPyROOT.so
-%{python_sitearch}/ROOT.py*
-%{python_sitearch}/cppyy.py*
-%{python_sitearch}/_pythonization.py*
-
-%files %{python3pkg} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_sitearch}/libPyROOT%{py3soabi}.so
-%{python3_sitearch}/ROOT.py
-%{python3_sitearch}/cppyy.py
-%{python3_sitearch}/_pythonization.py
-%{python3_sitearch}/__pycache__
-
-%if %{ruby}
-%files ruby -f includelist-bindings-ruby
-%{_libdir}/%{name}/libRuby.*
-%{_libdir}/%{name}/libRuby_rdict.pcm
-%{ruby_vendorarchdir}/libRuby.*
-%endif
-
-%files r -f includelist-bindings-r
-%{_libdir}/%{name}/libRInterface.*
-%{_libdir}/%{name}/libRInterface_rdict.pcm
-%doc bindings/r/doc/users-guide/*.md
-
-%files r-tools -f includelist-math-rtools
-%{_libdir}/%{name}/libRtools.*
-%{_libdir}/%{name}/libRtools_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
-
-%files genetic -f includelist-math-genetic
-%{_libdir}/%{name}/libGenetic.*
-%{_libdir}/%{name}/libGenetic_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
-
-%files geom -f includelist-geom
-%{_libdir}/%{name}/libGeom.*
-%{_libdir}/%{name}/libGeom_rdict.pcm
-%{_libdir}/%{name}/libGeomBuilder.*
-%{_libdir}/%{name}/libGeomBuilder_rdict.pcm
-%{_libdir}/%{name}/libGeomPainter.*
-%{_libdir}/%{name}/libGeomPainter_rdict.pcm
-%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
-%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
-%{_datadir}/%{name}/RadioNuclides.txt
-
-%files gdml -f includelist-geom-gdml
-%{_libdir}/%{name}/libGdml.*
-%{_libdir}/%{name}/libGdml_rdict.pcm
-
-%if %{oce}
-%files geocad -f includelist-geom-geocad
-%{_libdir}/%{name}/libGeoCad.*
-%{_libdir}/%{name}/libGeoCad_rdict.pcm
-%endif
-
-%files graf -f includelist-graf2d-graf
-%{_libdir}/%{name}/libGraf.*
-%{_libdir}/%{name}/libGraf_rdict.pcm
-%{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
-
-%files graf-asimage -f includelist-graf2d-asimage
-%{_libdir}/%{name}/libASImage.*
-%{_libdir}/%{name}/libASImage_rdict.pcm
-%{_libdir}/%{name}/libASImageGui.*
-%{_libdir}/%{name}/libASImageGui_rdict.pcm
-%{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
-%{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
-
-%files graf-fitsio -f includelist-graf2d-fitsio
-%{_libdir}/%{name}/libFITSIO.*
-%{_libdir}/%{name}/libFITSIO_rdict.pcm
-
-%files graf-gpad -f includelist-graf2d-gpad
-%{_libdir}/%{name}/libGpad.*
-%{_libdir}/%{name}/libGpad_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
-
-%files graf-gviz -f includelist-graf2d-gviz
-%{_libdir}/%{name}/libGviz.*
-%{_libdir}/%{name}/libGviz_rdict.pcm
-
-%files graf-postscript -f includelist-graf2d-postscript
-%{_libdir}/%{name}/libPostscript.*
-%{_libdir}/%{name}/libPostscript_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
-
-%files graf-qt -f includelist-graf2d-qt
-%{_libdir}/%{name}/libGQt.*
-%{_libdir}/%{name}/libGQt_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
-
-%files graf-x11 -f includelist-graf2d-x11
-%{_libdir}/%{name}/libGX11.*
-%{_libdir}/%{name}/libGX11_rdict.pcm
-%{_libdir}/%{name}/libGX11TTF.*
-%{_libdir}/%{name}/libGX11TTF_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
-%{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
-
-%files graf3d -f includelist-graf3d-g3d
-%{_libdir}/%{name}/libGraf3d.*
-%{_libdir}/%{name}/libGraf3d_rdict.pcm
-%{_datadir}/%{name}/plugins/TView/P010_TView3D.C
-
-%files graf3d-eve -f includelist-graf3d-eve
-%{_libdir}/%{name}/libEve.*
-%{_libdir}/%{name}/libEve_rdict.pcm
-
-%files graf3d-gl -f includelist-graf3d-gl
-%{_libdir}/%{name}/libRGL.*
-%{_libdir}/%{name}/libRGL_rdict.pcm
-%{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
-%{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
-%{_datadir}/%{name}/plugins/TVirtualGLImp/P010_TX11GL.C
-%{_datadir}/%{name}/plugins/TVirtualPadPainter/P010_TGLPadPainter.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P020_TGLSAViewer.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P030_TGLViewer.C
-
-%files graf3d-gviz3d -f includelist-graf3d-gviz3d
-%{_libdir}/%{name}/libGviz3d.*
-%{_libdir}/%{name}/libGviz3d_rdict.pcm
-
-%files graf3d-x3d -f includelist-graf3d-x3d
-%{_libdir}/%{name}/libX3d.*
-%{_libdir}/%{name}/libX3d_rdict.pcm
-%{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TVirtualViewerX3D.C
-
-%files gui -f includelist-gui-gui
-%{_libdir}/%{name}/libGui.*
-%{_libdir}/%{name}/libGui_rdict.pcm
-%{_libdir}/%{name}/libGuiHtml.*
-%{_libdir}/%{name}/libGuiHtml_rdict.pcm
-%{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
-%{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
-%{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
-%{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
-
-%files gui-fitpanel -f includelist-gui-fitpanel
-%{_libdir}/%{name}/libFitPanel.*
-%{_libdir}/%{name}/libFitPanel_rdict.pcm
-%{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
-
-%files gui-ged -f includelist-gui-ged
-%{_libdir}/%{name}/libGed.*
-%{_libdir}/%{name}/libGed_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
-
-%files guibuilder -f includelist-gui-guibuilder
-%{_libdir}/%{name}/libGuiBld.*
-%{_libdir}/%{name}/libGuiBld_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
-%{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
-
-%files gui-qt -f includelist-gui-qt
-%{_libdir}/%{name}/libQtRoot.*
-%{_libdir}/%{name}/libQtRoot_rdict.pcm
-%{_libdir}/%{name}/libQtGSI.*
-%{_libdir}/%{name}/libQtGSI_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
-
-%files gui-recorder -f includelist-gui-recorder
-%{_libdir}/%{name}/libRecorder.*
-%{_libdir}/%{name}/libRecorder_rdict.pcm
-
-%files hbook -f includelist-hist-hbook
-%{_bindir}/g2root
-%{_bindir}/h2root
-%{_mandir}/man1/g2root.1*
-%{_mandir}/man1/h2root.1*
-%{_libdir}/%{name}/libHbook.*
-%{_libdir}/%{name}/libHbook_rdict.pcm
-
-%files hist -f includelist-hist-hist
-%{_libdir}/%{name}/libHist.*
-%{_libdir}/%{name}/libHist_rdict.pcm
-
-%files hist-painter -f includelist-hist-histpainter
-%{_libdir}/%{name}/libHistPainter.*
-%{_libdir}/%{name}/libHistPainter_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
-%{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
-
-%files spectrum -f includelist-hist-spectrum
-%{_libdir}/%{name}/libSpectrum.*
-%{_libdir}/%{name}/libSpectrum_rdict.pcm
-
-%files spectrum-painter -f includelist-hist-spectrumpainter
-%{_libdir}/%{name}/libSpectrumPainter.*
-%{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
-
-%files hist-factory -f includelist-roofit-histfactory
-%{_bindir}/hist2workspace
-%{_bindir}/prepareHistFactory
-%{_mandir}/man1/hist2workspace.1*
-%{_mandir}/man1/prepareHistFactory.1*
-%{_libdir}/%{name}/libHistFactory.*
-%{_libdir}/%{name}/libHistFactory_rdict.pcm
-%{_datadir}/%{name}/HistFactorySchema.dtd
-%dir %{_includedir}/%{name}/RooStats/HistFactory
-%doc roofit/histfactory/doc/README
-
-%files html -f includelist-html
-%{_libdir}/%{name}/libHtml.*
-%{_libdir}/%{name}/libHtml_rdict.pcm
-%{_datadir}/%{name}/html
-
-%files io -f includelist-io-io
-%{_libdir}/%{name}/libRIO.*
-%{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
-%{_datadir}/%{name}/plugins/TVirtualStreamerInfo/P010_TStreamerInfo.C
-
-%files io-dcache -f includelist-io-dcache
-%{_libdir}/%{name}/libDCache.*
-%{_libdir}/%{name}/libDCache_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
-%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
-
-%files io-gfal -f includelist-io-gfal
-%{_libdir}/%{name}/libGFAL.*
-%{_libdir}/%{name}/libGFAL_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-
-%if %{hadoop}
-%files io-hdfs -f includelist-io-hdfs
-%{_libdir}/%{name}/libHDFS.*
-%{_libdir}/%{name}/libHDFS_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
-%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
-%endif
-
-%files io-rfio -f includelist-io-rfio
-%{_libdir}/%{name}/libRFIO.*
-%{_libdir}/%{name}/libRFIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
-%{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
-
-%files io-sql -f includelist-io-sql
-%{_libdir}/%{name}/libSQLIO.*
-%{_libdir}/%{name}/libSQLIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
-
-%files io-xml -f includelist-io-xml
-%{_libdir}/%{name}/libXMLIO.*
-%{_libdir}/%{name}/libXMLIO_rdict.pcm
-%{_libdir}/%{name}/libXMLParser.*
-%{_libdir}/%{name}/libXMLParser_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
-
-%files foam -f includelist-math-foam
-%{_libdir}/%{name}/libFoam.*
-%{_libdir}/%{name}/libFoam_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
-
-%files fftw -f includelist-math-fftw
-%{_libdir}/%{name}/libFFTW.*
-%{_libdir}/%{name}/libFFTW_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P030_TFFTRealComplex.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P040_TFFTReal.C
-
-%files fumili -f includelist-math-fumili
-%{_libdir}/%{name}/libFumili.*
-%{_libdir}/%{name}/libFumili_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
-
-%files genvector -f includelist-math-genvector
-%{_libdir}/%{name}/libGenVector.*
-%{_libdir}/%{name}/libGenVector_rdict.pcm
-%{_libdir}/%{name}/libGenVector32.rootmap
-%{_libdir}/%{name}/libGenVector_G__GenVector32_rdict.pcm
-%dir %{_includedir}/%{name}/Math/GenVector
-
-%files mathcore -f includelist-math-mathcore
-%{_libdir}/%{name}/libMathCore.*
-%{_libdir}/%{name}/libMathCore_rdict.pcm
-%dir %{_includedir}/%{name}/Fit
-
-%files mathmore -f includelist-math-mathmore
-%{_libdir}/%{name}/libMathMore.*
-%{_libdir}/%{name}/libMathMore_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P030_FalsePos.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P040_Newton.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P050_Secant.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P060_Steffenson.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P030_GSLMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P040_GSLNLSMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P050_GSLSimAnMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P010_GSLIntegrator.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P020_GSLMCIntegrator.C
-
-%files matrix -f includelist-math-matrix
-%{_libdir}/%{name}/libMatrix.*
-%{_libdir}/%{name}/libMatrix_rdict.pcm
-
-%files minuit -f includelist-math-minuit
-%{_libdir}/%{name}/libMinuit.*
-%{_libdir}/%{name}/libMinuit_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
-
-%files minuit2 -f includelist-math-minuit2
-%{_libdir}/%{name}/libMinuit2.*
-%{_libdir}/%{name}/libMinuit2_rdict.pcm
-%dir %{_includedir}/%{name}/Minuit2
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
-
-%files mlp -f includelist-math-mlp
-%{_libdir}/%{name}/libMLP.*
-%{_libdir}/%{name}/libMLP_rdict.pcm
-
-%files physics -f includelist-math-physics
-%{_libdir}/%{name}/libPhysics.*
-%{_libdir}/%{name}/libPhysics_rdict.pcm
-
-%files quadp -f includelist-math-quadp
-%{_libdir}/%{name}/libQuadp.*
-%{_libdir}/%{name}/libQuadp_rdict.pcm
-
-%files smatrix -f includelist-math-smatrix
-%{_libdir}/%{name}/libSmatrix.*
-%{_libdir}/%{name}/libSmatrix_rdict.pcm
-%{_libdir}/%{name}/libSmatrix32.rootmap
-%{_libdir}/%{name}/libSmatrix_G__Smatrix32_rdict.pcm
-
-%files splot -f includelist-math-splot
-%{_libdir}/%{name}/libSPlot.*
-%{_libdir}/%{name}/libSPlot_rdict.pcm
-
-%files unuran -f includelist-math-unuran
-%{_libdir}/%{name}/libUnuran.*
-%{_libdir}/%{name}/libUnuran_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
-
-%files vdt -f includelist-math-vdt
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/vdt
-%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
-%license math/vdt/Licence.md
-
-%files memstat -f includelist-misc-memstat
-%{_libdir}/%{name}/libMemStat.*
-%{_libdir}/%{name}/libMemStat_rdict.pcm
-
-%files table -f includelist-misc-table
-%{_libdir}/%{name}/libTable.*
-%{_libdir}/%{name}/libTable_rdict.pcm
-
-%files montecarlo-eg -f includelist-montecarlo-eg
-%{_libdir}/%{name}/libEG.*
-%{_libdir}/%{name}/libEG_rdict.pcm
-%{_datadir}/%{name}/pdg_table.txt
-%doc %{_pkgdocdir}/cfortran.doc
-
-%if %{pythia8}
-%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
-%{_libdir}/%{name}/libEGPythia8.*
-%{_libdir}/%{name}/libEGPythia8_rdict.pcm
-%endif
-
-%files montecarlo-vmc -f includelist-montecarlo-vmc
-%{_libdir}/%{name}/libVMC.*
-%{_libdir}/%{name}/libVMC_rdict.pcm
-%{_datadir}/%{name}/vmc
-
-%files net -f includelist-net-net
-%{_libdir}/%{name}/libNet.*
-%{_libdir}/%{name}/libNet_rdict.pcm
-%{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
-%{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
-%{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
-%{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
-%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
-%{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
-%{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
-%{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
-%{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
-
-%files net-rpdutils -f includelist-net-rpdutils
-%{_libdir}/%{name}/libSrvAuth.*
-
-%files net-bonjour -f includelist-net-bonjour
-%{_libdir}/%{name}/libBonjour.*
-%{_libdir}/%{name}/libBonjour_rdict.pcm
-
-%files net-auth -f includelist-net-auth
-%{_libdir}/%{name}/libRootAuth.*
-%{_libdir}/%{name}/libRootAuth_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
-%doc %{_pkgdocdir}/README.AUTH
-
-%files net-davix -f includelist-net-davix
-%{_libdir}/%{name}/libRDAVIX.*
-%{_libdir}/%{name}/libRDAVIX_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
-%{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
-
-%files net-globus
-%{_libdir}/%{name}/libGlobusAuth.*
-%doc %{_pkgdocdir}/README.GLOBUS
-
-%files net-krb5 -f includelist-net-krb5auth
-%{_libdir}/%{name}/libKrb5Auth.*
-%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
-
-%files net-ldap -f includelist-net-ldap
-%{_libdir}/%{name}/libRLDAP.*
-%{_libdir}/%{name}/libRLDAP_rdict.pcm
-
-%files net-http -f includelist-net-http
-%{_libdir}/%{name}/libRHTTP.*
-%{_libdir}/%{name}/libRHTTP_rdict.pcm
-%{_datadir}/%{name}/http
-%doc net/http/README.txt net/http/civetweb/*.md
-
-%if %{xrootd}
-%files netx -f includelist-netx
-%{_libdir}/%{name}/libNetx.*
-%{_libdir}/%{name}/libNetx_rdict.pcm
-%{_libdir}/%{name}/libNetxNG.*
-%{_libdir}/%{name}/libNetxNG_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
-%{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
-%{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
-%endif
-
-%files proof -f includelist-proof-proof
-%{_libdir}/%{name}/libProof.*
-%{_libdir}/%{name}/libProof_rdict.pcm
-%{_libdir}/%{name}/libProofDraw.*
-%{_libdir}/%{name}/libProofDraw_rdict.pcm
-%{_libdir}/%{name}/libProofPlayer.*
-%{_libdir}/%{name}/libProofPlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
-%{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
-%{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
-%{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
-%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
-%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
-%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
-%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
-%{_datadir}/%{name}/valgrind-root.supp
-%doc %{_pkgdocdir}/README.PROOF
-
-%files proof-bench -f includelist-proof-proofbench
-%{_libdir}/%{name}/libProofBench.*
-%{_libdir}/%{name}/libProofBench_rdict.pcm
-%{_datadir}/%{name}/proof
-
-%files proof-pq2 -f includelist-proof-pq2
-%{_bindir}/pq2*
-%{_mandir}/man1/pq2*.1*
-
-%files proof-sessionviewer -f includelist-gui-sessionviewer
-%{_libdir}/%{name}/libSessionViewer.*
-%{_libdir}/%{name}/libSessionViewer_rdict.pcm
-%{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
-%{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
-%{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
-
-%if %{xrootd}
-%files xproof -f includelist-proof-proofx
-%{_bindir}/proofexecv
-%{_bindir}/xproofd
-%{_mandir}/man1/xproofd.1*
-%{_libdir}/%{name}/libProofx.*
-%{_libdir}/%{name}/libProofx_rdict.pcm
-%{_libdir}/%{name}/libXrdProofd.*
-%{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
-%{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
-%{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
-%endif
-
-%files roofit -f includelist-roofit
-%{_libdir}/%{name}/libRooFit.*
-%{_libdir}/%{name}/libRooFit_rdict.pcm
-%{_libdir}/%{name}/libRooFitCore.*
-%{_libdir}/%{name}/libRooFitCore_rdict.pcm
-%{_libdir}/%{name}/libRooStats.*
-%{_libdir}/%{name}/libRooStats_rdict.pcm
-%dir %{_includedir}/%{name}/RooStats
-
-%files sql-mysql -f includelist-sql-mysql
-%{_libdir}/%{name}/libRMySQL.*
-%{_libdir}/%{name}/libRMySQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
-
-%files sql-odbc -f includelist-sql-odbc
-%{_libdir}/%{name}/libRODBC.*
-%{_libdir}/%{name}/libRODBC_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
-
-%files sql-sqlite -f includelist-sql-sqlite
-%{_libdir}/%{name}/libRSQLite.*
-%{_libdir}/%{name}/libRSQLite_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
-
-%files sql-pgsql -f includelist-sql-pgsql
-%{_libdir}/%{name}/libPgSQL.*
-%{_libdir}/%{name}/libPgSQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
-
-%files tmva -f includelist-tmva-tmva
-%{_libdir}/%{name}/libTMVA.*
-%{_libdir}/%{name}/libTMVA_rdict.pcm
-%dir %{_includedir}/%{name}/TMVA
-%license tmva/doc/LICENSE
-
-%files tmva-python -f includelist-tmva-pymva
-%{_libdir}/%{name}/libPyMVA.*
-%{_libdir}/%{name}/libPyMVA_rdict.pcm
-
-%files tmva-r -f includelist-tmva-rmva
-%{_libdir}/%{name}/libRMVA.*
-%{_libdir}/%{name}/libRMVA_rdict.pcm
-
-%files tmva-gui -f includelist-tmva-tmvagui
-%{_libdir}/%{name}/libTMVAGui.*
-%{_libdir}/%{name}/libTMVAGui_rdict.pcm
-
-%files tree -f includelist-tree-tree
-%{_libdir}/%{name}/libTree.*
-%{_libdir}/%{name}/libTree_rdict.pcm
-%doc %{_pkgdocdir}/README.SELECTOR
-
-%files tree-player -f includelist-tree-treeplayer
-%{_libdir}/%{name}/libTreePlayer.*
-%{_libdir}/%{name}/libTreePlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
-%{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
-
-%files tree-viewer -f includelist-tree-treeviewer
-%{_libdir}/%{name}/libTreeViewer.*
-%{_libdir}/%{name}/libTreeViewer_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
-
-%files cli
-%{_bindir}/rootbrowse
-%{_bindir}/rootcp
-%{_bindir}/rooteventselector
-%{_bindir}/rootls
-%{_bindir}/rootmkdir
-%{_bindir}/rootmv
-%{_bindir}/rootprint
-%{_bindir}/rootrm
-%{python_sitelib}/cmdLineUtils.py*
-
-%files notebook
-%{_bindir}/rootnb.exe
-%{_datadir}/%{name}/notebook
-
-%files rootaas
-%{python_sitelib}/ROOTaaS
-
-%changelog
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
-- Add requires on redhat-rpm-config to root-cling
-
-* Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
-- Update to 6.06.06
-- Drop patches root-gfal2.patch and root-keysymbols.patch
-- Make root-vdt package noarch
-
-* Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
-- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
-- Minor updates to patches - mostly backported from upstream
-- Reenable hadoop/hdfs support for F24+
-
-* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
-- Remove mathtext and minicern references from cmake files
-- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
-
-* Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
-- Disable hadoop/hdfs support for F24+ (hadoop was retired)
-
-* Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
-- Update to 6.06.04
-- Drop patch root-no-hexfloat-const.patch
-- Add requires on gcc-c++ to root-cling
-
-* Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
-- Rebuild for OCE-0.17.1
-
-* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
-- Update to 6.06.02 (F24+, EPEL7)
-- Change to cmake configuration (was using ./configure)
-- Change to doxygen documentation generation (was using THTML)
-- Run the test suite
-- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
-- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
-  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
-  root-notebook and root-rootaas
-- New subpackage for EPEL7: root-python34
-- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
-
-* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
-- Update to 5.34.36
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
-- Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
-
-* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
-- Rebuild for glew 1.13
-
-* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
-
-* Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
-- Adapt to gfal 2.10 - uses a different #define
-- Exclude ppc64le - has the same issues with cint as ppc and ppc64
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
-- Add versioned dependencies between packages
-- Reenable hadoop/hdfs support for F23+
-
-* Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
-- Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
-- Enable Cintex on aarch64
-
-* Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
-- Update to 5.34.32
-- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
-- Use GNU Free instead of Liberation, works better with TMathText
-- Fix segfault when embedding Type 1 fonts
-- Drop patch root-no-extra-formats.patch (workaround for above problem)
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
-- Update to 5.34.30
-- New sub-package: root-python3
-- Disable hadoop/hdfs support for F23+ (not installable)
-- Drop previously backported gcc 5 patches
-
-* Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
-- Update to 5.34.28
-- Merge emacs support files into main package (guidelines updated)
-
-* Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
-- Update to 5.34.26
-- Drop patch root-xrdversion.patch
-
-* Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
-- Rebuild with fixed cairo (bz 1183242)
-
-* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
-
-* Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
-- Update to 5.34.24
-- Drop patch root-bsd-misc.patch
-
-* Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
-- Move xproofd binaries from root-proofd to root-xproof
-- Adjust EPEL 7 font dependencies
-- Rebuild using new binutils (ld bug fixed - F21+)
-
-* Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
-- Update to 5.34.20
-- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
-- Do not depend on wine's fonts
-- Drop patch root-gccopt.patch
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
-- Update to 5.34.19
-- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
-- New sub-package: root-net-http
-- Drop patches root-thtml-revert.patch, root-gfal2.patch and
-  root-proofx-link-iolib.patch
-
-* Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
-- Add Requires on root-tree-player to root-gui-ged
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
-- Rebuild for ruby 2.1
-- Fix build failure on F21 (missing symbol in libProofx linking)
-
-* Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
-- Update to 5.34.18
-- Build GFAL module using libgfal2
-- New sub-package: root-vdt
-
-* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
-- Update to 5.34.17
-
-* Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
-- Update to 5.34.15
-- Drop patch root-davix.patch
-
-* Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
-- Rebuild for cfitsio 3.360
-
-* Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
-- Adapt to davix >= 0.2.8
-
-* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
-- Update to 5.34.14
-- New sub-package: root-net-davix
-- Drop patch root-pythia8-incdir.patch
-
-* Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
-- Update to 5.34.13
-- Remove java-devel build dependency (not needed with Fedora's libhdfs)
-- Adapt to pythia8 >= 8.1.80
-
-* Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
-- Fix hadoop lib location
-
-* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
-- rebuilt for GLEW 1.10
-
-* Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
-- Update to 5.34.10
-- New sub-package: root-io-hdfs (Fedora 20+)
-- New sub-package: root-sql-sqlite
-
-* Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
-- Exclude armv7hl - cint is not working
-- Use _pkgdocdir when defined
-- Use texlive-stix
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
-- Perl 5.18 rebuild
-
-* Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
-- Rebuild for cfitsio 3.350
-
-* Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
-- Update to 5.34.09
-- New sub-package: root-montecarlo-pythia8
-- Drop patch root-gfal-bits.patch
-- Use xz compression for source tarfile
-- Update ancient root version in EPEL
-
-* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
-- Update to 5.34.07
-
-* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
-- Update to 5.34.06
-- Drop patches root-gviz.patch, root-ruby-version.patch,
-  root-rev48681.patch and root-rev48831.patch
-
-* Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
-- Rebuild for ruby 2.0
-- Rebuild for cfitsio 3.340
-
-* Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
-- Update to 5.34.05
-- Rebuild for xrootd 3.3
-- Patch for latest graphviz (libcgraph)
-- Drop patches root-glibc.patch and root-tclass-fix.patch
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
-- Rebuild for glew 1.9.0
-
-* Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
-- Update to 5.34.02
-
-* Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
-- Rebuild for glew 1.7
-
-* Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
-- Update to 5.34.01
-- Remove sub-packages root-clarens and root-peac (dropped by upstream)
-
-* Thu Jul 05 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-2
-- Do the glibc 2.16 patch properly
-
-* Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
-- Update to 5.34.00
-- New sub-package: root-io-gfal
-
-* Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
-- Update to 5.32.03
-
-* Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
-- Update to 5.32.02
-
-* Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-2
-- Rebuild for xrootd 3.1.1
-
-* Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
-- Update to 5.32.01
-- Drop patches fixed upstream
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
-- Rebuilt for c++ ABI breakage
-
-* Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
-- Adapt to new ruby packaging guidelines
-
-* Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
-- Update to 5.32.00
-
-* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
-- Rebuild against PCRE 8.30
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
-- Update to 5.30.04
-
-* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.03-1
-- Update to 5.30.03
-
-* Fri Sep 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.02-1
-- Update to 5.30.02
-
-* Thu Aug 18 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.01-1
-- Update to 5.30.01
-- Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
-
-* Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-3
-- Backport upstream's fix for the i686 rootcint problem
-
-* Tue Jul 26 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-2
-- Add workaround for rootcint problem on i686
-- Pass default LDFLAGS (relro) to make
-
-* Sun Jul 24 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-1
-- Update to 5.30.00
-- Drop patch root-listbox-height.patch
-- New sub-package: root-proof-bench
-
-* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-2
-- Change build requires from qt-devel to qt4-devel
-
-* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-1
-- Update to 5.28.00e
-
-* Mon Jun 20 2011 ajax@redhat.com - 5.28.00d-2
-- Rebuild for new glew soname
-
-* Fri May 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00d-1
-- Update to 5.28.00d
-
-* Mon May 02 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1.1
-- Fix emacs Requires on RHEL5
-
-* Thu Apr 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1
-- Update to 5.28.00c
-
-* Wed Mar 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-2
-- Rebuild for mysql 5.5.10
-
-* Sat Mar 19 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-1
-- Update to 5.28.00b
-
-* Mon Feb 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00a-1
-- Update to 5.28.00a
-- Drop patches fixed upstream: root-afterimage.patch, root-htmldoc.patch,
-  root-xlibs-ppc.patch, root-cstddef.patch
-- Remove the fedpkg workaround - no longer needed
-
-* Sat Feb 12 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-4
-- Add workaround for changes in fedpkg
-
-* Thu Feb 10 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-3
-- Add Requires on root-graf-postscript to root-gpad
-- Require libAfterImage 1.20 or later to fix issues with circular markers in
-  batch mode
-- Add python26 subpackage for EPEL 5
-- Fix an issue where the last item in a TGFontTypeComboBox is almost
-  invisible (backported from upstream)
-- Add missing cstddef includes for gcc 4.6
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.28.00-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jan 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1.1
-- Fix linking of Xlibs on ppc
-
-* Wed Dec 15 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1
-- Update to 5.28.00
-- Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch,
-  root-missing-explicit-link.patch, root-split-latex.patch,
-  root-cern-filename.patch, root-make-3.82.patch,
-  root-fonttype-combobox-dtor.patch
-- New sub-packages: root-genetic, root-graf-fitsio, root-hist-factory,
-  root-proof-pq2
-- Make root-io a separate package again - the circular dependency with the
-  root-core package was resolved upstream
-
-* Fri Nov 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-3
-- Fix crash in TGFontTypeComboBox destructor
-- Add Requires on root-gui-ged to root-gui
-
-* Mon Nov 01 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-2
-- Rebuild for updated unuran
-
-* Fri Oct 22 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-1
-- Update to 5.26.00e
-- Drop patch fixed upstream: root-tmva-segfault.patch
-- Add Requires on root-proof to root-proofd
-
-* Sat Oct 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-3
-- Add Requires on root-graf-asimage to root-core
-- Add Requires on root-graf-x11 to root-gui
-- Add Requires on root-hist-painter to root-hist
-- Add Requires on root-minuit to root-mathcore
-- Add Requires on krb5-workstation to root-net-krb5
-- Add BuildRequires on krb5-workstation
-
-* Mon Aug 30 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-2
-- Adapt makefile to changes in make 3.82
-
-* Fri Aug 27 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-1
-- Update to 5.26.00d
-- Improved doc generation script
-
-* Mon Aug 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-4
-- Don't remove the prec_stl directory
-- Create a separate tutorial package for the tutorial and test suite
-
-* Thu Jul 29 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-3
-- Correct license tags for: cint, core and roofit
-- Regenerate source tarball due to upstream retag (again)
-
-* Fri Jul 16 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-2
-- Add dependency on gccxml for globus-reflex
-- Split some packages to break circular package dependencies
-- Merge libRIO into root-core
-- Regenerate source tarball due to upstream retag
-
-* Mon Jul 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-1
-- Update to 5.26.00c
-- Disable cint7 package - no longer compiles and has been deprecated upstream
-
-* Wed Jun 09 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-3
-- Use external xrootd
-- Make documentation selfcontained - can be read without network access
-
-* Wed May 19 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-2
-- Fix library detection when linker scripts are used
-- Allow building RFIO IO modules using DPM's RFIO implementation
-
-* Sat Mar 20 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-1
-- Update to 5.26.00b
-- Enable dCache support - dcap library is now in Fedora
-- Use system unuran library instead of embedded sources
-
-* Mon Feb  1 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
-- Update to 5.26.00a
-- Disable cintex package for non-intel architectures
-- Remove embedded gl2ps sources
-
-* Wed Jan 13 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00-1
-- Update to 5.26.00
-- Drop patches fixed upstream: root-globus.patch, root-dot-png.patch,
-  root-loadmeta.patch, root-openssl.patch, root-hash-endian.patch
-
-* Fri Nov 27 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.24.00b-1
-- Initial build
diff --git a/sources b/sources
deleted file mode 100644
index 5330ee7..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
-7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From ee101d8d31e6191f7f38b4e7a2d01bd929df7284 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Sat, 30 Jul 2016 15:07:44 +0530
Subject: [PATCH 091/344] Retire packages without systemd support, See FESCo
 ticket 1605

---
 .gitignore                       |    3 -
 dead.package                     |    1 +
 root-32bit.patch                 |   78 -
 root-abitags.patch               | 1267 -----------
 root-arm.patch                   |   81 -
 root-avoid-gui-crash.patch       |   59 -
 root-avoid-std-bind-lambda.patch |   42 -
 root-broken-cmake-config.patch   |  156 --
 root-cache-test.patch            |  284 ---
 root-cernlib-doc.patch           | 1307 -----------
 root-compiledata.patch           |   12 -
 root-deprecated-options.patch    |   30 -
 root-dont-link-jvm.patch         |  123 --
 root-dox-filter.patch            |   86 -
 root-doxyfile.patch              |   30 -
 root-doxygen-warnings.patch      |  723 -------
 root-fflags.patch                |   78 -
 root-fontconfig.patch            | 1408 ------------
 root-gl2ps.patch                 |  254 ---
 root-html-markup.patch           | 1031 ---------
 root-latex-markup.patch          |  877 --------
 root-libgfortranbegin.patch      |  182 --
 root-links.patch                 |  376 ----
 root-llvm-static.patch           |   11 -
 root-macro-align.patch           |   36 -
 root-missing-cmake-config.patch  |  187 --
 root-more-fflags.patch           |   33 -
 root-no-abi-check.patch          |   28 -
 root-no-testdata.patch           |   20 -
 root-ppc64.patch                 |   38 -
 root-private-public.patch        |  156 --
 root-s390x.patch                 |  147 --
 root-save-memory.patch           |   30 -
 root-see-macro-output.patch      |  266 ---
 root-soname.patch                |   11 -
 root-stressgraphics.patch        |   56 -
 root-template-files.patch        |   28 -
 root-test-install.patch          | 3105 ---------------------------
 root-testfiles.sh                |   85 -
 root-tildes.patch                |  194 --
 root-tmath-doc.patch             |  274 ---
 root-tprincipal-doc.patch        |  483 -----
 root-tvector2-comment.patch      |   13 -
 root-type1-embed.patch           |   97 -
 root-unuran.patch                |  305 ---
 root-werror.patch                |   12 -
 root.spec                        | 3462 ------------------------------
 sources                          |    2 -
 48 files changed, 1 insertion(+), 17566 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 root-32bit.patch
 delete mode 100644 root-abitags.patch
 delete mode 100644 root-arm.patch
 delete mode 100644 root-avoid-gui-crash.patch
 delete mode 100644 root-avoid-std-bind-lambda.patch
 delete mode 100644 root-broken-cmake-config.patch
 delete mode 100644 root-cache-test.patch
 delete mode 100644 root-cernlib-doc.patch
 delete mode 100644 root-compiledata.patch
 delete mode 100644 root-deprecated-options.patch
 delete mode 100644 root-dont-link-jvm.patch
 delete mode 100644 root-dox-filter.patch
 delete mode 100644 root-doxyfile.patch
 delete mode 100644 root-doxygen-warnings.patch
 delete mode 100644 root-fflags.patch
 delete mode 100644 root-fontconfig.patch
 delete mode 100644 root-gl2ps.patch
 delete mode 100644 root-html-markup.patch
 delete mode 100644 root-latex-markup.patch
 delete mode 100644 root-libgfortranbegin.patch
 delete mode 100644 root-links.patch
 delete mode 100644 root-llvm-static.patch
 delete mode 100644 root-macro-align.patch
 delete mode 100644 root-missing-cmake-config.patch
 delete mode 100644 root-more-fflags.patch
 delete mode 100644 root-no-abi-check.patch
 delete mode 100644 root-no-testdata.patch
 delete mode 100644 root-ppc64.patch
 delete mode 100644 root-private-public.patch
 delete mode 100644 root-s390x.patch
 delete mode 100644 root-save-memory.patch
 delete mode 100644 root-see-macro-output.patch
 delete mode 100644 root-soname.patch
 delete mode 100644 root-stressgraphics.patch
 delete mode 100644 root-template-files.patch
 delete mode 100644 root-test-install.patch
 delete mode 100755 root-testfiles.sh
 delete mode 100644 root-tildes.patch
 delete mode 100644 root-tmath-doc.patch
 delete mode 100644 root-tprincipal-doc.patch
 delete mode 100644 root-tvector2-comment.patch
 delete mode 100644 root-type1-embed.patch
 delete mode 100644 root-unuran.patch
 delete mode 100644 root-werror.patch
 delete mode 100644 root.spec
 delete mode 100644 sources

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9ff0650..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.tar.gz
-/*.tar.xz
-/usa.root
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1186b4b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Retire packages without systemd support, See FESCo ticket 1605
diff --git a/root-32bit.patch b/root-32bit.patch
deleted file mode 100644
index 326a8d8..0000000
--- a/root-32bit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
---- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
-@@ -179,7 +179,7 @@
- 
-    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
- 
--   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
-+   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
- 
-    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
- 
-diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
---- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
-@@ -1121,7 +1121,7 @@
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
- #if defined (R__LINUX) && !defined(R__B64)
-    // problem of precision on linux 32
--   if (Dim ==4) scale = 1000000000;
-+   if (Dim ==4) scale = 5000000000;
- #endif
-    // for problem with PtEtaPhiE
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
-diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
---- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
-@@ -312,7 +312,7 @@
-    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
-    double par[2] = {3,4};
-    double xx[2] = {0.8,1.6};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -326,7 +326,7 @@
-    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
-    double par[2] = {3,4};
-    double xx[3] = {0.8,1.6,2.2};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -369,12 +369,12 @@
-    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
-    f2.SetParameters(10,1,0,1);
-    f0.SetParameters(f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
- 
-    TF1 f3("f3","f1+[0]");
-    // param order should be the same
-    f3.SetParameters( f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
-    return ok;
- }
- 
-@@ -465,7 +465,7 @@
-    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
-    TF1 f6("f6",func,-10,10,4);
-    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
--   ok &= (f5.Eval(2) == f6.Eval(2) );
-+   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
-    return ok;
- }
- 
-@@ -485,7 +485,7 @@
-    // keep same order in evaluation
-    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
-    f0.SetParameters(1.1,2.1);
--   ok &= (fsincos.Eval(2) == f0.Eval(2) );
-+   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
-    return ok;
- 
- }
diff --git a/root-abitags.patch b/root-abitags.patch
deleted file mode 100644
index 040474a..0000000
--- a/root-abitags.patch
+++ /dev/null
@@ -1,1267 +0,0 @@
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
---- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
-@@ -0,0 +1,90 @@
-+========
-+Abi Tags
-+========
-+
-+Introduction
-+============
-+
-+This text tries to describe gcc semantic for mangling "abi_tag" attributes
-+described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
-+
-+There is no guarantee the following rules are correct, complete or make sense
-+in any way as they were determined empirically by experiments with gcc5.
-+
-+Declaration
-+===========
-+
-+Abi tags are declared in an abi_tag attribute and can be applied to a
-+function, variable, class or inline namespace declaration. The attribute takes
-+one or more strings (called tags); the order does not matter.
-+
-+See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
-+details.
-+
-+Tags on an inline namespace are called "implicit tags", all other tags are
-+"explicit tags".
-+
-+Mangling
-+========
-+
-+All tags that are "active" on a <unqualified-name> are emitted after the
-+<unqualified-name>, before <template-args> or <discriminator>, and are part of
-+the same <substitution> the <unqualified-name> is.
-+
-+They are mangled as:
-+
-+    <abi-tags> ::= <abi-tag>*   # sort by name
-+    <abi-tag> ::= B <tag source-name>
-+
-+Example:
-+
-+    __attribute__((abi_tag("test")))
-+    void Func();
-+
-+    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
-+
-+Active tags
-+===========
-+
-+A namespace has never any active tags; for types (class / struct / union /
-+enum) the explicit tags are the active tags.
-+
-+For variables and functions the active tags are the explicit tags plus any
-+"required tags" which are not in the "available tags" set:
-+
-+    derived-tags := (required-tags - available-tags)
-+    active-tags := explicit-tags + derived-tags
-+
-+Required tags for a function
-+============================
-+
-+If a function is used as a local scope for another name, and is part of
-+another function as local scope, it doesn't have any required tags.
-+
-+If a function is used as a local scope for a guard variable name, it doesn't
-+have any required tags.
-+
-+Otherwise the function requires any implicit or explicit tag used in the name
-+for the return type.
-+
-+Required tags for a variable
-+============================
-+
-+A variable requires any implicit or explicit tag used in its type.
-+
-+Available tags
-+==============
-+
-+All tags used in the prefix and in the template arguments for a name are
-+available; for functions also all  tags from the <bare-function-type> (which
-+might include the return type for template functions) are available.
-+
-+For <local-name>s all active tags used in the local part (<function-
-+encoding>) are available, but not implicit tags which were not active!
-+
-+Implicit and explicit tags used in the <unqualified-name> for a function (as
-+in the type of a cast operator) are NOT available.
-+
-+Example: a cast operator to std::string (which is
-+std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
-+required from the return type `std::string` but not available.
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
-@@ -144,6 +144,7 @@
- class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
- class VariadicUnsignedArgument<string name> : Argument<name, 1>;
- class VariadicExprArgument<string name> : Argument<name, 1>;
-+class VariadicStringArgument<string name> : Argument<name, 1>;
- 
- // A version of the form major.minor[.subminor].
- class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
-@@ -336,6 +337,14 @@
- // Attributes begin here
- //
- 
-+def AbiTag : Attr {
-+  let Spellings = [GCC<"abi_tag">];
-+  let Args = [VariadicStringArgument<"Tags">];
-+  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
-+                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
-+  let Documentation = [Undocumented];
-+}
-+
- def AddressSpace : TypeAttr {
-   let Spellings = [GNU<"address_space">];
-   let Args = [IntArgument<"AddressSpace">];
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
-@@ -2255,7 +2255,8 @@
-   "Objective-C instance methods|init methods of interface or class extension declarations|"
-   "variables, functions and classes|Objective-C protocols|"
-   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
--  "interface or protocol declarations|kernel functions}1">,
-+  "interface or protocol declarations|kernel functions|"
-+  "structs, classes, variables, functions, methods and inline namespaces}1">,
-   InGroup<IgnoredAttributes>;
- def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
- def warn_type_attribute_wrong_type : Warning<
-@@ -3922,6 +3923,12 @@
- def err_redefinition_extern_inline : Error<
-   "redefinition of a 'extern inline' function %0 is not supported in "
-   "%select{C99 mode|C++}1">;
-+def err_attr_abi_tag_only_on_inline_namespace :
-+  Error<"abi_tag attribute only allowed on inline namespaces">;
-+def err_abi_tag_on_redeclaration :
-+  Error<"cannot add abi_tag attribute in redeclaration">;
-+def err_new_abi_tag_on_redeclaration :
-+  Error<"abi_tag %0 missing in original declaration">;
- 
- def note_deleted_dtor_no_operator_delete : Note<
-   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
-@@ -846,7 +846,8 @@
-   ExpectedStructOrUnionOrTypedef,
-   ExpectedStructOrTypedef,
-   ExpectedObjectiveCInterfaceOrProtocol,
--  ExpectedKernelFunction
-+  ExpectedKernelFunction,
-+  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
- };
- 
- }  // end namespace clang
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
-@@ -202,6 +202,8 @@
- class CXXNameMangler {
-   ItaniumMangleContextImpl &Context;
-   raw_ostream &Out;
-+  bool NullOut = false;
-+  bool DisableDerivedAbiTags = false;
- 
-   /// The "structor" is the top-level declaration being mangled, if
-   /// that's not a template specialization; otherwise it's the pattern
-@@ -251,6 +253,167 @@
- 
-   } FunctionTypeDepth;
- 
-+  // abi_tag is a gcc attribute, taking one or more strings called "tags".
-+  //
-+  // the goal is to annotage against which version of a library an object was
-+  // build and to be able to provide backwards compatibility ("dual abi").
-+  //
-+  // for this the emitted mangled names have to be different, while you don't
-+  // want the user to have to use different names in the source.
-+  //
-+  // the abi_tag can be present on Struct, Var and Function  declarations as
-+  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
-+  // are always emitted after the unqualified name, and (implicit) tags on
-+  // namespace are not.
-+  //
-+  // For functions and variables there is a set of "implicitly available"
-+  // tags. These tags are: all tags from the namespace/structs the name is
-+  // embedded in, all tags from any template arguments of the name, and, for
-+  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
-+  // parameters and sometimes the return type).
-+  //
-+  // For functions this is basically the list of all tags from the signature
-+  // without the unqualified name and usually without the return type of the
-+  // function. In `operator Type()` Type is NOT part of that list, as it is
-+  // part of the unqualified name!
-+  //
-+  // Now all tags from the function return type/variable type which are not
-+  // "implicitly available" must be added to the explicit list of tags, and
-+  // are emitted after the unqualified name.
-+  //
-+  // Example:
-+  // namespace std {
-+  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
-+  //   inline namespace __cxx11 {
-+  //     struct string { };
-+  //   }
-+  // }
-+  //
-+  // std::string foo(); // needs abi tag "cxx11" on foo
-+  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
-+  // __attribute__((__abi_tag__("cxx11")))
-+  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
-+  //
-+  // The tags are sorted by name before emitting, and are serialized as
-+  //   <abitag> ::= B <"tag" source-name>
-+
-+  typedef SmallVector<StringRef, 4> AbiTagList;
-+
-+  // state to gather all implicit and explicit tags used in a mangled name.
-+  // must always have an instance of this while emitting any name to keep
-+  // track.
-+  //
-+  // TODO(abitags): how to handle substituted names? they should add the tags used in
-+  // the substitution to the list of available tags.
-+  class AbiTagState final {
-+  public:
-+    //! all abi tags used implicitly or explicitly
-+    std::set<StringRef> UsedAbiTags;
-+    //! all explicit abi tags (i.e. not from namespace)
-+    std::set<StringRef> EmittedAbiTags;
-+
-+    AbiTagState* &LinkHead;
-+    AbiTagState *Parent{nullptr};
-+
-+    bool LinkActive{false};
-+
-+    explicit AbiTagState(AbiTagState* &linkHead)
-+      : LinkHead(linkHead) {
-+      Parent = LinkHead;
-+      LinkHead = this;
-+      LinkActive = true;
-+    }
-+
-+    // no copy, no move
-+    AbiTagState(AbiTagState const&) = delete;
-+    AbiTagState& operator=(AbiTagState const&) = delete;
-+
-+    ~AbiTagState() {
-+      pop();
-+    }
-+
-+    void pop() {
-+      if (!LinkActive) return;
-+
-+      assert(LinkHead == this && "abi tag link head must point to us on destruction");
-+      LinkActive = false;
-+      if (Parent) {
-+        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
-+        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
-+      }
-+      LinkHead = Parent;
-+    }
-+
-+    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+      ND = cast<NamedDecl>(ND->getCanonicalDecl());
-+
-+      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
-+        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
-+      } else {
-+        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
-+        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
-+          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
-+            for (const auto& Tag: AbiTag->tags()) {
-+              UsedAbiTags.insert(Tag);
-+            }
-+          }
-+          // don't emit abi tags for namespaces
-+          return;
-+        }
-+      }
-+
-+      AbiTagList TagList;
-+      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
-+        for (const auto& Tag: AbiTag->tags()) {
-+          UsedAbiTags.insert(Tag);
-+          // AbiTag->tags() is sorted and has no duplicates
-+          TagList.push_back(Tag);
-+        }
-+      }
-+
-+      if (AdditionalAbiTags) {
-+        for (const auto& Tag: *AdditionalAbiTags) {
-+          UsedAbiTags.insert(Tag);
-+          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
-+            // don't insert duplicates
-+            TagList.push_back(Tag);
-+          }
-+        }
-+        // AbiTag->tags() are already sorted; only add if we had additional tags
-+        std::sort(TagList.begin(), TagList.end());
-+      }
-+
-+      writeSortedUniqueAbiTags(Out, TagList);
-+    }
-+
-+  protected:
-+    template<typename TagList>
-+    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
-+      for (const auto& Tag: AbiTags) {
-+        EmittedAbiTags.insert(Tag);
-+        Out << "B";
-+        Out << Tag.size();
-+        Out << Tag;
-+      }
-+    }
-+  } *AbiTags = nullptr;
-+  AbiTagState AbiTagsRoot{AbiTags};
-+
-+  struct TemporaryDisableDerivedAbiTags {
-+    bool& StateRef;
-+    bool OldState;
-+
-+    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
-+    : StateRef(State) {
-+      OldState = StateRef;
-+      StateRef = Disable;
-+    }
-+    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
-+    ~TemporaryDisableDerivedAbiTags() {
-+      StateRef = OldState;
-+    }
-+  };
-+
-   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
- 
-   ASTContext &getASTContext() const { return Context.getASTContext(); }
-@@ -273,6 +436,10 @@
-     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
-       SeqID(0) { }
- 
-+  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
-+    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
-+      SeqID(Outer.SeqID) { }
-+
- #if MANGLE_CHECKER
-   ~CXXNameMangler() {
-     if (Out.str()[0] == '\01')
-@@ -286,18 +453,21 @@
- #endif
-   raw_ostream &getStream() { return Out; }
- 
-+  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
-+
-   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
-   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
-   void mangleNumber(const llvm::APSInt &I);
-   void mangleNumber(int64_t Number);
-   void mangleFloat(const llvm::APFloat &F);
--  void mangleFunctionEncoding(const FunctionDecl *FD);
-+  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
-   void mangleSeqID(unsigned SeqID);
--  void mangleName(const NamedDecl *ND);
-+  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
-   void mangleType(QualType T);
-   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
-   
- private:
-+  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
- 
-   bool mangleSubstitution(const NamedDecl *ND);
-   bool mangleSubstitution(QualType T);
-@@ -326,31 +496,49 @@
-                             DeclarationName name,
-                             unsigned KnownArity = UnknownArity);
- 
--  void mangleName(const TemplateDecl *TD,
-+  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
-+
-+  void mangleNameWithAbiTags(const NamedDecl *ND,
-+                             const AbiTagList *AdditionalAbiTags,
-+                             bool ExcludeUnqualifiedName);
-+  void mangleTemplateName(const TemplateDecl *TD,
-+                  const AbiTagList *AdditionalAbiTags,
-+                  bool ExcludeUnqualifiedName,
-                   const TemplateArgument *TemplateArgs,
-                   unsigned NumTemplateArgs);
--  void mangleUnqualifiedName(const NamedDecl *ND) {
--    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
-+  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
-   }
-   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
--                             unsigned KnownArity);
--  void mangleUnscopedName(const NamedDecl *ND);
--  void mangleUnscopedTemplateName(const TemplateDecl *ND);
--  void mangleUnscopedTemplateName(TemplateName);
-+                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                  const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(TemplateName,
-+                                  const AbiTagList *AdditionalAbiTags);
-   void mangleSourceName(const IdentifierInfo *II);
--  void mangleLocalName(const Decl *D);
-+  void mangleLocalName(const Decl *D,
-+                       const AbiTagList *AdditionalAbiTags,
-+                       bool ExcludeUnqualifiedName);
-   void mangleBlockForPrefix(const BlockDecl *Block);
-   void mangleUnqualifiedBlock(const BlockDecl *Block);
-   void mangleLambda(const CXXRecordDecl *Lambda);
-   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
--                        bool NoFunction=false);
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool NoFunction,
-+                        bool ExcludeUnqualifiedName);
-   void mangleNestedName(const TemplateDecl *TD,
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool ExcludeUnqualifiedName,
-                         const TemplateArgument *TemplateArgs,
-                         unsigned NumTemplateArgs);
-   void manglePrefix(NestedNameSpecifier *qualifier);
-   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
-   void manglePrefix(QualType type);
--  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
-+  void mangleTemplatePrefix(const TemplateDecl *ND,
-+                            const AbiTagList *AdditionalAbiTags,
-+                            bool NoFunction = false,
-+                            bool ExcludeUnqualifiedName = false);
-   void mangleTemplatePrefix(TemplateName Template);
-   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
-   void mangleQualifiers(Qualifiers Quals);
-@@ -391,6 +579,10 @@
-   void mangleTemplateParameter(unsigned Index);
- 
-   void mangleFunctionParam(const ParmVarDecl *parm);
-+
-+  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
-+  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
-+  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
- };
- 
- }
-@@ -441,6 +633,11 @@
-   return true;
- }
- 
-+void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+  assert(AbiTags && "require AbiTagState");
-+  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
-+}
-+
- void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
-   // <mangled-name> ::= _Z <encoding>
-   //            ::= <data name>
-@@ -456,14 +653,28 @@
-     mangleName(cast<FieldDecl>(D));
- }
- 
--void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
--  // <encoding> ::= <function name> <bare-function-type>
--  mangleName(FD);
--
-+void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
-   // Don't mangle in the type if this isn't a decl we should typically mangle.
--  if (!Context.shouldMangleDeclName(FD))
-+  if (!Context.shouldMangleDeclName(FD)) {
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-     return;
-+  }
-+
-+  // <encoding> ::= <function name> <bare-function-type>
-+
-+  if (ExcludeUnqualifiedName)
-+  {
-+    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-+  } else {
-+    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
-+    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
-+  }
-+
-+  mangleFunctionEncodingBareType(FD);
-+}
- 
-+void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
-   if (FD->hasAttr<EnableIfAttr>()) {
-     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
-     Out << "Ua9enable_ifI";
-@@ -509,7 +720,7 @@
-     FD = PrimaryTemplate->getTemplatedDecl();
-   }
- 
--  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
-+  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
-                          MangleReturnType);
- }
- 
-@@ -567,7 +778,21 @@
-   return nullptr;
- }
- 
--void CXXNameMangler::mangleName(const NamedDecl *ND) {
-+// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
-+void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
-+  if (!ExcludeUnqualifiedName) {
-+    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
-+      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
-+      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
-+      return;
-+    }
-+  }
-+  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
-+}
-+
-+void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
-+                                           const AbiTagList *AdditionalAbiTags,
-+                                           bool ExcludeUnqualifiedName) {
-   //  <name> ::= <nested-name>
-   //         ::= <unscoped-name>
-   //         ::= <unscoped-template-name> <template-args>
-@@ -583,7 +808,7 @@
-     while (!DC->isNamespace() && !DC->isTranslationUnit())
-       DC = getEffectiveParentContext(DC);
-   else if (GetLocalClassDecl(ND)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
-@@ -593,76 +818,88 @@
-     // Check if we have a template.
-     const TemplateArgumentList *TemplateArgs = nullptr;
-     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--      mangleUnscopedTemplateName(TD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-       mangleTemplateArgs(*TemplateArgs);
-       return;
-     }
- 
--    mangleUnscopedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedName(ND, AdditionalAbiTags);
-     return;
-   }
- 
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
--  mangleNestedName(ND, DC);
-+  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
- }
--void CXXNameMangler::mangleName(const TemplateDecl *TD,
--                                const TemplateArgument *TemplateArgs,
--                                unsigned NumTemplateArgs) {
-+
-+void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
-+                                        const AbiTagList *AdditionalAbiTags,
-+                                        bool ExcludeUnqualifiedName,
-+                                        const TemplateArgument *TemplateArgs,
-+                                        unsigned NumTemplateArgs) {
-   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
- 
-   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
--    mangleUnscopedTemplateName(TD);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
-   } else {
--    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
-+    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
-   }
- }
- 
--void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
-+void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-   //  <unscoped-name> ::= <unqualified-name>
-   //                  ::= St <unqualified-name>   # ::std::
- 
-   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
-     Out << "St";
- 
--  mangleUnqualifiedName(ND);
-+  mangleUnqualifiedName(ND, AdditionalAbiTags);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
-+void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (mangleSubstitution(ND))
-     return;
- 
-   // <template-template-param> ::= <template-param>
--  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
-+  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
-     mangleTemplateParameter(TTP->getIndex());
--  else
--    mangleUnscopedName(ND->getTemplatedDecl());
-+  } else {
-+    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-+  }
- 
-   addSubstitution(ND);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
-+void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleUnscopedTemplateName(TD);
-+    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-   
-   if (mangleSubstitution(Template))
-     return;
- 
-+  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
-+
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Not a dependent template name?");
-   if (const IdentifierInfo *Id = Dependent->getIdentifier())
-     mangleSourceName(Id);
-   else
-     mangleOperatorName(Dependent->getOperator(), UnknownArity);
--  
-+
-   addSubstitution(Template);
- }
- 
-@@ -824,6 +1061,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespace());
-     break;
-   case NestedNameSpecifier::NamespaceAlias:
-     if (qualifier->getPrefix())
-@@ -832,6 +1070,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
- 
-   case NestedNameSpecifier::TypeSpec:
-@@ -917,15 +1156,18 @@
- 
-     case Type::Typedef:
-       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TypedefType>(type)->getDecl());
-       break;
- 
-     case Type::UnresolvedUsing:
-       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
-       break;
- 
-     case Type::Record:
-       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TagType>(type)->getDecl());
-       break;
- 
-     case Type::TemplateSpecialization: {
-@@ -943,6 +1185,7 @@
-         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
- 
-         mangleSourceName(temp->getIdentifier());
-+        writeAbiTags(temp);
-         break;
-       }
- 
-@@ -974,16 +1217,19 @@
-     case Type::InjectedClassName:
-       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
-       break;
- 
-     case Type::DependentName:
-       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
-+      // writeAbiTags(cast<DependentNameType>(type));
-       break;
- 
-     case Type::DependentTemplateSpecialization: {
-       const DependentTemplateSpecializationType *tst
-         = cast<DependentTemplateSpecializationType>(type);
-       mangleSourceName(tst->getIdentifier());
-+      // writeAbiTags(tst);
-       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
-       break;
-     }
-@@ -1033,6 +1279,7 @@
-     }
- 
-     mangleSourceName(qualifier->getAsIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
-   }
- 
-@@ -1049,12 +1296,14 @@
-                                           DeclarationName name,
-                                           unsigned knownArity) {
-   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
--  mangleUnqualifiedName(nullptr, name, knownArity);
-+  mangleUnqualifiedName(nullptr, name, knownArity,
-+                        /*AdditionalAbiTags*/ nullptr);
- }
- 
- void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
-                                            DeclarationName Name,
--                                           unsigned KnownArity) {
-+                                           unsigned KnownArity,
-+                                           const AbiTagList *AdditionalAbiTags) {
-   //  <unqualified-name> ::= <operator-name>
-   //                     ::= <ctor-dtor-name>
-   //                     ::= <source-name>
-@@ -1072,6 +1321,8 @@
-         Out << 'L';
- 
-       mangleSourceName(II);
-+      if (ND)
-+        writeAbiTags(ND, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1111,6 +1362,7 @@
-       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
- 
-       mangleSourceName(FD->getIdentifier());
-+      // TODO(abitags): not emitting abi tags: internal name anyway
-       break;
-     }
- 
-@@ -1131,6 +1383,9 @@
-       assert(D->getDeclName().getAsIdentifierInfo() &&
-              "Typedef was not named!");
-       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
-+      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
-+      // explicit abi tags are still possible; take from underlying type, not from typedef.
-+      writeAbiTags(TD, nullptr);
-       break;
-     }
- 
-@@ -1140,6 +1395,7 @@
-     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
-     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
-       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
-+        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
-         mangleLambda(Record);
-         break;
-       }
-@@ -1151,6 +1407,7 @@
-       if (UnnamedMangle > 1)
-         Out << llvm::utostr(UnnamedMangle - 2);
-       Out << '_';
-+      writeAbiTags(TD, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1183,6 +1440,7 @@
-       // Otherwise, use the complete constructor name. This is relevant if a
-       // class with a constructor is declared within a constructor.
-       mangleCXXCtorType(Ctor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXDestructorName:
-@@ -1194,12 +1452,14 @@
-       // Otherwise, use the complete destructor name. This is relevant if a
-       // class with a destructor is declared within a destructor.
-       mangleCXXDtorType(Dtor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXConversionFunctionName:
-     // <operator-name> ::= cv <type>    # (cast)
-     Out << "cv";
-     mangleType(Name.getCXXNameType());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXOperatorName: {
-@@ -1223,6 +1483,7 @@
-     // FIXME: This mangling is not yet official.
-     Out << "li";
-     mangleSourceName(Name.getCXXLiteralIdentifier());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXUsingDirective:
-@@ -1239,7 +1500,9 @@
- 
- void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
-                                       const DeclContext *DC,
--                                      bool NoFunction) {
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool NoFunction,
-+                                      bool ExcludeUnqualifiedName) {
-   // <nested-name> 
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
-@@ -1259,30 +1522,35 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD, NoFunction);
-+    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
-     mangleTemplateArgs(*TemplateArgs);
-   }
-   else {
-     manglePrefix(DC, NoFunction);
--    mangleUnqualifiedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND, AdditionalAbiTags);
-   }
- 
-   Out << 'E';
- }
- void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool ExcludeUnqualifiedName,
-                                       const TemplateArgument *TemplateArgs,
-                                       unsigned NumTemplateArgs) {
-   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
- 
-   Out << 'N';
- 
--  mangleTemplatePrefix(TD);
-+  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
-   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
- 
-   Out << 'E';
- }
- 
--void CXXNameMangler::mangleLocalName(const Decl *D) {
-+void CXXNameMangler::mangleLocalName(const Decl *D,
-+                                     const AbiTagList *AdditionalAbiTags,
-+                                     bool ExcludeUnqualifiedName) {
-   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
-   //              := Z <function encoding> E s [<discriminator>]
-   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
-@@ -1294,15 +1562,25 @@
- 
-   Out << 'Z';
- 
--  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
--    mangleObjCMethodName(MD);
--  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
--    mangleBlockForPrefix(BD);
--  else
--    mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+  {
-+    AbiTagState localAbiTags(AbiTags);
-+
-+    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
-+      mangleObjCMethodName(MD);
-+    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
-+      mangleBlockForPrefix(BD);
-+    else
-+      mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+
-+    // implicit abi tags (from namespace) are not available in the following
-+    // entity; reset to actually emitted tags, which are available.
-+    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
-+  }
- 
-   Out << 'E';
- 
-+  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
-+
-   if (RD) {
-     // The parameter number is omitted for the last parameter, 0 for the 
-     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
-@@ -1327,13 +1605,17 @@
-     // Mangle the name relative to the closest enclosing function.
-     // equality ok because RD derived from ND above
-     if (D == RD)  {
--      mangleUnqualifiedName(RD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedName(RD, AdditionalAbiTags);
-     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
--      mangleUnqualifiedBlock(BD);
-+      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedBlock(BD);
-     } else {
-       const NamedDecl *ND = cast<NamedDecl>(D);
--      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
-+      mangleNestedName(ND, getEffectiveDeclContext(ND),
-+                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
-     }
-   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-     // Mangle a block in a default parameter; see above explanation for
-@@ -1350,30 +1632,35 @@
-       }
-     }
- 
--    mangleUnqualifiedBlock(BD);
-+    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedBlock(BD);
-   } else {
--    mangleUnqualifiedName(cast<NamedDecl>(D));
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
-   }
- 
--  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
--    unsigned disc;
--    if (Context.getNextDiscriminator(ND, disc)) {
--      if (disc < 10)
--        Out << '_' << disc;
--      else
--        Out << "__" << disc << '_';
-+  if (!ExcludeUnqualifiedName) {
-+    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
-+      unsigned disc;
-+      if (Context.getNextDiscriminator(ND, disc)) {
-+        if (disc < 10)
-+          Out << '_' << disc;
-+        else
-+          Out << "__" << disc << '_';
-+      }
-     }
-   }
- }
- 
- void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
-   if (GetLocalClassDecl(Block)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   const DeclContext *DC = getEffectiveDeclContext(Block);
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   manglePrefix(getEffectiveDeclContext(Block));
-@@ -1384,10 +1671,11 @@
-   if (Decl *Context = Block->getBlockManglingContextDecl()) {
-     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
-         Context->getDeclContext()->isRecord()) {
--      if (const IdentifierInfo *Name
--            = cast<NamedDecl>(Context)->getIdentifier()) {
-+      const auto *ND = cast<NamedDecl>(Context);
-+      if (const IdentifierInfo *Name = ND->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1420,7 +1708,7 @@
-       if (const IdentifierInfo *Name
-             = cast<NamedDecl>(Context)->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1502,11 +1790,11 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD);
-+    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
-     mangleTemplateArgs(*TemplateArgs);
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND);
-+    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
-   }
- 
-   addSubstitution(ND);
-@@ -1517,7 +1805,7 @@
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleTemplatePrefix(TD);
-+    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
- 
-   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
-     manglePrefix(Qualified->getQualifier());
-@@ -1525,18 +1813,21 @@
-   if (OverloadedTemplateStorage *Overloaded
-                                       = Template.getAsOverloadedTemplate()) {
-     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
--                          UnknownArity);
-+                          UnknownArity,
-+                          /* AdditionalAbiTags */ nullptr);
-     return;
-   }
-    
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Unknown template name kind?");
-   manglePrefix(Dependent->getQualifier());
--  mangleUnscopedTemplateName(Template);
-+  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
- }
- 
- void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
--                                          bool NoFunction) {
-+                                          const AbiTagList *AdditionalAbiTags,
-+                                          bool NoFunction,
-+                                          bool ExcludeUnqualifiedName) {
-   // <template-prefix> ::= <prefix> <template unqualified-name>
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-@@ -1548,10 +1839,12 @@
- 
-   // <template-template-param> ::= <template-param>
-   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    // TODO(abitags): ???
-     mangleTemplateParameter(TTP->getIndex());
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND->getTemplatedDecl());
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-   }
- 
-   addSubstitution(ND);
-@@ -1595,6 +1888,7 @@
-     // <name> ::= <nested-name>
-     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
-     mangleSourceName(Dependent->getIdentifier());
-+    // writeAbiTags(Dependent);
-     break;
-   }
- 
-@@ -2370,7 +2664,11 @@
- 
- void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
-   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
--    mangleName(TD, T->getArgs(), T->getNumArgs());
-+    // types only have explicit abi tags, no addition tags
-+    mangleTemplateName(TD,
-+                       /* AdditionalAbiTags */ nullptr,
-+                       /* ExcludeUnqualifiedName */ false,
-+                       T->getArgs(), T->getNumArgs());
-   } else {
-     if (mangleSubstitution(QualType(T, 0)))
-       return;
-@@ -2417,6 +2715,7 @@
-   Out << 'N';
-   manglePrefix(T->getQualifier());
-   mangleSourceName(T->getIdentifier());
-+  // writeAbiTags(T); // TODO(abitags)
-   Out << 'E';
- }
- 
-@@ -3722,6 +4021,74 @@
-   Substitutions[Ptr] = SeqID++;
- }
- 
-+std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
-+  llvm::raw_null_ostream NullOutStream;
-+  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
-+
-+  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
-+    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
-+  } else {
-+    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
-+  }
-+
-+  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
-+  std::set<StringRef> ReturnTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
-+
-+    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
-+    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
-+    TrackReturnTypeTags.mangleType(Proto->getReturnType());
-+    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
-+
-+    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: ReturnTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
-+  std::set<StringRef> VariableTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackVariableType(*this, NullOutStream);
-+
-+    TrackVariableType.mangleType(VD->getType());
-+
-+    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: VariableTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
- //
- 
- /// \brief Mangles the name of the declaration D and emits that name to the
-@@ -3824,6 +4191,7 @@
-   //  <special-name> ::= GV <object name>       # Guard variable for one-time
-   //                                            # initialization
-   CXXNameMangler Mangler(*this, Out);
-+  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
-   Mangler.getStream() << "_ZGV";
-   Mangler.mangleName(D);
- }
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -3948,6 +3948,58 @@
-       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
- }
- 
-+static void handleAbiTagAttr(Sema &S, Decl *D,
-+                             const AttributeList &Attr) {
-+  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
-+    return;
-+
-+  SmallVector<std::string, 4> Tags;
-+
-+  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
-+    StringRef Tag;
-+
-+    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
-+      return;
-+
-+    Tags.push_back(Tag);
-+  }
-+  // store tags sorted and without duplicates
-+  std::sort(Tags.begin(), Tags.end());
-+  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
-+
-+  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
-+    if (!NS->isInline()) {
-+      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
-+      return;
-+    }
-+  }
-+
-+  const auto *CD = D->getCanonicalDecl();
-+  if (CD != D) {
-+    // redeclarations must not add new abi tags, or abi tags in the first place
-+    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
-+    if (nullptr == OldAbiTagAttr) {
-+      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
-+      S.Diag(CD->getLocation(), diag::note_previous_definition);
-+      return;
-+    }
-+    for (const auto& NewTag: Tags) {
-+      if (std::find(OldAbiTagAttr->tags_begin(),
-+                    OldAbiTagAttr->tags_end(),
-+                    NewTag) == OldAbiTagAttr->tags_end()) {
-+        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
-+        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
-+        return;
-+      }
-+    }
-+    return;
-+  }
-+
-+  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
-+                                          Tags.data(), Tags.size(),
-+                                          Attr.getAttributeSpellingListIndex()));
-+}
-+
- static void handleARMInterruptAttr(Sema &S, Decl *D,
-                                    const AttributeList &Attr) {
-   // Check the attribute arguments.
-@@ -4707,6 +4759,9 @@
-   case AttributeList::AT_Thread:
-     handleDeclspecThreadAttr(S, D, Attr);
-     break;
-+  case AttributeList::AT_AbiTag:
-+    handleAbiTagAttr(S, D, Attr);
-+    break;
- 
-   // Thread safety attributes:
-   case AttributeList::AT_AssertExclusiveLock:
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -79,6 +79,7 @@
-     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
-     .Case("Expr *", "ReadExpr(F)")
-     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
-+    .Case("std::string", "ReadString(Record, Idx)")
-     .Default("Record[Idx++]");
- }
- 
-@@ -92,6 +93,7 @@
-     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
-     .Case("IdentifierInfo *", 
-           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
-+    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
-     .Default("Record.push_back(" + std::string(name) + ");\n");
- }
- 
-@@ -986,6 +988,16 @@
-     }
-   };
- 
-+  class VariadicStringArgument : public VariadicArgument {
-+  public:
-+    VariadicStringArgument(const Record &Arg, StringRef Attr)
-+      : VariadicArgument(Arg, Attr, "std::string")
-+    {}
-+    void writeValueImpl(raw_ostream &OS) const override {
-+      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
-+    }
-+  };
-+
-   class TypeArgument : public SimpleArgument {
-   public:
-     TypeArgument(const Record &Arg, StringRef Attr)
-@@ -1047,6 +1059,8 @@
-     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
-   else if (ArgName == "VariadicUnsignedArgument")
-     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
-+  else if (ArgName == "VariadicStringArgument")
-+    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
-   else if (ArgName == "VariadicEnumArgument")
-     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
-   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
deleted file mode 100644
index d865e30..0000000
--- a/root-arm.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-@@ -19,7 +19,7 @@
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
- elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
--  message(STATUS "Found a 64bit system")
-+  message(STATUS "Found a 64bit ARM system")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-@@ -42,6 +42,18 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES arm)
-+  message(STATUS "Found a 32bit ARM system")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-@@ -52,6 +52,8 @@
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-@@ -47,6 +47,8 @@
-     set(AFTER_CC "${AFTER_CC} -m64")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-@@ -52,6 +52,10 @@
-     set(FREETYPE_CFLAGS "-m64 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-     set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-+    set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-@@ -17,6 +17,8 @@
- 
- if(ROOT_ARCHITECTURE MATCHES linuxarm64)
-   set(ROOT_CLING_TARGET "AArch64")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+  set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
deleted file mode 100644
index 776e79a..0000000
--- a/root-avoid-gui-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
---- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
-@@ -30,7 +30,7 @@
- shape, size, angle.</h2></center>
- The picture below shows this interface.
- End_Html
--Begin_Macro(GUI)
-+~~~
- {
-    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
-    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
-@@ -41,7 +41,8 @@
-    r->SetWindowSize(700,500);
-    return r->GetMainFrame();
- }
--End_Macro */
-+~~~
-+*/
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
---- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
-@@ -72,7 +72,7 @@
- <br><br>
- A simple macro to use a TGTable with a TGSimpleTableInterface:
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    Int_t i = 0, j = 0;
-    UInt_t nrows = 6, ncolumns = 5;
-@@ -111,13 +111,13 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- Begin_Html
- 
- It is also possible to visualise data from a tree. A simple macro
- showing the use of a TTreeTableInterface follows.
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    // Open a root file.
-    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
-@@ -153,7 +153,7 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- */
- 
- // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
deleted file mode 100644
index 5cbff77..0000000
--- a/root-avoid-std-bind-lambda.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
---- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
-@@ -33,6 +33,9 @@
-    // Total amount of numbers
-    const UInt_t nNumbers = 20000000U;
- 
-+   // We split the work in equal parts
-+   const auto workSize = nNumbers / nWorkers;
-+
-    // A simple function to fill ntuples randomly
- 
-    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
-@@ -57,7 +60,7 @@
-    // We now go MP! ------------------------------------------------------------
- 
-    // We define our work item
--   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
-+   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
-       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
-@@ -74,18 +77,10 @@
-    {
-       TimerRAII t("Parallel execution");
- 
--      // We split the work in equal parts
--      const auto workSize = nNumbers / nWorkers;
--
--      // The work item requires two arguments, the map infrastructure offer
--      // an interface to use only one. A standard solution is to use std::bind
--      using namespace std::placeholders;
--      auto workItemOneArg = std::bind(workItem, _1, workSize);
--
-       // Fill the pool with work
-       std::forward_list<UInt_t> workerIDs(nWorkers);
-       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
--      workers.Map(workItemOneArg, workerIDs);
-+      workers.Map(workItem, workerIDs);
-    }
- 
-    return 0;
diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
deleted file mode 100644
index aaa4a6c..0000000
--- a/root-broken-cmake-config.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
---- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
-@@ -0,0 +1,23 @@
-+# - Locate dpm library
-+# Defines:
-+#
-+#  DPM_FOUND
-+#  DPM_INCLUDE_DIR
-+#  DPM_INCLUDE_DIRS (not cached)
-+#  DPM_LIBRARIES
-+
-+set(DPM_FOUND FALSE)
-+
-+find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
-+find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+
-+set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
-+set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
-+
-+if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
-+  set(DPM_FOUND TRUE)
-+  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
-+endif()
-+
-+mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
---- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
-@@ -9,7 +9,7 @@
- 
- find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
-           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
--                /opt/globus/include
-+                /opt/globus/include /usr/include
-           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
-                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
- 
-@@ -24,7 +24,7 @@
-               openssl gsi_proxy_core callout)
- 
- foreach( lib ${libraries})
--  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
-+  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
-                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
-   if(GLOBUS_${lib}_LIBRARY)
-     set(GLOBUS_${lib}_FOUND 1)
-diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
---- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
-@@ -6,7 +6,7 @@
- #  HDFS_INCLUDE_DIRS (not cached)
- #  HDFS_LIBRARIES
- 
--find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
-+find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
- find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
- 
- set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
---- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
-@@ -2,8 +2,8 @@
- #
- # This module defines
- # PCRE_INCLUDE_DIR, where to locate PCRE header files
--# PCRE_LIBRARIES, the libraries to link against to use Pythia6
--# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
-+# PCRE_LIBRARIES, the libraries to link against to use PCRE
-+# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
- 
- if(PCRE_CONFIG_EXECUTABLE)
-   set(PCRE_FIND_QUIETLY 1)
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-@@ -446,15 +446,29 @@
- endif()
- 
- #---Check for Castor-------------------------------------------------------------------
--if(castor OR rfio)
-+if(castor)
-   message(STATUS "Looking for Castor")
-   find_package(Castor)
-   if(NOT CASTOR_FOUND)
-     if(fail-on-missing)
-       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
-     else()
--      message(STATUS "Castor not found. Switching off castor/rfio option")
-+      message(STATUS "Castor not found. Switching off castor option")
-       set(castor OFF CACHE BOOL "" FORCE)
-+    endif()
-+  endif()
-+endif()
-+
-+#---Check for RFIO-------------------------------------------------------------------
-+if(rfio)
-+  message(STATUS "Looking for RFIO")
-+  find_package(Castor)
-+  find_package(DPM)
-+  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
-+    if(fail-on-missing)
-+      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
-+    else()
-+      message(STATUS "Castor or DPM not found. Switching off rfio option")
-       set(rfio OFF CACHE BOOL "" FORCE)
-     endif()
-   endif()
-diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
---- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -0,0 +1,10 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT io/hdfs package
-+############################################################################
-+
-+include_directories(${HDFS_INCLUDE_DIRS})
-+
-+ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
-+
-+ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
---- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -2,10 +2,16 @@
- # CMakeLists.txt file for building ROOT io/rfio package
- ############################################################################
- 
--include_directories(${CASTOR_INCLUDE_DIR})
--
- ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
- 
-+if(CASTOR_FOUND)
-+include_directories(${CASTOR_INCLUDE_DIR})
- ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
-     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
-+else()
-+include_directories(${DPM_INCLUDE_DIR})
-+ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
-+    DEPENDENCIES Net RIO)
-+endif()
-+
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
---- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
-@@ -8,7 +8,6 @@
- endif()
- 
- ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
--ROOT_INSTALL_HEADERS()
- 
- if(builtin_openssl)
-   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
deleted file mode 100644
index 1cf437e..0000000
--- a/root-cache-test.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
-@@ -1907,8 +1907,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    TMultiGraph *mg;
-    TKey *key;
-diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
---- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
-@@ -1956,7 +1956,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
---- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
-@@ -10164,7 +10164,8 @@
-       refFile = TFile::Open(refFileName, "RECREATE");
-    }
-    else {
--      refFile = TFile::Open(refFileName);
-+      TFile::SetCacheFileDir(".");
-+      refFile = TFile::Open(refFileName, "CACHEREAD");
-    }
- 
-    if ( refFile != 0 ) {
-diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
---- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
-@@ -78,9 +78,10 @@
-          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
-          return 1;
-       }
--      fref = new TWebFile(refFile) ;
-+      TFile::SetCacheFileDir(".");
-+      fref = TFile::Open(refFile,"CACHEREAD") ;
-     } else {
--      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
-+      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
-     }
-     if (fref->IsZombie()) {
-       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
-diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
---- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
-@@ -2011,21 +2011,15 @@
-   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
- 
-   TFile* input(0);
--
-   FileStat_t stat;
- 
--  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
--  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
-+  TString fname = "./tmva_class_example.root";
-   if(!gSystem->GetPathInfo(fname,stat)) {
-      input = TFile::Open( fname );
--  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--     input = TFile::Open( "../"+fname );
--  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
--     input = TFile::Open( fcname );
-   } else {
--     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
-+     TFile::SetCacheFileDir(".");
-+     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-   }
--  delete [] fcname;
-   if (input == NULL) {
-      cerr << "broken/inaccessible input file" << endl;
-   }
-@@ -2440,14 +2434,12 @@
-    TFile* input(0);
-    FileStat_t stat;
- 
--   // FIXME:: give the filename of the sample somewhere else?
--   TString fname = "../tmva/test/tmva_reg_example.root";
-+   TString fname = "./tmva_reg_example.root";
-    if(!gSystem->GetPathInfo(fname,stat)) {
-       input = TFile::Open( fname );
--   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--      input = TFile::Open( "../"+fname );
-    } else {
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
-    }
-    if (input == NULL) {
-       cerr << "broken/inaccessible input file" << endl;
-diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
---- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
-@@ -27,23 +27,26 @@
-    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
-          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
- 
--
-    factory->AddVariable("myvar1 := var1+var2", 'F');
-    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
-    factory->AddVariable("var3",                "Variable 3", "units", 'F');
-    factory->AddVariable("var4",                "Variable 4", "units", 'F');
--
--
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
--
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
---- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
-@@ -36,12 +36,19 @@
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
---- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
-@@ -44,8 +44,8 @@
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
-@@ -221,14 +221,16 @@
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
--   TString fname = "./tmva_example.root";   
--   if (!gSystem->AccessPathName( fname )) 
-+   TString fname = "./tmva_class_example.root";
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else    
--      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
-@@ -201,13 +201,19 @@
- 
-    // Read training and test data
-    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--   
--   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--   
--   TFile *input = TFile::Open( fname );
--   
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
-    
-    // --- Register the training and test trees
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
-@@ -123,16 +123,16 @@
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
-    if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   } 
--   else { 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
-    }
--   
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
-@@ -158,11 +158,13 @@
-    // load the signal and background event samples from ROOT trees
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
--   if (!gSystem->AccessPathName( fname )) 
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
deleted file mode 100644
index eb05d5d..0000000
--- a/root-cernlib-doc.patch
+++ /dev/null
@@ -1,1307 +0,0 @@
-diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
---- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
-@@ -15,7 +15,7 @@
- #include "Rtypes.h"
- #include <string.h>
- 
--// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
-+// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
- 
- ///////////////////////////////////////////////////////////////////////////////////////
- //                                                                                   //
-@@ -25,8 +25,9 @@
- // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
- // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
- // add the result to another matrix, add to square matrix the multiple of a diagonal //
--// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
--// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
-+// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
-+// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
-+// Fortran convention.                                                               //
- //                                                                                   //
- ///////////////////////////////////////////////////////////////////////////////////////
- 
-diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
---- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
-@@ -11,8 +11,8 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- // The set of methods to work with the plain matrix / vector
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
- //
- // Revision 1.7  2006/05/21 18:05:26  brun
- // Fix more coding conventions violations
-@@ -33,7 +33,7 @@
- //
- // Revision 1.3  2003/04/03 17:39:39  fine
- // Make merge with ROOT 3.05.03 and add TR package
--//122
-+//
- // Revision 1.2  2003/02/04 23:35:20  fine
- // Clean up
- //
-@@ -154,27 +154,24 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication
-+///
- /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-+// --      ENTRY MXMLRT
-+// --                C = A(I,J) X B(J,J) X A*(J,I)
-+// --                A* TANDS FOR A-TRANSPOSED
-+//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
-+//             CALL MXMPY (A,B,X,NI,NJ,NJ)
-+//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
- 
--// --      ENTRY MXMLRT */
--// --                C = A(I,J) X B(J,J) X A*(J,I) */
--// --                A* TANDS FOR A-TRANSPOSED */
--//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
--//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
--//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
--
--/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
--/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
-+//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
-+//             CALL MXMPY (A,Y,C,NI,NJ,NI)
- 
- 
- // --                C = A*(I,J) X B(J,J) X A(J,I)
-@@ -191,6 +188,12 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication (double precision)
-+///
-+/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
-+/// ORIG. 01/01/64 RKB
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
- {
-@@ -215,36 +218,31 @@
-     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Matrix Transposition
- ///
--///  Matrix Transposition
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxtrp(const float *a, float *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- } /* mxtrp */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Matrix Transposition (double precision)
-+/// Matrix Transposition (double precision)
-+///
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxtrp(const double *a, double *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- 
-@@ -283,38 +281,35 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::traat(const float *a, float *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Symmetric Multiplication of Rectangular Matrices
-+/// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::traat(const double *a, double *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
-@@ -346,34 +341,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
-+/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
-@@ -405,34 +400,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
-@@ -470,34 +465,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
-@@ -543,51 +538,51 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
-@@ -596,17 +591,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trata.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trata(const float *a, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
-@@ -636,22 +629,21 @@
-    return r__;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -684,25 +676,22 @@
-    return b;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
--{
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
-+{
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -743,26 +732,23 @@
-    return r__;
- } /* tratsa_ */
- 
--//____________________________________________________________
--// trchlu.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchlu.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trchlu(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -806,15 +792,17 @@
-    return b;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trchul(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -823,11 +811,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -875,17 +858,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trinv(const float *t, float *s, int n)
-+{
-    int lhor, ipiv, lver, j;
-    double sum = 0;
-    double r__ = 0;
-@@ -934,22 +915,20 @@
-    return s;
- } /* trinv_ */
- 
--//____________________________________________________________
--// trla.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trla.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, ia, ib, iu;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -981,22 +960,19 @@
- } /* trla_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trlta.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trlta.F -- translated by f2c (version 19970219).
--// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
-+float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -1036,16 +1012,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trpck(const float *s, float *u, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1072,17 +1047,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1140,16 +1113,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1190,17 +1162,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
-+float *TCL::trsinv(const float *g, float *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -1209,17 +1179,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmlu(const float *u, float *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -1246,17 +1214,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmul(const float *g, float *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -1284,18 +1250,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trupck(const float *u, float *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -1336,25 +1299,20 @@
- } /* trupck_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trsat.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trsat.F -- translated by f2c (version 19970219).
--// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
-+float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --s;
- 
-@@ -1391,25 +1349,21 @@
- 
- // ------  double
- 
--//____________________________________________________________
--// trata.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trata.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trata(const double *a, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --a;
- 
-@@ -1437,23 +1391,21 @@
-    return 0;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -1487,24 +1439,22 @@
-    return 0;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -1547,25 +1497,21 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trchlu.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trchlu(const double *a, double *b, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1609,15 +1555,17 @@
-    return 0;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trchul(const double *a, double *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -1626,11 +1574,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1677,17 +1620,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trinv(const double *t, double *s, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int lhor, ipiv, lver,  j;
-    double r__;
-    int mx, ndTep, ind;
-@@ -1735,19 +1676,16 @@
- } /* trinv_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// trla.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
-+double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int ipiv, ia, ib, iu;
-    double sum;
- 
-@@ -1782,17 +1720,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trlta.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
-@@ -1834,16 +1770,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::trpck(const double *s, double *u, int n)
-+{
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1869,17 +1804,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1936,16 +1869,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1985,17 +1917,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
-+double *TCL::trsinv(const double *g, double *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -2006,17 +1936,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmlu(const double *u, double *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -2043,17 +1971,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmul(const double *g, double *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -2081,18 +2007,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
-+double *TCL::trupck(const double *u, double *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -2133,17 +2056,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsat.F -- translated by f2c (version 19970219)
-+///
- /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
deleted file mode 100644
index 4f30e9b..0000000
--- a/root-compiledata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
---- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
-@@ -75,7 +75,7 @@
- 
- # Remove the flags turning warnings into errors or extending
- # the number of warnings.
--CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
-+CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
- 
- # Determine the compiler version
- BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
deleted file mode 100644
index 0049c46..0000000
--- a/root-deprecated-options.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
-+++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
-@@ -202,7 +202,7 @@
-     enable_unuran=yes
-     enable_vc=yes
-     enable_vdt=yes
--    #enable_r=yes
-+    enable_r=yes
- fi
- 
- # Remove old log file
-@@ -2288,7 +2288,7 @@
-         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "yes:"; then
-@@ -2318,7 +2318,7 @@
-         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
deleted file mode 100644
index fdc0091..0000000
--- a/root-dont-link-jvm.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-@@ -263,10 +263,6 @@
- set(hdfslib ${HDFS_LIBRARY})
- set(hdfsincdir ${HDFS_INCLUDE_DIR})
- 
--set(jniincdir ${Java_INCLUDE_DIRS})
--set(jvmlib ${Java_LIBRARIES})
--set(jvmlibdir ${Java_LIBRARY_DIR})
--
- set(buildalien ${value${alien}})
- set(alienlibdir ${ALIEN_LIBRARY_DIR})
- set(alienlib ${ALIEN_LIBRARY})
-diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-@@ -251,9 +251,6 @@
- HDFSLIBDIR     := @hdfslibdir@
- HDFSCLILIB     := @hdfslib@
- HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
--JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
--JVMCLILIB      := @jvmlib@
--JVMLIBDIR      := @jvmlibdir@
- 
- BUILDALIEN     := @buildalien@
- ALIENLIBDIR    := @alienlibdir@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
-+++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
-@@ -1822,8 +1822,6 @@
-   hdfs-incdir        HDFS support, location of hdfs.h
-   hdfs-libdir        HDFS support, location of libhdfs
-   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
--  jni-incdir         HDFS support, location of JNI headers
--  jvm-libdir         HDFS support, location of JVM library
-   krb5               Kerberos5 support, location of Kerberos distribution
-   krb5-incdir        Kerberos5 support, location of krb5.h
-   krb5-libdir        Kerberos5 support, location of libkrb5
-@@ -2214,8 +2212,6 @@
-       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-iosvers=*)        iosvers=$optarg       ;;
--      --with-jni-incdir=*)     jniincdir=$optarg     ;;
--      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
-       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
-       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
-       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
-@@ -4535,17 +4531,6 @@
-     hdfsinc=$found_hdr
-     hdfsincdir=$found_dir
- 
--    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
--       JAVA_HOME=`/usr/libexec/java_home`
--    fi
--
--    keepincdir=$jniincdir
--    check_header "jni.h" "$jniincdir" \
--        ${JAVA_HOME:+$JAVA_HOME/include} \
--        /usr/java/default/include /usr/include /usr/local/include
--    jniinc=$found_hdr
--    jniincdir=$found_dir
--
-     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
-         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
-         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
-@@ -4553,26 +4538,12 @@
-     hdfslib=$found_lib
-     hdfslibdir=$found_dir
- 
--    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
--        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
--        /usr/java/default/jre/lib/amd64/server \
--        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
--    jvmlib=$found_lib
--    jvmlibdir=$found_dir
--
--    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
-+    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
-         enable_hdfs="no"
-     else
-         case $platform in
-             linux)
--                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
--                if test $link_result -eq 0 ; then
--                    enable_hdfs="no"
--                fi
--
--                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
-+                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
-                 if test $link_result -eq 0 ; then
-                     enable_hdfs="no"
-                 fi
-@@ -7641,9 +7612,6 @@
-     -e "s|@iosvers@|$iosvers|"                  \
-     -e "s|@iconpath@|$iconpath|"                \
-     -e "s|@incdir@|$incdir|"                    \
--    -e "s|@jniincdir@|$jniincdir|g"             \
--    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
--    -e "s|@jvmlib@|$jvmlib|g"                   \
-     -e "s|@krb5incdir@|$krb5incdir|"            \
-     -e "s|@krb5lib@|$krb5lib|"                  \
-     -e "s|@krb5libdir@|$krb5libdir|"            \
-diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
---- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
-@@ -44,7 +44,7 @@
- $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
--		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
-+		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
- 
- $(call pcmrule,HDFS)
- 	$(noop)
-@@ -72,4 +72,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
-+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
deleted file mode 100644
index 1bf85d2..0000000
--- a/root-dox-filter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
---- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
-@@ -98,6 +98,7 @@
- 
-    // Source file.
-    if (gSource) {
-+      size_t spos = 0;
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
- 
-@@ -106,10 +107,11 @@
-              gLineString.find("/** \\class")  != string::npos ||
-              gLineString.find("///! \\class") != string::npos) gClass = true;
- 
--         if (gLineString.find("End_Macro") != string::npos) {
-+         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
-             ReplaceAll(gLineString,"End_Macro","");
-             gImageSource = false;
-             gInMacro = 0;
-+            spos = 0;
-             if (m) {
-                fclose(m);
-                m = 0;
-@@ -122,8 +124,9 @@
-          }
- 
-          if (gInMacro) {
-+            if (spos) gLineString = gLineString.substr(spos);
-             if (gInMacro == 1) {
--               if (EndsWith(gLineString,".C\n")) {
-+               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
-                   ExecuteMacro();
-                   gInMacro++;
-                } else {
-@@ -153,14 +156,27 @@
-             }
-          }
- 
--         if (gLineString.find("Begin_Macro") != string::npos) {
-+         if (gLineString.find("Begin_Macro") != string::npos &&
-+             gLineString.find("End_Macro") == string::npos) {
-+            if (BeginsWith(gLineString, "///")) {
-+               spos = gLineString.find_first_not_of(' ', 3);
-+            }
-             if (gLineString.find("source") != string::npos) gImageSource = true;
-             gImageID++;
-             gInMacro++;
-             gLineString = "\n";
-          }
- 
--         printf("%s",gLineString.c_str());
-+         size_t l = gLineString.length();
-+         size_t b = 0;
-+         do {
-+            size_t e = gLineString.find('\n', b);
-+            if (e != string::npos) e++;
-+            if (spos) printf("%-*s%s", (int)spos, "///",
-+                              gLineString.substr(b, e - b).c_str());
-+            else printf("%s", gLineString.substr(b, e - b).c_str());
-+            b = e;
-+         } while (b < l);
-       }
-       fclose(f);
-       return 0;
-@@ -203,7 +219,8 @@
-    if (gSource) {
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
--         if (gLineString.find("ClassImp") != string::npos) {
-+         if (gLineString.find("ClassImp") != string::npos ||
-+             gLineString.find("NamespaceImp") != string::npos) {
-             i1         = gLineString.find("(")+1;
-             i2         = gLineString.find(")")-1;
-             gClassName = gLineString.substr(i1,i2-i1+1);
-@@ -238,8 +255,8 @@
- 
-    // Build the ROOT command to be executed.
-    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
--   int l = gLineString.length();
--   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
-+   size_t l = gLineString.length();
-+   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
- 
-    ExecuteCommand(gLineString);
- 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
deleted file mode 100644
index 46d6dde..0000000
--- a/root-doxyfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
---- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
-@@ -2058,7 +2058,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--MACRO_EXPANSION        = NO
-+MACRO_EXPANSION        = YES
- 
- # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
- # the macro expansion is limited to the macros specified with the PREDEFINED and
-@@ -2066,7 +2066,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--EXPAND_ONLY_PREDEF     = NO
-+EXPAND_ONLY_PREDEF     = YES
- 
- # If the SEARCH_INCLUDES tag is set to YES the includes files in the
- # INCLUDE_PATH will be searched if a #include is found.
-@@ -2098,7 +2098,7 @@
- # recursively expanded use the := operator instead of the = operator.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--PREDEFINED             =
-+PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
- 
- # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
- # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
deleted file mode 100644
index 35814e2..0000000
--- a/root-doxygen-warnings.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
-@@ -1,4 +1,4 @@
--/// \file impl_tuple_apply.h
-+/// \file ROOT/impl_tuple_apply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RArrayView.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
-@@ -1,4 +1,4 @@
--/// \file rhysd_array_view.h
-+/// \file ROOT/rhysd_array_view.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RTupleApply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
-@@ -1,4 +1,4 @@
--/// \file TCoopPtr
-+/// \file ROOT/TCoopPtr.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDirectory.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDrawable.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-08-07
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
-@@ -1,4 +1,4 @@
--/// \file TKey.h
-+/// \file ROOT/TKey.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TLogger.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-29
-diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
---- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
-@@ -57,7 +57,7 @@
-       // Same value as TVirtualCollectionProxy.
-       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
- 
--   /** @class template TCollectionProxyInfo::IteratorValue
-+   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
-     *
-     * Small helper to encapsulate whether to return the value
-     * pointed to by the iterator or its address.
-@@ -76,7 +76,7 @@
-          }
-       };
- 
--   /** @class template TCollectionProxyInfo::Iterators
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
-     *
-     * Small helper to implement the function to create,access and destroy
-     * iterators.
-@@ -204,7 +204,7 @@
-          }
-       };
- 
--  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
-+  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
-     *
-     * Small helper to save proxy environment in the event of
-     * recursive calls.
-@@ -276,7 +276,7 @@
-       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
-    };
- 
--   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Type
-     *
-     * Small helper to encapsulate basic data accesses for
-     * all STL continers.
-@@ -356,7 +356,7 @@
- 
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like vector, list, deque
-@@ -389,7 +389,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like forward_list
-@@ -425,7 +425,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-@@ -457,7 +457,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
---- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
-@@ -1,4 +1,4 @@
--/// \file TCanvas.h
-+/// \file ROOT/TCanvas.h
- /// \ingroup Gpad ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-08
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
-@@ -26,7 +26,7 @@
- #include "TClass.h"
- #include "TError.h"
- 
--/** \class
-+/** \class TGLPolyMarker
- \ingroup opengl
- To draw a 3D polymarker in a GL window.
- */
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
-@@ -14,7 +14,7 @@
- 
- #include <string.h>
- 
--/** \class
-+/** \class TGLSelectRecordBase
- \ingroup opengl TGLSelectRecordBase
- Base class for select records.
- Supports initialization from a raw GL record (UInt_t*) and
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
-@@ -15,7 +15,7 @@
- #include "TGLPlotCamera.h"
- #include "TGLIncludes.h"
- 
--/** \class
-+/** \class TGLVoxelPainter
- \ingroup opengl
- Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
- */
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
-@@ -49,11 +49,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
--\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
--\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
--\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
--\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
-+\class TH1C
-+\brief 1-D histogram with a byte per channel (see TH1 documentation)
-+\class TH1S
-+\brief 1-D histogram with a short per channel (see TH1 documentation)
-+\class TH1I
-+\brief 1-D histogram with an int per channel (see TH1 documentation)}
-+\class TH1F
-+\brief 1-D histogram with a float per channel (see TH1 documentation)}
-+\class TH1D
-+\brief 1-D histogram with a double per channel (see TH1 documentation)}
- @}
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
-@@ -30,11 +30,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
--\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
--\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
--\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
--\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
-+\class TH2C
-+\brief 2-D histogram with a byte per channel (see TH1 documentation)
-+\class TH2S
-+\brief 2-D histogram with a short per channel (see TH1 documentation)
-+\class TH2I
-+\brief 2-D histogram with an int per channel (see TH1 documentation)}
-+\class TH2F
-+\brief 2-D histogram with a float per channel (see TH1 documentation)}
-+\class TH2D
-+\brief 2-D histogram with a double per channel (see TH1 documentation)}
- @}
- */ 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
---- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
-@@ -28,11 +28,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
--\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
--\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
--\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
--\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
-+\class TH3C
-+\brief 3-D histogram with a byte per channel (see TH1 documentation)
-+\class TH3S
-+\brief 3-D histogram with a short per channel (see TH1 documentation)
-+\class TH3I
-+\brief 3-D histogram with an int per channel (see TH1 documentation)}
-+\class TH3F
-+\brief 3-D histogram with a float per channel (see TH1 documentation)}
-+\class TH3D
-+\brief 3-D histogram with a double per channel (see TH1 documentation)}
- @} 
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
---- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistDrawable.cxx
-+/// \file THistDrawable.cxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-11
-diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistPainter.cxx
-+/// \file THistPainter.cxx
- /// \ingroup HistPainter ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
---- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
-@@ -2463,7 +2463,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Write the first part of the links shown ontop of each doc page;
--/// one <div> has to be closed by caller so additional items can still
-+/// one \<div\> has to be closed by caller so additional items can still
- /// be added.
- 
- void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
-diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
---- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
-@@ -63,7 +63,7 @@
-                        const char *location = 0);
-    static Bool_t CheckFile(const char *path, const char *location = 0);
- 
--   /// Note: This must be kept in sync with values #defined in dcap.h
-+   /// Note: This must be kept in sync with values \#defined in dcap.h
-    enum EOnErrorAction {
-       kOnErrorRetry   =  1,
-       kOnErrorFail    =  0,
-diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
---- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
-@@ -160,7 +160,7 @@
- };
- 
- /**
-- \class TCollectionClassStreamer TCollectionProxy.h
-+ \class TCollectionClassStreamer TCollectionProxyFactory.h
-  \ingroup IO
- 
-  Class streamer object to implement TClassStreamer functionality
-diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
---- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
-@@ -434,7 +434,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include needed for the argument of
-+/// Add to the header file, the \#include needed for the argument of
- /// this template.
- 
- UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
-@@ -587,7 +587,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Add to the header file anything that need to appear after the class
--/// declaration (this includes some #pragma link).
-+/// declaration (this includes some \#pragma link).
- 
- void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
- {
-diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
---- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
-@@ -3645,7 +3645,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include need for this class.
-+/// Add to the header file, the \#include need for this class.
- 
- UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
- {
-diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
---- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
-@@ -1,4 +1,4 @@
--/// \file TFile.h
-+/// \file ROOT/TFile.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
---- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
-@@ -4,7 +4,7 @@
- 
- \brief The %ROOT Mathematical Libraries.
- 
--See the \subpage MathPage "Mathematical Libraries" description page.
-+See the \ref MathPage "Mathematical Libraries" description page.
- 
- 
- \page MathPage The ROOT Mathematical Libraries 
-@@ -39,7 +39,7 @@
- - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
- 
-    - Physics: library with the TVector3 and TLorentzVector classes.
--   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
-+   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
- 
- - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
---- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
-@@ -18,9 +18,7 @@
- #define ROOT_Math_Random
- 
- /**
--@defgroup Random 
--
-- Interface class for Random number generation
-+@defgroup Random Interface class for Random number generation
- */
- 
- #include "Math/RandomFunctions.h"
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
-@@ -209,7 +209,7 @@
- 
-   /**
- 
--  Calculates the real part of the cosine integral \Re(Ci).
-+  Calculates the real part of the cosine integral Re(Ci).
- 
-   For x<0, the imaginary part is \pi i and has to be added by the user,
-   for x>0 the imaginary part of Ci(x) is 0.
-diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
---- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
-@@ -21,7 +21,8 @@
- 
- /**
- 
--\class TKDTree class implementing a kd-tree
-+\class TKDTree
-+\brief Class implementing a kd-tree
- 
- 
- 
-diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
---- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
-@@ -1,4 +1,4 @@
--/// \file TFit.h
-+/// \file ROOT/TFit.h
- /// \ingroup MathCore ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
---- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
-@@ -83,9 +83,6 @@
- 
-     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
-     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
--
--    @ingroup MCIntegration
--
-    */
- 
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
-@@ -51,7 +51,7 @@
-    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
-                \cdot \left ( \int \limits_{0}^{1}
-                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
--               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
-+               - \kappa \, e^{\frac{-s}{\kappa}}\f].
-    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
- 
-    The parameters are:
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
-@@ -84,16 +84,17 @@
- // [5.2.1.6] (complete) elliptic integral of the third kind
- // (26.x.17.2)
- /**
-+Complete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-@@ -220,16 +221,17 @@
- // phi in radians
- // (26.x.17.1)
- /**
-+Incomplete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
---- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
-@@ -38,7 +38,7 @@
-     - The user can optionally provide the
- 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
- 	  - the mode via **TUnuranContDist::SetMode**,
--      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
-+	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
- 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
- 
- Some of this information is required depending on the chosen UNURAN generation method.
-diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
---- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.h
-+/*! \file TGLiteResult.h
- *//*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
---- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.cxx
-+/*! \file TGLiteResult.cxx
-  */ /*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
---- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
-@@ -60,8 +60,8 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// method used to get or set http header in the string buffer
- /// Header has following format:
--///   field1 : value1\r\n
--///   field2 : value2\r\n
-+///   field1 : value1\\r\\n
-+///   field2 : value2\\r\\n
- /// Such format corresponds to header format in HTTP requests
- 
- TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
-diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
---- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
-@@ -1195,7 +1195,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
--/// line [\r]\n. If so, return the pointer to the position after the line,
-+/// line [\\r]\\n. If so, return the pointer to the position after the line,
- /// otherwise return 0. This is used as callback to GetHunk(). The data
- /// between START and PEEKED has been read and cannot be "unread"; the
- /// data after PEEKED has only been peeked.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
---- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
-@@ -813,7 +813,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-@@ -826,7 +826,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
-@@ -1002,7 +1002,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
- 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
-@@ -1264,7 +1264,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- 
- RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
-@@ -21,7 +21,7 @@
-    RooAbsReal is the common abstract base class for objects that represent a
-    real value and implements functionality common to all real-valued objects
-    such as the ability to plot them, to construct integrals of them, the
--   ability to advertise (partial) analytical integrals etc..
-+   ability to advertise (partial) analytical integrals etc.
-    
-    Implementation of RooAbsReal may be derived, thus no interface
-    is provided to modify the contents.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
-@@ -838,7 +838,7 @@
- /// L = TLatex mode
- /// X = Latex mode
- /// Y = Latex table mode ( '=' replaced by '&' )
--/// V = Make name \verbatim in Latex mode
-+/// V = Make name \\verbatim in Latex mode
- /// P = use error to control shown precision
- /// F = force fixed precision
- ///
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
-@@ -55,7 +55,7 @@
-    confidence level is reached within an acceptable neighborhood as defined by
-    SetEpsilon(). More specifically: we calculate the following for different
-    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
--   d{normset} \$.
-+   d{normset} \f$.
-    Important note: this is not the default method because of a bug in constructing
-    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
-    calling SetUseKeys(true), and the data set will be interpreted without weights.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
-@@ -53,7 +53,7 @@
- To make Propose(xPrime, x) dependent on x, configure with
- PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
- 
--````{.cpp}
-+~~~{.cpp}
- // our parameter
- RooRealVar p("p", "p", 5, 0, 10);
- 
-@@ -74,7 +74,7 @@
- // number of proposals. If you don't call this function, the default cache size
- // is 1, which can be slow.
- pdfProposal.SetCacheSize(desiredCacheSize);
--````
-+~~~
- 
- PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
- for future versions.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
-@@ -40,8 +40,8 @@
- By default the calculation is:
- 
- \f[
--	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
--   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
-+        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
- \f]
- 
- where \f$ \lambda \f$ is the profile likeihood ratio, so the 
-@@ -50,11 +50,11 @@
- If ``SetSubtractMLE(false)`` then it calculates:
- 
- \f[
-+        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
-+\f]
- 
--	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
--                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
--
--where \f$ L\$ is the Likelihood function. 
-+where \f$ L \f$ is the Likelihood function.
- 
- The values of the parameters of interest for the alternative 
- hypothesis are taken at the time of the construction.
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
-@@ -9,7 +9,7 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
--/** \class Detail::TBranchProxy
-+/** \class ROOT::Detail::TBranchProxy
- Base class for all the proxy object. It includes the imeplemtation
- of the autoloading of branches as well as all the generic setup routine.
- */
diff --git a/root-fflags.patch b/root-fflags.patch
deleted file mode 100644
index 3fd6f0e..0000000
--- a/root-fflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
-@@ -70,7 +70,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -107,7 +107,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -144,7 +144,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
---- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
-@@ -37,12 +37,12 @@
-        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
-     else(${SYSCTL_OUTPUT} MATCHES 64)
-        MESSAGE(STATUS "Found a 32bit system")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
-     endif(${SYSCTL_OUTPUT} MATCHES 64)
-   endif()
- 
-@@ -65,7 +65,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-@@ -101,7 +101,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
---- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
-@@ -13,7 +13,7 @@
- 
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
deleted file mode 100644
index b60ac0d..0000000
--- a/root-fontconfig.patch
+++ /dev/null
@@ -1,1408 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
-@@ -265,18 +265,11 @@
-    LoadGraphicsLibs();
- 
-    // Try to load TrueType font renderer. Only try to load if not in batch
--   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-+   // mode and Root.UseTTFonts is true. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--   // Check for use of DFSG - fonts
--   if (!ttfont)
--      ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--
- #if !defined(R__WIN32)
-    if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
--       ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+       gEnv->GetValue("Root.UseTTFonts", 1)) {
-       if (gClassTable->GetDict("TGX11TTF")) {
-          // in principle we should not have linked anything against libGX11TTF
-          // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -290,7 +283,6 @@
-       }
-    }
- #endif
--   delete [] ttfont;
- 
-    // Create WM dependent application environment
-    if (fAppImp)
-diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
---- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
-@@ -12,7 +12,7 @@
- 
- include_directories(${FREETYPE_INCLUDE_DIRS})
- 
--ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
-+ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
- 
- if(builtin_freetype)
-   add_dependencies(${libname} FREETYPE)
-diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
---- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
-@@ -86,9 +86,8 @@
-    static FT_BBox        fgCBox;                  // string control box
-    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
-    static Int_t          fgCurFontIdx;            // current font index
--   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
-    static Int_t          fgFontCount;             // number of fonts loaded
--   static char          *fgFontName[kTTMaxFonts]; // font name
-+   static Int_t          fgFontID[kTTMaxFonts];   // font ID
-    static FT_Face        fgFace[kTTMaxFonts];     // font face
-    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
-    static Bool_t         fgHinting;               // use hinting (true by default)
-diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
---- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
-@@ -46,7 +46,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
- 		   "$(GRAFO) $(GRAFDO)" \
--		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,GRAF)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
-@@ -25,6 +25,8 @@
- #include "TMath.h"
- #include "TError.h"
- 
-+#include <fontconfig/fontconfig.h>
-+
- // to scale fonts to the same size as the old TT version
- const Float_t kScale = 0.93376068;
- 
-@@ -38,10 +40,9 @@
- Int_t          TTF::fgWidth          = 0;
- Int_t          TTF::fgAscent         = 0;
- Int_t          TTF::fgCurFontIdx     = -1;
--Int_t          TTF::fgSymbItaFontIdx = -1;
- Int_t          TTF::fgFontCount      = 0;
- Int_t          TTF::fgNumGlyphs      = 0;
--char          *TTF::fgFontName[kTTMaxFonts];
-+Int_t          TTF::fgFontID[kTTMaxFonts];
- FT_Matrix     *TTF::fgRotMatrix;
- FT_Library     TTF::fgLibrary;
- FT_BBox        TTF::fgCBox;
-@@ -72,6 +73,11 @@
-       return;
-    }
- 
-+   // Add root's font directory
-+   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
-+                                       TROOT::GetTTFFontDir());
-+   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
-+
-    // load default font (arialbd)
-    SetTextFont(62);
- }
-@@ -84,7 +90,6 @@
-    if (!fgInit) return;
- 
-    for (int i = 0; i < fgFontCount; i++) {
--      delete [] fgFontName[i];
-       FT_Done_Face(fgFace[i]);
-    }
-    if (fgRotMatrix) delete fgRotMatrix;
-@@ -109,12 +114,19 @@
-          charmap  = fgFace[fgCurFontIdx]->charmaps[i];
-          platform = charmap->platform_id;
-          encoding = charmap->encoding_id;
--         if ((platform == 3 && encoding == 1) ||
-+         if ((platform == 3 && encoding == 1 &&
-+              (fgFontID[fgCurFontIdx] != 12 &&
-+               fgFontID[fgCurFontIdx] != 14 &&
-+               fgFontID[fgCurFontIdx] != 15)) ||
-              (platform == 0 && encoding == 0) ||
-+             (platform == 7 && encoding == 2 &&
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)) ||
-              (platform == 1 && encoding == 0 &&
--              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
--             (platform == 1 && encoding == 0 &&
--              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)))
-          {
-             fgCharMap[fgCurFontIdx] = charmap;
-             if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -378,27 +390,147 @@
- 
-    if (!fontname || !fontname[0]) {
-       Warning("TTF::SetTextFont",
--              "no font name specified, using default font %s", fgFontName[0]);
-+              "no font name specified, using default font");
-       fgCurFontIdx = 0;
-       return 0;
-    }
-    const char *basename = gSystem->BaseName(fontname);
- 
-+   if (strcmp(basename, "timesi.ttf") == 0 ||
-+       strcmp(basename, "FreeSerifItalic.otf") == 0) {
-+      SetTextFont(12);
-+   }
-+   else if (strcmp(basename, "timesbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBold.otf") == 0) {
-+      SetTextFont(22);
-+   }
-+   else if (strcmp(basename, "timesbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
-+      SetTextFont(32);
-+   }
-+   else if (strcmp(basename, "arial.ttf") == 0 ||
-+            strcmp(basename, "FreeSans.otf") == 0) {
-+      SetTextFont(42);
-+   }
-+   else if (strcmp(basename, "ariali.ttf") == 0 ||
-+            strcmp(basename, "FreeSansOblique.otf") == 0) {
-+      SetTextFont(52);
-+   }
-+   else if (strcmp(basename, "arialbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBold.otf") == 0) {
-+      SetTextFont(62);
-+   }
-+   else if (strcmp(basename, "arialbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
-+      SetTextFont(72);
-+   }
-+   else if (strcmp(basename, "cour.ttf") == 0 ||
-+            strcmp(basename, "FreeMono.otf") == 0) {
-+      SetTextFont(82);
-+   }
-+   else if (strcmp(basename, "couri.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoOblique.otf") == 0) {
-+      SetTextFont(92);
-+   }
-+   else if (strcmp(basename, "courbd.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBold.otf") == 0) {
-+      SetTextFont(102);
-+   }
-+   else if (strcmp(basename, "courbi.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
-+      SetTextFont(112);
-+   }
-+   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      if (italic)
-+         SetTextFont(152);
-+      else
-+         SetTextFont(122);
-+   }
-+   else if (strcmp(basename, "times.ttf") == 0 ||
-+            strcmp(basename, "FreeSerif.otf") == 0) {
-+      SetTextFont(132);
-+   }
-+   else if (strcmp(basename, "wingding.ttf") == 0) {
-+      SetTextFont(142);
-+   }
-+   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
-+      SetTextFont(162);
-+   }
-+   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
-+      SetTextFont(172);
-+   }
-+   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
-+      SetTextFont(182);
-+   }
-+   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
-+      SetTextFont(192);
-+   }
-+   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
-+      SetTextFont(202);
-+   }
-+   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
-+      SetTextFont(212);
-+   }
-+   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
-+      SetTextFont(222);
-+   }
-+   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
-+      SetTextFont(232);
-+   }
-+   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
-+      SetTextFont(242);
-+   }
-+   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
-+      SetTextFont(252);
-+   }
-+   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
-+      SetTextFont(262);
-+   }
-+   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
-+      SetTextFont(272);
-+   }
-+   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
-+      SetTextFont(282);
-+   }
-+   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
-+      SetTextFont(292);
-+   }
-+   else {
-+      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
-+      if (fgFontCount) {
-+         Warning("TTF::SetTextFont", "using default font");
-+         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+         return 0;
-+      } else {
-+         return 1;
-+      }
-+   }
-+
-+   return 0;
-+}
-+
-+//______________________________________________________________________________
-+void TTF::SetTextFont(Font_t fontnumber)
-+{
-+   int fontid = fontnumber / 10;
-+   if (fontid < 0 || fontid > 31) fontid = 0;
-+
-+   Int_t italic = 0;
-+   if (fontid==15) italic = 1;
-+
-+   if (!fgInit) Init();
-+
-+   if (fontid == 0) {
-+      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
-+      return;
-+   }
-+
-    // check if font is in cache
-    int i;
-    for (i = 0; i < fgFontCount; i++) {
--      if (!strcmp(fgFontName[i], basename)) {
--         if (italic) {
--            if (i==fgSymbItaFontIdx) {
--               fgCurFontIdx = i;
--               return 0;
--            }
--         } else {
--            if (i!=fgSymbItaFontIdx) {
--               fgCurFontIdx = i;
--               return 0;
--            }
--         }
-+      if (fgFontID[i] == fontid) {
-+         fgCurFontIdx = i;
-+         return;
-       }
-    }
- 
-@@ -406,151 +538,215 @@
-    if (fgFontCount >= kTTMaxFonts) {
-       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
-             kTTMaxFonts);
--      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-+      Warning("TTF::SetTextFont", "using default font");
-       fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--      return 0;
-+      return;
-    }
- 
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   char *ttfont = NULL;
-+   int ttindex = 0;
- 
--   if (!ttfont) {
--      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
--      if (fgFontCount) {
--         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--         return 0;
--      } else {
--         return 1;
--      }
-+   FcPattern *pat, *match;
-+   FcCharSet *set = NULL;
-+   FcResult result;
-+
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 16:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 17:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 18:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 19:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 20:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 21:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 22:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 23:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 24:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 25:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 26:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 27:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 28:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 29:
-+   case 30:
-+   case 31:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      set = FcCharSetCreate ();
-+      FcCharSetAddChar (set, 0x0410); // Cyrillic
-+      FcCharSetAddChar (set, 0x4e00); // CJK
-+      FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   default:
-+      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
-+      FcPatternDestroy (pat);
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+      return;
-+      break;
-    }
- 
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
-+   char *ttfnt;
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+   ttfont = StrDup (ttfnt);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
-+   if (set) FcCharSetDestroy (set);
-+
-    FT_Face  tface = 0;
- 
--   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
-+   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
-       Error("TTF::SetTextFont", "error loading font %s", ttfont);
-       delete [] ttfont;
-       if (tface) FT_Done_Face(tface);
--      if (fgFontCount) {
--         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;
--         return 0;
--      } else {
--         return 1;
--      }
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;
-+      return;
-    }
- 
-    delete [] ttfont;
- 
--   fgFontName[fgFontCount] = StrDup(basename);
-+   fgFontID[fgFontCount]   = fontid;
-    fgCurFontIdx            = fgFontCount;
-    fgFace[fgCurFontIdx]    = tface;
-    fgCharMap[fgCurFontIdx] = 0;
-    fgFontCount++;
- 
-    if (italic) {
--      fgSymbItaFontIdx = fgCurFontIdx;
-       FT_Matrix slantMat;
-       slantMat.xx = (1 << 16);
-       slantMat.xy = ((1 << 16) >> 2);
-       slantMat.yx = 0;
-       slantMat.yy = (1 << 16);
--      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
--   }
--
--   return 0;
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Set specified font.
--/// List of the currently supported fonts (screen and PostScript)
--///
--/// | Font ID |   X11                     |     TTF          |
--/// |---------|---------------------------|------------------|
--/// |      1  | times-medium-i-normal     | timesi.ttf       |
--/// |      2  | times-bold-r-normal       | timesbd.ttf      |
--/// |      3  | times-bold-i-normal       | timesi.ttf       |
--/// |      4  | helvetica-medium-r-normal | arial.ttf        |
--/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
--/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
--/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
--/// |      8  | courier-medium-r-normal   | cour.ttf         |
--/// |      9  | courier-medium-o-normal   | couri.ttf        |
--/// |     10  | courier-bold-r-normal     | courbd.ttf       |
--/// |     11  | courier-bold-o-normal     | courbi.ttf       |
--/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
--/// |     13  | times-medium-r-normal     | times.ttf        |
--/// |     14  |                           | wingding.ttf     |
--/// |     15  | symbol oblique is emulated from symbol.ttf | |
--
--void TTF::SetTextFont(Font_t fontnumber)
--{
--   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
--   // Table of Microsoft and (for non-MSFT operating systems) backup
--   // FreeFont TTF fonts.
--   static const char *fonttable[][2] = {
--     { "Root.TTFont.0", "FreeSansBold.otf" },
--     { "Root.TTFont.1", "FreeSerifItalic.otf" },
--     { "Root.TTFont.2", "FreeSerifBold.otf" },
--     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--     { "Root.TTFont.4", "FreeSans.otf" },
--     { "Root.TTFont.5", "FreeSansOblique.otf" },
--     { "Root.TTFont.6", "FreeSansBold.otf" },
--     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--     { "Root.TTFont.8", "FreeMono.otf" },
--     { "Root.TTFont.9", "FreeMonoOblique.otf" },
--     { "Root.TTFont.10", "FreeMonoBold.otf" },
--     { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--     { "Root.TTFont.12", "symbol.ttf" },
--     { "Root.TTFont.13", "FreeSerif.otf" },
--     { "Root.TTFont.14", "wingding.ttf" },
--     { "Root.TTFont.15", "symbol.ttf" },
--     { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--     { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--     { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--     { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--     { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--     { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--     { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--     { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--     { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--     { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--     { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--     { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--     { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
--   };
--
--   static int fontset = -1;
--   int        thisset = fontset;
--
--   int fontid = fontnumber / 10;
--   if (fontid < 0 || fontid > 31) fontid = 0;
--
--   if (thisset == -1) {
--      // try to load font (font must be in Root.TTFontPath resource)
--      // to see which fontset we have available
--      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                          TROOT::GetTTFFontDir());
--      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
--      if (ttfont) {
--         delete [] ttfont;
--         thisset = 0;
--      } else {
--         // try backup free font
--         thisset = 1;
--      }
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
-    }
--   Int_t italic = 0;
--   if (fontid==15) italic = 1;
--   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
--   // Do not define font set is we're loading the symbol.ttf - it's
--   // the same in both cases.
--   if (ret == 0 && fontid != 12) fontset = thisset;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
---- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
-@@ -5,5 +5,5 @@
- 
- ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
-+ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
- ROOT_INSTALL_HEADERS()
-diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
---- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
-@@ -50,7 +50,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
- 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
--		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,POSTSCRIPT)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
-@@ -229,6 +229,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <wchar.h>
-+#include <fontconfig/fontconfig.h>
- 
- #include "Riostream.h"
- #include "Byteswap.h"
-@@ -1528,56 +1529,179 @@
- 
- void TPostScript::FontEmbed(void)
- {
--   static const char *fonttable[32][2] = {
--      { "Root.TTFont.0", "FreeSansBold.otf" },
--      { "Root.TTFont.1", "FreeSerifItalic.otf" },
--      { "Root.TTFont.2", "FreeSerifBold.otf" },
--      { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--      { "Root.TTFont.4", "FreeSans.otf" },
--      { "Root.TTFont.5", "FreeSansOblique.otf" },
--      { "Root.TTFont.6", "FreeSansBold.otf" },
--      { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
--      { "Root.TTFont.8", "FreeMono.otf" },
--      { "Root.TTFont.9", "FreeMonoOblique.otf" },
--      { "Root.TTFont.10", "FreeMonoBold.otf" },
--      { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
--      { "Root.TTFont.12", "symbol.ttf" },
--      { "Root.TTFont.13", "FreeSerif.otf" },
--      { "Root.TTFont.14", "wingding.ttf" },
--      { "Root.TTFont.15", "symbol.ttf" },
--      { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
--      { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
--      { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
--      { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
--      { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
--      { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
--      { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
--      { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
--      { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
--      { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
--      { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
--      { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
--      { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
--      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
--      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
--      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
--   };
--
-    PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
- 
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--
-    for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15 && MustEmbed[fontid-1]) {
--         const char *filename = gEnv->GetValue(
--                                               fonttable[fontid][0], fonttable[fontid][1]);
--         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
-+
-+         char *ttfont = NULL;
-+
-+         FcPattern *pat, *match;
-+         FcCharSet *set = NULL;
-+         FcResult result;
-+
-+         pat = FcPatternCreate ();
-+
-+         switch (fontid) {
-+         case 1:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 2:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 3:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 4:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 5:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 6:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 7:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 8:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 9:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 10:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 11:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 13:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 14:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 16:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 17:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 18:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 19:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 20:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 21:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 22:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 23:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 24:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 25:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 26:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 27:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 28:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 29:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            set = FcCharSetCreate ();
-+            FcCharSetAddChar (set, 0x0410); // Cyrillic
-+            FcCharSetAddChar (set, 0x4e00); // CJK
-+            FcPatternAddCharSet (pat, FC_CHARSET, set);
-+            break;
-+         }
-+
-+         FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+         FcDefaultSubstitute (pat);
-+         match = FcFontMatch (NULL, pat, &result);
-+         char *ttfnt;
-+         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+         ttfont = StrDup(ttfnt);
-+         FcPatternDestroy (match);
-+         FcPatternDestroy (pat);
-+         if (set) FcCharSetDestroy (set);
-+
-          if (!ttfont) {
--            Error("TPostScript::FontEmbed",
--                  "font %d (filename `%s') not found in path",
--                  fontid, filename);
-+            Error("TPostScript::FontEmbed", "font %d not found in path",
-+                  fontid);
-          } else {
-             if (FontEmbedType2(ttfont)) {
-                // nothing
-@@ -1586,9 +1710,8 @@
-             } else if(FontEmbedType42(ttfont)) {
-                // nothing
-             } else {
--               Error("TPostScript::FontEmbed",
--                     "failed to embed font %d (filename `%s')",
--                     fontid, filename);
-+               Error("TPostScript::FontEmbed", "failed to embed font %d)",
-+                     fontid);
-             }
-             delete [] ttfont;
-          }
-@@ -2536,10 +2659,10 @@
-       { "Root.PSFont.5",             "/Helvetica-Oblique" },
-       { "Root.PSFont.6",             "/Helvetica-Bold" },
-       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
--      { "Root.PSFont.8",             "/Courrier" },
--      { "Root.PSFont.9",             "/Courrier-Oblique" },
--      { "Root.PSFont.10",            "/Courrier-Bold" },
--      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
-+      { "Root.PSFont.8",             "/Courier" },
-+      { "Root.PSFont.9",             "/Courier-Oblique" },
-+      { "Root.PSFont.10",            "/Courier-Bold" },
-+      { "Root.PSFont.11",            "/Courier-BoldOblique" },
-       { "Root.PSFont.12",            "/Symbol" },
-       { "Root.PSFont.13",            "/Times-Roman" },
-       { "Root.PSFont.14",            "/ZapfDingbats" },
-@@ -2745,10 +2868,10 @@
-       { "Root.PSFont.9", "/FreeMonoOblique" },
-       { "Root.PSFont.10", "/FreeMonoBold" },
-       { "Root.PSFont.11", "/FreeMonoBoldOblique" },
--      { "Root.PSFont.12", "/SymbolMT" },
-+      { "Root.PSFont.12", "/StandardSymbolsL" },
-       { "Root.PSFont.13", "/FreeSerif" },
--      { "Root.PSFont.14", "/Wingdings-Regular" },
--      { "Root.PSFont.15", "/SymbolMT" },
-+      { "Root.PSFont.14", "/Dingbats" },
-+      { "Root.PSFont.15", "/StandardSymbolsL" },
-       { "Root.PSFont.STIXGen", "/STIXGeneral" },
-       { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
-       { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
-@@ -32,6 +32,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
-@@ -78,7 +78,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
--		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
-+		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
- 	$(noop)
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
-@@ -37,6 +37,7 @@
- # include "FTGLBitmapFont.h"
- #endif
- 
-+#include <fontconfig/fontconfig.h>
- 
- /** \class TGLFont
- \ingroup opengl
-@@ -420,7 +421,7 @@
- ClassImp(TGLFontManager);
- 
- TObjArray   TGLFontManager::fgFontFileArray;
--Int_t TGLFontManager::fgExtendedFontStart;
-+Int_t TGLFontManager::fgExtendedFontStart = 0;
- TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
- Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
- 
-@@ -451,17 +452,175 @@
-    FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
-    if (it == fFontMap.end())
-    {
--      TString ttpath, file;
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
--      {
--         //For extenede we have both ttf and otf.
--         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
--                                   ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
--                                   ((TObjString*)fgFontFileArray[fileID])->String());
--         file = fp;
--         delete [] fp;
-+      char *file = NULL;
-+      int ttindex = 0;
-+
-+      FcPattern *pat, *match;
-+      FcCharSet *set = NULL;
-+      FcResult result;
-+
-+      pat = FcPatternCreate ();
-+
-+      switch (fileID) {
-+      case 0:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 1:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 2:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 3:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 4:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 5:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 6:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 7:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 8:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 9:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 10:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 11:
-+      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 12:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 13:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 15:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 16:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 17:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 18:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 19:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 20:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 21:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 22:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 23:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 24:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 25:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 26:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 27:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 28:
-+      case 29:
-+      case 30:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         set = FcCharSetCreate ();
-+         FcCharSetAddChar (set, 0x0410); // Cyrillic
-+         FcCharSetAddChar (set, 0x4e00); // CJK
-+         FcPatternAddCharSet (pat, FC_CHARSET, set);
-       }
- 
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
-+      char *ttfnt;
-+      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+      file = StrDup (ttfnt);
-+      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+      FcPatternDestroy (match);
-+      FcPatternDestroy (pat);
-+      if (set) FcCharSetDestroy (set);
-+
-       FTFont* ftfont = 0;
-       switch (mode)
-       {
-@@ -485,10 +644,14 @@
-             ftfont = new FTGLTextureFont(file);
-             break;
-          default:
-+            delete [] file;
-             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
-             return;
-             break;
-       }
-+
-+      delete [] file;
-+
-       ftfont->FaceSize(size);
-       const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
-       out.CopyAttributes(mf);
-@@ -571,8 +734,6 @@
- {
-    if (fgStaticInitDone == kFALSE) InitStatics();
- 
--   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
--
-    return fgExtendedFontStart;
- }
- 
-@@ -642,28 +803,6 @@
-    fgFontFileArray.Add(new TObjString("wingding")); // 140
-    fgFontFileArray.Add(new TObjString("symbol"));   // 150
- 
--   fgExtendedFontStart = fgFontFileArray.GetEntries();
--   //"Extended" fonts for gl-pad.
--   //fgPadFontStart + ...
--   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
--   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
--   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
--
--   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
--   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
--   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
--   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
--
--   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
--   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
--   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
--   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
--
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
--   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
--   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
--
-    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
-    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
-    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
-@@ -34,6 +34,8 @@
- # include "FTGLBitmapFont.h"
- #endif
- 
-+#include <fontconfig/fontconfig.h>
-+
- #define FTGL_BITMAP  0
- #define FTGL_PIXMAP  1
- #define FTGL_OUTLINE 2
-@@ -178,27 +180,92 @@
- {
-    int fontid = fontnumber / 10;
- 
--   const char *fontname=0;
--   if (fontid == 0)  fontname = "arialbd.ttf";
--   if (fontid == 1)  fontname = "timesi.ttf";
--   if (fontid == 2)  fontname = "timesbd.ttf";
--   if (fontid == 3)  fontname = "timesbi.ttf";
--   if (fontid == 4)  fontname = "arial.ttf";
--   if (fontid == 5)  fontname = "ariali.ttf";
--   if (fontid == 6)  fontname = "arialbd.ttf";
--   if (fontid == 7)  fontname = "arialbi.ttf";
--   if (fontid == 8)  fontname = "cour.ttf";
--   if (fontid == 9)  fontname = "couri.ttf";
--   if (fontid == 10) fontname = "courbd.ttf";
--   if (fontid == 11) fontname = "courbi.ttf";
--   if (fontid == 12) fontname = "symbol.ttf";
--   if (fontid == 13) fontname = "times.ttf";
--   if (fontid == 14) fontname = "wingding.ttf";
--
--   // try to load font (font must be in Root.TTFontPath resource)
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   FcPattern *pat, *match;
-+   FcResult result;
-+   char *ttfont;
-+   int ttindex;
-+
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 0:
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   }
-+
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
- 
-    if (fGLTextFont) delete fGLTextFont;
- 
-@@ -206,7 +273,9 @@
- 
-    fGLTextFont = new FTGLPolygonFont(ttfont);
- 
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
-+
-    if (!fGLTextFont->FaceSize(1))
-       Error("SetGLTextFont","Cannot set FTGL::FaceSize");
--   delete [] ttfont;
- }
-diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
-@@ -83,20 +83,12 @@
-    gROOT->SetBatch(kFALSE);
- 
-    if (strcmp(appClassName, "proofserv")) {
--      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                          TROOT::GetTTFFontDir());
--      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
--      if (!ttfont)
--         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--      if (ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+      if (gEnv->GetValue("Root.UseTTFonts", 1)) {
-          TPluginHandler *h;
-          if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualX", "x11ttf")))
-             if (h->LoadPlugin() == -1)
-                Info("TGApplication", "no TTF support");
-       }
--
--      delete [] ttfont;
-    }
- 
-    // Create the canvas colors early so they are allocated before
-diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
---- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
-@@ -119,8 +119,7 @@
- {
-    TString sc;
-    Float_t step, mark[5];
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arialbd.ttf";
-+   TString ar = "arialbd.ttf";
-    Int_t i, nexe, offset;
- 
-    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -528,8 +527,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-@@ -609,8 +607,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
deleted file mode 100644
index c0f9e07..0000000
--- a/root-gl2ps.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
---- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
-@@ -0,0 +1,21 @@
-+# - Locate gl2ps library
-+# Defines:
-+#
-+#  GL2PS_FOUND
-+#  GL2PS_INCLUDE_DIR
-+#  GL2PS_INCLUDE_DIRS (not cached)
-+#  GL2PS_LIBRARIES
-+
-+find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
-+find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
-+
-+set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
-+set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
-+
-+mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
-@@ -70,6 +70,7 @@
- ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
- ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
- ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
-+ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
-@@ -153,6 +153,11 @@
- set(opengllib ${OPENGL_gl_LIBRARY})
- set(openglincdir ${OPENGL_INCLUDE_DIR})
- 
-+set(builtingl2ps ${value${builtin_gl2ps}})
-+set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
-+set(gl2pslib ${GL2PS_LIBRARY})
-+set(gl2psincdir ${GL2PS_INCLUDE_DIR})
-+
- set(buildldap ${value${ldap}})
- set(ldaplibdir ${LDAP_LIBRARY_DIR})
- set(ldaplib ${LDAP_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
-@@ -334,6 +334,16 @@
-   endif()
- endif()
- 
-+#---Check for gl2ps ------------------------------------------------------------------
-+if(NOT builtin_gl2ps)
-+  message(STATUS "Looking for gl2ps")
-+  find_Package(gl2ps)
-+  if(NOT GL2PS_FOUND)
-+    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
-+    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Graphviz installation-------------------------------------------------------
- if(gviz)
-   message(STATUS "Looking for Graphviz")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
-@@ -142,6 +142,11 @@
- OPENGLLIB      := @opengllib@
- OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
- 
-+BUILTINGL2PS   := @builtingl2ps@
-+GL2PSLIBDIR    := @gl2pslibdir@
-+GL2PSCLILIB    := @gl2pslib@
-+GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
-+
- BUILDLDAP      := @buildldap@
- LDAPLIBDIR     := @ldaplibdir@
- LDAPCLILIB     := @ldaplib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
-+++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
-@@ -53,6 +53,7 @@
-    enable_builtin_afterimage \
-    enable_builtin_ftgl       \
-    enable_builtin_freetype   \
-+   enable_builtin_gl2ps      \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-    enable_builtin_unuran     \
-@@ -182,6 +183,7 @@
- enable_winrtdebug=
- enable_builtin_freetype=no
- enable_builtin_ftgl=no
-+enable_builtin_gl2ps=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
- enable_builtin_unuran=no
-@@ -1704,6 +1706,7 @@
-   builtin-afterimage Build included libAfterImage, or use system libAfterImage
-   builtin-ftgl       Build included libFTGL, or use system libftgl
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-+  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-   builtin-unuran     Build included libunuran, or use system libunuran
-@@ -2047,6 +2050,7 @@
-    logmsg "Will use by default builtin versions of libraries on Win32"
-    enable_builtin_freetype="yes"
-    enable_builtin_ftgl="yes"
-+   enable_builtin_gl2ps="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-    enable_builtin_unuran="yes"
-@@ -3180,6 +3184,38 @@
- 
- ######################################################################
- #
-+### echo %%% libgl2ps (builtin or system)
-+#
-+if test "x$enable_builtin_gl2ps" = "xno" ; then
-+    check_header "gl2ps.h" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_gl2ps=yes
-+    else
-+        gl2psinc=$found_hdr
-+        gl2psincdir=$found_dir
-+    fi
-+
-+    check_library "libgl2ps" "$enable_shared" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        gl2pslib=""
-+        gl2pslibdir=""
-+        enable_builtin_gl2ps="yes"
-+    else
-+        gl2pslib="$found_lib"
-+        gl2pslibdir="$found_dir"
-+    fi
-+
-+    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
-+        enable_builtin_gl2ps="yes"
-+    fi
-+fi
-+message "Checking whether to build included gl2ps"
-+result "$enable_builtin_gl2ps"
-+
-+######################################################################
-+#
- ### echo %%% libpcre (builtin or system) - Mandatory lib
- #
- # Mandatory test, must succeed (see http://www.pcre.org/)
-@@ -7593,6 +7629,10 @@
-     -e "s|@ftglincdir@|$ftglincdir|"            \
-     -e "s|@ftgllibdir@|$ftgllibdir|"            \
-     -e "s|@ftgllibs@|$ftgllibs|"                \
-+    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
-+    -e "s|@gl2psincdir@|$gl2psincdir|"          \
-+    -e "s|@gl2pslib@|$gl2pslib|"                \
-+    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
-     -e "s|@glewincdir@|$glewincdir|"            \
-     -e "s|@glewlibdir@|$glewlibdir|"            \
-     -e "s|@glewlibs@|$glewlibs|"                \
-diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
-@@ -7,12 +7,20 @@
- ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
- list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
-                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
-+set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
- ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
- 
- if(WIN32 OR cocoa)
-   list(REMOVE_ITEM headers TX11GL.h)
-   list(REMOVE_ITEM sources TX11GL.cxx)
--  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
-+  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
-+endif()
-+
-+if(builtin_gl2ps)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+else()
-+  list(REMOVE_ITEM sources gl2ps.cxx)
-+  include_directories(${GL2PS_INCLUDE_DIRS})
- endif()
- 
- if(WIN32)
-@@ -32,6 +40,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
-@@ -19,6 +19,7 @@
- GLDH         := $(GLDS:.cxx=.h)
- 
- GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
-+GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
- GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
- 
- # Excluded from win32 builds
-@@ -42,6 +43,13 @@
- # Used by rootcint
- GLH2         := $(filter-out $(GLH1), $(GLH))
- 
-+ifeq ($(BUILTINGL2PS),yes)
-+GL2PSFLAGS   := -I$(MODDIRI)
-+else()
-+GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
-+GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
-+endif()
-+
- ifneq ($(OPENGLLIB),)
- GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
-                 $(XLIBS) -lm
-@@ -78,6 +86,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
-+		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
- 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
-@@ -107,12 +116,12 @@
- ##### extra rules ######
- ifeq ($(ARCH),win32)
- $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- else
--$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
--$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
-+$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
-+$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
- endif
- 
- $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-html-markup.patch b/root-html-markup.patch
deleted file mode 100644
index d6b9d1e..0000000
--- a/root-html-markup.patch
+++ /dev/null
@@ -1,1031 +0,0 @@
-diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
-@@ -42,7 +42,6 @@
- //
- // This enum type describes the ways in which TGTextEntry can display
- // its contents. The currently defined values are:
--//Begin_Html
- /*
- <ul>
- <li>  kNormal - display characters as they are entered. This is the default.
-@@ -50,14 +49,12 @@
- <li>  kPassword - display asterisks instead of the characters actually entered.
- </ul>
- */
--//End_Html
- // See also SetEchoMode(), GetEchoMode().
- //
- // enum TGTextEntry::EInsertMode
- //
- // This enum type describes the way how typed characters are
- // inserted in the text entry. This mode is switched by "Insert" key.
--//Begin_Html
- /*
- <ul>
- <li>  kInsert - typed character are inserted (cursor has shape of short line).
-@@ -65,13 +62,11 @@
-                  (cursor has the shape of filled rectangle).
- </ul>
- */
--//End_Html
- //
- // enum TGWidget::ETextJustification
- //
- // This enum type (defined in TGWidget.h) describes the text alignment modes.
- // These modes are valid untill text fits the frame width
--//Begin_Html
- /*
- <ul>
- <li>  kTextLeft    - left-side text alignment
-@@ -79,12 +74,10 @@
- <li>  kTextCenterX - center text alignment
- </ul>
- */
--//End_Html
- //
- //
- // The key press event handler converts a key press to some line editor action.
- // Here are the default key bindings:
--//Begin_Html
- /*
- <ul>
- <li><i> Left Arrow </i>
-@@ -153,7 +146,6 @@
- </ul>
- All other keys with valid ASCII codes insert themselves into the line.
- */
--//End_Html
- //
- ////////////////////////////////////////////////////////////////////////////////
- 
-@@ -658,13 +650,11 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// The echo modes available are:
--///Begin_Html
- /// <ul>
- /// <li> kNormal   - display characters as they are entered.  This is the default.
- /// <li> kNoEcho   - do not display anything.
- /// <li> kPassword - display asterisks instead of the characters actually entered.
- /// </ul>
--///End_Html
- /// It is always possible to cut and paste any marked text;  only the widget's own
- /// display is affected.
- /// See also GetEchoMode(), GetDisplayText().
-@@ -1154,7 +1144,6 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// The key press event handler converts a key press to some line editor
- /// action. Here are the default key bindings:
--///Begin_Html
- ///  <ul>
- ///  <li><i> Left Arrow </i>
- ///          Move the cursor one character leftwards.
-@@ -1220,7 +1209,6 @@
- ///  <li><i> Control-Y </i>
- ///          Paste the clipboard text into line edit.
- ///  </ul>
--///End_Html
- ///  All other keys with valid ASCII codes insert themselves into the line.
- 
- Bool_t TGTextEntry::HandleKey(Event_t* event)
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
-@@ -938,17 +938,10 @@
- ///  NOTE: To access the generated histograms in the current directory, do eg:
- ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
- ///
--/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
--/// with the following output:
--///Begin_Html
-+/// A complete example of this function is given in tutorial fitslicesy.C.
- 
- void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
- {
--   /*
--   <img src="gif/fitslicesy.gif">
--   */
--   //End_Html
--
-    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
- 
- }
-diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
---- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
-@@ -603,7 +603,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -682,7 +682,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -986,7 +986,7 @@
- ///     None so far
- ///
- /// For detailed description of what this entails, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::FindParameterization(Option_t *)
- {
-@@ -1005,7 +1005,7 @@
- ///     M     use Minuit to improve coefficients
- ///
- /// Also, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::Fit(Option_t *option)
- {
-@@ -1097,7 +1097,7 @@
- /// PRIVATE METHOD:
- /// Create list of candidate functions for the parameterisation. See
- /// also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeCandidates()
- {
-@@ -1354,7 +1354,7 @@
- /// PRIVATE METHOD:
- /// Invert the model matrix B, and compute final coefficients. For a
- /// more thorough discussion of what this means, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- ///
- /// First we invert the lower triangle matrix fOrthCurvatureMatrix
- /// and store the inverted matrix in the upper triangle.
-@@ -1496,7 +1496,7 @@
- /// Make Gram-Schmidt orthogonalisation. The class description gives
- /// a thorough account of this algorithm, as well as
- /// references. Please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
- {
-@@ -1589,7 +1589,7 @@
- ///     R4        Residuals computed on test sample
- ///
- /// For a description of these quantities, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeHistograms(Option_t *option)
- {
-@@ -1800,7 +1800,7 @@
- /// PRIVATE METHOD:
- /// Find the parameterization over the training sample. A full account
- /// of the algorithm is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeParameterization()
- {
-@@ -2365,7 +2365,7 @@
- /// be fitted, and the new candidate function to be included in the
- /// fit.  By default it is 0, which automatically chooses another
- /// selection criteria. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxAngle(Double_t ang)
- {
-@@ -2381,7 +2381,7 @@
- /// Set the min angle (in degrees) between a new candidate function
- /// and the subspace spanned by the previously accepted
- /// functions. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinAngle(Double_t ang)
- {
-@@ -2401,7 +2401,7 @@
- /// Where N is the dimension of the data sample, L is the number of
- /// terms (given in terms) and the first number, labels the term, the
- /// second the variable.  More information is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
- {
-@@ -2421,7 +2421,7 @@
- /// Set the user parameter for the function selection. The bigger the
- /// limit, the more functions are used. The meaning of this variable
- /// is defined in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowerLimit(Double_t limit)
- {
-@@ -2431,7 +2431,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Set the maximum power to be considered in the fit for each
- /// variable. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxPowers(const Int_t* powers)
- {
-@@ -2446,7 +2446,7 @@
- /// Set the acceptable relative error for when sum of square
- /// residuals is considered minimized. For a full account, refer to
- /// the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinRelativeError(Double_t error)
- {
-@@ -2458,7 +2458,7 @@
- /// PRIVATE METHOD:
- /// Test whether the currently considered function contributes to the
- /// fit. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
-                                   Double_t dResidur)
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
-@@ -71,8 +71,6 @@
- //
- //</div>
- //
--//<!-- */
--// --> End_Html
- 
- //______________________________________________________________________________
- /** \class TSpectrum2
-@@ -372,7 +370,6 @@
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- const char *TSpectrum2::Background(Double_t **spectrum,
-                        Int_t ssizex, Int_t ssizey,
-@@ -381,7 +378,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
-@@ -523,10 +520,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
-@@ -835,8 +830,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, x, y, sampling, r1, r2;
-    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
-@@ -1022,11 +1016,10 @@
- ///   averWindow-width of averaging smoothing window
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
-@@ -1134,10 +1127,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
-@@ -1239,8 +1230,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t xmin, xmax, ymin, ymax, i, j, l;
-    Double_t a, b, maxch;
-    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
-@@ -1439,7 +1429,6 @@
- ///   boost, boosting factor, for details we refer to manual
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
-                                        Int_t ssizex, Int_t ssizey,
-@@ -1447,7 +1436,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
-@@ -1602,10 +1591,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
-@@ -1982,8 +1969,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
-        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2177,8 +2163,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
-@@ -2311,10 +2296,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
-@@ -2856,8 +2839,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k, lindex, priz;
-    Double_t lda, ldb, ldc, area, maximum;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
-@@ -162,11 +162,10 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
-@@ -178,8 +177,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    if (numberPeaks <= 0){
-       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
-       return;
-@@ -1793,11 +1791,10 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrum2Fit::FitAwmi(Double_t **source)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
-@@ -2686,8 +2683,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, pw,
-@@ -4697,8 +4693,7 @@
- //
- /////////////////////////////////////////////////////////////////////////////
- //
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
-@@ -4928,8 +4923,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
-@@ -1748,8 +1748,7 @@
- /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -2018,8 +2017,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j;
-    Int_t size;
-    Double_t *working_vector = 0, **working_matrix = 0;
-@@ -2324,8 +2322,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -2481,8 +2478,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-@@ -2768,8 +2764,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2908,8 +2903,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
-@@ -273,7 +273,6 @@
- ///                                                                           //
- ///                                                                           //
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Background(Double_t***spectrum,
-                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -283,7 +282,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
-@@ -674,8 +673,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, x, y, z, sampling, q1, q2, q3;
-    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
-    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
-@@ -1069,11 +1067,10 @@
- /// averWindow-width of averaging smoothing window                          //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
- {
--/* -->
-+/* 
- 
- <div class=Section2>
- 
-@@ -1302,8 +1299,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
-    Double_t a,b,maxch;
-@@ -1868,7 +1864,6 @@
- /// boost, boosting factor, for details we refer to manual                  //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
-                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -1876,7 +1871,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- 
- <div class=Section3>
- 
-@@ -2357,8 +2352,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2590,8 +2584,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- 
- <div class=Section4>
- 
-@@ -2901,8 +2894,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k,lindex;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
-@@ -113,7 +113,6 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
- {
-@@ -162,7 +161,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    if (numberPeaks <= 0){
-       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
-@@ -847,7 +845,6 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumFit::FitAwmi(Double_t *source)
- {
-@@ -1343,7 +1340,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
-@@ -2312,7 +2308,6 @@
- ///        source-pointer to the vector of source spectrum
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumFit::FitStiefel(Double_t *source)
- {
-@@ -2546,7 +2541,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
-@@ -739,11 +739,10 @@
- ///             need 2*size length to store real and imaginary coefficients
- ///
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -989,8 +988,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t a, b, pi = 3.14159265358979323846;
-@@ -1482,11 +1480,10 @@
- ///
- /////////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -1618,8 +1615,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-@@ -2091,11 +2087,10 @@
- ///           need 2*size length to store real and imaginary coefficients
- ///
- /////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2226,8 +2221,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
---- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
-@@ -1162,7 +1162,6 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Paints histogram according to preset parameters.
--///Begin_Html <!--
- 
- void TSpectrum2Painter::Paint(Option_t * /*option*/)
- {
-@@ -1524,7 +1523,6 @@
- }
- </pre>
- <!-- */
--// --> End_Html
- 
-    Int_t turni,turnj,w1,w2,x,y;
-    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
-@@ -7654,14 +7652,12 @@
- ///                               * * *
- ///
- /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
--///Begin_Html
- 
- void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
- {
-    /*
-    <img src="gif/spectrumpainter.gif">
-    */
--   //End_Html
- 
-    TString opt = option;
- 
-diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
---- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
-@@ -25,20 +25,15 @@
- // Monte Carlo event generator (integrator) FOAM.
- // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
- // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_MapCamel1000.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_MapCamel1000.gif">
-+//
- // FOAM is now fully integrated with the ROOT package.
- // The important bonus of the ROOT use is persistency of the FOAM objects!
- //
- // For more sophisticated problems full version of FOAM may be more appropriate:
--//BEGIN_HTML <!--
--/* -->
--  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
--<!--*/
--// -->END_HTML
-+// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
-+//
- // Simple example of the use of FOAM:
- // ==================================
- // Int_t kanwa(){
-@@ -81,11 +76,9 @@
- //   return 0.5*Dist;
- // }// Camel2
- // Two-dim. histogram of the MC points generated with the above program looks as follows:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_cKanwa.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_cKanwa.gif">
-+//
- // Canonical nine steering parameters of FOAM
- // ===========================================
- //------------------------------------------------------------------------------
-@@ -266,10 +259,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Default destructor
--///  std::cout<<" DESTRUCTOR entered "<<std::endl;
- 
- TFoam::~TFoam()
- {
-+   //std::cout<<" DESTRUCTOR entered "<<std::endl;
-    Int_t i;
- 
-    if(fCells!= 0) {
-@@ -321,42 +314,35 @@
- /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
- /// and reseting (optionally) its internal parameters/switches.
- /// The overall operational scheme of the FOAM is the following:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_schema2.gif">
-+///
-+/// This method invokes several other methods:
-+/// ==========================================
-+/// InitCells initializes memory storage for cells and begins exploration process
-+/// from the root cell. The empty cells are allocated/filled using  CellFill.
-+/// The procedure Grow which loops over cells, picks up the cell with the biggest
-+/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
-+/// with the help of PeekMax procedure. The chosen cell is split using Divide.
-+/// Subsequently, the procedure Explore called by the Divide
-+/// (and by InitCells for the root cell) does the most important
-+/// job in the FOAM object build-up: it performs a small MC run for each
-+/// newly allocated daughter cell.
-+/// Explore calculates how profitable the future split of the cell will be
-+/// and defines the optimal cell division geometry with the help of Carver or Varedu
-+/// procedures, for maximum weight or variance optimization respectively.
-+/// All essential results of the exploration are written into
-+/// the explored cell object. At the very end of the foam build-up,
-+/// Finally, MakeActiveList is invoked to create a list of pointers to
-+/// all active cells, for the purpose of the quick access during the MC generation.
-+/// The procedure Explore employs MakeAlpha to generate random coordinates
-+/// inside a given cell with the uniform distribution.
-+/// The above sequence of the procedure calls is depicted in the following figure:
-+///
-+//  <img src="gif/foam_Initialize_schema.gif">
- 
- void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
- {
--/* -->
--<img src="gif/foam_schema2.gif">
--<!--*/
--// -->END_HTML
--//
--// This method invokes several other methods:
--// ==========================================
--// InitCells initializes memory storage for cells and begins exploration process
--// from the root cell. The empty cells are allocated/filled using  CellFill.
--// The procedure Grow which loops over cells, picks up the cell with the biggest
--// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
--// with the help of PeekMax procedure. The chosen cell is split using Divide.
--// Subsequently, the procedure Explore called by the Divide
--// (and by InitCells for the root cell) does the most important
--// job in the FOAM object build-up: it performs a small MC run for each
--// newly allocated daughter cell.
--// Explore calculates how profitable the future split of the cell will be
--// and defines the optimal cell division geometry with the help of Carver or Varedu
--// procedures, for maximum weight or variance optimization respectively.
--// All essential results of the exploration are written into
--// the explored cell object. At the very end of the foam build-up,
--// Finally, MakeActiveList is invoked to create a list of pointers to
--// all active cells, for the purpose of the quick access during the MC generation.
--// The procedure Explore employs MakeAlpha to generate random coordinates
--// inside a given cell with the uniform distribution.
--// The above sequence of the procedure calls is depicted in the following figure:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_Initialize_schema.gif">
--<!--*/
--// -->END_HTML
--
-    SetPseRan(PseRan);
-    SetRho(fun);
-    Initialize();
-@@ -1363,15 +1349,11 @@
- /// It defines which variables are excluded in the process of the cell division.
- /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
- /// The resulting map of cells in 2-dim. case will look as follows:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map2.gif">
- 
- void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
- {
--/* -->
--<img src="gif/foam_Map2.gif">
--<!--*/
--// -->END_HTML
--
-    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
-    if(fInhiDiv == 0) {
-       fInhiDiv = new Int_t[ fDim ];
-@@ -1391,15 +1373,11 @@
- ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
- ///     FoamX->SetXdivPRD(0,3,xDiv);
- /// results in the following 2-dim. pattern of the cells:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map3.gif">
- 
- void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
- {
--/* -->
--<img src="gif/foam_Map3.gif">
--<!--*/
--// -->END_HTML
--
-    Int_t i;
- 
-    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
-diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
-@@ -238,19 +238,14 @@
- /// PDG convention already)
- /// Source: BaBar User Guide, Neil I. Geddes,
- ///
--///Begin_Html
-+/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
-+/// with some fixes by PB, marked with (PB) below. Checked against
-+/// PDG listings from 2000.
-+///
-+/// Paul Balm, Nov 19, 2001
- 
- Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
- {
--  /*
--   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
--  */
--  //End_Html
--  // with some fixes by PB, marked with (PB) below. Checked against
--  // PDG listings from 2000.
--  //
--  // Paul Balm, Nov 19, 2001
--
-    switch(Geant3number) {
- 
-       case 1   : return 22;       // photon
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
-@@ -50,7 +50,7 @@
- 
- The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
- 
--The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
-+The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
- 
- */
- 
-diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
---- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
-@@ -3,13 +3,11 @@
- TCanvas *timeonaxis()
- {
- // This macro illustrates the use of the time mode on the axis
--// with different time intervals and time formats. It's result can
--// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
-+// with different time intervals and time formats.
- // Through all this script, the time is expressed in UTC. some
- // information about this format (and others like GPS) may be found at
--// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
--//  or
--// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
-+// http://tycho.usno.navy.mil/systime.html or
-+// http://www.topology.org/sci/time.html
- //
- // The start time is : almost NOW (the time at which the script is executed)
- // actualy, the nearest preceding hour beginning.
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
deleted file mode 100644
index 48e2a28..0000000
--- a/root-latex-markup.patch
+++ /dev/null
@@ -1,877 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
---- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
-@@ -185,14 +185,19 @@
- ## <a name="L8"></a> Accents
- Several kind of accents are available:
- 
--   #hat    = Begin_Latex #hat{a} End_Latex
--   #check  = Begin_Latex #check{a} End_Latex
--   #acute  = Begin_Latex #acute{a} End_Latex
--   #grave  = Begin_Latex #grave{a} End_Latex
--   #dot    = Begin_Latex #dot{a} End_Latex
--   #ddot   = Begin_Latex #ddot{a} End_Latex
--   #tilde  = Begin_Latex #tilde{a} End_Latex
--
-+Begin_Macro(source)
-+{
-+   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
-+   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
-+   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
-+   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
-+   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
-+   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
-+   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
-+   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
-+   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
-+}
-+End_Macro
- 
- The special sign: `#slash` draws a slash on top of the text between brackets:
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
---- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
-@@ -949,9 +949,9 @@
- /// Getting the error via TF1::DerivativeError:
- ///   (total error = roundoff error + interpolation error)
- /// the estimate of the roundoff error is taken as follows:
--///Begin_Latex
--///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--///End_Latex
-+/// \f[
-+///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+/// \f]
- /// where k is the double precision, ai are coefficients used in
- /// central difference formulas
- /// interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
---- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -360,27 +360,33 @@
- ///
- /// If the histograms are not filled with unit weights, the number of effective
- /// entries is used to normalise the bin contents which might lead to wrong results.
--/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
--///
-+/// \f[
-+/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
-+/// \f]
- /// The points are assigned a x value at the center of each histogram bin.
--/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
-+/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
-+/// for all options except for the
- /// bayesian methods where the result depends on the chosen option.
- ///
--/// If the denominator becomes 0 or pass >  total, the corresponding bin is
-+/// If the denominator becomes 0 or pass > total, the corresponding bin is
- /// skipped.
- ///
- /// 2) calculating ratios of two Poisson means (option 'pois'):
- /// --------------------------------------------------------------
- ///
- /// The two histograms are interpreted as independent Poisson processes and the ratio
--/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
--/// The histogram 'pass' is interpreted as n_{1} and the total histogram
--/// is used for n_{2}
-+/// \f[
-+/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
-+/// \f]
-+/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
-+/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
-+/// is used for \f$n_{2}\f$.
- ///
- /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
- /// of efficiency by a parameter transformation:
--/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
--///
-+/// \f[
-+/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
-+/// \f]
- /// The x errors span each histogram bin (lowedge ... lowedge+width)
- /// The y errors depend on the chosen statistic methode which can be determined
- /// by the options given below. For a detailed description of the used statistic
-@@ -413,8 +419,7 @@
- /// oscillation on the actual coverage probability a couple of approximations and
- /// methodes has been developped. For a detailed discussion, please have a look at
- /// this statistical paper:
--/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
--/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
-+/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
- 
- void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
- {
-diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
---- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -764,8 +764,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Get square of the error of bin addressed by linidx as
--/// BEGIN_LATEX #sum weight^{2}
--/// END_LATEX
-+/// \f$\sum weight^{2}\f$
- /// If errors are not enabled (via Sumw2() or CalculateErrors())
- /// return contents.
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -92,31 +92,28 @@
-     Method:
-        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
-        and 16-point Gaussian quadrature approximations to
--   Begin_Latex
--      I = #int^{b}_{a} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{b}_{a} f(x)dx
-+   \f]
-       and define
--   Begin_Latex
--      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
--   End_Latex
-+   \f[
-+      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
-+   \f]
-       Then,
--   Begin_Latex
--      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
--   End_Latex
--      where, starting with x0 = A and finishing with xk = B,
--      the subdivision points xi(i=1,2,...) are given by
--   Begin_Latex
--      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
--   End_Latex
--   Begin_Latex
--      #lambda
--   End_Latex
--      is equal to the first member of the
--      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
-+   \f[
-+      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
-+   \f]
-+      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
-+      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
-+   \f[
-+      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
-+   \f]
-+      \f$\lambda\f$ is equal to the first member of the
-+      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
-       If, at any stage in the process of subdivision, the ratio
--  Begin_Latex
--      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
--  End_Latex
-+  \f[
-+      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
-+  \f]
-       is so small that 1+0.005q is indistinguishable from 1 to
-       machine accuracy, an error exit occurs with the function value
-       set equal to zero.
-@@ -131,13 +128,13 @@
-       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
-       precisely, if k is the number of sub-intervals contributing to the
-       approximation (see Method), and if
--      Begin_Latex
--      I_{abs} = #int^{B}_{A} #||{f(x)}dx
--      End_Latex
-+   \f[
-+      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
-+   \f]
-       then the relation
--   Begin_Latex
--    #frac{#||{G-I}}{I_{abs}+k} < EPS
--   End_Latex
-+   \f[
-+      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
-+   \f]
-       will nearly always be true, provided the routine terminates without
-       printing an error message. For functions f having no singularities in
-       the closed interval [A,B] the accuracy will usually be much higher than
-@@ -156,9 +153,9 @@
- 
-    /** Returns Integral of function on an infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{-#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -169,9 +166,9 @@
- 
-    /** Returns Integral of function on an upper semi-infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{A} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{A} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -183,9 +180,9 @@
- 
-    /** Returns Integral of function on a lower semi-infinite interval.
-        This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{B}_{#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{B}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-          In any arithmetic expression, this function has the approximate value
-          of the integral I.
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -88,10 +88,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--      D(h) = #frac{f(x+h) - f(x-h)}{2h}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+      D(h) = \frac{f(x+h) - f(x-h)}{2h}
-+     \f]
-+      the final estimate
-+     \f[
-+      D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -103,9 +106,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -141,10 +144,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -156,9 +162,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -177,10 +183,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -192,9 +201,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
---- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
-@@ -34,35 +34,33 @@
- double kEulerGamma = 0.577215664901532860606512090082402431042;
- 
- 
--/* Begin_Html
--<center><h2>KelvinFunctions</h2></center>
-+/**
-+\class KelvinFunctions
- 
--<p>
- This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
- Kei(x), and their first derivatives.
--</p>
--
--End_Html */
-+*/
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
-+/// \f]
- /// For x > fgMin, Ber(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -102,24 +100,25 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
-+/// \f]
- /// For x > fgMin, Bei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -161,29 +160,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Ker(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -227,29 +227,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Kei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -298,10 +299,10 @@
- /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
- /// the polynomial approximation of Ber(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -343,10 +344,10 @@
- /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
- /// the polynomial approximation of Bei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -388,10 +389,10 @@
- /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
- /// the polynomial approximation of Ker(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -436,10 +437,10 @@
- /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
- /// the polynomial approximation of Kei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -481,9 +482,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
--/// Begin_Latex
--/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F1(double x)
- {
-@@ -510,9 +511,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
--/// Begin_Latex
--/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F2(double x)
- {
-@@ -541,9 +542,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
--/// Begin_Latex
--/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G1(double x)
- {
-@@ -568,9 +569,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
--/// Begin_Latex
--/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G2(double x)
- {
-@@ -597,9 +598,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
- /// DBei(x). M(x) is given by
--/// Begin_Latex
--/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// \f[
-+/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::M(double x)
- {
-@@ -612,10 +613,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
--/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
--/// Begin_Latex
--/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DBei(x). \f$\theta(x)\f$ is given by
-+/// \f[
-+/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Theta(double x)
- {
-@@ -628,10 +629,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). (x) is given by
--/// Begin_Latex
--/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// DKei(x). N(x) is given by
-+/// \f[
-+/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::N(double x)
- {
-@@ -644,10 +645,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
--/// Begin_Latex
--/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DKei(x). \f$\phi(x)\f$ is given by
-+/// \f[
-+/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Phi(double x)
- {
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
-@@ -85,7 +85,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
-       
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-    private:
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
-@@ -37,11 +37,12 @@
-    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
-    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
-    and an alternate hypothesis (eg. signal+background).  
--   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
--   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
--   not a probability.
--   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
--   Significance method.
-+   The p-values can also be transformed into confidence levels
-+   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
-+   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
-+   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
-+   Finally, the p-value of the null can be transformed into a number of
-+   equivalent Gaussian sigma using the Significance method.
- 
-    The p-value of the null for a given test statistic is rigorously defined and
-    this is the starting point for the following conventions.
-@@ -52,17 +53,17 @@
- observed value of the test statistic. This is the more standard
- convention and avoids confusion when doing inverted tests.
- 
--For exclusion, we also want the formula
--CLs = CLs+b / CLb to hold which therefore defines our conventions
--for CLs+b and CLb. CLs was specifically invented for exclusion
-+For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
-+to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
-+\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
- and therefore all quantities need be related through the assignments
--as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
-+as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
- is derived by considering the scenarios of a powerful and not powerful
--inverted test, where for the not so powerful test, CLs must be
-+inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
- close to one.
- 
- For results of Hypothesis tests,
--CLs has no similar direct interpretation as for exclusion and can
-+\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
- be larger than one.
- 
- */
-@@ -101,7 +102,7 @@
-       /// Convert  AlternatePValue into a "confidence level"
-       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
- 
--      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
-+      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
-       virtual Double_t CLs() const {
-          double thisCLb = CLb();
-          if (thisCLb == 0) {
-@@ -144,7 +145,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
- 
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-       /// The error on the Null p-value
-diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -100,11 +100,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$1 - CL_{b}\f$ : the B p-value
- double HybridResult::NullPValue() const
- {
--   // return 1-CL_b : the B p-value
--
-    if (fComputationsNulDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -131,11 +129,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$CL_{s+b}\f$ : the S+B p-value
- double HybridResult::AlternatePValue() const
- {
--   // return CL_s+b : the S+B p-value
--
-    if (fComputationsAltDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -162,40 +158,37 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
-+/// error on \f$CL_{b}\f$:
-+/// \f[
-+/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLbError() const
- {
--  // Returns an estimate of the error on CLb assuming a binomial error on
--  // CLb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_b.size();
-   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
-+/// error on \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLsplusbError() const
- {
--  // Returns an estimate of the error on CLsplusb assuming a binomial
--  // error on CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_sb.size();
-   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
-+/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- Double_t HybridResult::CLsError() const
- {
--  // Returns an estimate of the error on CLs through combination of the
--  // errors on CLb and CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--  // END_LATEX
-   unsigned const int n_b = fTestStat_b.size();
-   unsigned const int n_sb = fTestStat_sb.size();
-   
-diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -229,8 +229,8 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// compute CLb error
--/// Clb =  1 - NullPValue() 
-+/// compute \f$CL_{b}\f$ error
-+/// \f$CL_{b}\f$ = 1 - NullPValue()
- /// must use opposite condition that routine above
- 
- Double_t HypoTestResult::CLbError() const {
-@@ -251,12 +251,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Returns an estimate of the error on CLs through combination of the
--/// errors on CLb and CLsplusb:
--/// BEGIN_LATEX
--/// #sigma_{CL_s} = CL_s
--/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--/// END_LATEX
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
-+/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s
-+/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- 
- Double_t HypoTestResult::CLsError() const {
-    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
deleted file mode 100644
index 2af5c42..0000000
--- a/root-libgfortranbegin.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
---- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
---- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
---- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
-@@ -55,8 +55,10 @@
- else
- F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
---- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
---- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
---- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
-@@ -53,8 +53,10 @@
- else
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
---- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
-@@ -43,8 +43,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
---- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
---- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
-@@ -50,8 +50,10 @@
- endif
- F77FLAGS      = -m32 -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
---- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -54,8 +54,10 @@
- else
- F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
---- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -62,8 +62,10 @@
- else
- F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
---- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
---- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
deleted file mode 100644
index 4dfbc44..0000000
--- a/root-links.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
---- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
-@@ -5,7 +5,7 @@
- and their rotation algorithms. The classes were ported to root from
- CLHEP see:
- 
--<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
-+<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
- 
- ## The Physics Vector Classes
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
---- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
-@@ -331,7 +331,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the maximum number of function calls for the minimization algorithm
- /// For example for MIGRAD this is the maxcalls value passed as first argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetMaxIterations(Int_t niter)
- {
-@@ -341,7 +341,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the Error Definition (default=1)
- /// For Minuit this is the value passed with the "SET ERR" command
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
- 
- void TVirtualFitter::SetErrorDef(Double_t errdef)
- {
-@@ -356,7 +356,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the tolerance used in the minimization algorithm
- /// For example for MIGRAD this is tolerance value passed as second argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetPrecision(Double_t prec)
- {
-diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
---- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
-+++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
-@@ -13,7 +13,7 @@
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
---- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
-+++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
-@@ -5,15 +5,15 @@
- .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
- .\" other parms are allowed: see man(7), man(1)
- .SH NAME
--g2rootold \- convert GEANT geomtry files to ROOT files
-+g2rootold \- convert GEANT geometry files to ROOT files
- .SH SYNOPSIS
--.B g2rootoldd
-+.B g2rootold
- .I [-f map_name] geant_name macro_name
- .SH "DESCRIPTION"
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-@@ -103,9 +103,9 @@
- .I JDIGI.
- .SH "SEE ALSO"
- .RS
--.IR root (1),
--.IR g2root (1),
--.IR h2root(1),
-+.IR root(1) ,
-+.IR g2root(1) ,
-+.IR h2root(1) ,
- .RE
- and
- .RS
-diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
---- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
-@@ -74,7 +74,7 @@
- 
-     <ul>
-   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
--  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-+  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
- New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
- </li>
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -301,7 +301,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DENLAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -381,7 +381,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DISLAN) is used.
- 
-    @param x The argument \f$x\f$
-@@ -756,7 +756,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-@@ -783,7 +783,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -528,7 +528,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (RANLAN) is used.
- 
-    @param z The argument \f$z\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
-@@ -193,7 +193,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-@@ -219,7 +219,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
---- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
-@@ -193,7 +193,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-@@ -408,7 +408,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
-@@ -81,7 +81,7 @@
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
-@@ -90,7 +90,7 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
---- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
-@@ -92,14 +92,14 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    - VavilovAccurate uses the algorithm by
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
-@@ -103,7 +103,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-@@ -239,7 +239,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
---- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
-@@ -5,7 +5,7 @@
- <li>The main TMinuit class is documented in class TMinuit.</li>
- <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
-     </a></li>
--<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
-+<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
-     </a></li>
- <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
-       </A></li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
---- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
-@@ -13,7 +13,7 @@
- <p>
- <ol>
- <li>
--F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
-+F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
- <li>
- F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
- <li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
-@@ -32,7 +32,7 @@
- 
- <h2>References</h2>
- <ol>
--<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
-+<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
- <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
-   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
- <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
-@@ -14,7 +14,7 @@
- 
- ## References
- 
--1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
-+1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
- 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
- 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
- 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
-@@ -163,7 +163,7 @@
- <h3>Linear Algebra Functions</h3>
- 
- Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
--In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
-+In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
- <pre>
- <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
- bool ret = m.<strong>Invert</strong>()
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
-@@ -132,7 +132,7 @@
- 
- ### Linear Algebra Functions
- 
--Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
-+Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
- 
- <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
- bool ret = m.**Invert**()  
-diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
---- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
-@@ -47,8 +47,8 @@
- //           V               v      v                     v      v                  //
- //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
- //       |        ^                                                                 //
--//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
--//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
-+//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
-+//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
- // St_PolyLine3D  |                                                                 //
- //                |                                                                 //
- //           TPoints3DABC                                                           //
-diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
---- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
-@@ -142,7 +142,7 @@
- ///                            10 - this unvisible, but sons are visible
- ///                            01 - this visible but sons
- ///                            11 - neither this nor its sons are visible
--/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
-+/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
- 
- Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
- {
-@@ -150,11 +150,12 @@
-    return mapVis[vis];
- }
- 
--//______________________________________________________________________________
--//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+////////////////////////////////////////////////////////////////////////////////
-+/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
-+
- Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
- {
--// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
-    const Int_t mapVis[4] = {1, -2, 0, -1 };
-    Int_t i;
- //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
deleted file mode 100644
index 39d7510..0000000
--- a/root-llvm-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
-@@ -59,6 +59,7 @@
-   endif()
- endif()
- set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
-+set(BUILD_SHARED_LIBS "NO")
- #--- Do not build cling as part of llvm.
- set(LLVM_NOCLING "YES")
- 
diff --git a/root-macro-align.patch b/root-macro-align.patch
deleted file mode 100644
index f8ef9eb..0000000
--- a/root-macro-align.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
---- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
-@@ -329,7 +329,7 @@
- parameters are shown in the plot below.
- 
- Begin_Macro(source)
--   {
-+{
-       //canvas only needed for the documentation
-       TCanvas* c1 = new TCanvas("c1","",600,400);
-       c1->SetFillStyle(1001);
-@@ -363,7 +363,7 @@
- 
-       //only for this documentation
-       return c1;
--   }
-+}
- End_Macro
- 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
-@@ -1809,9 +1809,9 @@
- /// of comparison of the unweighted histogram with 217 events (minimal expected
- /// frequency equal to one) and the weighted histogram with 500 events (minimal
- /// expected frequency equal to 25)
--///Begin_Macro
-+/// Begin_Macro
- /// ../../../tutorials/math/chi2test.C(17)
--///End_Macro
-+/// End_Macro
- /// Fig 2. An example of comparison of the unweighted histogram with 217 events
- /// and the weighted histogram with 500 events:
- ///   a) unweighted histogram;
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
deleted file mode 100644
index 48085d6..0000000
--- a/root-missing-cmake-config.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
-@@ -252,6 +252,12 @@
-   endif()
-   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
-                          REGEX system.rootrc EXCLUDE
-+                         REGEX system.rootauthrc EXCLUDE
-+                         REGEX system.rootdaemonrc EXCLUDE
-+                         REGEX rootd.rc.d EXCLUDE
-+                         REGEX proofd.rc.d EXCLUDE
-+                         REGEX rootd.xinetd EXCLUDE
-+                         REGEX proofd.xinetd EXCLUDE
-                          REGEX root.mimes EXCLUDE)
-   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
-   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
-@@ -404,7 +404,13 @@
- set(perl ${PERL_EXECUTABLE})
- 
- #---RConfigure-------------------------------------------------------------------------------------------------
--set(setresuid undef)
-+CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
-+  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
-+if(found_setresuid)
-+  set(setresuid define)
-+else()
-+  set(setresuid undef)
-+endif()
- if(mathmore)
-   set(hasmathmore define)
- else()
-@@ -523,7 +529,16 @@
- execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
- 
- configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
-+
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+
- configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
-+
- if(ruby)
-   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
- endif()
-@@ -665,8 +680,21 @@
- 
- install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
-               ${CMAKE_BINARY_DIR}/etc/system.rootrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
-               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- 
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
-+              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-+                          GROUP_EXECUTE GROUP_READ
-+                          WORLD_EXECUTE WORLD_READ
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
- install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
- 
- if(NOT gnuinstall)
-diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
---- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
-@@ -9,4 +9,9 @@
- ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
- ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
--ROOT_INSTALL_HEADERS()
-+
-+if(AIX)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+endif()
-+
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
-@@ -7,6 +7,7 @@
-   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
-   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
-   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
-+  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
- endif()
- ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
- ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
-diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
---- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
-@@ -1,6 +1,7 @@
- 
- add_subdirectory(net)
- add_subdirectory(auth)  # special CMakeListst.txt
-+add_subdirectory(rootd)
- 
- if(bonjour)
-   add_subdirectory(bonjour)
-diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
---- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
-@@ -0,0 +1,9 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT net/rootd package
-+# @author Pere Mato, CERN
-+############################################################################
-+
-+ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
-+                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
---- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
-@@ -3,4 +3,7 @@
- # @author Pere Mato, CERN
- ############################################################################
- 
--ROOT_INSTALL_HEADERS()
-\ No newline at end of file
-+ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
-+  RIO Net Thread MathCore)
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
---- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
-@@ -4,6 +4,7 @@
- ############################################################################
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- add_definitions(${XROOTD_CFLAGS})
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
- 
-@@ -11,14 +12,16 @@
-   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
- else()
-   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
--                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
-+                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-   if (NOT XROOTD_NOMAIN)
-      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
-   endif ()
-   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
--  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
-+  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
-+  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
-+                         LIBRARIES ${SYSLIBS})
- endif()
- 
- if(builtin_xrootd)
-@@ -38,4 +41,4 @@
- endif()
- 
- 
--ROOT_INSTALL_HEADERS()
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
-diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
---- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
-@@ -1,4 +1,3 @@
--
- ############################################################################
- # CMakeLists.txt file for building ROOT proof/proofx package
- # @author Pere Mato, CERN
-@@ -14,6 +13,7 @@
- endif()
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
- link_directories(${XROOTD_LIBRARY_DIR})
- add_definitions(${XROOTD_CFLAGS})
- 
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
deleted file mode 100644
index 5ce9485..0000000
--- a/root-more-fflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index f51bcbe..1ee0602 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
- #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
--string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
-+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
- string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
-diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
-index 045926d..a419744 100644
---- a/cmake/scripts/RootUseFile.cmake.in
-+++ b/cmake/scripts/RootUseFile.cmake.in
-@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
-index b9a8e34..f931ad3 100644
---- a/etc/cmake/RootUseFile.cmake
-+++ b/etc/cmake/RootUseFile.cmake
-@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
deleted file mode 100644
index afad777..0000000
--- a/root-no-abi-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
-index 896ca4c..51e01905 100644
---- a/cmake/modules/CheckCompiler.cmake
-+++ b/cmake/modules/CheckCompiler.cmake
-@@ -1,7 +1,6 @@
- #---------------------------------------------------------------------------------------------------
- #  CheckCompiler.cmake
- #---------------------------------------------------------------------------------------------------
--include (CheckCXXSourceCompiles)
- 
- #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
- if(fortran)
-@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-   endif()
-   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
-   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
--  CHECK_CXX_SOURCE_COMPILES("
--    #include <string>
--    #if _GLIBCXX_USE_CXX11_ABI
--    #error \"cling does not support GCC 5 ABI.\"
--    #endif
--    int main() {}" CXX_SUPPORTS_OLD_ABI)
--  if(NOT CXX_SUPPORTS_OLD_ABI)
--     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
--  endif()
- else()
-   set(GCC_MAJOR 0)
-   set(GCC_MINOR 0)
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
deleted file mode 100644
index 1157d56..0000000
--- a/root-no-testdata.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
---- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
-@@ -239,13 +239,14 @@
- 
- #--stressProof-------------------------------------------------------------------------------
- if(NOT WIN32)
--  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-+  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
-   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
-                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
-                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
-                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
--                                         FAILREGEX "FAILED|Error in")
-+                                         FAILREGEX "FAILED|Error in"
-+                                         DEPENDS TestData)
- endif()
- 
- #--testbits----------------------------------------------------------------------------------
diff --git a/root-ppc64.patch b/root-ppc64.patch
deleted file mode 100644
index cab115c..0000000
--- a/root-ppc64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-@@ -30,8 +30,8 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
--elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
--  message(STATUS "Found a 64bit ppc64 little endian system")
-+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
-+  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-@@ -205,17 +205,12 @@
-    ;;
- linuxppcgcc)
-    # PPC Linux with gcc
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
-+   auxldflags="-m32"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
- linuxppc64gcc)
--   # PPC64 (64 bit mode) Linux with gcc 3.x
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
--   auxldflags="-m64"
--   auxlibs="-lm -ldl -rdynamic"
--   ;;
--ppc64le)
--   # PPC64 (64 bit mode) little endian
-+   # PPC64/PPC64LE (64 bit mode) Linux with gcc
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
deleted file mode 100644
index cb30e30..0000000
--- a/root-private-public.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
---- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
-@@ -43,8 +43,8 @@
- #ifndef ROOT_TSocket
- #include "TSocket.h"
- #endif
--#ifndef ROOT_XrdProofConn
--#include "XrdProofConn.h"
-+#ifndef __XPTYPES_H
-+#include "XProtocol/XPtypes.hh"
- #endif
- #ifndef XRC_UNSOLMSG_H
- #include "XrdClient/XrdClientUnsolMsg.hh"
-@@ -58,6 +58,7 @@
- class TXHandler;
- class TXSocketHandler;
- class XrdClientMessage;
-+class XrdProofConn;
- 
- // To transmit info to Handlers
- typedef struct {
-@@ -140,7 +141,7 @@
-    void                PostMsg(Int_t type, const char *msg = 0);
- 
-    // Auxilliary
--   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
-+   Int_t               GetLowSocket() const;
- 
-    static void         SetLocation(const char *loc = ""); // Set location string
- 
-@@ -170,13 +171,13 @@
- 
-    virtual Int_t       GetClientID() const { return -1; }
-    virtual Int_t       GetClientIDSize() const { return 1; }
--   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
--   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
--   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
--   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
-+   Int_t               GetLogConnID() const;
-+   Int_t               GetOpenError() const;
-+   Int_t               GetServType() const;
-+   Int_t               GetSessionID() const;
-    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
- 
--   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
-+   Bool_t              IsValid() const;
-    Bool_t              IsServProofd();
-    virtual void        RemoveClientID() { }
-    virtual void        SetClientID(Int_t) { }
-@@ -215,11 +216,9 @@
-    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
- 
-    // Interrupt the low level socket
--   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
--                                        fRDInterrupt = i;
--                                        if (i && fConn) fConn->SetInterrupt();
--                                        if (i && fAWait) fASem.Post(); }
-+   void                SetInterrupt(Bool_t i = kTRUE);
-    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
-+
-    // Set / Check async msg queue waiting status
-    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
-    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
-diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
---- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
-@@ -40,6 +40,8 @@
- #include "TSysEvtHandler.h"
- #include "XProofProtocol.h"
- 
-+#include "XrdProofConn.h"
-+
- ClassImp(TXProofMgr)
- 
- //
-diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
---- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
-@@ -912,6 +912,46 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Getter for logical connection ID
-+
-+Int_t TXSocket::GetLogConnID() const
-+{
-+   return (fConn ? fConn->GetLogConnID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for last error
-+
-+Int_t TXSocket::GetOpenError() const
-+{
-+   return (fConn ? fConn->GetOpenError() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for server type
-+
-+Int_t TXSocket::GetServType() const
-+{
-+   return (fConn ? fConn->GetServType() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for session ID
-+
-+Int_t TXSocket::GetSessionID() const
-+{
-+   return (fConn ? fConn->GetSessionID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for validity status
-+
-+Bool_t TXSocket::IsValid() const
-+{
-+   return (fConn ? (fConn->IsValid()) : kFALSE);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Return kTRUE if the remote server is a 'proofd'
- 
- Bool_t TXSocket::IsServProofd()
-@@ -1633,6 +1673,16 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+void TXSocket::SetInterrupt(Bool_t i)
-+{
-+   R__LOCKGUARD(fAMtx);
-+   fRDInterrupt = i;
-+   if (i && fConn) fConn->SetInterrupt();
-+   if (i && fAWait) fASem.Post();
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Send a TMessage object. Returns the number of bytes in the TMessage
- /// that were sent and -1 in case of error.
- 
-@@ -1923,6 +1973,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+Int_t TXSocket::GetLowSocket() const {
-+   return (fConn ? fConn->GetLowSocket() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Init environment variables for XrdClient
- 
- void TXSocket::InitEnvs()
diff --git a/root-s390x.patch b/root-s390x.patch
deleted file mode 100644
index 39f0b98..0000000
--- a/root-s390x.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
-@@ -54,6 +54,32 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390x)
-+  message(STATUS "Found a 64bit system")
-+  set(BIT_ENVIRONMENT "-m64")
-+  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390)
-+  message(STATUS "Found a 31bit system")
-+  set(BIT_ENVIRONMENT "-m31")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-+++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
-@@ -215,6 +215,18 @@
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
-+linuxs390gcc)
-+   # s390 (31 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
-+   auxldflags="-m31"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
-+linuxs390xgcc)
-+   # s390x (64 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-+   auxldflags="-m64"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
- linuxx8664gcc)
-    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
-diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
---- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
-@@ -202,6 +202,19 @@
- #   define NEED_SIGJMP
- #endif
- 
-+#if defined(linux) && defined(__s390__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define NEED_SIGJMP
-+#endif
-+
-+#if defined(linux) && defined(__s390x__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define R__B64
-+#   define NEED_SIGJMP
-+#endif
-+
- #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
- #   define R__HURD
- #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
-@@ -54,6 +54,10 @@
-     set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(PCRE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(PCRE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
-@@ -49,6 +49,10 @@
-     set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(AFTER_CC "${AFTER_CC} -m64")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(AFTER_CC "${AFTER_CC} .m31")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
-@@ -56,6 +56,10 @@
-     set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(FREETYPE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
-@@ -21,6 +21,8 @@
-   set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+  set(ROOT_CLING_TARGET "SystemZ")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
-   set(ROOT_CLING_TARGET "X86")
- elseif(ROOT_ARCHITECTURE MATCHES macosx)
-diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
---- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
-@@ -372,6 +372,8 @@
-   set(LLVM_NATIVE_ARCH Hexagon)
- elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
-   set(LLVM_NATIVE_ARCH SystemZ)
-+elseif (LLVM_NATIVE_ARCH MATCHES "s390")
-+  set(LLVM_NATIVE_ARCH SystemZ)
- else ()
-   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
- endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
deleted file mode 100644
index 4952a92..0000000
--- a/root-save-memory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
-@@ -36,7 +36,9 @@
-                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                                     ${corelinklibs})
- 
--add_dependencies(rootcling CLING LLVMRES)
-+# The dependency on Cling was added to prevent Cling (libCling) and
-+# rootcling from being linked in parallel.
-+add_dependencies(rootcling CLING LLVMRES Cling)
- 
- ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
- 
-diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
---- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
-@@ -25,9 +25,11 @@
- 
- CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
- ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
-+# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
-+# $(ROOTCLINGEXE) from being linked in parallel.
- $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
- 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
--           $(PCREDEP) $(CORELIBDEP)
-+           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
- 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
- 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
- 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
deleted file mode 100644
index 35b828c..0000000
--- a/root-see-macro-output.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
---- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
-@@ -13,7 +13,6 @@
- 
- void fit1() {
-    //Simple fitting example (1-d histogram with an interpreted function)
--   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
---- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- void fitslicesy() {
- //
- // Illustrates how to use the TH1::FitSlicesY function
--// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
- //    It uses the TH2F histogram generated in macro hsimple.C
- //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
- //    in 2 sepate pads.
-diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
---- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
-@@ -3,7 +3,6 @@
- 
- void multifit() {
- //  Fitting multiple functions to different ranges of a 1-D histogram
--// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- //      Example showing how to fit in a sub-range of an histogram
- //  An histogram is created and filled with the bin contents and errors
- //  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
---- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
-@@ -3,7 +3,6 @@
- 
- void shapes() {
- //The old geometry shapes (see script geodemo.C)
--//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
---- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,6 +1,5 @@
- void basic3d(){
-    // Show 3-D polylines and markers
--   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
-    //
- 
-    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
---- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void canvas(){
- //Example of primitives in a canvas
--// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
- // One of the first actions in a ROOT session is the creation of a Canvas.
- // Here we create a Canvas named "c1"
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
---- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,7 +1,6 @@
- void feynman()
- {
-    //Draw Feynman diagrams
--   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
-    //Author: Otto Schaile
- 
-    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
-diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
---- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
-@@ -1,6 +1,5 @@
- void gaxis(){
- //Simple example illustrating how to draw TGaxis objects in various formats.
--//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
- //Author: Rene Brun
- 
-   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
---- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
-@@ -1,6 +1,5 @@
- void tornado() {
- //Show 3-d polymarkers
--// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- //Author: Rene Brun
- 
-     gBenchmark->Start("tornado");
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
---- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void gerrors2() {
-    //Draw two graphs with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
---- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void gerrors() {
-    //Draw a graph with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
---- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void graph() {
-    //Draw a simple graph
--   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
---- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void surfaces() {
-    //Draw 2-Dim functions
--   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
---- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
-@@ -1,6 +1,5 @@
- void fillrandom() {
-    //Fill a 1-D histogram from a parametric function
--   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
---- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- // histograms filled and drawn in a loop
- void hsum() {
- //
--// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- //    Simple example illustrating how to use the C++ interpreter
- //    to fill histograms in a loop and show the graphics results
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
---- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
-@@ -9,7 +9,6 @@
- {
-    //example of macro illustrating how to superimpose two histograms
-    //with different scales in the "same" pad.
--   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
-diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
---- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
-diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
---- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
- #
- from os import path
- from ROOT import TCanvas, TFile, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
---- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraphErrors
-diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
---- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraph
-diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
---- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
---- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- #    Simple example illustrating how to use the C++ interpreter	
- #    to fill histograms in a loop and show the graphics results
- #
-diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
---- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- #      Example showing how to fit in a sub-range of an histogram
- #  An histogram is created and filled with the bin contents and errors
- #  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
---- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- #
- 
- import ROOT
-diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
---- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPaveText, TPad, TF2
-diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
---- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- 
- from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
- from ROOT import gROOT, gBenchmark
-diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
---- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
-@@ -4,7 +4,6 @@
- # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
- #
- # original header:
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- # Simple example illustrating how to use the C++ interpreter	
- # to fill histograms in a loop and show the graphics results
- 
diff --git a/root-soname.patch b/root-soname.patch
deleted file mode 100644
index 3367bad..0000000
--- a/root-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
-@@ -39,7 +39,7 @@
- if(soversion)
-   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
-       VERSION ${ROOT_VERSION}
--      SOVERSION ${ROOT_MAJOR_VERSION}
-+      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
-       SUFFIX ${libsuffix}
-       PREFIX ${libprefix} )
- else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
deleted file mode 100644
index 8834aa4..0000000
--- a/root-stressgraphics.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
---- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
-+++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
-@@ -3,18 +3,18 @@
-     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
-     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
-     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
--    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
-+    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
-     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
-     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
--    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
--    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
--   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
--   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
--   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
--   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
--   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
--   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
--   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
-+    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
-+    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
-+   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
-+   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
-+   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
-+   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
-+   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
-+   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
-+   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
-    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
-    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
-@@ -25,7 +25,7 @@
-    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
-    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
-    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
--   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
-+   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
-    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
-    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
-    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
-@@ -35,11 +35,11 @@
-    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
-    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
-    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
--   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
-+   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
-    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
--   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
-+   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
--   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
-+   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
-    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
-    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
-    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-template-files.patch b/root-template-files.patch
deleted file mode 100644
index 086b8a7..0000000
--- a/root-template-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
---- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
-@@ -15,8 +15,8 @@
-    // equal to 1 for the signal and 0 for the background is added.
-    const char *fname = "mlpHiggs.root";
-    TFile *input = 0;
--   if (!gSystem->AccessPathName(fname)) {
--      input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
-    } else {
-       printf("accessing %s file from http://root.cern.ch/files\n",fname);
-       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
---- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
-@@ -273,8 +273,8 @@
- 
-   const char *fname = "stock.root";
-   TFile *f = 0;
--  if (!gSystem->AccessPathName(fname)) {
--     f = TFile::Open(fname);
-+  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
-   } else {
-      printf("accessing %s file from http://root.cern.ch/files\n",fname);
-      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff --git a/root-test-install.patch b/root-test-install.patch
deleted file mode 100644
index 0b61f68..0000000
--- a/root-test-install.patch
+++ /dev/null
@@ -1,3105 +0,0 @@
-diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
---- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
-@@ -37,12 +37,12 @@
-   install(FILES ${pyfile} DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
-   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
--  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  file(COPY ${pyfile} DESTINATION ${localruntimedir})
- endforeach()
- 
--set( ROOTaaSDirName "ROOTaaS")
-+set(ROOTaaSDirName "ROOTaaS")
- install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
--file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
- 
- #---Install headers----------------------------------------------------------
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
---- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
-@@ -508,7 +508,7 @@
- 
-           # system logon, user logon, and local logon (skip Rint.Logon)
-             name = '.rootlogon.C'
--            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
-+            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
-                        os.path.expanduser( os.path.join( '~', name ) ) ]
-             if logons[-1] != os.path.join( os.getcwd(), name ):
-                logons.append( name )
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-@@ -222,7 +222,7 @@
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
- 
- # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
--if(rpath OR gnuinstall)
-+if(rpath)
-   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
-   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
- elseif(APPLE)
-diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
-@@ -19,6 +19,7 @@
-   set(libprefix lib)
-   set(ld_library_path PATH)
-   set(libsuffix .dll)
-+  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_BINDIR})
- elseif(APPLE)
-   set(ld_library_path DYLD_LIBRARY_PATH)
-@@ -26,6 +27,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- else()
-   set(ld_library_path LD_LIBRARY_PATH)
-@@ -33,6 +35,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
-@@ -322,7 +325,15 @@
-     set(pcm_name)
-   else()
-     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
--      set(command rootcling -rootbuild)
-+      if(gnuinstall)
-+        if(WIN32)
-+          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
-+        else()
-+          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
-+        endif()
-+      else()
-+        set(command rootcling -rootbuild)
-+      endif()
-       set(ROOTCINTDEP rootcling)
-     else()
-       set(command rootcling)
-@@ -431,9 +442,6 @@
-   if(TARGET G__${library})
-     add_dependencies(${library} G__${library})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
-   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
-   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
-@@ -468,9 +476,6 @@
-   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
-      add_dependencies(${library} ${CMAKE_MATCH_2})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
- 
-   #--- Only for building shared libraries
-   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
-@@ -511,9 +516,6 @@
-   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
-   include_directories(${CMAKE_BINARY_DIR}/include)
-   add_library( ${library} SHARED ${lib_srcs})
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
-   target_link_libraries(${library} ${ARG_LIBRARIES})
-   #----Installation details-------------------------------------------------------
-@@ -590,6 +592,10 @@
-                            PATTERN ".svn" EXCLUDE
-                            REGEX "LinkDef" EXCLUDE
-                            ${ARG_OPTIONS})
-+    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
-+                   PATTERN ".svn" EXCLUDE
-+                   REGEX "LinkDef" EXCLUDE
-+                   ${ARG_OPTIONS})
-     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
-   endforeach()
- endfunction()
-@@ -629,9 +635,6 @@
-   if (ARG_ADDITIONAL_COMPILE_FLAGS)
-     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${executable} move_headers)
--  endif()
- 
-   #----Installation details------------------------------------------------------
-   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-@@ -849,6 +852,9 @@
-     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
-   else()
-     add_test(NAME ${test} COMMAND ${_command})
-+    if (gnuinstall)
-+      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
-+    endif()
-   endif()
- 
-   #- Handle TIMOUT and DEPENDS arguments
-diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
---- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,20 +0,0 @@
--# Arguments:
--#  PREFIX    - Installation prefix
--#  COMPONENTS - Installation component
--
--set(COMPONENTS ${COMPONENTS})
--set(ENV{DESTDIR} "")
--foreach(component ${COMPONENTS})
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
--                             -DCMAKE_INSTALL_COMPONENT=${component}
--                             -P cmake_install.cmake
--    RESULT_VARIABLE result
--    OUTPUT_QUIET
--  )
--
--  if(result)
--    set(msg "Local installation of ${component} failed: ${result}\n")
--    message(FATAL_ERROR "${msg}")
--  endif()
--endforeach()
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
-@@ -135,7 +135,7 @@
-   endif()
- endforeach()
- 
--#---Move (copy) the headers and other directories to binary tree---------------------------------
-+#---Move (copy) directories to binary tree------------------------------------------------------
- set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
- add_custom_command(OUTPUT ${stamp_file}
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
-@@ -147,11 +147,7 @@
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
-                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
-                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
--add_custom_target(move_headers DEPENDS ${stamp_file}
--                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
--                                                        -DCOMPONENTS="headers"
--                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
--include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
-+add_custom_target(move_artifacts DEPENDS ${stamp_file})
- 
- 
- #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
-@@ -199,13 +195,23 @@
-                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
-                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
- 
--add_custom_command(OUTPUT etc/allDict.cxx.pch
--                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
--                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
--                           etc/dictpch/allLinkDefs.h
--                           etc/dictpch/allHeaders.h
--                           etc/dictpch/allCppflags.txt
--                           rootcling)
-+if (WIN32)
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+else()
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+endif()
- add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
- set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
- add_dependencies(onepcm ${__allTargets})
-@@ -213,22 +219,20 @@
- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- 
- #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
--if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
--  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
--  add_dependencies(hsimple onepcm)
--  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
--  if(WIN32)
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
--  else()
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
--                               $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
--  endif()
--  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-+add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
-+add_dependencies(hsimple onepcm)
-+if(WIN32)
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
-+else()
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
- endif()
-+install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
- 
- #---version--------------------------------------------------------------------------------------
- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
-@@ -266,9 +270,6 @@
- #---Configure Testing using CTest----------------------------------------------------------------
- configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
- if(testing)
--  if(gnuinstall)
--    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
--  endif()
-   include(RootCTest)
-   if(roottest)
-     find_package(Git REQUIRED)
-diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
---- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
-@@ -14,10 +14,11 @@
- #define ROOTTUTDIR    "@tutdir@"
- #define ROOTSRCDIR    "@srcdir@"
- #define ROOTICONPATH  "@iconpath@"
--#define EXTRAICONPATH "@extraiconpath@"
- #define TTFFONTDIR    "@ttffontdir@"
- #endif
- 
-+#define EXTRAICONPATH "@extraiconpath@"
-+
- #@setresuid@ R__HAS_SETRESUID   /**/
- #@hasmathmore@ R__HAS_MATHMORE   /**/
- #@haspthread@ R__HAS_PTHREAD    /**/
-diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
---- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
-@@ -9,24 +9,24 @@
- # and to PATH on Windows.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.DynamicPath:    .:@libdir@:
--WinNT.*.Root.DynamicPath:   .;@bindir@;
-+#Unix.*.Root.DynamicPath:    .:@libdir@
-+#WinNT.*.Root.DynamicPath:   .;@bindir@
- 
- # Path used to find macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.MacroPath:      .:@macrodir@:
--WinNT.*.Root.MacroPath:     .;@macrodir@;
-+#Unix.*.Root.MacroPath:      .:@macrodir@
-+#WinNT.*.Root.MacroPath:     .;@macrodir@
- 
- # Path used to find plugin macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.PluginPath:      :@plugindir@:
--WinNT.*.Root.PluginPath:     ;@plugindir@;
-+#Unix.*.Root.PluginPath:     @plugindir@
-+#WinNT.*.Root.PluginPath:    @plugindir@
- 
- # Path where to look for TrueType fonts.
- Unix.*.Root.UseTTFonts:     true
--*.*.Root.TTFontPath:        @ttffontdir@
-+#*.*.Root.TTFontPath:        @ttffontdir@
- 
- # Use Net* API functions.
- WinNT.UseNetAPI:         true
-@@ -222,7 +222,8 @@
- Gui.DocumentForegroundColor: black
- Gui.TooltipBackgroundColor:  LightYellow
- Gui.TooltipForegroundColor:  black
--Gui.IconPath:                $(HOME)/icons:@iconpath@:.
-+#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
-+#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
- Gui.MimeTypeFile:            $(HOME)/.root.mimes
- # If above does not exists defaults to this:
- #Gui.MimeTypeFile:            @etcdir@/root.mimes
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
-@@ -8018,6 +8018,7 @@
-     -e "s|@bindir@|$bindir|"               \
-     -e "s|@etcdir@|$etcdir|"               \
-     -e "s|@ttffontdir@|$fontdir|"          \
-+    -e "s|@extraiconpath@|$extraiconpath|" \
-     -e "s|@iconpath@|$iconpath|"           \
-     -e "s|@hasxrd@|$hasxrd|"               \
-     -e "s|@hasnotxrd@|$hasnotxrd|"         \
-diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
---- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
-@@ -325,7 +325,19 @@
-    static Int_t       ConvertVersionInt2Code(Int_t v);
-    static Int_t       RootVersionCode();
-    static const char**&GetExtraInterpreterArgs();
--   static const char *GetTutorialsDir();
-+
-+   static const TString& GetRootSys();
-+   static const TString& GetBinDir();
-+   static const TString& GetLibDir();
-+   static const TString& GetIncludeDir();
-+   static const TString& GetEtcDir();
-+   static const TString& GetDataDir();
-+   static const TString& GetDocDir();
-+   static const TString& GetMacroDir();
-+   static const TString& GetTutorialsDir();
-+   static const TString& GetSourceDir();
-+   static const TString& GetIconPath();
-+   static const TString& GetTTFFontDir();
- 
-    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
- };
-diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -268,11 +268,7 @@
-    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR);
--#else
--                                       "$(ROOTSYS)/fonts");
--#endif
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-    // Check for use of DFSG - fonts
-    if (!ttfont)
-@@ -880,29 +876,19 @@
-          Error("ProcessLine", "Cannot show demos in batch mode!");
-          return 1;
-       }
--#ifdef ROOTTUTDIR
--      ProcessLine(".x " ROOTTUTDIR "/demos.C");
--#else
--      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
--#endif
-+      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
-       return 0;
-    }
- 
-    if (!strncmp(line, ".license", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/LICENSE");
--#else
--      return PrintFile("$(ROOTSYS)/LICENSE");
--#endif
-+      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
-    }
- 
-    if (!strncmp(line, ".credits", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/CREDITS");
--#else
--      return PrintFile("$(ROOTSYS)/README/CREDITS");
--#endif
--
-+      TString credits = TROOT::GetDocDir() + "/CREDITS";
-+      if (gSystem->AccessPathName(credits, kReadPermission))
-+         credits = TROOT::GetDocDir() + "/README/CREDITS";
-+      return PrintFile(credits);
-    }
- 
-    if (!strncmp(line, ".pwd", 4)) {
-diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
---- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -399,21 +399,7 @@
- 
-       TString sname = "system";
-       sname += name;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--      // on iOS etc does not exist and system<name> resides in $ROOTSYS
--      etc = gRootDir;
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       ReadFile(s, kEnvGlobal);
-       delete [] s;
-       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
-@@ -683,17 +669,7 @@
- 
-       TString sname = "system";
-       sname += fRcName;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       rootrcdir = s;
-       delete [] s;
-    } else if (level == kEnvUser) {
-diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
---- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -468,6 +468,10 @@
-       TPH__IsReadingDirs() = kTRUE;
- 
-       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
-+      if (plugindirs.Length() == 0) {
-+         plugindirs = "plugins";
-+         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
-+      }
- #ifdef WIN32
-       dirs = plugindirs.Tokenize(";");
- #else
-diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
---- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
-@@ -543,6 +543,22 @@
-    // Initialize Operating System interface
-    InitSystem();
- 
-+   // Initialize static directory functions
-+   GetRootSys();
-+   GetBinDir();
-+   GetLibDir();
-+   GetIncludeDir();
-+   GetEtcDir();
-+   GetDataDir();
-+   GetDocDir();
-+   GetMacroDir();
-+   GetTutorialsDir();
-+   GetSourceDir();
-+   GetIconPath();
-+   GetTTFFontDir();
-+
-+   gRootDir = GetRootSys().Data();
-+
-    TDirectory::Build();
- 
-    // Initialize interface to CINT C++ interpreter
-@@ -1722,21 +1722,9 @@
-                "after the call to TROOT::InitInterpreter()!");
-       }
- 
--      const char *libcling = 0;
--      char *libclingStorage = 0;
--#ifdef ROOTLIBDIR
--      libcling = ROOTLIBDIR "/libCling."
--# ifdef R__WIN32
--      "dll";
--# else
--      "so";
--# endif
--#else
--      libclingStorage = gSystem->DynamicPathName("libCling");
--      libcling = libclingStorage;
--#endif
-+      char *libcling = gSystem->DynamicPathName("libCling");
-       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
--      delete [] libclingStorage;
-+      delete [] libcling;
- 
-       if (!gInterpreterLib) {
-          TString err = dlerror();
-@@ -2082,22 +2070,7 @@
- #endif
- 
-    TString gitinfo = "gitinfo.txt";
--   char *filename = 0;
--#ifdef ROOTETCDIR
--   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   filename = gSystem->ConcatFileName(etc, gitinfo);
--#endif
-+   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
- 
-    FILE *fp = fopen(filename, "r");
-    if (fp) {
-@@ -2415,17 +2388,9 @@
- #endif
-       if (macroPath.Length() == 0)
- #if !defined(R__WIN32)
--   #ifdef ROOTMACRODIR
--         macroPath = ".:" ROOTMACRODIR;
--   #else
--         macroPath = TString(".:") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".:" + TROOT::GetMacroDir();
- #else
--   #ifdef ROOTMACRODIR
--         macroPath = ".;" ROOTMACRODIR;
--   #else
--         macroPath = TString(".;") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".;" + TROOT::GetMacroDir();
- #endif
-    }
- 
-@@ -2521,14 +2486,252 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+#ifdef ROOTPREFIX
-+static Bool_t IgnorePrefix() {
-+   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
-+   return ignorePrefix;
-+}
-+#endif
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the rootsys directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetRootSys() {
-+#ifdef ROOTPREFIX
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsys;
-+      if (rootsys.IsNull())
-+         rootsys = gSystem->Getenv("ROOTSYS");
-+      if (rootsys.IsNull())
-+         rootsys = gRootDir;
-+      return rootsys;
-+#ifdef ROOTPREFIX
-+   } else {
-+      const static TString rootsys = ROOTPREFIX;
-+      return rootsys;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the binary directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetBinDir() {
-+#ifdef ROOTBINDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootbindir;
-+      if (rootbindir.IsNull()) {
-+         rootbindir = "bin";
-+         gSystem->PrependPathName(GetRootSys(), rootbindir);
-+      }
-+      return rootbindir;
-+#ifdef ROOTBINDIR
-+   } else {
-+      const static TString rootbindir = ROOTBINDIR;
-+      return rootbindir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the library directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetLibDir() {
-+#ifdef ROOTLIBDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootlibdir;
-+      if (rootlibdir.IsNull()) {
-+         rootlibdir = "lib";
-+         gSystem->PrependPathName(GetRootSys(), rootlibdir);
-+      }
-+      return rootlibdir;
-+#ifdef ROOTLIBDIR
-+   } else {
-+      const static TString rootlibdir = ROOTLIBDIR;
-+      return rootlibdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the include directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetIncludeDir() {
-+#ifdef ROOTINCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootincdir;
-+      if (rootincdir.IsNull()) {
-+         rootincdir = "include";
-+         gSystem->PrependPathName(GetRootSys(), rootincdir);
-+      }
-+      return rootincdir;
-+#ifdef ROOTINCDIR
-+   } else {
-+      const static TString rootincdir = ROOTINCDIR;
-+      return rootincdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the sysconfig directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetEtcDir() {
-+#ifdef ROOTETCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootetcdir;
-+      if (rootetcdir.IsNull()) {
-+         rootetcdir = "etc";
-+         gSystem->PrependPathName(GetRootSys(), rootetcdir);
-+      }
-+      return rootetcdir;
-+#ifdef ROOTETCDIR
-+   } else {
-+      const static TString rootetcdir = ROOTETCDIR;
-+      return rootetcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the data directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDataDir() {
-+#ifdef ROOTDATADIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDATADIR
-+   } else {
-+      const static TString rootdatadir = ROOTDATADIR;
-+      return rootdatadir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the documentation directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDocDir() {
-+#ifdef ROOTDOCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDOCDIR
-+   } else {
-+      const static TString rootdocdir = ROOTDOCDIR;
-+      return rootdocdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the macro directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetMacroDir() {
-+#ifdef ROOTMACRODIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootmacrodir;
-+      if (rootmacrodir.IsNull()) {
-+         rootmacrodir = "macros";
-+         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
-+      }
-+      return rootmacrodir;
-+#ifdef ROOTMACRODIR
-+   } else {
-+      const static TString rootmacrodir = ROOTMACRODIR;
-+      return rootmacrodir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Get the tutorials directory in the installation. Static utility function.
- 
--const char *TROOT::GetTutorialsDir()
--{
-+const TString& TROOT::GetTutorialsDir() {
- #ifdef ROOTTUTDIR
--   return ROOTTUTDIR;
--#else
--   static TString tutdir = TString(gRootDir) + "/tutorials";
--   return tutdir;
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString roottutdir;
-+      if (roottutdir.IsNull()) {
-+         roottutdir = "tutorials";
-+         gSystem->PrependPathName(GetRootSys(), roottutdir);
-+      }
-+      return roottutdir;
-+#ifdef ROOTTUTDIR
-+   } else {
-+      const static TString roottutdir = ROOTTUTDIR;
-+      return roottutdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the source directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetSourceDir() {
-+#ifdef ROOTSRCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsrcdir;
-+      if (rootsrcdir.IsNull()) {
-+         rootsrcdir = "src";
-+         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
-+      }
-+      return rootsrcdir;
-+#ifdef ROOTSRCDIR
-+   } else {
-+      const static TString rootsrcdir = ROOTSRCDIR;
-+      return rootsrcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the icon path in the installation. Static utility function.
-+
-+const TString& TROOT::GetIconPath() {
-+#ifdef ROOTICONPATH
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rooticonpath;
-+      if (rooticonpath.IsNull()) {
-+         rooticonpath = "icons";
-+         gSystem->PrependPathName(GetRootSys(), rooticonpath);
-+      }
-+      return rooticonpath;
-+#ifdef ROOTICONPATH
-+   } else {
-+      const static TString rooticonpath = ROOTICONPATH;
-+      return rooticonpath;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the fonts directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetTTFFontDir() {
-+#ifdef TTFFONTDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString ttffontdir;
-+      if (ttffontdir.IsNull()) {
-+         ttffontdir = "fonts";
-+         gSystem->PrependPathName(GetRootSys(), ttffontdir);
-+      }
-+      return ttffontdir;
-+#ifdef TTFFONTDIR
-+   } else {
-+      const static TString ttffontdir = TTFFONTDIR;
-+      return ttffontdir;
-+   }
- #endif
- }
-diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
-@@ -1852,22 +1852,10 @@
-       if (!system) {
-          // Mark the library in $ROOTSYS/lib as system.
-          const char *dirname = DirName(path);
--#ifdef ROOTLIBDIR
--         TString rootlibdir = ROOTLIBDIR;
--#else
--         TString rootlibdir = "lib";
--         PrependPathName(gRootDir, rootlibdir);
--#endif
--         system = R__MatchFilename(rootlibdir,dirname);
-+         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
- 
-          if (!system) {
--#ifdef ROOTBINDIR
--            TString rootbindir = ROOTBINDIR;
--#else
--            TString rootbindir = "bin";
--            PrependPathName(gRootDir, rootbindir);
--#endif
--            system = R__MatchFilename(rootbindir,dirname);
-+            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
-          }
-       }
- 
-@@ -2492,12 +2480,9 @@
- #else
-    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
- #endif
--#ifdef ROOTBINDIR
--   TString builddep = ROOTBINDIR;
--#else
--   TString builddep = TString(gRootDir) + "/bin";
--#endif
--   builddep += "/rmkdepend \"-f";
-+   TString builddep = "rmkdepend";
-+   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
-+   builddep += " \"-f";
-    builddep += depfilename;
-    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
-    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
-@@ -2519,12 +2504,7 @@
-       builddep += "/\" ";
-    }
-    builddep += " -Y -- ";
--#ifndef ROOTINCDIR
--   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
--   rootsysInclude += "/include";
--#else
--   TString rootsysInclude = ROOTINCDIR;
--#endif
-+   TString rootsysInclude = TROOT::GetIncludeDir();
-    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
-    builddep += includes;
-    builddep += defines;
-@@ -3345,27 +3325,17 @@
-       TString name = ".rootmap";
-       TString sname = "system.rootmap";
-       TString file;
--#ifdef ROOTETCDIR
--      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      AssignAndDelete(file, ConcatFileName(etc, sname));
-+      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
-       if (gSystem->AccessPathName(file)) {
-          // for backward compatibility check also $ROOTSYS/system<name> if
-          // $ROOTSYS/etc/system<name> does not exist
--         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
-+         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
-          if (gSystem->AccessPathName(file)) {
-             // for backward compatibility check also $ROOTSYS/<name> if
-             // $ROOTSYS/system<name> does not exist
--            AssignAndDelete(file, ConcatFileName(gRootDir, name));
-+            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
-          }
-       }
--#endif
-       mapfileStream << file << std::endl;
-       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
-       mapfileStream << file << std::endl;
-@@ -3379,23 +3349,9 @@
-    mapfileStream.close();
- 
-    // ======= Generate the rootcling command line
--   TString rcling;
--#ifndef ROOTBINDIR
--   rcling = gSystem->Getenv("ROOTSYS");
--#ifndef R__WIN32
--   rcling += "/bin/";
--#else
--   rcling += "\\bin\\";
--#endif
--#else
--   rcling = ROOTBINDIR;
--#ifndef R__WIN32
--   rcling += "/";
--#else
--   rcling += "\\";
--#endif
--#endif
--   rcling += "rootcling -v0 \"--lib-list-prefix=";
-+   TString rcling = "rootcling";
-+   PrependPathName(TROOT::GetBinDir(), rcling);
-+   rcling += " -v0 \"--lib-list-prefix=";
-    rcling += mapfile;
-    rcling += "\" -f \"";
-    rcling.Append(dict).Append("\" -c -p ");
-diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
---- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
-@@ -66,14 +66,14 @@
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- else()
-   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- endif()
- add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
-diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
---- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
-@@ -1719,17 +1719,7 @@
- {
-    static const char *suffix = "class.rules";
-    TString sname = suffix;
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   gSystem->PrependPathName(etc, sname);
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
- 
-    Int_t res = -1;
- 
-diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
---- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
-@@ -1049,10 +1049,10 @@
-    if (!fromRootCling) {
-       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
- 
--      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
--      clingArgsStorage.push_back(interpInclude);
-+      interpInclude = TROOT::GetEtcDir();
-+      clingArgsStorage.push_back("-I" + interpInclude);
- 
--      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
-+      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
-       if (gSystem->Getenv("ROOT_PCH")) {
-          pchFilename = gSystem->Getenv("ROOT_PCH");
-       }
-@@ -1063,14 +1063,8 @@
-       // clingArgsStorage.push_back("-fmodules");
- 
-       std::string include;
--#ifndef ROOTINCDIR
--      include = gSystem->Getenv("ROOTSYS");
--      include += "/include";
--#else // ROOTINCDIR
--      include = ROOTINCDIR;
--#endif // ROOTINCDIR
--      clingArgsStorage.push_back("-I");
--      clingArgsStorage.push_back(include);
-+      include = TROOT::GetIncludeDir();
-+      clingArgsStorage.push_back("-I" + include);
-       clingArgsStorage.push_back("-Wno-undefined-inline");
-       clingArgsStorage.push_back("-fsigned-char");
-    }
-@@ -1080,7 +1074,11 @@
-            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
-       interpArgs.push_back(iArg->c_str());
- 
--   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
-+#ifdef R__EXTERN_LLVMDIR
-+   TString llvmResourceDir = R__EXTERN_LLVMDIR;
-+#else
-+   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
-+#endif
-    // Add statically injected extra arguments, usually coming from rootcling.
-    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
-         extraArgs && *extraArgs; ++extraArgs) {
-@@ -1094,7 +1092,7 @@
- 
-    fInterpreter = new cling::Interpreter(interpArgs.size(),
-                                          &(interpArgs[0]),
--                                         llvmResourceDir.c_str());
-+                                         llvmResourceDir);
- 
-    if (!fromRootCling) {
-       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
-@@ -1103,13 +1101,13 @@
-       // llvm/clang header files shouldn't be there at all. We have to get rid of
-       // that dependency and avoid copying the header files.
-       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
--      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
-+      TCling::AddIncludePath((interpInclude + "/cling").c_str());
- 
-       // Add the current path to the include path
-       // TCling::AddIncludePath(".");
- 
-       // Add the root include directory and etc/ to list searched by default.
--      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
-+      TCling::AddIncludePath(TROOT::GetIncludeDir());
-    }
- 
-    // Don't check whether modules' files exist.
-@@ -4515,21 +4513,7 @@
- 
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and system<name> resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
- 
-    Int_t ret = ReadRootmapFile(s);
-    if (ret == -3) // old format
-diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
---- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
-@@ -339,10 +339,6 @@
- //______________________________________________________________________________
- llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
- 
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
- enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
- 
- //______________________________________________________________________________
-@@ -549,18 +545,6 @@
-                                  const char* headers[]);
- 
- //______________________________________________________________________________
--// Return the -I needed to find RuntimeUniverse.h
--std::string GetInterpreterExtraIncludePath(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the LLVM / clang resource directory
--std::string GetLLVMResourceDir(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
--//______________________________________________________________________________
- // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
- // that can be used in C++ as a variable name.
- void GetCppName(std::string &output, const char *input);
-diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
---- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -3407,40 +3407,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Return the -I needed to find RuntimeUniverse.h
--
--std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
--{
--#ifdef ROOTETCDIR
--   if (rootbuild) {
--      // Building ROOT, ignore ROOTETCDIR!
--#endif
--      const char* rootsys = getenv("ROOTSYS");
--      if (!rootsys) {
--         Error(0, "Environment variable ROOTSYS not set!");
--         return "-Ietc";
--      }
--      return std::string("-I") + rootsys + "/etc";
--#ifdef ROOTETCDIR
--   }
--   return std::string("-I") + ROOTETCDIR;
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Return the LLVM / clang resource directory
--
--std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
--{
--#ifdef R__EXTERN_LLVMDIR
--   return R__EXTERN_LLVMDIR;
--#else
--   return GetInterpreterExtraIncludePath(rootbuild)
--      .substr(2, std::string::npos) + "/cling";
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Get the template specialisation decl and template decl behind the qualtype
- /// Returns true if successfully found, false otherwise
- 
-@@ -3957,29 +3923,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--
--std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
--{
--   const std::string defaultInclude ("include");
--   if (!rootbuild) {
--#ifndef ROOTINCDIR
--      const char* rootSysContent = getenv("ROOTSYS");
--      if (rootSysContent) {
--         std::string incl_rootsys (rootSysContent);
--         return incl_rootsys + "/" + defaultInclude;
--      } else {
--         Error(0,"Environment variable ROOTSYS not set");
--         return defaultInclude;
--      }
--#else
--      return ROOTINCDIR;
--#endif
--   }
--
--   return defaultInclude;
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Return the dictionary file name for a module
- 
- std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
-diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
---- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -301,17 +301,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
---- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
-@@ -1663,8 +1663,7 @@
-    case kROOT_Load:
-       {
-          const TString fileName = s3("[^\"]*$");
--//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
--         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
-+         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
-          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
- 
- //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
-diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
---- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
-@@ -445,7 +445,9 @@
- 
- static void SetRootSys()
- {
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    void *addr = (void *)SetRootSys;
-    Dl_info info;
-    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
-@@ -458,8 +460,8 @@
-          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
-       }
-    }
--#else
--   return;
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- #endif
-@@ -487,7 +489,9 @@
-    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
-    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
- #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-    // first loaded is the app so set ROOTSYS to app bundle
-    if (i == 1) {
-@@ -513,6 +517,8 @@
-       }
-    }
- #endif
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // when libSystem.B.dylib is loaded we have finished loading all dylibs
-@@ -600,13 +606,8 @@
-    SetRootSys();
- #endif
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0)
--      gRootDir= "/usr/local/root";
--#else
--   gRootDir = ROOTPREFIX;
--#endif
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   gRootDir = "/usr/local/root";
- 
-    return kFALSE;
- }
-@@ -2138,22 +2140,17 @@
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
-          gdbscript = "";
--      } else {
--         gdbscript += " ";
-       }
-    }
-    if (gdbscript == "") {
--#ifdef ROOTETCDIR
--      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
--#else
--      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
--#endif
-+      gdbscript = "gdb-backtrace.sh";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
-          return;
-       }
--      gdbscript += " ";
-    }
-+   gdbscript += " ";
- 
-    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
-    gdbmess = gdbmess.Strip();
-@@ -4471,11 +4468,7 @@
-       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
-       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
-       if (rdynpath.IsNull()) {
--#ifdef ROOTLIBDIR
--         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
--#else
--         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
--#endif
-+         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
-       }
-       TString ldpath;
- #if defined (R__AIX)
-@@ -4496,16 +4489,9 @@
-       else {
-          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
-       }
--
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ":"; dynpath += ROOTLIBDIR;
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ":"; dynpath += TROOT::GetLibDir();
-       }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
--      }
--#endif
-       if (gCling) {
-          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
-       } else
-diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
-@@ -64,27 +64,27 @@
-                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
- endif()
- 
--set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
--configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
-+configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
- 
- if(WIN32)
--  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
- else()
-   if(CXX_HAS_fno_rtti)
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
-   else()
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
-   endif()
- endif()
- 
- ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
--                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
-+                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
-                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
-                               $<TARGET_OBJECTS:Clib>
-                               $<TARGET_OBJECTS:MetaUtils>
-                               $<TARGET_OBJECTS:MetaUtilsLLVM>
-                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                               NOINSTALL)
-+set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
- add_dependencies(rootcling_tmp CLING LLVMRES)
- set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
- set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
-diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
---- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
-@@ -48,7 +48,7 @@
- ROOTCINTEXE     := bin/rootcint$(EXEEXT)
- GENREFLEXEXE    := bin/genreflex$(EXEEXT)
- ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
--ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
-+ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
- 
- ##### Dependencies for all dictionaries
- ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
-diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
---- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -295,12 +295,6 @@
- bool buildingROOT = false;
- #endif
- 
--#ifdef R__EXTERN_LLVMDIR
--# define R__LLVMDIR R__EXTERN_LLVMDIR
--#else
--# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
--#endif
--
- namespace {
-    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
-    template <typename T> struct IsPointerTClassCopy {
-@@ -3977,11 +3971,6 @@
-       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
-    }
- 
--#if defined(ROOTINCDIR)
--   if (!buildingROOT)
--      SetRootSys();
--#endif
--
-    if (ic < argc && !strcmp(argv[ic], "-c")) {
-       // Simply ignore the -c options.
-       ic++;
-@@ -4131,7 +4120,11 @@
-    }
- 
-    ic = nextStart;
--   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
-+#endif
- 
-    std::vector<std::string> pcmArgs;
-    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
-@@ -4140,7 +4133,11 @@
-    }
- 
-    // cling-only arguments
--   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
-+#endif
-    // We do not want __ROOTCLING__ in the pch!
-    if (!onepcm) {
-       clingArgs.push_back("-D__ROOTCLING__");
-@@ -4162,10 +4159,14 @@
-    }
- 
-    std::string resourceDir;
--#ifdef R__LLVMRESOURCEDIR
--   resourceDir = "@R__LLVMRESOURCEDIR@";
-+#ifdef R__EXTERN_LLVMDIR
-+   resourceDir = R__EXTERN_LLVMDIR;
- #else
--   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
-+#ifdef ROOT_STAGE1_BUILD
-+   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
-+#else
-+   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
-+#endif
- #endif
- 
- #ifndef ROOT_STAGE1_BUILD
-@@ -4184,11 +4185,6 @@
- 
-    interp.getOptions().ErrorOut = true;
-    interp.enableRawInput(true);
--#ifdef ROOTINCDIR
--   const bool useROOTINCDIR = !buildingROOT;
--#else
--   const bool useROOTINCDIR = false;
--#endif
-    if (isGenreflex) {
-       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
-          // There was an error.
-@@ -4205,17 +4201,10 @@
-                               "#include <math.h>\n"
-                               "#include <string.h>\n"
-                              ) != cling::Interpreter::kSuccess
--            || (!useROOTINCDIR
--                && interp.declare("#include \"Rtypes.h\"\n"
--                                  "#include \"TClingRuntime.h\"\n"
--                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
--#ifdef ROOTINCDIR
--            || (useROOTINCDIR
--                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
--               )
--#endif
-+            || interp.declare("#include \"Rtypes.h\"\n"
-+                              "#include \"TClingRuntime.h\"\n"
-+                              "#include \"TObject.h\""
-+                             ) != cling::Interpreter::kSuccess
-          ) {
-          // There was an error.
-          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
---- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -37,6 +37,18 @@
- }
- 
- extern "C"
-+const char *TROOT__GetIncludeDir()
-+{
-+   return TROOT::GetIncludeDir().Data();
-+}
-+
-+extern "C"
-+const char *TROOT__GetEtcDir()
-+{
-+   return TROOT::GetEtcDir().Data();
-+}
-+
-+extern "C"
- cling::Interpreter *TCling__GetInterpreter()
- {
-    static bool sInitialized = false;
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
---- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
-@@ -21,6 +21,8 @@
- 
- extern "C" {
-    const char ** *TROOT__GetExtraInterpreterArgs();
-+   const char *TROOT__GetIncludeDir();
-+   const char *TROOT__GetEtcDir();
-    cling::Interpreter *TCling__GetInterpreter();
-    void InitializeStreamerInfoROOTFile(const char *filename);
-    void AddStreamerInfoToROOTFile(const char *normName);
-diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
---- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
-@@ -362,11 +362,7 @@
-          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
-          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
-          if (rdynpath == "") {
--#ifdef ROOTBINDIR
--            rdynpath = ".;"; rdynpath += ROOTBINDIR;
--#else
--            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
--#endif
-+            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
-          }
-          TString path = gSystem->Getenv("PATH");
-          if (path == "")
-@@ -376,15 +372,10 @@
-          }
- 
-       }
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ";"; dynpath += ROOTLIBDIR;
--      }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
-+
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ";"; dynpath += TROOT::GetLibDir();
-       }
--#endif
- 
-       return dynpath;
-    }
-@@ -823,16 +814,8 @@
-       }
- 
-       // determine the fileopen.C file path:
--      TString fileopen;
--#ifndef ROOT_PREFIX
--      fileopen += sys->TWinNTSystem::DriveName(buf);
--      fileopen += ":";
--      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
--      fileopen += "\\macros";
--#else
--      fileopen += ROOTMACRODIR;
--#endif
--      fileopen += "\\fileopen.C";
-+      TString fileopen = "fileopen.C";
-+      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
- 
-       if (regROOTwrite) {
-          // only write to registry if fileopen.C is readable
-@@ -1007,7 +990,9 @@
- 
-    char *buf = new char[MAX_MODULE_NAME32 + 1];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
-+#endif
-    // set ROOTSYS
-    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
-    if (hModCore) {
-@@ -1035,6 +1020,8 @@
-          }
-       }
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    UpdateRegistry(this, buf);
-@@ -1112,23 +1099,17 @@
- 
-    fSigcnt = 0;
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0) {
--      static char lpFilename[MAX_PATH];
--      if (::GetModuleFileName(NULL,               // handle to module to find filename for
--                            lpFilename,           // pointer to buffer to receive module path
--                            sizeof(lpFilename)))  // size of buffer, in characters
--      {
--         const char *dirName = DirName(DirName(lpFilename));
--         gRootDir = StrDup(dirName);
--      } else {
--         gRootDir = 0;
--      }
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   static char lpFilename[MAX_PATH];
-+   if (::GetModuleFileName(
-+          NULL,                   // handle to module to find filename for
-+          lpFilename,             // pointer to buffer to receive module path
-+          sizeof(lpFilename))) {  // size of buffer, in characters
-+      const char *dirName = DirName(DirName(lpFilename));
-+      gRootDir = StrDup(dirName);
-+   } else {
-+      gRootDir = 0;
-    }
--#else
--   gRootDir= ROOTPREFIX;
--#endif
- 
-    // Increase the accuracy of Sleep() without needing to link to winmm.lib
-    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
-diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
---- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
-@@ -50,6 +50,7 @@
- # Define all the header files which should be installed when
- # doing a "make install"
- install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
-+file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
- set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- 
- ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
-diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
---- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
-@@ -24,6 +24,7 @@
- #include "Riostream.h"
- 
- #include "TSystem.h"
-+#include "TROOT.h"
- #include "TObjArray.h"
- #include "TVirtualGeoPainter.h"
- #include "TGeoManager.h"
-@@ -1113,12 +1114,8 @@
- {
-    if (HasRNElements()) return;
-    TGeoElementRN *elem;
--   TString rnf;
--#ifdef ROOTETCDIR
--   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
--#else
--   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+   TString rnf = "RadioNuclides.txt";
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
-    FILE *fp = fopen(rnf, "r");
-    if (!fp) {
-       Error("ImportElementsRN","File RadioNuclides.txt not found");
-diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
-@@ -359,33 +359,33 @@
- 
- static void init_icon_paths()
- {
--   const char *icons = "/icons";
--#ifdef R__WIN32
--      icons = "\\icons";
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
-+#ifndef R__WIN32
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
- #endif
-+   }
- 
--   TString homeIcons = gSystem->HomeDirectory();
--   homeIcons += icons;
--
--   TString rootIcons = gSystem->Getenv("ROOTSYS");
--   rootIcons += icons;
--
--   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
--
--   gIconPaths[0] = StrDup(".");
--   gIconPaths[1] = StrDup(homeIcons.Data());
--   gIconPaths[2] = StrDup(rootIcons.Data());
--   gIconPaths[3] = StrDup(guiIcons.Data());
--
--#ifdef ROOTICONPATH
--   gIconPaths[4] = StrDup(ROOTICONPATH);
-+   Int_t cnt = 0;
-+   Ssiz_t from = 0;
-+   TString token;
-+#ifndef R__WIN32
-+   const char *delim = "/";
-+#else
-+   const char *delim = "\\";
- #endif
--
--#ifdef EXTRAICONPATH
--   gIconPaths[5] = StrDup(EXTRAICONPATH);
--#endif
--
--   gIconPaths[6] = 0;
-+   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
-+      char *path = gSystem->ExpandPathName(token.Data());
-+      if (path) {
-+         gIconPaths[cnt] = path;
-+         cnt++;
-+      }
-+   }
-+   gIconPaths[cnt] = 0;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
---- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
-@@ -811,11 +811,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-@@ -3077,11 +3073,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
---- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
-@@ -195,11 +195,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -225,11 +221,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- 
-    // draw list of classes (if specified)
-    if (classes && strlen(classes)) {
-diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
-@@ -15,12 +15,10 @@
- Interface to the freetype 2 library.
- */
- 
--// RConfigure.h is needed for TTFFONTDIR
--#include "RConfigure.h"
--
- #  include <ft2build.h>
- #  include FT_FREETYPE_H
- #  include FT_GLYPH_H
-+#include "TROOT.h"
- #include "TTF.h"
- #include "TSystem.h"
- #include "TEnv.h"
-@@ -415,13 +413,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                       TTFFONTDIR
--# else
--                                       "$(ROOTSYS)/fonts"
--# endif
--                                      );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (!ttfont) {
-@@ -543,12 +535,7 @@
-       // try to load font (font must be in Root.TTFontPath resource)
-       // to see which fontset we have available
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR
--#else
--                                          "$(ROOTSYS)/fonts"
--#endif
--                                         );
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
-       if (ttfont) {
-          delete [] ttfont;
-diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
-@@ -1567,12 +1567,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR
--#else // TTFFONTDIR
--                                       "$(ROOTSYS)/fonts"
--#endif // TTFFONTDIR
--                                       );
-+                                       TROOT::GetTTFFontDir());
- 
-    for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15 && MustEmbed[fontid-1]) {
-diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
---- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
-@@ -699,13 +699,6 @@
-                           GetSystemMetrics(SM_CYSMICON));
-    HDC dc = tempIcon->handle();
-    DrawIcon (dc, 0, 0, icon);
--#else
--# ifdef ROOTICONPATH
--   gSystem->ExpandPathName(ROOTICONPATH);
--# else
--   gSystem->ExpandPathName("$ROOTSYS/icons/");
--//   tempIcon =new QPixmap (16,16),
--# endif
- #endif
-    return tempIcon;
- }
-@@ -795,13 +788,7 @@
-    static TQtApplication *app = 0;
-    if (!app) {
-       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
--      static TString argvString (
--#ifdef ROOTBINDIR
--             ROOTBINDIR "/root.exe"
--#else
--             "$ROOTSYS/bin/root.exe"
--#endif
--             );
-+      static TString argvString (TROOT::GetBinDir() + "/root.exe");
-       gSystem->ExpandPathName(argvString);
-       static char *argv[] = {(char *)argvString.Data()};
-       static int nArg = 1;
-@@ -989,14 +976,8 @@
-     }
- 
-     if (isXdfSupport && !symbolFontFound) {
--// Load the local ROOT font
--       QString fontdir =
--#ifdef TTFFONTDIR
--         TTFFONTDIR
--#else
--         "$ROOTSYS/fonts"
--#endif
--        ;
-+        // Load the local ROOT font
-+        QString fontdir = TROOT::GetTTFFontDir().Data();
-         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
-         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
-     }
-@@ -1006,12 +987,7 @@
-         fontFamily = fSymbolFontFamily = "Arial";
-         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
-         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
--                 <<
--#ifdef TTFFONTDIR
--               TTFFONTDIR
--#else
--               "$ROOTSYS/fonts"
--#endif
-+                 << TROOT::GetTTFFontDir()
-                  << "\" directory to get the proper support for ROOT TLatex class";
-         // create a custom codec
-         new QSymbolCodec();
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
-@@ -14,6 +14,7 @@
- #include "TGLFontManager.h"
- 
- 
-+#include "TROOT.h"
- #include "TVirtualX.h"
- #include "TMath.h"
- #include "TSystem.h"
-@@ -451,11 +452,7 @@
-    if (it == fFontMap.end())
-    {
-       TString ttpath, file;
--# ifdef TTFFONTDIR
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
--# else
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
--# endif
-+      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
-       {
-          //For extenede we have both ttf and otf.
-          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -669,14 +669,7 @@
-          switch (parm1) {
-          case kGLHelpAbout: {
- #ifdef R__UNIX
--            TString rootx;
--#ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--#else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--#endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -197,13 +197,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                        TTFFONTDIR
--# else
--                                        "$(ROOTSYS)/fonts"
--# endif
--                                        );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (fGLTextFont) delete fGLTextFont;
-diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
-@@ -84,12 +84,7 @@
- 
-    if (strcmp(appClassName, "proofserv")) {
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR);
--#else
--                                          "$(ROOTSYS)/fonts");
--#endif
--
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
-       if (!ttfont)
-diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
---- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -83,46 +83,29 @@
-    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
-    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
- 
--   TString icon_path;
--   TString mime_file;
--   TString line;
--
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
- #ifndef R__WIN32
--# ifdef ROOTICONPATH
--   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
--                               ROOTICONPATH);
--#  ifdef EXTRAICONPATH
--   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
--#  else
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--#  endif
--# else
--   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
--                                                       gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--# endif
--   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
-+#endif
-+   }
- 
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
-+   TString mime_file = ".root.mimes";
-+   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
-+   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
-    char *mf = gSystem->ExpandPathName(mime_file.Data());
-    if (mf) {
-       mime_file = mf;
-       delete [] mf;
-    }
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--#ifdef ROOTETCDIR
--      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
--#else
--      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
--#else // R__WIN32
--   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
-+   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
-+      mime_file = "root.mimes";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
-+   }
- 
-    // Setup colors...
-    fClient->GetColorByName("white", fWhite);  // white and black always exist
-diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -842,14 +842,7 @@
- void TGTextEditor::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
-@@ -702,14 +702,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
-@@ -1962,14 +1962,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
---- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
-@@ -1192,14 +1192,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
---- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
-@@ -629,14 +629,7 @@
-                   case kM_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
---- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
-@@ -5812,14 +5812,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+		         TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
---- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
-@@ -1348,18 +1348,7 @@
-    R__LOCKGUARD(GetMakeClassMutex());
- 
-    fPathInfo.fEtcDir = "html";
--
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
--#else
--   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
--# ifdef ROOTPREFIX
--   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
--# else
--   if (getenv("ROOTSYS"))
--      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
--# endif
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
- 
-    return fPathInfo.fEtcDir;
- }
-@@ -1666,12 +1655,7 @@
-                   if (posSpace != std::string::npos)
-                      lib.erase(posSpace);
-                   if (rootLibs.find(lib) == rootLibs.end()) {
--#ifdef ROOTLIBDIR
--                     TString rootlibdir = ROOTLIBDIR;
--#else
--                     TString rootlibdir = "lib";
--                     gSystem->PrependPathName(gRootDir, rootlibdir);
--#endif
-+                     TString rootlibdir = TROOT::GetLibDir();
-                      TString sLib(lib);
-                      if (sLib.Index('.') == -1) {
-                         sLib += ".";
-diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
---- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
-@@ -3047,11 +3047,7 @@
-          return;
-       }
-       // Get Makefile.arch
--#ifdef ROOTETCDIR
--      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
--#else
--      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
--#endif
-+      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(mkarchsrc))
-          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
-       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
-@@ -40,5 +40,5 @@
-   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
--  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
- endif()
-diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
---- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
-@@ -173,15 +173,9 @@
- 
- int main()
- {
--#ifdef ROOTPREFIX
--   string rootbin(ROOTBINDIR);
--   string rootlib(ROOTLIBDIR);
--   string rootetc(ROOTETCDIR);
--#else
--   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
--   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
--   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
--#endif
-+   string rootbin(TROOT::GetBinDir());
-+   string rootlib(TROOT::GetLibDir());
-+   string rootetc(TROOT::GetEtcDir());
- 
-    // If needed, install ROOT notebook files in the user's home directory
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
---- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
-@@ -690,11 +690,9 @@
- .NOTPARALLEL:
- endif
- 
--ifeq ($(USECONFIG),FALSE)
- all: tutorials/hsimple.root
- tutorials/hsimple.root: rootexecs postbin
--	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
--endif
-+	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
- 
- all:            rootexecs postbin
- 	@echo " "
-@@ -1119,7 +1117,7 @@
- 
- $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
- 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
--	@$(MAKEPCH) $@
-+	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
- 
- $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
- 	@mkdir -p $(dir $@)
-@@ -1224,8 +1222,6 @@
- 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
- 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
- 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
--	   (cd $(DESTDIR)$(TUTDIR); \
--	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
- 	fi
- 
- uninstall:
-@@ -1352,7 +1348,6 @@
- 		--exclude proofd.xinetd \
- 		--exclude rootd.rc.d \
- 		--exclude rootd.xinetd \
--		--exclude gitinfo.txt \
- 		$(ROOT_SRCDIR)/etc . ; \
- 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
- 	$(RSYNC) \
-diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
---- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
-@@ -22,9 +22,6 @@
- 
- 
- #include "RConfigure.h"
--// #ifndef ROOTINCDIR
--// #define MATH_NO_PLUGIN_MANAGER
--// #endif
- 
- #include <algorithm>
- #include <functional>
-diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
-@@ -551,11 +551,8 @@
-    const char *fn;
- 
-    if (!FileName[0]) {
--#ifdef ROOTETCDIR
--      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
--#else
--      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+      default_name = "pdg_table.txt";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
-       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
-    } else {
-       fn = FileName;
-diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
---- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
-@@ -23,7 +23,6 @@
- add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
--add_dependencies(rsa move_headers)
- 
- if(ssl)
-   include_directories(${OPENSSL_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
---- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
-@@ -95,18 +95,8 @@
- {
-    // Executables and conf dirs
- 
--   string execdir, etcdir;
--#ifdef ROOTBINDIR
--   execdir = string(ROOTBINDIR);
--#endif
--#ifdef ROOTETCDIR
--   etcdir = string(ROOTETCDIR);
--#endif
--
--   // Define rootbindir if not done already
--   if (!execdir.length())
--      execdir = string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-+   string execdir = TROOT::GetBinDir().Data();
-    if (execdir.length()) {
-       int len = 15 + execdir.length();
-       char *tmp = new char[len+1];
-@@ -117,10 +107,8 @@
-          return -1;
-    }
- 
--   // Define rootetcdir if not done already
--   if (!etcdir.length())
--      etcdir = string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-+   string etcdir = TROOT::GetEtcDir().Data();
-    if (etcdir.length()) {
-       int len = 15 + etcdir.length();
-       char *tmp = new char[len+1];
-diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
---- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -4110,19 +4110,9 @@
-          ::Info("TAuthenticate::ReadRootAuthrc",
-                 "file %s cannot be read (errno: %d)", authrc, errno);
-       delete [] authrc;
--#ifdef ROOTETCDIR
--      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
--#else
--      char etc[1024];
--#ifdef WIN32
--      snprintf(etc, 1024, "%s\\etc", gRootDir);
--#else
--      snprintf(etc, 1024, "%s/etc", gRootDir);
--#endif
--      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
--#endif
-+      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
-       if (gDebug > 2)
--         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
-+         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
-       if (gSystem->AccessPathName(authrc, kReadPermission)) {
-          if (gDebug > 1)
-             ::Info("TAuthenticate::ReadRootAuthrc",
-diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
---- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -147,11 +147,7 @@
-    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
- 
-    if (fJSROOTSYS.Length() == 0) {
--#ifdef ROOTETCDIR
--      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
--#else
--      TString jsdir("$(ROOTSYS)/etc/http");
--#endif
-+      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(jsdir)) {
-          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
-          fJSROOTSYS = ".";
-@@ -162,18 +158,7 @@
- 
-    AddLocation("currentdir/", ".");
-    AddLocation("jsrootsys/", fJSROOTSYS);
--
--   const char *rootsys = gSystem->Getenv("ROOTSYS");
--   if (rootsys != 0) {
--      AddLocation("rootsys/", rootsys);
--   } else {
--#ifdef ROOTPREFIX
--      TString sysdir = ROOTPREFIX;
--#else
--      TString sysdir = "$(ROOTSYS)";
--#endif
--      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
--   }
-+   AddLocation("rootsys/", TROOT::GetRootSys());
- 
-    fDefaultPage = fJSROOTSYS + "/files/online.htm";
-    fDrawPage = fJSROOTSYS + "/files/draw.htm";
-diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
---- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
-@@ -1275,17 +1275,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
---- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
-@@ -335,22 +335,7 @@
-       }
-    }
- 
--   TString confdir;
--#ifndef ROOTPREFIX
--   // try to guess the config directory...
--   if (gSystem->Getenv("ROOTSYS")) {
--      confdir = TString(gSystem->Getenv("ROOTSYS"));
--   } else {
--      // Try to guess it from 'root.exe' path
--      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
--                                     "root.exe", kExecutePermission);
--      confdir = rootexe;
--      confdir.Resize(confdir.Last('/'));
--      delete [] rootexe;
--   }
--#else
--   confdir = TString(ROOTPREFIX);
--#endif
-+   TString confdir = TROOT::GetRootSys();
-    if (!confdir.Length()) {
-       Error("Authenticate", "config dir undefined");
-       return kFALSE;
-diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
---- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
-@@ -2528,10 +2528,13 @@
- 
-    if (argc > 0) {
-       confdir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTPREFIX
-+   }
-+
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-       if (!confdir.length()) {
-+         // try to guess the config directory...
-          if (getenv("ROOTSYS")) {
-             confdir = getenv("ROOTSYS");
-             if (gDebug > 0)
-@@ -2542,31 +2545,26 @@
-                ErrorInfo("main: no config directory specified");
-          }
-       }
--#else
--      confdir = ROOTPREFIX;
--#endif
-+      rootbindir = std::string(confdir).append("/bin");
-+      rootetcdir = std::string(confdir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else {
-+      if (!confdir.length())
-+         confdir = ROOTPREFIX;
-+      rootbindir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-    }
--#ifdef ROOTBINDIR
--   rootbindir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
- #endif
- 
--   // Define rootbindir if not done already
--   if (!rootbindir.length())
--      rootbindir = std::string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-    if (rootbindir.length()) {
-       char *tmp1 = new char[15 + rootbindir.length()];
-       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
-       putenv(tmp1);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp1 = new char[15 + rootetcdir.length()];
-       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
---- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
-@@ -31,7 +31,6 @@
- 
- #---static library needed for rootd and proofd --------------------------------------------
- add_library(rpdutil STATIC ${rpdutilsrcs})
--add_dependencies(rpdutil move_headers)
- 
- ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
- 
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
---- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
-@@ -436,17 +436,7 @@
-    if (fgWrksMax == -2) {
-       // Find the max number of workers, if any
-       TString sysname = "system.rootrc";
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sysname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
-       TEnv sysenv(0);
-       sysenv.ReadFile(s, kEnvGlobal);
-       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
-@@ -792,17 +782,9 @@
-       return -1;
-    }
-    // ROOTSYS
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
--#else
--   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
-    // Conf dir
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
--#else
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
-    // TMPDIR
-    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
-    // Log file in the log dir
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
---- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
-@@ -3026,13 +3026,7 @@
- #ifdef R__UNIX
-    // Add bindir to PATH
-    TString path(gSystem->Getenv("PATH"));
--   TString bindir;
--# ifdef ROOTBINDIR
--   bindir = ROOTBINDIR;
--# else
--   bindir = gSystem->Getenv("ROOTSYS");
--   if (!bindir.IsNull()) bindir += "/bin";
--# endif
-+   TString bindir(TROOT::GetBinDir());
-    // Augment PATH, if required
-    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
-    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
-diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
---- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
-@@ -78,13 +78,8 @@
- {
-    // Command to be executed
-    TString cmd;
--#ifdef R__HAVE_CONFIG
-    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
--#else
--   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
--#endif
-+            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
-             gSystem->GetPid(), gDebug);
-    // Execute
-    if (gSystem->Exec(cmd) != 0) {
-diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
---- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
-@@ -14,7 +14,7 @@
- # Generation and installation of the PAR files required by the benchmark 
- add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
--add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
-+add_dependencies(ProofBenchPARFiles move_artifacts)
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
-     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
-@@ -1331,11 +1331,7 @@
-       // Is it the default selector?
-       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("MakeDataSet", "uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
-@@ -26,6 +26,7 @@
- #include "TMap.h"
- #include "TProof.h"
- #include "TProofBenchTypes.h"
-+#include "TROOT.h"
- 
- 
- ClassImp(TProofBenchDataSet)
-@@ -145,11 +146,7 @@
-    TString selName("TSelHandleDataSet");
-    if (!TClass::GetClass(selName)) {
-       // Load the parfile
--#ifdef R__HAVE_CONFIG
--      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-       Info("Handle", "Uploading '%s' ...", par.Data());
-       if (fProof->UploadPackage(par) != 0) {
-          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
-@@ -275,11 +275,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelCPUDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
-@@ -163,11 +163,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelDataDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
---- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
-@@ -1005,49 +1005,48 @@
- 
-    if (argc > 0) {
-       gConfDir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTDATADIR
--      if (getenv("ROOTSYS")) {
--         gConfDir = getenv("ROOTSYS");
--         if (gDebug > 0)
--            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
--                      gConfDir.c_str());
--      } else {
--         Error(ErrFatal, -1, "main: no config directory specified");
--      }
--#else
--      gConfDir = ROOTDATADIR;
--#endif
-    }
--#ifdef ROOTBINDIR
--   gRootBinDir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
--#endif
- 
--   // Define gRootBinDir if not done already
--   if (!gRootBinDir.length())
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-+      if (!gConfDir.length()) {
-+         // try to guess the config directory...
-+         if (getenv("ROOTSYS")) {
-+            gConfDir = getenv("ROOTSYS");
-+            if (gDebug > 0)
-+               ErrorInfo("main: no config directory specified using"
-+                         " ROOTSYS (%s)", gConfDir.c_str());
-+         } else {
-+            Error(ErrFatal, -1, "main: no config directory specified");
-+         }
-+      }
-       gRootBinDir = std::string(gConfDir).append("/bin");
-+      rootetcdir = std::string(gConfDir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else  {
-+      if (!gConfDir.length())
-+         gConfDir = ROOTPREFIX;
-+      gRootBinDir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-+   }
-+#endif
- 
--   // make sure it contains the executable we want to run
-+   // make sure gRootBinDir contains the executable we want to run
-    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
-    if (access(arg0.c_str(), X_OK) == -1) {
-       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
-                         gConfDir.c_str());
-    }
--   // Make it available to all the session via env
-+   // Make gRootBinDir available to all the session via env
-    if (gRootBinDir.length()) {
-       char *tmp = new char[15 + gRootBinDir.length()];
-       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
-       putenv(tmp);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(gConfDir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp = new char[15 + rootetcdir.length()];
-       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
---- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
-@@ -384,11 +384,19 @@
-    } else {
-       // Check the ROOT dirs
-       if (fROOT.size() <= 0) {
-+         XrdOucString dir, bd, ld, id, dd;
- #ifdef R__HAVE_CONFIG
--         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
--                      id(ROOTINCDIR), dd(ROOTDATADIR);
--#else
--         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
-+         if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+            dir = getenv("ROOTSYS");
-+#ifdef R__HAVE_CONFIG
-+         else {
-+            dir = ROOTPREFIX;
-+            bd = ROOTBINDIR;
-+            ld = ROOTLIBDIR;
-+            id = ROOTINCDIR;
-+            dd = ROOTDATADIR;
-+         }
- #endif
-          // None defined: use ROOTSYS as default, if any; otherwise we fail
-          if (dir.length() > 0) {
-diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
---- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
-@@ -25,10 +25,4 @@
-                             WORLD_EXECUTE WORLD_READ
-                 DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
---- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
-@@ -8,9 +8,4 @@
- ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
-                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
- 
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
---- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -200,7 +200,6 @@
-    return 0;
- }
- 
--#ifndef ROOTPREFIX
- static const char *GetExePath()
- {
-    static std::string exepath;
-@@ -247,7 +246,6 @@
-       delete [] ep;
-    }
- }
--#endif
- 
- static void SetDisplay()
- {
-@@ -296,7 +294,9 @@
- 
- static void SetLibraryPath()
- {
--#ifndef ROOTLIBDIR
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Set library path for the different platforms.
- 
-    char *msg;
-@@ -343,6 +343,8 @@
-    }
- #  endif
-    putenv(msg);
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- 
-@@ -440,7 +442,9 @@
-    char **argvv;
-    char  arg0[kMAXPATHLEN];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Try to set ROOTSYS depending on pathname of the executable
-    SetRootSys();
- 
-@@ -449,6 +453,8 @@
-               argv[0], argv[0]);
-       return 1;
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // In batch mode don't show splash screen, idem for no logo mode,
-@@ -473,23 +479,20 @@
-    if (notebook) {
-       // Build command
- #ifdef ROOTBINDIR
--      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
--#else
--      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+      if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+#ifdef ROOTBINDIR
-+      else
-+         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
- #endif
- 
-       // Execute ROOT notebook binary
-       execl(arg0, arg0, NULL);
--  
-+
-       // Exec failed
--#ifndef ROOTBINDIR
--      fprintf(stderr,
--              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
--              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
--#else
--      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
--              argv[0], ROOTBINDIR, ROOTNBBINARY);
--#endif
-+      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
-+              argv[0], arg0);
- 
-       return 1;
-    }
-@@ -586,9 +589,12 @@
-    // Build argv vector
-    argvv = new char* [argc+2];
- #ifdef ROOTBINDIR
--   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
--#else
--   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+   if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+#ifdef ROOTBINDIR
-+   else
-+      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
- #endif
-    argvv[0] = arg0;
-    argvv[1] = (char *) "-splash";
-@@ -604,14 +610,8 @@
-    execv(arg0, argvv);
- 
-    // Exec failed
--#ifndef ROOTBINDIR
--   fprintf(stderr,
--           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
--           argv[0], getenv("ROOTSYS"), ROOTBINARY);
--#else
--   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
--           argv[0], ROOTBINDIR, ROOTBINARY);
--#endif
-+   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
-+           argv[0], arg0);
- 
-    return 1;
- }
-diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
---- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -475,14 +475,7 @@
-                   case M_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
---- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -1270,14 +1270,7 @@
- void TGRootIDE::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
-@@ -48,11 +48,7 @@
- ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
-@@ -31,11 +31,7 @@
- ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
---- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
-@@ -2049,14 +2049,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
---- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
-@@ -1017,14 +1017,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
diff --git a/root-testfiles.sh b/root-testfiles.sh
deleted file mode 100755
index e7160b8..0000000
--- a/root-testfiles.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-SITE="http://root.cern.ch/files"
-
-mkdir files
-pushd files
-
-wget -N ${SITE}/aleph_ref_4.root
-wget -N ${SITE}/aleph.root
-wget -N ${SITE}/alice3_ref_4.root
-wget -N ${SITE}/alice3.root
-wget -N ${SITE}/ams_ref_3.root
-wget -N ${SITE}/ams.root
-wget -N ${SITE}/babar2_ref_3.root
-wget -N ${SITE}/babar2.root
-wget -N ${SITE}/barres_ref_3.root
-wget -N ${SITE}/barres.root
-wget -N ${SITE}/belle_ref_3.root
-wget -N ${SITE}/belle.root
-wget -N ${SITE}/bes_ref_3.root
-wget -N ${SITE}/bes.root
-wget -N ${SITE}/brahms_ref_3.root
-wget -N ${SITE}/brahms.root
-wget -N ${SITE}/btev_ref_3.root
-wget -N ${SITE}/btev.root
-wget -N ${SITE}/cdf_ref_4.root
-wget -N ${SITE}/cdf.root
-wget -N ${SITE}/chambers_ref_3.root
-wget -N ${SITE}/chambers.root
-wget -N ${SITE}/cms_ref_3.root
-wget -N ${SITE}/cms.root
-wget -N ${SITE}/dubna_ref_3.root
-wget -N ${SITE}/dubna.root
-wget -N ${SITE}/e907_ref_3.root
-wget -N ${SITE}/e907.root
-wget -N ${SITE}/felix_ref_3.root
-wget -N ${SITE}/felix.root
-wget -N ${SITE}/ganil_ref_3.root
-wget -N ${SITE}/ganil.root
-wget -N ${SITE}/gem_ref_3.root
-wget -N ${SITE}/gem.root
-wget -N ${SITE}/hades2_ref_4.root
-wget -N ${SITE}/hades2.root
-wget -N ${SITE}/hermes_ref_3.root
-wget -N ${SITE}/hermes.root
-wget -N ${SITE}/integral_ref_3.root
-wget -N ${SITE}/integral.root
-wget -N ${SITE}/lhcbfull_ref_3.root
-wget -N ${SITE}/lhcbfull.root
-wget -N ${SITE}/na35_ref_3.root
-wget -N ${SITE}/na35.root
-wget -N ${SITE}/na47_ref_3.root
-wget -N ${SITE}/na47.root
-wget -N ${SITE}/na49_ref_3.root
-wget -N ${SITE}/na49.root
-wget -N ${SITE}/p326_ref_3.root
-wget -N ${SITE}/p326.root
-wget -N ${SITE}/phenix_ref_3.root
-wget -N ${SITE}/phenix.root
-wget -N ${SITE}/phobos2_ref_4.root
-wget -N ${SITE}/phobos2.root
-wget -N ${SITE}/sdc_ref_3.root
-wget -N ${SITE}/sdc.root
-wget -N ${SITE}/sld_ref_3.root
-wget -N ${SITE}/sld.root
-wget -N ${SITE}/star_ref_3.root
-wget -N ${SITE}/star.root
-wget -N ${SITE}/tesla_ref_3.root
-wget -N ${SITE}/tesla.root
-wget -N ${SITE}/wa91_ref_3.root
-wget -N ${SITE}/wa91.root
-
-wget -N ${SITE}/europe.root
-wget -N ${SITE}/linearIO.root
-wget -N ${SITE}/stressHistogram.5.18.00.root
-wget -N ${SITE}/stressRooFit_v534_ref.root
-wget -N ${SITE}/tmva_class_example.root
-wget -N ${SITE}/tmva_reg_example.root
-wget -N ${SITE}/usa.root
-
-for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
-
-popd
-
-tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-tildes.patch b/root-tildes.patch
deleted file mode 100644
index bb03674..0000000
--- a/root-tildes.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
---- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
-@@ -810,7 +810,7 @@
- ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
- /// ~~~
- ///  Note: We recommend using the method TDirectory::GetObject:
--/// ~~~ {.cpp}~
-+/// ~~~ {.cpp}
- ///      MyClass *obj = 0;
- ///      directory->GetObject("some object inheriting from MyClass",obj);
- ///      if (obj) { ... we found what we are looking for ... }
-diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
---- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
-@@ -1040,7 +1040,7 @@
- ///
- ///       TQObject::Connect("TGButton", "Clicked()",
- ///                         "TH2F", myHist, "Draw(Option_t*)");
--///~~~
-+/// ~~~
- /// cl == 0 - corresponds to function (interpereted or global)
- ///           the name of the function is defined by the slot string,
- ///           parameter receiver should be 0.
-diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -2677,7 +2677,7 @@
- /// We allow them to type:
- /// ~~~ {.cpp}
- ///  .X myfunc.C++(arg1,arg2)
--///  ~~~
-+/// ~~~
- /// or
- /// ~~~ {.cpp}
- ///  .X myfunc.C+(arg1,arg2)
-@@ -3843,7 +3843,7 @@
- /// the use of ';' to separate several instructions. However, shell specific
- /// construct should be avoided. In particular this description can contain
- /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- /// Five special variables will be expanded before execution:
- ///   Variable name       Expands to
- ///   -------------       ----------
-@@ -3915,7 +3915,7 @@
- /// IncludePath should contain the list of compiler flags to indicate where
- /// to find user defined header files. It is used to expand $IncludePath in
- /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
--/// ~~~ {.cpp}
-+///  ~~~ {.cpp}
- ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
- ///  ~~~
- /// the default value of IncludePath on Unix is:
-diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
---- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -663,7 +663,7 @@
- /// Create an array of clone objects of class cl. The class must inherit from
- /// TObject. If the class defines an own operator delete(), make sure that
- /// it looks like this:
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///    void MyClass::operator delete(void *vp)
- ///    {
- ///       if ((Long_t) vp != TObject::GetDtorOnly())
-diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
---- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
-@@ -321,7 +321,7 @@
- /// ~~~
- /// Otherwise override the `Print(Option_t *option, Int_t)`
- /// variant. Remember to declare:
--/// ~~~ {.cpp]
-+/// ~~~ {.cpp}
- ///   using TCollection::Print;
- /// ~~~
- /// somewhere close to the method declaration.
-diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
---- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
-@@ -189,7 +189,7 @@
-  int i;
-  i = TMath::LocMin(10, &v[0]);
-  std::cout << v[i] << std::endl;
-- ```
-+```
-  
- Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
- 
-@@ -233,7 +233,7 @@
- 
-  // old-style
-  mean = TMath::Mean(n, &v[0], &w[0]);
-- ```
-+```
-  
- ### Special and Statistical Functions.
- 
-diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
-@@ -5964,7 +5964,7 @@
- ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
- ///       TImage *im2 = TImage::Create();
- ///       im2->SetImageBuffer(&buf, TImage::kXpm);
--///  ~~~
-+/// ~~~
- ///      2.  xpm as an array of strings (pre-parsed)
- /// ~~~ {.cpp}
- ///    For example:
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -132,7 +132,7 @@
- because we clear only the pads and not the main canvas.
- Note that `c1->Update` must be called at the end of the first picture.
- 
--~~~ {.cpp}
-+ ~~~ {.cpp}
-      {
-         TFile *f1 = new TFile("hsimple.root");
-         TCanvas *c1 = new TCanvas("c1");
-diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
---- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -330,7 +330,7 @@
- ///    | 2-----|-3
- ///    |/      |/
- ///    1-------0
--///~~~
-+/// ~~~
- 
- void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
- {
-diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
---- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -71,7 +71,7 @@
- To change attributes of the rulers attached to the current Pad, one may
- query its pointer first:
- 
--~~~ {.cpp]
-+~~~ {.cpp}
- TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
- if (axis) {
-   TAxis3D::ToggleRulers()     // To pop axes down
-diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
---- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
-@@ -80,7 +80,7 @@
- many times.
- 
- The following very simple macro shows how to build and fill a `TH2Poly`:
--~~~ {.cpp]
-+~~~ {.cpp}
- {
-     TH2Poly *h2p = new TH2Poly();
- 
-diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
---- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
-@@ -2584,9 +2584,9 @@
- ///     T->Fill(); //loop
- ///     file->Write();
- ///     file->Close();
--///~~~
-+/// ~~~
- /// but do the following:
--///~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///     TFile *file = new TFile("myfile.root","recreate");
- ///     TTree *T = new TTree("T","title");
- ///     T->Fill(); //loop
-@@ -6487,7 +6487,7 @@
- /// ~~~ {.cpp}
- ///     TPrincipal *principal =
- ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
--///  ~~~
-+/// ~~~
- 
- TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
- {
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
-@@ -3004,6 +3004,7 @@
- /// The function return the status of the fit in the following form
- /// ~~~{.cpp}
- ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
-+/// ~~~
- /// -  The fitResult is 0 is the fit is OK.
- /// -  The fitResult is negative in case of an error not connected with the fit.
- /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
deleted file mode 100644
index 20209ec..0000000
--- a/root-tmath-doc.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
---- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
-@@ -359,9 +359,9 @@
- /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
- /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
- ///
--///  Begin_Latex
--///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
--///   End_Latex
-+///  \f[
-+///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
-+///  \f]
- ///
- ///
- ///--- Nve 14-nov-1998 UU-SAP Utrecht
-@@ -559,15 +559,16 @@
- /// see TMath::PoissonI to get a non-smooth function.
- /// Note that for large values of par, it is better to call
- ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
-+///   poisson->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Poisson(Double_t x, Double_t par)
- {
--/*
--<img src="gif/Poisson.gif">
--*/
--//End_Html
--
-    if (x<0)
-       return 0;
-    else if (x == 0.0)
-@@ -587,15 +588,17 @@
- /// compute the Poisson distribution function for (x,par)
- /// This is a non-smooth function.
- /// This function is equivalent to ROOT::Math::poisson_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
-+///   poissoni->SetNpx(1000);
-+///   poissoni->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::PoissonI(Double_t x, Double_t par)
- {
--/*
--<img src="gif/PoissonI.gif">
--*/
--//End_Html
--
-    Int_t ix = Int_t(x);
-    return Poisson(ix,par);
- }
-@@ -630,36 +633,33 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculates the Kolmogorov distribution function,
--///Begin_Html
-+/// \f[
-+/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
-+/// \f]
-+/// which gives the probability that Kolmogorov's test statistic will exceed
-+/// the value z assuming the null hypothesis. This gives a very powerful
-+/// test for comparing two one-dimensional distributions.
-+/// see, for example, Eadie et al, "statistocal Methods in Experimental
-+/// Physics', pp 269-270).
-+///
-+/// This function returns the confidence level for the null hypothesis, where:
-+///   z = dn*sqrt(n), and
-+///   dn  is the maximum deviation between a hypothetical distribution
-+///       function and an experimental distribution with
-+///   n   events
-+///
-+/// NOTE: To compare two experimental distributions with m and n events,
-+///       use z = sqrt(m*n/(m+n))*dn
-+///
-+/// Accuracy: The function is far too accurate for any imaginable application.
-+///           Probabilities less than 10^-15 are returned as zero.
-+///           However, remember that the formula is only valid for "large" n.
-+/// Theta function inversion formula is used for z <= 1
-+///
-+/// This function was translated by Rene Brun from PROBKL in CERNLIB.
- 
- Double_t TMath::KolmogorovProb(Double_t z)
- {
--   /*
--   <img src="gif/kolmogorov.gif">
--   */
--   //End_Html
--   // which gives the probability that Kolmogorov's test statistic will exceed
--   // the value z assuming the null hypothesis. This gives a very powerful
--   // test for comparing two one-dimensional distributions.
--   // see, for example, Eadie et al, "statistocal Methods in Experimental
--   // Physics', pp 269-270).
--   //
--   // This function returns the confidence level for the null hypothesis, where:
--   //   z = dn*sqrt(n), and
--   //   dn  is the maximum deviation between a hypothetical distribution
--   //       function and an experimental distribution with
--   //   n    events
--   //
--   // NOTE: To compare two experimental distributions with m and n events,
--   //       use z = sqrt(m*n/(m+n))*dn
--   //
--   // Accuracy: The function is far too accurate for any imaginable application.
--   //           Probabilities less than 10^-15 are returned as zero.
--   //           However, remember that the formula is only valid for "large" n.
--   // Theta function inversion formula is used for z <= 1
--   //
--   // This function was translated by Rene Brun from PROBKL in CERNLIB.
--
-    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
-    const Double_t w = 2.50662827;
-    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
-@@ -2254,15 +2254,40 @@
- /// The definition can be found in "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
- /// use now implementation in ROOT::Math::gamma_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
-+///
-+///   gdist->SetParameters(0.5, 0., 1.);
-+///   gdist->SetLineColor(2);
-+///   TF1 *gdist1 = gdist->DrawCopy("L");
-+///   gdist->SetParameters(1.0, 0., 1.);
-+///   gdist->SetLineColor(3);
-+///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(2.0, 0., 1.);
-+///   gdist->SetLineColor(4);
-+///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(5.0, 0., 1.);
-+///   gdist->SetLineColor(6);
-+///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
- {
--   /*
--   <img src="gif/gammadist.gif">
--   */
--   //End_Html
--
-    if ((x<mu) || (gamma<=0) || (beta <=0)) {
-       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
-       return 0;
-@@ -2308,21 +2333,47 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Computes the density of LogNormal distribution at point x.
- /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
--/// sigma is the shape parameter
--/// theta is the location parameter
--/// m is the scale parameter
-+/// - sigma is the shape parameter
-+/// - theta is the location parameter
-+/// - m is the scale parameter
- /// The formula was taken from "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
- /// Implementation using ROOT::Math::lognormal_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
-+///   logn->SetMinimum(1e-3);
-+///
-+///   logn->SetParameters(0.5, 0., 1.);
-+///   logn->SetLineColor(2);
-+///   TF1 *logn1 = logn->DrawCopy("L");
-+///   logn->SetParameters(1.0, 0., 1.);
-+///   logn->SetLineColor(3);
-+///   TF1 *logn2 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(2.0, 0., 1.);
-+///   logn->SetLineColor(4);
-+///   TF1 *logn3 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(5.0, 0., 1.);
-+///   logn->SetLineColor(6);
-+///   TF1 *logn4 = logn->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
- {
--   /*
--   <img src="gif/lognormal.gif">
--   */
--   //End_Html
--
-    if ((x<theta) || (sigma<=0) || (m<=0)) {
-       Error("TMath::Lognormal", "illegal parameter values");
-       return 0;
-@@ -2615,15 +2666,39 @@
- ///density function computed numerically in an accurate way: our approximation
- ///shows a difference of less than 3% around the peak of the density function, slowly
- ///increasing going towards the extreme tails to the right and to the left"
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
-+///
-+///   vavilov->SetParameters(0.5, 0.);
-+///   vavilov->SetLineColor(2);
-+///   TF1 *vavilov1 = vavilov->DrawCopy("L");
-+///   vavilov->SetParameters(0.3, 0.);
-+///   vavilov->SetLineColor(3);
-+///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.2, 0.);
-+///   vavilov->SetLineColor(4);
-+///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.1, 0.);
-+///   vavilov->SetLineColor(6);
-+///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
-+///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
- {
--/*
--<img src="gif/Vavilov.gif">
--*/
--//End_Html
--
-    Double_t *ac = new Double_t[14];
-    Double_t *hc = new Double_t[9];
- 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
deleted file mode 100644
index 95090d6..0000000
--- a/root-tprincipal-doc.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
-index 76bb5d4..d5bab47 100644
---- a/hist/hist/src/TPrincipal.cxx
-+++ b/hist/hist/src/TPrincipal.cxx
-@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
- error \f$E_N\f$ is minimized.
- 
- The transformation matrix to go from the pattern space to the feature
--space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
-+space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
- \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
- \f[
-   \mathsf{T} = \left[
-@@ -207,10 +207,6 @@ in the transformed space.
- Christian Holm August 2000, CERN
- */
- 
--// $Id$
--// $Date: 2006/05/24 14:55:26 $
--// $Author: brun $
--
- #include "TPrincipal.h"
- 
- #include "TVectorD.h"
-@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
- ClassImp(TPrincipal);
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Empty CTOR, Do not use.
-+/// Empty constructor. Do not use.
- 
- TPrincipal::TPrincipal()
-   : fMeanValues(0),
-@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Ctor. Argument is number of variables in the sample of data
-+/// Constructor. Argument is number of variables in the sample of data
- /// Options are:
--///   N       Normalize the covariance matrix (default)
--///   D       Store input data (default)
-+///  - N       Normalize the covariance matrix (default)
-+///  - D       Store input data (default)
- ///
- /// The created object is  named "principal" by default.
- 
-@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///copy constructor
-+/// Copy constructor.
- 
- TPrincipal::TPrincipal(const TPrincipal& pr) :
-   TNamed(pr),
-@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///assignement operator
-+/// Assignment operator.
- 
- TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- {
-@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// destructor
-+/// Destructor.
- 
- TPrincipal::~TPrincipal()
- {
-@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Html
-+/// Add a data point and update the covariance matrix. The input
-+/// array must be <TT>fNumberOfVariables</TT> long.
-+///
-+///
-+/// The Covariance matrix and mean values of the input data is calculated
-+/// on the fly by the following equations:
-+///
-+/// \f[
-+/// \left<x_i\right>^{(0)}  = x_{i0}
-+/// \f]
-+///
-+///
-+/// \f[
-+/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
-+/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
-+/// \f]
-+///
-+/// \f[
-+/// C_{ij}^{(0)} = 0
-+/// \f]
-+///
-+///
-+///
-+/// \f[
-+/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
-+/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
-+///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
-+/// - \frac1n C_{ij}^{(n-1)}
-+/// \f]
-+///
-+/// since this is a really fast method, with no rounding errors (please
-+/// refer to CERN 72-21 pp. 54-106).
-+///
-+///
-+/// The data is stored internally in a <TT>TVectorD</TT>, in the following
-+/// way:
-+///
-+/// \f[
-+/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
-+///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
-+/// \f]
-+///
-+/// With \f$P\f$ as defined in the class description.
- 
- void TPrincipal::AddRow(const Double_t *p)
- {
--  /*
--     </PRE>
--Add a data point and update the covariance matrix. The input
--array must be <TT>fNumberOfVariables</TT> long.
--
--<P>
--The Covariance matrix and mean values of the input data is caculated
--on the fly by the following equations:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(0)}  = x_{i0}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="90" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img36.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(0)} = x_{i0}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
--+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="302" HEIGHT="42" BORDER="0"
-- SRC="gif/principal_img37.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
--+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="62" HEIGHT="34" BORDER="0"
-- SRC="gif/principal_img38.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
--  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="504" HEIGHT="43" BORDER="0"
-- SRC="gif/principal_img39.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{i...
--...\left&lt;x_j\right&gt;^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--since this is a really fast method, with no rounding errors (please
--refer to CERN 72-21 pp. 54-106).
--
--<P>
--The data is stored internally in a <TT>TVectorD</TT>, in the following
--way:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="319" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img40.gif"
-- ALT="\begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--With <IMG
-- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
-- SRC="gif/principal_img6.gif"
-- ALT="$P$"> as defined in the class description.
--     <PRE>
--  */
--  // End_Html
-    if (!p)
-       return;
- 
-@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Generates the file <filename>, with .C appended if it does
-+/// Generates the file `<filename>`, with `.C` appended if it does
- /// argument doesn't end in .cxx or .C.
- ///
- /// The file contains the implementation of two functions
--///
-+/// ~~~ {.cpp}
- ///    void X2P(Double_t *x, Double *p)
- ///    void P2X(Double_t *p, Double *x, Int_t nTest)
--///
--/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
-+/// ~~~
-+/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
- /// respectively. Please refer to these methods.
- ///
- /// Further, the static variables:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    gNVariables
- ///    Double_t gEigenValues[]
- ///    Double_t gEigenVectors[]
- ///    Double_t gMeanValues[]
- ///    Double_t gSigmaValues[]
--///
-+/// ~~~
- /// are initialized. The only ROOT header file needed is Rtypes.h
- ///
- /// See TPrincipal::MakeRealCode for a list of options
-@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Make histograms of the result of the analysis.
- /// The option string say which histograms to create
--///      X         Histogram original data
--///      P         Histogram principal components corresponding to
--///                original data
--///      D         Histogram the difference between the original data
--///                and the projection of principal unto a lower
--///                dimensional subspace (2D histograms)
--///      E         Histogram the eigenvalues
--///      S         Histogram the square of the residues
--///                (see TPrincipal::SumOfSquareResidues)
--/// The histograms will be named <name>_<type><number>, where <name>
--/// is the first argument, <type> is one of X,P,D,E,S, and <number>
-+///     - X         Histogram original data
-+///     - P         Histogram principal components corresponding to
-+///                 original data
-+///     - D         Histogram the difference between the original data
-+///                 and the projection of principal unto a lower
-+///                 dimensional subspace (2D histograms)
-+///     - E         Histogram the eigenvalues
-+///     - S         Histogram the square of the residues
-+///                 (see `TPrincipal::SumOfSquareResiduals`)
-+/// The histograms will be named `<name>_<type><number>`, where `<name>`
-+/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
- /// is the variable.
- 
- void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
-@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD: Normalize the covariance matrix
-+/// Normalize the covariance matrix
- 
- void TPrincipal::MakeNormalised()
- {
-@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
- ////////////////////////////////////////////////////////////////////////////////
- /// Generate the file <classname>PCA.cxx which contains the
- /// implementation of two methods:
--///
-+/// ~~~ {.cpp}
- ///    void <classname>::X2P(Double_t *x, Double *p)
- ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
--///
-+/// ~~~
- /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
--/// respectivly. Please refer to these methods.
-+/// respectively. Please refer to these methods.
- ///
- /// Further, the public static members:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    <classname>::fgNVariables
- ///    Double_t <classname>::fgEigenValues[]
- ///    Double_t <classname>::fgEigenVectors[]
- ///    Double_t <classname>::fgMeanValues[]
- ///    Double_t <classname>::fgSigmaValues[]
--///
-+/// ~~~
- /// are initialized, and assumed to exist. The class declaration is
- /// assumed to be in <classname>.h and assumed to be provided by the
- /// user.
-@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
- /// See TPrincipal::MakeRealCode for a list of options
- ///
- /// The minimal class definition is:
--///
-+/// ~~~ {.cpp}
- ///   class <classname> {
- ///   public:
- ///     static Int_t    fgNVariables;
-@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
- ///     void X2P(Double_t *x, Double_t *p);
- ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
- ///   };
--///
-+/// ~~~
- /// Whether the methods <classname>::X2P and <classname>::P2X should
- /// be static or not, is up to the user.
- 
-@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Perform the principal components analysis.
- /// This is done in several stages in the TMatrix::EigenVectors method:
--/// * Transform the covariance matrix into a tridiagonal matrix.
--/// * Find the eigenvalues and vectors of the tridiagonal matrix.
-+///  - Transform the covariance matrix into a tridiagonal matrix.
-+///  - Find the eigenvalues and vectors of the tridiagonal matrix.
- 
- void TPrincipal::MakePrincipals()
- {
-@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
- /// This is the method that actually generates the code for the
- /// transformations to and from feature space and pattern space
- /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
-@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
- ////////////////////////////////////////////////////////////////////////////////
- /// Print the statistics
- /// Options are
--///      M            Print mean values of original data
--///      S            Print sigma values of original data
--///      E            Print eigenvalues of covariance matrix
--///      V            Print eigenvectors of covariance matrix
-+///  - M            Print mean values of original data
-+///  - S            Print sigma values of original data
-+///  - E            Print eigenvalues of covariance matrix
-+///  - V            Print eigenvectors of covariance matrix
- /// Default is MSE
- 
- void TPrincipal::Print(Option_t *opt) const
-@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
--/// Begin_html
-+/// Calculates the sum of the square residuals, that is
-+///
-+/// \f[
-+/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
-+/// \f]
-+///
-+/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
-+/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
-+/// \f$x_i\f$, the original data; I.e., the square distance to the space
-+/// spanned by \f$N\f$ eigenvectors.
- 
- void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
- {
--   /*
--    </PRE>
--    Calculates the sum of the square residuals, that is
--    <BR><P></P>
--    <DIV ALIGN="CENTER">
--
--    <!-- MATH
--    \begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}
--    -->
--
--
--    <IMG
--    WIDTH="147" HEIGHT="58" BORDER="0"
--    SRC="gif/principal_img52.gif"
--    ALT="\begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}">
--    </DIV>
--    <BR CLEAR="ALL">
--    <P></P>
--    where
--    <!-- MATH
--    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
--    -->
--    <IMG
--    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img53.gif"
--    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
--    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img54.gif"
--    ALT="$p_i$"> is the
--    <IMG
--    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img55.gif"
--    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
--    <IMG
--    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img56.gif"
--    ALT="$x_i$">, the original data; I.e., the square distance to the space
--    spanned by <IMG
--    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img12.gif"
--    ALT="$N$"> eigenvectors.
--    <BR>
--    <PRE>
--   */
--   // End_Html
-+
-    if (!x)
-       return;
- 
-@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculate the principal components from the original data vector
- /// x, and return it in p.
-+///
- /// It's the users responsibility to make sure that both x and p are
- /// of the right size (i.e., memory must be allocated for p).
- 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
deleted file mode 100644
index 4a4177b..0000000
--- a/root-tvector2-comment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
---- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
-@@ -96,7 +96,8 @@
-    TVector2 Rotate (Double_t phi) const;
- 
-                                         // returns phi angle in the interval [0,2*PI)
--   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
-+   static Double_t Phi_0_2pi(Double_t x);
-+
-                                         // returns phi angle in the interval [-PI,PI)
-    static Double_t Phi_mpi_pi(Double_t x);
- 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
deleted file mode 100644
index f4f3681..0000000
--- a/root-type1-embed.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
---- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
-@@ -30,14 +30,14 @@
- #ifndef LITTLE_ENDIAN
- #define LITTLE_ENDIAN 1
- #endif // LITTLE_ENDIAN
--#include "Byteswap.h"
--#define bswap_16(x)   Rbswap_16((x))
--#define bswap_32(x)   Rbswap_32((x))
- #else // R__BYTESWAP
- #ifdef LITTLE_ENDIAN
- #undef LITTLE_ENDIAN
- #endif // LITTLE_ENDIAN
- #endif // R__BYTESWAP
-+#include "Byteswap.h"
-+#define bswap_16(x)   Rbswap_16((x))
-+#define bswap_32(x)   Rbswap_32((x))
- 
- // References:
- //
-@@ -236,29 +236,26 @@
-       if(magic_number[0] == '\200') {
-          // IBM PC format printer font binary
- 
--         // FIXME: Maybe the real name can be parsed out of the
--         // file
--         font_name = "";
--
-          struct pfb_segment_header_s segment_header;
-          size_t offset = 0;
- 
--         segment_header.type = 0;
-+         // The two char elements of struct
-+         // pfb_segment_header_s are most likely aligned to
-+         // larger than 1 byte boundaries, so copy all the
-+         // elements individually
-+         segment_header.always_128 = font_data[offset];
-+         segment_header.type = font_data[offset + 1];
-+
-          while (segment_header.type != TYPE_EOF) {
--            // The two char elements of struct
--            // pfb_segment_header_s are most likely aligned to
--            // larger than 1 byte boundaries, so copy all the
--            // elements individually
--            segment_header.always_128 = font_data[offset];
--            segment_header.type = font_data[offset + 1];
-             memcpy(&segment_header.length, &font_data[offset + 2],
-                    sizeof(unsigned int));
-             offset += sizeof(unsigned int) + 2;
--#ifdef LITTLE_ENDIAN
-+#ifndef LITTLE_ENDIAN
-             segment_header.length =
-             bswap_32(segment_header.length);
- #endif // LITTLE_ENDIAN
-             char *buffer = new char[segment_header.length];
-+            char *fname;
- 
-             memcpy(buffer, &font_data[offset],
-                    segment_header.length);
-@@ -278,6 +275,26 @@
-                      buffer[segment_header.length - 1] = '\n';
-                   }
-                   ret.append(buffer, segment_header.length);
-+
-+                  fname = (char*)memmem(buffer, segment_header.length,
-+                                        "/FontName", 9);
-+                  if (fname) {
-+                     fname += 9;
-+                     while (fname < buffer + segment_header.length &&
-+                            isspace(*fname)) {
-+                        fname++;
-+                     }
-+                     if (fname < buffer + segment_header.length &&
-+                         *fname == '/') {
-+                        fname++;
-+                     }
-+                     int len = 0;
-+                     while (fname + len < buffer + segment_header.length &&
-+                            isgraph(*(fname + len))) {
-+                        len++;
-+                     }
-+                     font_name.assign(fname, len);
-+                  }
-                   break;
-                case TYPE_BINARY:
-                   append_asciihex(
-@@ -289,6 +306,9 @@
-             }
- 
-             delete [] buffer;
-+
-+            segment_header.always_128 = font_data[offset];
-+            segment_header.type = font_data[offset + 1];
-          }
- 
-          return ret;
diff --git a/root-unuran.patch b/root-unuran.patch
deleted file mode 100644
index 0e78176..0000000
--- a/root-unuran.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
---- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
-@@ -0,0 +1,21 @@
-+# - Locate Unuran library
-+# Defines:
-+#
-+#  UNURAN_FOUND
-+#  UNURAN_INCLUDE_DIR
-+#  UNURAN_INCLUDE_DIRS (not cached)
-+#  UNURAN_LIBRARIES
-+
-+find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
-+find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
-+
-+set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
-+set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
-+
-+mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-@@ -73,6 +73,7 @@
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-+ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
- ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
- ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
- ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -142,6 +142,11 @@
- set(zliblib ${ZLIB_LIBRARY})
- set(zlibincdir ${ZLIB_INCLUDE_DIR})
- 
-+set(builtinunuran ${value${builtin_unuran}})
-+set(unuranlibdir ${UNURAN_LIBRARY_DIR})
-+set(unuranlib ${UNURAN_LIBRARY})
-+set(unuranincdir ${UNURAN_INCLUDE_DIR})
-+
- set(buildgl ${value${opengl}})
- set(opengllibdir ${OPENGL_LIBRARY_DIR})
- set(openglulib ${OPENGL_glu_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -40,6 +40,16 @@
-   endif()
- endif()
- 
-+#---Check for Unuran ------------------------------------------------------------------
-+if(NOT builtin_unuran)
-+  message(STATUS "Looking for Unuran")
-+  find_Package(Unuran)
-+  if(NOT UNURAN_FOUND)
-+    message(STATUS "Unuran not found. Switching on builtin_unuran option")
-+    set(builtin_unuran ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Freetype---------------------------------------------------------------
- if(NOT builtin_freetype)
-   message(STATUS "Looking for Freetype")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-@@ -121,6 +121,11 @@
- 
- BUILTINPCRE    := @builtinpcre@
- 
-+BUILTINUNURAN  := @builtinunuran@
-+UNURANLIBDIR   := @unuranlibdir@
-+UNURANLIB      := @unuranlib@
-+UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
-+
- BUILTINZLIB    := @builtinzlib@
- ZLIBLIBDIR     := @zliblibdir@
- ZLIBCLILIB     := @zliblib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
-+++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
-@@ -55,6 +55,7 @@
-    enable_builtin_freetype   \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-+   enable_builtin_unuran     \
-    enable_builtin_zlib       \
-    enable_builtin_lzma       \
-    enable_builtin_llvm       \
-@@ -183,6 +184,7 @@
- enable_builtin_ftgl=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
-+enable_builtin_unuran=no
- enable_builtin_zlib=no
- enable_builtin_lzma=no
- enable_builtin_llvm=yes
-@@ -1704,6 +1706,7 @@
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-+  builtin-unuran     Build included libunuran, or use system libunuran
-   builtin-zlib       Build included libz, or use system libz
-   builtin-lzma       Build included liblzma, or use system liblzma
-   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
-@@ -2046,6 +2049,7 @@
-    enable_builtin_ftgl="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-+   enable_builtin_unuran="yes"
-    enable_builtin_zlib="yes"
-    enable_builtin_lzma="yes"
-    top_builddir=`cygpath -u $top_builddir`
-@@ -3210,6 +3214,38 @@
- 
- ######################################################################
- #
-+### echo %%% libunuran (builtin or system)
-+#
-+if test "x$enable_builtin_unuran" = "xno" ; then
-+    check_header "unuran.h" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_unuran=yes
-+    else
-+        unuraninc=$found_hdr
-+        unuranincdir=$found_dir
-+    fi
-+
-+    check_library "libunuran" "$enable_shared" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        unuranlib=""
-+        unuranlibdir=""
-+        enable_builtin_unuran="yes"
-+    else
-+        unuranlib="$found_lib"
-+        unuranlibdir="$found_dir"
-+    fi
-+
-+    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
-+        enable_builtin_unuran="yes"
-+    fi
-+fi
-+message "Checking whether to build included unuran"
-+result "$enable_builtin_unuran"
-+
-+######################################################################
-+#
- ### echo %%% Use included zLib or use systems
- #
- if test "x$enable_builtin_zlib" = "xno" ; then
-@@ -7720,6 +7756,10 @@
-     -e "s|@top_srcdir@|$top_srcdir|"            \
-     -e "s|@ttffontdir@|$fontdir|"               \
-     -e "s|@tutdir@|$tutdir|"                    \
-+    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
-+    -e "s|@unuranincdir@|$unuranincdir|"        \
-+    -e "s|@unuranlib@|$unuranlib|"              \
-+    -e "s|@unuranlibdir@|$unuranlibdir|"        \
-     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
-     -e "s|@xmlincdir@|$xmlincdir|"              \
-     -e "s|@xmllib@|$xmllib|"                    \
-diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
---- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
-@@ -3,6 +3,9 @@
- ############################################################################
- 
- #---Define package related variables-----------------------------------------------------------------
-+
-+if(builtin_unuran)
-+
- set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
- set(UNR_VERSION "1.8.0-root")
- set(UNR_TARNAME "unuran-${UNR_VERSION}")
-@@ -62,8 +65,17 @@
-                ${UNR_UNTARDIR}/src/tests/*.c
-                ${UNR_UNTARDIR}/src/uniform/*.c
-                ${UNR_UNTARDIR}/src/urng/*.c )
-+set(unrconfig ${UNR_UNTARDIR}/config.h)
-+
-+else()
-+
-+include_directories(${UNURAN_INCLUDE_DIRS})
-+set(unrsources)
-+set(unrconfig)
-+
-+endif()
- 
- ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
- 
--ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
-+ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
---- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
-@@ -12,6 +12,8 @@
- UNURANDIRS   := $(UNURANDIR)/src
- UNURANDIRI   := $(UNURANDIR)/inc
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- UNRVERS      := unuran-1.8.0-root
- 
- UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
-@@ -43,15 +45,18 @@
-                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
- endif
--UNRO         := $(UNRS:.c=.o)
-+UNRFLAGS     := -I$(UNRDIRS)/src
- 
--ifeq ($(PLATFORM),win32)
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
- else
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
-+
-+UNURANETAG   :=
-+UNRCFG       :=
-+UNRS         :=
-+UNRFLAGS     := $(UNURANINCDIR:%=-I%)
-+
- endif
- 
--UNRFLAGS     :=  -I$(UNRDIRS)/src
-+UNRO         := $(UNRS:.c=.o)
- 
- ##### libUnuran #####
- UNURANL      := $(MODDIRI)/LinkDef.h
-@@ -84,6 +89,8 @@
- include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
- 		cp $< $@
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- $(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
-@@ -134,12 +141,14 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
-+endif
-+
- $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
- 
- $(call pcmrule,UNURAN)
- 	$(noop)
-@@ -158,16 +167,19 @@
- 
- clean-$(MODNAME):
- 		@rm -f $(UNURANO) $(UNURANDO)
-+ifeq ($(BUILTINUNURAN),yes)
- 		-@(if [ -d $(UNRDIRS) ]; then \
- 			cd $(UNRDIRS); \
- 			$(MAKE) clean; \
- 		fi)
-+endif
- 
- clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
- 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
-+ifeq ($(BUILTINUNURAN),yes)
- 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
- ifeq ($(UNURKEEP),yes)
- 		@mv $(UNRDIRS) $(UNRDIRS).keep
-@@ -177,6 +189,7 @@
- 		@mv $(UNRDIRS).keep $(UNRDIRS)
- endif
- 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
-+endif
- 
- distclean::     distclean-$(MODNAME)
- 
-@@ -184,6 +197,7 @@
- 
- $(UNURANO): CXXFLAGS += $(UNRFLAGS)
- 
-+ifeq ($(BUILTINUNURAN),yes)
- ifeq ($(PLATFORM),win32)
- $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
- else
-@@ -194,3 +208,4 @@
- ifeq ($(CC),icc)
- $(UNRO): CFLAGS += -mp
- endif
-+endif
diff --git a/root-werror.patch b/root-werror.patch
deleted file mode 100644
index 06e49f1..0000000
--- a/root-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
-@@ -40,7 +40,7 @@
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
- 
- #---Do not transform warnings in errors-------------------------------------------------------------
--string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- 
- #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root.spec b/root.spec
deleted file mode 100644
index 1078ad4..0000000
--- a/root.spec
+++ /dev/null
@@ -1,3462 +0,0 @@
-%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
-
-# Ruby support not yet ported to root version 6
-%global ruby 0
-
-%global oce 1
-%global pythia8 1
-%global xrootd 1
-
-%if %{?fedora}%{!?fedora:0} >= 20
-# libhdfs is currently only available on intel architectures in Fedora
-%ifarch %{ix86} x86_64
-%global hadoop 1
-%else
-%global hadoop 0
-%endif
-%else
-%global hadoop 0
-%endif
-
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-# Do not create .orig files when patching source
-%global _default_patch_flags --no-backup-if-mismatch
-
-Name:		root
-Version:	6.06.06
-%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
-Summary:	Numerical data analysis framework
-
-License:	LGPLv2+
-URL:		https://root.cern.ch/
-#		The upstream source is modified to exclude proprietary fonts:
-#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
-#		tar -z -x -f root_v%{version}.source.tar.gz
-#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
-#		tar -J -c -f root-%{version}.tar.xz root-%{version}
-Source0:	%{name}-%{version}.tar.xz
-#		Input data for the tests
-Source1:	%{name}-testfiles.tar.xz
-#		Script to generate above source
-Source2:	%{name}-testfiles.sh
-#		Adapt to gcc's ABI tags
-#		https://github.com/root-mirror/root/pull/124
-Patch0:		%{name}-abitags.patch
-#		Allow running tests
-#		https://github.com/root-mirror/root/pull/130
-Patch1:		%{name}-test-install.patch
-#		Use system fonts
-Patch2:		%{name}-fontconfig.patch
-#		Fix segfault when embedding Type 1 fonts
-#		https://github.com/root-mirror/root/pull/90
-Patch3:		%{name}-type1-embed.patch
-#		Don't link to libjvm (handled properly inside libhdfs)
-Patch4:		%{name}-dont-link-jvm.patch
-#		Remove gcc ABI check
-#		with the abitags patch above it is not needed
-Patch5:		%{name}-no-abi-check.patch
-#		Public header #includes private header
-#		https://github.com/root-mirror/root/pull/88
-Patch6:		%{name}-private-public.patch
-#		Fix problems with the cmake configuration
-Patch7:		%{name}-broken-cmake-config.patch
-#		Missing stuff in the cmake configuration
-Patch8:		%{name}-missing-cmake-config.patch
-#		Fix broken deprecation check (configure)
-Patch9:		%{name}-deprecated-options.patch
-#		Only link to libgfortranbegin.a if it exists (configure)
-Patch10:	%{name}-libgfortranbegin.patch
-#		Make sure the removal of -Werror doesn't do more than intended
-Patch11:	%{name}-werror.patch
-#		Properly remove -Wall (must also remove Werror=*)
-Patch12:	%{name}-compiledata.patch
-#		Don't overwrite FFLAGS
-Patch13:	%{name}-fflags.patch
-#		Use system unuran
-Patch14:	%{name}-unuran.patch
-#		Use systme gl2ps
-Patch15:	%{name}-gl2ps.patch
-#		More CMAKE_Fortran_FLAGS case issues
-Patch16:	%{name}-more-fflags.patch
-#		Use the same soname for cmake and configure
-Patch17:	%{name}-soname.patch
-#		Save memory during build
-Patch18:	%{name}-save-memory.patch
-#		Fix build configuration for ppc64/ppc64le
-Patch19:	%{name}-ppc64.patch
-#		Fix build configuration for ARM
-Patch20:	%{name}-arm.patch
-#		Fix build configuration for s390/s390x
-Patch21:	%{name}-s390x.patch
-#		Always build the bundled llvm as static libraries
-Patch22:	%{name}-llvm-static.patch
-
-#		Documentation fixes
-
-#		Fixes for doxygen parsing issues:
-#		- warning: Found ';' while parsing initializer list
-#		- warning: Illegal member name found
-#		- warning: no matching file member found for ClassImp()
-#		- warning: documented symbol 'X' was not declared or defined
-Patch23:	%{name}-doxyfile.patch
-#		Improvements to the doxygen filter
-Patch24:	%{name}-dox-filter.patch
-#		Align macros so the doxygen filter works
-Patch25:	%{name}-macro-align.patch
-#		Fix broken ~~~ for doxygen
-#		https://github.com/root-mirror/root/pull/127
-Patch26:	%{name}-tildes.patch
-#		Convert old latex markup to doxygen
-Patch27:	%{name}-latex-markup.patch
-#		Remove some old html markup
-Patch28:	%{name}-html-markup.patch
-#		Fix broken links (cernlib, clhep, geant)
-Patch29:	%{name}-links.patch
-#		Remove duplicated comment
-Patch30:	%{name}-tvector2-comment.patch
-#		Remove links to tutorial macro results
-Patch31:	%{name}-see-macro-output.patch
-#		Fix TMath doxygen
-Patch32:	%{name}-tmath-doc.patch
-#		Fix cernlib doxygen
-Patch33:	%{name}-cernlib-doc.patch
-#		Backported doxygen updates for TPrincipal class
-Patch34:	%{name}-tprincipal-doc.patch
-#		Don't run gui macros
-Patch35:	%{name}-avoid-gui-crash.patch
-#		Doxygen warnings
-Patch36:	%{name}-doxygen-warnings.patch
-
-#		Test fixes
-
-#		User files in source tree during tests
-Patch37:	%{name}-template-files.patch
-#		Use cache read option
-Patch38:	%{name}-cache-test.patch
-#		Fixes for tests on ix86
-Patch39:	%{name}-32bit.patch
-#		Fixes for stressGraphics.ref
-Patch40:	%{name}-stressgraphics.patch
-#		Don't download testdata
-Patch41:	%{name}-no-testdata.patch
-#		Avoid using std::bind with lambdas (fixed upstream)
-Patch42:	%{name}-avoid-std-bind-lambda.patch
-
-#		s390 is not supported by cling: "error: unknown target
-#		triple 's390-ibm-linux', please use -triple or -arch"
-ExcludeArch:	s390
-#		ppc/ppc64/ppc64le does not yet work
-#		https://sft.its.cern.ch/jira/browse/ROOT-6434
-#		https://sft.its.cern.ch/jira/browse/ROOT-7314
-ExcludeArch:	ppc %{power64}
-
-BuildRequires:	cmake
-BuildRequires:	libX11-devel
-BuildRequires:	libXpm-devel
-BuildRequires:	libXft-devel
-BuildRequires:	libXext-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel
-BuildRequires:	fcgi-devel
-BuildRequires:	ftgl-devel
-BuildRequires:	glew-devel
-BuildRequires:	gl2ps-devel
-BuildRequires:	pcre-devel
-BuildRequires:	zlib-devel
-BuildRequires:	xz-devel
-BuildRequires:	libAfterImage-devel >= 1.20
-BuildRequires:	ncurses-devel
-BuildRequires:	avahi-compat-libdns_sd-devel
-BuildRequires:	avahi-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	fftw-devel
-BuildRequires:	gsl-devel
-BuildRequires:	unuran-devel
-BuildRequires:	krb5-devel
-BuildRequires:	krb5-workstation
-BuildRequires:	openldap-devel
-BuildRequires:	mysql-devel
-BuildRequires:	sqlite-devel
-BuildRequires:	unixODBC-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libGLU-devel
-BuildRequires:	postgresql-devel
-BuildRequires:	python-devel
-%if %{?fedora}%{!?fedora:0} >= 15
-BuildRequires:	python3-devel
-%global python3pkg python3
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
-BuildRequires:	python34-devel
-%global python3pkg python34
-%endif
-BuildRequires:	qt4-devel
-%if %{ruby}
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
-%endif
-BuildRequires:	openssl-devel
-BuildRequires:	globus-gss-assist-devel
-BuildRequires:	globus-gsi-credential-devel
-BuildRequires:	globus-proxy-utils
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	dcap-devel
-BuildRequires:	dpm-devel
-%if %{xrootd}
-BuildRequires:	xrootd-client-devel >= 1:3.3.5
-BuildRequires:	xrootd-private-devel >= 1:3.3.5
-%endif
-BuildRequires:	cfitsio-devel
-BuildRequires:	davix-devel >= 0.2.8
-BuildRequires:	gfal2-devel
-BuildRequires:	srm-ifce-devel
-%if %{hadoop}
-BuildRequires:	hadoop-devel
-%endif
-%if %{oce}
-BuildRequires:	OCE-devel
-%endif
-BuildRequires:	R-Rcpp-devel
-BuildRequires:	R-RInside-devel
-BuildRequires:	readline-devel
-BuildRequires:	tbb-devel
-BuildRequires:	emacs
-BuildRequires:	emacs-el
-BuildRequires:	gcc-c++
-BuildRequires:	gcc-gfortran
-BuildRequires:	graphviz-devel
-BuildRequires:	expat-devel
-%if %{pythia8}
-BuildRequires:	pythia8-devel >= 8.1.80
-%endif
-BuildRequires:	numpy
-BuildRequires:	dos2unix
-BuildRequires:	doxygen
-BuildRequires:	graphviz
-BuildRequires:	perl-generators
-#		Some of the tests call lsb_release
-BuildRequires:	redhat-lsb-core
-BuildRequires:	font(freesans)
-BuildRequires:	font(freeserif)
-BuildRequires:	font(freemono)
-#		Provides "symbol" and "dingbats"
-BuildRequires:	urw-fonts
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
-BuildRequires:	font(droidsansfallback)
-%endif
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	hicolor-icon-theme
-Requires:	emacs-filesystem >= %{_emacs_version}
-Provides:	emacs-%{name} = %{version}-%{release}
-Provides:	emacs-%{name}-el = %{version}-%{release}
-Obsoletes:	emacs-%{name} < 5.34.28
-Obsoletes:	emacs-%{name}-el < 5.34.28
-
-%description
-The ROOT system provides a set of object oriented frameworks with all
-the functionality needed to handle and analyze large amounts of data
-in a very efficient way. Having the data defined as a set of objects,
-specialized storage methods are used to get direct access to the
-separate attributes of the selected objects, without having to touch
-the bulk of the data. Included are histograming methods in an
-arbitrary number of dimensions, curve fitting, function evaluation,
-minimization, graphics and visualization classes to allow the easy
-setup of an analysis system that can query and process the data
-interactively or in batch mode, as well as a general parallel
-processing framework, PROOF, that can considerably speed up an
-analysis.
-
-Thanks to the built-in C++ interpreter cling, the command, the
-scripting and the programming language are all C++. The interpreter
-allows for fast prototyping of the macros since it removes the, time
-consuming, compile/link cycle. It also provides a good environment to
-learn C++. If more performance is needed the interactively developed
-macros can be compiled using a C++ compiler via a machine independent
-transparent compiler interface called ACliC.
-
-The system has been designed in such a way that it can query its
-databases in parallel on clusters of workstations or many-core
-machines. ROOT is an open system that can be dynamically extended by
-linking external libraries. This makes ROOT a premier platform on
-which to build data acquisition, simulation and data analysis systems.
-
-%package icons
-Summary:	ROOT icon collection
-BuildArch:	noarch
-Requires:	%{name}-core = %{version}-%{release}
-
-%description icons
-This package contains icons used by the ROOT GUI.
-
-%package fonts
-Summary:	ROOT font collection
-BuildArch:	noarch
-%if %{?rhel}%{!?rhel:0}
-#		STIX version 0.9 and Driod Sans Fallback
-License:	OFL and ASL 2.0
-%else
-#		STIX version 0.9 only
-License:	OFL
-%endif
-Requires:	%{name}-core = %{version}-%{release}
-
-%description fonts
-This package contains fonts used by ROOT that are not available in Fedora.
-In particular it contains STIX version 0.9 that is used by TMathText.
-%if %{?rhel}%{!?rhel:0}
-For EPEL it also provides the Google Droid Sans Fallback font.
-%endif
-
-%package doc
-Summary:	Documentation for the ROOT system
-BuildArch:	noarch
-License:	LGPLv2+ and GPLv2+ and BSD
-Requires:	mathjax
-
-%description doc
-This package contains the automatically generated ROOT class
-documentation.
-
-%package tutorial
-Summary:	ROOT tutorial scripts and test suite
-BuildArch:	noarch
-Requires:	%{name} = %{version}-%{release}
-
-%description tutorial
-This package contains the tutorial scripts and test suite for ROOT.
-
-%package core
-Summary:	ROOT core libraries
-License:	LGPLv2+ and BSD
-Requires:	%{name}-fonts = %{version}-%{release}
-Requires:	%{name}-icons = %{version}-%{release}
-#		Dynamic dependencies
-Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
-Requires:	xorg-x11-fonts-ISO8859-1-75dpi
-Requires:	font(freesans)
-Requires:	font(freeserif)
-Requires:	font(freemono)
-#		Provides "symbol" and "dingbats"
-Requires:	urw-fonts
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
-Requires:	font(droidsansfallback)
-%endif
-%if %{ruby} == 0
-Obsoletes:	%{name}-ruby < 6.00.00
-%endif
-%if %{hadoop} == 0
-Obsoletes:	%{name}-io-hdfs < 6.06.04-2
-%endif
-
-%description core
-This package contains the core libraries used by ROOT: libCore, libNew,
-libRint and libThread.
-
-%package multiproc
-Summary:	Multi-processor support for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description multiproc
-This package provides ROOT's multi-processor support library: libMultiProc.
-
-%package cling
-Summary:	Cling C++ interpreter
-License:	NCSA and (NCSA or LGPLv2+)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-#		Root's cling interpreter uses a particular git commit of
-#		llvm and clang with application specific changes. It does
-#		not work with the system libraries. The bundled llvm and
-#		clang are compiled using -fvisibility=hidden, and are not
-#		visible outside of the libCling module.
-Requires:	gcc-c++
-Requires:	redhat-rpm-config
-Provides:	bundled(clang-libs)
-Provides:	bundled(llvm-libs)
-Obsoletes:	%{name}-cint7 < 5.26.00c
-Obsoletes:	%{name}-cint < 6.00.00
-Obsoletes:	%{name}-cintex < 6.00.00
-Obsoletes:	%{name}-reflex < 6.00.00
-
-%description cling
-Cling is an interactive C++ interpreter, built on top of Clang and
-LLVM compiler infrastructure.
-
-%package proofd
-Summary:	Parallel ROOT Facility - distributed, parallel computing
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
-
-%description proofd
-This package contains the PROOF server. Proofd is the core daemon of
-the PROOF (Parallel ROOT Facility) system for distributed parallel
-computing. Installing this package on a machine makes it possible
-for the machine to participate in a parallel computing farm (cluster
-or via the Internet), either as a master or a slave, using a
-transparent interface.
-
-%package rootd
-Summary:	ROOT remote file server
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
-
-%description rootd
-This package contains the ROOT file server. Rootd is a server for ROOT
-files, serving files over the Internet. Using this daemon, you can
-access files on the machine from anywhere on the Internet, using a
-transparent interface.
-
-%package python
-Summary:	Python extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description python
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
-%package %{python3pkg}
-Summary:	Python extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description %{python3pkg}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
-%if %{ruby}
-%package ruby
-Summary:	Ruby extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Provides:	ruby(libRuby) = %{version}
-
-%description ruby
-This package contains the Ruby extension for ROOT. The interface
-goes both ways - that is, you can call ROOT functions from Ruby, and
-invoke the Ruby interpreter from ROOT.
-%endif
-
-%package r
-Summary:	R interface for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description r
-ROOT R is an interface in ROOT to call R functions using an R C++
-interface. This interface opens the possibility in ROOT to use the
-very large set of mathematical and statistical tools provided by R.
-With ROOT R you can perform a conversion from ROOT's C++ objects to
-R's objects, transform the returned R objects into ROOT's C++ objects,
-then the R functionality can be used directly for statistical studies
-in ROOT.
-
-%package r-tools
-Summary:	R Tools
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-r%{?_isa} = %{version}-%{release}
-
-%description r-tools
-This package contains a minimizer module for ROOT that uses the ROOT
-R interface.
-
-%package genetic
-Summary:	Genetic algorithms for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description genetic
-This package contains a genetic minimizer module for ROOT.
-
-%package geom
-Summary:	Geometry library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description geom
-This package contains a library for defining geometries in ROOT.
-
-%package gdml
-Summary:	GDML import/export for ROOT geometries
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-
-%description gdml
-This package contains an import/export module for ROOT geometries.
-
-%if %{oce}
-%package geocad
-Summary:	OpenCascade import/export for ROOT geometries
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-
-%description geocad
-This package contains an import/export module for ROOT geometries.
-%endif
-
-%package graf
-Summary:	2D graphics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf
-This package contains the 2-dimensional graphics library for ROOT.
-
-%package graf-asimage
-Summary:	AfterImage graphics renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf-asimage
-This package contains the AfterImage renderer for ROOT, which allows
-you to store output graphics in many formats, including JPEG, PNG and
-TIFF.
-
-%package graf-fitsio
-Summary:	ROOT interface for the Flexible Image Transport System (FITS)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description graf-fitsio
-This package contains a library for using the Flexible Image Transport
-System (FITS) data format in root.
-
-%package graf-gpad
-Summary:	Canvas and pad library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
-
-%description graf-gpad
-This package contains a library for canvas and pad manipulations.
-
-%package graf-gviz
-Summary:	Graphviz 2D library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description graf-gviz
-This package contains the 2-dimensional graphviz library for ROOT.
-
-%package graf-postscript
-Summary:	Postscript/PDF renderer library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-
-%description graf-postscript
-This package contains a library for ROOT, which allows rendering
-postscript and PDF output.
-
-%package graf-qt
-Summary:	Qt renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-
-%description graf-qt
-This package contains the Qt renderer for ROOT.
-
-%package graf-x11
-Summary:	X window system renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-
-%description graf-x11
-This package contains the X11 renderer for ROOT, which allows using an
-X display for showing graphics.
-
-%package graf3d
-Summary:	Basic 3D shapes library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description graf3d
-This library contains the basic 3D shapes and classes for ROOT. For
-a more full-blown geometry library, see the root-geom package.
-
-%package graf3d-eve
-Summary:	Event display library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description graf3d-eve
-This package contains a library for defining event displays in ROOT.
-
-%package graf3d-gl
-Summary:	GL renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description graf3d-gl
-This package contains the GL renderer for ROOT. This library provides
-3D rendering of volumes and shapes defined in ROOT, as well as 3D
-rendering of histograms, and similar. Included is also a high quality
-3D viewer for ROOT defined geometries.
-
-%package graf3d-gviz3d
-Summary:	Graphviz 3D library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-
-%description graf3d-gviz3d
-This package contains the 3-dimensional graphviz library for ROOT.
-
-%package graf3d-x3d
-Summary:	X 3D renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-
-%description graf3d-x3d
-This package contains the X 3D renderer for ROOT. This library provides
-3D rendering of volumes and shapes defined in ROOT. Included is also
-a low quality 3D viewer for ROOT defined geometries.
-
-%package gui
-Summary:	GUI library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-#		Dynamic dependencies
-Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-
-%description gui
-This package contains a library for defining graphical user interfaces.
-
-%package gui-fitpanel
-Summary:	GUI element for fits in ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description gui-fitpanel
-This package contains a library to show a pop-up dialog when fitting
-various kinds of data.
-
-%package gui-ged
-Summary:	GUI element for editing various ROOT objects
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description gui-ged
-This package contains a library to show a pop-up window for editing
-various ROOT objects.
-
-%package guibuilder
-Summary:	GUI editor library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description guibuilder
-This package contains a library for editing graphical user interfaces
-in ROOT.
-
-%package gui-qt
-Summary:	Qt GUI for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-
-%description gui-qt
-This package contains the Qt GUI for ROOT.
-
-%package gui-recorder
-Summary:	Interface for recording and replaying events in ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description gui-recorder
-This library provides interface for recording and replaying events in ROOT.
-Recorded events are:
- - Commands typed by user in command line ('new TCanvas')
- - GUI events (mouse movement, button clicks, ...)
-All the recorded events from one session are stored in one TFile
-and can be replayed again anytime.
-
-%package hbook
-Summary:	Hbook library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description hbook
-This package contains the Hbook library for ROOT, allowing you to
-access legacy Hbook files (NTuples and Histograms from PAW).
-
-%package hist
-Summary:	Histogram library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
-
-%description hist
-This package contains a library for histogramming in ROOT.
-
-%package hist-painter
-Summary:	Histogram painter plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description hist-painter
-This package contains a painter of histograms for ROOT.
-
-%package spectrum
-Summary:	Spectra analysis library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description spectrum
-This package contains the Spectrum library for ROOT.
-
-%package spectrum-painter
-Summary:	Spectrum painter plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description spectrum-painter
-This package contains a painter of spectra for ROOT.
-
-%package hist-factory
-Summary:	RooFit PDFs from ROOT histograms
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description hist-factory
-Create RooFit probability density functions from ROOT histograms.
-
-%package html
-Summary:	HTML documentation generator for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	graphviz
-
-%description html
-This package contains classes to automatically extract documentation
-from marked up sources.
-
-%package io
-Summary:	Input/output of ROOT objects
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description io
-This package provides I/O routines for ROOT objects.
-
-%package io-dcache
-Summary:	dCache input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-dcache
-This package contains the dCache extension for ROOT.
-
-%package io-gfal
-Summary:	Grid File Access Library input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-gfal
-This package contains the Grid File Access Library extension for ROOT.
-
-%if %{hadoop}
-%package io-hdfs
-Summary:	Hadoop File System input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-hdfs
-This package contains the Hadoop File System extension for ROOT.
-%endif
-
-%package io-rfio
-Summary:	Remote File input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-rfio
-This package contains the Remote File IO extension for ROOT.
-
-%package io-sql
-Summary:	SQL input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description io-sql
-This package contains the SQL extension for ROOT, that allows
-transparent access to files data via an SQL database, using ROOT's
-TFile interface.
-
-%package io-xml
-Summary:	XML reader library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-xml
-This package contains the XML reader library for ROOT.
-
-%package foam
-Summary:	A Compact Version of the Cellular Event Generator
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description foam
-The general-purpose self-adapting Monte Carlo (MC) event
-generator/simulator mFOAM (standing for mini-FOAM) is a new compact
-version of the FOAM program, with a slightly limited functionality
-with respect to its parent version. On the other hand, mFOAM is
-easier to use for the average user.
-
-%package fftw
-Summary:	FFTW library for ROOT
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description fftw
-This package contains the Fast Fourier Transform extension for ROOT.
-It uses the very fast fftw (version 3) library.
-
-%package fumili
-Summary:	Fumili library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description fumili
-This package contains the fumili library for ROOT. This provides an
-alternative fitting algorithm for ROOT.
-
-%package genvector
-Summary:	Generalized vector library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description genvector
-This package contains the Genvector library for ROOT. This provides
-a generalized vector library.
-
-%package mathcore
-Summary:	Core mathematics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-
-%description mathcore
-This package contains the MathCore library for ROOT.
-
-%package mathmore
-Summary:	GSL interface library for ROOT
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description mathmore
-This package contains the MathMore library for ROOT. This provides
-a partial GNU Scientific Library interface for ROOT.
-While the rest of root is licensed under LGPLv2+ this optional library
-is licensed under GPLv2+ due to its use of GSL.
-
-%package matrix
-Summary:	Matrix library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description matrix
-This package contains the Matrix library for ROOT.
-
-%package minuit
-Summary:	Minuit library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description minuit
-This package contains the MINUIT library for ROOT. This provides a
-fitting algorithm for ROOT.
-
-%package minuit2
-Summary:	Minuit version 2 library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description minuit2
-This package contains the MINUIT version 2 library for ROOT. This
-provides an fitting algorithm for ROOT.
-
-%package mlp
-Summary:	Multi-layer perceptron extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description mlp
-This package contains the mlp library for ROOT. This library provides
-a multi-layer perceptron neural network package for ROOT.
-
-%package physics
-Summary:	Physics library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description physics
-This package contains the physics library for ROOT.
-
-%package quadp
-Summary:	QuadP library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-
-%description quadp
-This package contains the QuadP library for ROOT. This provides the a
-framework in which to do Quadratic Programming. The quadratic
-programming problem involves minimization of a quadratic function
-subject to linear constraints.
-
-%package smatrix
-Summary:	Sparse matrix library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description smatrix
-This package contains the Smatrix library for ROOT.
-
-%package splot
-Summary:	Splot library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description splot
-A common method used in High Energy Physics to perform measurements
-is the maximum Likelihood method, exploiting discriminating variables
-to disentangle signal from background. The crucial point for such an
-analysis to be reliable is to use an exhaustive list of sources of
-events combined with an accurate description of all the Probability
-Density Functions (PDF).
-
-To assess the validity of the fit, a convincing quality check is to
-explore further the data sample by examining the distributions of
-control variables. A control variable can be obtained for instance by
-removing one of the discriminating variables before performing again
-the maximum Likelihood fit: this removed variable is a control
-variable. The expected distribution of this control variable, for
-signal, is to be compared to the one extracted, for signal, from the
-data sample. In order to be able to do so, one must be able to unfold
-from the distribution of the whole data sample.
-
-The SPlot method allows to reconstruct the distributions for the
-control variable, independently for each of the various sources of
-events, without making use of any a priori knowledge on this
-variable. The aim is thus to use the knowledge available for the
-discriminating variables to infer the behavior of the individual
-sources of events with respect to the control variable.
-
-SPlot is optimal if the control variable is uncorrelated with the
-discriminating variables.
-
-%package unuran
-Summary:	Random number generator library
-License:	GPLv2+
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description unuran
-Contains universal (also called automatic or black-box) algorithms
-that can generate random numbers from large classes of continuous or
-discrete distributions, and also from practically all standard
-distributions.
-
-To generate random numbers the user must supply some information
-about the desired distribution, especially a C-function that computes
-the density and - depending on the chosen methods - some additional
-information (like the borders of the domain, the mode, the derivative
-of the density ...). After a user has given this information an
-init-program computes all tables and constants necessary for the
-random variate generation. The sample program can then generate
-variates from the desired distribution.
-
-%package vdt
-Summary:	VDT mathematical library
-BuildArch:	noarch
-
-%description vdt
-VDT is a library of mathematical functions implemented in double and
-single precision. The implementation is fast and with the aid of
-modern compilers (e.g. gcc 4.7) vectorizable.
-
-%package memstat
-Summary:	Memory statistics tool for use with ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description memstat
-This package contains the memory statistics tool for debugging memory
-leaks and such.
-
-%package table
-Summary:	Table library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description table
-This package contains the Table library for ROOT.
-
-%package montecarlo-eg
-Summary:	Event generator library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-
-%description montecarlo-eg
-This package contains an event generator library for ROOT.
-
-%if %{pythia8}
-%package montecarlo-pythia8
-Summary:	Pythia version 8 plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-
-%description montecarlo-pythia8
-This package contains the Pythia version 8 plug-in for ROOT. This
-package provide the ROOT user with transparent interface to the Pythia
-(version 8) event generators for hadronic interactions. If the term
-"hadronic" does not ring any bells, this package is not for you.
-%endif
-
-%package montecarlo-vmc
-Summary:	Virtual Monte-Carlo (simulation) library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-
-%description montecarlo-vmc
-This package contains the VMC library for ROOT.
-
-%package net
-Summary:	Net library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description net
-This package contains the ROOT networking library.
-
-%package net-rpdutils
-Summary:	Authentication utilities used by rootd and proofd
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-rpdutils
-This package contains authentication utilities used by rootd and proofd.
-
-%package net-bonjour
-Summary:	Bonjour extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-bonjour
-This package contains a bonjour extension for ROOT.
-
-%package net-auth
-Summary:	Authentication extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description net-auth
-This package contains the basic authentication algorithms used by ROOT.
-
-%package net-davix
-Summary:	Davix extension for ROOT
-Requires:	davix-libs%{?_isa} >= 0.2.8
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description net-davix
-This package contains the davix extension for ROOT, that provides
-access to http based storage such as webdav and S3.
-
-%package net-globus
-Summary:	Globus extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	globus-proxy-utils
-
-%description net-globus
-This package contains the Globus extension for ROOT, that allows
-authentication and authorization against Globus.
-
-%package net-krb5
-Summary:	Kerberos (version 5) extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	krb5-workstation
-
-%description net-krb5
-This package contains the Kerberos (version 5) extension for ROOT, that
-allows authentication and authorization using Kerberos tokens.
-
-%package net-ldap
-Summary:	LDAP extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-ldap
-This package contains the LDAP extension for ROOT. This gives you
-access to LDAP directories via ROOT.
-
-%package net-http
-Summary:	HTTP server extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description net-http
-This package contains the HTTP server extension for ROOT. It provides
-an http interface to arbitrary ROOT applications.
-
-%if %{xrootd}
-%package netx
-Summary:	NetX extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description netx
-This package contains the NetX extension for ROOT, i.e. a client for
-the xrootd server. Both the old (NetX) and the new (NetXNG) version are
-provided.
-%endif
-
-%package proof
-Summary:	PROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-Obsoletes:	%{name}-clarens < 5.34.01
-Obsoletes:	%{name}-peac < 5.34.01
-
-%description proof
-This package contains the proof extension for ROOT. This provides a
-client to use in a PROOF environment.
-
-%package proof-bench
-Summary:	PROOF benchmarking
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-bench
-This package contains the steering class for PROOF benchmarks.
-
-%package proof-pq2
-Summary:	PROOF Quick Query (pq2)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-
-%description proof-pq2
-Shell-based interface to the PROOF dataset handling.
-
-%package proof-sessionviewer
-Summary:	GUI to browse an interactive PROOF session
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-sessionviewer
-This package contains a library for browsing an interactive PROOF
-session in ROOT.
-
-%if %{xrootd}
-%package xproof
-Summary:	XPROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires:	xrootd-server%{?_isa}
-
-%description xproof
-This package contains the xproof extension for ROOT. This provides a
-client to be used in a PROOF environment.
-%endif
-
-%package roofit
-Summary:	ROOT extension for modeling expected distributions
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description roofit
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-%package sql-mysql
-Summary:	MySQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-mysql
-This package contains the MySQL plugin for ROOT. This plugin
-provides a thin client (interface) to MySQL servers. Using this
-client, one can obtain information from a MySQL database into the
-ROOT environment.
-
-%package sql-odbc
-Summary:	ODBC plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-odbc
-This package contains the ODBC (Open DataBase Connectivity) plugin
-for ROOT, that allows transparent access to any kind of database that
-supports the ODBC protocol.
-
-%package sql-sqlite
-Summary:	Sqlite client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-sqlite
-This package contains the sqlite plugin for ROOT. This plugin
-provides a thin client (interface) to sqlite servers. Using this
-client, one can obtain information from a sqlite database into the
-ROOT environment.
-
-%package sql-pgsql
-Summary:	PostgreSQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-pgsql
-This package contains the PostGreSQL plugin for ROOT. This plugin
-provides a thin client (interface) to PostGreSQL servers. Using this
-client, one can obtain information from a PostGreSQL database into the
-ROOT environment.
-
-%package tmva
-Summary:	Toolkit for multivariate data analysis
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description tmva
-The Toolkit for Multivariate Analysis (TMVA) provides a
-ROOT-integrated environment for the parallel processing and
-evaluation of MVA techniques to discriminate signal from background
-samples. It presently includes (ranked by complexity):
-
-  * Rectangular cut optimization
-  * Correlated likelihood estimator (PDE approach)
-  * Multi-dimensional likelihood estimator (PDE - range-search approach)
-  * Fisher (and Mahalanobis) discriminant
-  * H-Matrix (chi-squared) estimator
-  * Artificial Neural Network (two different implementations)
-  * Boosted Decision Trees
-
-The TMVA package includes an implementation for each of these
-discrimination techniques, their training and testing (performance
-evaluation). In addition all these methods can be tested in parallel,
-and hence their performance on a particular data set may easily be
-compared.
-
-%package tmva-python
-Summary:	Toolkit for multivariate data analysis (Python)
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description tmva-python
-Python integration with TMVA.
-
-%package tmva-r
-Summary:	Toolkit for multivariate data analysis (R)
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-r%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-
-%description tmva-r
-R integration with TMVA.
-
-%package tmva-gui
-Summary:	Toolkit for multivariate data analysis GUI
-License:	BSD
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
-
-%description tmva-gui
-GUI for the Toolkit for Multivariate Analysis (TMVA)
-
-%package tree
-Summary:	Tree library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description tree
-This package contains the Tree library for ROOT.
-
-%package tree-player
-Summary:	Library to loop over a ROOT tree
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description tree-player
-This package contains a plugin to loop over a ROOT tree.
-
-%package tree-viewer
-Summary:	GUI to browse a ROOT tree
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-
-%description tree-viewer
-This package contains a plugin for browsing a ROOT tree in ROOT.
-
-%package cli
-Summary:	ROOT command line utilities
-BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
-
-%description cli
-The ROOT command line utilities is a set of scripts for common tasks
-written in python.
-
-%package notebook
-Summary:	ROOT as an IPython Notebook
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-rootaas = %{version}-%{release}
-Requires:	/usr/bin/ipython
-
-%description notebook
-ROOT as an IPython Notebook.
-
-%package rootaas
-Summary:	ROOT as a Service
-BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
-Requires:	python-ipython-console
-
-%description rootaas
-ROOT as a Service - the IPython kernel for the ROOT notebook.
-
-%prep
-%setup -q -a 1
-
-# Convert from mac line terminators (and remove trailing spaces)
-mac2unix math/smatrix/doc/SMatrixClass.html
-sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
-mac2unix math/smatrix/doc/SVector.html
-sed 's! *$!!' -i math/smatrix/doc/SVector.html
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-
-# Remove bundled sources in order to be sure they are not used
-#  * afterimage
-rm -rf graf2d/asimage/src/libAfterImage
-#  * ftgl
-rm -rf graf3d/ftgl/src graf3d/ftgl/inc
-#  * freetype
-rm -rf graf2d/freetype/src
-#  * glew
-rm -rf graf3d/glew/src graf3d/glew/inc
-#  * pcre
-rm -rf core/pcre/src
-#  * zlib
-rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
-#  * lzma
-rm -rf core/lzma/src/*.tar.gz
-#  * gl2ps
-rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
-#  * unuran
-rm -rf math/unuran/src/*.tar.gz
-#  * xrootd-private-devel headers
-rm -rf proof/xrdinc
-#  * x11 extension headers
-rm -rf graf2d/x11/inc/X11
-#  * mathjax
-rm -rf documentation/doxygen/mathjax.tar.gz
-sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
-sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
-    -i documentation/doxygen/Doxyfile
-%if %{?fedora}%{!?fedora:0} >= 24
-#  * string_view
-rm core/metautils/inc/libcpp_string_view.h \
-   core/metautils/inc/RWrap_libcpp_string_view.h
-%endif
-
-# Remove bundled fonts provided by the OS distributions
-%if %{?fedora}%{!?fedora:0} >= 11
-rm fonts/DroidSansFallback.ttf
-%endif
-
-# Remove unsupported man page macros
-sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
-
-# Build PyROOT for python 3
-cp -pr bindings/pyroot bindings/python
-
-%build
-unset QTDIR
-unset QTLIB
-unset QTINC
-
-mkdir builddir
-pushd builddir
-
-# Avoid overlinking (this used to be the default with the old configure script)
-LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-
-%ifarch s390 s390x
-# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
-%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
-%endif
-
-%ifarch ppc %{power64} s390 s390x
-# On some architectures JIT compilation fails if the stack protector is used
-# https://llvm.org/bugs/show_bug.cgi?id=22248
-# https://llvm.org/bugs/show_bug.cgi?id=26226
-# IncrementalExecutor::executeFunction:
-#   symbol '__stack_chk_guard' unresolved while linking
-%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
-%endif
-
-%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
-       -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
-       -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
-       -Dgnuinstall:BOOL=ON \
-       -Dbuiltin_afterimage:BOOL=OFF \
-       -Dbuiltin_cfitsio:BOOL=OFF \
-       -Dbuiltin_davix:BOOL=OFF \
-       -Dbuiltin_fftw3:BOOL=OFF \
-       -Dbuiltin_freetype:BOOL=OFF \
-       -Dbuiltin_ftgl:BOOL=OFF \
-       -Dbuiltin_gl2ps:BOOL=OFF \
-       -Dbuiltin_glew:BOOL=OFF \
-       -Dbuiltin_gsl:BOOL=OFF \
-       -Dbuiltin_llvm:BOOL=ON \
-       -Dbuiltin_lzma:BOOL=OFF \
-       -Dbuiltin_openssl:BOOL=OFF \
-       -Dbuiltin_pcre:BOOL=OFF \
-       -Dbuiltin_tbb:BOOL=OFF \
-       -Dbuiltin_unuran:BOOL=OFF \
-       -Dbuiltin_xrootd:BOOL=OFF \
-       -Dbuiltin_zlib:BOOL=OFF \
-       -Dafdsmgrd:BOOL=OFF \
-       -Dafs:BOOL=OFF \
-       -Dalien:BOOL=OFF \
-       -Dasimage:BOOL=ON \
-       -Dastiff:BOOL=ON \
-       -Dbonjour:BOOL=ON \
-       -Dcastor:BOOL=OFF \
-       -Dccache:BOOL=OFF \
-       -Dchirp:BOOL=OFF \
-       -Dcling:BOOL=ON \
-       -Dcocoa:BOOL=OFF \
-%if %{?fedora}%{!?fedora:0} >= 24
-       -Dcxx14:BOOL=ON \
-%else
-       -Dcxx14:BOOL=OFF \
-%endif
-       -Ddavix:BOOL=ON \
-       -Ddcache:BOOL=ON \
-       -Dexceptions:BOOL=ON \
-       -Dexplicitlink:BOOL=ON \
-       -Dfftw3:BOOL=ON \
-       -Dfitsio:BOOL=ON \
-       -Dfortran:BOOL=ON \
-       -Dgdml:BOOL=ON \
-       -Dgenvector:BOOL=ON \
-%if %{oce}
-       -Dgeocad:BOOL=ON \
-%else
-       -Dgeocad:BOOL=OFF \
-%endif
-       -Dgfal:BOOL=ON \
-       -Dglite:BOOL=OFF \
-       -Dglobus:BOOL=ON \
-       -Dgsl_shared:BOOL=ON \
-       -Dgviz:BOOL=ON \
-%if %{hadoop}
-       -Dhdfs:BOOL=ON \
-%else
-       -Dhdfs:BOOL=OFF \
-%endif
-       -Dhttp:BOOL=ON \
-       -Djemalloc:BOOL=OFF \
-       -Dkrb5:BOOL=ON \
-       -Dldap:BOOL=ON \
-       -Dlibcxx:BOOL=OFF \
-       -Dmathmore:BOOL=ON \
-       -Dmemstat:BOOL=ON \
-       -Dminuit2:BOOL=ON \
-       -Dmonalisa:BOOL=OFF \
-       -Dmt:BOOL=ON \
-       -Dmysql:BOOL=ON \
-       -Dodbc:BOOL=ON \
-       -Dopengl:BOOL=ON \
-       -Doracle:BOOL=OFF \
-       -Dpch:BOOL=ON \
-       -Dpgsql:BOOL=ON \
-       -Dpythia6:BOOL=OFF \
-%if %{pythia8}
-       -Dpythia8:BOOL=ON \
-%else
-       -Dpythia8:BOOL=OFF \
-%endif
-       -Dpython:BOOL=ON \
-       -Dqt:BOOL=ON \
-       -Dqtgsi:BOOL=ON \
-       -Dr:BOOL=ON \
-       -Drfio:BOOL=ON \
-       -Droofit:BOOL=ON \
-       -Droot7:BOOL=OFF \
-       -Drpath:BOOL=OFF \
-%if %{ruby}
-       -Druby:BOOL=ON \
-%else
-       -Druby:BOOL=OFF \
-%endif
-       -Dsapdb:BOOL=OFF \
-       -Dshadowpw:BOOL=ON \
-       -Dshared:BOOL=ON \
-       -Dsoversion:BOOL=ON \
-       -Dsqlite:BOOL=ON \
-       -Dsrp:BOOL=OFF \
-       -Dssl:BOOL=ON \
-       -Dtable:BOOL=ON \
-       -Dtbb:BOOL=ON \
-       -Dtcmalloc:BOOL=OFF \
-       -Dthread:BOOL=ON \
-       -Dtmva:BOOL=ON \
-       -Dunuran:BOOL=ON \
-       -Dvc:BOOL=OFF \
-       -Dvdt:BOOL=ON \
-       -Dx11:BOOL=ON \
-       -Dxft:BOOL=ON \
-       -Dxml:BOOL=ON \
-%if %{xrootd}
-       -Dxrootd:BOOL=ON \
-%else
-       -Dxrootd:BOOL=OFF \
-%endif
-       -Dfail-on-missing:BOOL=ON \
-       -Dtesting:BOOL=ON \
-       ..
-
-# Build PyROOT for python 3 (prep)
-cp -pr bindings/pyroot bindings/python
-
-make %{?_smp_mflags}
-
-# Build PyROOT for python 3
-mkdir python
-mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
-    > CMakeFiles/Makefile2
-py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
-py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
-sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
-make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
-mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
-
-popd
-
-%install
-pushd builddir
-make %{?_smp_mflags} install DESTDIR=%{buildroot}
-popd
-
-# Move python modules to the sitelib
-mkdir -p %{buildroot}%{python_sitelib}
-mkdir -p %{buildroot}%{python_sitearch}
-
-mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
-
-rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
-mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
-
-# Do emacs byte compilation
-emacs -batch -no-site-file -f batch-byte-compile \
-    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
-
-# Install desktop entry and icon
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-
-cat > root.desktop << EOF
-[Desktop Entry]
-Name=Root
-GenericName=Root
-Comment=Numerical data analysis framework
-Exec=root
-Icon=root
-Terminal=true
-Type=Application
-MimeType=application/x-root;
-Categories=Utility;
-Encoding=UTF-8
-EOF
-
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-		     --vendor "" root.desktop
-install -p -m 644 build/package/debian/root-system-bin.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
-
-# Install mime type and icon
-mkdir -p %{buildroot}%{_datadir}/mime/packages
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
-    %{buildroot}%{_datadir}/mime/packages/root.xml
-install -p -m 644 build/package/debian/application-x-root.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-
-# Init scripts for services
-mkdir -p %{buildroot}%{_initrddir}
-mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
-   %{buildroot}%{_initrddir}/proofd
-mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
-   %{buildroot}%{_initrddir}/rootd
-
-# Turn off services by default
-sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
-
-# The Python interface library is handled by alternatives
-mkdir -p %{buildroot}%{python_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python_sitearch}/libPyROOT.so
-
-mkdir -p %{buildroot}%{python3_sitearch}
-install builddir/python/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
-install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
-
-%if %{ruby}
-# The Ruby interface library must be in two places
-mkdir -p %{buildroot}%{ruby_vendorarchdir}
-mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
-   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
-ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
-   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
-%endif
-
-# These should be in PATH
-mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
-
-# Avoid /usr/bin/env shebangs
-sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed 's!/usr/bin/env python!/usr/bin/python!' \
-    -i %{buildroot}%{_bindir}/rootbrowse \
-       %{buildroot}%{_bindir}/rootcp \
-       %{buildroot}%{_bindir}/rooteventselector \
-       %{buildroot}%{_bindir}/rootls \
-       %{buildroot}%{_bindir}/rootmkdir \
-       %{buildroot}%{_bindir}/rootmv \
-       %{buildroot}%{_bindir}/rootprint \
-       %{buildroot}%{_bindir}/rootrm \
-       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
-       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
-
-# Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
-rm %{buildroot}%{_datadir}/%{name}/daemons/README
-rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
-rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
-rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
-rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
-rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
-rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
-rm %{buildroot}%{_libdir}/%{name}/libminicern.a
-rm %{buildroot}%{_bindir}/setenvwrap.csh
-rm %{buildroot}%{_bindir}/setxrd*
-rm %{buildroot}%{_bindir}/thisroot*
-rm %{buildroot}%{_mandir}/man1/g2rootold.1
-rm %{buildroot}%{_mandir}/man1/genmap.1
-rm %{buildroot}%{_mandir}/man1/proofserva.1
-rm %{buildroot}%{_mandir}/man1/roota.1
-rm %{buildroot}%{_mandir}/man1/setup-pq2.1
-%if %{xrootd} == 0
-rm %{buildroot}%{_mandir}/man1/xproofd.1
-%endif
-rm %{buildroot}%{_includedir}/%{name}/*.cw
-rm %{buildroot}%{_includedir}/%{name}/*.pri
-rm %{buildroot}%{_includedir}/%{name}/proofdp.h
-rm %{buildroot}%{_includedir}/%{name}/rootdp.h
-rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
-rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
-rm %{buildroot}%{_pkgdocdir}/INSTALL
-rm %{buildroot}%{_pkgdocdir}/README.ALIEN
-rm %{buildroot}%{_pkgdocdir}/README.MONALISA
-
-# Remove mathtext and minicern references from cmake files
-sed -e 's/ mathtext / /' -e /mathtext/d \
-    -e 's/ minicern / /' -e /minicern/d \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
-    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
-
-# Only used on Windows
-rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
-
-# Remove plugin definitions for non-built and obsolete plugins
-pushd %{buildroot}%{_datadir}/%{name}/plugins
-rm TAFS/P010_TAFS.C
-rm TDataProgressDialog/P010_TDataProgressDialog.C
-rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P030_TCastorFile.C
-rm TFile/P060_TChirpFile.C
-rm TFile/P070_TAlienFile.C
-%if %{hadoop} == 0
-rm TFile/P110_THDFSFile.C
-%endif
-rm TGLManager/P020_TGWin32GLManager.C
-rm TGLManager/P030_TGOSXGLManager.C
-rm TGrid/P010_TAlien.C
-rm TGrid/P020_TGLite.C
-rm TImagePlugin/P010_TASPluginGS.C
-rm TSQLServer/P030_TSapDBServer.C
-rm TSQLServer/P040_TOracleServer.C
-rm TSystem/P030_TAlienSystem.C
-%if %{hadoop} == 0
-rm TSystem/P060_THDFSSystem.C
-%endif
-rm TViewerX3D/P020_TQtViewerX3D.C
-rm TVirtualGLImp/P020_TGWin32GL.C
-rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
-rm TVirtualX/P030_TGWin32.C
-rm TVirtualX/P050_TGQuartz.C
-%if %{xrootd} == 0
-rm TFile/P100_TXNetFile.C
-rm TFileStager/P010_TXNetFileStager.C
-rm TProofMgr/P010_TXProofMgr.C
-rm TProofServ/P010_TXProofServ.C
-rm TSlave/P010_TXSlave.C
-rm TSystem/P040_TXNetSystem.C
-%endif
-rmdir TAFS
-rmdir TDataProgressDialog
-rmdir TGrid
-rmdir TImagePlugin
-popd
-
-# Create ldconfig configuration
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name} > \
-     %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-
-# Rename to avoid name clashes
-cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
-cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
-cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
-
-# Generate documentation
-pushd documentation/doxygen
-ln -s ../../files files
-sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
-    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
-    ROOTSYS=${PWD}/../../builddir \
-    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
-mv doc/html %{buildroot}%{_pkgdocdir}/html
-popd
-
-# Create includelist files ...
-for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
-    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
-    l=`tr / - <<< $l`
-    tmpdir=`mktemp -d`
-    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
-	sort | sed 's!^\.!!' > $l
-    rm -rf $tmpdir
-done
-
-# ... and merge some of them
-cat includelist-core-{[^mw],m[^au]}* > includelist-core
-cat includelist-geom-geom* > includelist-geom
-cat includelist-roofit-roo* > includelist-roofit
-cat includelist-gui-qt* > includelist-gui-qt
-cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
-cat includelist-gui-guihtml >> includelist-gui-gui
-cat includelist-io-xmlparser >> includelist-io-xml
-cat includelist-proof-proofplayer >> includelist-proof-proof
-cat includelist-net-netx* > includelist-netx
-
-%check
-pushd builddir
-pushd test
-ln -s ../../files files
-popd
-pushd runtutorials
-ln -s ../../files files
-popd
-# Exclude some tests that can not be run
-# - test-stressIOPlugins-*
-#   requires network access (by design since they test the remote file IO)
-# - tutorial-tree-run_h1analysis
-#   requires network access: http://root.cern.ch/files/h1/
-# - tutorial-r-*
-#   occasionally causes random crashes
-# - tutorial-multicore-mp*
-#   currently fails on ix86 and arm
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
-%ifarch %{ix86} %{arm}
-excluded="${excluded}|tutorial-multicore-mp.*"
-%endif
-make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
-popd
-
-%post
-touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
-    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-fi
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-
-%post rootd
-/sbin/chkconfig --add rootd
-
-%preun rootd
-if [ $1 = 0 ] ; then
-    /sbin/service rootd stop >/dev/null 2>&1
-    /sbin/chkconfig --del rootd
-fi
-
-%postun rootd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service rootd condrestart >/dev/null 2>&1 || :
-fi
-
-%post proofd
-/sbin/chkconfig --add proofd
-
-%preun proofd
-if [ $1 = 0 ] ; then
-    /sbin/service proofd stop >/dev/null 2>&1
-    /sbin/chkconfig --del proofd
-fi
-
-%postun proofd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service proofd condrestart >/dev/null 2>&1 || :
-fi
-
-%post python
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
-    done
-fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
-/sbin/ldconfig
-
-%preun python
-if [ $1 = 0 ]; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python_sitearch}/libPyROOT.so
-fi
-
-%postun python -p /sbin/ldconfig
-
-%post %{python3pkg}
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
-    done
-fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
-/sbin/ldconfig
-
-%preun %{python3pkg}
-if [ $1 = 0 ]; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
-fi
-
-%postun %{python3pkg} -p /sbin/ldconfig
-
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
-%post cling -p /sbin/ldconfig
-%postun cling -p /sbin/ldconfig
-%if %{ruby}
-%post ruby -p /sbin/ldconfig
-%postun ruby -p /sbin/ldconfig
-%endif
-%post r -p /sbin/ldconfig
-%postun r -p /sbin/ldconfig
-%post r-tools -p /sbin/ldconfig
-%postun r-tools -p /sbin/ldconfig
-%post genetic -p /sbin/ldconfig
-%postun genetic -p /sbin/ldconfig
-%post geom -p /sbin/ldconfig
-%postun geom -p /sbin/ldconfig
-%post gdml -p /sbin/ldconfig
-%postun gdml -p /sbin/ldconfig
-%if %{oce}
-%post geocad -p /sbin/ldconfig
-%postun geocad -p /sbin/ldconfig
-%endif
-%post graf -p /sbin/ldconfig
-%postun graf -p /sbin/ldconfig
-%post graf-asimage -p /sbin/ldconfig
-%postun graf-asimage -p /sbin/ldconfig
-%post graf-fitsio -p /sbin/ldconfig
-%postun graf-fitsio -p /sbin/ldconfig
-%post graf-gpad -p /sbin/ldconfig
-%postun graf-gpad -p /sbin/ldconfig
-%post graf-gviz -p /sbin/ldconfig
-%postun graf-gviz -p /sbin/ldconfig
-%post graf-postscript -p /sbin/ldconfig
-%postun graf-postscript -p /sbin/ldconfig
-%post graf-qt -p /sbin/ldconfig
-%postun graf-qt -p /sbin/ldconfig
-%post graf-x11 -p /sbin/ldconfig
-%postun graf-x11 -p /sbin/ldconfig
-%post graf3d -p /sbin/ldconfig
-%postun graf3d -p /sbin/ldconfig
-%post graf3d-eve -p /sbin/ldconfig
-%postun graf3d-eve -p /sbin/ldconfig
-%post graf3d-gl -p /sbin/ldconfig
-%postun graf3d-gl -p /sbin/ldconfig
-%post graf3d-gviz3d -p /sbin/ldconfig
-%postun graf3d-gviz3d -p /sbin/ldconfig
-%post graf3d-x3d -p /sbin/ldconfig
-%postun graf3d-x3d -p /sbin/ldconfig
-%post gui -p /sbin/ldconfig
-%postun gui -p /sbin/ldconfig
-%post gui-fitpanel -p /sbin/ldconfig
-%postun gui-fitpanel -p /sbin/ldconfig
-%post gui-ged -p /sbin/ldconfig
-%postun gui-ged -p /sbin/ldconfig
-%post guibuilder -p /sbin/ldconfig
-%postun guibuilder -p /sbin/ldconfig
-%post gui-qt -p /sbin/ldconfig
-%postun gui-qt -p /sbin/ldconfig
-%post gui-recorder -p /sbin/ldconfig
-%postun gui-recorder -p /sbin/ldconfig
-%post hbook -p /sbin/ldconfig
-%postun hbook -p /sbin/ldconfig
-%post hist -p /sbin/ldconfig
-%postun hist -p /sbin/ldconfig
-%post hist-painter -p /sbin/ldconfig
-%postun hist-painter -p /sbin/ldconfig
-%post spectrum -p /sbin/ldconfig
-%postun spectrum -p /sbin/ldconfig
-%post spectrum-painter -p /sbin/ldconfig
-%postun spectrum-painter -p /sbin/ldconfig
-%post hist-factory -p /sbin/ldconfig
-%postun hist-factory -p /sbin/ldconfig
-%post html -p /sbin/ldconfig
-%postun html -p /sbin/ldconfig
-%post io -p /sbin/ldconfig
-%postun io -p /sbin/ldconfig
-%post io-dcache -p /sbin/ldconfig
-%postun io-dcache -p /sbin/ldconfig
-%post io-gfal -p /sbin/ldconfig
-%postun io-gfal -p /sbin/ldconfig
-%if %{hadoop}
-%post io-hdfs -p /sbin/ldconfig
-%postun io-hdfs -p /sbin/ldconfig
-%endif
-%post io-rfio -p /sbin/ldconfig
-%postun io-rfio -p /sbin/ldconfig
-%post io-sql -p /sbin/ldconfig
-%postun io-sql -p /sbin/ldconfig
-%post io-xml -p /sbin/ldconfig
-%postun io-xml -p /sbin/ldconfig
-%post foam -p /sbin/ldconfig
-%postun foam -p /sbin/ldconfig
-%post fftw -p /sbin/ldconfig
-%postun fftw -p /sbin/ldconfig
-%post fumili -p /sbin/ldconfig
-%postun fumili -p /sbin/ldconfig
-%post genvector -p /sbin/ldconfig
-%postun genvector -p /sbin/ldconfig
-%post mathcore -p /sbin/ldconfig
-%postun mathcore -p /sbin/ldconfig
-%post mathmore -p /sbin/ldconfig
-%postun mathmore -p /sbin/ldconfig
-%post matrix -p /sbin/ldconfig
-%postun matrix -p /sbin/ldconfig
-%post minuit -p /sbin/ldconfig
-%postun minuit -p /sbin/ldconfig
-%post minuit2 -p /sbin/ldconfig
-%postun minuit2 -p /sbin/ldconfig
-%post mlp -p /sbin/ldconfig
-%postun mlp -p /sbin/ldconfig
-%post physics -p /sbin/ldconfig
-%postun physics -p /sbin/ldconfig
-%post quadp -p /sbin/ldconfig
-%postun quadp -p /sbin/ldconfig
-%post smatrix -p /sbin/ldconfig
-%postun smatrix -p /sbin/ldconfig
-%post splot -p /sbin/ldconfig
-%postun splot -p /sbin/ldconfig
-%post unuran -p /sbin/ldconfig
-%postun unuran -p /sbin/ldconfig
-%post memstat -p /sbin/ldconfig
-%postun memstat -p /sbin/ldconfig
-%post table -p /sbin/ldconfig
-%postun table -p /sbin/ldconfig
-%post montecarlo-eg -p /sbin/ldconfig
-%postun montecarlo-eg -p /sbin/ldconfig
-%if %{pythia8}
-%post montecarlo-pythia8 -p /sbin/ldconfig
-%postun montecarlo-pythia8 -p /sbin/ldconfig
-%endif
-%post montecarlo-vmc -p /sbin/ldconfig
-%postun montecarlo-vmc -p /sbin/ldconfig
-%post net -p /sbin/ldconfig
-%postun net -p /sbin/ldconfig
-%post net-rpdutils -p /sbin/ldconfig
-%postun net-rpdutils -p /sbin/ldconfig
-%post net-bonjour -p /sbin/ldconfig
-%postun net-bonjour -p /sbin/ldconfig
-%post net-auth -p /sbin/ldconfig
-%postun net-auth -p /sbin/ldconfig
-%post net-davix -p /sbin/ldconfig
-%postun net-davix -p /sbin/ldconfig
-%post net-globus -p /sbin/ldconfig
-%postun net-globus -p /sbin/ldconfig
-%post net-krb5 -p /sbin/ldconfig
-%postun net-krb5 -p /sbin/ldconfig
-%post net-ldap -p /sbin/ldconfig
-%postun net-ldap -p /sbin/ldconfig
-%post net-http -p /sbin/ldconfig
-%postun net-http -p /sbin/ldconfig
-%if %{xrootd}
-%post netx -p /sbin/ldconfig
-%postun netx -p /sbin/ldconfig
-%endif
-%post proof -p /sbin/ldconfig
-%postun proof -p /sbin/ldconfig
-%post proof-sessionviewer -p /sbin/ldconfig
-%postun proof-sessionviewer -p /sbin/ldconfig
-%if %{xrootd}
-%post xproof -p /sbin/ldconfig
-%postun xproof -p /sbin/ldconfig
-%endif
-%post roofit -p /sbin/ldconfig
-%postun roofit -p /sbin/ldconfig
-%post sql-mysql -p /sbin/ldconfig
-%postun sql-mysql -p /sbin/ldconfig
-%post sql-odbc -p /sbin/ldconfig
-%postun sql-odbc -p /sbin/ldconfig
-%post sql-sqlite -p /sbin/ldconfig
-%postun sql-sqlite -p /sbin/ldconfig
-%post sql-pgsql -p /sbin/ldconfig
-%postun sql-pgsql -p /sbin/ldconfig
-%post tmva -p /sbin/ldconfig
-%postun tmva -p /sbin/ldconfig
-%post tmva-python -p /sbin/ldconfig
-%postun tmva-python -p /sbin/ldconfig
-%post tmva-r -p /sbin/ldconfig
-%postun tmva-r -p /sbin/ldconfig
-%post tmva-gui -p /sbin/ldconfig
-%postun tmva-gui -p /sbin/ldconfig
-%post tree -p /sbin/ldconfig
-%postun tree -p /sbin/ldconfig
-%post tree-player -p /sbin/ldconfig
-%postun tree-player -p /sbin/ldconfig
-%post tree-viewer -p /sbin/ldconfig
-%postun tree-viewer -p /sbin/ldconfig
-
-%files
-%{_bindir}/hadd
-%{_bindir}/root
-%{_bindir}/root.exe
-%{_bindir}/rootn.exe
-%{_bindir}/roots
-%{_bindir}/roots.exe
-%{_bindir}/ssh2rpd
-%{_mandir}/man1/hadd.1*
-%{_mandir}/man1/root.1*
-%{_mandir}/man1/root.exe.1*
-%{_mandir}/man1/rootn.exe.1*
-%{_mandir}/man1/roots.exe.1*
-%{_mandir}/man1/ssh2rpd.1*
-%{_datadir}/applications/root.desktop
-%{_datadir}/icons/hicolor/48x48/apps/root.png
-%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
-%{_datadir}/mime/packages/root.xml
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitelispdir}/%{name}/*.el
-
-%files icons
-%{_datadir}/%{name}/icons
-
-%files fonts
-%{_datadir}/%{name}/fonts
-
-%files core -f includelist-core
-%{_bindir}/memprobe
-%{_bindir}/rlibmap
-%{_bindir}/rmkdepend
-%{_bindir}/root-config
-%{_mandir}/man1/memprobe.1*
-%{_mandir}/man1/rmkdepend.1*
-%{_mandir}/man1/root-config.1*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libCore.*
-%{_libdir}/%{name}/libNew.*
-%{_libdir}/%{name}/libRint.*
-%{_libdir}/%{name}/libThread.*
-%{_libdir}/%{name}/lib*Dict.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/allDict.cxx.pch
-%{_datadir}/%{name}/class.rules
-%{_datadir}/%{name}/gdb-backtrace.sh
-%{_datadir}/%{name}/helgrind-root.supp
-%{_datadir}/%{name}/Makefile.arch
-%{_datadir}/%{name}/root.mimes
-%{_datadir}/%{name}/system.rootauthrc
-%{_datadir}/%{name}/system.rootdaemonrc
-%{_datadir}/%{name}/system.rootrc
-%{_datadir}/%{name}/valgrind-root-python.supp
-%{_mandir}/man1/system.rootdaemonrc.1*
-%dir %{_datadir}/%{name}/cmake
-%{_datadir}/%{name}/cmake/*.cmake
-%dir %{_datadir}/%{name}/cmake/modules
-%{_datadir}/%{name}/cmake/modules/*.cmake
-%{_datadir}/%{name}/cmake/modules/*.cmake.in
-%dir %{_datadir}/%{name}/macros
-%{_datadir}/%{name}/macros/Dialogs.C
-%dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/plugins/*
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/RConfigOptions.h
-%{_includedir}/%{name}/RConfigure.h
-%{_includedir}/%{name}/RGitCommit.h
-%{_includedir}/%{name}/compiledata.h
-%dir %{_includedir}/%{name}/Math
-%{_datadir}/aclocal/root.m4
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%dir %{_pkgdocdir}
-# CREDITS and LICENSE are used at runtime by the .credits and .license commands
-# They therefore should not be marked doc.
-%{_pkgdocdir}/CREDITS
-%{_pkgdocdir}/LICENSE
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/ReleaseNotes
-%license LICENSE
-
-%files multiproc -f includelist-core-multiproc
-%{_libdir}/%{name}/libMultiProc.*
-%{_libdir}/%{name}/libMultiProc_rdict.pcm
-
-%files cling
-%{_bindir}/genreflex
-%{_bindir}/rootcint
-%{_bindir}/rootcling
-%{_libdir}/%{name}/libCling.*
-%{_datadir}/%{name}/cling
-%{_datadir}/%{name}/dictpch
-%doc interpreter/cling/CREDITS.txt
-%doc interpreter/cling/README.md
-%license interpreter/cling/LICENSE.TXT
-%doc interpreter/llvm/src/llvm-CREDITS.TXT
-%doc interpreter/llvm/src/llvm-README.txt
-%license interpreter/llvm/src/llvm-LICENSE.TXT
-
-%files doc
-%doc %{_pkgdocdir}/html
-
-%files tutorial
-%doc %{_pkgdocdir}/test
-%doc %{_pkgdocdir}/tutorials
-
-%files proofd
-%{_bindir}/proofd
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
-%{_mandir}/man1/proofd.1*
-%{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
-%{_initrddir}/proofd
-
-%files rootd
-%{_bindir}/rootd
-%{_mandir}/man1/rootd.1*
-%{_initrddir}/rootd
-
-%files python -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python_sitearch}/libPyROOT.so
-%{python_sitearch}/ROOT.py*
-%{python_sitearch}/cppyy.py*
-%{python_sitearch}/_pythonization.py*
-
-%files %{python3pkg} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_sitearch}/libPyROOT%{py3soabi}.so
-%{python3_sitearch}/ROOT.py
-%{python3_sitearch}/cppyy.py
-%{python3_sitearch}/_pythonization.py
-%{python3_sitearch}/__pycache__
-
-%if %{ruby}
-%files ruby -f includelist-bindings-ruby
-%{_libdir}/%{name}/libRuby.*
-%{_libdir}/%{name}/libRuby_rdict.pcm
-%{ruby_vendorarchdir}/libRuby.*
-%endif
-
-%files r -f includelist-bindings-r
-%{_libdir}/%{name}/libRInterface.*
-%{_libdir}/%{name}/libRInterface_rdict.pcm
-%doc bindings/r/doc/users-guide/*.md
-
-%files r-tools -f includelist-math-rtools
-%{_libdir}/%{name}/libRtools.*
-%{_libdir}/%{name}/libRtools_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
-
-%files genetic -f includelist-math-genetic
-%{_libdir}/%{name}/libGenetic.*
-%{_libdir}/%{name}/libGenetic_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
-
-%files geom -f includelist-geom
-%{_libdir}/%{name}/libGeom.*
-%{_libdir}/%{name}/libGeom_rdict.pcm
-%{_libdir}/%{name}/libGeomBuilder.*
-%{_libdir}/%{name}/libGeomBuilder_rdict.pcm
-%{_libdir}/%{name}/libGeomPainter.*
-%{_libdir}/%{name}/libGeomPainter_rdict.pcm
-%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
-%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
-%{_datadir}/%{name}/RadioNuclides.txt
-
-%files gdml -f includelist-geom-gdml
-%{_libdir}/%{name}/libGdml.*
-%{_libdir}/%{name}/libGdml_rdict.pcm
-
-%if %{oce}
-%files geocad -f includelist-geom-geocad
-%{_libdir}/%{name}/libGeoCad.*
-%{_libdir}/%{name}/libGeoCad_rdict.pcm
-%endif
-
-%files graf -f includelist-graf2d-graf
-%{_libdir}/%{name}/libGraf.*
-%{_libdir}/%{name}/libGraf_rdict.pcm
-%{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
-
-%files graf-asimage -f includelist-graf2d-asimage
-%{_libdir}/%{name}/libASImage.*
-%{_libdir}/%{name}/libASImage_rdict.pcm
-%{_libdir}/%{name}/libASImageGui.*
-%{_libdir}/%{name}/libASImageGui_rdict.pcm
-%{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
-%{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
-
-%files graf-fitsio -f includelist-graf2d-fitsio
-%{_libdir}/%{name}/libFITSIO.*
-%{_libdir}/%{name}/libFITSIO_rdict.pcm
-
-%files graf-gpad -f includelist-graf2d-gpad
-%{_libdir}/%{name}/libGpad.*
-%{_libdir}/%{name}/libGpad_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
-
-%files graf-gviz -f includelist-graf2d-gviz
-%{_libdir}/%{name}/libGviz.*
-%{_libdir}/%{name}/libGviz_rdict.pcm
-
-%files graf-postscript -f includelist-graf2d-postscript
-%{_libdir}/%{name}/libPostscript.*
-%{_libdir}/%{name}/libPostscript_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
-%{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
-
-%files graf-qt -f includelist-graf2d-qt
-%{_libdir}/%{name}/libGQt.*
-%{_libdir}/%{name}/libGQt_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
-
-%files graf-x11 -f includelist-graf2d-x11
-%{_libdir}/%{name}/libGX11.*
-%{_libdir}/%{name}/libGX11_rdict.pcm
-%{_libdir}/%{name}/libGX11TTF.*
-%{_libdir}/%{name}/libGX11TTF_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
-%{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
-
-%files graf3d -f includelist-graf3d-g3d
-%{_libdir}/%{name}/libGraf3d.*
-%{_libdir}/%{name}/libGraf3d_rdict.pcm
-%{_datadir}/%{name}/plugins/TView/P010_TView3D.C
-
-%files graf3d-eve -f includelist-graf3d-eve
-%{_libdir}/%{name}/libEve.*
-%{_libdir}/%{name}/libEve_rdict.pcm
-
-%files graf3d-gl -f includelist-graf3d-gl
-%{_libdir}/%{name}/libRGL.*
-%{_libdir}/%{name}/libRGL_rdict.pcm
-%{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
-%{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
-%{_datadir}/%{name}/plugins/TVirtualGLImp/P010_TX11GL.C
-%{_datadir}/%{name}/plugins/TVirtualPadPainter/P010_TGLPadPainter.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P020_TGLSAViewer.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P030_TGLViewer.C
-
-%files graf3d-gviz3d -f includelist-graf3d-gviz3d
-%{_libdir}/%{name}/libGviz3d.*
-%{_libdir}/%{name}/libGviz3d_rdict.pcm
-
-%files graf3d-x3d -f includelist-graf3d-x3d
-%{_libdir}/%{name}/libX3d.*
-%{_libdir}/%{name}/libX3d_rdict.pcm
-%{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
-%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TVirtualViewerX3D.C
-
-%files gui -f includelist-gui-gui
-%{_libdir}/%{name}/libGui.*
-%{_libdir}/%{name}/libGui_rdict.pcm
-%{_libdir}/%{name}/libGuiHtml.*
-%{_libdir}/%{name}/libGuiHtml_rdict.pcm
-%{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
-%{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
-%{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
-%{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
-
-%files gui-fitpanel -f includelist-gui-fitpanel
-%{_libdir}/%{name}/libFitPanel.*
-%{_libdir}/%{name}/libFitPanel_rdict.pcm
-%{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
-
-%files gui-ged -f includelist-gui-ged
-%{_libdir}/%{name}/libGed.*
-%{_libdir}/%{name}/libGed_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
-
-%files guibuilder -f includelist-gui-guibuilder
-%{_libdir}/%{name}/libGuiBld.*
-%{_libdir}/%{name}/libGuiBld_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
-%{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
-
-%files gui-qt -f includelist-gui-qt
-%{_libdir}/%{name}/libQtRoot.*
-%{_libdir}/%{name}/libQtRoot_rdict.pcm
-%{_libdir}/%{name}/libQtGSI.*
-%{_libdir}/%{name}/libQtGSI_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
-
-%files gui-recorder -f includelist-gui-recorder
-%{_libdir}/%{name}/libRecorder.*
-%{_libdir}/%{name}/libRecorder_rdict.pcm
-
-%files hbook -f includelist-hist-hbook
-%{_bindir}/g2root
-%{_bindir}/h2root
-%{_mandir}/man1/g2root.1*
-%{_mandir}/man1/h2root.1*
-%{_libdir}/%{name}/libHbook.*
-%{_libdir}/%{name}/libHbook_rdict.pcm
-
-%files hist -f includelist-hist-hist
-%{_libdir}/%{name}/libHist.*
-%{_libdir}/%{name}/libHist_rdict.pcm
-
-%files hist-painter -f includelist-hist-histpainter
-%{_libdir}/%{name}/libHistPainter.*
-%{_libdir}/%{name}/libHistPainter_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
-%{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
-
-%files spectrum -f includelist-hist-spectrum
-%{_libdir}/%{name}/libSpectrum.*
-%{_libdir}/%{name}/libSpectrum_rdict.pcm
-
-%files spectrum-painter -f includelist-hist-spectrumpainter
-%{_libdir}/%{name}/libSpectrumPainter.*
-%{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
-
-%files hist-factory -f includelist-roofit-histfactory
-%{_bindir}/hist2workspace
-%{_bindir}/prepareHistFactory
-%{_mandir}/man1/hist2workspace.1*
-%{_mandir}/man1/prepareHistFactory.1*
-%{_libdir}/%{name}/libHistFactory.*
-%{_libdir}/%{name}/libHistFactory_rdict.pcm
-%{_datadir}/%{name}/HistFactorySchema.dtd
-%dir %{_includedir}/%{name}/RooStats/HistFactory
-%doc roofit/histfactory/doc/README
-
-%files html -f includelist-html
-%{_libdir}/%{name}/libHtml.*
-%{_libdir}/%{name}/libHtml_rdict.pcm
-%{_datadir}/%{name}/html
-
-%files io -f includelist-io-io
-%{_libdir}/%{name}/libRIO.*
-%{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
-%{_datadir}/%{name}/plugins/TVirtualStreamerInfo/P010_TStreamerInfo.C
-
-%files io-dcache -f includelist-io-dcache
-%{_libdir}/%{name}/libDCache.*
-%{_libdir}/%{name}/libDCache_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
-%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
-
-%files io-gfal -f includelist-io-gfal
-%{_libdir}/%{name}/libGFAL.*
-%{_libdir}/%{name}/libGFAL_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-
-%if %{hadoop}
-%files io-hdfs -f includelist-io-hdfs
-%{_libdir}/%{name}/libHDFS.*
-%{_libdir}/%{name}/libHDFS_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
-%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
-%endif
-
-%files io-rfio -f includelist-io-rfio
-%{_libdir}/%{name}/libRFIO.*
-%{_libdir}/%{name}/libRFIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
-%{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
-
-%files io-sql -f includelist-io-sql
-%{_libdir}/%{name}/libSQLIO.*
-%{_libdir}/%{name}/libSQLIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
-
-%files io-xml -f includelist-io-xml
-%{_libdir}/%{name}/libXMLIO.*
-%{_libdir}/%{name}/libXMLIO_rdict.pcm
-%{_libdir}/%{name}/libXMLParser.*
-%{_libdir}/%{name}/libXMLParser_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
-
-%files foam -f includelist-math-foam
-%{_libdir}/%{name}/libFoam.*
-%{_libdir}/%{name}/libFoam_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
-
-%files fftw -f includelist-math-fftw
-%{_libdir}/%{name}/libFFTW.*
-%{_libdir}/%{name}/libFFTW_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P030_TFFTRealComplex.C
-%{_datadir}/%{name}/plugins/TVirtualFFT/P040_TFFTReal.C
-
-%files fumili -f includelist-math-fumili
-%{_libdir}/%{name}/libFumili.*
-%{_libdir}/%{name}/libFumili_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
-
-%files genvector -f includelist-math-genvector
-%{_libdir}/%{name}/libGenVector.*
-%{_libdir}/%{name}/libGenVector_rdict.pcm
-%{_libdir}/%{name}/libGenVector32.rootmap
-%{_libdir}/%{name}/libGenVector_G__GenVector32_rdict.pcm
-%dir %{_includedir}/%{name}/Math/GenVector
-
-%files mathcore -f includelist-math-mathcore
-%{_libdir}/%{name}/libMathCore.*
-%{_libdir}/%{name}/libMathCore_rdict.pcm
-%dir %{_includedir}/%{name}/Fit
-
-%files mathmore -f includelist-math-mathmore
-%{_libdir}/%{name}/libMathMore.*
-%{_libdir}/%{name}/libMathMore_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P030_FalsePos.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P040_Newton.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P050_Secant.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P060_Steffenson.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P030_GSLMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P040_GSLNLSMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P050_GSLSimAnMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P010_GSLIntegrator.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P020_GSLMCIntegrator.C
-
-%files matrix -f includelist-math-matrix
-%{_libdir}/%{name}/libMatrix.*
-%{_libdir}/%{name}/libMatrix_rdict.pcm
-
-%files minuit -f includelist-math-minuit
-%{_libdir}/%{name}/libMinuit.*
-%{_libdir}/%{name}/libMinuit_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
-
-%files minuit2 -f includelist-math-minuit2
-%{_libdir}/%{name}/libMinuit2.*
-%{_libdir}/%{name}/libMinuit2_rdict.pcm
-%dir %{_includedir}/%{name}/Minuit2
-%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
-
-%files mlp -f includelist-math-mlp
-%{_libdir}/%{name}/libMLP.*
-%{_libdir}/%{name}/libMLP_rdict.pcm
-
-%files physics -f includelist-math-physics
-%{_libdir}/%{name}/libPhysics.*
-%{_libdir}/%{name}/libPhysics_rdict.pcm
-
-%files quadp -f includelist-math-quadp
-%{_libdir}/%{name}/libQuadp.*
-%{_libdir}/%{name}/libQuadp_rdict.pcm
-
-%files smatrix -f includelist-math-smatrix
-%{_libdir}/%{name}/libSmatrix.*
-%{_libdir}/%{name}/libSmatrix_rdict.pcm
-%{_libdir}/%{name}/libSmatrix32.rootmap
-%{_libdir}/%{name}/libSmatrix_G__Smatrix32_rdict.pcm
-
-%files splot -f includelist-math-splot
-%{_libdir}/%{name}/libSPlot.*
-%{_libdir}/%{name}/libSPlot_rdict.pcm
-
-%files unuran -f includelist-math-unuran
-%{_libdir}/%{name}/libUnuran.*
-%{_libdir}/%{name}/libUnuran_rdict.pcm
-%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
-
-%files vdt -f includelist-math-vdt
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/vdt
-%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
-%license math/vdt/Licence.md
-
-%files memstat -f includelist-misc-memstat
-%{_libdir}/%{name}/libMemStat.*
-%{_libdir}/%{name}/libMemStat_rdict.pcm
-
-%files table -f includelist-misc-table
-%{_libdir}/%{name}/libTable.*
-%{_libdir}/%{name}/libTable_rdict.pcm
-
-%files montecarlo-eg -f includelist-montecarlo-eg
-%{_libdir}/%{name}/libEG.*
-%{_libdir}/%{name}/libEG_rdict.pcm
-%{_datadir}/%{name}/pdg_table.txt
-%doc %{_pkgdocdir}/cfortran.doc
-
-%if %{pythia8}
-%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
-%{_libdir}/%{name}/libEGPythia8.*
-%{_libdir}/%{name}/libEGPythia8_rdict.pcm
-%endif
-
-%files montecarlo-vmc -f includelist-montecarlo-vmc
-%{_libdir}/%{name}/libVMC.*
-%{_libdir}/%{name}/libVMC_rdict.pcm
-%{_datadir}/%{name}/vmc
-
-%files net -f includelist-net-net
-%{_libdir}/%{name}/libNet.*
-%{_libdir}/%{name}/libNet_rdict.pcm
-%{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
-%{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
-%{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
-%{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
-%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
-%{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
-%{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
-%{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
-%{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
-
-%files net-rpdutils -f includelist-net-rpdutils
-%{_libdir}/%{name}/libSrvAuth.*
-
-%files net-bonjour -f includelist-net-bonjour
-%{_libdir}/%{name}/libBonjour.*
-%{_libdir}/%{name}/libBonjour_rdict.pcm
-
-%files net-auth -f includelist-net-auth
-%{_libdir}/%{name}/libRootAuth.*
-%{_libdir}/%{name}/libRootAuth_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
-%doc %{_pkgdocdir}/README.AUTH
-
-%files net-davix -f includelist-net-davix
-%{_libdir}/%{name}/libRDAVIX.*
-%{_libdir}/%{name}/libRDAVIX_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
-%{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
-
-%files net-globus
-%{_libdir}/%{name}/libGlobusAuth.*
-%doc %{_pkgdocdir}/README.GLOBUS
-
-%files net-krb5 -f includelist-net-krb5auth
-%{_libdir}/%{name}/libKrb5Auth.*
-%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
-
-%files net-ldap -f includelist-net-ldap
-%{_libdir}/%{name}/libRLDAP.*
-%{_libdir}/%{name}/libRLDAP_rdict.pcm
-
-%files net-http -f includelist-net-http
-%{_libdir}/%{name}/libRHTTP.*
-%{_libdir}/%{name}/libRHTTP_rdict.pcm
-%{_datadir}/%{name}/http
-%doc net/http/README.txt net/http/civetweb/*.md
-
-%if %{xrootd}
-%files netx -f includelist-netx
-%{_libdir}/%{name}/libNetx.*
-%{_libdir}/%{name}/libNetx_rdict.pcm
-%{_libdir}/%{name}/libNetxNG.*
-%{_libdir}/%{name}/libNetxNG_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
-%{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
-%{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
-%endif
-
-%files proof -f includelist-proof-proof
-%{_libdir}/%{name}/libProof.*
-%{_libdir}/%{name}/libProof_rdict.pcm
-%{_libdir}/%{name}/libProofDraw.*
-%{_libdir}/%{name}/libProofDraw_rdict.pcm
-%{_libdir}/%{name}/libProofPlayer.*
-%{_libdir}/%{name}/libProofPlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
-%{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
-%{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
-%{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
-%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
-%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
-%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
-%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
-%{_datadir}/%{name}/valgrind-root.supp
-%doc %{_pkgdocdir}/README.PROOF
-
-%files proof-bench -f includelist-proof-proofbench
-%{_libdir}/%{name}/libProofBench.*
-%{_libdir}/%{name}/libProofBench_rdict.pcm
-%{_datadir}/%{name}/proof
-
-%files proof-pq2 -f includelist-proof-pq2
-%{_bindir}/pq2*
-%{_mandir}/man1/pq2*.1*
-
-%files proof-sessionviewer -f includelist-gui-sessionviewer
-%{_libdir}/%{name}/libSessionViewer.*
-%{_libdir}/%{name}/libSessionViewer_rdict.pcm
-%{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
-%{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
-%{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
-
-%if %{xrootd}
-%files xproof -f includelist-proof-proofx
-%{_bindir}/proofexecv
-%{_bindir}/xproofd
-%{_mandir}/man1/xproofd.1*
-%{_libdir}/%{name}/libProofx.*
-%{_libdir}/%{name}/libProofx_rdict.pcm
-%{_libdir}/%{name}/libXrdProofd.*
-%{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
-%{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
-%{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
-%endif
-
-%files roofit -f includelist-roofit
-%{_libdir}/%{name}/libRooFit.*
-%{_libdir}/%{name}/libRooFit_rdict.pcm
-%{_libdir}/%{name}/libRooFitCore.*
-%{_libdir}/%{name}/libRooFitCore_rdict.pcm
-%{_libdir}/%{name}/libRooStats.*
-%{_libdir}/%{name}/libRooStats_rdict.pcm
-%dir %{_includedir}/%{name}/RooStats
-
-%files sql-mysql -f includelist-sql-mysql
-%{_libdir}/%{name}/libRMySQL.*
-%{_libdir}/%{name}/libRMySQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
-
-%files sql-odbc -f includelist-sql-odbc
-%{_libdir}/%{name}/libRODBC.*
-%{_libdir}/%{name}/libRODBC_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
-
-%files sql-sqlite -f includelist-sql-sqlite
-%{_libdir}/%{name}/libRSQLite.*
-%{_libdir}/%{name}/libRSQLite_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
-
-%files sql-pgsql -f includelist-sql-pgsql
-%{_libdir}/%{name}/libPgSQL.*
-%{_libdir}/%{name}/libPgSQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
-
-%files tmva -f includelist-tmva-tmva
-%{_libdir}/%{name}/libTMVA.*
-%{_libdir}/%{name}/libTMVA_rdict.pcm
-%dir %{_includedir}/%{name}/TMVA
-%license tmva/doc/LICENSE
-
-%files tmva-python -f includelist-tmva-pymva
-%{_libdir}/%{name}/libPyMVA.*
-%{_libdir}/%{name}/libPyMVA_rdict.pcm
-
-%files tmva-r -f includelist-tmva-rmva
-%{_libdir}/%{name}/libRMVA.*
-%{_libdir}/%{name}/libRMVA_rdict.pcm
-
-%files tmva-gui -f includelist-tmva-tmvagui
-%{_libdir}/%{name}/libTMVAGui.*
-%{_libdir}/%{name}/libTMVAGui_rdict.pcm
-
-%files tree -f includelist-tree-tree
-%{_libdir}/%{name}/libTree.*
-%{_libdir}/%{name}/libTree_rdict.pcm
-%doc %{_pkgdocdir}/README.SELECTOR
-
-%files tree-player -f includelist-tree-treeplayer
-%{_libdir}/%{name}/libTreePlayer.*
-%{_libdir}/%{name}/libTreePlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
-%{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
-
-%files tree-viewer -f includelist-tree-treeviewer
-%{_libdir}/%{name}/libTreeViewer.*
-%{_libdir}/%{name}/libTreeViewer_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
-
-%files cli
-%{_bindir}/rootbrowse
-%{_bindir}/rootcp
-%{_bindir}/rooteventselector
-%{_bindir}/rootls
-%{_bindir}/rootmkdir
-%{_bindir}/rootmv
-%{_bindir}/rootprint
-%{_bindir}/rootrm
-%{python_sitelib}/cmdLineUtils.py*
-
-%files notebook
-%{_bindir}/rootnb.exe
-%{_datadir}/%{name}/notebook
-
-%files rootaas
-%{python_sitelib}/ROOTaaS
-
-%changelog
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
-- Add requires on redhat-rpm-config to root-cling
-
-* Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
-- Update to 6.06.06
-- Drop patches root-gfal2.patch and root-keysymbols.patch
-- Make root-vdt package noarch
-
-* Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
-- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
-- Minor updates to patches - mostly backported from upstream
-- Reenable hadoop/hdfs support for F24+
-
-* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
-- Remove mathtext and minicern references from cmake files
-- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
-
-* Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
-- Disable hadoop/hdfs support for F24+ (hadoop was retired)
-
-* Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
-- Update to 6.06.04
-- Drop patch root-no-hexfloat-const.patch
-- Add requires on gcc-c++ to root-cling
-
-* Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
-- Rebuild for OCE-0.17.1
-
-* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
-- Update to 6.06.02 (F24+, EPEL7)
-- Change to cmake configuration (was using ./configure)
-- Change to doxygen documentation generation (was using THTML)
-- Run the test suite
-- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
-- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
-  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
-  root-notebook and root-rootaas
-- New subpackage for EPEL7: root-python34
-- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
-
-* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
-- Update to 5.34.36
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
-- Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
-
-* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
-- Rebuild for glew 1.13
-
-* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
-
-* Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
-- Adapt to gfal 2.10 - uses a different #define
-- Exclude ppc64le - has the same issues with cint as ppc and ppc64
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
-- Add versioned dependencies between packages
-- Reenable hadoop/hdfs support for F23+
-
-* Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
-- Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
-- Enable Cintex on aarch64
-
-* Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
-- Update to 5.34.32
-- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
-- Use GNU Free instead of Liberation, works better with TMathText
-- Fix segfault when embedding Type 1 fonts
-- Drop patch root-no-extra-formats.patch (workaround for above problem)
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
-- Update to 5.34.30
-- New sub-package: root-python3
-- Disable hadoop/hdfs support for F23+ (not installable)
-- Drop previously backported gcc 5 patches
-
-* Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
-- Update to 5.34.28
-- Merge emacs support files into main package (guidelines updated)
-
-* Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
-- Update to 5.34.26
-- Drop patch root-xrdversion.patch
-
-* Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
-- Rebuild with fixed cairo (bz 1183242)
-
-* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
-
-* Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
-- Update to 5.34.24
-- Drop patch root-bsd-misc.patch
-
-* Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
-- Move xproofd binaries from root-proofd to root-xproof
-- Adjust EPEL 7 font dependencies
-- Rebuild using new binutils (ld bug fixed - F21+)
-
-* Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
-- Update to 5.34.20
-- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
-- Do not depend on wine's fonts
-- Drop patch root-gccopt.patch
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
-- Update to 5.34.19
-- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
-- New sub-package: root-net-http
-- Drop patches root-thtml-revert.patch, root-gfal2.patch and
-  root-proofx-link-iolib.patch
-
-* Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
-- Add Requires on root-tree-player to root-gui-ged
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
-- Rebuild for ruby 2.1
-- Fix build failure on F21 (missing symbol in libProofx linking)
-
-* Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
-- Update to 5.34.18
-- Build GFAL module using libgfal2
-- New sub-package: root-vdt
-
-* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
-- Update to 5.34.17
-
-* Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
-- Update to 5.34.15
-- Drop patch root-davix.patch
-
-* Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
-- Rebuild for cfitsio 3.360
-
-* Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
-- Adapt to davix >= 0.2.8
-
-* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
-- Update to 5.34.14
-- New sub-package: root-net-davix
-- Drop patch root-pythia8-incdir.patch
-
-* Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
-- Update to 5.34.13
-- Remove java-devel build dependency (not needed with Fedora's libhdfs)
-- Adapt to pythia8 >= 8.1.80
-
-* Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
-- Fix hadoop lib location
-
-* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
-- rebuilt for GLEW 1.10
-
-* Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
-- Update to 5.34.10
-- New sub-package: root-io-hdfs (Fedora 20+)
-- New sub-package: root-sql-sqlite
-
-* Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
-- Exclude armv7hl - cint is not working
-- Use _pkgdocdir when defined
-- Use texlive-stix
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
-- Perl 5.18 rebuild
-
-* Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
-- Rebuild for cfitsio 3.350
-
-* Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
-- Update to 5.34.09
-- New sub-package: root-montecarlo-pythia8
-- Drop patch root-gfal-bits.patch
-- Use xz compression for source tarfile
-- Update ancient root version in EPEL
-
-* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
-- Update to 5.34.07
-
-* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
-- Update to 5.34.06
-- Drop patches root-gviz.patch, root-ruby-version.patch,
-  root-rev48681.patch and root-rev48831.patch
-
-* Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
-- Rebuild for ruby 2.0
-- Rebuild for cfitsio 3.340
-
-* Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
-- Update to 5.34.05
-- Rebuild for xrootd 3.3
-- Patch for latest graphviz (libcgraph)
-- Drop patches root-glibc.patch and root-tclass-fix.patch
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
-- Rebuild for glew 1.9.0
-
-* Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
-- Update to 5.34.02
-
-* Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
-- Rebuild for glew 1.7
-
-* Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
-- Update to 5.34.01
-- Remove sub-packages root-clarens and root-peac (dropped by upstream)
-
-* Thu Jul 05 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-2
-- Do the glibc 2.16 patch properly
-
-* Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
-- Update to 5.34.00
-- New sub-package: root-io-gfal
-
-* Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
-- Update to 5.32.03
-
-* Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
-- Update to 5.32.02
-
-* Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-2
-- Rebuild for xrootd 3.1.1
-
-* Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
-- Update to 5.32.01
-- Drop patches fixed upstream
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
-- Rebuilt for c++ ABI breakage
-
-* Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
-- Adapt to new ruby packaging guidelines
-
-* Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
-- Update to 5.32.00
-
-* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
-- Rebuild against PCRE 8.30
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
-- Update to 5.30.04
-
-* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.03-1
-- Update to 5.30.03
-
-* Fri Sep 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.02-1
-- Update to 5.30.02
-
-* Thu Aug 18 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.01-1
-- Update to 5.30.01
-- Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
-
-* Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-3
-- Backport upstream's fix for the i686 rootcint problem
-
-* Tue Jul 26 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-2
-- Add workaround for rootcint problem on i686
-- Pass default LDFLAGS (relro) to make
-
-* Sun Jul 24 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-1
-- Update to 5.30.00
-- Drop patch root-listbox-height.patch
-- New sub-package: root-proof-bench
-
-* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-2
-- Change build requires from qt-devel to qt4-devel
-
-* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-1
-- Update to 5.28.00e
-
-* Mon Jun 20 2011 ajax@redhat.com - 5.28.00d-2
-- Rebuild for new glew soname
-
-* Fri May 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00d-1
-- Update to 5.28.00d
-
-* Mon May 02 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1.1
-- Fix emacs Requires on RHEL5
-
-* Thu Apr 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1
-- Update to 5.28.00c
-
-* Wed Mar 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-2
-- Rebuild for mysql 5.5.10
-
-* Sat Mar 19 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-1
-- Update to 5.28.00b
-
-* Mon Feb 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00a-1
-- Update to 5.28.00a
-- Drop patches fixed upstream: root-afterimage.patch, root-htmldoc.patch,
-  root-xlibs-ppc.patch, root-cstddef.patch
-- Remove the fedpkg workaround - no longer needed
-
-* Sat Feb 12 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-4
-- Add workaround for changes in fedpkg
-
-* Thu Feb 10 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-3
-- Add Requires on root-graf-postscript to root-gpad
-- Require libAfterImage 1.20 or later to fix issues with circular markers in
-  batch mode
-- Add python26 subpackage for EPEL 5
-- Fix an issue where the last item in a TGFontTypeComboBox is almost
-  invisible (backported from upstream)
-- Add missing cstddef includes for gcc 4.6
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.28.00-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jan 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1.1
-- Fix linking of Xlibs on ppc
-
-* Wed Dec 15 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1
-- Update to 5.28.00
-- Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch,
-  root-missing-explicit-link.patch, root-split-latex.patch,
-  root-cern-filename.patch, root-make-3.82.patch,
-  root-fonttype-combobox-dtor.patch
-- New sub-packages: root-genetic, root-graf-fitsio, root-hist-factory,
-  root-proof-pq2
-- Make root-io a separate package again - the circular dependency with the
-  root-core package was resolved upstream
-
-* Fri Nov 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-3
-- Fix crash in TGFontTypeComboBox destructor
-- Add Requires on root-gui-ged to root-gui
-
-* Mon Nov 01 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-2
-- Rebuild for updated unuran
-
-* Fri Oct 22 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-1
-- Update to 5.26.00e
-- Drop patch fixed upstream: root-tmva-segfault.patch
-- Add Requires on root-proof to root-proofd
-
-* Sat Oct 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-3
-- Add Requires on root-graf-asimage to root-core
-- Add Requires on root-graf-x11 to root-gui
-- Add Requires on root-hist-painter to root-hist
-- Add Requires on root-minuit to root-mathcore
-- Add Requires on krb5-workstation to root-net-krb5
-- Add BuildRequires on krb5-workstation
-
-* Mon Aug 30 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-2
-- Adapt makefile to changes in make 3.82
-
-* Fri Aug 27 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-1
-- Update to 5.26.00d
-- Improved doc generation script
-
-* Mon Aug 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-4
-- Don't remove the prec_stl directory
-- Create a separate tutorial package for the tutorial and test suite
-
-* Thu Jul 29 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-3
-- Correct license tags for: cint, core and roofit
-- Regenerate source tarball due to upstream retag (again)
-
-* Fri Jul 16 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-2
-- Add dependency on gccxml for globus-reflex
-- Split some packages to break circular package dependencies
-- Merge libRIO into root-core
-- Regenerate source tarball due to upstream retag
-
-* Mon Jul 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-1
-- Update to 5.26.00c
-- Disable cint7 package - no longer compiles and has been deprecated upstream
-
-* Wed Jun 09 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-3
-- Use external xrootd
-- Make documentation selfcontained - can be read without network access
-
-* Wed May 19 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-2
-- Fix library detection when linker scripts are used
-- Allow building RFIO IO modules using DPM's RFIO implementation
-
-* Sat Mar 20 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-1
-- Update to 5.26.00b
-- Enable dCache support - dcap library is now in Fedora
-- Use system unuran library instead of embedded sources
-
-* Mon Feb  1 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
-- Update to 5.26.00a
-- Disable cintex package for non-intel architectures
-- Remove embedded gl2ps sources
-
-* Wed Jan 13 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00-1
-- Update to 5.26.00
-- Drop patches fixed upstream: root-globus.patch, root-dot-png.patch,
-  root-loadmeta.patch, root-openssl.patch, root-hash-endian.patch
-
-* Fri Nov 27 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.24.00b-1
-- Initial build
diff --git a/sources b/sources
deleted file mode 100644
index 5330ee7..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
-7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From 0c8b01c3b07f4f2d9c4e42f44aed9c7c89c82b00 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 14 Aug 2016 06:21:55 +0200
Subject: [PATCH 092/344] Revert "Retire packages without systemd support, See
 FESCo ticket 1605"

This reverts commit ee101d8d31e6191f7f38b4e7a2d01bd929df7284.
---
 .gitignore                       |    3 +
 dead.package                     |    1 -
 root-32bit.patch                 |   78 +
 root-abitags.patch               | 1267 +++++++++++
 root-arm.patch                   |   81 +
 root-avoid-gui-crash.patch       |   59 +
 root-avoid-std-bind-lambda.patch |   42 +
 root-broken-cmake-config.patch   |  156 ++
 root-cache-test.patch            |  284 +++
 root-cernlib-doc.patch           | 1307 +++++++++++
 root-compiledata.patch           |   12 +
 root-deprecated-options.patch    |   30 +
 root-dont-link-jvm.patch         |  123 ++
 root-dox-filter.patch            |   86 +
 root-doxyfile.patch              |   30 +
 root-doxygen-warnings.patch      |  723 +++++++
 root-fflags.patch                |   78 +
 root-fontconfig.patch            | 1408 ++++++++++++
 root-gl2ps.patch                 |  254 +++
 root-html-markup.patch           | 1031 +++++++++
 root-latex-markup.patch          |  877 ++++++++
 root-libgfortranbegin.patch      |  182 ++
 root-links.patch                 |  376 ++++
 root-llvm-static.patch           |   11 +
 root-macro-align.patch           |   36 +
 root-missing-cmake-config.patch  |  187 ++
 root-more-fflags.patch           |   33 +
 root-no-abi-check.patch          |   28 +
 root-no-testdata.patch           |   20 +
 root-ppc64.patch                 |   38 +
 root-private-public.patch        |  156 ++
 root-s390x.patch                 |  147 ++
 root-save-memory.patch           |   30 +
 root-see-macro-output.patch      |  266 +++
 root-soname.patch                |   11 +
 root-stressgraphics.patch        |   56 +
 root-template-files.patch        |   28 +
 root-test-install.patch          | 3105 +++++++++++++++++++++++++++
 root-testfiles.sh                |   85 +
 root-tildes.patch                |  194 ++
 root-tmath-doc.patch             |  274 +++
 root-tprincipal-doc.patch        |  483 +++++
 root-tvector2-comment.patch      |   13 +
 root-type1-embed.patch           |   97 +
 root-unuran.patch                |  305 +++
 root-werror.patch                |   12 +
 root.spec                        | 3462 ++++++++++++++++++++++++++++++
 sources                          |    2 +
 48 files changed, 17566 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 delete mode 100644 dead.package
 create mode 100644 root-32bit.patch
 create mode 100644 root-abitags.patch
 create mode 100644 root-arm.patch
 create mode 100644 root-avoid-gui-crash.patch
 create mode 100644 root-avoid-std-bind-lambda.patch
 create mode 100644 root-broken-cmake-config.patch
 create mode 100644 root-cache-test.patch
 create mode 100644 root-cernlib-doc.patch
 create mode 100644 root-compiledata.patch
 create mode 100644 root-deprecated-options.patch
 create mode 100644 root-dont-link-jvm.patch
 create mode 100644 root-dox-filter.patch
 create mode 100644 root-doxyfile.patch
 create mode 100644 root-doxygen-warnings.patch
 create mode 100644 root-fflags.patch
 create mode 100644 root-fontconfig.patch
 create mode 100644 root-gl2ps.patch
 create mode 100644 root-html-markup.patch
 create mode 100644 root-latex-markup.patch
 create mode 100644 root-libgfortranbegin.patch
 create mode 100644 root-links.patch
 create mode 100644 root-llvm-static.patch
 create mode 100644 root-macro-align.patch
 create mode 100644 root-missing-cmake-config.patch
 create mode 100644 root-more-fflags.patch
 create mode 100644 root-no-abi-check.patch
 create mode 100644 root-no-testdata.patch
 create mode 100644 root-ppc64.patch
 create mode 100644 root-private-public.patch
 create mode 100644 root-s390x.patch
 create mode 100644 root-save-memory.patch
 create mode 100644 root-see-macro-output.patch
 create mode 100644 root-soname.patch
 create mode 100644 root-stressgraphics.patch
 create mode 100644 root-template-files.patch
 create mode 100644 root-test-install.patch
 create mode 100755 root-testfiles.sh
 create mode 100644 root-tildes.patch
 create mode 100644 root-tmath-doc.patch
 create mode 100644 root-tprincipal-doc.patch
 create mode 100644 root-tvector2-comment.patch
 create mode 100644 root-type1-embed.patch
 create mode 100644 root-unuran.patch
 create mode 100644 root-werror.patch
 create mode 100644 root.spec
 create mode 100644 sources

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9ff0650
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/*.tar.xz
+/usa.root
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 1186b4b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Retire packages without systemd support, See FESCo ticket 1605
diff --git a/root-32bit.patch b/root-32bit.patch
new file mode 100644
index 0000000..326a8d8
--- /dev/null
+++ b/root-32bit.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
+--- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
+@@ -179,7 +179,7 @@
+ 
+    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
+ 
+-   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
++   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
+ 
+    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
+ 
+diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
+--- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
+@@ -1121,7 +1121,7 @@
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
+ #if defined (R__LINUX) && !defined(R__B64)
+    // problem of precision on linux 32
+-   if (Dim ==4) scale = 1000000000;
++   if (Dim ==4) scale = 5000000000;
+ #endif
+    // for problem with PtEtaPhiE
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
+diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
+--- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
+@@ -312,7 +312,7 @@
+    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
+    double par[2] = {3,4};
+    double xx[2] = {0.8,1.6};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -326,7 +326,7 @@
+    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
+    double par[2] = {3,4};
+    double xx[3] = {0.8,1.6,2.2};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -369,12 +369,12 @@
+    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
+    f2.SetParameters(10,1,0,1);
+    f0.SetParameters(f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
+ 
+    TF1 f3("f3","f1+[0]");
+    // param order should be the same
+    f3.SetParameters( f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
+    return ok;
+ }
+ 
+@@ -465,7 +465,7 @@
+    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
+    TF1 f6("f6",func,-10,10,4);
+    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
+-   ok &= (f5.Eval(2) == f6.Eval(2) );
++   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
+    return ok;
+ }
+ 
+@@ -485,7 +485,7 @@
+    // keep same order in evaluation
+    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
+    f0.SetParameters(1.1,2.1);
+-   ok &= (fsincos.Eval(2) == f0.Eval(2) );
++   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
+    return ok;
+ 
+ }
diff --git a/root-abitags.patch b/root-abitags.patch
new file mode 100644
index 0000000..040474a
--- /dev/null
+++ b/root-abitags.patch
@@ -0,0 +1,1267 @@
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
+--- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
+@@ -0,0 +1,90 @@
++========
++Abi Tags
++========
++
++Introduction
++============
++
++This text tries to describe gcc semantic for mangling "abi_tag" attributes
++described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
++
++There is no guarantee the following rules are correct, complete or make sense
++in any way as they were determined empirically by experiments with gcc5.
++
++Declaration
++===========
++
++Abi tags are declared in an abi_tag attribute and can be applied to a
++function, variable, class or inline namespace declaration. The attribute takes
++one or more strings (called tags); the order does not matter.
++
++See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
++details.
++
++Tags on an inline namespace are called "implicit tags", all other tags are
++"explicit tags".
++
++Mangling
++========
++
++All tags that are "active" on a <unqualified-name> are emitted after the
++<unqualified-name>, before <template-args> or <discriminator>, and are part of
++the same <substitution> the <unqualified-name> is.
++
++They are mangled as:
++
++    <abi-tags> ::= <abi-tag>*   # sort by name
++    <abi-tag> ::= B <tag source-name>
++
++Example:
++
++    __attribute__((abi_tag("test")))
++    void Func();
++
++    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
++
++Active tags
++===========
++
++A namespace has never any active tags; for types (class / struct / union /
++enum) the explicit tags are the active tags.
++
++For variables and functions the active tags are the explicit tags plus any
++"required tags" which are not in the "available tags" set:
++
++    derived-tags := (required-tags - available-tags)
++    active-tags := explicit-tags + derived-tags
++
++Required tags for a function
++============================
++
++If a function is used as a local scope for another name, and is part of
++another function as local scope, it doesn't have any required tags.
++
++If a function is used as a local scope for a guard variable name, it doesn't
++have any required tags.
++
++Otherwise the function requires any implicit or explicit tag used in the name
++for the return type.
++
++Required tags for a variable
++============================
++
++A variable requires any implicit or explicit tag used in its type.
++
++Available tags
++==============
++
++All tags used in the prefix and in the template arguments for a name are
++available; for functions also all  tags from the <bare-function-type> (which
++might include the return type for template functions) are available.
++
++For <local-name>s all active tags used in the local part (<function-
++encoding>) are available, but not implicit tags which were not active!
++
++Implicit and explicit tags used in the <unqualified-name> for a function (as
++in the type of a cast operator) are NOT available.
++
++Example: a cast operator to std::string (which is
++std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
++required from the return type `std::string` but not available.
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
+@@ -144,6 +144,7 @@
+ class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
+ class VariadicUnsignedArgument<string name> : Argument<name, 1>;
+ class VariadicExprArgument<string name> : Argument<name, 1>;
++class VariadicStringArgument<string name> : Argument<name, 1>;
+ 
+ // A version of the form major.minor[.subminor].
+ class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
+@@ -336,6 +337,14 @@
+ // Attributes begin here
+ //
+ 
++def AbiTag : Attr {
++  let Spellings = [GCC<"abi_tag">];
++  let Args = [VariadicStringArgument<"Tags">];
++  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
++                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
++  let Documentation = [Undocumented];
++}
++
+ def AddressSpace : TypeAttr {
+   let Spellings = [GNU<"address_space">];
+   let Args = [IntArgument<"AddressSpace">];
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
+@@ -2255,7 +2255,8 @@
+   "Objective-C instance methods|init methods of interface or class extension declarations|"
+   "variables, functions and classes|Objective-C protocols|"
+   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
+-  "interface or protocol declarations|kernel functions}1">,
++  "interface or protocol declarations|kernel functions|"
++  "structs, classes, variables, functions, methods and inline namespaces}1">,
+   InGroup<IgnoredAttributes>;
+ def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
+ def warn_type_attribute_wrong_type : Warning<
+@@ -3922,6 +3923,12 @@
+ def err_redefinition_extern_inline : Error<
+   "redefinition of a 'extern inline' function %0 is not supported in "
+   "%select{C99 mode|C++}1">;
++def err_attr_abi_tag_only_on_inline_namespace :
++  Error<"abi_tag attribute only allowed on inline namespaces">;
++def err_abi_tag_on_redeclaration :
++  Error<"cannot add abi_tag attribute in redeclaration">;
++def err_new_abi_tag_on_redeclaration :
++  Error<"abi_tag %0 missing in original declaration">;
+ 
+ def note_deleted_dtor_no_operator_delete : Note<
+   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
+@@ -846,7 +846,8 @@
+   ExpectedStructOrUnionOrTypedef,
+   ExpectedStructOrTypedef,
+   ExpectedObjectiveCInterfaceOrProtocol,
+-  ExpectedKernelFunction
++  ExpectedKernelFunction,
++  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
+ };
+ 
+ }  // end namespace clang
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
+@@ -202,6 +202,8 @@
+ class CXXNameMangler {
+   ItaniumMangleContextImpl &Context;
+   raw_ostream &Out;
++  bool NullOut = false;
++  bool DisableDerivedAbiTags = false;
+ 
+   /// The "structor" is the top-level declaration being mangled, if
+   /// that's not a template specialization; otherwise it's the pattern
+@@ -251,6 +253,167 @@
+ 
+   } FunctionTypeDepth;
+ 
++  // abi_tag is a gcc attribute, taking one or more strings called "tags".
++  //
++  // the goal is to annotage against which version of a library an object was
++  // build and to be able to provide backwards compatibility ("dual abi").
++  //
++  // for this the emitted mangled names have to be different, while you don't
++  // want the user to have to use different names in the source.
++  //
++  // the abi_tag can be present on Struct, Var and Function  declarations as
++  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
++  // are always emitted after the unqualified name, and (implicit) tags on
++  // namespace are not.
++  //
++  // For functions and variables there is a set of "implicitly available"
++  // tags. These tags are: all tags from the namespace/structs the name is
++  // embedded in, all tags from any template arguments of the name, and, for
++  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
++  // parameters and sometimes the return type).
++  //
++  // For functions this is basically the list of all tags from the signature
++  // without the unqualified name and usually without the return type of the
++  // function. In `operator Type()` Type is NOT part of that list, as it is
++  // part of the unqualified name!
++  //
++  // Now all tags from the function return type/variable type which are not
++  // "implicitly available" must be added to the explicit list of tags, and
++  // are emitted after the unqualified name.
++  //
++  // Example:
++  // namespace std {
++  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
++  //   inline namespace __cxx11 {
++  //     struct string { };
++  //   }
++  // }
++  //
++  // std::string foo(); // needs abi tag "cxx11" on foo
++  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
++  // __attribute__((__abi_tag__("cxx11")))
++  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
++  //
++  // The tags are sorted by name before emitting, and are serialized as
++  //   <abitag> ::= B <"tag" source-name>
++
++  typedef SmallVector<StringRef, 4> AbiTagList;
++
++  // state to gather all implicit and explicit tags used in a mangled name.
++  // must always have an instance of this while emitting any name to keep
++  // track.
++  //
++  // TODO(abitags): how to handle substituted names? they should add the tags used in
++  // the substitution to the list of available tags.
++  class AbiTagState final {
++  public:
++    //! all abi tags used implicitly or explicitly
++    std::set<StringRef> UsedAbiTags;
++    //! all explicit abi tags (i.e. not from namespace)
++    std::set<StringRef> EmittedAbiTags;
++
++    AbiTagState* &LinkHead;
++    AbiTagState *Parent{nullptr};
++
++    bool LinkActive{false};
++
++    explicit AbiTagState(AbiTagState* &linkHead)
++      : LinkHead(linkHead) {
++      Parent = LinkHead;
++      LinkHead = this;
++      LinkActive = true;
++    }
++
++    // no copy, no move
++    AbiTagState(AbiTagState const&) = delete;
++    AbiTagState& operator=(AbiTagState const&) = delete;
++
++    ~AbiTagState() {
++      pop();
++    }
++
++    void pop() {
++      if (!LinkActive) return;
++
++      assert(LinkHead == this && "abi tag link head must point to us on destruction");
++      LinkActive = false;
++      if (Parent) {
++        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
++        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
++      }
++      LinkHead = Parent;
++    }
++
++    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++      ND = cast<NamedDecl>(ND->getCanonicalDecl());
++
++      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
++        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
++      } else {
++        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
++        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
++          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
++            for (const auto& Tag: AbiTag->tags()) {
++              UsedAbiTags.insert(Tag);
++            }
++          }
++          // don't emit abi tags for namespaces
++          return;
++        }
++      }
++
++      AbiTagList TagList;
++      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
++        for (const auto& Tag: AbiTag->tags()) {
++          UsedAbiTags.insert(Tag);
++          // AbiTag->tags() is sorted and has no duplicates
++          TagList.push_back(Tag);
++        }
++      }
++
++      if (AdditionalAbiTags) {
++        for (const auto& Tag: *AdditionalAbiTags) {
++          UsedAbiTags.insert(Tag);
++          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
++            // don't insert duplicates
++            TagList.push_back(Tag);
++          }
++        }
++        // AbiTag->tags() are already sorted; only add if we had additional tags
++        std::sort(TagList.begin(), TagList.end());
++      }
++
++      writeSortedUniqueAbiTags(Out, TagList);
++    }
++
++  protected:
++    template<typename TagList>
++    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
++      for (const auto& Tag: AbiTags) {
++        EmittedAbiTags.insert(Tag);
++        Out << "B";
++        Out << Tag.size();
++        Out << Tag;
++      }
++    }
++  } *AbiTags = nullptr;
++  AbiTagState AbiTagsRoot{AbiTags};
++
++  struct TemporaryDisableDerivedAbiTags {
++    bool& StateRef;
++    bool OldState;
++
++    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
++    : StateRef(State) {
++      OldState = StateRef;
++      StateRef = Disable;
++    }
++    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
++    ~TemporaryDisableDerivedAbiTags() {
++      StateRef = OldState;
++    }
++  };
++
+   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
+ 
+   ASTContext &getASTContext() const { return Context.getASTContext(); }
+@@ -273,6 +436,10 @@
+     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
+       SeqID(0) { }
+ 
++  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
++    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
++      SeqID(Outer.SeqID) { }
++
+ #if MANGLE_CHECKER
+   ~CXXNameMangler() {
+     if (Out.str()[0] == '\01')
+@@ -286,18 +453,21 @@
+ #endif
+   raw_ostream &getStream() { return Out; }
+ 
++  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
++
+   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
+   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
+   void mangleNumber(const llvm::APSInt &I);
+   void mangleNumber(int64_t Number);
+   void mangleFloat(const llvm::APFloat &F);
+-  void mangleFunctionEncoding(const FunctionDecl *FD);
++  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
+   void mangleSeqID(unsigned SeqID);
+-  void mangleName(const NamedDecl *ND);
++  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
+   void mangleType(QualType T);
+   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
+   
+ private:
++  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
+ 
+   bool mangleSubstitution(const NamedDecl *ND);
+   bool mangleSubstitution(QualType T);
+@@ -326,31 +496,49 @@
+                             DeclarationName name,
+                             unsigned KnownArity = UnknownArity);
+ 
+-  void mangleName(const TemplateDecl *TD,
++  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
++
++  void mangleNameWithAbiTags(const NamedDecl *ND,
++                             const AbiTagList *AdditionalAbiTags,
++                             bool ExcludeUnqualifiedName);
++  void mangleTemplateName(const TemplateDecl *TD,
++                  const AbiTagList *AdditionalAbiTags,
++                  bool ExcludeUnqualifiedName,
+                   const TemplateArgument *TemplateArgs,
+                   unsigned NumTemplateArgs);
+-  void mangleUnqualifiedName(const NamedDecl *ND) {
+-    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
++  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
+   }
+   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
+-                             unsigned KnownArity);
+-  void mangleUnscopedName(const NamedDecl *ND);
+-  void mangleUnscopedTemplateName(const TemplateDecl *ND);
+-  void mangleUnscopedTemplateName(TemplateName);
++                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                  const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(TemplateName,
++                                  const AbiTagList *AdditionalAbiTags);
+   void mangleSourceName(const IdentifierInfo *II);
+-  void mangleLocalName(const Decl *D);
++  void mangleLocalName(const Decl *D,
++                       const AbiTagList *AdditionalAbiTags,
++                       bool ExcludeUnqualifiedName);
+   void mangleBlockForPrefix(const BlockDecl *Block);
+   void mangleUnqualifiedBlock(const BlockDecl *Block);
+   void mangleLambda(const CXXRecordDecl *Lambda);
+   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
+-                        bool NoFunction=false);
++                        const AbiTagList *AdditionalAbiTags,
++                        bool NoFunction,
++                        bool ExcludeUnqualifiedName);
+   void mangleNestedName(const TemplateDecl *TD,
++                        const AbiTagList *AdditionalAbiTags,
++                        bool ExcludeUnqualifiedName,
+                         const TemplateArgument *TemplateArgs,
+                         unsigned NumTemplateArgs);
+   void manglePrefix(NestedNameSpecifier *qualifier);
+   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
+   void manglePrefix(QualType type);
+-  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
++  void mangleTemplatePrefix(const TemplateDecl *ND,
++                            const AbiTagList *AdditionalAbiTags,
++                            bool NoFunction = false,
++                            bool ExcludeUnqualifiedName = false);
+   void mangleTemplatePrefix(TemplateName Template);
+   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
+   void mangleQualifiers(Qualifiers Quals);
+@@ -391,6 +579,10 @@
+   void mangleTemplateParameter(unsigned Index);
+ 
+   void mangleFunctionParam(const ParmVarDecl *parm);
++
++  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
++  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
++  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
+ };
+ 
+ }
+@@ -441,6 +633,11 @@
+   return true;
+ }
+ 
++void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++  assert(AbiTags && "require AbiTagState");
++  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
++}
++
+ void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
+   // <mangled-name> ::= _Z <encoding>
+   //            ::= <data name>
+@@ -456,14 +653,28 @@
+     mangleName(cast<FieldDecl>(D));
+ }
+ 
+-void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
+-  // <encoding> ::= <function name> <bare-function-type>
+-  mangleName(FD);
+-
++void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
+   // Don't mangle in the type if this isn't a decl we should typically mangle.
+-  if (!Context.shouldMangleDeclName(FD))
++  if (!Context.shouldMangleDeclName(FD)) {
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
+     return;
++  }
++
++  // <encoding> ::= <function name> <bare-function-type>
++
++  if (ExcludeUnqualifiedName)
++  {
++    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
++  } else {
++    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
++    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
++  }
++
++  mangleFunctionEncodingBareType(FD);
++}
+ 
++void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
+   if (FD->hasAttr<EnableIfAttr>()) {
+     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
+     Out << "Ua9enable_ifI";
+@@ -509,7 +720,7 @@
+     FD = PrimaryTemplate->getTemplatedDecl();
+   }
+ 
+-  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
++  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
+                          MangleReturnType);
+ }
+ 
+@@ -567,7 +778,21 @@
+   return nullptr;
+ }
+ 
+-void CXXNameMangler::mangleName(const NamedDecl *ND) {
++// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
++void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
++  if (!ExcludeUnqualifiedName) {
++    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
++      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
++      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
++      return;
++    }
++  }
++  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
++}
++
++void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
++                                           const AbiTagList *AdditionalAbiTags,
++                                           bool ExcludeUnqualifiedName) {
+   //  <name> ::= <nested-name>
+   //         ::= <unscoped-name>
+   //         ::= <unscoped-template-name> <template-args>
+@@ -583,7 +808,7 @@
+     while (!DC->isNamespace() && !DC->isTranslationUnit())
+       DC = getEffectiveParentContext(DC);
+   else if (GetLocalClassDecl(ND)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+@@ -593,76 +818,88 @@
+     // Check if we have a template.
+     const TemplateArgumentList *TemplateArgs = nullptr;
+     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-      mangleUnscopedTemplateName(TD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+       mangleTemplateArgs(*TemplateArgs);
+       return;
+     }
+ 
+-    mangleUnscopedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedName(ND, AdditionalAbiTags);
+     return;
+   }
+ 
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+-  mangleNestedName(ND, DC);
++  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
+ }
+-void CXXNameMangler::mangleName(const TemplateDecl *TD,
+-                                const TemplateArgument *TemplateArgs,
+-                                unsigned NumTemplateArgs) {
++
++void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
++                                        const AbiTagList *AdditionalAbiTags,
++                                        bool ExcludeUnqualifiedName,
++                                        const TemplateArgument *TemplateArgs,
++                                        unsigned NumTemplateArgs) {
+   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
+ 
+   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
+-    mangleUnscopedTemplateName(TD);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+   } else {
+-    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
++    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
+   }
+ }
+ 
+-void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
++void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
+   //  <unscoped-name> ::= <unqualified-name>
+   //                  ::= St <unqualified-name>   # ::std::
+ 
+   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
+     Out << "St";
+ 
+-  mangleUnqualifiedName(ND);
++  mangleUnqualifiedName(ND, AdditionalAbiTags);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
++void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (mangleSubstitution(ND))
+     return;
+ 
+   // <template-template-param> ::= <template-param>
+-  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
++  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
+     mangleTemplateParameter(TTP->getIndex());
+-  else
+-    mangleUnscopedName(ND->getTemplatedDecl());
++  } else {
++    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
++  }
+ 
+   addSubstitution(ND);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
++void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleUnscopedTemplateName(TD);
++    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+   
+   if (mangleSubstitution(Template))
+     return;
+ 
++  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
++
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Not a dependent template name?");
+   if (const IdentifierInfo *Id = Dependent->getIdentifier())
+     mangleSourceName(Id);
+   else
+     mangleOperatorName(Dependent->getOperator(), UnknownArity);
+-  
++
+   addSubstitution(Template);
+ }
+ 
+@@ -824,6 +1061,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespace());
+     break;
+   case NestedNameSpecifier::NamespaceAlias:
+     if (qualifier->getPrefix())
+@@ -832,6 +1070,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+ 
+   case NestedNameSpecifier::TypeSpec:
+@@ -917,15 +1156,18 @@
+ 
+     case Type::Typedef:
+       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TypedefType>(type)->getDecl());
+       break;
+ 
+     case Type::UnresolvedUsing:
+       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
+       break;
+ 
+     case Type::Record:
+       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TagType>(type)->getDecl());
+       break;
+ 
+     case Type::TemplateSpecialization: {
+@@ -943,6 +1185,7 @@
+         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
+ 
+         mangleSourceName(temp->getIdentifier());
++        writeAbiTags(temp);
+         break;
+       }
+ 
+@@ -974,16 +1217,19 @@
+     case Type::InjectedClassName:
+       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
+       break;
+ 
+     case Type::DependentName:
+       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
++      // writeAbiTags(cast<DependentNameType>(type));
+       break;
+ 
+     case Type::DependentTemplateSpecialization: {
+       const DependentTemplateSpecializationType *tst
+         = cast<DependentTemplateSpecializationType>(type);
+       mangleSourceName(tst->getIdentifier());
++      // writeAbiTags(tst);
+       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
+       break;
+     }
+@@ -1033,6 +1279,7 @@
+     }
+ 
+     mangleSourceName(qualifier->getAsIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+   }
+ 
+@@ -1049,12 +1296,14 @@
+                                           DeclarationName name,
+                                           unsigned knownArity) {
+   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
+-  mangleUnqualifiedName(nullptr, name, knownArity);
++  mangleUnqualifiedName(nullptr, name, knownArity,
++                        /*AdditionalAbiTags*/ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
+                                            DeclarationName Name,
+-                                           unsigned KnownArity) {
++                                           unsigned KnownArity,
++                                           const AbiTagList *AdditionalAbiTags) {
+   //  <unqualified-name> ::= <operator-name>
+   //                     ::= <ctor-dtor-name>
+   //                     ::= <source-name>
+@@ -1072,6 +1321,8 @@
+         Out << 'L';
+ 
+       mangleSourceName(II);
++      if (ND)
++        writeAbiTags(ND, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1111,6 +1362,7 @@
+       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
+ 
+       mangleSourceName(FD->getIdentifier());
++      // TODO(abitags): not emitting abi tags: internal name anyway
+       break;
+     }
+ 
+@@ -1131,6 +1383,9 @@
+       assert(D->getDeclName().getAsIdentifierInfo() &&
+              "Typedef was not named!");
+       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
++      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
++      // explicit abi tags are still possible; take from underlying type, not from typedef.
++      writeAbiTags(TD, nullptr);
+       break;
+     }
+ 
+@@ -1140,6 +1395,7 @@
+     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
+     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
+       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
++        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
+         mangleLambda(Record);
+         break;
+       }
+@@ -1151,6 +1407,7 @@
+       if (UnnamedMangle > 1)
+         Out << llvm::utostr(UnnamedMangle - 2);
+       Out << '_';
++      writeAbiTags(TD, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1183,6 +1440,7 @@
+       // Otherwise, use the complete constructor name. This is relevant if a
+       // class with a constructor is declared within a constructor.
+       mangleCXXCtorType(Ctor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXDestructorName:
+@@ -1194,12 +1452,14 @@
+       // Otherwise, use the complete destructor name. This is relevant if a
+       // class with a destructor is declared within a destructor.
+       mangleCXXDtorType(Dtor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXConversionFunctionName:
+     // <operator-name> ::= cv <type>    # (cast)
+     Out << "cv";
+     mangleType(Name.getCXXNameType());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXOperatorName: {
+@@ -1223,6 +1483,7 @@
+     // FIXME: This mangling is not yet official.
+     Out << "li";
+     mangleSourceName(Name.getCXXLiteralIdentifier());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXUsingDirective:
+@@ -1239,7 +1500,9 @@
+ 
+ void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
+                                       const DeclContext *DC,
+-                                      bool NoFunction) {
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool NoFunction,
++                                      bool ExcludeUnqualifiedName) {
+   // <nested-name> 
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
+@@ -1259,30 +1522,35 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD, NoFunction);
++    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
+     mangleTemplateArgs(*TemplateArgs);
+   }
+   else {
+     manglePrefix(DC, NoFunction);
+-    mangleUnqualifiedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND, AdditionalAbiTags);
+   }
+ 
+   Out << 'E';
+ }
+ void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool ExcludeUnqualifiedName,
+                                       const TemplateArgument *TemplateArgs,
+                                       unsigned NumTemplateArgs) {
+   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
+ 
+   Out << 'N';
+ 
+-  mangleTemplatePrefix(TD);
++  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
+   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+ 
+   Out << 'E';
+ }
+ 
+-void CXXNameMangler::mangleLocalName(const Decl *D) {
++void CXXNameMangler::mangleLocalName(const Decl *D,
++                                     const AbiTagList *AdditionalAbiTags,
++                                     bool ExcludeUnqualifiedName) {
+   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
+   //              := Z <function encoding> E s [<discriminator>]
+   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
+@@ -1294,15 +1562,25 @@
+ 
+   Out << 'Z';
+ 
+-  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
+-    mangleObjCMethodName(MD);
+-  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
+-    mangleBlockForPrefix(BD);
+-  else
+-    mangleFunctionEncoding(cast<FunctionDecl>(DC));
++  {
++    AbiTagState localAbiTags(AbiTags);
++
++    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
++      mangleObjCMethodName(MD);
++    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
++      mangleBlockForPrefix(BD);
++    else
++      mangleFunctionEncoding(cast<FunctionDecl>(DC));
++
++    // implicit abi tags (from namespace) are not available in the following
++    // entity; reset to actually emitted tags, which are available.
++    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
++  }
+ 
+   Out << 'E';
+ 
++  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
++
+   if (RD) {
+     // The parameter number is omitted for the last parameter, 0 for the 
+     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
+@@ -1327,13 +1605,17 @@
+     // Mangle the name relative to the closest enclosing function.
+     // equality ok because RD derived from ND above
+     if (D == RD)  {
+-      mangleUnqualifiedName(RD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedName(RD, AdditionalAbiTags);
+     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
+-      mangleUnqualifiedBlock(BD);
++      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedBlock(BD);
+     } else {
+       const NamedDecl *ND = cast<NamedDecl>(D);
+-      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
++      mangleNestedName(ND, getEffectiveDeclContext(ND),
++                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
+     }
+   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+     // Mangle a block in a default parameter; see above explanation for
+@@ -1350,30 +1632,35 @@
+       }
+     }
+ 
+-    mangleUnqualifiedBlock(BD);
++    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedBlock(BD);
+   } else {
+-    mangleUnqualifiedName(cast<NamedDecl>(D));
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
+   }
+ 
+-  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
+-    unsigned disc;
+-    if (Context.getNextDiscriminator(ND, disc)) {
+-      if (disc < 10)
+-        Out << '_' << disc;
+-      else
+-        Out << "__" << disc << '_';
++  if (!ExcludeUnqualifiedName) {
++    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
++      unsigned disc;
++      if (Context.getNextDiscriminator(ND, disc)) {
++        if (disc < 10)
++          Out << '_' << disc;
++        else
++          Out << "__" << disc << '_';
++      }
+     }
+   }
+ }
+ 
+ void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
+   if (GetLocalClassDecl(Block)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   const DeclContext *DC = getEffectiveDeclContext(Block);
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   manglePrefix(getEffectiveDeclContext(Block));
+@@ -1384,10 +1671,11 @@
+   if (Decl *Context = Block->getBlockManglingContextDecl()) {
+     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
+         Context->getDeclContext()->isRecord()) {
+-      if (const IdentifierInfo *Name
+-            = cast<NamedDecl>(Context)->getIdentifier()) {
++      const auto *ND = cast<NamedDecl>(Context);
++      if (const IdentifierInfo *Name = ND->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
++        Out << 'M';
+       }
+     }
+   }
+@@ -1420,7 +1708,7 @@
+       if (const IdentifierInfo *Name
+             = cast<NamedDecl>(Context)->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        Out << 'M';
+       }
+     }
+   }
+@@ -1502,11 +1790,11 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD);
++    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+     mangleTemplateArgs(*TemplateArgs);
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND);
++    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
+   }
+ 
+   addSubstitution(ND);
+@@ -1517,7 +1805,7 @@
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleTemplatePrefix(TD);
++    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+ 
+   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
+     manglePrefix(Qualified->getQualifier());
+@@ -1525,18 +1813,21 @@
+   if (OverloadedTemplateStorage *Overloaded
+                                       = Template.getAsOverloadedTemplate()) {
+     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
+-                          UnknownArity);
++                          UnknownArity,
++                          /* AdditionalAbiTags */ nullptr);
+     return;
+   }
+    
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Unknown template name kind?");
+   manglePrefix(Dependent->getQualifier());
+-  mangleUnscopedTemplateName(Template);
++  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
+-                                          bool NoFunction) {
++                                          const AbiTagList *AdditionalAbiTags,
++                                          bool NoFunction,
++                                          bool ExcludeUnqualifiedName) {
+   // <template-prefix> ::= <prefix> <template unqualified-name>
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+@@ -1548,10 +1839,12 @@
+ 
+   // <template-template-param> ::= <template-param>
+   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    // TODO(abitags): ???
+     mangleTemplateParameter(TTP->getIndex());
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND->getTemplatedDecl());
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
+   }
+ 
+   addSubstitution(ND);
+@@ -1595,6 +1888,7 @@
+     // <name> ::= <nested-name>
+     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
+     mangleSourceName(Dependent->getIdentifier());
++    // writeAbiTags(Dependent);
+     break;
+   }
+ 
+@@ -2370,7 +2664,11 @@
+ 
+ void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
+   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
+-    mangleName(TD, T->getArgs(), T->getNumArgs());
++    // types only have explicit abi tags, no addition tags
++    mangleTemplateName(TD,
++                       /* AdditionalAbiTags */ nullptr,
++                       /* ExcludeUnqualifiedName */ false,
++                       T->getArgs(), T->getNumArgs());
+   } else {
+     if (mangleSubstitution(QualType(T, 0)))
+       return;
+@@ -2417,6 +2715,7 @@
+   Out << 'N';
+   manglePrefix(T->getQualifier());
+   mangleSourceName(T->getIdentifier());
++  // writeAbiTags(T); // TODO(abitags)
+   Out << 'E';
+ }
+ 
+@@ -3722,6 +4021,74 @@
+   Substitutions[Ptr] = SeqID++;
+ }
+ 
++std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
++  llvm::raw_null_ostream NullOutStream;
++  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
++
++  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
++    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
++  } else {
++    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
++  }
++
++  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
++  std::set<StringRef> ReturnTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
++
++    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
++    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
++    TrackReturnTypeTags.mangleType(Proto->getReturnType());
++    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
++
++    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: ReturnTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
++  std::set<StringRef> VariableTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackVariableType(*this, NullOutStream);
++
++    TrackVariableType.mangleType(VD->getType());
++
++    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: VariableTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
+ //
+ 
+ /// \brief Mangles the name of the declaration D and emits that name to the
+@@ -3824,6 +4191,7 @@
+   //  <special-name> ::= GV <object name>       # Guard variable for one-time
+   //                                            # initialization
+   CXXNameMangler Mangler(*this, Out);
++  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
+   Mangler.getStream() << "_ZGV";
+   Mangler.mangleName(D);
+ }
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -3948,6 +3948,58 @@
+       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
+ }
+ 
++static void handleAbiTagAttr(Sema &S, Decl *D,
++                             const AttributeList &Attr) {
++  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
++    return;
++
++  SmallVector<std::string, 4> Tags;
++
++  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
++    StringRef Tag;
++
++    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
++      return;
++
++    Tags.push_back(Tag);
++  }
++  // store tags sorted and without duplicates
++  std::sort(Tags.begin(), Tags.end());
++  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
++
++  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
++    if (!NS->isInline()) {
++      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
++      return;
++    }
++  }
++
++  const auto *CD = D->getCanonicalDecl();
++  if (CD != D) {
++    // redeclarations must not add new abi tags, or abi tags in the first place
++    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
++    if (nullptr == OldAbiTagAttr) {
++      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
++      S.Diag(CD->getLocation(), diag::note_previous_definition);
++      return;
++    }
++    for (const auto& NewTag: Tags) {
++      if (std::find(OldAbiTagAttr->tags_begin(),
++                    OldAbiTagAttr->tags_end(),
++                    NewTag) == OldAbiTagAttr->tags_end()) {
++        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
++        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
++        return;
++      }
++    }
++    return;
++  }
++
++  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
++                                          Tags.data(), Tags.size(),
++                                          Attr.getAttributeSpellingListIndex()));
++}
++
+ static void handleARMInterruptAttr(Sema &S, Decl *D,
+                                    const AttributeList &Attr) {
+   // Check the attribute arguments.
+@@ -4707,6 +4759,9 @@
+   case AttributeList::AT_Thread:
+     handleDeclspecThreadAttr(S, D, Attr);
+     break;
++  case AttributeList::AT_AbiTag:
++    handleAbiTagAttr(S, D, Attr);
++    break;
+ 
+   // Thread safety attributes:
+   case AttributeList::AT_AssertExclusiveLock:
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -79,6 +79,7 @@
+     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
+     .Case("Expr *", "ReadExpr(F)")
+     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
++    .Case("std::string", "ReadString(Record, Idx)")
+     .Default("Record[Idx++]");
+ }
+ 
+@@ -92,6 +93,7 @@
+     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
+     .Case("IdentifierInfo *", 
+           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
++    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
+     .Default("Record.push_back(" + std::string(name) + ");\n");
+ }
+ 
+@@ -986,6 +988,16 @@
+     }
+   };
+ 
++  class VariadicStringArgument : public VariadicArgument {
++  public:
++    VariadicStringArgument(const Record &Arg, StringRef Attr)
++      : VariadicArgument(Arg, Attr, "std::string")
++    {}
++    void writeValueImpl(raw_ostream &OS) const override {
++      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
++    }
++  };
++
+   class TypeArgument : public SimpleArgument {
+   public:
+     TypeArgument(const Record &Arg, StringRef Attr)
+@@ -1047,6 +1059,8 @@
+     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
+   else if (ArgName == "VariadicUnsignedArgument")
+     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
++  else if (ArgName == "VariadicStringArgument")
++    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
+   else if (ArgName == "VariadicEnumArgument")
+     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
+   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
new file mode 100644
index 0000000..d865e30
--- /dev/null
+++ b/root-arm.patch
@@ -0,0 +1,81 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
+@@ -19,7 +19,7 @@
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+ elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
+-  message(STATUS "Found a 64bit system")
++  message(STATUS "Found a 64bit ARM system")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+@@ -42,6 +42,18 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES arm)
++  message(STATUS "Found a 32bit ARM system")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxarm)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxarm)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
+@@ -52,6 +52,8 @@
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
+@@ -47,6 +47,8 @@
+     set(AFTER_CC "${AFTER_CC} -m64")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
+@@ -52,6 +52,10 @@
+     set(FREETYPE_CFLAGS "-m64 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+     set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
++    set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
+@@ -17,6 +17,8 @@
+ 
+ if(ROOT_ARCHITECTURE MATCHES linuxarm64)
+   set(ROOT_CLING_TARGET "AArch64")
++elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++  set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
new file mode 100644
index 0000000..776e79a
--- /dev/null
+++ b/root-avoid-gui-crash.patch
@@ -0,0 +1,59 @@
+diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
+--- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
+@@ -30,7 +30,7 @@
+ shape, size, angle.</h2></center>
+ The picture below shows this interface.
+ End_Html
+-Begin_Macro(GUI)
++~~~
+ {
+    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
+    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
+@@ -41,7 +41,8 @@
+    r->SetWindowSize(700,500);
+    return r->GetMainFrame();
+ }
+-End_Macro */
++~~~
++*/
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
+@@ -72,7 +72,7 @@
+ <br><br>
+ A simple macro to use a TGTable with a TGSimpleTableInterface:
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    Int_t i = 0, j = 0;
+    UInt_t nrows = 6, ncolumns = 5;
+@@ -111,13 +111,13 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ Begin_Html
+ 
+ It is also possible to visualise data from a tree. A simple macro
+ showing the use of a TTreeTableInterface follows.
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    // Open a root file.
+    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
+@@ -153,7 +153,7 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ */
+ 
+ // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
new file mode 100644
index 0000000..5cbff77
--- /dev/null
+++ b/root-avoid-std-bind-lambda.patch
@@ -0,0 +1,42 @@
+diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
+--- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
+@@ -33,6 +33,9 @@
+    // Total amount of numbers
+    const UInt_t nNumbers = 20000000U;
+ 
++   // We split the work in equal parts
++   const auto workSize = nNumbers / nWorkers;
++
+    // A simple function to fill ntuples randomly
+ 
+    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
+@@ -57,7 +60,7 @@
+    // We now go MP! ------------------------------------------------------------
+ 
+    // We define our work item
+-   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
++   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
+@@ -74,18 +77,10 @@
+    {
+       TimerRAII t("Parallel execution");
+ 
+-      // We split the work in equal parts
+-      const auto workSize = nNumbers / nWorkers;
+-
+-      // The work item requires two arguments, the map infrastructure offer
+-      // an interface to use only one. A standard solution is to use std::bind
+-      using namespace std::placeholders;
+-      auto workItemOneArg = std::bind(workItem, _1, workSize);
+-
+       // Fill the pool with work
+       std::forward_list<UInt_t> workerIDs(nWorkers);
+       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
+-      workers.Map(workItemOneArg, workerIDs);
++      workers.Map(workItem, workerIDs);
+    }
+ 
+    return 0;
diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
new file mode 100644
index 0000000..aaa4a6c
--- /dev/null
+++ b/root-broken-cmake-config.patch
@@ -0,0 +1,156 @@
+diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
+--- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
+@@ -0,0 +1,23 @@
++# - Locate dpm library
++# Defines:
++#
++#  DPM_FOUND
++#  DPM_INCLUDE_DIR
++#  DPM_INCLUDE_DIRS (not cached)
++#  DPM_LIBRARIES
++
++set(DPM_FOUND FALSE)
++
++find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
++find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++
++set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
++set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
++
++if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
++  set(DPM_FOUND TRUE)
++  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
++endif()
++
++mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
+--- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
+@@ -9,7 +9,7 @@
+ 
+ find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
+           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
+-                /opt/globus/include
++                /opt/globus/include /usr/include
+           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
+                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
+ 
+@@ -24,7 +24,7 @@
+               openssl gsi_proxy_core callout)
+ 
+ foreach( lib ${libraries})
+-  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
++  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
+                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
+   if(GLOBUS_${lib}_LIBRARY)
+     set(GLOBUS_${lib}_FOUND 1)
+diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
+--- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
+@@ -6,7 +6,7 @@
+ #  HDFS_INCLUDE_DIRS (not cached)
+ #  HDFS_LIBRARIES
+ 
+-find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
++find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
+ find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
+ 
+ set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
+--- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
+@@ -2,8 +2,8 @@
+ #
+ # This module defines
+ # PCRE_INCLUDE_DIR, where to locate PCRE header files
+-# PCRE_LIBRARIES, the libraries to link against to use Pythia6
+-# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
++# PCRE_LIBRARIES, the libraries to link against to use PCRE
++# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
+ 
+ if(PCRE_CONFIG_EXECUTABLE)
+   set(PCRE_FIND_QUIETLY 1)
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
+@@ -446,15 +446,29 @@
+ endif()
+ 
+ #---Check for Castor-------------------------------------------------------------------
+-if(castor OR rfio)
++if(castor)
+   message(STATUS "Looking for Castor")
+   find_package(Castor)
+   if(NOT CASTOR_FOUND)
+     if(fail-on-missing)
+       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
+     else()
+-      message(STATUS "Castor not found. Switching off castor/rfio option")
++      message(STATUS "Castor not found. Switching off castor option")
+       set(castor OFF CACHE BOOL "" FORCE)
++    endif()
++  endif()
++endif()
++
++#---Check for RFIO-------------------------------------------------------------------
++if(rfio)
++  message(STATUS "Looking for RFIO")
++  find_package(Castor)
++  find_package(DPM)
++  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
++    if(fail-on-missing)
++      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
++    else()
++      message(STATUS "Castor or DPM not found. Switching off rfio option")
+       set(rfio OFF CACHE BOOL "" FORCE)
+     endif()
+   endif()
+diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
+--- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -0,0 +1,10 @@
++############################################################################
++# CMakeLists.txt file for building ROOT io/hdfs package
++############################################################################
++
++include_directories(${HDFS_INCLUDE_DIRS})
++
++ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
++
++ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
+--- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -2,10 +2,16 @@
+ # CMakeLists.txt file for building ROOT io/rfio package
+ ############################################################################
+ 
+-include_directories(${CASTOR_INCLUDE_DIR})
+-
+ ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
+ 
++if(CASTOR_FOUND)
++include_directories(${CASTOR_INCLUDE_DIR})
+ ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
+     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
++else()
++include_directories(${DPM_INCLUDE_DIR})
++ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
++    DEPENDENCIES Net RIO)
++endif()
++
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
+--- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
+@@ -8,7 +8,6 @@
+ endif()
+ 
+ ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
+-ROOT_INSTALL_HEADERS()
+ 
+ if(builtin_openssl)
+   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
new file mode 100644
index 0000000..1cf437e
--- /dev/null
+++ b/root-cache-test.patch
@@ -0,0 +1,284 @@
+diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
+@@ -1907,8 +1907,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    TMultiGraph *mg;
+    TKey *key;
+diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
+--- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
+@@ -1956,7 +1956,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
+--- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
+@@ -10164,7 +10164,8 @@
+       refFile = TFile::Open(refFileName, "RECREATE");
+    }
+    else {
+-      refFile = TFile::Open(refFileName);
++      TFile::SetCacheFileDir(".");
++      refFile = TFile::Open(refFileName, "CACHEREAD");
+    }
+ 
+    if ( refFile != 0 ) {
+diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
+--- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
+@@ -78,9 +78,10 @@
+          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
+          return 1;
+       }
+-      fref = new TWebFile(refFile) ;
++      TFile::SetCacheFileDir(".");
++      fref = TFile::Open(refFile,"CACHEREAD") ;
+     } else {
+-      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
++      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
+     }
+     if (fref->IsZombie()) {
+       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
+diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
+--- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
+@@ -2011,21 +2011,15 @@
+   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
+ 
+   TFile* input(0);
+-
+   FileStat_t stat;
+ 
+-  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
+-  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
++  TString fname = "./tmva_class_example.root";
+   if(!gSystem->GetPathInfo(fname,stat)) {
+      input = TFile::Open( fname );
+-  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-     input = TFile::Open( "../"+fname );
+-  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
+-     input = TFile::Open( fcname );
+   } else {
+-     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
++     TFile::SetCacheFileDir(".");
++     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+   }
+-  delete [] fcname;
+   if (input == NULL) {
+      cerr << "broken/inaccessible input file" << endl;
+   }
+@@ -2440,14 +2434,12 @@
+    TFile* input(0);
+    FileStat_t stat;
+ 
+-   // FIXME:: give the filename of the sample somewhere else?
+-   TString fname = "../tmva/test/tmva_reg_example.root";
++   TString fname = "./tmva_reg_example.root";
+    if(!gSystem->GetPathInfo(fname,stat)) {
+       input = TFile::Open( fname );
+-   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-      input = TFile::Open( "../"+fname );
+    } else {
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
+    }
+    if (input == NULL) {
+       cerr << "broken/inaccessible input file" << endl;
+diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
+--- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
+@@ -27,23 +27,26 @@
+    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
+          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
+ 
+-
+    factory->AddVariable("myvar1 := var1+var2", 'F');
+    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
+    factory->AddVariable("var3",                "Variable 3", "units", 'F');
+    factory->AddVariable("var4",                "Variable 4", "units", 'F');
+-
+-
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
+-
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
+--- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
+@@ -36,12 +36,19 @@
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
+--- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
+@@ -44,8 +44,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
+@@ -221,14 +221,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+-   TString fname = "./tmva_example.root";   
+-   if (!gSystem->AccessPathName( fname )) 
++   TString fname = "./tmva_class_example.root";
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else    
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
+@@ -201,13 +201,19 @@
+ 
+    // Read training and test data
+    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-   
+-   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-   
+-   TFile *input = TFile::Open( fname );
+-   
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+    
+    // --- Register the training and test trees
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
+@@ -123,16 +123,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+    if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   } 
+-   else { 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+    }
+-   
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
+@@ -158,11 +158,13 @@
+    // load the signal and background event samples from ROOT trees
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+-   if (!gSystem->AccessPathName( fname )) 
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
new file mode 100644
index 0000000..eb05d5d
--- /dev/null
+++ b/root-cernlib-doc.patch
@@ -0,0 +1,1307 @@
+diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
+--- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
+@@ -15,7 +15,7 @@
+ #include "Rtypes.h"
+ #include <string.h>
+ 
+-// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
++// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
+ 
+ ///////////////////////////////////////////////////////////////////////////////////////
+ //                                                                                   //
+@@ -25,8 +25,9 @@
+ // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
+ // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
+ // add the result to another matrix, add to square matrix the multiple of a diagonal //
+-// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
+-// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
++// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
++// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
++// Fortran convention.                                                               //
+ //                                                                                   //
+ ///////////////////////////////////////////////////////////////////////////////////////
+ 
+diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
+--- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
+@@ -11,8 +11,8 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // The set of methods to work with the plain matrix / vector
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
+ //
+ // Revision 1.7  2006/05/21 18:05:26  brun
+ // Fix more coding conventions violations
+@@ -33,7 +33,7 @@
+ //
+ // Revision 1.3  2003/04/03 17:39:39  fine
+ // Make merge with ROOT 3.05.03 and add TR package
+-//122
++//
+ // Revision 1.2  2003/02/04 23:35:20  fine
+ // Clean up
+ //
+@@ -154,27 +154,24 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication
++///
+ /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
++// --      ENTRY MXMLRT
++// --                C = A(I,J) X B(J,J) X A*(J,I)
++// --                A* TANDS FOR A-TRANSPOSED
++//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
++//             CALL MXMPY (A,B,X,NI,NJ,NJ)
++//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
+ 
+-// --      ENTRY MXMLRT */
+-// --                C = A(I,J) X B(J,J) X A*(J,I) */
+-// --                A* TANDS FOR A-TRANSPOSED */
+-//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
+-//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
+-//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
+-
+-/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
+-/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
++//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
++//             CALL MXMPY (A,Y,C,NI,NJ,NI)
+ 
+ 
+ // --                C = A*(I,J) X B(J,J) X A(J,I)
+@@ -191,6 +188,12 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication (double precision)
++///
++/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
++/// ORIG. 01/01/64 RKB
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
+ {
+@@ -215,36 +218,31 @@
+     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// Matrix Transposition
+ ///
+-///  Matrix Transposition
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxtrp(const float *a, float *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ } /* mxtrp */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Matrix Transposition (double precision)
++/// Matrix Transposition (double precision)
++///
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxtrp(const double *a, double *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ 
+@@ -283,38 +281,35 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::traat(const float *a, float *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Symmetric Multiplication of Rectangular Matrices
++/// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::traat(const double *a, double *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+@@ -346,34 +341,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
++/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+@@ -405,34 +400,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+@@ -470,34 +465,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+@@ -543,51 +538,51 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+@@ -596,17 +591,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trata.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trata(const float *a, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+@@ -636,22 +629,21 @@
+    return r__;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -684,25 +676,22 @@
+    return b;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
+-{
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
++{
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -743,26 +732,23 @@
+    return r__;
+ } /* tratsa_ */
+ 
+-//____________________________________________________________
+-// trchlu.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchlu.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trchlu(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -806,15 +792,17 @@
+    return b;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trchul(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -823,11 +811,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -875,17 +858,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trinv(const float *t, float *s, int n)
++{
+    int lhor, ipiv, lver, j;
+    double sum = 0;
+    double r__ = 0;
+@@ -934,22 +915,20 @@
+    return s;
+ } /* trinv_ */
+ 
+-//____________________________________________________________
+-// trla.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trla.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -981,22 +960,19 @@
+ } /* trla_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trlta.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trlta.F -- translated by f2c (version 19970219).
+-// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
++float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -1036,16 +1012,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trpck(const float *s, float *u, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1072,17 +1047,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1140,16 +1113,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1190,17 +1162,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
++float *TCL::trsinv(const float *g, float *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -1209,17 +1179,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmlu(const float *u, float *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -1246,17 +1214,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmul(const float *g, float *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -1284,18 +1250,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trupck(const float *u, float *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -1336,25 +1299,20 @@
+ } /* trupck_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trsat.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trsat.F -- translated by f2c (version 19970219).
+-// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
++float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --s;
+ 
+@@ -1391,25 +1349,21 @@
+ 
+ // ------  double
+ 
+-//____________________________________________________________
+-// trata.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trata.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trata(const double *a, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --a;
+ 
+@@ -1437,23 +1391,21 @@
+    return 0;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -1487,24 +1439,22 @@
+    return 0;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -1547,25 +1497,21 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trchlu.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trchlu(const double *a, double *b, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1609,15 +1555,17 @@
+    return 0;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trchul(const double *a, double *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -1626,11 +1574,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1677,17 +1620,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trinv(const double *t, double *s, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int lhor, ipiv, lver,  j;
+    double r__;
+    int mx, ndTep, ind;
+@@ -1735,19 +1676,16 @@
+ } /* trinv_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// trla.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
++double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+@@ -1782,17 +1720,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trlta.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+@@ -1834,16 +1770,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::trpck(const double *s, double *u, int n)
++{
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1869,17 +1804,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1936,16 +1869,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1985,17 +1917,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
++double *TCL::trsinv(const double *g, double *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -2006,17 +1936,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmlu(const double *u, double *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -2043,17 +1971,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmul(const double *g, double *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -2081,18 +2007,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
++double *TCL::trupck(const double *u, double *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -2133,17 +2056,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsat.F -- translated by f2c (version 19970219)
++///
+ /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
new file mode 100644
index 0000000..4f30e9b
--- /dev/null
+++ b/root-compiledata.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
+--- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
+@@ -75,7 +75,7 @@
+ 
+ # Remove the flags turning warnings into errors or extending
+ # the number of warnings.
+-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
++CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
+ 
+ # Determine the compiler version
+ BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
new file mode 100644
index 0000000..0049c46
--- /dev/null
+++ b/root-deprecated-options.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
++++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
+@@ -202,7 +202,7 @@
+     enable_unuran=yes
+     enable_vc=yes
+     enable_vdt=yes
+-    #enable_r=yes
++    enable_r=yes
+ fi
+ 
+ # Remove old log file
+@@ -2288,7 +2288,7 @@
+         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "yes:"; then
+@@ -2318,7 +2318,7 @@
+         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
new file mode 100644
index 0000000..fdc0091
--- /dev/null
+++ b/root-dont-link-jvm.patch
@@ -0,0 +1,123 @@
+diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
+@@ -263,10 +263,6 @@
+ set(hdfslib ${HDFS_LIBRARY})
+ set(hdfsincdir ${HDFS_INCLUDE_DIR})
+ 
+-set(jniincdir ${Java_INCLUDE_DIRS})
+-set(jvmlib ${Java_LIBRARIES})
+-set(jvmlibdir ${Java_LIBRARY_DIR})
+-
+ set(buildalien ${value${alien}})
+ set(alienlibdir ${ALIEN_LIBRARY_DIR})
+ set(alienlib ${ALIEN_LIBRARY})
+diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
+@@ -251,9 +251,6 @@
+ HDFSLIBDIR     := @hdfslibdir@
+ HDFSCLILIB     := @hdfslib@
+ HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
+-JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
+-JVMCLILIB      := @jvmlib@
+-JVMLIBDIR      := @jvmlibdir@
+ 
+ BUILDALIEN     := @buildalien@
+ ALIENLIBDIR    := @alienlibdir@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
++++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
+@@ -1822,8 +1822,6 @@
+   hdfs-incdir        HDFS support, location of hdfs.h
+   hdfs-libdir        HDFS support, location of libhdfs
+   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
+-  jni-incdir         HDFS support, location of JNI headers
+-  jvm-libdir         HDFS support, location of JVM library
+   krb5               Kerberos5 support, location of Kerberos distribution
+   krb5-incdir        Kerberos5 support, location of krb5.h
+   krb5-libdir        Kerberos5 support, location of libkrb5
+@@ -2214,8 +2212,6 @@
+       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-iosvers=*)        iosvers=$optarg       ;;
+-      --with-jni-incdir=*)     jniincdir=$optarg     ;;
+-      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
+       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
+       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
+       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
+@@ -4535,17 +4531,6 @@
+     hdfsinc=$found_hdr
+     hdfsincdir=$found_dir
+ 
+-    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
+-       JAVA_HOME=`/usr/libexec/java_home`
+-    fi
+-
+-    keepincdir=$jniincdir
+-    check_header "jni.h" "$jniincdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/include} \
+-        /usr/java/default/include /usr/include /usr/local/include
+-    jniinc=$found_hdr
+-    jniincdir=$found_dir
+-
+     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
+         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
+         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
+@@ -4553,26 +4538,12 @@
+     hdfslib=$found_lib
+     hdfslibdir=$found_dir
+ 
+-    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
+-        /usr/java/default/jre/lib/amd64/server \
+-        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
+-    jvmlib=$found_lib
+-    jvmlibdir=$found_dir
+-
+-    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
++    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
+         enable_hdfs="no"
+     else
+         case $platform in
+             linux)
+-                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
+-                if test $link_result -eq 0 ; then
+-                    enable_hdfs="no"
+-                fi
+-
+-                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
++                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
+                 if test $link_result -eq 0 ; then
+                     enable_hdfs="no"
+                 fi
+@@ -7641,9 +7612,6 @@
+     -e "s|@iosvers@|$iosvers|"                  \
+     -e "s|@iconpath@|$iconpath|"                \
+     -e "s|@incdir@|$incdir|"                    \
+-    -e "s|@jniincdir@|$jniincdir|g"             \
+-    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
+-    -e "s|@jvmlib@|$jvmlib|g"                   \
+     -e "s|@krb5incdir@|$krb5incdir|"            \
+     -e "s|@krb5lib@|$krb5lib|"                  \
+     -e "s|@krb5libdir@|$krb5libdir|"            \
+diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
+--- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
+@@ -44,7 +44,7 @@
+ $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
+-		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
++		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
+ 
+ $(call pcmrule,HDFS)
+ 	$(noop)
+@@ -72,4 +72,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
++$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
new file mode 100644
index 0000000..1bf85d2
--- /dev/null
+++ b/root-dox-filter.patch
@@ -0,0 +1,86 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
+--- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
+@@ -98,6 +98,7 @@
+ 
+    // Source file.
+    if (gSource) {
++      size_t spos = 0;
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+ 
+@@ -106,10 +107,11 @@
+              gLineString.find("/** \\class")  != string::npos ||
+              gLineString.find("///! \\class") != string::npos) gClass = true;
+ 
+-         if (gLineString.find("End_Macro") != string::npos) {
++         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
+             ReplaceAll(gLineString,"End_Macro","");
+             gImageSource = false;
+             gInMacro = 0;
++            spos = 0;
+             if (m) {
+                fclose(m);
+                m = 0;
+@@ -122,8 +124,9 @@
+          }
+ 
+          if (gInMacro) {
++            if (spos) gLineString = gLineString.substr(spos);
+             if (gInMacro == 1) {
+-               if (EndsWith(gLineString,".C\n")) {
++               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
+                   ExecuteMacro();
+                   gInMacro++;
+                } else {
+@@ -153,14 +156,27 @@
+             }
+          }
+ 
+-         if (gLineString.find("Begin_Macro") != string::npos) {
++         if (gLineString.find("Begin_Macro") != string::npos &&
++             gLineString.find("End_Macro") == string::npos) {
++            if (BeginsWith(gLineString, "///")) {
++               spos = gLineString.find_first_not_of(' ', 3);
++            }
+             if (gLineString.find("source") != string::npos) gImageSource = true;
+             gImageID++;
+             gInMacro++;
+             gLineString = "\n";
+          }
+ 
+-         printf("%s",gLineString.c_str());
++         size_t l = gLineString.length();
++         size_t b = 0;
++         do {
++            size_t e = gLineString.find('\n', b);
++            if (e != string::npos) e++;
++            if (spos) printf("%-*s%s", (int)spos, "///",
++                              gLineString.substr(b, e - b).c_str());
++            else printf("%s", gLineString.substr(b, e - b).c_str());
++            b = e;
++         } while (b < l);
+       }
+       fclose(f);
+       return 0;
+@@ -203,7 +219,8 @@
+    if (gSource) {
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+-         if (gLineString.find("ClassImp") != string::npos) {
++         if (gLineString.find("ClassImp") != string::npos ||
++             gLineString.find("NamespaceImp") != string::npos) {
+             i1         = gLineString.find("(")+1;
+             i2         = gLineString.find(")")-1;
+             gClassName = gLineString.substr(i1,i2-i1+1);
+@@ -238,8 +255,8 @@
+ 
+    // Build the ROOT command to be executed.
+    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
+-   int l = gLineString.length();
+-   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
++   size_t l = gLineString.length();
++   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
+ 
+    ExecuteCommand(gLineString);
+ 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
new file mode 100644
index 0000000..46d6dde
--- /dev/null
+++ b/root-doxyfile.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
+--- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
+@@ -2058,7 +2058,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-MACRO_EXPANSION        = NO
++MACRO_EXPANSION        = YES
+ 
+ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+ # the macro expansion is limited to the macros specified with the PREDEFINED and
+@@ -2066,7 +2066,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-EXPAND_ONLY_PREDEF     = NO
++EXPAND_ONLY_PREDEF     = YES
+ 
+ # If the SEARCH_INCLUDES tag is set to YES the includes files in the
+ # INCLUDE_PATH will be searched if a #include is found.
+@@ -2098,7 +2098,7 @@
+ # recursively expanded use the := operator instead of the = operator.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-PREDEFINED             =
++PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
+ 
+ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+ # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
new file mode 100644
index 0000000..35814e2
--- /dev/null
+++ b/root-doxygen-warnings.patch
@@ -0,0 +1,723 @@
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
+@@ -1,4 +1,4 @@
+-/// \file impl_tuple_apply.h
++/// \file ROOT/impl_tuple_apply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RArrayView.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
+@@ -1,4 +1,4 @@
+-/// \file rhysd_array_view.h
++/// \file ROOT/rhysd_array_view.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RTupleApply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCoopPtr
++/// \file ROOT/TCoopPtr.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDirectory.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDrawable.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-08-07
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
+@@ -1,4 +1,4 @@
+-/// \file TKey.h
++/// \file ROOT/TKey.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TLogger.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-29
+diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
+--- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
+@@ -57,7 +57,7 @@
+       // Same value as TVirtualCollectionProxy.
+       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
+ 
+-   /** @class template TCollectionProxyInfo::IteratorValue
++   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
+     *
+     * Small helper to encapsulate whether to return the value
+     * pointed to by the iterator or its address.
+@@ -76,7 +76,7 @@
+          }
+       };
+ 
+-   /** @class template TCollectionProxyInfo::Iterators
++   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
+     *
+     * Small helper to implement the function to create,access and destroy
+     * iterators.
+@@ -204,7 +204,7 @@
+          }
+       };
+ 
+-  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
++  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
+     *
+     * Small helper to save proxy environment in the event of
+     * recursive calls.
+@@ -276,7 +276,7 @@
+       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
+    };
+ 
+-   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Type
+     *
+     * Small helper to encapsulate basic data accesses for
+     * all STL continers.
+@@ -356,7 +356,7 @@
+ 
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like vector, list, deque
+@@ -389,7 +389,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like forward_list
+@@ -425,7 +425,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+@@ -457,7 +457,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
+--- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCanvas.h
++/// \file ROOT/TCanvas.h
+ /// \ingroup Gpad ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-08
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
+@@ -26,7 +26,7 @@
+ #include "TClass.h"
+ #include "TError.h"
+ 
+-/** \class
++/** \class TGLPolyMarker
+ \ingroup opengl
+ To draw a 3D polymarker in a GL window.
+ */
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
+@@ -14,7 +14,7 @@
+ 
+ #include <string.h>
+ 
+-/** \class
++/** \class TGLSelectRecordBase
+ \ingroup opengl TGLSelectRecordBase
+ Base class for select records.
+ Supports initialization from a raw GL record (UInt_t*) and
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
+@@ -15,7 +15,7 @@
+ #include "TGLPlotCamera.h"
+ #include "TGLIncludes.h"
+ 
+-/** \class
++/** \class TGLVoxelPainter
+ \ingroup opengl
+ Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
+ */
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
+@@ -49,11 +49,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
+-\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
+-\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
+-\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
+-\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
++\class TH1C
++\brief 1-D histogram with a byte per channel (see TH1 documentation)
++\class TH1S
++\brief 1-D histogram with a short per channel (see TH1 documentation)
++\class TH1I
++\brief 1-D histogram with an int per channel (see TH1 documentation)}
++\class TH1F
++\brief 1-D histogram with a float per channel (see TH1 documentation)}
++\class TH1D
++\brief 1-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
+@@ -30,11 +30,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
+-\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
+-\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
+-\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
+-\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
++\class TH2C
++\brief 2-D histogram with a byte per channel (see TH1 documentation)
++\class TH2S
++\brief 2-D histogram with a short per channel (see TH1 documentation)
++\class TH2I
++\brief 2-D histogram with an int per channel (see TH1 documentation)}
++\class TH2F
++\brief 2-D histogram with a float per channel (see TH1 documentation)}
++\class TH2D
++\brief 2-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
+--- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
+@@ -28,11 +28,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
+-\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
+-\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
+-\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
+-\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
++\class TH3C
++\brief 3-D histogram with a byte per channel (see TH1 documentation)
++\class TH3S
++\brief 3-D histogram with a short per channel (see TH1 documentation)
++\class TH3I
++\brief 3-D histogram with an int per channel (see TH1 documentation)}
++\class TH3F
++\brief 3-D histogram with a float per channel (see TH1 documentation)}
++\class TH3D
++\brief 3-D histogram with a double per channel (see TH1 documentation)}
+ @} 
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
+--- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistDrawable.cxx
++/// \file THistDrawable.cxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-11
+diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistPainter.cxx
++/// \file THistPainter.cxx
+ /// \ingroup HistPainter ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
+--- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
+@@ -2463,7 +2463,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Write the first part of the links shown ontop of each doc page;
+-/// one <div> has to be closed by caller so additional items can still
++/// one \<div\> has to be closed by caller so additional items can still
+ /// be added.
+ 
+ void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
+diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
+--- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
+@@ -63,7 +63,7 @@
+                        const char *location = 0);
+    static Bool_t CheckFile(const char *path, const char *location = 0);
+ 
+-   /// Note: This must be kept in sync with values #defined in dcap.h
++   /// Note: This must be kept in sync with values \#defined in dcap.h
+    enum EOnErrorAction {
+       kOnErrorRetry   =  1,
+       kOnErrorFail    =  0,
+diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
+--- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
+@@ -160,7 +160,7 @@
+ };
+ 
+ /**
+- \class TCollectionClassStreamer TCollectionProxy.h
++ \class TCollectionClassStreamer TCollectionProxyFactory.h
+  \ingroup IO
+ 
+  Class streamer object to implement TClassStreamer functionality
+diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
+--- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
+@@ -434,7 +434,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include needed for the argument of
++/// Add to the header file, the \#include needed for the argument of
+ /// this template.
+ 
+ UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
+@@ -587,7 +587,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Add to the header file anything that need to appear after the class
+-/// declaration (this includes some #pragma link).
++/// declaration (this includes some \#pragma link).
+ 
+ void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
+ {
+diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
+--- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
+@@ -3645,7 +3645,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include need for this class.
++/// Add to the header file, the \#include need for this class.
+ 
+ UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
+ {
+diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
+--- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFile.h
++/// \file ROOT/TFile.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
+--- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
+@@ -4,7 +4,7 @@
+ 
+ \brief The %ROOT Mathematical Libraries.
+ 
+-See the \subpage MathPage "Mathematical Libraries" description page.
++See the \ref MathPage "Mathematical Libraries" description page.
+ 
+ 
+ \page MathPage The ROOT Mathematical Libraries 
+@@ -39,7 +39,7 @@
+ - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
+ 
+    - Physics: library with the TVector3 and TLorentzVector classes.
+-   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
++   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
+ 
+ - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
+@@ -18,9 +18,7 @@
+ #define ROOT_Math_Random
+ 
+ /**
+-@defgroup Random 
+-
+- Interface class for Random number generation
++@defgroup Random Interface class for Random number generation
+ */
+ 
+ #include "Math/RandomFunctions.h"
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
+@@ -209,7 +209,7 @@
+ 
+   /**
+ 
+-  Calculates the real part of the cosine integral \Re(Ci).
++  Calculates the real part of the cosine integral Re(Ci).
+ 
+   For x<0, the imaginary part is \pi i and has to be added by the user,
+   for x>0 the imaginary part of Ci(x) is 0.
+diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
+--- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
+@@ -21,7 +21,8 @@
+ 
+ /**
+ 
+-\class TKDTree class implementing a kd-tree
++\class TKDTree
++\brief Class implementing a kd-tree
+ 
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
+--- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFit.h
++/// \file ROOT/TFit.h
+ /// \ingroup MathCore ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
+@@ -83,9 +83,6 @@
+ 
+     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
+     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
+-
+-    @ingroup MCIntegration
+-
+    */
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
+@@ -51,7 +51,7 @@
+    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
+                \cdot \left ( \int \limits_{0}^{1}
+                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
+-               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
++               - \kappa \, e^{\frac{-s}{\kappa}}\f].
+    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
+ 
+    The parameters are:
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
+@@ -84,16 +84,17 @@
+ // [5.2.1.6] (complete) elliptic integral of the third kind
+ // (26.x.17.2)
+ /**
++Complete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+@@ -220,16 +221,17 @@
+ // phi in radians
+ // (26.x.17.1)
+ /**
++Incomplete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
+--- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
+@@ -38,7 +38,7 @@
+     - The user can optionally provide the
+ 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
+ 	  - the mode via **TUnuranContDist::SetMode**,
+-      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
++	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
+ 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
+ 
+ Some of this information is required depending on the chosen UNURAN generation method.
+diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
+--- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.h
++/*! \file TGLiteResult.h
+ *//*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
+--- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.cxx
++/*! \file TGLiteResult.cxx
+  */ /*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
+--- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
+@@ -60,8 +60,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// method used to get or set http header in the string buffer
+ /// Header has following format:
+-///   field1 : value1\r\n
+-///   field2 : value2\r\n
++///   field1 : value1\\r\\n
++///   field2 : value2\\r\\n
+ /// Such format corresponds to header format in HTTP requests
+ 
+ TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
+diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
+--- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
+@@ -1195,7 +1195,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
+-/// line [\r]\n. If so, return the pointer to the position after the line,
++/// line [\\r]\\n. If so, return the pointer to the position after the line,
+ /// otherwise return 0. This is used as callback to GetHunk(). The data
+ /// between START and PEEKED has been read and cannot be "unread"; the
+ /// data after PEEKED has only been peeked.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
+--- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
+@@ -813,7 +813,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+@@ -826,7 +826,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
+@@ -1002,7 +1002,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
+ 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
+@@ -1264,7 +1264,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ 
+ RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
+@@ -21,7 +21,7 @@
+    RooAbsReal is the common abstract base class for objects that represent a
+    real value and implements functionality common to all real-valued objects
+    such as the ability to plot them, to construct integrals of them, the
+-   ability to advertise (partial) analytical integrals etc..
++   ability to advertise (partial) analytical integrals etc.
+    
+    Implementation of RooAbsReal may be derived, thus no interface
+    is provided to modify the contents.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
+@@ -838,7 +838,7 @@
+ /// L = TLatex mode
+ /// X = Latex mode
+ /// Y = Latex table mode ( '=' replaced by '&' )
+-/// V = Make name \verbatim in Latex mode
++/// V = Make name \\verbatim in Latex mode
+ /// P = use error to control shown precision
+ /// F = force fixed precision
+ ///
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
+@@ -55,7 +55,7 @@
+    confidence level is reached within an acceptable neighborhood as defined by
+    SetEpsilon(). More specifically: we calculate the following for different
+    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
+-   d{normset} \$.
++   d{normset} \f$.
+    Important note: this is not the default method because of a bug in constructing
+    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
+    calling SetUseKeys(true), and the data set will be interpreted without weights.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
+@@ -53,7 +53,7 @@
+ To make Propose(xPrime, x) dependent on x, configure with
+ PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
+ 
+-````{.cpp}
++~~~{.cpp}
+ // our parameter
+ RooRealVar p("p", "p", 5, 0, 10);
+ 
+@@ -74,7 +74,7 @@
+ // number of proposals. If you don't call this function, the default cache size
+ // is 1, which can be slow.
+ pdfProposal.SetCacheSize(desiredCacheSize);
+-````
++~~~
+ 
+ PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
+ for future versions.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
+@@ -40,8 +40,8 @@
+ By default the calculation is:
+ 
+ \f[
+-	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
+-   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
++        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
+ \f]
+ 
+ where \f$ \lambda \f$ is the profile likeihood ratio, so the 
+@@ -50,11 +50,11 @@
+ If ``SetSubtractMLE(false)`` then it calculates:
+ 
+ \f[
++        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
++\f]
+ 
+-	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
+-                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
+-
+-where \f$ L\$ is the Likelihood function. 
++where \f$ L \f$ is the Likelihood function.
+ 
+ The values of the parameters of interest for the alternative 
+ hypothesis are taken at the time of the construction.
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
+@@ -9,7 +9,7 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
+-/** \class Detail::TBranchProxy
++/** \class ROOT::Detail::TBranchProxy
+ Base class for all the proxy object. It includes the imeplemtation
+ of the autoloading of branches as well as all the generic setup routine.
+ */
diff --git a/root-fflags.patch b/root-fflags.patch
new file mode 100644
index 0000000..3fd6f0e
--- /dev/null
+++ b/root-fflags.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
+@@ -70,7 +70,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -107,7 +107,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -144,7 +144,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
+@@ -37,12 +37,12 @@
+        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
+     else(${SYSCTL_OUTPUT} MATCHES 64)
+        MESSAGE(STATUS "Found a 32bit system")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
+     endif(${SYSCTL_OUTPUT} MATCHES 64)
+   endif()
+ 
+@@ -65,7 +65,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+@@ -101,7 +101,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
+@@ -13,7 +13,7 @@
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
new file mode 100644
index 0000000..b60ac0d
--- /dev/null
+++ b/root-fontconfig.patch
@@ -0,0 +1,1408 @@
+diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
+@@ -265,18 +265,11 @@
+    LoadGraphicsLibs();
+ 
+    // Try to load TrueType font renderer. Only try to load if not in batch
+-   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
++   // mode and Root.UseTTFonts is true. Abort silently
+    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+-   // Check for use of DFSG - fonts
+-   if (!ttfont)
+-      ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
+-
+ #if !defined(R__WIN32)
+    if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
+-       ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
++       gEnv->GetValue("Root.UseTTFonts", 1)) {
+       if (gClassTable->GetDict("TGX11TTF")) {
+          // in principle we should not have linked anything against libGX11TTF
+          // but with ACLiC this can happen, initialize TGX11TTF by hand
+@@ -290,7 +283,6 @@
+       }
+    }
+ #endif
+-   delete [] ttfont;
+ 
+    // Create WM dependent application environment
+    if (fAppImp)
+diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
+@@ -12,7 +12,7 @@
+ 
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+ 
+-ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
++ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
+ 
+ if(builtin_freetype)
+   add_dependencies(${libname} FREETYPE)
+diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
+--- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
+@@ -86,9 +86,8 @@
+    static FT_BBox        fgCBox;                  // string control box
+    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
+    static Int_t          fgCurFontIdx;            // current font index
+-   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
+    static Int_t          fgFontCount;             // number of fonts loaded
+-   static char          *fgFontName[kTTMaxFonts]; // font name
++   static Int_t          fgFontID[kTTMaxFonts];   // font ID
+    static FT_Face        fgFace[kTTMaxFonts];     // font face
+    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
+    static Bool_t         fgHinting;               // use hinting (true by default)
+diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
+--- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
+@@ -46,7 +46,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
+ 		   "$(GRAFO) $(GRAFDO)" \
+-		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
+ 
+ $(call pcmrule,GRAF)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
+@@ -25,6 +25,8 @@
+ #include "TMath.h"
+ #include "TError.h"
+ 
++#include <fontconfig/fontconfig.h>
++
+ // to scale fonts to the same size as the old TT version
+ const Float_t kScale = 0.93376068;
+ 
+@@ -38,10 +40,9 @@
+ Int_t          TTF::fgWidth          = 0;
+ Int_t          TTF::fgAscent         = 0;
+ Int_t          TTF::fgCurFontIdx     = -1;
+-Int_t          TTF::fgSymbItaFontIdx = -1;
+ Int_t          TTF::fgFontCount      = 0;
+ Int_t          TTF::fgNumGlyphs      = 0;
+-char          *TTF::fgFontName[kTTMaxFonts];
++Int_t          TTF::fgFontID[kTTMaxFonts];
+ FT_Matrix     *TTF::fgRotMatrix;
+ FT_Library     TTF::fgLibrary;
+ FT_BBox        TTF::fgCBox;
+@@ -72,6 +73,11 @@
+       return;
+    }
+ 
++   // Add root's font directory
++   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
++                                       TROOT::GetTTFFontDir());
++   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
++
+    // load default font (arialbd)
+    SetTextFont(62);
+ }
+@@ -84,7 +90,6 @@
+    if (!fgInit) return;
+ 
+    for (int i = 0; i < fgFontCount; i++) {
+-      delete [] fgFontName[i];
+       FT_Done_Face(fgFace[i]);
+    }
+    if (fgRotMatrix) delete fgRotMatrix;
+@@ -109,12 +114,19 @@
+          charmap  = fgFace[fgCurFontIdx]->charmaps[i];
+          platform = charmap->platform_id;
+          encoding = charmap->encoding_id;
+-         if ((platform == 3 && encoding == 1) ||
++         if ((platform == 3 && encoding == 1 &&
++              (fgFontID[fgCurFontIdx] != 12 &&
++               fgFontID[fgCurFontIdx] != 14 &&
++               fgFontID[fgCurFontIdx] != 15)) ||
+              (platform == 0 && encoding == 0) ||
++             (platform == 7 && encoding == 2 &&
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)) ||
+              (platform == 1 && encoding == 0 &&
+-              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
+-             (platform == 1 && encoding == 0 &&
+-              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)))
+          {
+             fgCharMap[fgCurFontIdx] = charmap;
+             if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
+@@ -378,27 +390,147 @@
+ 
+    if (!fontname || !fontname[0]) {
+       Warning("TTF::SetTextFont",
+-              "no font name specified, using default font %s", fgFontName[0]);
++              "no font name specified, using default font");
+       fgCurFontIdx = 0;
+       return 0;
+    }
+    const char *basename = gSystem->BaseName(fontname);
+ 
++   if (strcmp(basename, "timesi.ttf") == 0 ||
++       strcmp(basename, "FreeSerifItalic.otf") == 0) {
++      SetTextFont(12);
++   }
++   else if (strcmp(basename, "timesbd.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBold.otf") == 0) {
++      SetTextFont(22);
++   }
++   else if (strcmp(basename, "timesbi.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++      SetTextFont(32);
++   }
++   else if (strcmp(basename, "arial.ttf") == 0 ||
++            strcmp(basename, "FreeSans.otf") == 0) {
++      SetTextFont(42);
++   }
++   else if (strcmp(basename, "ariali.ttf") == 0 ||
++            strcmp(basename, "FreeSansOblique.otf") == 0) {
++      SetTextFont(52);
++   }
++   else if (strcmp(basename, "arialbd.ttf") == 0 ||
++            strcmp(basename, "FreeSansBold.otf") == 0) {
++      SetTextFont(62);
++   }
++   else if (strcmp(basename, "arialbi.ttf") == 0 ||
++            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++      SetTextFont(72);
++   }
++   else if (strcmp(basename, "cour.ttf") == 0 ||
++            strcmp(basename, "FreeMono.otf") == 0) {
++      SetTextFont(82);
++   }
++   else if (strcmp(basename, "couri.ttf") == 0 ||
++            strcmp(basename, "FreeMonoOblique.otf") == 0) {
++      SetTextFont(92);
++   }
++   else if (strcmp(basename, "courbd.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBold.otf") == 0) {
++      SetTextFont(102);
++   }
++   else if (strcmp(basename, "courbi.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++      SetTextFont(112);
++   }
++   else if (strcmp(basename, "symbol.ttf") == 0) {
++      if (italic)
++         SetTextFont(152);
++      else
++         SetTextFont(122);
++   }
++   else if (strcmp(basename, "times.ttf") == 0 ||
++            strcmp(basename, "FreeSerif.otf") == 0) {
++      SetTextFont(132);
++   }
++   else if (strcmp(basename, "wingding.ttf") == 0) {
++      SetTextFont(142);
++   }
++   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
++      SetTextFont(162);
++   }
++   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
++      SetTextFont(172);
++   }
++   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
++      SetTextFont(182);
++   }
++   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
++      SetTextFont(192);
++   }
++   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
++      SetTextFont(202);
++   }
++   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
++      SetTextFont(212);
++   }
++   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
++      SetTextFont(222);
++   }
++   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
++      SetTextFont(232);
++   }
++   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
++      SetTextFont(242);
++   }
++   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
++      SetTextFont(252);
++   }
++   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
++      SetTextFont(262);
++   }
++   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
++      SetTextFont(272);
++   }
++   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
++      SetTextFont(282);
++   }
++   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
++      SetTextFont(292);
++   }
++   else {
++      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
++      if (fgFontCount) {
++         Warning("TTF::SetTextFont", "using default font");
++         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++         return 0;
++      } else {
++         return 1;
++      }
++   }
++
++   return 0;
++}
++
++//______________________________________________________________________________
++void TTF::SetTextFont(Font_t fontnumber)
++{
++   int fontid = fontnumber / 10;
++   if (fontid < 0 || fontid > 31) fontid = 0;
++
++   Int_t italic = 0;
++   if (fontid==15) italic = 1;
++
++   if (!fgInit) Init();
++
++   if (fontid == 0) {
++      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
++      return;
++   }
++
+    // check if font is in cache
+    int i;
+    for (i = 0; i < fgFontCount; i++) {
+-      if (!strcmp(fgFontName[i], basename)) {
+-         if (italic) {
+-            if (i==fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         } else {
+-            if (i!=fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         }
++      if (fgFontID[i] == fontid) {
++         fgCurFontIdx = i;
++         return;
+       }
+    }
+ 
+@@ -406,151 +538,215 @@
+    if (fgFontCount >= kTTMaxFonts) {
+       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
+             kTTMaxFonts);
+-      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
++      Warning("TTF::SetTextFont", "using default font");
+       fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-      return 0;
++      return;
+    }
+ 
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++   char *ttfont = NULL;
++   int ttindex = 0;
+ 
+-   if (!ttfont) {
+-      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-         return 0;
+-      } else {
+-         return 1;
+-      }
++   FcPattern *pat, *match;
++   FcCharSet *set = NULL;
++   FcResult result;
++
++   pat = FcPatternCreate ();
++
++   switch (fontid) {
++   case 1:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 2:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 3:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 4:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 5:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 6:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 7:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 8:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 9:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 10:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 11:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 12:
++   case 15:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 16:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 17:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 18:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 19:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 20:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 21:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 22:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 23:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 24:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 25:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 26:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 27:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 28:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 29:
++   case 30:
++   case 31:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      set = FcCharSetCreate ();
++      FcCharSetAddChar (set, 0x0410); // Cyrillic
++      FcCharSetAddChar (set, 0x4e00); // CJK
++      FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   default:
++      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
++      FcPatternDestroy (pat);
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++      return;
++      break;
+    }
+ 
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   char *ttfnt;
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++   ttfont = StrDup (ttfnt);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
++   if (set) FcCharSetDestroy (set);
++
+    FT_Face  tface = 0;
+ 
+-   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
++   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
+       Error("TTF::SetTextFont", "error loading font %s", ttfont);
+       delete [] ttfont;
+       if (tface) FT_Done_Face(tface);
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;
+-         return 0;
+-      } else {
+-         return 1;
+-      }
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;
++      return;
+    }
+ 
+    delete [] ttfont;
+ 
+-   fgFontName[fgFontCount] = StrDup(basename);
++   fgFontID[fgFontCount]   = fontid;
+    fgCurFontIdx            = fgFontCount;
+    fgFace[fgCurFontIdx]    = tface;
+    fgCharMap[fgCurFontIdx] = 0;
+    fgFontCount++;
+ 
+    if (italic) {
+-      fgSymbItaFontIdx = fgCurFontIdx;
+       FT_Matrix slantMat;
+       slantMat.xx = (1 << 16);
+       slantMat.xy = ((1 << 16) >> 2);
+       slantMat.yx = 0;
+       slantMat.yy = (1 << 16);
+-      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
+-   }
+-
+-   return 0;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Set specified font.
+-/// List of the currently supported fonts (screen and PostScript)
+-///
+-/// | Font ID |   X11                     |     TTF          |
+-/// |---------|---------------------------|------------------|
+-/// |      1  | times-medium-i-normal     | timesi.ttf       |
+-/// |      2  | times-bold-r-normal       | timesbd.ttf      |
+-/// |      3  | times-bold-i-normal       | timesi.ttf       |
+-/// |      4  | helvetica-medium-r-normal | arial.ttf        |
+-/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
+-/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
+-/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
+-/// |      8  | courier-medium-r-normal   | cour.ttf         |
+-/// |      9  | courier-medium-o-normal   | couri.ttf        |
+-/// |     10  | courier-bold-r-normal     | courbd.ttf       |
+-/// |     11  | courier-bold-o-normal     | courbi.ttf       |
+-/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
+-/// |     13  | times-medium-r-normal     | times.ttf        |
+-/// |     14  |                           | wingding.ttf     |
+-/// |     15  | symbol oblique is emulated from symbol.ttf | |
+-
+-void TTF::SetTextFont(Font_t fontnumber)
+-{
+-   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
+-   // Table of Microsoft and (for non-MSFT operating systems) backup
+-   // FreeFont TTF fonts.
+-   static const char *fonttable[][2] = {
+-     { "Root.TTFont.0", "FreeSansBold.otf" },
+-     { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-     { "Root.TTFont.2", "FreeSerifBold.otf" },
+-     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-     { "Root.TTFont.4", "FreeSans.otf" },
+-     { "Root.TTFont.5", "FreeSansOblique.otf" },
+-     { "Root.TTFont.6", "FreeSansBold.otf" },
+-     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-     { "Root.TTFont.8", "FreeMono.otf" },
+-     { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-     { "Root.TTFont.10", "FreeMonoBold.otf" },
+-     { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-     { "Root.TTFont.12", "symbol.ttf" },
+-     { "Root.TTFont.13", "FreeSerif.otf" },
+-     { "Root.TTFont.14", "wingding.ttf" },
+-     { "Root.TTFont.15", "symbol.ttf" },
+-     { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-     { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-     { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-     { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-     { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-     { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-     { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-     { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-     { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-     { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-     { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-     { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-     { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
+-   };
+-
+-   static int fontset = -1;
+-   int        thisset = fontset;
+-
+-   int fontid = fontnumber / 10;
+-   if (fontid < 0 || fontid > 31) fontid = 0;
+-
+-   if (thisset == -1) {
+-      // try to load font (font must be in Root.TTFontPath resource)
+-      // to see which fontset we have available
+-      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                          TROOT::GetTTFFontDir());
+-      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
+-      if (ttfont) {
+-         delete [] ttfont;
+-         thisset = 0;
+-      } else {
+-         // try backup free font
+-         thisset = 1;
+-      }
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
+    }
+-   Int_t italic = 0;
+-   if (fontid==15) italic = 1;
+-   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
+-   // Do not define font set is we're loading the symbol.ttf - it's
+-   // the same in both cases.
+-   if (ret == 0 && fontid != 12) fontset = thisset;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
+@@ -5,5 +5,5 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
++ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
+ ROOT_INSTALL_HEADERS()
+diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
+--- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
+@@ -50,7 +50,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
+ 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
+-		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
+ 
+ $(call pcmrule,POSTSCRIPT)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
+@@ -229,6 +229,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <wchar.h>
++#include <fontconfig/fontconfig.h>
+ 
+ #include "Riostream.h"
+ #include "Byteswap.h"
+@@ -1528,56 +1529,179 @@
+ 
+ void TPostScript::FontEmbed(void)
+ {
+-   static const char *fonttable[32][2] = {
+-      { "Root.TTFont.0", "FreeSansBold.otf" },
+-      { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-      { "Root.TTFont.2", "FreeSerifBold.otf" },
+-      { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-      { "Root.TTFont.4", "FreeSans.otf" },
+-      { "Root.TTFont.5", "FreeSansOblique.otf" },
+-      { "Root.TTFont.6", "FreeSansBold.otf" },
+-      { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-      { "Root.TTFont.8", "FreeMono.otf" },
+-      { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-      { "Root.TTFont.10", "FreeMonoBold.otf" },
+-      { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-      { "Root.TTFont.12", "symbol.ttf" },
+-      { "Root.TTFont.13", "FreeSerif.otf" },
+-      { "Root.TTFont.14", "wingding.ttf" },
+-      { "Root.TTFont.15", "symbol.ttf" },
+-      { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-      { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-      { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-      { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-      { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-      { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-      { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-      { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-      { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-      { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-      { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-      { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-      { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
+-   };
+-
+    PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
+ 
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
+-         const char *filename = gEnv->GetValue(
+-                                               fonttable[fontid][0], fonttable[fontid][1]);
+-         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
++
++         char *ttfont = NULL;
++
++         FcPattern *pat, *match;
++         FcCharSet *set = NULL;
++         FcResult result;
++
++         pat = FcPatternCreate ();
++
++         switch (fontid) {
++         case 1:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 2:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 3:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 4:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 5:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 6:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 7:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 8:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 9:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 10:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 11:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 12:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 13:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 14:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 16:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 17:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 18:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 19:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 20:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 21:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 22:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 23:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 24:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 25:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 26:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 27:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 28:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 29:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            set = FcCharSetCreate ();
++            FcCharSetAddChar (set, 0x0410); // Cyrillic
++            FcCharSetAddChar (set, 0x4e00); // CJK
++            FcPatternAddCharSet (pat, FC_CHARSET, set);
++            break;
++         }
++
++         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcDefaultSubstitute (pat);
++         match = FcFontMatch (NULL, pat, &result);
++         char *ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++         ttfont = StrDup(ttfnt);
++         FcPatternDestroy (match);
++         FcPatternDestroy (pat);
++         if (set) FcCharSetDestroy (set);
++
+          if (!ttfont) {
+-            Error("TPostScript::FontEmbed",
+-                  "font %d (filename `%s') not found in path",
+-                  fontid, filename);
++            Error("TPostScript::FontEmbed", "font %d not found in path",
++                  fontid);
+          } else {
+             if (FontEmbedType2(ttfont)) {
+                // nothing
+@@ -1586,9 +1710,8 @@
+             } else if(FontEmbedType42(ttfont)) {
+                // nothing
+             } else {
+-               Error("TPostScript::FontEmbed",
+-                     "failed to embed font %d (filename `%s')",
+-                     fontid, filename);
++               Error("TPostScript::FontEmbed", "failed to embed font %d)",
++                     fontid);
+             }
+             delete [] ttfont;
+          }
+@@ -2536,10 +2659,10 @@
+       { "Root.PSFont.5",             "/Helvetica-Oblique" },
+       { "Root.PSFont.6",             "/Helvetica-Bold" },
+       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
+-      { "Root.PSFont.8",             "/Courrier" },
+-      { "Root.PSFont.9",             "/Courrier-Oblique" },
+-      { "Root.PSFont.10",            "/Courrier-Bold" },
+-      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
++      { "Root.PSFont.8",             "/Courier" },
++      { "Root.PSFont.9",             "/Courier-Oblique" },
++      { "Root.PSFont.10",            "/Courier-Bold" },
++      { "Root.PSFont.11",            "/Courier-BoldOblique" },
+       { "Root.PSFont.12",            "/Symbol" },
+       { "Root.PSFont.13",            "/Times-Roman" },
+       { "Root.PSFont.14",            "/ZapfDingbats" },
+@@ -2745,10 +2868,10 @@
+       { "Root.PSFont.9", "/FreeMonoOblique" },
+       { "Root.PSFont.10", "/FreeMonoBold" },
+       { "Root.PSFont.11", "/FreeMonoBoldOblique" },
+-      { "Root.PSFont.12", "/SymbolMT" },
++      { "Root.PSFont.12", "/StandardSymbolsL" },
+       { "Root.PSFont.13", "/FreeSerif" },
+-      { "Root.PSFont.14", "/Wingdings-Regular" },
+-      { "Root.PSFont.15", "/SymbolMT" },
++      { "Root.PSFont.14", "/Dingbats" },
++      { "Root.PSFont.15", "/StandardSymbolsL" },
+       { "Root.PSFont.STIXGen", "/STIXGeneral" },
+       { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
+       { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
+diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
+@@ -32,6 +32,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
+@@ -78,7 +78,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
+ 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
+-		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
++		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ 
+ $(call pcmrule,GL)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
+@@ -37,6 +37,7 @@
+ # include "FTGLBitmapFont.h"
+ #endif
+ 
++#include <fontconfig/fontconfig.h>
+ 
+ /** \class TGLFont
+ \ingroup opengl
+@@ -420,7 +421,7 @@
+ ClassImp(TGLFontManager);
+ 
+ TObjArray   TGLFontManager::fgFontFileArray;
+-Int_t TGLFontManager::fgExtendedFontStart;
++Int_t TGLFontManager::fgExtendedFontStart = 0;
+ TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
+ Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
+ 
+@@ -451,17 +452,175 @@
+    FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
+    if (it == fFontMap.end())
+    {
+-      TString ttpath, file;
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
+-      {
+-         //For extenede we have both ttf and otf.
+-         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+-                                   ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
+-                                   ((TObjString*)fgFontFileArray[fileID])->String());
+-         file = fp;
+-         delete [] fp;
++      char *file = NULL;
++      int ttindex = 0;
++
++      FcPattern *pat, *match;
++      FcCharSet *set = NULL;
++      FcResult result;
++
++      pat = FcPatternCreate ();
++
++      switch (fileID) {
++      case 0:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 1:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 2:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 3:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 4:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 5:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 6:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 7:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 8:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 9:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 10:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 11:
++      case 14:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 12:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 13:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 15:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 16:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 17:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 18:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 19:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 20:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 21:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 22:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 23:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 24:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 25:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 26:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 27:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 28:
++      case 29:
++      case 30:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         set = FcCharSetCreate ();
++         FcCharSetAddChar (set, 0x0410); // Cyrillic
++         FcCharSetAddChar (set, 0x4e00); // CJK
++         FcPatternAddCharSet (pat, FC_CHARSET, set);
+       }
+ 
++      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (NULL, pat, &result);
++      char *ttfnt;
++      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++      file = StrDup (ttfnt);
++      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++      FcPatternDestroy (match);
++      FcPatternDestroy (pat);
++      if (set) FcCharSetDestroy (set);
++
+       FTFont* ftfont = 0;
+       switch (mode)
+       {
+@@ -485,10 +644,14 @@
+             ftfont = new FTGLTextureFont(file);
+             break;
+          default:
++            delete [] file;
+             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
+             return;
+             break;
+       }
++
++      delete [] file;
++
+       ftfont->FaceSize(size);
+       const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
+       out.CopyAttributes(mf);
+@@ -571,8 +734,6 @@
+ {
+    if (fgStaticInitDone == kFALSE) InitStatics();
+ 
+-   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
+-
+    return fgExtendedFontStart;
+ }
+ 
+@@ -642,28 +803,6 @@
+    fgFontFileArray.Add(new TObjString("wingding")); // 140
+    fgFontFileArray.Add(new TObjString("symbol"));   // 150
+ 
+-   fgExtendedFontStart = fgFontFileArray.GetEntries();
+-   //"Extended" fonts for gl-pad.
+-   //fgPadFontStart + ...
+-   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
+-
+-   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
+-   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
+-   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
+-   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
+-
+-   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
+-   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
+-   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
+-   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
+-
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
+-   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
+-   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
+-
+    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
+    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
+    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
+@@ -34,6 +34,8 @@
+ # include "FTGLBitmapFont.h"
+ #endif
+ 
++#include <fontconfig/fontconfig.h>
++
+ #define FTGL_BITMAP  0
+ #define FTGL_PIXMAP  1
+ #define FTGL_OUTLINE 2
+@@ -178,27 +180,92 @@
+ {
+    int fontid = fontnumber / 10;
+ 
+-   const char *fontname=0;
+-   if (fontid == 0)  fontname = "arialbd.ttf";
+-   if (fontid == 1)  fontname = "timesi.ttf";
+-   if (fontid == 2)  fontname = "timesbd.ttf";
+-   if (fontid == 3)  fontname = "timesbi.ttf";
+-   if (fontid == 4)  fontname = "arial.ttf";
+-   if (fontid == 5)  fontname = "ariali.ttf";
+-   if (fontid == 6)  fontname = "arialbd.ttf";
+-   if (fontid == 7)  fontname = "arialbi.ttf";
+-   if (fontid == 8)  fontname = "cour.ttf";
+-   if (fontid == 9)  fontname = "couri.ttf";
+-   if (fontid == 10) fontname = "courbd.ttf";
+-   if (fontid == 11) fontname = "courbi.ttf";
+-   if (fontid == 12) fontname = "symbol.ttf";
+-   if (fontid == 13) fontname = "times.ttf";
+-   if (fontid == 14) fontname = "wingding.ttf";
+-
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++   FcPattern *pat, *match;
++   FcResult result;
++   char *ttfont;
++   int ttindex;
++
++   pat = FcPatternCreate ();
++
++   switch (fontid) {
++   case 1:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 2:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 3:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 4:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 5:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 0:
++   case 6:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 7:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 8:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 9:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 10:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 11:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 12:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   }
++
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
+ 
+    if (fGLTextFont) delete fGLTextFont;
+ 
+@@ -206,7 +273,9 @@
+ 
+    fGLTextFont = new FTGLPolygonFont(ttfont);
+ 
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
++
+    if (!fGLTextFont->FaceSize(1))
+       Error("SetGLTextFont","Cannot set FTGL::FaceSize");
+-   delete [] ttfont;
+ }
+diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
+@@ -83,20 +83,12 @@
+    gROOT->SetBatch(kFALSE);
+ 
+    if (strcmp(appClassName, "proofserv")) {
+-      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                          TROOT::GetTTFFontDir());
+-      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+-      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
+-      if (!ttfont)
+-         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
+-      if (ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
++      if (gEnv->GetValue("Root.UseTTFonts", 1)) {
+          TPluginHandler *h;
+          if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualX", "x11ttf")))
+             if (h->LoadPlugin() == -1)
+                Info("TGApplication", "no TTF support");
+       }
+-
+-      delete [] ttfont;
+    }
+ 
+    // Create the canvas colors early so they are allocated before
+diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
+--- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
+@@ -119,8 +119,7 @@
+ {
+    TString sc;
+    Float_t step, mark[5];
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString ar = fp + "/arialbd.ttf";
++   TString ar = "arialbd.ttf";
+    Int_t i, nexe, offset;
+ 
+    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
+@@ -528,8 +527,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
+@@ -609,8 +607,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
new file mode 100644
index 0000000..c0f9e07
--- /dev/null
+++ b/root-gl2ps.patch
@@ -0,0 +1,254 @@
+diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
+--- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
+@@ -0,0 +1,21 @@
++# - Locate gl2ps library
++# Defines:
++#
++#  GL2PS_FOUND
++#  GL2PS_INCLUDE_DIR
++#  GL2PS_INCLUDE_DIRS (not cached)
++#  GL2PS_LIBRARIES
++
++find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
++find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
++
++set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
++set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
++
++mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
+@@ -70,6 +70,7 @@
+ ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
+ ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
+ ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
++ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
+@@ -153,6 +153,11 @@
+ set(opengllib ${OPENGL_gl_LIBRARY})
+ set(openglincdir ${OPENGL_INCLUDE_DIR})
+ 
++set(builtingl2ps ${value${builtin_gl2ps}})
++set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
++set(gl2pslib ${GL2PS_LIBRARY})
++set(gl2psincdir ${GL2PS_INCLUDE_DIR})
++
+ set(buildldap ${value${ldap}})
+ set(ldaplibdir ${LDAP_LIBRARY_DIR})
+ set(ldaplib ${LDAP_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
+@@ -334,6 +334,16 @@
+   endif()
+ endif()
+ 
++#---Check for gl2ps ------------------------------------------------------------------
++if(NOT builtin_gl2ps)
++  message(STATUS "Looking for gl2ps")
++  find_Package(gl2ps)
++  if(NOT GL2PS_FOUND)
++    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
++    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Graphviz installation-------------------------------------------------------
+ if(gviz)
+   message(STATUS "Looking for Graphviz")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
+@@ -142,6 +142,11 @@
+ OPENGLLIB      := @opengllib@
+ OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
+ 
++BUILTINGL2PS   := @builtingl2ps@
++GL2PSLIBDIR    := @gl2pslibdir@
++GL2PSCLILIB    := @gl2pslib@
++GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
++
+ BUILDLDAP      := @buildldap@
+ LDAPLIBDIR     := @ldaplibdir@
+ LDAPCLILIB     := @ldaplib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
++++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
+@@ -53,6 +53,7 @@
+    enable_builtin_afterimage \
+    enable_builtin_ftgl       \
+    enable_builtin_freetype   \
++   enable_builtin_gl2ps      \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
+    enable_builtin_unuran     \
+@@ -182,6 +183,7 @@
+ enable_winrtdebug=
+ enable_builtin_freetype=no
+ enable_builtin_ftgl=no
++enable_builtin_gl2ps=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
+ enable_builtin_unuran=no
+@@ -1704,6 +1706,7 @@
+   builtin-afterimage Build included libAfterImage, or use system libAfterImage
+   builtin-ftgl       Build included libFTGL, or use system libftgl
+   builtin-freetype   Build included libfreetype, or use system libfreetype
++  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
+   builtin-unuran     Build included libunuran, or use system libunuran
+@@ -2047,6 +2050,7 @@
+    logmsg "Will use by default builtin versions of libraries on Win32"
+    enable_builtin_freetype="yes"
+    enable_builtin_ftgl="yes"
++   enable_builtin_gl2ps="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
+    enable_builtin_unuran="yes"
+@@ -3180,6 +3184,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libgl2ps (builtin or system)
++#
++if test "x$enable_builtin_gl2ps" = "xno" ; then
++    check_header "gl2ps.h" "" \
++        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_gl2ps=yes
++    else
++        gl2psinc=$found_hdr
++        gl2psincdir=$found_dir
++    fi
++
++    check_library "libgl2ps" "$enable_shared" "" \
++        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        gl2pslib=""
++        gl2pslibdir=""
++        enable_builtin_gl2ps="yes"
++    else
++        gl2pslib="$found_lib"
++        gl2pslibdir="$found_dir"
++    fi
++
++    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
++        enable_builtin_gl2ps="yes"
++    fi
++fi
++message "Checking whether to build included gl2ps"
++result "$enable_builtin_gl2ps"
++
++######################################################################
++#
+ ### echo %%% libpcre (builtin or system) - Mandatory lib
+ #
+ # Mandatory test, must succeed (see http://www.pcre.org/)
+@@ -7593,6 +7629,10 @@
+     -e "s|@ftglincdir@|$ftglincdir|"            \
+     -e "s|@ftgllibdir@|$ftgllibdir|"            \
+     -e "s|@ftgllibs@|$ftgllibs|"                \
++    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
++    -e "s|@gl2psincdir@|$gl2psincdir|"          \
++    -e "s|@gl2pslib@|$gl2pslib|"                \
++    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
+     -e "s|@glewincdir@|$glewincdir|"            \
+     -e "s|@glewlibdir@|$glewlibdir|"            \
+     -e "s|@glewlibs@|$glewlibs|"                \
+diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
+@@ -7,12 +7,20 @@
+ ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
+ list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
+                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
++set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
+ ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
+ 
+ if(WIN32 OR cocoa)
+   list(REMOVE_ITEM headers TX11GL.h)
+   list(REMOVE_ITEM sources TX11GL.cxx)
+-  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
++  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
++endif()
++
++if(builtin_gl2ps)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++else()
++  list(REMOVE_ITEM sources gl2ps.cxx)
++  include_directories(${GL2PS_INCLUDE_DIRS})
+ endif()
+ 
+ if(WIN32)
+@@ -32,6 +40,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
+@@ -19,6 +19,7 @@
+ GLDH         := $(GLDS:.cxx=.h)
+ 
+ GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
++GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
+ GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
+ 
+ # Excluded from win32 builds
+@@ -42,6 +43,13 @@
+ # Used by rootcint
+ GLH2         := $(filter-out $(GLH1), $(GLH))
+ 
++ifeq ($(BUILTINGL2PS),yes)
++GL2PSFLAGS   := -I$(MODDIRI)
++else()
++GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
++GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
++endif()
++
+ ifneq ($(OPENGLLIB),)
+ GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
+                 $(XLIBS) -lm
+@@ -78,6 +86,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
+ 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
++		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
+ 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ 
+ $(call pcmrule,GL)
+@@ -107,12 +116,12 @@
+ ##### extra rules ######
+ ifeq ($(ARCH),win32)
+ $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ else
+-$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
+-$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
++$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
++$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
+ endif
+ 
+ $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-html-markup.patch b/root-html-markup.patch
new file mode 100644
index 0000000..d6b9d1e
--- /dev/null
+++ b/root-html-markup.patch
@@ -0,0 +1,1031 @@
+diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
+@@ -42,7 +42,6 @@
+ //
+ // This enum type describes the ways in which TGTextEntry can display
+ // its contents. The currently defined values are:
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kNormal - display characters as they are entered. This is the default.
+@@ -50,14 +49,12 @@
+ <li>  kPassword - display asterisks instead of the characters actually entered.
+ </ul>
+ */
+-//End_Html
+ // See also SetEchoMode(), GetEchoMode().
+ //
+ // enum TGTextEntry::EInsertMode
+ //
+ // This enum type describes the way how typed characters are
+ // inserted in the text entry. This mode is switched by "Insert" key.
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kInsert - typed character are inserted (cursor has shape of short line).
+@@ -65,13 +62,11 @@
+                  (cursor has the shape of filled rectangle).
+ </ul>
+ */
+-//End_Html
+ //
+ // enum TGWidget::ETextJustification
+ //
+ // This enum type (defined in TGWidget.h) describes the text alignment modes.
+ // These modes are valid untill text fits the frame width
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kTextLeft    - left-side text alignment
+@@ -79,12 +74,10 @@
+ <li>  kTextCenterX - center text alignment
+ </ul>
+ */
+-//End_Html
+ //
+ //
+ // The key press event handler converts a key press to some line editor action.
+ // Here are the default key bindings:
+-//Begin_Html
+ /*
+ <ul>
+ <li><i> Left Arrow </i>
+@@ -153,7 +146,6 @@
+ </ul>
+ All other keys with valid ASCII codes insert themselves into the line.
+ */
+-//End_Html
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+@@ -658,13 +650,11 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The echo modes available are:
+-///Begin_Html
+ /// <ul>
+ /// <li> kNormal   - display characters as they are entered.  This is the default.
+ /// <li> kNoEcho   - do not display anything.
+ /// <li> kPassword - display asterisks instead of the characters actually entered.
+ /// </ul>
+-///End_Html
+ /// It is always possible to cut and paste any marked text;  only the widget's own
+ /// display is affected.
+ /// See also GetEchoMode(), GetDisplayText().
+@@ -1154,7 +1144,6 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The key press event handler converts a key press to some line editor
+ /// action. Here are the default key bindings:
+-///Begin_Html
+ ///  <ul>
+ ///  <li><i> Left Arrow </i>
+ ///          Move the cursor one character leftwards.
+@@ -1220,7 +1209,6 @@
+ ///  <li><i> Control-Y </i>
+ ///          Paste the clipboard text into line edit.
+ ///  </ul>
+-///End_Html
+ ///  All other keys with valid ASCII codes insert themselves into the line.
+ 
+ Bool_t TGTextEntry::HandleKey(Event_t* event)
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
+@@ -938,17 +938,10 @@
+ ///  NOTE: To access the generated histograms in the current directory, do eg:
+ ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
+ ///
+-/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
+-/// with the following output:
+-///Begin_Html
++/// A complete example of this function is given in tutorial fitslicesy.C.
+ 
+ void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
+ {
+-   /*
+-   <img src="gif/fitslicesy.gif">
+-   */
+-   //End_Html
+-
+    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
+ 
+ }
+diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
+--- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
+@@ -603,7 +603,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -682,7 +682,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -986,7 +986,7 @@
+ ///     None so far
+ ///
+ /// For detailed description of what this entails, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::FindParameterization(Option_t *)
+ {
+@@ -1005,7 +1005,7 @@
+ ///     M     use Minuit to improve coefficients
+ ///
+ /// Also, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::Fit(Option_t *option)
+ {
+@@ -1097,7 +1097,7 @@
+ /// PRIVATE METHOD:
+ /// Create list of candidate functions for the parameterisation. See
+ /// also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeCandidates()
+ {
+@@ -1354,7 +1354,7 @@
+ /// PRIVATE METHOD:
+ /// Invert the model matrix B, and compute final coefficients. For a
+ /// more thorough discussion of what this means, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ ///
+ /// First we invert the lower triangle matrix fOrthCurvatureMatrix
+ /// and store the inverted matrix in the upper triangle.
+@@ -1496,7 +1496,7 @@
+ /// Make Gram-Schmidt orthogonalisation. The class description gives
+ /// a thorough account of this algorithm, as well as
+ /// references. Please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
+ {
+@@ -1589,7 +1589,7 @@
+ ///     R4        Residuals computed on test sample
+ ///
+ /// For a description of these quantities, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeHistograms(Option_t *option)
+ {
+@@ -1800,7 +1800,7 @@
+ /// PRIVATE METHOD:
+ /// Find the parameterization over the training sample. A full account
+ /// of the algorithm is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeParameterization()
+ {
+@@ -2365,7 +2365,7 @@
+ /// be fitted, and the new candidate function to be included in the
+ /// fit.  By default it is 0, which automatically chooses another
+ /// selection criteria. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxAngle(Double_t ang)
+ {
+@@ -2381,7 +2381,7 @@
+ /// Set the min angle (in degrees) between a new candidate function
+ /// and the subspace spanned by the previously accepted
+ /// functions. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinAngle(Double_t ang)
+ {
+@@ -2401,7 +2401,7 @@
+ /// Where N is the dimension of the data sample, L is the number of
+ /// terms (given in terms) and the first number, labels the term, the
+ /// second the variable.  More information is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
+ {
+@@ -2421,7 +2421,7 @@
+ /// Set the user parameter for the function selection. The bigger the
+ /// limit, the more functions are used. The meaning of this variable
+ /// is defined in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowerLimit(Double_t limit)
+ {
+@@ -2431,7 +2431,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Set the maximum power to be considered in the fit for each
+ /// variable. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxPowers(const Int_t* powers)
+ {
+@@ -2446,7 +2446,7 @@
+ /// Set the acceptable relative error for when sum of square
+ /// residuals is considered minimized. For a full account, refer to
+ /// the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinRelativeError(Double_t error)
+ {
+@@ -2458,7 +2458,7 @@
+ /// PRIVATE METHOD:
+ /// Test whether the currently considered function contributes to the
+ /// fit. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
+                                   Double_t dResidur)
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
+@@ -71,8 +71,6 @@
+ //
+ //</div>
+ //
+-//<!-- */
+-// --> End_Html
+ 
+ //______________________________________________________________________________
+ /** \class TSpectrum2
+@@ -372,7 +370,6 @@
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Background(Double_t **spectrum,
+                        Int_t ssizex, Int_t ssizey,
+@@ -381,7 +378,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
+@@ -523,10 +520,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
+@@ -835,8 +830,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, x, y, sampling, r1, r2;
+    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
+@@ -1022,11 +1016,10 @@
+ ///   averWindow-width of averaging smoothing window
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
+@@ -1134,10 +1127,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
+@@ -1239,8 +1230,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t xmin, xmax, ymin, ymax, i, j, l;
+    Double_t a, b, maxch;
+    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
+@@ -1439,7 +1429,6 @@
+ ///   boost, boosting factor, for details we refer to manual
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
+                                        Int_t ssizex, Int_t ssizey,
+@@ -1447,7 +1436,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
+@@ -1602,10 +1591,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
+@@ -1982,8 +1969,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
+        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2177,8 +2163,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
+@@ -2311,10 +2296,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
+@@ -2856,8 +2839,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k, lindex, priz;
+    Double_t lda, ldb, ldc, area, maximum;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
+@@ -162,11 +162,10 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
+@@ -178,8 +177,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    if (numberPeaks <= 0){
+       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
+       return;
+@@ -1793,11 +1791,10 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrum2Fit::FitAwmi(Double_t **source)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
+@@ -2686,8 +2683,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, pw,
+@@ -4697,8 +4693,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+ //
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
+@@ -4928,8 +4923,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
+@@ -1748,8 +1748,7 @@
+ /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -2018,8 +2017,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j;
+    Int_t size;
+    Double_t *working_vector = 0, **working_matrix = 0;
+@@ -2324,8 +2322,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -2481,8 +2478,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+@@ -2768,8 +2764,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2908,8 +2903,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
+@@ -273,7 +273,6 @@
+ ///                                                                           //
+ ///                                                                           //
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Background(Double_t***spectrum,
+                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -283,7 +282,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
+@@ -674,8 +673,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, x, y, z, sampling, q1, q2, q3;
+    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
+    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
+@@ -1069,11 +1067,10 @@
+ /// averWindow-width of averaging smoothing window                          //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section2>
+ 
+@@ -1302,8 +1299,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
+    Double_t a,b,maxch;
+@@ -1868,7 +1864,6 @@
+ /// boost, boosting factor, for details we refer to manual                  //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
+                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -1876,7 +1871,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section3>
+ 
+@@ -2357,8 +2352,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2590,8 +2584,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ 
+ <div class=Section4>
+ 
+@@ -2901,8 +2894,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k,lindex;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
+@@ -113,7 +113,6 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
+ {
+@@ -162,7 +161,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    if (numberPeaks <= 0){
+       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
+@@ -847,7 +845,6 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitAwmi(Double_t *source)
+ {
+@@ -1343,7 +1340,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
+@@ -2312,7 +2308,6 @@
+ ///        source-pointer to the vector of source spectrum
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitStiefel(Double_t *source)
+ {
+@@ -2546,7 +2541,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
+@@ -739,11 +739,10 @@
+ ///             need 2*size length to store real and imaginary coefficients
+ ///
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -989,8 +988,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t a, b, pi = 3.14159265358979323846;
+@@ -1482,11 +1480,10 @@
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -1618,8 +1615,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+@@ -2091,11 +2087,10 @@
+ ///           need 2*size length to store real and imaginary coefficients
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2226,8 +2221,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
+--- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
+@@ -1162,7 +1162,6 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Paints histogram according to preset parameters.
+-///Begin_Html <!--
+ 
+ void TSpectrum2Painter::Paint(Option_t * /*option*/)
+ {
+@@ -1524,7 +1523,6 @@
+ }
+ </pre>
+ <!-- */
+-// --> End_Html
+ 
+    Int_t turni,turnj,w1,w2,x,y;
+    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
+@@ -7654,14 +7652,12 @@
+ ///                               * * *
+ ///
+ /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
+-///Begin_Html
+ 
+ void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
+ {
+    /*
+    <img src="gif/spectrumpainter.gif">
+    */
+-   //End_Html
+ 
+    TString opt = option;
+ 
+diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
+--- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
+@@ -25,20 +25,15 @@
+ // Monte Carlo event generator (integrator) FOAM.
+ // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
+ // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_MapCamel1000.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_MapCamel1000.gif">
++//
+ // FOAM is now fully integrated with the ROOT package.
+ // The important bonus of the ROOT use is persistency of the FOAM objects!
+ //
+ // For more sophisticated problems full version of FOAM may be more appropriate:
+-//BEGIN_HTML <!--
+-/* -->
+-  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
+-<!--*/
+-// -->END_HTML
++// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
++//
+ // Simple example of the use of FOAM:
+ // ==================================
+ // Int_t kanwa(){
+@@ -81,11 +76,9 @@
+ //   return 0.5*Dist;
+ // }// Camel2
+ // Two-dim. histogram of the MC points generated with the above program looks as follows:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_cKanwa.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_cKanwa.gif">
++//
+ // Canonical nine steering parameters of FOAM
+ // ===========================================
+ //------------------------------------------------------------------------------
+@@ -266,10 +259,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Default destructor
+-///  std::cout<<" DESTRUCTOR entered "<<std::endl;
+ 
+ TFoam::~TFoam()
+ {
++   //std::cout<<" DESTRUCTOR entered "<<std::endl;
+    Int_t i;
+ 
+    if(fCells!= 0) {
+@@ -321,42 +314,35 @@
+ /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
+ /// and reseting (optionally) its internal parameters/switches.
+ /// The overall operational scheme of the FOAM is the following:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_schema2.gif">
++///
++/// This method invokes several other methods:
++/// ==========================================
++/// InitCells initializes memory storage for cells and begins exploration process
++/// from the root cell. The empty cells are allocated/filled using  CellFill.
++/// The procedure Grow which loops over cells, picks up the cell with the biggest
++/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
++/// with the help of PeekMax procedure. The chosen cell is split using Divide.
++/// Subsequently, the procedure Explore called by the Divide
++/// (and by InitCells for the root cell) does the most important
++/// job in the FOAM object build-up: it performs a small MC run for each
++/// newly allocated daughter cell.
++/// Explore calculates how profitable the future split of the cell will be
++/// and defines the optimal cell division geometry with the help of Carver or Varedu
++/// procedures, for maximum weight or variance optimization respectively.
++/// All essential results of the exploration are written into
++/// the explored cell object. At the very end of the foam build-up,
++/// Finally, MakeActiveList is invoked to create a list of pointers to
++/// all active cells, for the purpose of the quick access during the MC generation.
++/// The procedure Explore employs MakeAlpha to generate random coordinates
++/// inside a given cell with the uniform distribution.
++/// The above sequence of the procedure calls is depicted in the following figure:
++///
++//  <img src="gif/foam_Initialize_schema.gif">
+ 
+ void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
+ {
+-/* -->
+-<img src="gif/foam_schema2.gif">
+-<!--*/
+-// -->END_HTML
+-//
+-// This method invokes several other methods:
+-// ==========================================
+-// InitCells initializes memory storage for cells and begins exploration process
+-// from the root cell. The empty cells are allocated/filled using  CellFill.
+-// The procedure Grow which loops over cells, picks up the cell with the biggest
+-// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
+-// with the help of PeekMax procedure. The chosen cell is split using Divide.
+-// Subsequently, the procedure Explore called by the Divide
+-// (and by InitCells for the root cell) does the most important
+-// job in the FOAM object build-up: it performs a small MC run for each
+-// newly allocated daughter cell.
+-// Explore calculates how profitable the future split of the cell will be
+-// and defines the optimal cell division geometry with the help of Carver or Varedu
+-// procedures, for maximum weight or variance optimization respectively.
+-// All essential results of the exploration are written into
+-// the explored cell object. At the very end of the foam build-up,
+-// Finally, MakeActiveList is invoked to create a list of pointers to
+-// all active cells, for the purpose of the quick access during the MC generation.
+-// The procedure Explore employs MakeAlpha to generate random coordinates
+-// inside a given cell with the uniform distribution.
+-// The above sequence of the procedure calls is depicted in the following figure:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_Initialize_schema.gif">
+-<!--*/
+-// -->END_HTML
+-
+    SetPseRan(PseRan);
+    SetRho(fun);
+    Initialize();
+@@ -1363,15 +1349,11 @@
+ /// It defines which variables are excluded in the process of the cell division.
+ /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
+ /// The resulting map of cells in 2-dim. case will look as follows:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map2.gif">
+ 
+ void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
+ {
+-/* -->
+-<img src="gif/foam_Map2.gif">
+-<!--*/
+-// -->END_HTML
+-
+    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
+    if(fInhiDiv == 0) {
+       fInhiDiv = new Int_t[ fDim ];
+@@ -1391,15 +1373,11 @@
+ ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
+ ///     FoamX->SetXdivPRD(0,3,xDiv);
+ /// results in the following 2-dim. pattern of the cells:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map3.gif">
+ 
+ void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
+ {
+-/* -->
+-<img src="gif/foam_Map3.gif">
+-<!--*/
+-// -->END_HTML
+-
+    Int_t i;
+ 
+    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
+diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
+@@ -238,19 +238,14 @@
+ /// PDG convention already)
+ /// Source: BaBar User Guide, Neil I. Geddes,
+ ///
+-///Begin_Html
++/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
++/// with some fixes by PB, marked with (PB) below. Checked against
++/// PDG listings from 2000.
++///
++/// Paul Balm, Nov 19, 2001
+ 
+ Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
+ {
+-  /*
+-   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
+-  */
+-  //End_Html
+-  // with some fixes by PB, marked with (PB) below. Checked against
+-  // PDG listings from 2000.
+-  //
+-  // Paul Balm, Nov 19, 2001
+-
+    switch(Geant3number) {
+ 
+       case 1   : return 22;       // photon
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
+@@ -50,7 +50,7 @@
+ 
+ The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
+ 
+-The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
++The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
+ 
+ */
+ 
+diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
+--- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
+@@ -3,13 +3,11 @@
+ TCanvas *timeonaxis()
+ {
+ // This macro illustrates the use of the time mode on the axis
+-// with different time intervals and time formats. It's result can
+-// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
++// with different time intervals and time formats.
+ // Through all this script, the time is expressed in UTC. some
+ // information about this format (and others like GPS) may be found at
+-// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
+-//  or
+-// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
++// http://tycho.usno.navy.mil/systime.html or
++// http://www.topology.org/sci/time.html
+ //
+ // The start time is : almost NOW (the time at which the script is executed)
+ // actualy, the nearest preceding hour beginning.
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
new file mode 100644
index 0000000..48e2a28
--- /dev/null
+++ b/root-latex-markup.patch
@@ -0,0 +1,877 @@
+diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
+@@ -185,14 +185,19 @@
+ ## <a name="L8"></a> Accents
+ Several kind of accents are available:
+ 
+-   #hat    = Begin_Latex #hat{a} End_Latex
+-   #check  = Begin_Latex #check{a} End_Latex
+-   #acute  = Begin_Latex #acute{a} End_Latex
+-   #grave  = Begin_Latex #grave{a} End_Latex
+-   #dot    = Begin_Latex #dot{a} End_Latex
+-   #ddot   = Begin_Latex #ddot{a} End_Latex
+-   #tilde  = Begin_Latex #tilde{a} End_Latex
+-
++Begin_Macro(source)
++{
++   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
++   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
++   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
++   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
++   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
++   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
++   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
++   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
++   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
++}
++End_Macro
+ 
+ The special sign: `#slash` draws a slash on top of the text between brackets:
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
+--- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
+@@ -949,9 +949,9 @@
+ /// Getting the error via TF1::DerivativeError:
+ ///   (total error = roundoff error + interpolation error)
+ /// the estimate of the roundoff error is taken as follows:
+-///Begin_Latex
+-///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-///End_Latex
++/// \f[
++///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++/// \f]
+ /// where k is the double precision, ai are coefficients used in
+ /// central difference formulas
+ /// interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
+--- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -360,27 +360,33 @@
+ ///
+ /// If the histograms are not filled with unit weights, the number of effective
+ /// entries is used to normalise the bin contents which might lead to wrong results.
+-/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
+-///
++/// \f[
++/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
++/// \f]
+ /// The points are assigned a x value at the center of each histogram bin.
+-/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
++/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
++/// for all options except for the
+ /// bayesian methods where the result depends on the chosen option.
+ ///
+-/// If the denominator becomes 0 or pass >  total, the corresponding bin is
++/// If the denominator becomes 0 or pass > total, the corresponding bin is
+ /// skipped.
+ ///
+ /// 2) calculating ratios of two Poisson means (option 'pois'):
+ /// --------------------------------------------------------------
+ ///
+ /// The two histograms are interpreted as independent Poisson processes and the ratio
+-/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
+-/// The histogram 'pass' is interpreted as n_{1} and the total histogram
+-/// is used for n_{2}
++/// \f[
++/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
++/// \f]
++/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
++/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
++/// is used for \f$n_{2}\f$.
+ ///
+ /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
+ /// of efficiency by a parameter transformation:
+-/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
+-///
++/// \f[
++/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
++/// \f]
+ /// The x errors span each histogram bin (lowedge ... lowedge+width)
+ /// The y errors depend on the chosen statistic methode which can be determined
+ /// by the options given below. For a detailed description of the used statistic
+@@ -413,8 +419,7 @@
+ /// oscillation on the actual coverage probability a couple of approximations and
+ /// methodes has been developped. For a detailed discussion, please have a look at
+ /// this statistical paper:
+-/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
+-/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
++/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
+ 
+ void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
+ {
+diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
+--- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -764,8 +764,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Get square of the error of bin addressed by linidx as
+-/// BEGIN_LATEX #sum weight^{2}
+-/// END_LATEX
++/// \f$\sum weight^{2}\f$
+ /// If errors are not enabled (via Sumw2() or CalculateErrors())
+ /// return contents.
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -92,31 +92,28 @@
+     Method:
+        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
+        and 16-point Gaussian quadrature approximations to
+-   Begin_Latex
+-      I = #int^{b}_{a} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{b}_{a} f(x)dx
++   \f]
+       and define
+-   Begin_Latex
+-      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
+-   End_Latex
++   \f[
++      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
++   \f]
+       Then,
+-   Begin_Latex
+-      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
+-   End_Latex
+-      where, starting with x0 = A and finishing with xk = B,
+-      the subdivision points xi(i=1,2,...) are given by
+-   Begin_Latex
+-      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
+-   End_Latex
+-   Begin_Latex
+-      #lambda
+-   End_Latex
+-      is equal to the first member of the
+-      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
++   \f[
++      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
++   \f]
++      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
++      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
++   \f[
++      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
++   \f]
++      \f$\lambda\f$ is equal to the first member of the
++      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
+       If, at any stage in the process of subdivision, the ratio
+-  Begin_Latex
+-      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
+-  End_Latex
++  \f[
++      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
++  \f]
+       is so small that 1+0.005q is indistinguishable from 1 to
+       machine accuracy, an error exit occurs with the function value
+       set equal to zero.
+@@ -131,13 +128,13 @@
+       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
+       precisely, if k is the number of sub-intervals contributing to the
+       approximation (see Method), and if
+-      Begin_Latex
+-      I_{abs} = #int^{B}_{A} #||{f(x)}dx
+-      End_Latex
++   \f[
++      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
++   \f]
+       then the relation
+-   Begin_Latex
+-    #frac{#||{G-I}}{I_{abs}+k} < EPS
+-   End_Latex
++   \f[
++      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
++   \f]
+       will nearly always be true, provided the routine terminates without
+       printing an error message. For functions f having no singularities in
+       the closed interval [A,B] the accuracy will usually be much higher than
+@@ -156,9 +153,9 @@
+ 
+    /** Returns Integral of function on an infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{-#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{-\infty} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -169,9 +166,9 @@
+ 
+    /** Returns Integral of function on an upper semi-infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{A} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{A} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -183,9 +180,9 @@
+ 
+    /** Returns Integral of function on a lower semi-infinite interval.
+        This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{B}_{#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{B}_{-\infty} f(x)dx
++   \f]
+       Usage:
+          In any arithmetic expression, this function has the approximate value
+          of the integral I.
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -88,10 +88,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-      D(h) = #frac{f(x+h) - f(x-h)}{2h}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++      D(h) = \frac{f(x+h) - f(x-h)}{2h}
++     \f]
++      the final estimate
++     \f[
++      D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -103,9 +106,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -141,10 +144,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -156,9 +162,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -177,10 +183,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -192,9 +201,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
+--- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
+@@ -34,35 +34,33 @@
+ double kEulerGamma = 0.577215664901532860606512090082402431042;
+ 
+ 
+-/* Begin_Html
+-<center><h2>KelvinFunctions</h2></center>
++/**
++\class KelvinFunctions
+ 
+-<p>
+ This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
+ Kei(x), and their first derivatives.
+-</p>
+-
+-End_Html */
++*/
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
++/// \f]
+ /// For x > fgMin, Ber(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -102,24 +100,25 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
++/// \f]
+ /// For x > fgMin, Bei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -161,29 +160,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Ker(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -227,29 +227,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Kei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -298,10 +299,10 @@
+ /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ber(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -343,10 +344,10 @@
+ /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
+ /// the polynomial approximation of Bei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -388,10 +389,10 @@
+ /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ker(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -436,10 +437,10 @@
+ /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
+ /// the polynomial approximation of Kei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -481,9 +482,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
+-/// Begin_Latex
+-/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F1(double x)
+ {
+@@ -510,9 +511,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
+-/// Begin_Latex
+-/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F2(double x)
+ {
+@@ -541,9 +542,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
+-/// Begin_Latex
+-/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G1(double x)
+ {
+@@ -568,9 +569,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
+-/// Begin_Latex
+-/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G2(double x)
+ {
+@@ -597,9 +598,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+ /// DBei(x). M(x) is given by
+-/// Begin_Latex
+-/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// \f[
++/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::M(double x)
+ {
+@@ -612,10 +613,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+-/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DBei(x). \f$\theta(x)\f$ is given by
++/// \f[
++/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Theta(double x)
+ {
+@@ -628,10 +629,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). (x) is given by
+-/// Begin_Latex
+-/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// DKei(x). N(x) is given by
++/// \f[
++/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::N(double x)
+ {
+@@ -644,10 +645,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DKei(x). \f$\phi(x)\f$ is given by
++/// \f[
++/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Phi(double x)
+ {
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
+@@ -85,7 +85,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+       
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+    private:
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
+@@ -37,11 +37,12 @@
+    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
+    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
+    and an alternate hypothesis (eg. signal+background).  
+-   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
+-   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
+-   not a probability.
+-   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
+-   Significance method.
++   The p-values can also be transformed into confidence levels
++   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
++   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
++   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
++   Finally, the p-value of the null can be transformed into a number of
++   equivalent Gaussian sigma using the Significance method.
+ 
+    The p-value of the null for a given test statistic is rigorously defined and
+    this is the starting point for the following conventions.
+@@ -52,17 +53,17 @@
+ observed value of the test statistic. This is the more standard
+ convention and avoids confusion when doing inverted tests.
+ 
+-For exclusion, we also want the formula
+-CLs = CLs+b / CLb to hold which therefore defines our conventions
+-for CLs+b and CLb. CLs was specifically invented for exclusion
++For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
++to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
++\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
+ and therefore all quantities need be related through the assignments
+-as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
++as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
+ is derived by considering the scenarios of a powerful and not powerful
+-inverted test, where for the not so powerful test, CLs must be
++inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
+ close to one.
+ 
+ For results of Hypothesis tests,
+-CLs has no similar direct interpretation as for exclusion and can
++\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
+ be larger than one.
+ 
+ */
+@@ -101,7 +102,7 @@
+       /// Convert  AlternatePValue into a "confidence level"
+       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
+ 
+-      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
++      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
+       virtual Double_t CLs() const {
+          double thisCLb = CLb();
+          if (thisCLb == 0) {
+@@ -144,7 +145,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+ 
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+       /// The error on the Null p-value
+diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -100,11 +100,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$1 - CL_{b}\f$ : the B p-value
+ double HybridResult::NullPValue() const
+ {
+-   // return 1-CL_b : the B p-value
+-
+    if (fComputationsNulDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -131,11 +129,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$CL_{s+b}\f$ : the S+B p-value
+ double HybridResult::AlternatePValue() const
+ {
+-   // return CL_s+b : the S+B p-value
+-
+    if (fComputationsAltDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -162,40 +158,37 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
++/// error on \f$CL_{b}\f$:
++/// \f[
++/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLbError() const
+ {
+-  // Returns an estimate of the error on CLb assuming a binomial error on
+-  // CLb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_b.size();
+   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
++/// error on \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLsplusbError() const
+ {
+-  // Returns an estimate of the error on CLsplusb assuming a binomial
+-  // error on CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_sb.size();
+   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
++/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ Double_t HybridResult::CLsError() const
+ {
+-  // Returns an estimate of the error on CLs through combination of the
+-  // errors on CLb and CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-  // END_LATEX
+   unsigned const int n_b = fTestStat_b.size();
+   unsigned const int n_sb = fTestStat_sb.size();
+   
+diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -229,8 +229,8 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// compute CLb error
+-/// Clb =  1 - NullPValue() 
++/// compute \f$CL_{b}\f$ error
++/// \f$CL_{b}\f$ = 1 - NullPValue()
+ /// must use opposite condition that routine above
+ 
+ Double_t HypoTestResult::CLbError() const {
+@@ -251,12 +251,12 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Returns an estimate of the error on CLs through combination of the
+-/// errors on CLb and CLsplusb:
+-/// BEGIN_LATEX
+-/// #sigma_{CL_s} = CL_s
+-/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-/// END_LATEX
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
++/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s
++/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ 
+ Double_t HypoTestResult::CLsError() const {
+    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
new file mode 100644
index 0000000..2af5c42
--- /dev/null
+++ b/root-libgfortranbegin.patch
@@ -0,0 +1,182 @@
+diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
+--- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
+--- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
+--- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
+@@ -55,8 +55,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
+--- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
+--- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
+--- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
+@@ -53,8 +53,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
+--- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
+@@ -43,8 +43,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
+--- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
+--- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
+@@ -50,8 +50,10 @@
+ endif
+ F77FLAGS      = -m32 -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
+--- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -54,8 +54,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
+--- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -62,8 +62,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
+--- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
+--- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
new file mode 100644
index 0000000..4dfbc44
--- /dev/null
+++ b/root-links.patch
@@ -0,0 +1,376 @@
+diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
+--- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
+@@ -5,7 +5,7 @@
+ and their rotation algorithms. The classes were ported to root from
+ CLHEP see:
+ 
+-<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
++<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
+ 
+ ## The Physics Vector Classes
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
+--- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
+@@ -331,7 +331,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the maximum number of function calls for the minimization algorithm
+ /// For example for MIGRAD this is the maxcalls value passed as first argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetMaxIterations(Int_t niter)
+ {
+@@ -341,7 +341,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the Error Definition (default=1)
+ /// For Minuit this is the value passed with the "SET ERR" command
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
+ 
+ void TVirtualFitter::SetErrorDef(Double_t errdef)
+ {
+@@ -356,7 +356,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the tolerance used in the minimization algorithm
+ /// For example for MIGRAD this is tolerance value passed as second argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetPrecision(Double_t prec)
+ {
+diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
+--- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
++++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
+@@ -13,7 +13,7 @@
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
+--- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
++++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
+@@ -5,15 +5,15 @@
+ .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+ .\" other parms are allowed: see man(7), man(1)
+ .SH NAME
+-g2rootold \- convert GEANT geomtry files to ROOT files
++g2rootold \- convert GEANT geometry files to ROOT files
+ .SH SYNOPSIS
+-.B g2rootoldd
++.B g2rootold
+ .I [-f map_name] geant_name macro_name
+ .SH "DESCRIPTION"
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+@@ -103,9 +103,9 @@
+ .I JDIGI.
+ .SH "SEE ALSO"
+ .RS
+-.IR root (1),
+-.IR g2root (1),
+-.IR h2root(1),
++.IR root(1) ,
++.IR g2root(1) ,
++.IR h2root(1) ,
+ .RE
+ and
+ .RS
+diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
+--- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
+@@ -74,7 +74,7 @@
+ 
+     <ul>
+   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
+-  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
++  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
+   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
+ New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
+ </li>
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -301,7 +301,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DENLAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -381,7 +381,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DISLAN) is used.
+ 
+    @param x The argument \f$x\f$
+@@ -756,7 +756,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+@@ -783,7 +783,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -528,7 +528,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (RANLAN) is used.
+ 
+    @param z The argument \f$z\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
+@@ -193,7 +193,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+@@ -219,7 +219,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
+@@ -193,7 +193,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+@@ -408,7 +408,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
+@@ -81,7 +81,7 @@
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
+@@ -90,7 +90,7 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
+@@ -92,14 +92,14 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    - VavilovAccurate uses the algorithm by
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
+@@ -103,7 +103,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+@@ -239,7 +239,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
+--- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
+@@ -5,7 +5,7 @@
+ <li>The main TMinuit class is documented in class TMinuit.</li>
+ <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
+     </a></li>
+-<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
++<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
+     </a></li>
+ <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
+       </A></li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
+--- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
+@@ -13,7 +13,7 @@
+ <p>
+ <ol>
+ <li>
+-F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
++F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
+ <li>
+ F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
+ <li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
+@@ -32,7 +32,7 @@
+ 
+ <h2>References</h2>
+ <ol>
+-<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
++<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
+ <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
+   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
+ <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
+@@ -14,7 +14,7 @@
+ 
+ ## References
+ 
+-1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
++1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
+ 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
+ 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
+ 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
+@@ -163,7 +163,7 @@
+ <h3>Linear Algebra Functions</h3>
+ 
+ Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
+-In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
++In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
+ <pre>
+ <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
+ bool ret = m.<strong>Invert</strong>()
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
+@@ -132,7 +132,7 @@
+ 
+ ### Linear Algebra Functions
+ 
+-Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
++Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
+ 
+ <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
+ bool ret = m.**Invert**()  
+diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
+--- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
+@@ -47,8 +47,8 @@
+ //           V               v      v                     v      v                  //
+ //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
+ //       |        ^                                                                 //
+-//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
+-//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
++//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
++//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
+ // St_PolyLine3D  |                                                                 //
+ //                |                                                                 //
+ //           TPoints3DABC                                                           //
+diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
+--- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
+@@ -142,7 +142,7 @@
+ ///                            10 - this unvisible, but sons are visible
+ ///                            01 - this visible but sons
+ ///                            11 - neither this nor its sons are visible
+-/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
++/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
+ 
+ Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
+ {
+@@ -150,11 +150,12 @@
+    return mapVis[vis];
+ }
+ 
+-//______________________________________________________________________________
+-//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++////////////////////////////////////////////////////////////////////////////////
++/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
++
+ Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
+ {
+-// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
+    const Int_t mapVis[4] = {1, -2, 0, -1 };
+    Int_t i;
+ //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
new file mode 100644
index 0000000..39d7510
--- /dev/null
+++ b/root-llvm-static.patch
@@ -0,0 +1,11 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
+@@ -59,6 +59,7 @@
+   endif()
+ endif()
+ set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
++set(BUILD_SHARED_LIBS "NO")
+ #--- Do not build cling as part of llvm.
+ set(LLVM_NOCLING "YES")
+ 
diff --git a/root-macro-align.patch b/root-macro-align.patch
new file mode 100644
index 0000000..f8ef9eb
--- /dev/null
+++ b/root-macro-align.patch
@@ -0,0 +1,36 @@
+diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
+--- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
+@@ -329,7 +329,7 @@
+ parameters are shown in the plot below.
+ 
+ Begin_Macro(source)
+-   {
++{
+       //canvas only needed for the documentation
+       TCanvas* c1 = new TCanvas("c1","",600,400);
+       c1->SetFillStyle(1001);
+@@ -363,7 +363,7 @@
+ 
+       //only for this documentation
+       return c1;
+-   }
++}
+ End_Macro
+ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
+@@ -1809,9 +1809,9 @@
+ /// of comparison of the unweighted histogram with 217 events (minimal expected
+ /// frequency equal to one) and the weighted histogram with 500 events (minimal
+ /// expected frequency equal to 25)
+-///Begin_Macro
++/// Begin_Macro
+ /// ../../../tutorials/math/chi2test.C(17)
+-///End_Macro
++/// End_Macro
+ /// Fig 2. An example of comparison of the unweighted histogram with 217 events
+ /// and the weighted histogram with 500 events:
+ ///   a) unweighted histogram;
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
new file mode 100644
index 0000000..48085d6
--- /dev/null
+++ b/root-missing-cmake-config.patch
@@ -0,0 +1,187 @@
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
+@@ -252,6 +252,12 @@
+   endif()
+   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
+                          REGEX system.rootrc EXCLUDE
++                         REGEX system.rootauthrc EXCLUDE
++                         REGEX system.rootdaemonrc EXCLUDE
++                         REGEX rootd.rc.d EXCLUDE
++                         REGEX proofd.rc.d EXCLUDE
++                         REGEX rootd.xinetd EXCLUDE
++                         REGEX proofd.xinetd EXCLUDE
+                          REGEX root.mimes EXCLUDE)
+   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
+   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
+@@ -404,7 +404,13 @@
+ set(perl ${PERL_EXECUTABLE})
+ 
+ #---RConfigure-------------------------------------------------------------------------------------------------
+-set(setresuid undef)
++CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
++  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
++if(found_setresuid)
++  set(setresuid define)
++else()
++  set(setresuid undef)
++endif()
+ if(mathmore)
+   set(hasmathmore define)
+ else()
+@@ -523,7 +529,16 @@
+ execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
+ 
+ configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
++
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
++
+ configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
++
+ if(ruby)
+   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
+ endif()
+@@ -665,8 +680,21 @@
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
+               ${CMAKE_BINARY_DIR}/etc/system.rootrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
+               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
++              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
++                          GROUP_EXECUTE GROUP_READ
++                          WORLD_EXECUTE WORLD_READ
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
+ install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
+ 
+ if(NOT gnuinstall)
+diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
+@@ -9,4 +9,9 @@
+ ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+ ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
+-ROOT_INSTALL_HEADERS()
++
++if(AIX)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++endif()
++
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
+@@ -7,6 +7,7 @@
+   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
+   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
+   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
++  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
+ endif()
+ ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
+ ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
+diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
+--- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
+@@ -1,6 +1,7 @@
+ 
+ add_subdirectory(net)
+ add_subdirectory(auth)  # special CMakeListst.txt
++add_subdirectory(rootd)
+ 
+ if(bonjour)
+   add_subdirectory(bonjour)
+diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
+--- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
+@@ -0,0 +1,9 @@
++############################################################################
++# CMakeLists.txt file for building ROOT net/rootd package
++# @author Pere Mato, CERN
++############################################################################
++
++ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
++                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
+--- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
+@@ -3,4 +3,7 @@
+ # @author Pere Mato, CERN
+ ############################################################################
+ 
+-ROOT_INSTALL_HEADERS()
+\ No newline at end of file
++ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
++  RIO Net Thread MathCore)
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
+@@ -4,6 +4,7 @@
+ ############################################################################
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ add_definitions(${XROOTD_CFLAGS})
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
+ 
+@@ -11,14 +12,16 @@
+   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
+ else()
+   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
+-                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
++                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
+   if (NOT XROOTD_NOMAIN)
+      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
+   endif ()
+   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+-  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
++  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
++  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
++                         LIBRARIES ${SYSLIBS})
+ endif()
+ 
+ if(builtin_xrootd)
+@@ -38,4 +41,4 @@
+ endif()
+ 
+ 
+-ROOT_INSTALL_HEADERS()
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
+diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
+@@ -1,4 +1,3 @@
+-
+ ############################################################################
+ # CMakeLists.txt file for building ROOT proof/proofx package
+ # @author Pere Mato, CERN
+@@ -14,6 +13,7 @@
+ endif()
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
+ link_directories(${XROOTD_LIBRARY_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ 
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
new file mode 100644
index 0000000..5ce9485
--- /dev/null
+++ b/root-more-fflags.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index f51bcbe..1ee0602 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
+ #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
+-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
++string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+ string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
+ set(ROOT_COMPILER_FLAG_HINTS "#
+ set(ROOT_DEFINITIONS \"${__defs}\")
+diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
+index 045926d..a419744 100644
+--- a/cmake/scripts/RootUseFile.cmake.in
++++ b/cmake/scripts/RootUseFile.cmake.in
+@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
+index b9a8e34..f931ad3 100644
+--- a/etc/cmake/RootUseFile.cmake
++++ b/etc/cmake/RootUseFile.cmake
+@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
new file mode 100644
index 0000000..afad777
--- /dev/null
+++ b/root-no-abi-check.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
+index 896ca4c..51e01905 100644
+--- a/cmake/modules/CheckCompiler.cmake
++++ b/cmake/modules/CheckCompiler.cmake
+@@ -1,7 +1,6 @@
+ #---------------------------------------------------------------------------------------------------
+ #  CheckCompiler.cmake
+ #---------------------------------------------------------------------------------------------------
+-include (CheckCXXSourceCompiles)
+ 
+ #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
+ if(fortran)
+@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
+   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
+-  CHECK_CXX_SOURCE_COMPILES("
+-    #include <string>
+-    #if _GLIBCXX_USE_CXX11_ABI
+-    #error \"cling does not support GCC 5 ABI.\"
+-    #endif
+-    int main() {}" CXX_SUPPORTS_OLD_ABI)
+-  if(NOT CXX_SUPPORTS_OLD_ABI)
+-     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
+-  endif()
+ else()
+   set(GCC_MAJOR 0)
+   set(GCC_MINOR 0)
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
new file mode 100644
index 0000000..1157d56
--- /dev/null
+++ b/root-no-testdata.patch
@@ -0,0 +1,20 @@
+diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
+--- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
+@@ -239,13 +239,14 @@
+ 
+ #--stressProof-------------------------------------------------------------------------------
+ if(NOT WIN32)
+-  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
++  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
+   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
+   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
+                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
+                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
+                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
+-                                         FAILREGEX "FAILED|Error in")
++                                         FAILREGEX "FAILED|Error in"
++                                         DEPENDS TestData)
+ endif()
+ 
+ #--testbits----------------------------------------------------------------------------------
diff --git a/root-ppc64.patch b/root-ppc64.patch
new file mode 100644
index 0000000..cab115c
--- /dev/null
+++ b/root-ppc64.patch
@@ -0,0 +1,38 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
+@@ -30,8 +30,8 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
+-  message(STATUS "Found a 64bit ppc64 little endian system")
++elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
++  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
+@@ -205,17 +205,12 @@
+    ;;
+ linuxppcgcc)
+    # PPC Linux with gcc
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
++   auxldflags="-m32"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
+ linuxppc64gcc)
+-   # PPC64 (64 bit mode) Linux with gcc 3.x
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+-   auxldflags="-m64"
+-   auxlibs="-lm -ldl -rdynamic"
+-   ;;
+-ppc64le)
+-   # PPC64 (64 bit mode) little endian
++   # PPC64/PPC64LE (64 bit mode) Linux with gcc
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
new file mode 100644
index 0000000..cb30e30
--- /dev/null
+++ b/root-private-public.patch
@@ -0,0 +1,156 @@
+diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
+--- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
+@@ -43,8 +43,8 @@
+ #ifndef ROOT_TSocket
+ #include "TSocket.h"
+ #endif
+-#ifndef ROOT_XrdProofConn
+-#include "XrdProofConn.h"
++#ifndef __XPTYPES_H
++#include "XProtocol/XPtypes.hh"
+ #endif
+ #ifndef XRC_UNSOLMSG_H
+ #include "XrdClient/XrdClientUnsolMsg.hh"
+@@ -58,6 +58,7 @@
+ class TXHandler;
+ class TXSocketHandler;
+ class XrdClientMessage;
++class XrdProofConn;
+ 
+ // To transmit info to Handlers
+ typedef struct {
+@@ -140,7 +141,7 @@
+    void                PostMsg(Int_t type, const char *msg = 0);
+ 
+    // Auxilliary
+-   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
++   Int_t               GetLowSocket() const;
+ 
+    static void         SetLocation(const char *loc = ""); // Set location string
+ 
+@@ -170,13 +171,13 @@
+ 
+    virtual Int_t       GetClientID() const { return -1; }
+    virtual Int_t       GetClientIDSize() const { return 1; }
+-   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
+-   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
+-   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
+-   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
++   Int_t               GetLogConnID() const;
++   Int_t               GetOpenError() const;
++   Int_t               GetServType() const;
++   Int_t               GetSessionID() const;
+    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
+ 
+-   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
++   Bool_t              IsValid() const;
+    Bool_t              IsServProofd();
+    virtual void        RemoveClientID() { }
+    virtual void        SetClientID(Int_t) { }
+@@ -215,11 +216,9 @@
+    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
+ 
+    // Interrupt the low level socket
+-   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
+-                                        fRDInterrupt = i;
+-                                        if (i && fConn) fConn->SetInterrupt();
+-                                        if (i && fAWait) fASem.Post(); }
++   void                SetInterrupt(Bool_t i = kTRUE);
+    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
++
+    // Set / Check async msg queue waiting status
+    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
+    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
+diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
+@@ -40,6 +40,8 @@
+ #include "TSysEvtHandler.h"
+ #include "XProofProtocol.h"
+ 
++#include "XrdProofConn.h"
++
+ ClassImp(TXProofMgr)
+ 
+ //
+diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
+@@ -912,6 +912,46 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// Getter for logical connection ID
++
++Int_t TXSocket::GetLogConnID() const
++{
++   return (fConn ? fConn->GetLogConnID() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for last error
++
++Int_t TXSocket::GetOpenError() const
++{
++   return (fConn ? fConn->GetOpenError() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for server type
++
++Int_t TXSocket::GetServType() const
++{
++   return (fConn ? fConn->GetServType() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for session ID
++
++Int_t TXSocket::GetSessionID() const
++{
++   return (fConn ? fConn->GetSessionID() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for validity status
++
++Bool_t TXSocket::IsValid() const
++{
++   return (fConn ? (fConn->IsValid()) : kFALSE);
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Return kTRUE if the remote server is a 'proofd'
+ 
+ Bool_t TXSocket::IsServProofd()
+@@ -1633,6 +1673,16 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++void TXSocket::SetInterrupt(Bool_t i)
++{
++   R__LOCKGUARD(fAMtx);
++   fRDInterrupt = i;
++   if (i && fConn) fConn->SetInterrupt();
++   if (i && fAWait) fASem.Post();
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Send a TMessage object. Returns the number of bytes in the TMessage
+ /// that were sent and -1 in case of error.
+ 
+@@ -1923,6 +1973,12 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++Int_t TXSocket::GetLowSocket() const {
++   return (fConn ? fConn->GetLowSocket() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Init environment variables for XrdClient
+ 
+ void TXSocket::InitEnvs()
diff --git a/root-s390x.patch b/root-s390x.patch
new file mode 100644
index 0000000..39f0b98
--- /dev/null
+++ b/root-s390x.patch
@@ -0,0 +1,147 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
+@@ -54,6 +54,32 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390x)
++  message(STATUS "Found a 64bit system")
++  set(BIT_ENVIRONMENT "-m64")
++  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390)
++  message(STATUS "Found a 31bit system")
++  set(BIT_ENVIRONMENT "-m31")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
++++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
+@@ -215,6 +215,18 @@
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
++linuxs390gcc)
++   # s390 (31 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
++   auxldflags="-m31"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
++linuxs390xgcc)
++   # s390x (64 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
++   auxldflags="-m64"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
+ linuxx8664gcc)
+    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
+diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
+--- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
+@@ -202,6 +202,19 @@
+ #   define NEED_SIGJMP
+ #endif
+ 
++#if defined(linux) && defined(__s390__)
++#   define R__LINUX
++#   define R__UNIX
++#   define NEED_SIGJMP
++#endif
++
++#if defined(linux) && defined(__s390x__)
++#   define R__LINUX
++#   define R__UNIX
++#   define R__B64
++#   define NEED_SIGJMP
++#endif
++
+ #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
+ #   define R__HURD
+ #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
+@@ -54,6 +54,10 @@
+     set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(PCRE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(PCRE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
+@@ -49,6 +49,10 @@
+     set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(AFTER_CC "${AFTER_CC} -m64")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(AFTER_CC "${AFTER_CC} .m31")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
+@@ -56,6 +56,10 @@
+     set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(FREETYPE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
+@@ -21,6 +21,8 @@
+   set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
++elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++  set(ROOT_CLING_TARGET "SystemZ")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
+   set(ROOT_CLING_TARGET "X86")
+ elseif(ROOT_ARCHITECTURE MATCHES macosx)
+diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
+--- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
+@@ -372,6 +372,8 @@
+   set(LLVM_NATIVE_ARCH Hexagon)
+ elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
+   set(LLVM_NATIVE_ARCH SystemZ)
++elseif (LLVM_NATIVE_ARCH MATCHES "s390")
++  set(LLVM_NATIVE_ARCH SystemZ)
+ else ()
+   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
+ endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
new file mode 100644
index 0000000..4952a92
--- /dev/null
+++ b/root-save-memory.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
+@@ -36,7 +36,9 @@
+                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                                     ${corelinklibs})
+ 
+-add_dependencies(rootcling CLING LLVMRES)
++# The dependency on Cling was added to prevent Cling (libCling) and
++# rootcling from being linked in parallel.
++add_dependencies(rootcling CLING LLVMRES Cling)
+ 
+ ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
+ 
+diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
+--- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
+@@ -25,9 +25,11 @@
+ 
+ CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
+ ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
++# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
++# $(ROOTCLINGEXE) from being linked in parallel.
+ $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
+ 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
+-           $(PCREDEP) $(CORELIBDEP)
++           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
+ 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
+ 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
+ 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
new file mode 100644
index 0000000..35b828c
--- /dev/null
+++ b/root-see-macro-output.patch
@@ -0,0 +1,266 @@
+diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
+--- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
+@@ -13,7 +13,6 @@
+ 
+ void fit1() {
+    //Simple fitting example (1-d histogram with an interpreted function)
+-   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
+--- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ void fitslicesy() {
+ //
+ // Illustrates how to use the TH1::FitSlicesY function
+-// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
+ //    It uses the TH2F histogram generated in macro hsimple.C
+ //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
+ //    in 2 sepate pads.
+diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
+--- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
+@@ -3,7 +3,6 @@
+ 
+ void multifit() {
+ //  Fitting multiple functions to different ranges of a 1-D histogram
+-// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ //      Example showing how to fit in a sub-range of an histogram
+ //  An histogram is created and filled with the bin contents and errors
+ //  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
+--- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
+@@ -3,7 +3,6 @@
+ 
+ void shapes() {
+ //The old geometry shapes (see script geodemo.C)
+-//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
+--- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,6 +1,5 @@
+ void basic3d(){
+    // Show 3-D polylines and markers
+-   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
+    //
+ 
+    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
+--- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void canvas(){
+ //Example of primitives in a canvas
+-// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
+ // One of the first actions in a ROOT session is the creation of a Canvas.
+ // Here we create a Canvas named "c1"
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
+--- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,7 +1,6 @@
+ void feynman()
+ {
+    //Draw Feynman diagrams
+-   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
+    //Author: Otto Schaile
+ 
+    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
+diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
+--- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
+@@ -1,6 +1,5 @@
+ void gaxis(){
+ //Simple example illustrating how to draw TGaxis objects in various formats.
+-//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
+--- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
+@@ -1,6 +1,5 @@
+ void tornado() {
+ //Show 3-d polymarkers
+-// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+     gBenchmark->Start("tornado");
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void gerrors2() {
+    //Draw two graphs with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void gerrors() {
+    //Draw a graph with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
+--- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void graph() {
+    //Draw a simple graph
+-   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
+--- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void surfaces() {
+    //Draw 2-Dim functions
+-   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
+--- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
+@@ -1,6 +1,5 @@
+ void fillrandom() {
+    //Fill a 1-D histogram from a parametric function
+-   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
+--- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ // histograms filled and drawn in a loop
+ void hsum() {
+ //
+-// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ //    Simple example illustrating how to use the C++ interpreter
+ //    to fill histograms in a loop and show the graphics results
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
+--- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
+@@ -9,7 +9,6 @@
+ {
+    //example of macro illustrating how to superimpose two histograms
+    //with different scales in the "same" pad.
+-   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
+diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
+--- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
+diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
+--- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+ #
+ from os import path
+ from ROOT import TCanvas, TFile, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
+--- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraphErrors
+diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
+--- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraph
+diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
+--- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
+--- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ #    Simple example illustrating how to use the C++ interpreter	
+ #    to fill histograms in a loop and show the graphics results
+ #
+diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
+--- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ #      Example showing how to fit in a sub-range of an histogram
+ #  An histogram is created and filled with the bin contents and errors
+ #  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
+--- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ #
+ 
+ import ROOT
+diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
+--- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPaveText, TPad, TF2
+diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
+--- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ 
+ from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
+ from ROOT import gROOT, gBenchmark
+diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
+--- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
+@@ -4,7 +4,6 @@
+ # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
+ #
+ # original header:
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ # Simple example illustrating how to use the C++ interpreter	
+ # to fill histograms in a loop and show the graphics results
+ 
diff --git a/root-soname.patch b/root-soname.patch
new file mode 100644
index 0000000..3367bad
--- /dev/null
+++ b/root-soname.patch
@@ -0,0 +1,11 @@
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
+@@ -39,7 +39,7 @@
+ if(soversion)
+   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
+       VERSION ${ROOT_VERSION}
+-      SOVERSION ${ROOT_MAJOR_VERSION}
++      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
+       SUFFIX ${libsuffix}
+       PREFIX ${libprefix} )
+ else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
new file mode 100644
index 0000000..8834aa4
--- /dev/null
+++ b/root-stressgraphics.patch
@@ -0,0 +1,56 @@
+diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
+--- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
++++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
+@@ -3,18 +3,18 @@
+     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
+     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
+     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
+-    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
++    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
+     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
+     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
+-    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
+-    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
+-   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
+-   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
+-   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
+-   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
+-   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
+-   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
+-   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
++    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
++    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
++   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
++   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
++   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
++   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
++   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
++   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
++   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
+    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
+    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
+@@ -25,7 +25,7 @@
+    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
+    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
+    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
+-   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
++   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
+    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
+    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
+    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
+@@ -35,11 +35,11 @@
+    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
+    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
+    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
+-   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
++   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
+    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
+-   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
++   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
+-   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
++   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
+    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
+    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
+    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-template-files.patch b/root-template-files.patch
new file mode 100644
index 0000000..086b8a7
--- /dev/null
+++ b/root-template-files.patch
@@ -0,0 +1,28 @@
+diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
+--- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
+@@ -15,8 +15,8 @@
+    // equal to 1 for the signal and 0 for the background is added.
+    const char *fname = "mlpHiggs.root";
+    TFile *input = 0;
+-   if (!gSystem->AccessPathName(fname)) {
+-      input = TFile::Open(fname);
++   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    } else {
+       printf("accessing %s file from http://root.cern.ch/files\n",fname);
+       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
+--- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
+@@ -273,8 +273,8 @@
+ 
+   const char *fname = "stock.root";
+   TFile *f = 0;
+-  if (!gSystem->AccessPathName(fname)) {
+-     f = TFile::Open(fname);
++  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+   } else {
+      printf("accessing %s file from http://root.cern.ch/files\n",fname);
+      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff --git a/root-test-install.patch b/root-test-install.patch
new file mode 100644
index 0000000..0b61f68
--- /dev/null
+++ b/root-test-install.patch
@@ -0,0 +1,3105 @@
+diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
+--- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
+@@ -37,12 +37,12 @@
+   install(FILES ${pyfile} DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+-  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY ${pyfile} DESTINATION ${localruntimedir})
+ endforeach()
+ 
+-set( ROOTaaSDirName "ROOTaaS")
++set(ROOTaaSDirName "ROOTaaS")
+ install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
+-file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
+ 
+ #---Install headers----------------------------------------------------------
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
+--- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
+@@ -508,7 +508,7 @@
+ 
+           # system logon, user logon, and local logon (skip Rint.Logon)
+             name = '.rootlogon.C'
+-            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
++            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
+                        os.path.expanduser( os.path.join( '~', name ) ) ]
+             if logons[-1] != os.path.join( os.getcwd(), name ):
+                logons.append( name )
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
+@@ -222,7 +222,7 @@
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
+ 
+ # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
+-if(rpath OR gnuinstall)
++if(rpath)
+   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
+   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
+ elseif(APPLE)
+diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
+@@ -19,6 +19,7 @@
+   set(libprefix lib)
+   set(ld_library_path PATH)
+   set(libsuffix .dll)
++  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_BINDIR})
+ elseif(APPLE)
+   set(ld_library_path DYLD_LIBRARY_PATH)
+@@ -26,6 +27,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ else()
+   set(ld_library_path LD_LIBRARY_PATH)
+@@ -33,6 +35,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+@@ -322,7 +325,15 @@
+     set(pcm_name)
+   else()
+     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
+-      set(command rootcling -rootbuild)
++      if(gnuinstall)
++        if(WIN32)
++          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
++        else()
++          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
++        endif()
++      else()
++        set(command rootcling -rootbuild)
++      endif()
+       set(ROOTCINTDEP rootcling)
+     else()
+       set(command rootcling)
+@@ -431,9 +442,6 @@
+   if(TARGET G__${library})
+     add_dependencies(${library} G__${library})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
+   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
+   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
+@@ -468,9 +476,6 @@
+   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
+      add_dependencies(${library} ${CMAKE_MATCH_2})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+ 
+   #--- Only for building shared libraries
+   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
+@@ -511,9 +516,6 @@
+   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
+   include_directories(${CMAKE_BINARY_DIR}/include)
+   add_library( ${library} SHARED ${lib_srcs})
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
+   target_link_libraries(${library} ${ARG_LIBRARIES})
+   #----Installation details-------------------------------------------------------
+@@ -590,6 +592,10 @@
+                            PATTERN ".svn" EXCLUDE
+                            REGEX "LinkDef" EXCLUDE
+                            ${ARG_OPTIONS})
++    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
++                   PATTERN ".svn" EXCLUDE
++                   REGEX "LinkDef" EXCLUDE
++                   ${ARG_OPTIONS})
+     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
+   endforeach()
+ endfunction()
+@@ -629,9 +635,6 @@
+   if (ARG_ADDITIONAL_COMPILE_FLAGS)
+     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${executable} move_headers)
+-  endif()
+ 
+   #----Installation details------------------------------------------------------
+   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+@@ -849,6 +852,9 @@
+     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
+   else()
+     add_test(NAME ${test} COMMAND ${_command})
++    if (gnuinstall)
++      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
++    endif()
+   endif()
+ 
+   #- Handle TIMOUT and DEPENDS arguments
+diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
+--- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
+@@ -1,20 +0,0 @@
+-# Arguments:
+-#  PREFIX    - Installation prefix
+-#  COMPONENTS - Installation component
+-
+-set(COMPONENTS ${COMPONENTS})
+-set(ENV{DESTDIR} "")
+-foreach(component ${COMPONENTS})
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
+-                             -DCMAKE_INSTALL_COMPONENT=${component}
+-                             -P cmake_install.cmake
+-    RESULT_VARIABLE result
+-    OUTPUT_QUIET
+-  )
+-
+-  if(result)
+-    set(msg "Local installation of ${component} failed: ${result}\n")
+-    message(FATAL_ERROR "${msg}")
+-  endif()
+-endforeach()
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
+@@ -135,7 +135,7 @@
+   endif()
+ endforeach()
+ 
+-#---Move (copy) the headers and other directories to binary tree---------------------------------
++#---Move (copy) directories to binary tree------------------------------------------------------
+ set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
+ add_custom_command(OUTPUT ${stamp_file}
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
+@@ -147,11 +147,7 @@
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
+                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
+                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
+-add_custom_target(move_headers DEPENDS ${stamp_file}
+-                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
+-                                                        -DCOMPONENTS="headers"
+-                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
+-include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
++add_custom_target(move_artifacts DEPENDS ${stamp_file})
+ 
+ 
+ #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
+@@ -199,13 +195,23 @@
+                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
+                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
+ 
+-add_custom_command(OUTPUT etc/allDict.cxx.pch
+-                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+-                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
+-                           etc/dictpch/allLinkDefs.h
+-                           etc/dictpch/allHeaders.h
+-                           etc/dictpch/allCppflags.txt
+-                           rootcling)
++if (WIN32)
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++else()
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++endif()
+ add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
+ set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
+ add_dependencies(onepcm ${__allTargets})
+@@ -213,22 +219,20 @@
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+ #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
+-  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-  add_dependencies(hsimple onepcm)
+-  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
+-  if(WIN32)
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  else()
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+-                               $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  endif()
+-  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
++add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
++add_dependencies(hsimple onepcm)
++if(WIN32)
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
++else()
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+ endif()
++install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+ 
+ #---version--------------------------------------------------------------------------------------
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
+@@ -266,9 +270,6 @@
+ #---Configure Testing using CTest----------------------------------------------------------------
+ configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
+ if(testing)
+-  if(gnuinstall)
+-    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
+-  endif()
+   include(RootCTest)
+   if(roottest)
+     find_package(Git REQUIRED)
+diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
+--- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
+@@ -14,10 +14,11 @@
+ #define ROOTTUTDIR    "@tutdir@"
+ #define ROOTSRCDIR    "@srcdir@"
+ #define ROOTICONPATH  "@iconpath@"
+-#define EXTRAICONPATH "@extraiconpath@"
+ #define TTFFONTDIR    "@ttffontdir@"
+ #endif
+ 
++#define EXTRAICONPATH "@extraiconpath@"
++
+ #@setresuid@ R__HAS_SETRESUID   /**/
+ #@hasmathmore@ R__HAS_MATHMORE   /**/
+ #@haspthread@ R__HAS_PTHREAD    /**/
+diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
+--- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
+@@ -9,24 +9,24 @@
+ # and to PATH on Windows.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.DynamicPath:    .:@libdir@:
+-WinNT.*.Root.DynamicPath:   .;@bindir@;
++#Unix.*.Root.DynamicPath:    .:@libdir@
++#WinNT.*.Root.DynamicPath:   .;@bindir@
+ 
+ # Path used to find macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.MacroPath:      .:@macrodir@:
+-WinNT.*.Root.MacroPath:     .;@macrodir@;
++#Unix.*.Root.MacroPath:      .:@macrodir@
++#WinNT.*.Root.MacroPath:     .;@macrodir@
+ 
+ # Path used to find plugin macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.PluginPath:      :@plugindir@:
+-WinNT.*.Root.PluginPath:     ;@plugindir@;
++#Unix.*.Root.PluginPath:     @plugindir@
++#WinNT.*.Root.PluginPath:    @plugindir@
+ 
+ # Path where to look for TrueType fonts.
+ Unix.*.Root.UseTTFonts:     true
+-*.*.Root.TTFontPath:        @ttffontdir@
++#*.*.Root.TTFontPath:        @ttffontdir@
+ 
+ # Use Net* API functions.
+ WinNT.UseNetAPI:         true
+@@ -222,7 +222,8 @@
+ Gui.DocumentForegroundColor: black
+ Gui.TooltipBackgroundColor:  LightYellow
+ Gui.TooltipForegroundColor:  black
+-Gui.IconPath:                $(HOME)/icons:@iconpath@:.
++#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
++#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
+ Gui.MimeTypeFile:            $(HOME)/.root.mimes
+ # If above does not exists defaults to this:
+ #Gui.MimeTypeFile:            @etcdir@/root.mimes
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
+@@ -8018,6 +8018,7 @@
+     -e "s|@bindir@|$bindir|"               \
+     -e "s|@etcdir@|$etcdir|"               \
+     -e "s|@ttffontdir@|$fontdir|"          \
++    -e "s|@extraiconpath@|$extraiconpath|" \
+     -e "s|@iconpath@|$iconpath|"           \
+     -e "s|@hasxrd@|$hasxrd|"               \
+     -e "s|@hasnotxrd@|$hasnotxrd|"         \
+diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
+--- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
+@@ -325,7 +325,19 @@
+    static Int_t       ConvertVersionInt2Code(Int_t v);
+    static Int_t       RootVersionCode();
+    static const char**&GetExtraInterpreterArgs();
+-   static const char *GetTutorialsDir();
++
++   static const TString& GetRootSys();
++   static const TString& GetBinDir();
++   static const TString& GetLibDir();
++   static const TString& GetIncludeDir();
++   static const TString& GetEtcDir();
++   static const TString& GetDataDir();
++   static const TString& GetDocDir();
++   static const TString& GetMacroDir();
++   static const TString& GetTutorialsDir();
++   static const TString& GetSourceDir();
++   static const TString& GetIconPath();
++   static const TString& GetTTFFontDir();
+ 
+    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
+ };
+diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -268,11 +268,7 @@
+    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
+    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR);
+-#else
+-                                       "$(ROOTSYS)/fonts");
+-#endif
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+    // Check for use of DFSG - fonts
+    if (!ttfont)
+@@ -880,29 +876,19 @@
+          Error("ProcessLine", "Cannot show demos in batch mode!");
+          return 1;
+       }
+-#ifdef ROOTTUTDIR
+-      ProcessLine(".x " ROOTTUTDIR "/demos.C");
+-#else
+-      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
+-#endif
++      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
+       return 0;
+    }
+ 
+    if (!strncmp(line, ".license", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/LICENSE");
+-#else
+-      return PrintFile("$(ROOTSYS)/LICENSE");
+-#endif
++      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
+    }
+ 
+    if (!strncmp(line, ".credits", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/CREDITS");
+-#else
+-      return PrintFile("$(ROOTSYS)/README/CREDITS");
+-#endif
+-
++      TString credits = TROOT::GetDocDir() + "/CREDITS";
++      if (gSystem->AccessPathName(credits, kReadPermission))
++         credits = TROOT::GetDocDir() + "/README/CREDITS";
++      return PrintFile(credits);
+    }
+ 
+    if (!strncmp(line, ".pwd", 4)) {
+diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
+--- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -399,21 +399,7 @@
+ 
+       TString sname = "system";
+       sname += name;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-      // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-      etc = gRootDir;
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       ReadFile(s, kEnvGlobal);
+       delete [] s;
+       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
+@@ -683,17 +669,7 @@
+ 
+       TString sname = "system";
+       sname += fRcName;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       rootrcdir = s;
+       delete [] s;
+    } else if (level == kEnvUser) {
+diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
+--- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -468,6 +468,10 @@
+       TPH__IsReadingDirs() = kTRUE;
+ 
+       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
++      if (plugindirs.Length() == 0) {
++         plugindirs = "plugins";
++         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
++      }
+ #ifdef WIN32
+       dirs = plugindirs.Tokenize(";");
+ #else
+diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
+--- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
+@@ -543,6 +543,22 @@
+    // Initialize Operating System interface
+    InitSystem();
+ 
++   // Initialize static directory functions
++   GetRootSys();
++   GetBinDir();
++   GetLibDir();
++   GetIncludeDir();
++   GetEtcDir();
++   GetDataDir();
++   GetDocDir();
++   GetMacroDir();
++   GetTutorialsDir();
++   GetSourceDir();
++   GetIconPath();
++   GetTTFFontDir();
++
++   gRootDir = GetRootSys().Data();
++
+    TDirectory::Build();
+ 
+    // Initialize interface to CINT C++ interpreter
+@@ -1722,21 +1722,9 @@
+                "after the call to TROOT::InitInterpreter()!");
+       }
+ 
+-      const char *libcling = 0;
+-      char *libclingStorage = 0;
+-#ifdef ROOTLIBDIR
+-      libcling = ROOTLIBDIR "/libCling."
+-# ifdef R__WIN32
+-      "dll";
+-# else
+-      "so";
+-# endif
+-#else
+-      libclingStorage = gSystem->DynamicPathName("libCling");
+-      libcling = libclingStorage;
+-#endif
++      char *libcling = gSystem->DynamicPathName("libCling");
+       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
+-      delete [] libclingStorage;
++      delete [] libcling;
+ 
+       if (!gInterpreterLib) {
+          TString err = dlerror();
+@@ -2082,22 +2070,7 @@
+ #endif
+ 
+    TString gitinfo = "gitinfo.txt";
+-   char *filename = 0;
+-#ifdef ROOTETCDIR
+-   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   filename = gSystem->ConcatFileName(etc, gitinfo);
+-#endif
++   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
+ 
+    FILE *fp = fopen(filename, "r");
+    if (fp) {
+@@ -2415,17 +2388,9 @@
+ #endif
+       if (macroPath.Length() == 0)
+ #if !defined(R__WIN32)
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".:" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".:") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".:" + TROOT::GetMacroDir();
+ #else
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".;" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".;") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".;" + TROOT::GetMacroDir();
+ #endif
+    }
+ 
+@@ -2521,14 +2486,252 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++#ifdef ROOTPREFIX
++static Bool_t IgnorePrefix() {
++   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
++   return ignorePrefix;
++}
++#endif
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the rootsys directory in the installation. Static utility function.
++
++const TString& TROOT::GetRootSys() {
++#ifdef ROOTPREFIX
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsys;
++      if (rootsys.IsNull())
++         rootsys = gSystem->Getenv("ROOTSYS");
++      if (rootsys.IsNull())
++         rootsys = gRootDir;
++      return rootsys;
++#ifdef ROOTPREFIX
++   } else {
++      const static TString rootsys = ROOTPREFIX;
++      return rootsys;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the binary directory in the installation. Static utility function.
++
++const TString& TROOT::GetBinDir() {
++#ifdef ROOTBINDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootbindir;
++      if (rootbindir.IsNull()) {
++         rootbindir = "bin";
++         gSystem->PrependPathName(GetRootSys(), rootbindir);
++      }
++      return rootbindir;
++#ifdef ROOTBINDIR
++   } else {
++      const static TString rootbindir = ROOTBINDIR;
++      return rootbindir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the library directory in the installation. Static utility function.
++
++const TString& TROOT::GetLibDir() {
++#ifdef ROOTLIBDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootlibdir;
++      if (rootlibdir.IsNull()) {
++         rootlibdir = "lib";
++         gSystem->PrependPathName(GetRootSys(), rootlibdir);
++      }
++      return rootlibdir;
++#ifdef ROOTLIBDIR
++   } else {
++      const static TString rootlibdir = ROOTLIBDIR;
++      return rootlibdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the include directory in the installation. Static utility function.
++
++const TString& TROOT::GetIncludeDir() {
++#ifdef ROOTINCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootincdir;
++      if (rootincdir.IsNull()) {
++         rootincdir = "include";
++         gSystem->PrependPathName(GetRootSys(), rootincdir);
++      }
++      return rootincdir;
++#ifdef ROOTINCDIR
++   } else {
++      const static TString rootincdir = ROOTINCDIR;
++      return rootincdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the sysconfig directory in the installation. Static utility function.
++
++const TString& TROOT::GetEtcDir() {
++#ifdef ROOTETCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootetcdir;
++      if (rootetcdir.IsNull()) {
++         rootetcdir = "etc";
++         gSystem->PrependPathName(GetRootSys(), rootetcdir);
++      }
++      return rootetcdir;
++#ifdef ROOTETCDIR
++   } else {
++      const static TString rootetcdir = ROOTETCDIR;
++      return rootetcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the data directory in the installation. Static utility function.
++
++const TString& TROOT::GetDataDir() {
++#ifdef ROOTDATADIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDATADIR
++   } else {
++      const static TString rootdatadir = ROOTDATADIR;
++      return rootdatadir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the documentation directory in the installation. Static utility function.
++
++const TString& TROOT::GetDocDir() {
++#ifdef ROOTDOCDIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDOCDIR
++   } else {
++      const static TString rootdocdir = ROOTDOCDIR;
++      return rootdocdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the macro directory in the installation. Static utility function.
++
++const TString& TROOT::GetMacroDir() {
++#ifdef ROOTMACRODIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootmacrodir;
++      if (rootmacrodir.IsNull()) {
++         rootmacrodir = "macros";
++         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
++      }
++      return rootmacrodir;
++#ifdef ROOTMACRODIR
++   } else {
++      const static TString rootmacrodir = ROOTMACRODIR;
++      return rootmacrodir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Get the tutorials directory in the installation. Static utility function.
+ 
+-const char *TROOT::GetTutorialsDir()
+-{
++const TString& TROOT::GetTutorialsDir() {
+ #ifdef ROOTTUTDIR
+-   return ROOTTUTDIR;
+-#else
+-   static TString tutdir = TString(gRootDir) + "/tutorials";
+-   return tutdir;
++   if (IgnorePrefix()) {
++#endif
++      static TString roottutdir;
++      if (roottutdir.IsNull()) {
++         roottutdir = "tutorials";
++         gSystem->PrependPathName(GetRootSys(), roottutdir);
++      }
++      return roottutdir;
++#ifdef ROOTTUTDIR
++   } else {
++      const static TString roottutdir = ROOTTUTDIR;
++      return roottutdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the source directory in the installation. Static utility function.
++
++const TString& TROOT::GetSourceDir() {
++#ifdef ROOTSRCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsrcdir;
++      if (rootsrcdir.IsNull()) {
++         rootsrcdir = "src";
++         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
++      }
++      return rootsrcdir;
++#ifdef ROOTSRCDIR
++   } else {
++      const static TString rootsrcdir = ROOTSRCDIR;
++      return rootsrcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the icon path in the installation. Static utility function.
++
++const TString& TROOT::GetIconPath() {
++#ifdef ROOTICONPATH
++   if (IgnorePrefix()) {
++#endif
++      static TString rooticonpath;
++      if (rooticonpath.IsNull()) {
++         rooticonpath = "icons";
++         gSystem->PrependPathName(GetRootSys(), rooticonpath);
++      }
++      return rooticonpath;
++#ifdef ROOTICONPATH
++   } else {
++      const static TString rooticonpath = ROOTICONPATH;
++      return rooticonpath;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the fonts directory in the installation. Static utility function.
++
++const TString& TROOT::GetTTFFontDir() {
++#ifdef TTFFONTDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString ttffontdir;
++      if (ttffontdir.IsNull()) {
++         ttffontdir = "fonts";
++         gSystem->PrependPathName(GetRootSys(), ttffontdir);
++      }
++      return ttffontdir;
++#ifdef TTFFONTDIR
++   } else {
++      const static TString ttffontdir = TTFFONTDIR;
++      return ttffontdir;
++   }
+ #endif
+ }
+diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
+@@ -1852,22 +1852,10 @@
+       if (!system) {
+          // Mark the library in $ROOTSYS/lib as system.
+          const char *dirname = DirName(path);
+-#ifdef ROOTLIBDIR
+-         TString rootlibdir = ROOTLIBDIR;
+-#else
+-         TString rootlibdir = "lib";
+-         PrependPathName(gRootDir, rootlibdir);
+-#endif
+-         system = R__MatchFilename(rootlibdir,dirname);
++         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
+ 
+          if (!system) {
+-#ifdef ROOTBINDIR
+-            TString rootbindir = ROOTBINDIR;
+-#else
+-            TString rootbindir = "bin";
+-            PrependPathName(gRootDir, rootbindir);
+-#endif
+-            system = R__MatchFilename(rootbindir,dirname);
++            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
+          }
+       }
+ 
+@@ -2492,12 +2480,9 @@
+ #else
+    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
+ #endif
+-#ifdef ROOTBINDIR
+-   TString builddep = ROOTBINDIR;
+-#else
+-   TString builddep = TString(gRootDir) + "/bin";
+-#endif
+-   builddep += "/rmkdepend \"-f";
++   TString builddep = "rmkdepend";
++   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
++   builddep += " \"-f";
+    builddep += depfilename;
+    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
+    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
+@@ -2519,12 +2504,7 @@
+       builddep += "/\" ";
+    }
+    builddep += " -Y -- ";
+-#ifndef ROOTINCDIR
+-   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
+-   rootsysInclude += "/include";
+-#else
+-   TString rootsysInclude = ROOTINCDIR;
+-#endif
++   TString rootsysInclude = TROOT::GetIncludeDir();
+    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
+    builddep += includes;
+    builddep += defines;
+@@ -3345,27 +3325,17 @@
+       TString name = ".rootmap";
+       TString sname = "system.rootmap";
+       TString file;
+-#ifdef ROOTETCDIR
+-      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      AssignAndDelete(file, ConcatFileName(etc, sname));
++      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
+       if (gSystem->AccessPathName(file)) {
+          // for backward compatibility check also $ROOTSYS/system<name> if
+          // $ROOTSYS/etc/system<name> does not exist
+-         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
++         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
+          if (gSystem->AccessPathName(file)) {
+             // for backward compatibility check also $ROOTSYS/<name> if
+             // $ROOTSYS/system<name> does not exist
+-            AssignAndDelete(file, ConcatFileName(gRootDir, name));
++            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
+          }
+       }
+-#endif
+       mapfileStream << file << std::endl;
+       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
+       mapfileStream << file << std::endl;
+@@ -3379,23 +3349,9 @@
+    mapfileStream.close();
+ 
+    // ======= Generate the rootcling command line
+-   TString rcling;
+-#ifndef ROOTBINDIR
+-   rcling = gSystem->Getenv("ROOTSYS");
+-#ifndef R__WIN32
+-   rcling += "/bin/";
+-#else
+-   rcling += "\\bin\\";
+-#endif
+-#else
+-   rcling = ROOTBINDIR;
+-#ifndef R__WIN32
+-   rcling += "/";
+-#else
+-   rcling += "\\";
+-#endif
+-#endif
+-   rcling += "rootcling -v0 \"--lib-list-prefix=";
++   TString rcling = "rootcling";
++   PrependPathName(TROOT::GetBinDir(), rcling);
++   rcling += " -v0 \"--lib-list-prefix=";
+    rcling += mapfile;
+    rcling += "\" -f \"";
+    rcling.Append(dict).Append("\" -c -p ");
+diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
+--- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
+@@ -66,14 +66,14 @@
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ else()
+   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ endif()
+ add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
+diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
+--- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
+@@ -1719,17 +1719,7 @@
+ {
+    static const char *suffix = "class.rules";
+    TString sname = suffix;
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   gSystem->PrependPathName(etc, sname);
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t res = -1;
+ 
+diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
+--- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
+@@ -1049,10 +1049,10 @@
+    if (!fromRootCling) {
+       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
+ 
+-      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
+-      clingArgsStorage.push_back(interpInclude);
++      interpInclude = TROOT::GetEtcDir();
++      clingArgsStorage.push_back("-I" + interpInclude);
+ 
+-      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
++      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
+       if (gSystem->Getenv("ROOT_PCH")) {
+          pchFilename = gSystem->Getenv("ROOT_PCH");
+       }
+@@ -1063,14 +1063,8 @@
+       // clingArgsStorage.push_back("-fmodules");
+ 
+       std::string include;
+-#ifndef ROOTINCDIR
+-      include = gSystem->Getenv("ROOTSYS");
+-      include += "/include";
+-#else // ROOTINCDIR
+-      include = ROOTINCDIR;
+-#endif // ROOTINCDIR
+-      clingArgsStorage.push_back("-I");
+-      clingArgsStorage.push_back(include);
++      include = TROOT::GetIncludeDir();
++      clingArgsStorage.push_back("-I" + include);
+       clingArgsStorage.push_back("-Wno-undefined-inline");
+       clingArgsStorage.push_back("-fsigned-char");
+    }
+@@ -1080,7 +1074,11 @@
+            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
+       interpArgs.push_back(iArg->c_str());
+ 
+-   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
++#ifdef R__EXTERN_LLVMDIR
++   TString llvmResourceDir = R__EXTERN_LLVMDIR;
++#else
++   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
++#endif
+    // Add statically injected extra arguments, usually coming from rootcling.
+    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
+         extraArgs && *extraArgs; ++extraArgs) {
+@@ -1094,7 +1092,7 @@
+ 
+    fInterpreter = new cling::Interpreter(interpArgs.size(),
+                                          &(interpArgs[0]),
+-                                         llvmResourceDir.c_str());
++                                         llvmResourceDir);
+ 
+    if (!fromRootCling) {
+       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
+@@ -1103,13 +1101,13 @@
+       // llvm/clang header files shouldn't be there at all. We have to get rid of
+       // that dependency and avoid copying the header files.
+       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
+-      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
++      TCling::AddIncludePath((interpInclude + "/cling").c_str());
+ 
+       // Add the current path to the include path
+       // TCling::AddIncludePath(".");
+ 
+       // Add the root include directory and etc/ to list searched by default.
+-      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
++      TCling::AddIncludePath(TROOT::GetIncludeDir());
+    }
+ 
+    // Don't check whether modules' files exist.
+@@ -4515,21 +4513,7 @@
+ 
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t ret = ReadRootmapFile(s);
+    if (ret == -3) // old format
+diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
+--- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
+@@ -339,10 +339,6 @@
+ //______________________________________________________________________________
+ llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
+ 
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+ enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
+ 
+ //______________________________________________________________________________
+@@ -549,18 +545,6 @@
+                                  const char* headers[]);
+ 
+ //______________________________________________________________________________
+-// Return the -I needed to find RuntimeUniverse.h
+-std::string GetInterpreterExtraIncludePath(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the LLVM / clang resource directory
+-std::string GetLLVMResourceDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+ // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
+ // that can be used in C++ as a variable name.
+ void GetCppName(std::string &output, const char *input);
+diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
+--- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -3407,40 +3407,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Return the -I needed to find RuntimeUniverse.h
+-
+-std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
+-{
+-#ifdef ROOTETCDIR
+-   if (rootbuild) {
+-      // Building ROOT, ignore ROOTETCDIR!
+-#endif
+-      const char* rootsys = getenv("ROOTSYS");
+-      if (!rootsys) {
+-         Error(0, "Environment variable ROOTSYS not set!");
+-         return "-Ietc";
+-      }
+-      return std::string("-I") + rootsys + "/etc";
+-#ifdef ROOTETCDIR
+-   }
+-   return std::string("-I") + ROOTETCDIR;
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Return the LLVM / clang resource directory
+-
+-std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
+-{
+-#ifdef R__EXTERN_LLVMDIR
+-   return R__EXTERN_LLVMDIR;
+-#else
+-   return GetInterpreterExtraIncludePath(rootbuild)
+-      .substr(2, std::string::npos) + "/cling";
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Get the template specialisation decl and template decl behind the qualtype
+ /// Returns true if successfully found, false otherwise
+ 
+@@ -3957,29 +3923,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-
+-std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
+-{
+-   const std::string defaultInclude ("include");
+-   if (!rootbuild) {
+-#ifndef ROOTINCDIR
+-      const char* rootSysContent = getenv("ROOTSYS");
+-      if (rootSysContent) {
+-         std::string incl_rootsys (rootSysContent);
+-         return incl_rootsys + "/" + defaultInclude;
+-      } else {
+-         Error(0,"Environment variable ROOTSYS not set");
+-         return defaultInclude;
+-      }
+-#else
+-      return ROOTINCDIR;
+-#endif
+-   }
+-
+-   return defaultInclude;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Return the dictionary file name for a module
+ 
+ std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
+diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
+--- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -301,17 +301,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
+--- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
+@@ -1663,8 +1663,7 @@
+    case kROOT_Load:
+       {
+          const TString fileName = s3("[^\"]*$");
+-//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
+-         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
++         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
+          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
+ 
+ //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
+diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
+--- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
+@@ -445,7 +445,9 @@
+ 
+ static void SetRootSys()
+ {
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+    void *addr = (void *)SetRootSys;
+    Dl_info info;
+    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
+@@ -458,8 +460,8 @@
+          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
+       }
+    }
+-#else
+-   return;
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ #endif
+@@ -487,7 +489,9 @@
+    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
+    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+ #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+    // first loaded is the app so set ROOTSYS to app bundle
+    if (i == 1) {
+@@ -513,6 +517,8 @@
+       }
+    }
+ #endif
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // when libSystem.B.dylib is loaded we have finished loading all dylibs
+@@ -600,13 +606,8 @@
+    SetRootSys();
+ #endif
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0)
+-      gRootDir= "/usr/local/root";
+-#else
+-   gRootDir = ROOTPREFIX;
+-#endif
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   gRootDir = "/usr/local/root";
+ 
+    return kFALSE;
+ }
+@@ -2138,22 +2140,17 @@
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
+          gdbscript = "";
+-      } else {
+-         gdbscript += " ";
+       }
+    }
+    if (gdbscript == "") {
+-#ifdef ROOTETCDIR
+-      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
+-#else
+-      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
+-#endif
++      gdbscript = "gdb-backtrace.sh";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
+          return;
+       }
+-      gdbscript += " ";
+    }
++   gdbscript += " ";
+ 
+    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
+    gdbmess = gdbmess.Strip();
+@@ -4471,11 +4468,7 @@
+       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
+       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
+       if (rdynpath.IsNull()) {
+-#ifdef ROOTLIBDIR
+-         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
+-#else
+-         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
+-#endif
++         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
+       }
+       TString ldpath;
+ #if defined (R__AIX)
+@@ -4496,16 +4489,9 @@
+       else {
+          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
+       }
+-
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ":"; dynpath += ROOTLIBDIR;
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ":"; dynpath += TROOT::GetLibDir();
+       }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
+-      }
+-#endif
+       if (gCling) {
+          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
+       } else
+diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
+@@ -64,27 +64,27 @@
+                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+ endif()
+ 
+-set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
+-configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
++configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
+ 
+ if(WIN32)
+-  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
+ else()
+   if(CXX_HAS_fno_rtti)
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
+   else()
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
+   endif()
+ endif()
+ 
+ ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
+-                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
++                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
+                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
+                               $<TARGET_OBJECTS:Clib>
+                               $<TARGET_OBJECTS:MetaUtils>
+                               $<TARGET_OBJECTS:MetaUtilsLLVM>
+                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                               NOINSTALL)
++set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
+ add_dependencies(rootcling_tmp CLING LLVMRES)
+ set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+ set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
+--- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
+@@ -48,7 +48,7 @@
+ ROOTCINTEXE     := bin/rootcint$(EXEEXT)
+ GENREFLEXEXE    := bin/genreflex$(EXEEXT)
+ ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
+-ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
++ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
+ 
+ ##### Dependencies for all dictionaries
+ ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
+diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
+--- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -295,12 +295,6 @@
+ bool buildingROOT = false;
+ #endif
+ 
+-#ifdef R__EXTERN_LLVMDIR
+-# define R__LLVMDIR R__EXTERN_LLVMDIR
+-#else
+-# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
+-#endif
+-
+ namespace {
+    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
+    template <typename T> struct IsPointerTClassCopy {
+@@ -3977,11 +3971,6 @@
+       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
+    }
+ 
+-#if defined(ROOTINCDIR)
+-   if (!buildingROOT)
+-      SetRootSys();
+-#endif
+-
+    if (ic < argc && !strcmp(argv[ic], "-c")) {
+       // Simply ignore the -c options.
+       ic++;
+@@ -4131,7 +4120,11 @@
+    }
+ 
+    ic = nextStart;
+-   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
++#endif
+ 
+    std::vector<std::string> pcmArgs;
+    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
+@@ -4140,7 +4133,11 @@
+    }
+ 
+    // cling-only arguments
+-   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
++#endif
+    // We do not want __ROOTCLING__ in the pch!
+    if (!onepcm) {
+       clingArgs.push_back("-D__ROOTCLING__");
+@@ -4162,10 +4159,14 @@
+    }
+ 
+    std::string resourceDir;
+-#ifdef R__LLVMRESOURCEDIR
+-   resourceDir = "@R__LLVMRESOURCEDIR@";
++#ifdef R__EXTERN_LLVMDIR
++   resourceDir = R__EXTERN_LLVMDIR;
+ #else
+-   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
++#ifdef ROOT_STAGE1_BUILD
++   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
++#else
++   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
++#endif
+ #endif
+ 
+ #ifndef ROOT_STAGE1_BUILD
+@@ -4184,11 +4185,6 @@
+ 
+    interp.getOptions().ErrorOut = true;
+    interp.enableRawInput(true);
+-#ifdef ROOTINCDIR
+-   const bool useROOTINCDIR = !buildingROOT;
+-#else
+-   const bool useROOTINCDIR = false;
+-#endif
+    if (isGenreflex) {
+       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
+          // There was an error.
+@@ -4205,17 +4201,10 @@
+                               "#include <math.h>\n"
+                               "#include <string.h>\n"
+                              ) != cling::Interpreter::kSuccess
+-            || (!useROOTINCDIR
+-                && interp.declare("#include \"Rtypes.h\"\n"
+-                                  "#include \"TClingRuntime.h\"\n"
+-                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
+-#ifdef ROOTINCDIR
+-            || (useROOTINCDIR
+-                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
+-               )
+-#endif
++            || interp.declare("#include \"Rtypes.h\"\n"
++                              "#include \"TClingRuntime.h\"\n"
++                              "#include \"TObject.h\""
++                             ) != cling::Interpreter::kSuccess
+          ) {
+          // There was an error.
+          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -37,6 +37,18 @@
+ }
+ 
+ extern "C"
++const char *TROOT__GetIncludeDir()
++{
++   return TROOT::GetIncludeDir().Data();
++}
++
++extern "C"
++const char *TROOT__GetEtcDir()
++{
++   return TROOT::GetEtcDir().Data();
++}
++
++extern "C"
+ cling::Interpreter *TCling__GetInterpreter()
+ {
+    static bool sInitialized = false;
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
+@@ -21,6 +21,8 @@
+ 
+ extern "C" {
+    const char ** *TROOT__GetExtraInterpreterArgs();
++   const char *TROOT__GetIncludeDir();
++   const char *TROOT__GetEtcDir();
+    cling::Interpreter *TCling__GetInterpreter();
+    void InitializeStreamerInfoROOTFile(const char *filename);
+    void AddStreamerInfoToROOTFile(const char *normName);
+diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
+--- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
+@@ -362,11 +362,7 @@
+          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
+          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
+          if (rdynpath == "") {
+-#ifdef ROOTBINDIR
+-            rdynpath = ".;"; rdynpath += ROOTBINDIR;
+-#else
+-            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
+-#endif
++            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
+          }
+          TString path = gSystem->Getenv("PATH");
+          if (path == "")
+@@ -376,15 +372,10 @@
+          }
+ 
+       }
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ";"; dynpath += ROOTLIBDIR;
+-      }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
++
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ";"; dynpath += TROOT::GetLibDir();
+       }
+-#endif
+ 
+       return dynpath;
+    }
+@@ -823,16 +814,8 @@
+       }
+ 
+       // determine the fileopen.C file path:
+-      TString fileopen;
+-#ifndef ROOT_PREFIX
+-      fileopen += sys->TWinNTSystem::DriveName(buf);
+-      fileopen += ":";
+-      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
+-      fileopen += "\\macros";
+-#else
+-      fileopen += ROOTMACRODIR;
+-#endif
+-      fileopen += "\\fileopen.C";
++      TString fileopen = "fileopen.C";
++      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
+ 
+       if (regROOTwrite) {
+          // only write to registry if fileopen.C is readable
+@@ -1007,7 +990,9 @@
+ 
+    char *buf = new char[MAX_MODULE_NAME32 + 1];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
++#endif
+    // set ROOTSYS
+    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
+    if (hModCore) {
+@@ -1035,6 +1020,8 @@
+          }
+       }
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    UpdateRegistry(this, buf);
+@@ -1112,23 +1099,17 @@
+ 
+    fSigcnt = 0;
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0) {
+-      static char lpFilename[MAX_PATH];
+-      if (::GetModuleFileName(NULL,               // handle to module to find filename for
+-                            lpFilename,           // pointer to buffer to receive module path
+-                            sizeof(lpFilename)))  // size of buffer, in characters
+-      {
+-         const char *dirName = DirName(DirName(lpFilename));
+-         gRootDir = StrDup(dirName);
+-      } else {
+-         gRootDir = 0;
+-      }
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   static char lpFilename[MAX_PATH];
++   if (::GetModuleFileName(
++          NULL,                   // handle to module to find filename for
++          lpFilename,             // pointer to buffer to receive module path
++          sizeof(lpFilename))) {  // size of buffer, in characters
++      const char *dirName = DirName(DirName(lpFilename));
++      gRootDir = StrDup(dirName);
++   } else {
++      gRootDir = 0;
+    }
+-#else
+-   gRootDir= ROOTPREFIX;
+-#endif
+ 
+    // Increase the accuracy of Sleep() without needing to link to winmm.lib
+    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
+diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
+--- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
+@@ -50,6 +50,7 @@
+ # Define all the header files which should be installed when
+ # doing a "make install"
+ install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
++file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
+ set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ 
+ ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
+diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
+--- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
+@@ -24,6 +24,7 @@
+ #include "Riostream.h"
+ 
+ #include "TSystem.h"
++#include "TROOT.h"
+ #include "TObjArray.h"
+ #include "TVirtualGeoPainter.h"
+ #include "TGeoManager.h"
+@@ -1113,12 +1114,8 @@
+ {
+    if (HasRNElements()) return;
+    TGeoElementRN *elem;
+-   TString rnf;
+-#ifdef ROOTETCDIR
+-   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
+-#else
+-   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++   TString rnf = "RadioNuclides.txt";
++   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
+    FILE *fp = fopen(rnf, "r");
+    if (!fp) {
+       Error("ImportElementsRN","File RadioNuclides.txt not found");
+diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
+@@ -359,33 +359,33 @@
+ 
+ static void init_icon_paths()
+ {
+-   const char *icons = "/icons";
+-#ifdef R__WIN32
+-      icons = "\\icons";
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
++#ifndef R__WIN32
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
+ #endif
++   }
+ 
+-   TString homeIcons = gSystem->HomeDirectory();
+-   homeIcons += icons;
+-
+-   TString rootIcons = gSystem->Getenv("ROOTSYS");
+-   rootIcons += icons;
+-
+-   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
+-
+-   gIconPaths[0] = StrDup(".");
+-   gIconPaths[1] = StrDup(homeIcons.Data());
+-   gIconPaths[2] = StrDup(rootIcons.Data());
+-   gIconPaths[3] = StrDup(guiIcons.Data());
+-
+-#ifdef ROOTICONPATH
+-   gIconPaths[4] = StrDup(ROOTICONPATH);
++   Int_t cnt = 0;
++   Ssiz_t from = 0;
++   TString token;
++#ifndef R__WIN32
++   const char *delim = "/";
++#else
++   const char *delim = "\\";
+ #endif
+-
+-#ifdef EXTRAICONPATH
+-   gIconPaths[5] = StrDup(EXTRAICONPATH);
+-#endif
+-
+-   gIconPaths[6] = 0;
++   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
++      char *path = gSystem->ExpandPathName(token.Data());
++      if (path) {
++         gIconPaths[cnt] = path;
++         cnt++;
++      }
++   }
++   gIconPaths[cnt] = 0;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
+--- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
+@@ -811,11 +811,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+@@ -3077,11 +3073,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
+--- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
+@@ -195,11 +195,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -225,11 +221,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ 
+    // draw list of classes (if specified)
+    if (classes && strlen(classes)) {
+diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
+@@ -15,12 +15,10 @@
+ Interface to the freetype 2 library.
+ */
+ 
+-// RConfigure.h is needed for TTFFONTDIR
+-#include "RConfigure.h"
+-
+ #  include <ft2build.h>
+ #  include FT_FREETYPE_H
+ #  include FT_GLYPH_H
++#include "TROOT.h"
+ #include "TTF.h"
+ #include "TSystem.h"
+ #include "TEnv.h"
+@@ -415,13 +413,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-# else
+-                                       "$(ROOTSYS)/fonts"
+-# endif
+-                                      );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (!ttfont) {
+@@ -543,12 +535,7 @@
+       // try to load font (font must be in Root.TTFontPath resource)
+       // to see which fontset we have available
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR
+-#else
+-                                          "$(ROOTSYS)/fonts"
+-#endif
+-                                         );
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
+       if (ttfont) {
+          delete [] ttfont;
+diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
+@@ -1567,12 +1567,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-#else // TTFFONTDIR
+-                                       "$(ROOTSYS)/fonts"
+-#endif // TTFFONTDIR
+-                                       );
++                                       TROOT::GetTTFFontDir());
+ 
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
+diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
+--- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -699,13 +699,6 @@
+                           GetSystemMetrics(SM_CYSMICON));
+    HDC dc = tempIcon->handle();
+    DrawIcon (dc, 0, 0, icon);
+-#else
+-# ifdef ROOTICONPATH
+-   gSystem->ExpandPathName(ROOTICONPATH);
+-# else
+-   gSystem->ExpandPathName("$ROOTSYS/icons/");
+-//   tempIcon =new QPixmap (16,16),
+-# endif
+ #endif
+    return tempIcon;
+ }
+@@ -795,13 +788,7 @@
+    static TQtApplication *app = 0;
+    if (!app) {
+       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
+-      static TString argvString (
+-#ifdef ROOTBINDIR
+-             ROOTBINDIR "/root.exe"
+-#else
+-             "$ROOTSYS/bin/root.exe"
+-#endif
+-             );
++      static TString argvString (TROOT::GetBinDir() + "/root.exe");
+       gSystem->ExpandPathName(argvString);
+       static char *argv[] = {(char *)argvString.Data()};
+       static int nArg = 1;
+@@ -989,14 +976,8 @@
+     }
+ 
+     if (isXdfSupport && !symbolFontFound) {
+-// Load the local ROOT font
+-       QString fontdir =
+-#ifdef TTFFONTDIR
+-         TTFFONTDIR
+-#else
+-         "$ROOTSYS/fonts"
+-#endif
+-        ;
++        // Load the local ROOT font
++        QString fontdir = TROOT::GetTTFFontDir().Data();
+         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
+         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
+     }
+@@ -1006,12 +987,7 @@
+         fontFamily = fSymbolFontFamily = "Arial";
+         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
+         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
+-                 <<
+-#ifdef TTFFONTDIR
+-               TTFFONTDIR
+-#else
+-               "$ROOTSYS/fonts"
+-#endif
++                 << TROOT::GetTTFFontDir()
+                  << "\" directory to get the proper support for ROOT TLatex class";
+         // create a custom codec
+         new QSymbolCodec();
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -14,6 +14,7 @@
+ #include "TGLFontManager.h"
+ 
+ 
++#include "TROOT.h"
+ #include "TVirtualX.h"
+ #include "TMath.h"
+ #include "TSystem.h"
+@@ -451,11 +452,7 @@
+    if (it == fFontMap.end())
+    {
+       TString ttpath, file;
+-# ifdef TTFFONTDIR
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
+-# else
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
+-# endif
++      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
+       {
+          //For extenede we have both ttf and otf.
+          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -669,14 +669,7 @@
+          switch (parm1) {
+          case kGLHelpAbout: {
+ #ifdef R__UNIX
+-            TString rootx;
+-#ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-#else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-#endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -197,13 +197,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                        TTFFONTDIR
+-# else
+-                                        "$(ROOTSYS)/fonts"
+-# endif
+-                                        );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (fGLTextFont) delete fGLTextFont;
+diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -84,12 +84,7 @@
+ 
+    if (strcmp(appClassName, "proofserv")) {
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR);
+-#else
+-                                          "$(ROOTSYS)/fonts");
+-#endif
+-
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
+       if (!ttfont)
+diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
+--- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -83,46 +83,29 @@
+    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
+    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
+ 
+-   TString icon_path;
+-   TString mime_file;
+-   TString line;
+-
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
+ #ifndef R__WIN32
+-# ifdef ROOTICONPATH
+-   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
+-                               ROOTICONPATH);
+-#  ifdef EXTRAICONPATH
+-   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
+-#  else
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-#  endif
+-# else
+-   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
+-                                                       gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-# endif
+-   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
++#endif
++   }
+ 
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
++   TString mime_file = ".root.mimes";
++   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
++   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
+    char *mf = gSystem->ExpandPathName(mime_file.Data());
+    if (mf) {
+       mime_file = mf;
+       delete [] mf;
+    }
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-#ifdef ROOTETCDIR
+-      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
+-#else
+-      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
+-#else // R__WIN32
+-   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
++   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
++      mime_file = "root.mimes";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
++   }
+ 
+    // Setup colors...
+    fClient->GetColorByName("white", fWhite);  // white and black always exist
+diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -842,14 +842,7 @@
+ void TGTextEditor::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -702,14 +702,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1962,14 +1962,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1192,14 +1192,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
+--- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
+@@ -629,14 +629,7 @@
+                   case kM_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
+--- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -5812,14 +5812,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++		         TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
+--- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -1348,18 +1348,7 @@
+    R__LOCKGUARD(GetMakeClassMutex());
+ 
+    fPathInfo.fEtcDir = "html";
+-
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
+-#else
+-   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
+-# ifdef ROOTPREFIX
+-   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
+-# else
+-   if (getenv("ROOTSYS"))
+-      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
+-# endif
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
+ 
+    return fPathInfo.fEtcDir;
+ }
+@@ -1666,12 +1655,7 @@
+                   if (posSpace != std::string::npos)
+                      lib.erase(posSpace);
+                   if (rootLibs.find(lib) == rootLibs.end()) {
+-#ifdef ROOTLIBDIR
+-                     TString rootlibdir = ROOTLIBDIR;
+-#else
+-                     TString rootlibdir = "lib";
+-                     gSystem->PrependPathName(gRootDir, rootlibdir);
+-#endif
++                     TString rootlibdir = TROOT::GetLibDir();
+                      TString sLib(lib);
+                      if (sLib.Index('.') == -1) {
+                         sLib += ".";
+diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
+--- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
+@@ -3047,11 +3047,7 @@
+          return;
+       }
+       // Get Makefile.arch
+-#ifdef ROOTETCDIR
+-      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
+-#else
+-      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
+-#endif
++      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(mkarchsrc))
+          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
+       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
+@@ -40,5 +40,5 @@
+   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+-  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
+ endif()
+diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
+--- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
+@@ -173,15 +173,9 @@
+ 
+ int main()
+ {
+-#ifdef ROOTPREFIX
+-   string rootbin(ROOTBINDIR);
+-   string rootlib(ROOTLIBDIR);
+-   string rootetc(ROOTETCDIR);
+-#else
+-   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
+-   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
+-   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
+-#endif
++   string rootbin(TROOT::GetBinDir());
++   string rootlib(TROOT::GetLibDir());
++   string rootetc(TROOT::GetEtcDir());
+ 
+    // If needed, install ROOT notebook files in the user's home directory
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
+--- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
+@@ -690,11 +690,9 @@
+ .NOTPARALLEL:
+ endif
+ 
+-ifeq ($(USECONFIG),FALSE)
+ all: tutorials/hsimple.root
+ tutorials/hsimple.root: rootexecs postbin
+-	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
+-endif
++	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
+ 
+ all:            rootexecs postbin
+ 	@echo " "
+@@ -1119,7 +1117,7 @@
+ 
+ $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
+ 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
+-	@$(MAKEPCH) $@
++	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
+ 
+ $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
+ 	@mkdir -p $(dir $@)
+@@ -1224,8 +1222,6 @@
+ 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
+ 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
+ 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
+-	   (cd $(DESTDIR)$(TUTDIR); \
+-	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+ 	fi
+ 
+ uninstall:
+@@ -1352,7 +1348,6 @@
+ 		--exclude proofd.xinetd \
+ 		--exclude rootd.rc.d \
+ 		--exclude rootd.xinetd \
+-		--exclude gitinfo.txt \
+ 		$(ROOT_SRCDIR)/etc . ; \
+ 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
+ 	$(RSYNC) \
+diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
+--- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
+@@ -22,9 +22,6 @@
+ 
+ 
+ #include "RConfigure.h"
+-// #ifndef ROOTINCDIR
+-// #define MATH_NO_PLUGIN_MANAGER
+-// #endif
+ 
+ #include <algorithm>
+ #include <functional>
+diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
+@@ -551,11 +551,8 @@
+    const char *fn;
+ 
+    if (!FileName[0]) {
+-#ifdef ROOTETCDIR
+-      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
+-#else
+-      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++      default_name = "pdg_table.txt";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
+       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
+    } else {
+       fn = FileName;
+diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
+--- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
+@@ -23,7 +23,6 @@
+ add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
+-add_dependencies(rsa move_headers)
+ 
+ if(ssl)
+   include_directories(${OPENSSL_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
+--- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
+@@ -95,18 +95,8 @@
+ {
+    // Executables and conf dirs
+ 
+-   string execdir, etcdir;
+-#ifdef ROOTBINDIR
+-   execdir = string(ROOTBINDIR);
+-#endif
+-#ifdef ROOTETCDIR
+-   etcdir = string(ROOTETCDIR);
+-#endif
+-
+-   // Define rootbindir if not done already
+-   if (!execdir.length())
+-      execdir = string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
++   string execdir = TROOT::GetBinDir().Data();
+    if (execdir.length()) {
+       int len = 15 + execdir.length();
+       char *tmp = new char[len+1];
+@@ -117,10 +107,8 @@
+          return -1;
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!etcdir.length())
+-      etcdir = string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
++   string etcdir = TROOT::GetEtcDir().Data();
+    if (etcdir.length()) {
+       int len = 15 + etcdir.length();
+       char *tmp = new char[len+1];
+diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
+--- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -4110,19 +4110,9 @@
+          ::Info("TAuthenticate::ReadRootAuthrc",
+                 "file %s cannot be read (errno: %d)", authrc, errno);
+       delete [] authrc;
+-#ifdef ROOTETCDIR
+-      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
+-#else
+-      char etc[1024];
+-#ifdef WIN32
+-      snprintf(etc, 1024, "%s\\etc", gRootDir);
+-#else
+-      snprintf(etc, 1024, "%s/etc", gRootDir);
+-#endif
+-      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
+-#endif
++      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
+       if (gDebug > 2)
+-         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
++         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
+       if (gSystem->AccessPathName(authrc, kReadPermission)) {
+          if (gDebug > 1)
+             ::Info("TAuthenticate::ReadRootAuthrc",
+diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
+--- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -147,11 +147,7 @@
+    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
+ 
+    if (fJSROOTSYS.Length() == 0) {
+-#ifdef ROOTETCDIR
+-      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
+-#else
+-      TString jsdir("$(ROOTSYS)/etc/http");
+-#endif
++      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(jsdir)) {
+          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
+          fJSROOTSYS = ".";
+@@ -162,18 +158,7 @@
+ 
+    AddLocation("currentdir/", ".");
+    AddLocation("jsrootsys/", fJSROOTSYS);
+-
+-   const char *rootsys = gSystem->Getenv("ROOTSYS");
+-   if (rootsys != 0) {
+-      AddLocation("rootsys/", rootsys);
+-   } else {
+-#ifdef ROOTPREFIX
+-      TString sysdir = ROOTPREFIX;
+-#else
+-      TString sysdir = "$(ROOTSYS)";
+-#endif
+-      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
+-   }
++   AddLocation("rootsys/", TROOT::GetRootSys());
+ 
+    fDefaultPage = fJSROOTSYS + "/files/online.htm";
+    fDrawPage = fJSROOTSYS + "/files/draw.htm";
+diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
+--- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -1275,17 +1275,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
+--- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -335,22 +335,7 @@
+       }
+    }
+ 
+-   TString confdir;
+-#ifndef ROOTPREFIX
+-   // try to guess the config directory...
+-   if (gSystem->Getenv("ROOTSYS")) {
+-      confdir = TString(gSystem->Getenv("ROOTSYS"));
+-   } else {
+-      // Try to guess it from 'root.exe' path
+-      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
+-                                     "root.exe", kExecutePermission);
+-      confdir = rootexe;
+-      confdir.Resize(confdir.Last('/'));
+-      delete [] rootexe;
+-   }
+-#else
+-   confdir = TString(ROOTPREFIX);
+-#endif
++   TString confdir = TROOT::GetRootSys();
+    if (!confdir.Length()) {
+       Error("Authenticate", "config dir undefined");
+       return kFALSE;
+diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
+--- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
+@@ -2528,10 +2528,13 @@
+ 
+    if (argc > 0) {
+       confdir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTPREFIX
++   }
++
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
+       if (!confdir.length()) {
++         // try to guess the config directory...
+          if (getenv("ROOTSYS")) {
+             confdir = getenv("ROOTSYS");
+             if (gDebug > 0)
+@@ -2542,31 +2545,26 @@
+                ErrorInfo("main: no config directory specified");
+          }
+       }
+-#else
+-      confdir = ROOTPREFIX;
+-#endif
++      rootbindir = std::string(confdir).append("/bin");
++      rootetcdir = std::string(confdir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else {
++      if (!confdir.length())
++         confdir = ROOTPREFIX;
++      rootbindir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
+    }
+-#ifdef ROOTBINDIR
+-   rootbindir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+ #endif
+ 
+-   // Define rootbindir if not done already
+-   if (!rootbindir.length())
+-      rootbindir = std::string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
+    if (rootbindir.length()) {
+       char *tmp1 = new char[15 + rootbindir.length()];
+       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
+       putenv(tmp1);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp1 = new char[15 + rootetcdir.length()];
+       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
+--- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
+@@ -31,7 +31,6 @@
+ 
+ #---static library needed for rootd and proofd --------------------------------------------
+ add_library(rpdutil STATIC ${rpdutilsrcs})
+-add_dependencies(rpdutil move_headers)
+ 
+ ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
+ 
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
+@@ -436,17 +436,7 @@
+    if (fgWrksMax == -2) {
+       // Find the max number of workers, if any
+       TString sysname = "system.rootrc";
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sysname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
+       TEnv sysenv(0);
+       sysenv.ReadFile(s, kEnvGlobal);
+       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
+@@ -792,17 +782,9 @@
+       return -1;
+    }
+    // ROOTSYS
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
+-#else
+-   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
+    // Conf dir
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
+-#else
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
+    // TMPDIR
+    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
+    // Log file in the log dir
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
+@@ -3026,13 +3026,7 @@
+ #ifdef R__UNIX
+    // Add bindir to PATH
+    TString path(gSystem->Getenv("PATH"));
+-   TString bindir;
+-# ifdef ROOTBINDIR
+-   bindir = ROOTBINDIR;
+-# else
+-   bindir = gSystem->Getenv("ROOTSYS");
+-   if (!bindir.IsNull()) bindir += "/bin";
+-# endif
++   TString bindir(TROOT::GetBinDir());
+    // Augment PATH, if required
+    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
+    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
+diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
+@@ -78,13 +78,8 @@
+ {
+    // Command to be executed
+    TString cmd;
+-#ifdef R__HAVE_CONFIG
+    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
+-#else
+-   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
+-#endif
++            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
+             gSystem->GetPid(), gDebug);
+    // Execute
+    if (gSystem->Exec(cmd) != 0) {
+diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
+@@ -14,7 +14,7 @@
+ # Generation and installation of the PAR files required by the benchmark 
+ add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
+-add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
++add_dependencies(ProofBenchPARFiles move_artifacts)
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
+     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
+@@ -1331,11 +1331,7 @@
+       // Is it the default selector?
+       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("MakeDataSet", "uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
+@@ -26,6 +26,7 @@
+ #include "TMap.h"
+ #include "TProof.h"
+ #include "TProofBenchTypes.h"
++#include "TROOT.h"
+ 
+ 
+ ClassImp(TProofBenchDataSet)
+@@ -145,11 +146,7 @@
+    TString selName("TSelHandleDataSet");
+    if (!TClass::GetClass(selName)) {
+       // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+       Info("Handle", "Uploading '%s' ...", par.Data());
+       if (fProof->UploadPackage(par) != 0) {
+          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
+@@ -275,11 +275,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelCPUDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
+@@ -163,11 +163,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelDataDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
+--- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
+@@ -1005,49 +1005,48 @@
+ 
+    if (argc > 0) {
+       gConfDir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTDATADIR
+-      if (getenv("ROOTSYS")) {
+-         gConfDir = getenv("ROOTSYS");
+-         if (gDebug > 0)
+-            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
+-                      gConfDir.c_str());
+-      } else {
+-         Error(ErrFatal, -1, "main: no config directory specified");
+-      }
+-#else
+-      gConfDir = ROOTDATADIR;
+-#endif
+    }
+-#ifdef ROOTBINDIR
+-   gRootBinDir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+-#endif
+ 
+-   // Define gRootBinDir if not done already
+-   if (!gRootBinDir.length())
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
++      if (!gConfDir.length()) {
++         // try to guess the config directory...
++         if (getenv("ROOTSYS")) {
++            gConfDir = getenv("ROOTSYS");
++            if (gDebug > 0)
++               ErrorInfo("main: no config directory specified using"
++                         " ROOTSYS (%s)", gConfDir.c_str());
++         } else {
++            Error(ErrFatal, -1, "main: no config directory specified");
++         }
++      }
+       gRootBinDir = std::string(gConfDir).append("/bin");
++      rootetcdir = std::string(gConfDir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else  {
++      if (!gConfDir.length())
++         gConfDir = ROOTPREFIX;
++      gRootBinDir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
++   }
++#endif
+ 
+-   // make sure it contains the executable we want to run
++   // make sure gRootBinDir contains the executable we want to run
+    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
+    if (access(arg0.c_str(), X_OK) == -1) {
+       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
+                         gConfDir.c_str());
+    }
+-   // Make it available to all the session via env
++   // Make gRootBinDir available to all the session via env
+    if (gRootBinDir.length()) {
+       char *tmp = new char[15 + gRootBinDir.length()];
+       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
+       putenv(tmp);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(gConfDir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp = new char[15 + rootetcdir.length()];
+       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
+--- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
+@@ -384,11 +384,19 @@
+    } else {
+       // Check the ROOT dirs
+       if (fROOT.size() <= 0) {
++         XrdOucString dir, bd, ld, id, dd;
+ #ifdef R__HAVE_CONFIG
+-         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
+-                      id(ROOTINCDIR), dd(ROOTDATADIR);
+-#else
+-         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
++         if (getenv("ROOTIGNOREPREFIX"))
++#endif
++            dir = getenv("ROOTSYS");
++#ifdef R__HAVE_CONFIG
++         else {
++            dir = ROOTPREFIX;
++            bd = ROOTBINDIR;
++            ld = ROOTLIBDIR;
++            id = ROOTINCDIR;
++            dd = ROOTDATADIR;
++         }
+ #endif
+          // None defined: use ROOTSYS as default, if any; otherwise we fail
+          if (dir.length() > 0) {
+diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
+--- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -25,10 +25,4 @@
+                             WORLD_EXECUTE WORLD_READ
+                 DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
+--- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -8,9 +8,4 @@
+ ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
+                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
+ 
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
+--- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -200,7 +200,6 @@
+    return 0;
+ }
+ 
+-#ifndef ROOTPREFIX
+ static const char *GetExePath()
+ {
+    static std::string exepath;
+@@ -247,7 +246,6 @@
+       delete [] ep;
+    }
+ }
+-#endif
+ 
+ static void SetDisplay()
+ {
+@@ -296,7 +294,9 @@
+ 
+ static void SetLibraryPath()
+ {
+-#ifndef ROOTLIBDIR
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Set library path for the different platforms.
+ 
+    char *msg;
+@@ -343,6 +343,8 @@
+    }
+ #  endif
+    putenv(msg);
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ 
+@@ -440,7 +442,9 @@
+    char **argvv;
+    char  arg0[kMAXPATHLEN];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Try to set ROOTSYS depending on pathname of the executable
+    SetRootSys();
+ 
+@@ -449,6 +453,8 @@
+               argv[0], argv[0]);
+       return 1;
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // In batch mode don't show splash screen, idem for no logo mode,
+@@ -473,23 +479,20 @@
+    if (notebook) {
+       // Build command
+ #ifdef ROOTBINDIR
+-      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+-#else
+-      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++      if (getenv("ROOTIGNOREPREFIX"))
++#endif
++         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++#ifdef ROOTBINDIR
++      else
++         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+ #endif
+ 
+       // Execute ROOT notebook binary
+       execl(arg0, arg0, NULL);
+-  
++
+       // Exec failed
+-#ifndef ROOTBINDIR
+-      fprintf(stderr,
+-              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
+-              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
+-#else
+-      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
+-              argv[0], ROOTBINDIR, ROOTNBBINARY);
+-#endif
++      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
++              argv[0], arg0);
+ 
+       return 1;
+    }
+@@ -586,9 +589,12 @@
+    // Build argv vector
+    argvv = new char* [argc+2];
+ #ifdef ROOTBINDIR
+-   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+-#else
+-   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++   if (getenv("ROOTIGNOREPREFIX"))
++#endif
++      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++#ifdef ROOTBINDIR
++   else
++      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+ #endif
+    argvv[0] = arg0;
+    argvv[1] = (char *) "-splash";
+@@ -604,14 +610,8 @@
+    execv(arg0, argvv);
+ 
+    // Exec failed
+-#ifndef ROOTBINDIR
+-   fprintf(stderr,
+-           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
+-           argv[0], getenv("ROOTSYS"), ROOTBINARY);
+-#else
+-   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
+-           argv[0], ROOTBINDIR, ROOTBINARY);
+-#endif
++   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
++           argv[0], arg0);
+ 
+    return 1;
+ }
+diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
+--- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -475,14 +475,7 @@
+                   case M_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
+--- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -1270,14 +1270,7 @@
+ void TGRootIDE::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -48,11 +48,7 @@
+ ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -31,11 +31,7 @@
+ ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
+--- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
+@@ -2049,14 +2049,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
+--- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
+@@ -1017,14 +1017,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
diff --git a/root-testfiles.sh b/root-testfiles.sh
new file mode 100755
index 0000000..e7160b8
--- /dev/null
+++ b/root-testfiles.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+
+SITE="http://root.cern.ch/files"
+
+mkdir files
+pushd files
+
+wget -N ${SITE}/aleph_ref_4.root
+wget -N ${SITE}/aleph.root
+wget -N ${SITE}/alice3_ref_4.root
+wget -N ${SITE}/alice3.root
+wget -N ${SITE}/ams_ref_3.root
+wget -N ${SITE}/ams.root
+wget -N ${SITE}/babar2_ref_3.root
+wget -N ${SITE}/babar2.root
+wget -N ${SITE}/barres_ref_3.root
+wget -N ${SITE}/barres.root
+wget -N ${SITE}/belle_ref_3.root
+wget -N ${SITE}/belle.root
+wget -N ${SITE}/bes_ref_3.root
+wget -N ${SITE}/bes.root
+wget -N ${SITE}/brahms_ref_3.root
+wget -N ${SITE}/brahms.root
+wget -N ${SITE}/btev_ref_3.root
+wget -N ${SITE}/btev.root
+wget -N ${SITE}/cdf_ref_4.root
+wget -N ${SITE}/cdf.root
+wget -N ${SITE}/chambers_ref_3.root
+wget -N ${SITE}/chambers.root
+wget -N ${SITE}/cms_ref_3.root
+wget -N ${SITE}/cms.root
+wget -N ${SITE}/dubna_ref_3.root
+wget -N ${SITE}/dubna.root
+wget -N ${SITE}/e907_ref_3.root
+wget -N ${SITE}/e907.root
+wget -N ${SITE}/felix_ref_3.root
+wget -N ${SITE}/felix.root
+wget -N ${SITE}/ganil_ref_3.root
+wget -N ${SITE}/ganil.root
+wget -N ${SITE}/gem_ref_3.root
+wget -N ${SITE}/gem.root
+wget -N ${SITE}/hades2_ref_4.root
+wget -N ${SITE}/hades2.root
+wget -N ${SITE}/hermes_ref_3.root
+wget -N ${SITE}/hermes.root
+wget -N ${SITE}/integral_ref_3.root
+wget -N ${SITE}/integral.root
+wget -N ${SITE}/lhcbfull_ref_3.root
+wget -N ${SITE}/lhcbfull.root
+wget -N ${SITE}/na35_ref_3.root
+wget -N ${SITE}/na35.root
+wget -N ${SITE}/na47_ref_3.root
+wget -N ${SITE}/na47.root
+wget -N ${SITE}/na49_ref_3.root
+wget -N ${SITE}/na49.root
+wget -N ${SITE}/p326_ref_3.root
+wget -N ${SITE}/p326.root
+wget -N ${SITE}/phenix_ref_3.root
+wget -N ${SITE}/phenix.root
+wget -N ${SITE}/phobos2_ref_4.root
+wget -N ${SITE}/phobos2.root
+wget -N ${SITE}/sdc_ref_3.root
+wget -N ${SITE}/sdc.root
+wget -N ${SITE}/sld_ref_3.root
+wget -N ${SITE}/sld.root
+wget -N ${SITE}/star_ref_3.root
+wget -N ${SITE}/star.root
+wget -N ${SITE}/tesla_ref_3.root
+wget -N ${SITE}/tesla.root
+wget -N ${SITE}/wa91_ref_3.root
+wget -N ${SITE}/wa91.root
+
+wget -N ${SITE}/europe.root
+wget -N ${SITE}/linearIO.root
+wget -N ${SITE}/stressHistogram.5.18.00.root
+wget -N ${SITE}/stressRooFit_v534_ref.root
+wget -N ${SITE}/tmva_class_example.root
+wget -N ${SITE}/tmva_reg_example.root
+wget -N ${SITE}/usa.root
+
+for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
+
+popd
+
+tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-tildes.patch b/root-tildes.patch
new file mode 100644
index 0000000..bb03674
--- /dev/null
+++ b/root-tildes.patch
@@ -0,0 +1,194 @@
+diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
+--- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
+@@ -810,7 +810,7 @@
+ ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
+ /// ~~~
+ ///  Note: We recommend using the method TDirectory::GetObject:
+-/// ~~~ {.cpp}~
++/// ~~~ {.cpp}
+ ///      MyClass *obj = 0;
+ ///      directory->GetObject("some object inheriting from MyClass",obj);
+ ///      if (obj) { ... we found what we are looking for ... }
+diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
+--- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
+@@ -1040,7 +1040,7 @@
+ ///
+ ///       TQObject::Connect("TGButton", "Clicked()",
+ ///                         "TH2F", myHist, "Draw(Option_t*)");
+-///~~~
++/// ~~~
+ /// cl == 0 - corresponds to function (interpereted or global)
+ ///           the name of the function is defined by the slot string,
+ ///           parameter receiver should be 0.
+diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -2677,7 +2677,7 @@
+ /// We allow them to type:
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C++(arg1,arg2)
+-///  ~~~
++/// ~~~
+ /// or
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C+(arg1,arg2)
+@@ -3843,7 +3843,7 @@
+ /// the use of ';' to separate several instructions. However, shell specific
+ /// construct should be avoided. In particular this description can contain
+ /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ /// Five special variables will be expanded before execution:
+ ///   Variable name       Expands to
+ ///   -------------       ----------
+@@ -3915,7 +3915,7 @@
+ /// IncludePath should contain the list of compiler flags to indicate where
+ /// to find user defined header files. It is used to expand $IncludePath in
+ /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
+-/// ~~~ {.cpp}
++///  ~~~ {.cpp}
+ ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
+ ///  ~~~
+ /// the default value of IncludePath on Unix is:
+diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
+--- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -663,7 +663,7 @@
+ /// Create an array of clone objects of class cl. The class must inherit from
+ /// TObject. If the class defines an own operator delete(), make sure that
+ /// it looks like this:
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///    void MyClass::operator delete(void *vp)
+ ///    {
+ ///       if ((Long_t) vp != TObject::GetDtorOnly())
+diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
+--- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
+@@ -321,7 +321,7 @@
+ /// ~~~
+ /// Otherwise override the `Print(Option_t *option, Int_t)`
+ /// variant. Remember to declare:
+-/// ~~~ {.cpp]
++/// ~~~ {.cpp}
+ ///   using TCollection::Print;
+ /// ~~~
+ /// somewhere close to the method declaration.
+diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
+--- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
+@@ -189,7 +189,7 @@
+  int i;
+  i = TMath::LocMin(10, &v[0]);
+  std::cout << v[i] << std::endl;
+- ```
++```
+  
+ Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
+ 
+@@ -233,7 +233,7 @@
+ 
+  // old-style
+  mean = TMath::Mean(n, &v[0], &w[0]);
+- ```
++```
+  
+ ### Special and Statistical Functions.
+ 
+diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
+@@ -5964,7 +5964,7 @@
+ ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
+ ///       TImage *im2 = TImage::Create();
+ ///       im2->SetImageBuffer(&buf, TImage::kXpm);
+-///  ~~~
++/// ~~~
+ ///      2.  xpm as an array of strings (pre-parsed)
+ /// ~~~ {.cpp}
+ ///    For example:
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -132,7 +132,7 @@
+ because we clear only the pads and not the main canvas.
+ Note that `c1->Update` must be called at the end of the first picture.
+ 
+-~~~ {.cpp}
++ ~~~ {.cpp}
+      {
+         TFile *f1 = new TFile("hsimple.root");
+         TCanvas *c1 = new TCanvas("c1");
+diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
+--- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -330,7 +330,7 @@
+ ///    | 2-----|-3
+ ///    |/      |/
+ ///    1-------0
+-///~~~
++/// ~~~
+ 
+ void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
+ {
+diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
+--- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -71,7 +71,7 @@
+ To change attributes of the rulers attached to the current Pad, one may
+ query its pointer first:
+ 
+-~~~ {.cpp]
++~~~ {.cpp}
+ TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
+ if (axis) {
+   TAxis3D::ToggleRulers()     // To pop axes down
+diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
+@@ -80,7 +80,7 @@
+ many times.
+ 
+ The following very simple macro shows how to build and fill a `TH2Poly`:
+-~~~ {.cpp]
++~~~ {.cpp}
+ {
+     TH2Poly *h2p = new TH2Poly();
+ 
+diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
+--- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
+@@ -2584,9 +2584,9 @@
+ ///     T->Fill(); //loop
+ ///     file->Write();
+ ///     file->Close();
+-///~~~
++/// ~~~
+ /// but do the following:
+-///~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///     TFile *file = new TFile("myfile.root","recreate");
+ ///     TTree *T = new TTree("T","title");
+ ///     T->Fill(); //loop
+@@ -6487,7 +6487,7 @@
+ /// ~~~ {.cpp}
+ ///     TPrincipal *principal =
+ ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
+-///  ~~~
++/// ~~~
+ 
+ TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
+ {
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
+@@ -3004,6 +3004,7 @@
+ /// The function return the status of the fit in the following form
+ /// ~~~{.cpp}
+ ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
++/// ~~~
+ /// -  The fitResult is 0 is the fit is OK.
+ /// -  The fitResult is negative in case of an error not connected with the fit.
+ /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
new file mode 100644
index 0000000..20209ec
--- /dev/null
+++ b/root-tmath-doc.patch
@@ -0,0 +1,274 @@
+diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
+--- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
+@@ -359,9 +359,9 @@
+ /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
+ /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
+ ///
+-///  Begin_Latex
+-///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
+-///   End_Latex
++///  \f[
++///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
++///  \f]
+ ///
+ ///
+ ///--- Nve 14-nov-1998 UU-SAP Utrecht
+@@ -559,15 +559,16 @@
+ /// see TMath::PoissonI to get a non-smooth function.
+ /// Note that for large values of par, it is better to call
+ ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
++///   poisson->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Poisson(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/Poisson.gif">
+-*/
+-//End_Html
+-
+    if (x<0)
+       return 0;
+    else if (x == 0.0)
+@@ -587,15 +588,17 @@
+ /// compute the Poisson distribution function for (x,par)
+ /// This is a non-smooth function.
+ /// This function is equivalent to ROOT::Math::poisson_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
++///   poissoni->SetNpx(1000);
++///   poissoni->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::PoissonI(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/PoissonI.gif">
+-*/
+-//End_Html
+-
+    Int_t ix = Int_t(x);
+    return Poisson(ix,par);
+ }
+@@ -630,36 +633,33 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculates the Kolmogorov distribution function,
+-///Begin_Html
++/// \f[
++/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
++/// \f]
++/// which gives the probability that Kolmogorov's test statistic will exceed
++/// the value z assuming the null hypothesis. This gives a very powerful
++/// test for comparing two one-dimensional distributions.
++/// see, for example, Eadie et al, "statistocal Methods in Experimental
++/// Physics', pp 269-270).
++///
++/// This function returns the confidence level for the null hypothesis, where:
++///   z = dn*sqrt(n), and
++///   dn  is the maximum deviation between a hypothetical distribution
++///       function and an experimental distribution with
++///   n   events
++///
++/// NOTE: To compare two experimental distributions with m and n events,
++///       use z = sqrt(m*n/(m+n))*dn
++///
++/// Accuracy: The function is far too accurate for any imaginable application.
++///           Probabilities less than 10^-15 are returned as zero.
++///           However, remember that the formula is only valid for "large" n.
++/// Theta function inversion formula is used for z <= 1
++///
++/// This function was translated by Rene Brun from PROBKL in CERNLIB.
+ 
+ Double_t TMath::KolmogorovProb(Double_t z)
+ {
+-   /*
+-   <img src="gif/kolmogorov.gif">
+-   */
+-   //End_Html
+-   // which gives the probability that Kolmogorov's test statistic will exceed
+-   // the value z assuming the null hypothesis. This gives a very powerful
+-   // test for comparing two one-dimensional distributions.
+-   // see, for example, Eadie et al, "statistocal Methods in Experimental
+-   // Physics', pp 269-270).
+-   //
+-   // This function returns the confidence level for the null hypothesis, where:
+-   //   z = dn*sqrt(n), and
+-   //   dn  is the maximum deviation between a hypothetical distribution
+-   //       function and an experimental distribution with
+-   //   n    events
+-   //
+-   // NOTE: To compare two experimental distributions with m and n events,
+-   //       use z = sqrt(m*n/(m+n))*dn
+-   //
+-   // Accuracy: The function is far too accurate for any imaginable application.
+-   //           Probabilities less than 10^-15 are returned as zero.
+-   //           However, remember that the formula is only valid for "large" n.
+-   // Theta function inversion formula is used for z <= 1
+-   //
+-   // This function was translated by Rene Brun from PROBKL in CERNLIB.
+-
+    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
+    const Double_t w = 2.50662827;
+    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
+@@ -2254,15 +2254,40 @@
+ /// The definition can be found in "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
+ /// use now implementation in ROOT::Math::gamma_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
++///
++///   gdist->SetParameters(0.5, 0., 1.);
++///   gdist->SetLineColor(2);
++///   TF1 *gdist1 = gdist->DrawCopy("L");
++///   gdist->SetParameters(1.0, 0., 1.);
++///   gdist->SetLineColor(3);
++///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(2.0, 0., 1.);
++///   gdist->SetLineColor(4);
++///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(5.0, 0., 1.);
++///   gdist->SetLineColor(6);
++///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
+ {
+-   /*
+-   <img src="gif/gammadist.gif">
+-   */
+-   //End_Html
+-
+    if ((x<mu) || (gamma<=0) || (beta <=0)) {
+       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
+       return 0;
+@@ -2308,21 +2333,47 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Computes the density of LogNormal distribution at point x.
+ /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
+-/// sigma is the shape parameter
+-/// theta is the location parameter
+-/// m is the scale parameter
++/// - sigma is the shape parameter
++/// - theta is the location parameter
++/// - m is the scale parameter
+ /// The formula was taken from "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
+ /// Implementation using ROOT::Math::lognormal_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
++///   logn->SetMinimum(1e-3);
++///
++///   logn->SetParameters(0.5, 0., 1.);
++///   logn->SetLineColor(2);
++///   TF1 *logn1 = logn->DrawCopy("L");
++///   logn->SetParameters(1.0, 0., 1.);
++///   logn->SetLineColor(3);
++///   TF1 *logn2 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(2.0, 0., 1.);
++///   logn->SetLineColor(4);
++///   TF1 *logn3 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(5.0, 0., 1.);
++///   logn->SetLineColor(6);
++///   TF1 *logn4 = logn->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
+ {
+-   /*
+-   <img src="gif/lognormal.gif">
+-   */
+-   //End_Html
+-
+    if ((x<theta) || (sigma<=0) || (m<=0)) {
+       Error("TMath::Lognormal", "illegal parameter values");
+       return 0;
+@@ -2615,15 +2666,39 @@
+ ///density function computed numerically in an accurate way: our approximation
+ ///shows a difference of less than 3% around the peak of the density function, slowly
+ ///increasing going towards the extreme tails to the right and to the left"
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
++///
++///   vavilov->SetParameters(0.5, 0.);
++///   vavilov->SetLineColor(2);
++///   TF1 *vavilov1 = vavilov->DrawCopy("L");
++///   vavilov->SetParameters(0.3, 0.);
++///   vavilov->SetLineColor(3);
++///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.2, 0.);
++///   vavilov->SetLineColor(4);
++///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.1, 0.);
++///   vavilov->SetLineColor(6);
++///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
++///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
++///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
++///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
++///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
+ {
+-/*
+-<img src="gif/Vavilov.gif">
+-*/
+-//End_Html
+-
+    Double_t *ac = new Double_t[14];
+    Double_t *hc = new Double_t[9];
+ 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
new file mode 100644
index 0000000..95090d6
--- /dev/null
+++ b/root-tprincipal-doc.patch
@@ -0,0 +1,483 @@
+diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
+index 76bb5d4..d5bab47 100644
+--- a/hist/hist/src/TPrincipal.cxx
++++ b/hist/hist/src/TPrincipal.cxx
+@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
+ error \f$E_N\f$ is minimized.
+ 
+ The transformation matrix to go from the pattern space to the feature
+-space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
++space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
+ \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
+ \f[
+   \mathsf{T} = \left[
+@@ -207,10 +207,6 @@ in the transformed space.
+ Christian Holm August 2000, CERN
+ */
+ 
+-// $Id$
+-// $Date: 2006/05/24 14:55:26 $
+-// $Author: brun $
+-
+ #include "TPrincipal.h"
+ 
+ #include "TVectorD.h"
+@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
+ ClassImp(TPrincipal);
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Empty CTOR, Do not use.
++/// Empty constructor. Do not use.
+ 
+ TPrincipal::TPrincipal()
+   : fMeanValues(0),
+@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Ctor. Argument is number of variables in the sample of data
++/// Constructor. Argument is number of variables in the sample of data
+ /// Options are:
+-///   N       Normalize the covariance matrix (default)
+-///   D       Store input data (default)
++///  - N       Normalize the covariance matrix (default)
++///  - D       Store input data (default)
+ ///
+ /// The created object is  named "principal" by default.
+ 
+@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///copy constructor
++/// Copy constructor.
+ 
+ TPrincipal::TPrincipal(const TPrincipal& pr) :
+   TNamed(pr),
+@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///assignement operator
++/// Assignment operator.
+ 
+ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ {
+@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// destructor
++/// Destructor.
+ 
+ TPrincipal::~TPrincipal()
+ {
+@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Html
++/// Add a data point and update the covariance matrix. The input
++/// array must be <TT>fNumberOfVariables</TT> long.
++///
++///
++/// The Covariance matrix and mean values of the input data is calculated
++/// on the fly by the following equations:
++///
++/// \f[
++/// \left<x_i\right>^{(0)}  = x_{i0}
++/// \f]
++///
++///
++/// \f[
++/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
++/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
++/// \f]
++///
++/// \f[
++/// C_{ij}^{(0)} = 0
++/// \f]
++///
++///
++///
++/// \f[
++/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
++/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
++///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
++/// - \frac1n C_{ij}^{(n-1)}
++/// \f]
++///
++/// since this is a really fast method, with no rounding errors (please
++/// refer to CERN 72-21 pp. 54-106).
++///
++///
++/// The data is stored internally in a <TT>TVectorD</TT>, in the following
++/// way:
++///
++/// \f[
++/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
++///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
++/// \f]
++///
++/// With \f$P\f$ as defined in the class description.
+ 
+ void TPrincipal::AddRow(const Double_t *p)
+ {
+-  /*
+-     </PRE>
+-Add a data point and update the covariance matrix. The input
+-array must be <TT>fNumberOfVariables</TT> long.
+-
+-<P>
+-The Covariance matrix and mean values of the input data is caculated
+-on the fly by the following equations:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(0)}  = x_{i0}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="90" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img36.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(0)} = x_{i0}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
+-+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="302" HEIGHT="42" BORDER="0"
+- SRC="gif/principal_img37.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
+-+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="62" HEIGHT="34" BORDER="0"
+- SRC="gif/principal_img38.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
+-  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="504" HEIGHT="43" BORDER="0"
+- SRC="gif/principal_img39.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{i...
+-...\left&lt;x_j\right&gt;^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-since this is a really fast method, with no rounding errors (please
+-refer to CERN 72-21 pp. 54-106).
+-
+-<P>
+-The data is stored internally in a <TT>TVectorD</TT>, in the following
+-way:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="319" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img40.gif"
+- ALT="\begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-With <IMG
+- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+- SRC="gif/principal_img6.gif"
+- ALT="$P$"> as defined in the class description.
+-     <PRE>
+-  */
+-  // End_Html
+    if (!p)
+       return;
+ 
+@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Generates the file <filename>, with .C appended if it does
++/// Generates the file `<filename>`, with `.C` appended if it does
+ /// argument doesn't end in .cxx or .C.
+ ///
+ /// The file contains the implementation of two functions
+-///
++/// ~~~ {.cpp}
+ ///    void X2P(Double_t *x, Double *p)
+ ///    void P2X(Double_t *p, Double *x, Int_t nTest)
+-///
+-/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
++/// ~~~
++/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
+ /// respectively. Please refer to these methods.
+ ///
+ /// Further, the static variables:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    gNVariables
+ ///    Double_t gEigenValues[]
+ ///    Double_t gEigenVectors[]
+ ///    Double_t gMeanValues[]
+ ///    Double_t gSigmaValues[]
+-///
++/// ~~~
+ /// are initialized. The only ROOT header file needed is Rtypes.h
+ ///
+ /// See TPrincipal::MakeRealCode for a list of options
+@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Make histograms of the result of the analysis.
+ /// The option string say which histograms to create
+-///      X         Histogram original data
+-///      P         Histogram principal components corresponding to
+-///                original data
+-///      D         Histogram the difference between the original data
+-///                and the projection of principal unto a lower
+-///                dimensional subspace (2D histograms)
+-///      E         Histogram the eigenvalues
+-///      S         Histogram the square of the residues
+-///                (see TPrincipal::SumOfSquareResidues)
+-/// The histograms will be named <name>_<type><number>, where <name>
+-/// is the first argument, <type> is one of X,P,D,E,S, and <number>
++///     - X         Histogram original data
++///     - P         Histogram principal components corresponding to
++///                 original data
++///     - D         Histogram the difference between the original data
++///                 and the projection of principal unto a lower
++///                 dimensional subspace (2D histograms)
++///     - E         Histogram the eigenvalues
++///     - S         Histogram the square of the residues
++///                 (see `TPrincipal::SumOfSquareResiduals`)
++/// The histograms will be named `<name>_<type><number>`, where `<name>`
++/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
+ /// is the variable.
+ 
+ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD: Normalize the covariance matrix
++/// Normalize the covariance matrix
+ 
+ void TPrincipal::MakeNormalised()
+ {
+@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Generate the file <classname>PCA.cxx which contains the
+ /// implementation of two methods:
+-///
++/// ~~~ {.cpp}
+ ///    void <classname>::X2P(Double_t *x, Double *p)
+ ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
+-///
++/// ~~~
+ /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
+-/// respectivly. Please refer to these methods.
++/// respectively. Please refer to these methods.
+ ///
+ /// Further, the public static members:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    <classname>::fgNVariables
+ ///    Double_t <classname>::fgEigenValues[]
+ ///    Double_t <classname>::fgEigenVectors[]
+ ///    Double_t <classname>::fgMeanValues[]
+ ///    Double_t <classname>::fgSigmaValues[]
+-///
++/// ~~~
+ /// are initialized, and assumed to exist. The class declaration is
+ /// assumed to be in <classname>.h and assumed to be provided by the
+ /// user.
+@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
+ /// See TPrincipal::MakeRealCode for a list of options
+ ///
+ /// The minimal class definition is:
+-///
++/// ~~~ {.cpp}
+ ///   class <classname> {
+ ///   public:
+ ///     static Int_t    fgNVariables;
+@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
+ ///     void X2P(Double_t *x, Double_t *p);
+ ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
+ ///   };
+-///
++/// ~~~
+ /// Whether the methods <classname>::X2P and <classname>::P2X should
+ /// be static or not, is up to the user.
+ 
+@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Perform the principal components analysis.
+ /// This is done in several stages in the TMatrix::EigenVectors method:
+-/// * Transform the covariance matrix into a tridiagonal matrix.
+-/// * Find the eigenvalues and vectors of the tridiagonal matrix.
++///  - Transform the covariance matrix into a tridiagonal matrix.
++///  - Find the eigenvalues and vectors of the tridiagonal matrix.
+ 
+ void TPrincipal::MakePrincipals()
+ {
+@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+ /// This is the method that actually generates the code for the
+ /// transformations to and from feature space and pattern space
+ /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
+@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Print the statistics
+ /// Options are
+-///      M            Print mean values of original data
+-///      S            Print sigma values of original data
+-///      E            Print eigenvalues of covariance matrix
+-///      V            Print eigenvectors of covariance matrix
++///  - M            Print mean values of original data
++///  - S            Print sigma values of original data
++///  - E            Print eigenvalues of covariance matrix
++///  - V            Print eigenvectors of covariance matrix
+ /// Default is MSE
+ 
+ void TPrincipal::Print(Option_t *opt) const
+@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+-/// Begin_html
++/// Calculates the sum of the square residuals, that is
++///
++/// \f[
++/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
++/// \f]
++///
++/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
++/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
++/// \f$x_i\f$, the original data; I.e., the square distance to the space
++/// spanned by \f$N\f$ eigenvectors.
+ 
+ void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
+ {
+-   /*
+-    </PRE>
+-    Calculates the sum of the square residuals, that is
+-    <BR><P></P>
+-    <DIV ALIGN="CENTER">
+-
+-    <!-- MATH
+-    \begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}
+-    -->
+-
+-
+-    <IMG
+-    WIDTH="147" HEIGHT="58" BORDER="0"
+-    SRC="gif/principal_img52.gif"
+-    ALT="\begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}">
+-    </DIV>
+-    <BR CLEAR="ALL">
+-    <P></P>
+-    where
+-    <!-- MATH
+-    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
+-    -->
+-    <IMG
+-    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img53.gif"
+-    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
+-    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img54.gif"
+-    ALT="$p_i$"> is the
+-    <IMG
+-    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img55.gif"
+-    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
+-    <IMG
+-    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img56.gif"
+-    ALT="$x_i$">, the original data; I.e., the square distance to the space
+-    spanned by <IMG
+-    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img12.gif"
+-    ALT="$N$"> eigenvectors.
+-    <BR>
+-    <PRE>
+-   */
+-   // End_Html
++
+    if (!x)
+       return;
+ 
+@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculate the principal components from the original data vector
+ /// x, and return it in p.
++///
+ /// It's the users responsibility to make sure that both x and p are
+ /// of the right size (i.e., memory must be allocated for p).
+ 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
new file mode 100644
index 0000000..4a4177b
--- /dev/null
+++ b/root-tvector2-comment.patch
@@ -0,0 +1,13 @@
+diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
+--- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
+@@ -96,7 +96,8 @@
+    TVector2 Rotate (Double_t phi) const;
+ 
+                                         // returns phi angle in the interval [0,2*PI)
+-   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
++   static Double_t Phi_0_2pi(Double_t x);
++
+                                         // returns phi angle in the interval [-PI,PI)
+    static Double_t Phi_mpi_pi(Double_t x);
+ 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
new file mode 100644
index 0000000..f4f3681
--- /dev/null
+++ b/root-type1-embed.patch
@@ -0,0 +1,97 @@
+diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
+--- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
+@@ -30,14 +30,14 @@
+ #ifndef LITTLE_ENDIAN
+ #define LITTLE_ENDIAN 1
+ #endif // LITTLE_ENDIAN
+-#include "Byteswap.h"
+-#define bswap_16(x)   Rbswap_16((x))
+-#define bswap_32(x)   Rbswap_32((x))
+ #else // R__BYTESWAP
+ #ifdef LITTLE_ENDIAN
+ #undef LITTLE_ENDIAN
+ #endif // LITTLE_ENDIAN
+ #endif // R__BYTESWAP
++#include "Byteswap.h"
++#define bswap_16(x)   Rbswap_16((x))
++#define bswap_32(x)   Rbswap_32((x))
+ 
+ // References:
+ //
+@@ -236,29 +236,26 @@
+       if(magic_number[0] == '\200') {
+          // IBM PC format printer font binary
+ 
+-         // FIXME: Maybe the real name can be parsed out of the
+-         // file
+-         font_name = "";
+-
+          struct pfb_segment_header_s segment_header;
+          size_t offset = 0;
+ 
+-         segment_header.type = 0;
++         // The two char elements of struct
++         // pfb_segment_header_s are most likely aligned to
++         // larger than 1 byte boundaries, so copy all the
++         // elements individually
++         segment_header.always_128 = font_data[offset];
++         segment_header.type = font_data[offset + 1];
++
+          while (segment_header.type != TYPE_EOF) {
+-            // The two char elements of struct
+-            // pfb_segment_header_s are most likely aligned to
+-            // larger than 1 byte boundaries, so copy all the
+-            // elements individually
+-            segment_header.always_128 = font_data[offset];
+-            segment_header.type = font_data[offset + 1];
+             memcpy(&segment_header.length, &font_data[offset + 2],
+                    sizeof(unsigned int));
+             offset += sizeof(unsigned int) + 2;
+-#ifdef LITTLE_ENDIAN
++#ifndef LITTLE_ENDIAN
+             segment_header.length =
+             bswap_32(segment_header.length);
+ #endif // LITTLE_ENDIAN
+             char *buffer = new char[segment_header.length];
++            char *fname;
+ 
+             memcpy(buffer, &font_data[offset],
+                    segment_header.length);
+@@ -278,6 +275,26 @@
+                      buffer[segment_header.length - 1] = '\n';
+                   }
+                   ret.append(buffer, segment_header.length);
++
++                  fname = (char*)memmem(buffer, segment_header.length,
++                                        "/FontName", 9);
++                  if (fname) {
++                     fname += 9;
++                     while (fname < buffer + segment_header.length &&
++                            isspace(*fname)) {
++                        fname++;
++                     }
++                     if (fname < buffer + segment_header.length &&
++                         *fname == '/') {
++                        fname++;
++                     }
++                     int len = 0;
++                     while (fname + len < buffer + segment_header.length &&
++                            isgraph(*(fname + len))) {
++                        len++;
++                     }
++                     font_name.assign(fname, len);
++                  }
+                   break;
+                case TYPE_BINARY:
+                   append_asciihex(
+@@ -289,6 +306,9 @@
+             }
+ 
+             delete [] buffer;
++
++            segment_header.always_128 = font_data[offset];
++            segment_header.type = font_data[offset + 1];
+          }
+ 
+          return ret;
diff --git a/root-unuran.patch b/root-unuran.patch
new file mode 100644
index 0000000..0e78176
--- /dev/null
+++ b/root-unuran.patch
@@ -0,0 +1,305 @@
+diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
+--- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
+@@ -0,0 +1,21 @@
++# - Locate Unuran library
++# Defines:
++#
++#  UNURAN_FOUND
++#  UNURAN_INCLUDE_DIR
++#  UNURAN_INCLUDE_DIRS (not cached)
++#  UNURAN_LIBRARIES
++
++find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
++find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
++
++set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
++set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
++
++mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
+@@ -73,6 +73,7 @@
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
++ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
+ ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
+ ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
+ ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -142,6 +142,11 @@
+ set(zliblib ${ZLIB_LIBRARY})
+ set(zlibincdir ${ZLIB_INCLUDE_DIR})
+ 
++set(builtinunuran ${value${builtin_unuran}})
++set(unuranlibdir ${UNURAN_LIBRARY_DIR})
++set(unuranlib ${UNURAN_LIBRARY})
++set(unuranincdir ${UNURAN_INCLUDE_DIR})
++
+ set(buildgl ${value${opengl}})
+ set(opengllibdir ${OPENGL_LIBRARY_DIR})
+ set(openglulib ${OPENGL_glu_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -40,6 +40,16 @@
+   endif()
+ endif()
+ 
++#---Check for Unuran ------------------------------------------------------------------
++if(NOT builtin_unuran)
++  message(STATUS "Looking for Unuran")
++  find_Package(Unuran)
++  if(NOT UNURAN_FOUND)
++    message(STATUS "Unuran not found. Switching on builtin_unuran option")
++    set(builtin_unuran ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Freetype---------------------------------------------------------------
+ if(NOT builtin_freetype)
+   message(STATUS "Looking for Freetype")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
+@@ -121,6 +121,11 @@
+ 
+ BUILTINPCRE    := @builtinpcre@
+ 
++BUILTINUNURAN  := @builtinunuran@
++UNURANLIBDIR   := @unuranlibdir@
++UNURANLIB      := @unuranlib@
++UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
++
+ BUILTINZLIB    := @builtinzlib@
+ ZLIBLIBDIR     := @zliblibdir@
+ ZLIBCLILIB     := @zliblib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
++++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
+@@ -55,6 +55,7 @@
+    enable_builtin_freetype   \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
++   enable_builtin_unuran     \
+    enable_builtin_zlib       \
+    enable_builtin_lzma       \
+    enable_builtin_llvm       \
+@@ -183,6 +184,7 @@
+ enable_builtin_ftgl=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
++enable_builtin_unuran=no
+ enable_builtin_zlib=no
+ enable_builtin_lzma=no
+ enable_builtin_llvm=yes
+@@ -1704,6 +1706,7 @@
+   builtin-freetype   Build included libfreetype, or use system libfreetype
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
++  builtin-unuran     Build included libunuran, or use system libunuran
+   builtin-zlib       Build included libz, or use system libz
+   builtin-lzma       Build included liblzma, or use system liblzma
+   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
+@@ -2046,6 +2049,7 @@
+    enable_builtin_ftgl="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
++   enable_builtin_unuran="yes"
+    enable_builtin_zlib="yes"
+    enable_builtin_lzma="yes"
+    top_builddir=`cygpath -u $top_builddir`
+@@ -3210,6 +3214,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libunuran (builtin or system)
++#
++if test "x$enable_builtin_unuran" = "xno" ; then
++    check_header "unuran.h" "" \
++        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_unuran=yes
++    else
++        unuraninc=$found_hdr
++        unuranincdir=$found_dir
++    fi
++
++    check_library "libunuran" "$enable_shared" "" \
++        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        unuranlib=""
++        unuranlibdir=""
++        enable_builtin_unuran="yes"
++    else
++        unuranlib="$found_lib"
++        unuranlibdir="$found_dir"
++    fi
++
++    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
++        enable_builtin_unuran="yes"
++    fi
++fi
++message "Checking whether to build included unuran"
++result "$enable_builtin_unuran"
++
++######################################################################
++#
+ ### echo %%% Use included zLib or use systems
+ #
+ if test "x$enable_builtin_zlib" = "xno" ; then
+@@ -7720,6 +7756,10 @@
+     -e "s|@top_srcdir@|$top_srcdir|"            \
+     -e "s|@ttffontdir@|$fontdir|"               \
+     -e "s|@tutdir@|$tutdir|"                    \
++    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
++    -e "s|@unuranincdir@|$unuranincdir|"        \
++    -e "s|@unuranlib@|$unuranlib|"              \
++    -e "s|@unuranlibdir@|$unuranlibdir|"        \
+     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
+     -e "s|@xmlincdir@|$xmlincdir|"              \
+     -e "s|@xmllib@|$xmllib|"                    \
+diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
+--- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
+@@ -3,6 +3,9 @@
+ ############################################################################
+ 
+ #---Define package related variables-----------------------------------------------------------------
++
++if(builtin_unuran)
++
+ set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ set(UNR_VERSION "1.8.0-root")
+ set(UNR_TARNAME "unuran-${UNR_VERSION}")
+@@ -62,8 +65,17 @@
+                ${UNR_UNTARDIR}/src/tests/*.c
+                ${UNR_UNTARDIR}/src/uniform/*.c
+                ${UNR_UNTARDIR}/src/urng/*.c )
++set(unrconfig ${UNR_UNTARDIR}/config.h)
++
++else()
++
++include_directories(${UNURAN_INCLUDE_DIRS})
++set(unrsources)
++set(unrconfig)
++
++endif()
+ 
+ ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
+ 
+-ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
++ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
+--- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
+@@ -12,6 +12,8 @@
+ UNURANDIRS   := $(UNURANDIR)/src
+ UNURANDIRI   := $(UNURANDIR)/inc
+ 
++ifeq ($(BUILTINUNURAN),yes)
++
+ UNRVERS      := unuran-1.8.0-root
+ 
+ UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
+@@ -43,15 +45,18 @@
+                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
+ endif
+-UNRO         := $(UNRS:.c=.o)
++UNRFLAGS     := -I$(UNRDIRS)/src
+ 
+-ifeq ($(PLATFORM),win32)
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
+ else
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
++
++UNURANETAG   :=
++UNRCFG       :=
++UNRS         :=
++UNRFLAGS     := $(UNURANINCDIR:%=-I%)
++
+ endif
+ 
+-UNRFLAGS     :=  -I$(UNRDIRS)/src
++UNRO         := $(UNRS:.c=.o)
+ 
+ ##### libUnuran #####
+ UNURANL      := $(MODDIRI)/LinkDef.h
+@@ -84,6 +89,8 @@
+ include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
+ 		cp $< $@
+ 
++ifeq ($(BUILTINUNURAN),yes)
++
+ $(UNURANDEP):   $(UNRCFG)
+ $(UNRS):        $(UNURANETAG)
+ 
+@@ -134,12 +141,14 @@
+ 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
+ 		CFLAGS="$$ACFLAGS");
+ 
++endif
++
+ $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
+                 $(MAINLIBS) $(UNURANLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
+ 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
+ 		   "$(UNURANO) $(UNURANDO)"             \
+-		   "$(UNURANLIBEXTRA) $(UNRO)"
++		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
+ 
+ $(call pcmrule,UNURAN)
+ 	$(noop)
+@@ -158,16 +167,19 @@
+ 
+ clean-$(MODNAME):
+ 		@rm -f $(UNURANO) $(UNURANDO)
++ifeq ($(BUILTINUNURAN),yes)
+ 		-@(if [ -d $(UNRDIRS) ]; then \
+ 			cd $(UNRDIRS); \
+ 			$(MAKE) clean; \
+ 		fi)
++endif
+ 
+ clean::         clean-$(MODNAME)
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
+ 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
++ifeq ($(BUILTINUNURAN),yes)
+ 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
+ ifeq ($(UNURKEEP),yes)
+ 		@mv $(UNRDIRS) $(UNRDIRS).keep
+@@ -177,6 +189,7 @@
+ 		@mv $(UNRDIRS).keep $(UNRDIRS)
+ endif
+ 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
++endif
+ 
+ distclean::     distclean-$(MODNAME)
+ 
+@@ -184,6 +197,7 @@
+ 
+ $(UNURANO): CXXFLAGS += $(UNRFLAGS)
+ 
++ifeq ($(BUILTINUNURAN),yes)
+ ifeq ($(PLATFORM),win32)
+ $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
+ else
+@@ -194,3 +208,4 @@
+ ifeq ($(CC),icc)
+ $(UNRO): CFLAGS += -mp
+ endif
++endif
diff --git a/root-werror.patch b/root-werror.patch
new file mode 100644
index 0000000..06e49f1
--- /dev/null
+++ b/root-werror.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
+@@ -40,7 +40,7 @@
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
+ 
+ #---Do not transform warnings in errors-------------------------------------------------------------
+-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+ #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root.spec b/root.spec
new file mode 100644
index 0000000..1078ad4
--- /dev/null
+++ b/root.spec
@@ -0,0 +1,3462 @@
+%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
+
+# Ruby support not yet ported to root version 6
+%global ruby 0
+
+%global oce 1
+%global pythia8 1
+%global xrootd 1
+
+%if %{?fedora}%{!?fedora:0} >= 20
+# libhdfs is currently only available on intel architectures in Fedora
+%ifarch %{ix86} x86_64
+%global hadoop 1
+%else
+%global hadoop 0
+%endif
+%else
+%global hadoop 0
+%endif
+
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+# Do not create .orig files when patching source
+%global _default_patch_flags --no-backup-if-mismatch
+
+Name:		root
+Version:	6.06.06
+%global libversion %(cut -d. -f 1-2 <<< %{version})
+Release:	3%{?dist}
+Summary:	Numerical data analysis framework
+
+License:	LGPLv2+
+URL:		https://root.cern.ch/
+#		The upstream source is modified to exclude proprietary fonts:
+#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
+#		tar -z -x -f root_v%{version}.source.tar.gz
+#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
+#		tar -J -c -f root-%{version}.tar.xz root-%{version}
+Source0:	%{name}-%{version}.tar.xz
+#		Input data for the tests
+Source1:	%{name}-testfiles.tar.xz
+#		Script to generate above source
+Source2:	%{name}-testfiles.sh
+#		Adapt to gcc's ABI tags
+#		https://github.com/root-mirror/root/pull/124
+Patch0:		%{name}-abitags.patch
+#		Allow running tests
+#		https://github.com/root-mirror/root/pull/130
+Patch1:		%{name}-test-install.patch
+#		Use system fonts
+Patch2:		%{name}-fontconfig.patch
+#		Fix segfault when embedding Type 1 fonts
+#		https://github.com/root-mirror/root/pull/90
+Patch3:		%{name}-type1-embed.patch
+#		Don't link to libjvm (handled properly inside libhdfs)
+Patch4:		%{name}-dont-link-jvm.patch
+#		Remove gcc ABI check
+#		with the abitags patch above it is not needed
+Patch5:		%{name}-no-abi-check.patch
+#		Public header #includes private header
+#		https://github.com/root-mirror/root/pull/88
+Patch6:		%{name}-private-public.patch
+#		Fix problems with the cmake configuration
+Patch7:		%{name}-broken-cmake-config.patch
+#		Missing stuff in the cmake configuration
+Patch8:		%{name}-missing-cmake-config.patch
+#		Fix broken deprecation check (configure)
+Patch9:		%{name}-deprecated-options.patch
+#		Only link to libgfortranbegin.a if it exists (configure)
+Patch10:	%{name}-libgfortranbegin.patch
+#		Make sure the removal of -Werror doesn't do more than intended
+Patch11:	%{name}-werror.patch
+#		Properly remove -Wall (must also remove Werror=*)
+Patch12:	%{name}-compiledata.patch
+#		Don't overwrite FFLAGS
+Patch13:	%{name}-fflags.patch
+#		Use system unuran
+Patch14:	%{name}-unuran.patch
+#		Use systme gl2ps
+Patch15:	%{name}-gl2ps.patch
+#		More CMAKE_Fortran_FLAGS case issues
+Patch16:	%{name}-more-fflags.patch
+#		Use the same soname for cmake and configure
+Patch17:	%{name}-soname.patch
+#		Save memory during build
+Patch18:	%{name}-save-memory.patch
+#		Fix build configuration for ppc64/ppc64le
+Patch19:	%{name}-ppc64.patch
+#		Fix build configuration for ARM
+Patch20:	%{name}-arm.patch
+#		Fix build configuration for s390/s390x
+Patch21:	%{name}-s390x.patch
+#		Always build the bundled llvm as static libraries
+Patch22:	%{name}-llvm-static.patch
+
+#		Documentation fixes
+
+#		Fixes for doxygen parsing issues:
+#		- warning: Found ';' while parsing initializer list
+#		- warning: Illegal member name found
+#		- warning: no matching file member found for ClassImp()
+#		- warning: documented symbol 'X' was not declared or defined
+Patch23:	%{name}-doxyfile.patch
+#		Improvements to the doxygen filter
+Patch24:	%{name}-dox-filter.patch
+#		Align macros so the doxygen filter works
+Patch25:	%{name}-macro-align.patch
+#		Fix broken ~~~ for doxygen
+#		https://github.com/root-mirror/root/pull/127
+Patch26:	%{name}-tildes.patch
+#		Convert old latex markup to doxygen
+Patch27:	%{name}-latex-markup.patch
+#		Remove some old html markup
+Patch28:	%{name}-html-markup.patch
+#		Fix broken links (cernlib, clhep, geant)
+Patch29:	%{name}-links.patch
+#		Remove duplicated comment
+Patch30:	%{name}-tvector2-comment.patch
+#		Remove links to tutorial macro results
+Patch31:	%{name}-see-macro-output.patch
+#		Fix TMath doxygen
+Patch32:	%{name}-tmath-doc.patch
+#		Fix cernlib doxygen
+Patch33:	%{name}-cernlib-doc.patch
+#		Backported doxygen updates for TPrincipal class
+Patch34:	%{name}-tprincipal-doc.patch
+#		Don't run gui macros
+Patch35:	%{name}-avoid-gui-crash.patch
+#		Doxygen warnings
+Patch36:	%{name}-doxygen-warnings.patch
+
+#		Test fixes
+
+#		User files in source tree during tests
+Patch37:	%{name}-template-files.patch
+#		Use cache read option
+Patch38:	%{name}-cache-test.patch
+#		Fixes for tests on ix86
+Patch39:	%{name}-32bit.patch
+#		Fixes for stressGraphics.ref
+Patch40:	%{name}-stressgraphics.patch
+#		Don't download testdata
+Patch41:	%{name}-no-testdata.patch
+#		Avoid using std::bind with lambdas (fixed upstream)
+Patch42:	%{name}-avoid-std-bind-lambda.patch
+
+#		s390 is not supported by cling: "error: unknown target
+#		triple 's390-ibm-linux', please use -triple or -arch"
+ExcludeArch:	s390
+#		ppc/ppc64/ppc64le does not yet work
+#		https://sft.its.cern.ch/jira/browse/ROOT-6434
+#		https://sft.its.cern.ch/jira/browse/ROOT-7314
+ExcludeArch:	ppc %{power64}
+
+BuildRequires:	cmake
+BuildRequires:	libX11-devel
+BuildRequires:	libXpm-devel
+BuildRequires:	libXft-devel
+BuildRequires:	libXext-devel
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel
+BuildRequires:	fcgi-devel
+BuildRequires:	ftgl-devel
+BuildRequires:	glew-devel
+BuildRequires:	gl2ps-devel
+BuildRequires:	pcre-devel
+BuildRequires:	zlib-devel
+BuildRequires:	xz-devel
+BuildRequires:	libAfterImage-devel >= 1.20
+BuildRequires:	ncurses-devel
+BuildRequires:	avahi-compat-libdns_sd-devel
+BuildRequires:	avahi-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	fftw-devel
+BuildRequires:	gsl-devel
+BuildRequires:	unuran-devel
+BuildRequires:	krb5-devel
+BuildRequires:	krb5-workstation
+BuildRequires:	openldap-devel
+BuildRequires:	mysql-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	unixODBC-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	mesa-libGLU-devel
+BuildRequires:	postgresql-devel
+BuildRequires:	python-devel
+%if %{?fedora}%{!?fedora:0} >= 15
+BuildRequires:	python3-devel
+%global python3pkg python3
+%endif
+%if %{?rhel}%{!?rhel:0} == 7
+BuildRequires:	python34-devel
+%global python3pkg python34
+%endif
+BuildRequires:	qt4-devel
+%if %{ruby}
+BuildRequires:	ruby
+BuildRequires:	ruby-devel
+%endif
+BuildRequires:	openssl-devel
+BuildRequires:	globus-gss-assist-devel
+BuildRequires:	globus-gsi-credential-devel
+BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	dcap-devel
+BuildRequires:	dpm-devel
+%if %{xrootd}
+BuildRequires:	xrootd-client-devel >= 1:3.3.5
+BuildRequires:	xrootd-private-devel >= 1:3.3.5
+%endif
+BuildRequires:	cfitsio-devel
+BuildRequires:	davix-devel >= 0.2.8
+BuildRequires:	gfal2-devel
+BuildRequires:	srm-ifce-devel
+%if %{hadoop}
+BuildRequires:	hadoop-devel
+%endif
+%if %{oce}
+BuildRequires:	OCE-devel
+%endif
+BuildRequires:	R-Rcpp-devel
+BuildRequires:	R-RInside-devel
+BuildRequires:	readline-devel
+BuildRequires:	tbb-devel
+BuildRequires:	emacs
+BuildRequires:	emacs-el
+BuildRequires:	gcc-c++
+BuildRequires:	gcc-gfortran
+BuildRequires:	graphviz-devel
+BuildRequires:	expat-devel
+%if %{pythia8}
+BuildRequires:	pythia8-devel >= 8.1.80
+%endif
+BuildRequires:	numpy
+BuildRequires:	dos2unix
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	perl-generators
+#		Some of the tests call lsb_release
+BuildRequires:	redhat-lsb-core
+BuildRequires:	font(freesans)
+BuildRequires:	font(freeserif)
+BuildRequires:	font(freemono)
+#		Provides "symbol" and "dingbats"
+BuildRequires:	urw-fonts
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
+BuildRequires:	font(droidsansfallback)
+%endif
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	hicolor-icon-theme
+Requires:	emacs-filesystem >= %{_emacs_version}
+Provides:	emacs-%{name} = %{version}-%{release}
+Provides:	emacs-%{name}-el = %{version}-%{release}
+Obsoletes:	emacs-%{name} < 5.34.28
+Obsoletes:	emacs-%{name}-el < 5.34.28
+
+%description
+The ROOT system provides a set of object oriented frameworks with all
+the functionality needed to handle and analyze large amounts of data
+in a very efficient way. Having the data defined as a set of objects,
+specialized storage methods are used to get direct access to the
+separate attributes of the selected objects, without having to touch
+the bulk of the data. Included are histograming methods in an
+arbitrary number of dimensions, curve fitting, function evaluation,
+minimization, graphics and visualization classes to allow the easy
+setup of an analysis system that can query and process the data
+interactively or in batch mode, as well as a general parallel
+processing framework, PROOF, that can considerably speed up an
+analysis.
+
+Thanks to the built-in C++ interpreter cling, the command, the
+scripting and the programming language are all C++. The interpreter
+allows for fast prototyping of the macros since it removes the, time
+consuming, compile/link cycle. It also provides a good environment to
+learn C++. If more performance is needed the interactively developed
+macros can be compiled using a C++ compiler via a machine independent
+transparent compiler interface called ACliC.
+
+The system has been designed in such a way that it can query its
+databases in parallel on clusters of workstations or many-core
+machines. ROOT is an open system that can be dynamically extended by
+linking external libraries. This makes ROOT a premier platform on
+which to build data acquisition, simulation and data analysis systems.
+
+%package icons
+Summary:	ROOT icon collection
+BuildArch:	noarch
+Requires:	%{name}-core = %{version}-%{release}
+
+%description icons
+This package contains icons used by the ROOT GUI.
+
+%package fonts
+Summary:	ROOT font collection
+BuildArch:	noarch
+%if %{?rhel}%{!?rhel:0}
+#		STIX version 0.9 and Driod Sans Fallback
+License:	OFL and ASL 2.0
+%else
+#		STIX version 0.9 only
+License:	OFL
+%endif
+Requires:	%{name}-core = %{version}-%{release}
+
+%description fonts
+This package contains fonts used by ROOT that are not available in Fedora.
+In particular it contains STIX version 0.9 that is used by TMathText.
+%if %{?rhel}%{!?rhel:0}
+For EPEL it also provides the Google Droid Sans Fallback font.
+%endif
+
+%package doc
+Summary:	Documentation for the ROOT system
+BuildArch:	noarch
+License:	LGPLv2+ and GPLv2+ and BSD
+Requires:	mathjax
+
+%description doc
+This package contains the automatically generated ROOT class
+documentation.
+
+%package tutorial
+Summary:	ROOT tutorial scripts and test suite
+BuildArch:	noarch
+Requires:	%{name} = %{version}-%{release}
+
+%description tutorial
+This package contains the tutorial scripts and test suite for ROOT.
+
+%package core
+Summary:	ROOT core libraries
+License:	LGPLv2+ and BSD
+Requires:	%{name}-fonts = %{version}-%{release}
+Requires:	%{name}-icons = %{version}-%{release}
+#		Dynamic dependencies
+Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
+Requires:	xorg-x11-fonts-ISO8859-1-75dpi
+Requires:	font(freesans)
+Requires:	font(freeserif)
+Requires:	font(freemono)
+#		Provides "symbol" and "dingbats"
+Requires:	urw-fonts
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
+Requires:	font(droidsansfallback)
+%endif
+%if %{ruby} == 0
+Obsoletes:	%{name}-ruby < 6.00.00
+%endif
+%if %{hadoop} == 0
+Obsoletes:	%{name}-io-hdfs < 6.06.04-2
+%endif
+
+%description core
+This package contains the core libraries used by ROOT: libCore, libNew,
+libRint and libThread.
+
+%package multiproc
+Summary:	Multi-processor support for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description multiproc
+This package provides ROOT's multi-processor support library: libMultiProc.
+
+%package cling
+Summary:	Cling C++ interpreter
+License:	NCSA and (NCSA or LGPLv2+)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+#		Root's cling interpreter uses a particular git commit of
+#		llvm and clang with application specific changes. It does
+#		not work with the system libraries. The bundled llvm and
+#		clang are compiled using -fvisibility=hidden, and are not
+#		visible outside of the libCling module.
+Requires:	gcc-c++
+Requires:	redhat-rpm-config
+Provides:	bundled(clang-libs)
+Provides:	bundled(llvm-libs)
+Obsoletes:	%{name}-cint7 < 5.26.00c
+Obsoletes:	%{name}-cint < 6.00.00
+Obsoletes:	%{name}-cintex < 6.00.00
+Obsoletes:	%{name}-reflex < 6.00.00
+
+%description cling
+Cling is an interactive C++ interpreter, built on top of Clang and
+LLVM compiler infrastructure.
+
+%package proofd
+Summary:	Parallel ROOT Facility - distributed, parallel computing
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(post):		chkconfig
+Requires(postun):	initscripts
+
+%description proofd
+This package contains the PROOF server. Proofd is the core daemon of
+the PROOF (Parallel ROOT Facility) system for distributed parallel
+computing. Installing this package on a machine makes it possible
+for the machine to participate in a parallel computing farm (cluster
+or via the Internet), either as a master or a slave, using a
+transparent interface.
+
+%package rootd
+Summary:	ROOT remote file server
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(post):		chkconfig
+Requires(postun):	initscripts
+
+%description rootd
+This package contains the ROOT file server. Rootd is a server for ROOT
+files, serving files over the Internet. Using this daemon, you can
+access files on the machine from anywhere on the Internet, using a
+transparent interface.
+
+%package python
+Summary:	Python extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description python
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
+%package %{python3pkg}
+Summary:	Python extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description %{python3pkg}
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
+%if %{ruby}
+%package ruby
+Summary:	Ruby extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Provides:	ruby(libRuby) = %{version}
+
+%description ruby
+This package contains the Ruby extension for ROOT. The interface
+goes both ways - that is, you can call ROOT functions from Ruby, and
+invoke the Ruby interpreter from ROOT.
+%endif
+
+%package r
+Summary:	R interface for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description r
+ROOT R is an interface in ROOT to call R functions using an R C++
+interface. This interface opens the possibility in ROOT to use the
+very large set of mathematical and statistical tools provided by R.
+With ROOT R you can perform a conversion from ROOT's C++ objects to
+R's objects, transform the returned R objects into ROOT's C++ objects,
+then the R functionality can be used directly for statistical studies
+in ROOT.
+
+%package r-tools
+Summary:	R Tools
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+
+%description r-tools
+This package contains a minimizer module for ROOT that uses the ROOT
+R interface.
+
+%package genetic
+Summary:	Genetic algorithms for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description genetic
+This package contains a genetic minimizer module for ROOT.
+
+%package geom
+Summary:	Geometry library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description geom
+This package contains a library for defining geometries in ROOT.
+
+%package gdml
+Summary:	GDML import/export for ROOT geometries
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+
+%description gdml
+This package contains an import/export module for ROOT geometries.
+
+%if %{oce}
+%package geocad
+Summary:	OpenCascade import/export for ROOT geometries
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+
+%description geocad
+This package contains an import/export module for ROOT geometries.
+%endif
+
+%package graf
+Summary:	2D graphics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf
+This package contains the 2-dimensional graphics library for ROOT.
+
+%package graf-asimage
+Summary:	AfterImage graphics renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf-asimage
+This package contains the AfterImage renderer for ROOT, which allows
+you to store output graphics in many formats, including JPEG, PNG and
+TIFF.
+
+%package graf-fitsio
+Summary:	ROOT interface for the Flexible Image Transport System (FITS)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description graf-fitsio
+This package contains a library for using the Flexible Image Transport
+System (FITS) data format in root.
+
+%package graf-gpad
+Summary:	Canvas and pad library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
+
+%description graf-gpad
+This package contains a library for canvas and pad manipulations.
+
+%package graf-gviz
+Summary:	Graphviz 2D library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description graf-gviz
+This package contains the 2-dimensional graphviz library for ROOT.
+
+%package graf-postscript
+Summary:	Postscript/PDF renderer library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+
+%description graf-postscript
+This package contains a library for ROOT, which allows rendering
+postscript and PDF output.
+
+%package graf-qt
+Summary:	Qt renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+
+%description graf-qt
+This package contains the Qt renderer for ROOT.
+
+%package graf-x11
+Summary:	X window system renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+
+%description graf-x11
+This package contains the X11 renderer for ROOT, which allows using an
+X display for showing graphics.
+
+%package graf3d
+Summary:	Basic 3D shapes library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf3d
+This library contains the basic 3D shapes and classes for ROOT. For
+a more full-blown geometry library, see the root-geom package.
+
+%package graf3d-eve
+Summary:	Event display library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description graf3d-eve
+This package contains a library for defining event displays in ROOT.
+
+%package graf3d-gl
+Summary:	GL renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description graf3d-gl
+This package contains the GL renderer for ROOT. This library provides
+3D rendering of volumes and shapes defined in ROOT, as well as 3D
+rendering of histograms, and similar. Included is also a high quality
+3D viewer for ROOT defined geometries.
+
+%package graf3d-gviz3d
+Summary:	Graphviz 3D library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+
+%description graf3d-gviz3d
+This package contains the 3-dimensional graphviz library for ROOT.
+
+%package graf3d-x3d
+Summary:	X 3D renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+
+%description graf3d-x3d
+This package contains the X 3D renderer for ROOT. This library provides
+3D rendering of volumes and shapes defined in ROOT. Included is also
+a low quality 3D viewer for ROOT defined geometries.
+
+%package gui
+Summary:	GUI library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+#		Dynamic dependencies
+Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+
+%description gui
+This package contains a library for defining graphical user interfaces.
+
+%package gui-fitpanel
+Summary:	GUI element for fits in ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description gui-fitpanel
+This package contains a library to show a pop-up dialog when fitting
+various kinds of data.
+
+%package gui-ged
+Summary:	GUI element for editing various ROOT objects
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description gui-ged
+This package contains a library to show a pop-up window for editing
+various ROOT objects.
+
+%package guibuilder
+Summary:	GUI editor library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description guibuilder
+This package contains a library for editing graphical user interfaces
+in ROOT.
+
+%package gui-qt
+Summary:	Qt GUI for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+
+%description gui-qt
+This package contains the Qt GUI for ROOT.
+
+%package gui-recorder
+Summary:	Interface for recording and replaying events in ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description gui-recorder
+This library provides interface for recording and replaying events in ROOT.
+Recorded events are:
+ - Commands typed by user in command line ('new TCanvas')
+ - GUI events (mouse movement, button clicks, ...)
+All the recorded events from one session are stored in one TFile
+and can be replayed again anytime.
+
+%package hbook
+Summary:	Hbook library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description hbook
+This package contains the Hbook library for ROOT, allowing you to
+access legacy Hbook files (NTuples and Histograms from PAW).
+
+%package hist
+Summary:	Histogram library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
+
+%description hist
+This package contains a library for histogramming in ROOT.
+
+%package hist-painter
+Summary:	Histogram painter plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description hist-painter
+This package contains a painter of histograms for ROOT.
+
+%package spectrum
+Summary:	Spectra analysis library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description spectrum
+This package contains the Spectrum library for ROOT.
+
+%package spectrum-painter
+Summary:	Spectrum painter plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description spectrum-painter
+This package contains a painter of spectra for ROOT.
+
+%package hist-factory
+Summary:	RooFit PDFs from ROOT histograms
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description hist-factory
+Create RooFit probability density functions from ROOT histograms.
+
+%package html
+Summary:	HTML documentation generator for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	graphviz
+
+%description html
+This package contains classes to automatically extract documentation
+from marked up sources.
+
+%package io
+Summary:	Input/output of ROOT objects
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description io
+This package provides I/O routines for ROOT objects.
+
+%package io-dcache
+Summary:	dCache input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-dcache
+This package contains the dCache extension for ROOT.
+
+%package io-gfal
+Summary:	Grid File Access Library input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-gfal
+This package contains the Grid File Access Library extension for ROOT.
+
+%if %{hadoop}
+%package io-hdfs
+Summary:	Hadoop File System input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-hdfs
+This package contains the Hadoop File System extension for ROOT.
+%endif
+
+%package io-rfio
+Summary:	Remote File input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-rfio
+This package contains the Remote File IO extension for ROOT.
+
+%package io-sql
+Summary:	SQL input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description io-sql
+This package contains the SQL extension for ROOT, that allows
+transparent access to files data via an SQL database, using ROOT's
+TFile interface.
+
+%package io-xml
+Summary:	XML reader library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-xml
+This package contains the XML reader library for ROOT.
+
+%package foam
+Summary:	A Compact Version of the Cellular Event Generator
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description foam
+The general-purpose self-adapting Monte Carlo (MC) event
+generator/simulator mFOAM (standing for mini-FOAM) is a new compact
+version of the FOAM program, with a slightly limited functionality
+with respect to its parent version. On the other hand, mFOAM is
+easier to use for the average user.
+
+%package fftw
+Summary:	FFTW library for ROOT
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description fftw
+This package contains the Fast Fourier Transform extension for ROOT.
+It uses the very fast fftw (version 3) library.
+
+%package fumili
+Summary:	Fumili library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description fumili
+This package contains the fumili library for ROOT. This provides an
+alternative fitting algorithm for ROOT.
+
+%package genvector
+Summary:	Generalized vector library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description genvector
+This package contains the Genvector library for ROOT. This provides
+a generalized vector library.
+
+%package mathcore
+Summary:	Core mathematics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+
+%description mathcore
+This package contains the MathCore library for ROOT.
+
+%package mathmore
+Summary:	GSL interface library for ROOT
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description mathmore
+This package contains the MathMore library for ROOT. This provides
+a partial GNU Scientific Library interface for ROOT.
+While the rest of root is licensed under LGPLv2+ this optional library
+is licensed under GPLv2+ due to its use of GSL.
+
+%package matrix
+Summary:	Matrix library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description matrix
+This package contains the Matrix library for ROOT.
+
+%package minuit
+Summary:	Minuit library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description minuit
+This package contains the MINUIT library for ROOT. This provides a
+fitting algorithm for ROOT.
+
+%package minuit2
+Summary:	Minuit version 2 library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description minuit2
+This package contains the MINUIT version 2 library for ROOT. This
+provides an fitting algorithm for ROOT.
+
+%package mlp
+Summary:	Multi-layer perceptron extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description mlp
+This package contains the mlp library for ROOT. This library provides
+a multi-layer perceptron neural network package for ROOT.
+
+%package physics
+Summary:	Physics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description physics
+This package contains the physics library for ROOT.
+
+%package quadp
+Summary:	QuadP library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description quadp
+This package contains the QuadP library for ROOT. This provides the a
+framework in which to do Quadratic Programming. The quadratic
+programming problem involves minimization of a quadratic function
+subject to linear constraints.
+
+%package smatrix
+Summary:	Sparse matrix library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description smatrix
+This package contains the Smatrix library for ROOT.
+
+%package splot
+Summary:	Splot library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description splot
+A common method used in High Energy Physics to perform measurements
+is the maximum Likelihood method, exploiting discriminating variables
+to disentangle signal from background. The crucial point for such an
+analysis to be reliable is to use an exhaustive list of sources of
+events combined with an accurate description of all the Probability
+Density Functions (PDF).
+
+To assess the validity of the fit, a convincing quality check is to
+explore further the data sample by examining the distributions of
+control variables. A control variable can be obtained for instance by
+removing one of the discriminating variables before performing again
+the maximum Likelihood fit: this removed variable is a control
+variable. The expected distribution of this control variable, for
+signal, is to be compared to the one extracted, for signal, from the
+data sample. In order to be able to do so, one must be able to unfold
+from the distribution of the whole data sample.
+
+The SPlot method allows to reconstruct the distributions for the
+control variable, independently for each of the various sources of
+events, without making use of any a priori knowledge on this
+variable. The aim is thus to use the knowledge available for the
+discriminating variables to infer the behavior of the individual
+sources of events with respect to the control variable.
+
+SPlot is optimal if the control variable is uncorrelated with the
+discriminating variables.
+
+%package unuran
+Summary:	Random number generator library
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description unuran
+Contains universal (also called automatic or black-box) algorithms
+that can generate random numbers from large classes of continuous or
+discrete distributions, and also from practically all standard
+distributions.
+
+To generate random numbers the user must supply some information
+about the desired distribution, especially a C-function that computes
+the density and - depending on the chosen methods - some additional
+information (like the borders of the domain, the mode, the derivative
+of the density ...). After a user has given this information an
+init-program computes all tables and constants necessary for the
+random variate generation. The sample program can then generate
+variates from the desired distribution.
+
+%package vdt
+Summary:	VDT mathematical library
+BuildArch:	noarch
+
+%description vdt
+VDT is a library of mathematical functions implemented in double and
+single precision. The implementation is fast and with the aid of
+modern compilers (e.g. gcc 4.7) vectorizable.
+
+%package memstat
+Summary:	Memory statistics tool for use with ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description memstat
+This package contains the memory statistics tool for debugging memory
+leaks and such.
+
+%package table
+Summary:	Table library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description table
+This package contains the Table library for ROOT.
+
+%package montecarlo-eg
+Summary:	Event generator library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description montecarlo-eg
+This package contains an event generator library for ROOT.
+
+%if %{pythia8}
+%package montecarlo-pythia8
+Summary:	Pythia version 8 plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+
+%description montecarlo-pythia8
+This package contains the Pythia version 8 plug-in for ROOT. This
+package provide the ROOT user with transparent interface to the Pythia
+(version 8) event generators for hadronic interactions. If the term
+"hadronic" does not ring any bells, this package is not for you.
+%endif
+
+%package montecarlo-vmc
+Summary:	Virtual Monte-Carlo (simulation) library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+
+%description montecarlo-vmc
+This package contains the VMC library for ROOT.
+
+%package net
+Summary:	Net library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description net
+This package contains the ROOT networking library.
+
+%package net-rpdutils
+Summary:	Authentication utilities used by rootd and proofd
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-rpdutils
+This package contains authentication utilities used by rootd and proofd.
+
+%package net-bonjour
+Summary:	Bonjour extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-bonjour
+This package contains a bonjour extension for ROOT.
+
+%package net-auth
+Summary:	Authentication extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description net-auth
+This package contains the basic authentication algorithms used by ROOT.
+
+%package net-davix
+Summary:	Davix extension for ROOT
+Requires:	davix-libs%{?_isa} >= 0.2.8
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description net-davix
+This package contains the davix extension for ROOT, that provides
+access to http based storage such as webdav and S3.
+
+%package net-globus
+Summary:	Globus extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
+Requires:	globus-proxy-utils
+
+%description net-globus
+This package contains the Globus extension for ROOT, that allows
+authentication and authorization against Globus.
+
+%package net-krb5
+Summary:	Kerberos (version 5) extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
+Requires:	krb5-workstation
+
+%description net-krb5
+This package contains the Kerberos (version 5) extension for ROOT, that
+allows authentication and authorization using Kerberos tokens.
+
+%package net-ldap
+Summary:	LDAP extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-ldap
+This package contains the LDAP extension for ROOT. This gives you
+access to LDAP directories via ROOT.
+
+%package net-http
+Summary:	HTTP server extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description net-http
+This package contains the HTTP server extension for ROOT. It provides
+an http interface to arbitrary ROOT applications.
+
+%if %{xrootd}
+%package netx
+Summary:	NetX extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description netx
+This package contains the NetX extension for ROOT, i.e. a client for
+the xrootd server. Both the old (NetX) and the new (NetXNG) version are
+provided.
+%endif
+
+%package proof
+Summary:	PROOF extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+Obsoletes:	%{name}-clarens < 5.34.01
+Obsoletes:	%{name}-peac < 5.34.01
+
+%description proof
+This package contains the proof extension for ROOT. This provides a
+client to use in a PROOF environment.
+
+%package proof-bench
+Summary:	PROOF benchmarking
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description proof-bench
+This package contains the steering class for PROOF benchmarks.
+
+%package proof-pq2
+Summary:	PROOF Quick Query (pq2)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+
+%description proof-pq2
+Shell-based interface to the PROOF dataset handling.
+
+%package proof-sessionviewer
+Summary:	GUI to browse an interactive PROOF session
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description proof-sessionviewer
+This package contains a library for browsing an interactive PROOF
+session in ROOT.
+
+%if %{xrootd}
+%package xproof
+Summary:	XPROOF extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires:	xrootd-server%{?_isa}
+
+%description xproof
+This package contains the xproof extension for ROOT. This provides a
+client to be used in a PROOF environment.
+%endif
+
+%package roofit
+Summary:	ROOT extension for modeling expected distributions
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description roofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+%package sql-mysql
+Summary:	MySQL client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-mysql
+This package contains the MySQL plugin for ROOT. This plugin
+provides a thin client (interface) to MySQL servers. Using this
+client, one can obtain information from a MySQL database into the
+ROOT environment.
+
+%package sql-odbc
+Summary:	ODBC plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-odbc
+This package contains the ODBC (Open DataBase Connectivity) plugin
+for ROOT, that allows transparent access to any kind of database that
+supports the ODBC protocol.
+
+%package sql-sqlite
+Summary:	Sqlite client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-sqlite
+This package contains the sqlite plugin for ROOT. This plugin
+provides a thin client (interface) to sqlite servers. Using this
+client, one can obtain information from a sqlite database into the
+ROOT environment.
+
+%package sql-pgsql
+Summary:	PostgreSQL client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-pgsql
+This package contains the PostGreSQL plugin for ROOT. This plugin
+provides a thin client (interface) to PostGreSQL servers. Using this
+client, one can obtain information from a PostGreSQL database into the
+ROOT environment.
+
+%package tmva
+Summary:	Toolkit for multivariate data analysis
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description tmva
+The Toolkit for Multivariate Analysis (TMVA) provides a
+ROOT-integrated environment for the parallel processing and
+evaluation of MVA techniques to discriminate signal from background
+samples. It presently includes (ranked by complexity):
+
+  * Rectangular cut optimization
+  * Correlated likelihood estimator (PDE approach)
+  * Multi-dimensional likelihood estimator (PDE - range-search approach)
+  * Fisher (and Mahalanobis) discriminant
+  * H-Matrix (chi-squared) estimator
+  * Artificial Neural Network (two different implementations)
+  * Boosted Decision Trees
+
+The TMVA package includes an implementation for each of these
+discrimination techniques, their training and testing (performance
+evaluation). In addition all these methods can be tested in parallel,
+and hence their performance on a particular data set may easily be
+compared.
+
+%package tmva-python
+Summary:	Toolkit for multivariate data analysis (Python)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-python
+Python integration with TMVA.
+
+%package tmva-r
+Summary:	Toolkit for multivariate data analysis (R)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-r
+R integration with TMVA.
+
+%package tmva-gui
+Summary:	Toolkit for multivariate data analysis GUI
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
+
+%description tmva-gui
+GUI for the Toolkit for Multivariate Analysis (TMVA)
+
+%package tree
+Summary:	Tree library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description tree
+This package contains the Tree library for ROOT.
+
+%package tree-player
+Summary:	Library to loop over a ROOT tree
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description tree-player
+This package contains a plugin to loop over a ROOT tree.
+
+%package tree-viewer
+Summary:	GUI to browse a ROOT tree
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description tree-viewer
+This package contains a plugin for browsing a ROOT tree in ROOT.
+
+%package cli
+Summary:	ROOT command line utilities
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+
+%description cli
+The ROOT command line utilities is a set of scripts for common tasks
+written in python.
+
+%package notebook
+Summary:	ROOT as an IPython Notebook
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-rootaas = %{version}-%{release}
+Requires:	/usr/bin/ipython
+
+%description notebook
+ROOT as an IPython Notebook.
+
+%package rootaas
+Summary:	ROOT as a Service
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+Requires:	python-ipython-console
+
+%description rootaas
+ROOT as a Service - the IPython kernel for the ROOT notebook.
+
+%prep
+%setup -q -a 1
+
+# Convert from mac line terminators (and remove trailing spaces)
+mac2unix math/smatrix/doc/SMatrixClass.html
+sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
+mac2unix math/smatrix/doc/SVector.html
+sed 's! *$!!' -i math/smatrix/doc/SVector.html
+
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+
+# Remove bundled sources in order to be sure they are not used
+#  * afterimage
+rm -rf graf2d/asimage/src/libAfterImage
+#  * ftgl
+rm -rf graf3d/ftgl/src graf3d/ftgl/inc
+#  * freetype
+rm -rf graf2d/freetype/src
+#  * glew
+rm -rf graf3d/glew/src graf3d/glew/inc
+#  * pcre
+rm -rf core/pcre/src
+#  * zlib
+rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
+#  * lzma
+rm -rf core/lzma/src/*.tar.gz
+#  * gl2ps
+rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
+#  * unuran
+rm -rf math/unuran/src/*.tar.gz
+#  * xrootd-private-devel headers
+rm -rf proof/xrdinc
+#  * x11 extension headers
+rm -rf graf2d/x11/inc/X11
+#  * mathjax
+rm -rf documentation/doxygen/mathjax.tar.gz
+sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
+sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
+    -i documentation/doxygen/Doxyfile
+%if %{?fedora}%{!?fedora:0} >= 24
+#  * string_view
+rm core/metautils/inc/libcpp_string_view.h \
+   core/metautils/inc/RWrap_libcpp_string_view.h
+%endif
+
+# Remove bundled fonts provided by the OS distributions
+%if %{?fedora}%{!?fedora:0} >= 11
+rm fonts/DroidSansFallback.ttf
+%endif
+
+# Remove unsupported man page macros
+sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
+
+# Build PyROOT for python 3
+cp -pr bindings/pyroot bindings/python
+
+%build
+unset QTDIR
+unset QTLIB
+unset QTINC
+
+mkdir builddir
+pushd builddir
+
+# Avoid overlinking (this used to be the default with the old configure script)
+LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
+
+%ifarch s390 s390x
+# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
+%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
+%endif
+
+%ifarch ppc %{power64} s390 s390x
+# On some architectures JIT compilation fails if the stack protector is used
+# https://llvm.org/bugs/show_bug.cgi?id=22248
+# https://llvm.org/bugs/show_bug.cgi?id=26226
+# IncrementalExecutor::executeFunction:
+#   symbol '__stack_chk_guard' unresolved while linking
+%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
+%endif
+
+%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
+       -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
+       -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
+       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
+       -Dgnuinstall:BOOL=ON \
+       -Dbuiltin_afterimage:BOOL=OFF \
+       -Dbuiltin_cfitsio:BOOL=OFF \
+       -Dbuiltin_davix:BOOL=OFF \
+       -Dbuiltin_fftw3:BOOL=OFF \
+       -Dbuiltin_freetype:BOOL=OFF \
+       -Dbuiltin_ftgl:BOOL=OFF \
+       -Dbuiltin_gl2ps:BOOL=OFF \
+       -Dbuiltin_glew:BOOL=OFF \
+       -Dbuiltin_gsl:BOOL=OFF \
+       -Dbuiltin_llvm:BOOL=ON \
+       -Dbuiltin_lzma:BOOL=OFF \
+       -Dbuiltin_openssl:BOOL=OFF \
+       -Dbuiltin_pcre:BOOL=OFF \
+       -Dbuiltin_tbb:BOOL=OFF \
+       -Dbuiltin_unuran:BOOL=OFF \
+       -Dbuiltin_xrootd:BOOL=OFF \
+       -Dbuiltin_zlib:BOOL=OFF \
+       -Dafdsmgrd:BOOL=OFF \
+       -Dafs:BOOL=OFF \
+       -Dalien:BOOL=OFF \
+       -Dasimage:BOOL=ON \
+       -Dastiff:BOOL=ON \
+       -Dbonjour:BOOL=ON \
+       -Dcastor:BOOL=OFF \
+       -Dccache:BOOL=OFF \
+       -Dchirp:BOOL=OFF \
+       -Dcling:BOOL=ON \
+       -Dcocoa:BOOL=OFF \
+%if %{?fedora}%{!?fedora:0} >= 24
+       -Dcxx14:BOOL=ON \
+%else
+       -Dcxx14:BOOL=OFF \
+%endif
+       -Ddavix:BOOL=ON \
+       -Ddcache:BOOL=ON \
+       -Dexceptions:BOOL=ON \
+       -Dexplicitlink:BOOL=ON \
+       -Dfftw3:BOOL=ON \
+       -Dfitsio:BOOL=ON \
+       -Dfortran:BOOL=ON \
+       -Dgdml:BOOL=ON \
+       -Dgenvector:BOOL=ON \
+%if %{oce}
+       -Dgeocad:BOOL=ON \
+%else
+       -Dgeocad:BOOL=OFF \
+%endif
+       -Dgfal:BOOL=ON \
+       -Dglite:BOOL=OFF \
+       -Dglobus:BOOL=ON \
+       -Dgsl_shared:BOOL=ON \
+       -Dgviz:BOOL=ON \
+%if %{hadoop}
+       -Dhdfs:BOOL=ON \
+%else
+       -Dhdfs:BOOL=OFF \
+%endif
+       -Dhttp:BOOL=ON \
+       -Djemalloc:BOOL=OFF \
+       -Dkrb5:BOOL=ON \
+       -Dldap:BOOL=ON \
+       -Dlibcxx:BOOL=OFF \
+       -Dmathmore:BOOL=ON \
+       -Dmemstat:BOOL=ON \
+       -Dminuit2:BOOL=ON \
+       -Dmonalisa:BOOL=OFF \
+       -Dmt:BOOL=ON \
+       -Dmysql:BOOL=ON \
+       -Dodbc:BOOL=ON \
+       -Dopengl:BOOL=ON \
+       -Doracle:BOOL=OFF \
+       -Dpch:BOOL=ON \
+       -Dpgsql:BOOL=ON \
+       -Dpythia6:BOOL=OFF \
+%if %{pythia8}
+       -Dpythia8:BOOL=ON \
+%else
+       -Dpythia8:BOOL=OFF \
+%endif
+       -Dpython:BOOL=ON \
+       -Dqt:BOOL=ON \
+       -Dqtgsi:BOOL=ON \
+       -Dr:BOOL=ON \
+       -Drfio:BOOL=ON \
+       -Droofit:BOOL=ON \
+       -Droot7:BOOL=OFF \
+       -Drpath:BOOL=OFF \
+%if %{ruby}
+       -Druby:BOOL=ON \
+%else
+       -Druby:BOOL=OFF \
+%endif
+       -Dsapdb:BOOL=OFF \
+       -Dshadowpw:BOOL=ON \
+       -Dshared:BOOL=ON \
+       -Dsoversion:BOOL=ON \
+       -Dsqlite:BOOL=ON \
+       -Dsrp:BOOL=OFF \
+       -Dssl:BOOL=ON \
+       -Dtable:BOOL=ON \
+       -Dtbb:BOOL=ON \
+       -Dtcmalloc:BOOL=OFF \
+       -Dthread:BOOL=ON \
+       -Dtmva:BOOL=ON \
+       -Dunuran:BOOL=ON \
+       -Dvc:BOOL=OFF \
+       -Dvdt:BOOL=ON \
+       -Dx11:BOOL=ON \
+       -Dxft:BOOL=ON \
+       -Dxml:BOOL=ON \
+%if %{xrootd}
+       -Dxrootd:BOOL=ON \
+%else
+       -Dxrootd:BOOL=OFF \
+%endif
+       -Dfail-on-missing:BOOL=ON \
+       -Dtesting:BOOL=ON \
+       ..
+
+# Build PyROOT for python 3 (prep)
+cp -pr bindings/pyroot bindings/python
+
+make %{?_smp_mflags}
+
+# Build PyROOT for python 3
+mkdir python
+mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
+sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
+    > CMakeFiles/Makefile2
+py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
+py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
+py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
+make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
+mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+
+popd
+
+%install
+pushd builddir
+make %{?_smp_mflags} install DESTDIR=%{buildroot}
+popd
+
+# Move python modules to the sitelib
+mkdir -p %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python_sitearch}
+
+mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
+
+rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
+mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
+
+# Do emacs byte compilation
+emacs -batch -no-site-file -f batch-byte-compile \
+    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
+
+# Install desktop entry and icon
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+
+cat > root.desktop << EOF
+[Desktop Entry]
+Name=Root
+GenericName=Root
+Comment=Numerical data analysis framework
+Exec=root
+Icon=root
+Terminal=true
+Type=Application
+MimeType=application/x-root;
+Categories=Utility;
+Encoding=UTF-8
+EOF
+
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+		     --vendor "" root.desktop
+install -p -m 644 build/package/debian/root-system-bin.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
+
+# Install mime type and icon
+mkdir -p %{buildroot}%{_datadir}/mime/packages
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
+install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
+    %{buildroot}%{_datadir}/mime/packages/root.xml
+install -p -m 644 build/package/debian/application-x-root.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
+
+# Init scripts for services
+mkdir -p %{buildroot}%{_initrddir}
+mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
+   %{buildroot}%{_initrddir}/proofd
+mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
+   %{buildroot}%{_initrddir}/rootd
+
+# Turn off services by default
+sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
+
+# The Python interface library is handled by alternatives
+mkdir -p %{buildroot}%{python_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
+   %{buildroot}%{python_sitearch}/libPyROOT.so
+
+mkdir -p %{buildroot}%{python3_sitearch}
+install builddir/python/libPyROOT.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
+
+%if %{ruby}
+# The Ruby interface library must be in two places
+mkdir -p %{buildroot}%{ruby_vendorarchdir}
+mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
+   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
+ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
+   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
+%endif
+
+# These should be in PATH
+mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
+
+# Avoid /usr/bin/env shebangs
+sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
+sed 's!/usr/bin/env python!/usr/bin/python!' \
+    -i %{buildroot}%{_bindir}/rootbrowse \
+       %{buildroot}%{_bindir}/rootcp \
+       %{buildroot}%{_bindir}/rooteventselector \
+       %{buildroot}%{_bindir}/rootls \
+       %{buildroot}%{_bindir}/rootmkdir \
+       %{buildroot}%{_bindir}/rootmv \
+       %{buildroot}%{_bindir}/rootprint \
+       %{buildroot}%{_bindir}/rootrm \
+       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
+       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
+
+# Remove some junk
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
+rm %{buildroot}%{_datadir}/%{name}/daemons/README
+rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
+rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
+rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
+rm %{buildroot}%{_datadir}/%{name}/root.desktop
+rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
+rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
+rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
+rm %{buildroot}%{_libdir}/%{name}/libminicern.a
+rm %{buildroot}%{_bindir}/setenvwrap.csh
+rm %{buildroot}%{_bindir}/setxrd*
+rm %{buildroot}%{_bindir}/thisroot*
+rm %{buildroot}%{_mandir}/man1/g2rootold.1
+rm %{buildroot}%{_mandir}/man1/genmap.1
+rm %{buildroot}%{_mandir}/man1/proofserva.1
+rm %{buildroot}%{_mandir}/man1/roota.1
+rm %{buildroot}%{_mandir}/man1/setup-pq2.1
+%if %{xrootd} == 0
+rm %{buildroot}%{_mandir}/man1/xproofd.1
+%endif
+rm %{buildroot}%{_includedir}/%{name}/*.cw
+rm %{buildroot}%{_includedir}/%{name}/*.pri
+rm %{buildroot}%{_includedir}/%{name}/proofdp.h
+rm %{buildroot}%{_includedir}/%{name}/rootdp.h
+rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
+rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
+rm %{buildroot}%{_pkgdocdir}/INSTALL
+rm %{buildroot}%{_pkgdocdir}/README.ALIEN
+rm %{buildroot}%{_pkgdocdir}/README.MONALISA
+
+# Remove mathtext and minicern references from cmake files
+sed -e 's/ mathtext / /' -e /mathtext/d \
+    -e 's/ minicern / /' -e /minicern/d \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
+    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
+
+# Only used on Windows
+rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
+
+# Remove plugin definitions for non-built and obsolete plugins
+pushd %{buildroot}%{_datadir}/%{name}/plugins
+rm TAFS/P010_TAFS.C
+rm TDataProgressDialog/P010_TDataProgressDialog.C
+rm TDataSetManager/P020_TDataSetManagerAliEn.C
+rm TFile/P030_TCastorFile.C
+rm TFile/P060_TChirpFile.C
+rm TFile/P070_TAlienFile.C
+%if %{hadoop} == 0
+rm TFile/P110_THDFSFile.C
+%endif
+rm TGLManager/P020_TGWin32GLManager.C
+rm TGLManager/P030_TGOSXGLManager.C
+rm TGrid/P010_TAlien.C
+rm TGrid/P020_TGLite.C
+rm TImagePlugin/P010_TASPluginGS.C
+rm TSQLServer/P030_TSapDBServer.C
+rm TSQLServer/P040_TOracleServer.C
+rm TSystem/P030_TAlienSystem.C
+%if %{hadoop} == 0
+rm TSystem/P060_THDFSSystem.C
+%endif
+rm TViewerX3D/P020_TQtViewerX3D.C
+rm TVirtualGLImp/P020_TGWin32GL.C
+rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
+rm TVirtualX/P030_TGWin32.C
+rm TVirtualX/P050_TGQuartz.C
+%if %{xrootd} == 0
+rm TFile/P100_TXNetFile.C
+rm TFileStager/P010_TXNetFileStager.C
+rm TProofMgr/P010_TXProofMgr.C
+rm TProofServ/P010_TXProofServ.C
+rm TSlave/P010_TXSlave.C
+rm TSystem/P040_TXNetSystem.C
+%endif
+rmdir TAFS
+rmdir TDataProgressDialog
+rmdir TGrid
+rmdir TImagePlugin
+popd
+
+# Create ldconfig configuration
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/%{name} > \
+     %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
+# Rename to avoid name clashes
+cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
+cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
+cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
+
+# Generate documentation
+pushd documentation/doxygen
+ln -s ../../files files
+sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
+    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
+    ROOTSYS=${PWD}/../../builddir \
+    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
+mv doc/html %{buildroot}%{_pkgdocdir}/html
+popd
+
+# Create includelist files ...
+for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
+    l=`tr / - <<< $l`
+    tmpdir=`mktemp -d`
+    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
+	sort | sed 's!^\.!!' > $l
+    rm -rf $tmpdir
+done
+
+# ... and merge some of them
+cat includelist-core-{[^mw],m[^au]}* > includelist-core
+cat includelist-geom-geom* > includelist-geom
+cat includelist-roofit-roo* > includelist-roofit
+cat includelist-gui-qt* > includelist-gui-qt
+cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
+cat includelist-gui-guihtml >> includelist-gui-gui
+cat includelist-io-xmlparser >> includelist-io-xml
+cat includelist-proof-proofplayer >> includelist-proof-proof
+cat includelist-net-netx* > includelist-netx
+
+%check
+pushd builddir
+pushd test
+ln -s ../../files files
+popd
+pushd runtutorials
+ln -s ../../files files
+popd
+# Exclude some tests that can not be run
+# - test-stressIOPlugins-*
+#   requires network access (by design since they test the remote file IO)
+# - tutorial-tree-run_h1analysis
+#   requires network access: http://root.cern.ch/files/h1/
+# - tutorial-r-*
+#   occasionally causes random crashes
+# - tutorial-multicore-mp*
+#   currently fails on ix86 and arm
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
+%ifarch %{ix86} %{arm}
+excluded="${excluded}|tutorial-multicore-mp.*"
+%endif
+make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
+popd
+
+%post
+touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+update-desktop-database >/dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
+    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+fi
+update-desktop-database >/dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+%post rootd
+/sbin/chkconfig --add rootd
+
+%preun rootd
+if [ $1 = 0 ] ; then
+    /sbin/service rootd stop >/dev/null 2>&1
+    /sbin/chkconfig --del rootd
+fi
+
+%postun rootd
+if [ "$1" -ge "1" ] ; then
+    /sbin/service rootd condrestart >/dev/null 2>&1 || :
+fi
+
+%post proofd
+/sbin/chkconfig --add proofd
+
+%preun proofd
+if [ $1 = 0 ] ; then
+    /sbin/service proofd stop >/dev/null 2>&1
+    /sbin/chkconfig --del proofd
+fi
+
+%postun proofd
+if [ "$1" -ge "1" ] ; then
+    /sbin/service proofd condrestart >/dev/null 2>&1 || :
+fi
+
+%post python
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
+/sbin/ldconfig
+
+%preun python
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python_sitearch}/libPyROOT.so
+fi
+
+%postun python -p /sbin/ldconfig
+
+%post %{python3pkg}
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+/sbin/ldconfig
+
+%preun %{python3pkg}
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
+fi
+
+%postun %{python3pkg} -p /sbin/ldconfig
+
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
+%post cling -p /sbin/ldconfig
+%postun cling -p /sbin/ldconfig
+%if %{ruby}
+%post ruby -p /sbin/ldconfig
+%postun ruby -p /sbin/ldconfig
+%endif
+%post r -p /sbin/ldconfig
+%postun r -p /sbin/ldconfig
+%post r-tools -p /sbin/ldconfig
+%postun r-tools -p /sbin/ldconfig
+%post genetic -p /sbin/ldconfig
+%postun genetic -p /sbin/ldconfig
+%post geom -p /sbin/ldconfig
+%postun geom -p /sbin/ldconfig
+%post gdml -p /sbin/ldconfig
+%postun gdml -p /sbin/ldconfig
+%if %{oce}
+%post geocad -p /sbin/ldconfig
+%postun geocad -p /sbin/ldconfig
+%endif
+%post graf -p /sbin/ldconfig
+%postun graf -p /sbin/ldconfig
+%post graf-asimage -p /sbin/ldconfig
+%postun graf-asimage -p /sbin/ldconfig
+%post graf-fitsio -p /sbin/ldconfig
+%postun graf-fitsio -p /sbin/ldconfig
+%post graf-gpad -p /sbin/ldconfig
+%postun graf-gpad -p /sbin/ldconfig
+%post graf-gviz -p /sbin/ldconfig
+%postun graf-gviz -p /sbin/ldconfig
+%post graf-postscript -p /sbin/ldconfig
+%postun graf-postscript -p /sbin/ldconfig
+%post graf-qt -p /sbin/ldconfig
+%postun graf-qt -p /sbin/ldconfig
+%post graf-x11 -p /sbin/ldconfig
+%postun graf-x11 -p /sbin/ldconfig
+%post graf3d -p /sbin/ldconfig
+%postun graf3d -p /sbin/ldconfig
+%post graf3d-eve -p /sbin/ldconfig
+%postun graf3d-eve -p /sbin/ldconfig
+%post graf3d-gl -p /sbin/ldconfig
+%postun graf3d-gl -p /sbin/ldconfig
+%post graf3d-gviz3d -p /sbin/ldconfig
+%postun graf3d-gviz3d -p /sbin/ldconfig
+%post graf3d-x3d -p /sbin/ldconfig
+%postun graf3d-x3d -p /sbin/ldconfig
+%post gui -p /sbin/ldconfig
+%postun gui -p /sbin/ldconfig
+%post gui-fitpanel -p /sbin/ldconfig
+%postun gui-fitpanel -p /sbin/ldconfig
+%post gui-ged -p /sbin/ldconfig
+%postun gui-ged -p /sbin/ldconfig
+%post guibuilder -p /sbin/ldconfig
+%postun guibuilder -p /sbin/ldconfig
+%post gui-qt -p /sbin/ldconfig
+%postun gui-qt -p /sbin/ldconfig
+%post gui-recorder -p /sbin/ldconfig
+%postun gui-recorder -p /sbin/ldconfig
+%post hbook -p /sbin/ldconfig
+%postun hbook -p /sbin/ldconfig
+%post hist -p /sbin/ldconfig
+%postun hist -p /sbin/ldconfig
+%post hist-painter -p /sbin/ldconfig
+%postun hist-painter -p /sbin/ldconfig
+%post spectrum -p /sbin/ldconfig
+%postun spectrum -p /sbin/ldconfig
+%post spectrum-painter -p /sbin/ldconfig
+%postun spectrum-painter -p /sbin/ldconfig
+%post hist-factory -p /sbin/ldconfig
+%postun hist-factory -p /sbin/ldconfig
+%post html -p /sbin/ldconfig
+%postun html -p /sbin/ldconfig
+%post io -p /sbin/ldconfig
+%postun io -p /sbin/ldconfig
+%post io-dcache -p /sbin/ldconfig
+%postun io-dcache -p /sbin/ldconfig
+%post io-gfal -p /sbin/ldconfig
+%postun io-gfal -p /sbin/ldconfig
+%if %{hadoop}
+%post io-hdfs -p /sbin/ldconfig
+%postun io-hdfs -p /sbin/ldconfig
+%endif
+%post io-rfio -p /sbin/ldconfig
+%postun io-rfio -p /sbin/ldconfig
+%post io-sql -p /sbin/ldconfig
+%postun io-sql -p /sbin/ldconfig
+%post io-xml -p /sbin/ldconfig
+%postun io-xml -p /sbin/ldconfig
+%post foam -p /sbin/ldconfig
+%postun foam -p /sbin/ldconfig
+%post fftw -p /sbin/ldconfig
+%postun fftw -p /sbin/ldconfig
+%post fumili -p /sbin/ldconfig
+%postun fumili -p /sbin/ldconfig
+%post genvector -p /sbin/ldconfig
+%postun genvector -p /sbin/ldconfig
+%post mathcore -p /sbin/ldconfig
+%postun mathcore -p /sbin/ldconfig
+%post mathmore -p /sbin/ldconfig
+%postun mathmore -p /sbin/ldconfig
+%post matrix -p /sbin/ldconfig
+%postun matrix -p /sbin/ldconfig
+%post minuit -p /sbin/ldconfig
+%postun minuit -p /sbin/ldconfig
+%post minuit2 -p /sbin/ldconfig
+%postun minuit2 -p /sbin/ldconfig
+%post mlp -p /sbin/ldconfig
+%postun mlp -p /sbin/ldconfig
+%post physics -p /sbin/ldconfig
+%postun physics -p /sbin/ldconfig
+%post quadp -p /sbin/ldconfig
+%postun quadp -p /sbin/ldconfig
+%post smatrix -p /sbin/ldconfig
+%postun smatrix -p /sbin/ldconfig
+%post splot -p /sbin/ldconfig
+%postun splot -p /sbin/ldconfig
+%post unuran -p /sbin/ldconfig
+%postun unuran -p /sbin/ldconfig
+%post memstat -p /sbin/ldconfig
+%postun memstat -p /sbin/ldconfig
+%post table -p /sbin/ldconfig
+%postun table -p /sbin/ldconfig
+%post montecarlo-eg -p /sbin/ldconfig
+%postun montecarlo-eg -p /sbin/ldconfig
+%if %{pythia8}
+%post montecarlo-pythia8 -p /sbin/ldconfig
+%postun montecarlo-pythia8 -p /sbin/ldconfig
+%endif
+%post montecarlo-vmc -p /sbin/ldconfig
+%postun montecarlo-vmc -p /sbin/ldconfig
+%post net -p /sbin/ldconfig
+%postun net -p /sbin/ldconfig
+%post net-rpdutils -p /sbin/ldconfig
+%postun net-rpdutils -p /sbin/ldconfig
+%post net-bonjour -p /sbin/ldconfig
+%postun net-bonjour -p /sbin/ldconfig
+%post net-auth -p /sbin/ldconfig
+%postun net-auth -p /sbin/ldconfig
+%post net-davix -p /sbin/ldconfig
+%postun net-davix -p /sbin/ldconfig
+%post net-globus -p /sbin/ldconfig
+%postun net-globus -p /sbin/ldconfig
+%post net-krb5 -p /sbin/ldconfig
+%postun net-krb5 -p /sbin/ldconfig
+%post net-ldap -p /sbin/ldconfig
+%postun net-ldap -p /sbin/ldconfig
+%post net-http -p /sbin/ldconfig
+%postun net-http -p /sbin/ldconfig
+%if %{xrootd}
+%post netx -p /sbin/ldconfig
+%postun netx -p /sbin/ldconfig
+%endif
+%post proof -p /sbin/ldconfig
+%postun proof -p /sbin/ldconfig
+%post proof-sessionviewer -p /sbin/ldconfig
+%postun proof-sessionviewer -p /sbin/ldconfig
+%if %{xrootd}
+%post xproof -p /sbin/ldconfig
+%postun xproof -p /sbin/ldconfig
+%endif
+%post roofit -p /sbin/ldconfig
+%postun roofit -p /sbin/ldconfig
+%post sql-mysql -p /sbin/ldconfig
+%postun sql-mysql -p /sbin/ldconfig
+%post sql-odbc -p /sbin/ldconfig
+%postun sql-odbc -p /sbin/ldconfig
+%post sql-sqlite -p /sbin/ldconfig
+%postun sql-sqlite -p /sbin/ldconfig
+%post sql-pgsql -p /sbin/ldconfig
+%postun sql-pgsql -p /sbin/ldconfig
+%post tmva -p /sbin/ldconfig
+%postun tmva -p /sbin/ldconfig
+%post tmva-python -p /sbin/ldconfig
+%postun tmva-python -p /sbin/ldconfig
+%post tmva-r -p /sbin/ldconfig
+%postun tmva-r -p /sbin/ldconfig
+%post tmva-gui -p /sbin/ldconfig
+%postun tmva-gui -p /sbin/ldconfig
+%post tree -p /sbin/ldconfig
+%postun tree -p /sbin/ldconfig
+%post tree-player -p /sbin/ldconfig
+%postun tree-player -p /sbin/ldconfig
+%post tree-viewer -p /sbin/ldconfig
+%postun tree-viewer -p /sbin/ldconfig
+
+%files
+%{_bindir}/hadd
+%{_bindir}/root
+%{_bindir}/root.exe
+%{_bindir}/rootn.exe
+%{_bindir}/roots
+%{_bindir}/roots.exe
+%{_bindir}/ssh2rpd
+%{_mandir}/man1/hadd.1*
+%{_mandir}/man1/root.1*
+%{_mandir}/man1/root.exe.1*
+%{_mandir}/man1/rootn.exe.1*
+%{_mandir}/man1/roots.exe.1*
+%{_mandir}/man1/ssh2rpd.1*
+%{_datadir}/applications/root.desktop
+%{_datadir}/icons/hicolor/48x48/apps/root.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
+%{_datadir}/mime/packages/root.xml
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitelispdir}/%{name}/*.el
+
+%files icons
+%{_datadir}/%{name}/icons
+
+%files fonts
+%{_datadir}/%{name}/fonts
+
+%files core -f includelist-core
+%{_bindir}/memprobe
+%{_bindir}/rlibmap
+%{_bindir}/rmkdepend
+%{_bindir}/root-config
+%{_mandir}/man1/memprobe.1*
+%{_mandir}/man1/rmkdepend.1*
+%{_mandir}/man1/root-config.1*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/libCore.*
+%{_libdir}/%{name}/libNew.*
+%{_libdir}/%{name}/libRint.*
+%{_libdir}/%{name}/libThread.*
+%{_libdir}/%{name}/lib*Dict.*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/allDict.cxx.pch
+%{_datadir}/%{name}/class.rules
+%{_datadir}/%{name}/gdb-backtrace.sh
+%{_datadir}/%{name}/helgrind-root.supp
+%{_datadir}/%{name}/Makefile.arch
+%{_datadir}/%{name}/root.mimes
+%{_datadir}/%{name}/system.rootauthrc
+%{_datadir}/%{name}/system.rootdaemonrc
+%{_datadir}/%{name}/system.rootrc
+%{_datadir}/%{name}/valgrind-root-python.supp
+%{_mandir}/man1/system.rootdaemonrc.1*
+%dir %{_datadir}/%{name}/cmake
+%{_datadir}/%{name}/cmake/*.cmake
+%dir %{_datadir}/%{name}/cmake/modules
+%{_datadir}/%{name}/cmake/modules/*.cmake
+%{_datadir}/%{name}/cmake/modules/*.cmake.in
+%dir %{_datadir}/%{name}/macros
+%{_datadir}/%{name}/macros/Dialogs.C
+%dir %{_datadir}/%{name}/plugins
+%dir %{_datadir}/%{name}/plugins/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/RConfigOptions.h
+%{_includedir}/%{name}/RConfigure.h
+%{_includedir}/%{name}/RGitCommit.h
+%{_includedir}/%{name}/compiledata.h
+%dir %{_includedir}/%{name}/Math
+%{_datadir}/aclocal/root.m4
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%dir %{_pkgdocdir}
+# CREDITS and LICENSE are used at runtime by the .credits and .license commands
+# They therefore should not be marked doc.
+%{_pkgdocdir}/CREDITS
+%{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/ReleaseNotes
+%license LICENSE
+
+%files multiproc -f includelist-core-multiproc
+%{_libdir}/%{name}/libMultiProc.*
+%{_libdir}/%{name}/libMultiProc_rdict.pcm
+
+%files cling
+%{_bindir}/genreflex
+%{_bindir}/rootcint
+%{_bindir}/rootcling
+%{_libdir}/%{name}/libCling.*
+%{_datadir}/%{name}/cling
+%{_datadir}/%{name}/dictpch
+%doc interpreter/cling/CREDITS.txt
+%doc interpreter/cling/README.md
+%license interpreter/cling/LICENSE.TXT
+%doc interpreter/llvm/src/llvm-CREDITS.TXT
+%doc interpreter/llvm/src/llvm-README.txt
+%license interpreter/llvm/src/llvm-LICENSE.TXT
+
+%files doc
+%doc %{_pkgdocdir}/html
+
+%files tutorial
+%doc %{_pkgdocdir}/test
+%doc %{_pkgdocdir}/tutorials
+
+%files proofd
+%{_bindir}/proofd
+%{_bindir}/proofserv
+%{_bindir}/proofserv.exe
+%{_bindir}/xpdtest
+%{_mandir}/man1/proofd.1*
+%{_mandir}/man1/proofserv.1*
+%{_mandir}/man1/xpdtest.1*
+%{_initrddir}/proofd
+
+%files rootd
+%{_bindir}/rootd
+%{_mandir}/man1/rootd.1*
+%{_initrddir}/rootd
+
+%files python -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python_sitearch}/libPyROOT.so
+%{python_sitearch}/ROOT.py*
+%{python_sitearch}/cppyy.py*
+%{python_sitearch}/_pythonization.py*
+
+%files %{python3pkg} -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_sitearch}/libPyROOT%{py3soabi}.so
+%{python3_sitearch}/ROOT.py
+%{python3_sitearch}/cppyy.py
+%{python3_sitearch}/_pythonization.py
+%{python3_sitearch}/__pycache__
+
+%if %{ruby}
+%files ruby -f includelist-bindings-ruby
+%{_libdir}/%{name}/libRuby.*
+%{_libdir}/%{name}/libRuby_rdict.pcm
+%{ruby_vendorarchdir}/libRuby.*
+%endif
+
+%files r -f includelist-bindings-r
+%{_libdir}/%{name}/libRInterface.*
+%{_libdir}/%{name}/libRInterface_rdict.pcm
+%doc bindings/r/doc/users-guide/*.md
+
+%files r-tools -f includelist-math-rtools
+%{_libdir}/%{name}/libRtools.*
+%{_libdir}/%{name}/libRtools_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
+
+%files genetic -f includelist-math-genetic
+%{_libdir}/%{name}/libGenetic.*
+%{_libdir}/%{name}/libGenetic_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
+
+%files geom -f includelist-geom
+%{_libdir}/%{name}/libGeom.*
+%{_libdir}/%{name}/libGeom_rdict.pcm
+%{_libdir}/%{name}/libGeomBuilder.*
+%{_libdir}/%{name}/libGeomBuilder_rdict.pcm
+%{_libdir}/%{name}/libGeomPainter.*
+%{_libdir}/%{name}/libGeomPainter_rdict.pcm
+%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
+%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
+%{_datadir}/%{name}/RadioNuclides.txt
+
+%files gdml -f includelist-geom-gdml
+%{_libdir}/%{name}/libGdml.*
+%{_libdir}/%{name}/libGdml_rdict.pcm
+
+%if %{oce}
+%files geocad -f includelist-geom-geocad
+%{_libdir}/%{name}/libGeoCad.*
+%{_libdir}/%{name}/libGeoCad_rdict.pcm
+%endif
+
+%files graf -f includelist-graf2d-graf
+%{_libdir}/%{name}/libGraf.*
+%{_libdir}/%{name}/libGraf_rdict.pcm
+%{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
+
+%files graf-asimage -f includelist-graf2d-asimage
+%{_libdir}/%{name}/libASImage.*
+%{_libdir}/%{name}/libASImage_rdict.pcm
+%{_libdir}/%{name}/libASImageGui.*
+%{_libdir}/%{name}/libASImageGui_rdict.pcm
+%{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
+%{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
+
+%files graf-fitsio -f includelist-graf2d-fitsio
+%{_libdir}/%{name}/libFITSIO.*
+%{_libdir}/%{name}/libFITSIO_rdict.pcm
+
+%files graf-gpad -f includelist-graf2d-gpad
+%{_libdir}/%{name}/libGpad.*
+%{_libdir}/%{name}/libGpad_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
+
+%files graf-gviz -f includelist-graf2d-gviz
+%{_libdir}/%{name}/libGviz.*
+%{_libdir}/%{name}/libGviz_rdict.pcm
+
+%files graf-postscript -f includelist-graf2d-postscript
+%{_libdir}/%{name}/libPostscript.*
+%{_libdir}/%{name}/libPostscript_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
+
+%files graf-qt -f includelist-graf2d-qt
+%{_libdir}/%{name}/libGQt.*
+%{_libdir}/%{name}/libGQt_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
+
+%files graf-x11 -f includelist-graf2d-x11
+%{_libdir}/%{name}/libGX11.*
+%{_libdir}/%{name}/libGX11_rdict.pcm
+%{_libdir}/%{name}/libGX11TTF.*
+%{_libdir}/%{name}/libGX11TTF_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
+%{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
+
+%files graf3d -f includelist-graf3d-g3d
+%{_libdir}/%{name}/libGraf3d.*
+%{_libdir}/%{name}/libGraf3d_rdict.pcm
+%{_datadir}/%{name}/plugins/TView/P010_TView3D.C
+
+%files graf3d-eve -f includelist-graf3d-eve
+%{_libdir}/%{name}/libEve.*
+%{_libdir}/%{name}/libEve_rdict.pcm
+
+%files graf3d-gl -f includelist-graf3d-gl
+%{_libdir}/%{name}/libRGL.*
+%{_libdir}/%{name}/libRGL_rdict.pcm
+%{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
+%{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
+%{_datadir}/%{name}/plugins/TVirtualGLImp/P010_TX11GL.C
+%{_datadir}/%{name}/plugins/TVirtualPadPainter/P010_TGLPadPainter.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P020_TGLSAViewer.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P030_TGLViewer.C
+
+%files graf3d-gviz3d -f includelist-graf3d-gviz3d
+%{_libdir}/%{name}/libGviz3d.*
+%{_libdir}/%{name}/libGviz3d_rdict.pcm
+
+%files graf3d-x3d -f includelist-graf3d-x3d
+%{_libdir}/%{name}/libX3d.*
+%{_libdir}/%{name}/libX3d_rdict.pcm
+%{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TVirtualViewerX3D.C
+
+%files gui -f includelist-gui-gui
+%{_libdir}/%{name}/libGui.*
+%{_libdir}/%{name}/libGui_rdict.pcm
+%{_libdir}/%{name}/libGuiHtml.*
+%{_libdir}/%{name}/libGuiHtml_rdict.pcm
+%{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
+%{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
+%{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
+%{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
+
+%files gui-fitpanel -f includelist-gui-fitpanel
+%{_libdir}/%{name}/libFitPanel.*
+%{_libdir}/%{name}/libFitPanel_rdict.pcm
+%{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
+
+%files gui-ged -f includelist-gui-ged
+%{_libdir}/%{name}/libGed.*
+%{_libdir}/%{name}/libGed_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
+
+%files guibuilder -f includelist-gui-guibuilder
+%{_libdir}/%{name}/libGuiBld.*
+%{_libdir}/%{name}/libGuiBld_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
+%{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
+
+%files gui-qt -f includelist-gui-qt
+%{_libdir}/%{name}/libQtRoot.*
+%{_libdir}/%{name}/libQtRoot_rdict.pcm
+%{_libdir}/%{name}/libQtGSI.*
+%{_libdir}/%{name}/libQtGSI_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
+
+%files gui-recorder -f includelist-gui-recorder
+%{_libdir}/%{name}/libRecorder.*
+%{_libdir}/%{name}/libRecorder_rdict.pcm
+
+%files hbook -f includelist-hist-hbook
+%{_bindir}/g2root
+%{_bindir}/h2root
+%{_mandir}/man1/g2root.1*
+%{_mandir}/man1/h2root.1*
+%{_libdir}/%{name}/libHbook.*
+%{_libdir}/%{name}/libHbook_rdict.pcm
+
+%files hist -f includelist-hist-hist
+%{_libdir}/%{name}/libHist.*
+%{_libdir}/%{name}/libHist_rdict.pcm
+
+%files hist-painter -f includelist-hist-histpainter
+%{_libdir}/%{name}/libHistPainter.*
+%{_libdir}/%{name}/libHistPainter_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
+%{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
+
+%files spectrum -f includelist-hist-spectrum
+%{_libdir}/%{name}/libSpectrum.*
+%{_libdir}/%{name}/libSpectrum_rdict.pcm
+
+%files spectrum-painter -f includelist-hist-spectrumpainter
+%{_libdir}/%{name}/libSpectrumPainter.*
+%{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
+
+%files hist-factory -f includelist-roofit-histfactory
+%{_bindir}/hist2workspace
+%{_bindir}/prepareHistFactory
+%{_mandir}/man1/hist2workspace.1*
+%{_mandir}/man1/prepareHistFactory.1*
+%{_libdir}/%{name}/libHistFactory.*
+%{_libdir}/%{name}/libHistFactory_rdict.pcm
+%{_datadir}/%{name}/HistFactorySchema.dtd
+%dir %{_includedir}/%{name}/RooStats/HistFactory
+%doc roofit/histfactory/doc/README
+
+%files html -f includelist-html
+%{_libdir}/%{name}/libHtml.*
+%{_libdir}/%{name}/libHtml_rdict.pcm
+%{_datadir}/%{name}/html
+
+%files io -f includelist-io-io
+%{_libdir}/%{name}/libRIO.*
+%{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
+%{_datadir}/%{name}/plugins/TVirtualStreamerInfo/P010_TStreamerInfo.C
+
+%files io-dcache -f includelist-io-dcache
+%{_libdir}/%{name}/libDCache.*
+%{_libdir}/%{name}/libDCache_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
+%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
+
+%files io-gfal -f includelist-io-gfal
+%{_libdir}/%{name}/libGFAL.*
+%{_libdir}/%{name}/libGFAL_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+
+%if %{hadoop}
+%files io-hdfs -f includelist-io-hdfs
+%{_libdir}/%{name}/libHDFS.*
+%{_libdir}/%{name}/libHDFS_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
+%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
+%endif
+
+%files io-rfio -f includelist-io-rfio
+%{_libdir}/%{name}/libRFIO.*
+%{_libdir}/%{name}/libRFIO_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
+%{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
+
+%files io-sql -f includelist-io-sql
+%{_libdir}/%{name}/libSQLIO.*
+%{_libdir}/%{name}/libSQLIO_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
+
+%files io-xml -f includelist-io-xml
+%{_libdir}/%{name}/libXMLIO.*
+%{_libdir}/%{name}/libXMLIO_rdict.pcm
+%{_libdir}/%{name}/libXMLParser.*
+%{_libdir}/%{name}/libXMLParser_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
+
+%files foam -f includelist-math-foam
+%{_libdir}/%{name}/libFoam.*
+%{_libdir}/%{name}/libFoam_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
+
+%files fftw -f includelist-math-fftw
+%{_libdir}/%{name}/libFFTW.*
+%{_libdir}/%{name}/libFFTW_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P030_TFFTRealComplex.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P040_TFFTReal.C
+
+%files fumili -f includelist-math-fumili
+%{_libdir}/%{name}/libFumili.*
+%{_libdir}/%{name}/libFumili_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
+
+%files genvector -f includelist-math-genvector
+%{_libdir}/%{name}/libGenVector.*
+%{_libdir}/%{name}/libGenVector_rdict.pcm
+%{_libdir}/%{name}/libGenVector32.rootmap
+%{_libdir}/%{name}/libGenVector_G__GenVector32_rdict.pcm
+%dir %{_includedir}/%{name}/Math/GenVector
+
+%files mathcore -f includelist-math-mathcore
+%{_libdir}/%{name}/libMathCore.*
+%{_libdir}/%{name}/libMathCore_rdict.pcm
+%dir %{_includedir}/%{name}/Fit
+
+%files mathmore -f includelist-math-mathmore
+%{_libdir}/%{name}/libMathMore.*
+%{_libdir}/%{name}/libMathMore_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P030_FalsePos.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P040_Newton.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P050_Secant.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P060_Steffenson.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P030_GSLMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P040_GSLNLSMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P050_GSLSimAnMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P010_GSLIntegrator.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P020_GSLMCIntegrator.C
+
+%files matrix -f includelist-math-matrix
+%{_libdir}/%{name}/libMatrix.*
+%{_libdir}/%{name}/libMatrix_rdict.pcm
+
+%files minuit -f includelist-math-minuit
+%{_libdir}/%{name}/libMinuit.*
+%{_libdir}/%{name}/libMinuit_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
+
+%files minuit2 -f includelist-math-minuit2
+%{_libdir}/%{name}/libMinuit2.*
+%{_libdir}/%{name}/libMinuit2_rdict.pcm
+%dir %{_includedir}/%{name}/Minuit2
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
+
+%files mlp -f includelist-math-mlp
+%{_libdir}/%{name}/libMLP.*
+%{_libdir}/%{name}/libMLP_rdict.pcm
+
+%files physics -f includelist-math-physics
+%{_libdir}/%{name}/libPhysics.*
+%{_libdir}/%{name}/libPhysics_rdict.pcm
+
+%files quadp -f includelist-math-quadp
+%{_libdir}/%{name}/libQuadp.*
+%{_libdir}/%{name}/libQuadp_rdict.pcm
+
+%files smatrix -f includelist-math-smatrix
+%{_libdir}/%{name}/libSmatrix.*
+%{_libdir}/%{name}/libSmatrix_rdict.pcm
+%{_libdir}/%{name}/libSmatrix32.rootmap
+%{_libdir}/%{name}/libSmatrix_G__Smatrix32_rdict.pcm
+
+%files splot -f includelist-math-splot
+%{_libdir}/%{name}/libSPlot.*
+%{_libdir}/%{name}/libSPlot_rdict.pcm
+
+%files unuran -f includelist-math-unuran
+%{_libdir}/%{name}/libUnuran.*
+%{_libdir}/%{name}/libUnuran_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
+
+%files vdt -f includelist-math-vdt
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/vdt
+%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
+%license math/vdt/Licence.md
+
+%files memstat -f includelist-misc-memstat
+%{_libdir}/%{name}/libMemStat.*
+%{_libdir}/%{name}/libMemStat_rdict.pcm
+
+%files table -f includelist-misc-table
+%{_libdir}/%{name}/libTable.*
+%{_libdir}/%{name}/libTable_rdict.pcm
+
+%files montecarlo-eg -f includelist-montecarlo-eg
+%{_libdir}/%{name}/libEG.*
+%{_libdir}/%{name}/libEG_rdict.pcm
+%{_datadir}/%{name}/pdg_table.txt
+%doc %{_pkgdocdir}/cfortran.doc
+
+%if %{pythia8}
+%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
+%{_libdir}/%{name}/libEGPythia8.*
+%{_libdir}/%{name}/libEGPythia8_rdict.pcm
+%endif
+
+%files montecarlo-vmc -f includelist-montecarlo-vmc
+%{_libdir}/%{name}/libVMC.*
+%{_libdir}/%{name}/libVMC_rdict.pcm
+%{_datadir}/%{name}/vmc
+
+%files net -f includelist-net-net
+%{_libdir}/%{name}/libNet.*
+%{_libdir}/%{name}/libNet_rdict.pcm
+%{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
+%{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
+%{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
+%{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
+%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
+%{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
+%{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
+%{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
+%{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
+
+%files net-rpdutils -f includelist-net-rpdutils
+%{_libdir}/%{name}/libSrvAuth.*
+
+%files net-bonjour -f includelist-net-bonjour
+%{_libdir}/%{name}/libBonjour.*
+%{_libdir}/%{name}/libBonjour_rdict.pcm
+
+%files net-auth -f includelist-net-auth
+%{_libdir}/%{name}/libRootAuth.*
+%{_libdir}/%{name}/libRootAuth_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
+%doc %{_pkgdocdir}/README.AUTH
+
+%files net-davix -f includelist-net-davix
+%{_libdir}/%{name}/libRDAVIX.*
+%{_libdir}/%{name}/libRDAVIX_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
+%{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
+
+%files net-globus
+%{_libdir}/%{name}/libGlobusAuth.*
+%doc %{_pkgdocdir}/README.GLOBUS
+
+%files net-krb5 -f includelist-net-krb5auth
+%{_libdir}/%{name}/libKrb5Auth.*
+%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
+
+%files net-ldap -f includelist-net-ldap
+%{_libdir}/%{name}/libRLDAP.*
+%{_libdir}/%{name}/libRLDAP_rdict.pcm
+
+%files net-http -f includelist-net-http
+%{_libdir}/%{name}/libRHTTP.*
+%{_libdir}/%{name}/libRHTTP_rdict.pcm
+%{_datadir}/%{name}/http
+%doc net/http/README.txt net/http/civetweb/*.md
+
+%if %{xrootd}
+%files netx -f includelist-netx
+%{_libdir}/%{name}/libNetx.*
+%{_libdir}/%{name}/libNetx_rdict.pcm
+%{_libdir}/%{name}/libNetxNG.*
+%{_libdir}/%{name}/libNetxNG_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
+%{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
+%{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
+%endif
+
+%files proof -f includelist-proof-proof
+%{_libdir}/%{name}/libProof.*
+%{_libdir}/%{name}/libProof_rdict.pcm
+%{_libdir}/%{name}/libProofDraw.*
+%{_libdir}/%{name}/libProofDraw_rdict.pcm
+%{_libdir}/%{name}/libProofPlayer.*
+%{_libdir}/%{name}/libProofPlayer_rdict.pcm
+%{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
+%{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
+%{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
+%{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
+%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
+%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
+%{_datadir}/%{name}/valgrind-root.supp
+%doc %{_pkgdocdir}/README.PROOF
+
+%files proof-bench -f includelist-proof-proofbench
+%{_libdir}/%{name}/libProofBench.*
+%{_libdir}/%{name}/libProofBench_rdict.pcm
+%{_datadir}/%{name}/proof
+
+%files proof-pq2 -f includelist-proof-pq2
+%{_bindir}/pq2*
+%{_mandir}/man1/pq2*.1*
+
+%files proof-sessionviewer -f includelist-gui-sessionviewer
+%{_libdir}/%{name}/libSessionViewer.*
+%{_libdir}/%{name}/libSessionViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
+%{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
+%{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
+
+%if %{xrootd}
+%files xproof -f includelist-proof-proofx
+%{_bindir}/proofexecv
+%{_bindir}/xproofd
+%{_mandir}/man1/xproofd.1*
+%{_libdir}/%{name}/libProofx.*
+%{_libdir}/%{name}/libProofx_rdict.pcm
+%{_libdir}/%{name}/libXrdProofd.*
+%{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
+%{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
+%{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
+%endif
+
+%files roofit -f includelist-roofit
+%{_libdir}/%{name}/libRooFit.*
+%{_libdir}/%{name}/libRooFit_rdict.pcm
+%{_libdir}/%{name}/libRooFitCore.*
+%{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%{_libdir}/%{name}/libRooStats.*
+%{_libdir}/%{name}/libRooStats_rdict.pcm
+%dir %{_includedir}/%{name}/RooStats
+
+%files sql-mysql -f includelist-sql-mysql
+%{_libdir}/%{name}/libRMySQL.*
+%{_libdir}/%{name}/libRMySQL_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
+
+%files sql-odbc -f includelist-sql-odbc
+%{_libdir}/%{name}/libRODBC.*
+%{_libdir}/%{name}/libRODBC_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
+
+%files sql-sqlite -f includelist-sql-sqlite
+%{_libdir}/%{name}/libRSQLite.*
+%{_libdir}/%{name}/libRSQLite_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
+
+%files sql-pgsql -f includelist-sql-pgsql
+%{_libdir}/%{name}/libPgSQL.*
+%{_libdir}/%{name}/libPgSQL_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
+
+%files tmva -f includelist-tmva-tmva
+%{_libdir}/%{name}/libTMVA.*
+%{_libdir}/%{name}/libTMVA_rdict.pcm
+%dir %{_includedir}/%{name}/TMVA
+%license tmva/doc/LICENSE
+
+%files tmva-python -f includelist-tmva-pymva
+%{_libdir}/%{name}/libPyMVA.*
+%{_libdir}/%{name}/libPyMVA_rdict.pcm
+
+%files tmva-r -f includelist-tmva-rmva
+%{_libdir}/%{name}/libRMVA.*
+%{_libdir}/%{name}/libRMVA_rdict.pcm
+
+%files tmva-gui -f includelist-tmva-tmvagui
+%{_libdir}/%{name}/libTMVAGui.*
+%{_libdir}/%{name}/libTMVAGui_rdict.pcm
+
+%files tree -f includelist-tree-tree
+%{_libdir}/%{name}/libTree.*
+%{_libdir}/%{name}/libTree_rdict.pcm
+%doc %{_pkgdocdir}/README.SELECTOR
+
+%files tree-player -f includelist-tree-treeplayer
+%{_libdir}/%{name}/libTreePlayer.*
+%{_libdir}/%{name}/libTreePlayer_rdict.pcm
+%{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
+%{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
+
+%files tree-viewer -f includelist-tree-treeviewer
+%{_libdir}/%{name}/libTreeViewer.*
+%{_libdir}/%{name}/libTreeViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
+
+%files cli
+%{_bindir}/rootbrowse
+%{_bindir}/rootcp
+%{_bindir}/rooteventselector
+%{_bindir}/rootls
+%{_bindir}/rootmkdir
+%{_bindir}/rootmv
+%{_bindir}/rootprint
+%{_bindir}/rootrm
+%{python_sitelib}/cmdLineUtils.py*
+
+%files notebook
+%{_bindir}/rootnb.exe
+%{_datadir}/%{name}/notebook
+
+%files rootaas
+%{python_sitelib}/ROOTaaS
+
+%changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
+- Add requires on redhat-rpm-config to root-cling
+
+* Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
+- Update to 6.06.06
+- Drop patches root-gfal2.patch and root-keysymbols.patch
+- Make root-vdt package noarch
+
+* Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
+- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
+- Minor updates to patches - mostly backported from upstream
+- Reenable hadoop/hdfs support for F24+
+
+* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
+- Remove mathtext and minicern references from cmake files
+- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
+
+* Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
+- Disable hadoop/hdfs support for F24+ (hadoop was retired)
+
+* Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
+- Update to 6.06.04
+- Drop patch root-no-hexfloat-const.patch
+- Add requires on gcc-c++ to root-cling
+
+* Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
+- Rebuild for OCE-0.17.1
+
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
+- Update to 6.06.02 (F24+, EPEL7)
+- Change to cmake configuration (was using ./configure)
+- Change to doxygen documentation generation (was using THTML)
+- Run the test suite
+- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
+- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
+  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
+  root-notebook and root-rootaas
+- New subpackage for EPEL7: root-python34
+- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
+
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
+- Update to 5.34.36
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
+- Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
+- Rebuild for glew 1.13
+
+* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
+- Adapt to gfal 2.10 - uses a different #define
+- Exclude ppc64le - has the same issues with cint as ppc and ppc64
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
+- Add versioned dependencies between packages
+- Reenable hadoop/hdfs support for F23+
+
+* Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
+- Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
+- Enable Cintex on aarch64
+
+* Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
+- Update to 5.34.32
+- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
+- Use GNU Free instead of Liberation, works better with TMathText
+- Fix segfault when embedding Type 1 fonts
+- Drop patch root-no-extra-formats.patch (workaround for above problem)
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
+- Update to 5.34.30
+- New sub-package: root-python3
+- Disable hadoop/hdfs support for F23+ (not installable)
+- Drop previously backported gcc 5 patches
+
+* Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
+- Update to 5.34.28
+- Merge emacs support files into main package (guidelines updated)
+
+* Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
+- Update to 5.34.26
+- Drop patch root-xrdversion.patch
+
+* Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
+- Rebuild with fixed cairo (bz 1183242)
+
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
+- Update to 5.34.24
+- Drop patch root-bsd-misc.patch
+
+* Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
+- Move xproofd binaries from root-proofd to root-xproof
+- Adjust EPEL 7 font dependencies
+- Rebuild using new binutils (ld bug fixed - F21+)
+
+* Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
+- Update to 5.34.20
+- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
+- Do not depend on wine's fonts
+- Drop patch root-gccopt.patch
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
+- Update to 5.34.19
+- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
+- New sub-package: root-net-http
+- Drop patches root-thtml-revert.patch, root-gfal2.patch and
+  root-proofx-link-iolib.patch
+
+* Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
+- Add Requires on root-tree-player to root-gui-ged
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
+- Rebuild for ruby 2.1
+- Fix build failure on F21 (missing symbol in libProofx linking)
+
+* Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
+- Update to 5.34.18
+- Build GFAL module using libgfal2
+- New sub-package: root-vdt
+
+* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
+- Update to 5.34.17
+
+* Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
+- Update to 5.34.15
+- Drop patch root-davix.patch
+
+* Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
+- Rebuild for cfitsio 3.360
+
+* Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
+- Adapt to davix >= 0.2.8
+
+* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
+- Update to 5.34.14
+- New sub-package: root-net-davix
+- Drop patch root-pythia8-incdir.patch
+
+* Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
+- Update to 5.34.13
+- Remove java-devel build dependency (not needed with Fedora's libhdfs)
+- Adapt to pythia8 >= 8.1.80
+
+* Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
+- Fix hadoop lib location
+
+* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
+- rebuilt for GLEW 1.10
+
+* Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
+- Update to 5.34.10
+- New sub-package: root-io-hdfs (Fedora 20+)
+- New sub-package: root-sql-sqlite
+
+* Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
+- Exclude armv7hl - cint is not working
+- Use _pkgdocdir when defined
+- Use texlive-stix
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
+- Perl 5.18 rebuild
+
+* Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
+- Rebuild for cfitsio 3.350
+
+* Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
+- Update to 5.34.09
+- New sub-package: root-montecarlo-pythia8
+- Drop patch root-gfal-bits.patch
+- Use xz compression for source tarfile
+- Update ancient root version in EPEL
+
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
+- Update to 5.34.07
+
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
+- Update to 5.34.06
+- Drop patches root-gviz.patch, root-ruby-version.patch,
+  root-rev48681.patch and root-rev48831.patch
+
+* Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
+- Rebuild for ruby 2.0
+- Rebuild for cfitsio 3.340
+
+* Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
+- Update to 5.34.05
+- Rebuild for xrootd 3.3
+- Patch for latest graphviz (libcgraph)
+- Drop patches root-glibc.patch and root-tclass-fix.patch
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
+- Rebuild for glew 1.9.0
+
+* Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
+- Update to 5.34.02
+
+* Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
+- Rebuild for glew 1.7
+
+* Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
+- Update to 5.34.01
+- Remove sub-packages root-clarens and root-peac (dropped by upstream)
+
+* Thu Jul 05 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-2
+- Do the glibc 2.16 patch properly
+
+* Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
+- Update to 5.34.00
+- New sub-package: root-io-gfal
+
+* Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
+- Update to 5.32.03
+
+* Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
+- Update to 5.32.02
+
+* Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-2
+- Rebuild for xrootd 3.1.1
+
+* Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
+- Update to 5.32.01
+- Drop patches fixed upstream
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
+- Rebuilt for c++ ABI breakage
+
+* Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
+- Adapt to new ruby packaging guidelines
+
+* Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
+- Update to 5.32.00
+
+* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
+- Rebuild against PCRE 8.30
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
+- Update to 5.30.04
+
+* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.03-1
+- Update to 5.30.03
+
+* Fri Sep 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.02-1
+- Update to 5.30.02
+
+* Thu Aug 18 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.01-1
+- Update to 5.30.01
+- Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
+
+* Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-3
+- Backport upstream's fix for the i686 rootcint problem
+
+* Tue Jul 26 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-2
+- Add workaround for rootcint problem on i686
+- Pass default LDFLAGS (relro) to make
+
+* Sun Jul 24 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-1
+- Update to 5.30.00
+- Drop patch root-listbox-height.patch
+- New sub-package: root-proof-bench
+
+* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-2
+- Change build requires from qt-devel to qt4-devel
+
+* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-1
+- Update to 5.28.00e
+
+* Mon Jun 20 2011 ajax@redhat.com - 5.28.00d-2
+- Rebuild for new glew soname
+
+* Fri May 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00d-1
+- Update to 5.28.00d
+
+* Mon May 02 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1.1
+- Fix emacs Requires on RHEL5
+
+* Thu Apr 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1
+- Update to 5.28.00c
+
+* Wed Mar 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-2
+- Rebuild for mysql 5.5.10
+
+* Sat Mar 19 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-1
+- Update to 5.28.00b
+
+* Mon Feb 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00a-1
+- Update to 5.28.00a
+- Drop patches fixed upstream: root-afterimage.patch, root-htmldoc.patch,
+  root-xlibs-ppc.patch, root-cstddef.patch
+- Remove the fedpkg workaround - no longer needed
+
+* Sat Feb 12 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-4
+- Add workaround for changes in fedpkg
+
+* Thu Feb 10 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-3
+- Add Requires on root-graf-postscript to root-gpad
+- Require libAfterImage 1.20 or later to fix issues with circular markers in
+  batch mode
+- Add python26 subpackage for EPEL 5
+- Fix an issue where the last item in a TGFontTypeComboBox is almost
+  invisible (backported from upstream)
+- Add missing cstddef includes for gcc 4.6
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.28.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1.1
+- Fix linking of Xlibs on ppc
+
+* Wed Dec 15 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1
+- Update to 5.28.00
+- Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch,
+  root-missing-explicit-link.patch, root-split-latex.patch,
+  root-cern-filename.patch, root-make-3.82.patch,
+  root-fonttype-combobox-dtor.patch
+- New sub-packages: root-genetic, root-graf-fitsio, root-hist-factory,
+  root-proof-pq2
+- Make root-io a separate package again - the circular dependency with the
+  root-core package was resolved upstream
+
+* Fri Nov 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-3
+- Fix crash in TGFontTypeComboBox destructor
+- Add Requires on root-gui-ged to root-gui
+
+* Mon Nov 01 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-2
+- Rebuild for updated unuran
+
+* Fri Oct 22 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-1
+- Update to 5.26.00e
+- Drop patch fixed upstream: root-tmva-segfault.patch
+- Add Requires on root-proof to root-proofd
+
+* Sat Oct 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-3
+- Add Requires on root-graf-asimage to root-core
+- Add Requires on root-graf-x11 to root-gui
+- Add Requires on root-hist-painter to root-hist
+- Add Requires on root-minuit to root-mathcore
+- Add Requires on krb5-workstation to root-net-krb5
+- Add BuildRequires on krb5-workstation
+
+* Mon Aug 30 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-2
+- Adapt makefile to changes in make 3.82
+
+* Fri Aug 27 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-1
+- Update to 5.26.00d
+- Improved doc generation script
+
+* Mon Aug 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-4
+- Don't remove the prec_stl directory
+- Create a separate tutorial package for the tutorial and test suite
+
+* Thu Jul 29 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-3
+- Correct license tags for: cint, core and roofit
+- Regenerate source tarball due to upstream retag (again)
+
+* Fri Jul 16 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-2
+- Add dependency on gccxml for globus-reflex
+- Split some packages to break circular package dependencies
+- Merge libRIO into root-core
+- Regenerate source tarball due to upstream retag
+
+* Mon Jul 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-1
+- Update to 5.26.00c
+- Disable cint7 package - no longer compiles and has been deprecated upstream
+
+* Wed Jun 09 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-3
+- Use external xrootd
+- Make documentation selfcontained - can be read without network access
+
+* Wed May 19 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-2
+- Fix library detection when linker scripts are used
+- Allow building RFIO IO modules using DPM's RFIO implementation
+
+* Sat Mar 20 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-1
+- Update to 5.26.00b
+- Enable dCache support - dcap library is now in Fedora
+- Use system unuran library instead of embedded sources
+
+* Mon Feb  1 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
+- Update to 5.26.00a
+- Disable cintex package for non-intel architectures
+- Remove embedded gl2ps sources
+
+* Wed Jan 13 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00-1
+- Update to 5.26.00
+- Drop patches fixed upstream: root-globus.patch, root-dot-png.patch,
+  root-loadmeta.patch, root-openssl.patch, root-hash-endian.patch
+
+* Fri Nov 27 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.24.00b-1
+- Initial build
diff --git a/sources b/sources
new file mode 100644
index 0000000..5330ee7
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
+7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From 16e38e12a22eeca8e79f98082024d05d0e389b77 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 14 Aug 2016 06:24:21 +0200
Subject: [PATCH 093/344] Revert "Retire packages without systemd support, See
 FESCo ticket 1605"

This reverts commit f23b63a03fa4f62bbb6dafaefe2821b80ceed9e8.
---
 .gitignore                       |    3 +
 dead.package                     |    1 -
 root-32bit.patch                 |   78 +
 root-abitags.patch               | 1267 +++++++++++
 root-arm.patch                   |   81 +
 root-avoid-gui-crash.patch       |   59 +
 root-avoid-std-bind-lambda.patch |   42 +
 root-broken-cmake-config.patch   |  156 ++
 root-cache-test.patch            |  284 +++
 root-cernlib-doc.patch           | 1307 +++++++++++
 root-compiledata.patch           |   12 +
 root-deprecated-options.patch    |   30 +
 root-dont-link-jvm.patch         |  123 ++
 root-dox-filter.patch            |   86 +
 root-doxyfile.patch              |   30 +
 root-doxygen-warnings.patch      |  723 +++++++
 root-fflags.patch                |   78 +
 root-fontconfig.patch            | 1408 ++++++++++++
 root-gl2ps.patch                 |  254 +++
 root-html-markup.patch           | 1031 +++++++++
 root-latex-markup.patch          |  877 ++++++++
 root-libgfortranbegin.patch      |  182 ++
 root-links.patch                 |  376 ++++
 root-llvm-static.patch           |   11 +
 root-macro-align.patch           |   36 +
 root-missing-cmake-config.patch  |  187 ++
 root-more-fflags.patch           |   33 +
 root-no-abi-check.patch          |   28 +
 root-no-testdata.patch           |   20 +
 root-ppc64.patch                 |   38 +
 root-private-public.patch        |  156 ++
 root-s390x.patch                 |  147 ++
 root-save-memory.patch           |   30 +
 root-see-macro-output.patch      |  266 +++
 root-soname.patch                |   11 +
 root-stressgraphics.patch        |   56 +
 root-template-files.patch        |   28 +
 root-test-install.patch          | 3105 +++++++++++++++++++++++++++
 root-testfiles.sh                |   85 +
 root-tildes.patch                |  194 ++
 root-tmath-doc.patch             |  274 +++
 root-tprincipal-doc.patch        |  483 +++++
 root-tvector2-comment.patch      |   13 +
 root-type1-embed.patch           |   97 +
 root-unuran.patch                |  305 +++
 root-werror.patch                |   12 +
 root.spec                        | 3462 ++++++++++++++++++++++++++++++
 sources                          |    2 +
 48 files changed, 17566 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 delete mode 100644 dead.package
 create mode 100644 root-32bit.patch
 create mode 100644 root-abitags.patch
 create mode 100644 root-arm.patch
 create mode 100644 root-avoid-gui-crash.patch
 create mode 100644 root-avoid-std-bind-lambda.patch
 create mode 100644 root-broken-cmake-config.patch
 create mode 100644 root-cache-test.patch
 create mode 100644 root-cernlib-doc.patch
 create mode 100644 root-compiledata.patch
 create mode 100644 root-deprecated-options.patch
 create mode 100644 root-dont-link-jvm.patch
 create mode 100644 root-dox-filter.patch
 create mode 100644 root-doxyfile.patch
 create mode 100644 root-doxygen-warnings.patch
 create mode 100644 root-fflags.patch
 create mode 100644 root-fontconfig.patch
 create mode 100644 root-gl2ps.patch
 create mode 100644 root-html-markup.patch
 create mode 100644 root-latex-markup.patch
 create mode 100644 root-libgfortranbegin.patch
 create mode 100644 root-links.patch
 create mode 100644 root-llvm-static.patch
 create mode 100644 root-macro-align.patch
 create mode 100644 root-missing-cmake-config.patch
 create mode 100644 root-more-fflags.patch
 create mode 100644 root-no-abi-check.patch
 create mode 100644 root-no-testdata.patch
 create mode 100644 root-ppc64.patch
 create mode 100644 root-private-public.patch
 create mode 100644 root-s390x.patch
 create mode 100644 root-save-memory.patch
 create mode 100644 root-see-macro-output.patch
 create mode 100644 root-soname.patch
 create mode 100644 root-stressgraphics.patch
 create mode 100644 root-template-files.patch
 create mode 100644 root-test-install.patch
 create mode 100755 root-testfiles.sh
 create mode 100644 root-tildes.patch
 create mode 100644 root-tmath-doc.patch
 create mode 100644 root-tprincipal-doc.patch
 create mode 100644 root-tvector2-comment.patch
 create mode 100644 root-type1-embed.patch
 create mode 100644 root-unuran.patch
 create mode 100644 root-werror.patch
 create mode 100644 root.spec
 create mode 100644 sources

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9ff0650
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/*.tar.xz
+/usa.root
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 1186b4b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Retire packages without systemd support, See FESCo ticket 1605
diff --git a/root-32bit.patch b/root-32bit.patch
new file mode 100644
index 0000000..326a8d8
--- /dev/null
+++ b/root-32bit.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
+--- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
+@@ -179,7 +179,7 @@
+ 
+    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
+ 
+-   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
++   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
+ 
+    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
+ 
+diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
+--- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
+@@ -1121,7 +1121,7 @@
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
+ #if defined (R__LINUX) && !defined(R__B64)
+    // problem of precision on linux 32
+-   if (Dim ==4) scale = 1000000000;
++   if (Dim ==4) scale = 5000000000;
+ #endif
+    // for problem with PtEtaPhiE
+    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
+diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
+--- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
+@@ -312,7 +312,7 @@
+    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
+    double par[2] = {3,4};
+    double xx[2] = {0.8,1.6};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -326,7 +326,7 @@
+    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
+    double par[2] = {3,4};
+    double xx[3] = {0.8,1.6,2.2};
+-   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
++   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
+    return ok; 
+ }
+ 
+@@ -369,12 +369,12 @@
+    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
+    f2.SetParameters(10,1,0,1);
+    f0.SetParameters(f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
+ 
+    TF1 f3("f3","f1+[0]");
+    // param order should be the same
+    f3.SetParameters( f2.GetParameters() );
+-   ok &= (f2.Eval(1) == f0.Eval(1) );
++   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
+    return ok;
+ }
+ 
+@@ -465,7 +465,7 @@
+    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
+    TF1 f6("f6",func,-10,10,4);
+    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
+-   ok &= (f5.Eval(2) == f6.Eval(2) );
++   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
+    return ok;
+ }
+ 
+@@ -485,7 +485,7 @@
+    // keep same order in evaluation
+    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
+    f0.SetParameters(1.1,2.1);
+-   ok &= (fsincos.Eval(2) == f0.Eval(2) );
++   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
+    return ok;
+ 
+ }
diff --git a/root-abitags.patch b/root-abitags.patch
new file mode 100644
index 0000000..040474a
--- /dev/null
+++ b/root-abitags.patch
@@ -0,0 +1,1267 @@
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
+--- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
+@@ -0,0 +1,90 @@
++========
++Abi Tags
++========
++
++Introduction
++============
++
++This text tries to describe gcc semantic for mangling "abi_tag" attributes
++described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
++
++There is no guarantee the following rules are correct, complete or make sense
++in any way as they were determined empirically by experiments with gcc5.
++
++Declaration
++===========
++
++Abi tags are declared in an abi_tag attribute and can be applied to a
++function, variable, class or inline namespace declaration. The attribute takes
++one or more strings (called tags); the order does not matter.
++
++See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
++details.
++
++Tags on an inline namespace are called "implicit tags", all other tags are
++"explicit tags".
++
++Mangling
++========
++
++All tags that are "active" on a <unqualified-name> are emitted after the
++<unqualified-name>, before <template-args> or <discriminator>, and are part of
++the same <substitution> the <unqualified-name> is.
++
++They are mangled as:
++
++    <abi-tags> ::= <abi-tag>*   # sort by name
++    <abi-tag> ::= B <tag source-name>
++
++Example:
++
++    __attribute__((abi_tag("test")))
++    void Func();
++
++    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
++
++Active tags
++===========
++
++A namespace has never any active tags; for types (class / struct / union /
++enum) the explicit tags are the active tags.
++
++For variables and functions the active tags are the explicit tags plus any
++"required tags" which are not in the "available tags" set:
++
++    derived-tags := (required-tags - available-tags)
++    active-tags := explicit-tags + derived-tags
++
++Required tags for a function
++============================
++
++If a function is used as a local scope for another name, and is part of
++another function as local scope, it doesn't have any required tags.
++
++If a function is used as a local scope for a guard variable name, it doesn't
++have any required tags.
++
++Otherwise the function requires any implicit or explicit tag used in the name
++for the return type.
++
++Required tags for a variable
++============================
++
++A variable requires any implicit or explicit tag used in its type.
++
++Available tags
++==============
++
++All tags used in the prefix and in the template arguments for a name are
++available; for functions also all  tags from the <bare-function-type> (which
++might include the return type for template functions) are available.
++
++For <local-name>s all active tags used in the local part (<function-
++encoding>) are available, but not implicit tags which were not active!
++
++Implicit and explicit tags used in the <unqualified-name> for a function (as
++in the type of a cast operator) are NOT available.
++
++Example: a cast operator to std::string (which is
++std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
++required from the return type `std::string` but not available.
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
+@@ -144,6 +144,7 @@
+ class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
+ class VariadicUnsignedArgument<string name> : Argument<name, 1>;
+ class VariadicExprArgument<string name> : Argument<name, 1>;
++class VariadicStringArgument<string name> : Argument<name, 1>;
+ 
+ // A version of the form major.minor[.subminor].
+ class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
+@@ -336,6 +337,14 @@
+ // Attributes begin here
+ //
+ 
++def AbiTag : Attr {
++  let Spellings = [GCC<"abi_tag">];
++  let Args = [VariadicStringArgument<"Tags">];
++  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
++                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
++  let Documentation = [Undocumented];
++}
++
+ def AddressSpace : TypeAttr {
+   let Spellings = [GNU<"address_space">];
+   let Args = [IntArgument<"AddressSpace">];
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
+@@ -2255,7 +2255,8 @@
+   "Objective-C instance methods|init methods of interface or class extension declarations|"
+   "variables, functions and classes|Objective-C protocols|"
+   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
+-  "interface or protocol declarations|kernel functions}1">,
++  "interface or protocol declarations|kernel functions|"
++  "structs, classes, variables, functions, methods and inline namespaces}1">,
+   InGroup<IgnoredAttributes>;
+ def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
+ def warn_type_attribute_wrong_type : Warning<
+@@ -3922,6 +3923,12 @@
+ def err_redefinition_extern_inline : Error<
+   "redefinition of a 'extern inline' function %0 is not supported in "
+   "%select{C99 mode|C++}1">;
++def err_attr_abi_tag_only_on_inline_namespace :
++  Error<"abi_tag attribute only allowed on inline namespaces">;
++def err_abi_tag_on_redeclaration :
++  Error<"cannot add abi_tag attribute in redeclaration">;
++def err_new_abi_tag_on_redeclaration :
++  Error<"abi_tag %0 missing in original declaration">;
+ 
+ def note_deleted_dtor_no_operator_delete : Note<
+   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
+@@ -846,7 +846,8 @@
+   ExpectedStructOrUnionOrTypedef,
+   ExpectedStructOrTypedef,
+   ExpectedObjectiveCInterfaceOrProtocol,
+-  ExpectedKernelFunction
++  ExpectedKernelFunction,
++  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
+ };
+ 
+ }  // end namespace clang
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
+@@ -202,6 +202,8 @@
+ class CXXNameMangler {
+   ItaniumMangleContextImpl &Context;
+   raw_ostream &Out;
++  bool NullOut = false;
++  bool DisableDerivedAbiTags = false;
+ 
+   /// The "structor" is the top-level declaration being mangled, if
+   /// that's not a template specialization; otherwise it's the pattern
+@@ -251,6 +253,167 @@
+ 
+   } FunctionTypeDepth;
+ 
++  // abi_tag is a gcc attribute, taking one or more strings called "tags".
++  //
++  // the goal is to annotage against which version of a library an object was
++  // build and to be able to provide backwards compatibility ("dual abi").
++  //
++  // for this the emitted mangled names have to be different, while you don't
++  // want the user to have to use different names in the source.
++  //
++  // the abi_tag can be present on Struct, Var and Function  declarations as
++  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
++  // are always emitted after the unqualified name, and (implicit) tags on
++  // namespace are not.
++  //
++  // For functions and variables there is a set of "implicitly available"
++  // tags. These tags are: all tags from the namespace/structs the name is
++  // embedded in, all tags from any template arguments of the name, and, for
++  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
++  // parameters and sometimes the return type).
++  //
++  // For functions this is basically the list of all tags from the signature
++  // without the unqualified name and usually without the return type of the
++  // function. In `operator Type()` Type is NOT part of that list, as it is
++  // part of the unqualified name!
++  //
++  // Now all tags from the function return type/variable type which are not
++  // "implicitly available" must be added to the explicit list of tags, and
++  // are emitted after the unqualified name.
++  //
++  // Example:
++  // namespace std {
++  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
++  //   inline namespace __cxx11 {
++  //     struct string { };
++  //   }
++  // }
++  //
++  // std::string foo(); // needs abi tag "cxx11" on foo
++  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
++  // __attribute__((__abi_tag__("cxx11")))
++  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
++  //
++  // The tags are sorted by name before emitting, and are serialized as
++  //   <abitag> ::= B <"tag" source-name>
++
++  typedef SmallVector<StringRef, 4> AbiTagList;
++
++  // state to gather all implicit and explicit tags used in a mangled name.
++  // must always have an instance of this while emitting any name to keep
++  // track.
++  //
++  // TODO(abitags): how to handle substituted names? they should add the tags used in
++  // the substitution to the list of available tags.
++  class AbiTagState final {
++  public:
++    //! all abi tags used implicitly or explicitly
++    std::set<StringRef> UsedAbiTags;
++    //! all explicit abi tags (i.e. not from namespace)
++    std::set<StringRef> EmittedAbiTags;
++
++    AbiTagState* &LinkHead;
++    AbiTagState *Parent{nullptr};
++
++    bool LinkActive{false};
++
++    explicit AbiTagState(AbiTagState* &linkHead)
++      : LinkHead(linkHead) {
++      Parent = LinkHead;
++      LinkHead = this;
++      LinkActive = true;
++    }
++
++    // no copy, no move
++    AbiTagState(AbiTagState const&) = delete;
++    AbiTagState& operator=(AbiTagState const&) = delete;
++
++    ~AbiTagState() {
++      pop();
++    }
++
++    void pop() {
++      if (!LinkActive) return;
++
++      assert(LinkHead == this && "abi tag link head must point to us on destruction");
++      LinkActive = false;
++      if (Parent) {
++        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
++        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
++      }
++      LinkHead = Parent;
++    }
++
++    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++      ND = cast<NamedDecl>(ND->getCanonicalDecl());
++
++      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
++        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
++      } else {
++        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
++        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
++          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
++            for (const auto& Tag: AbiTag->tags()) {
++              UsedAbiTags.insert(Tag);
++            }
++          }
++          // don't emit abi tags for namespaces
++          return;
++        }
++      }
++
++      AbiTagList TagList;
++      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
++        for (const auto& Tag: AbiTag->tags()) {
++          UsedAbiTags.insert(Tag);
++          // AbiTag->tags() is sorted and has no duplicates
++          TagList.push_back(Tag);
++        }
++      }
++
++      if (AdditionalAbiTags) {
++        for (const auto& Tag: *AdditionalAbiTags) {
++          UsedAbiTags.insert(Tag);
++          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
++            // don't insert duplicates
++            TagList.push_back(Tag);
++          }
++        }
++        // AbiTag->tags() are already sorted; only add if we had additional tags
++        std::sort(TagList.begin(), TagList.end());
++      }
++
++      writeSortedUniqueAbiTags(Out, TagList);
++    }
++
++  protected:
++    template<typename TagList>
++    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
++      for (const auto& Tag: AbiTags) {
++        EmittedAbiTags.insert(Tag);
++        Out << "B";
++        Out << Tag.size();
++        Out << Tag;
++      }
++    }
++  } *AbiTags = nullptr;
++  AbiTagState AbiTagsRoot{AbiTags};
++
++  struct TemporaryDisableDerivedAbiTags {
++    bool& StateRef;
++    bool OldState;
++
++    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
++    : StateRef(State) {
++      OldState = StateRef;
++      StateRef = Disable;
++    }
++    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
++    ~TemporaryDisableDerivedAbiTags() {
++      StateRef = OldState;
++    }
++  };
++
+   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
+ 
+   ASTContext &getASTContext() const { return Context.getASTContext(); }
+@@ -273,6 +436,10 @@
+     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
+       SeqID(0) { }
+ 
++  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
++    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
++      SeqID(Outer.SeqID) { }
++
+ #if MANGLE_CHECKER
+   ~CXXNameMangler() {
+     if (Out.str()[0] == '\01')
+@@ -286,18 +453,21 @@
+ #endif
+   raw_ostream &getStream() { return Out; }
+ 
++  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
++
+   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
+   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
+   void mangleNumber(const llvm::APSInt &I);
+   void mangleNumber(int64_t Number);
+   void mangleFloat(const llvm::APFloat &F);
+-  void mangleFunctionEncoding(const FunctionDecl *FD);
++  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
+   void mangleSeqID(unsigned SeqID);
+-  void mangleName(const NamedDecl *ND);
++  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
+   void mangleType(QualType T);
+   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
+   
+ private:
++  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
+ 
+   bool mangleSubstitution(const NamedDecl *ND);
+   bool mangleSubstitution(QualType T);
+@@ -326,31 +496,49 @@
+                             DeclarationName name,
+                             unsigned KnownArity = UnknownArity);
+ 
+-  void mangleName(const TemplateDecl *TD,
++  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
++
++  void mangleNameWithAbiTags(const NamedDecl *ND,
++                             const AbiTagList *AdditionalAbiTags,
++                             bool ExcludeUnqualifiedName);
++  void mangleTemplateName(const TemplateDecl *TD,
++                  const AbiTagList *AdditionalAbiTags,
++                  bool ExcludeUnqualifiedName,
+                   const TemplateArgument *TemplateArgs,
+                   unsigned NumTemplateArgs);
+-  void mangleUnqualifiedName(const NamedDecl *ND) {
+-    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
++  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
+   }
+   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
+-                             unsigned KnownArity);
+-  void mangleUnscopedName(const NamedDecl *ND);
+-  void mangleUnscopedTemplateName(const TemplateDecl *ND);
+-  void mangleUnscopedTemplateName(TemplateName);
++                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                  const AbiTagList *AdditionalAbiTags);
++  void mangleUnscopedTemplateName(TemplateName,
++                                  const AbiTagList *AdditionalAbiTags);
+   void mangleSourceName(const IdentifierInfo *II);
+-  void mangleLocalName(const Decl *D);
++  void mangleLocalName(const Decl *D,
++                       const AbiTagList *AdditionalAbiTags,
++                       bool ExcludeUnqualifiedName);
+   void mangleBlockForPrefix(const BlockDecl *Block);
+   void mangleUnqualifiedBlock(const BlockDecl *Block);
+   void mangleLambda(const CXXRecordDecl *Lambda);
+   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
+-                        bool NoFunction=false);
++                        const AbiTagList *AdditionalAbiTags,
++                        bool NoFunction,
++                        bool ExcludeUnqualifiedName);
+   void mangleNestedName(const TemplateDecl *TD,
++                        const AbiTagList *AdditionalAbiTags,
++                        bool ExcludeUnqualifiedName,
+                         const TemplateArgument *TemplateArgs,
+                         unsigned NumTemplateArgs);
+   void manglePrefix(NestedNameSpecifier *qualifier);
+   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
+   void manglePrefix(QualType type);
+-  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
++  void mangleTemplatePrefix(const TemplateDecl *ND,
++                            const AbiTagList *AdditionalAbiTags,
++                            bool NoFunction = false,
++                            bool ExcludeUnqualifiedName = false);
+   void mangleTemplatePrefix(TemplateName Template);
+   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
+   void mangleQualifiers(Qualifiers Quals);
+@@ -391,6 +579,10 @@
+   void mangleTemplateParameter(unsigned Index);
+ 
+   void mangleFunctionParam(const ParmVarDecl *parm);
++
++  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
++  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
++  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
+ };
+ 
+ }
+@@ -441,6 +633,11 @@
+   return true;
+ }
+ 
++void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
++  assert(AbiTags && "require AbiTagState");
++  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
++}
++
+ void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
+   // <mangled-name> ::= _Z <encoding>
+   //            ::= <data name>
+@@ -456,14 +653,28 @@
+     mangleName(cast<FieldDecl>(D));
+ }
+ 
+-void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
+-  // <encoding> ::= <function name> <bare-function-type>
+-  mangleName(FD);
+-
++void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
+   // Don't mangle in the type if this isn't a decl we should typically mangle.
+-  if (!Context.shouldMangleDeclName(FD))
++  if (!Context.shouldMangleDeclName(FD)) {
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
+     return;
++  }
++
++  // <encoding> ::= <function name> <bare-function-type>
++
++  if (ExcludeUnqualifiedName)
++  {
++    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
++    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
++  } else {
++    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
++    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
++  }
++
++  mangleFunctionEncodingBareType(FD);
++}
+ 
++void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
+   if (FD->hasAttr<EnableIfAttr>()) {
+     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
+     Out << "Ua9enable_ifI";
+@@ -509,7 +720,7 @@
+     FD = PrimaryTemplate->getTemplatedDecl();
+   }
+ 
+-  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
++  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
+                          MangleReturnType);
+ }
+ 
+@@ -567,7 +778,21 @@
+   return nullptr;
+ }
+ 
+-void CXXNameMangler::mangleName(const NamedDecl *ND) {
++// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
++void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
++  if (!ExcludeUnqualifiedName) {
++    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
++      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
++      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
++      return;
++    }
++  }
++  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
++}
++
++void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
++                                           const AbiTagList *AdditionalAbiTags,
++                                           bool ExcludeUnqualifiedName) {
+   //  <name> ::= <nested-name>
+   //         ::= <unscoped-name>
+   //         ::= <unscoped-template-name> <template-args>
+@@ -583,7 +808,7 @@
+     while (!DC->isNamespace() && !DC->isTranslationUnit())
+       DC = getEffectiveParentContext(DC);
+   else if (GetLocalClassDecl(ND)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+@@ -593,76 +818,88 @@
+     // Check if we have a template.
+     const TemplateArgumentList *TemplateArgs = nullptr;
+     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-      mangleUnscopedTemplateName(TD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+       mangleTemplateArgs(*TemplateArgs);
+       return;
+     }
+ 
+-    mangleUnscopedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedName(ND, AdditionalAbiTags);
+     return;
+   }
+ 
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(ND);
++    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
+     return;
+   }
+ 
+-  mangleNestedName(ND, DC);
++  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
+ }
+-void CXXNameMangler::mangleName(const TemplateDecl *TD,
+-                                const TemplateArgument *TemplateArgs,
+-                                unsigned NumTemplateArgs) {
++
++void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
++                                        const AbiTagList *AdditionalAbiTags,
++                                        bool ExcludeUnqualifiedName,
++                                        const TemplateArgument *TemplateArgs,
++                                        unsigned NumTemplateArgs) {
+   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
+ 
+   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
+-    mangleUnscopedTemplateName(TD);
++    if (!ExcludeUnqualifiedName)
++      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+   } else {
+-    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
++    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
+   }
+ }
+ 
+-void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
++void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
+   //  <unscoped-name> ::= <unqualified-name>
+   //                  ::= St <unqualified-name>   # ::std::
+ 
+   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
+     Out << "St";
+ 
+-  mangleUnqualifiedName(ND);
++  mangleUnqualifiedName(ND, AdditionalAbiTags);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
++void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (mangleSubstitution(ND))
+     return;
+ 
+   // <template-template-param> ::= <template-param>
+-  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
++  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
+     mangleTemplateParameter(TTP->getIndex());
+-  else
+-    mangleUnscopedName(ND->getTemplatedDecl());
++  } else {
++    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
++  }
+ 
+   addSubstitution(ND);
+ }
+ 
+-void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
++void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
++                                                const AbiTagList *AdditionalAbiTags) {
+   //     <unscoped-template-name> ::= <unscoped-name>
+   //                              ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleUnscopedTemplateName(TD);
++    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
+   
+   if (mangleSubstitution(Template))
+     return;
+ 
++  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
++
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Not a dependent template name?");
+   if (const IdentifierInfo *Id = Dependent->getIdentifier())
+     mangleSourceName(Id);
+   else
+     mangleOperatorName(Dependent->getOperator(), UnknownArity);
+-  
++
+   addSubstitution(Template);
+ }
+ 
+@@ -824,6 +1061,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespace());
+     break;
+   case NestedNameSpecifier::NamespaceAlias:
+     if (qualifier->getPrefix())
+@@ -832,6 +1070,7 @@
+     else
+       Out << "sr";
+     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+ 
+   case NestedNameSpecifier::TypeSpec:
+@@ -917,15 +1156,18 @@
+ 
+     case Type::Typedef:
+       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TypedefType>(type)->getDecl());
+       break;
+ 
+     case Type::UnresolvedUsing:
+       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
+       break;
+ 
+     case Type::Record:
+       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
++      writeAbiTags(cast<TagType>(type)->getDecl());
+       break;
+ 
+     case Type::TemplateSpecialization: {
+@@ -943,6 +1185,7 @@
+         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
+ 
+         mangleSourceName(temp->getIdentifier());
++        writeAbiTags(temp);
+         break;
+       }
+ 
+@@ -974,16 +1217,19 @@
+     case Type::InjectedClassName:
+       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
+                          ->getIdentifier());
++      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
+       break;
+ 
+     case Type::DependentName:
+       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
++      // writeAbiTags(cast<DependentNameType>(type));
+       break;
+ 
+     case Type::DependentTemplateSpecialization: {
+       const DependentTemplateSpecializationType *tst
+         = cast<DependentTemplateSpecializationType>(type);
+       mangleSourceName(tst->getIdentifier());
++      // writeAbiTags(tst);
+       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
+       break;
+     }
+@@ -1033,6 +1279,7 @@
+     }
+ 
+     mangleSourceName(qualifier->getAsIdentifier());
++    writeAbiTags(qualifier->getAsNamespaceAlias());
+     break;
+   }
+ 
+@@ -1049,12 +1296,14 @@
+                                           DeclarationName name,
+                                           unsigned knownArity) {
+   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
+-  mangleUnqualifiedName(nullptr, name, knownArity);
++  mangleUnqualifiedName(nullptr, name, knownArity,
++                        /*AdditionalAbiTags*/ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
+                                            DeclarationName Name,
+-                                           unsigned KnownArity) {
++                                           unsigned KnownArity,
++                                           const AbiTagList *AdditionalAbiTags) {
+   //  <unqualified-name> ::= <operator-name>
+   //                     ::= <ctor-dtor-name>
+   //                     ::= <source-name>
+@@ -1072,6 +1321,8 @@
+         Out << 'L';
+ 
+       mangleSourceName(II);
++      if (ND)
++        writeAbiTags(ND, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1111,6 +1362,7 @@
+       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
+ 
+       mangleSourceName(FD->getIdentifier());
++      // TODO(abitags): not emitting abi tags: internal name anyway
+       break;
+     }
+ 
+@@ -1131,6 +1383,9 @@
+       assert(D->getDeclName().getAsIdentifierInfo() &&
+              "Typedef was not named!");
+       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
++      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
++      // explicit abi tags are still possible; take from underlying type, not from typedef.
++      writeAbiTags(TD, nullptr);
+       break;
+     }
+ 
+@@ -1140,6 +1395,7 @@
+     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
+     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
+       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
++        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
+         mangleLambda(Record);
+         break;
+       }
+@@ -1151,6 +1407,7 @@
+       if (UnnamedMangle > 1)
+         Out << llvm::utostr(UnnamedMangle - 2);
+       Out << '_';
++      writeAbiTags(TD, AdditionalAbiTags);
+       break;
+     }
+ 
+@@ -1183,6 +1440,7 @@
+       // Otherwise, use the complete constructor name. This is relevant if a
+       // class with a constructor is declared within a constructor.
+       mangleCXXCtorType(Ctor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXDestructorName:
+@@ -1194,12 +1452,14 @@
+       // Otherwise, use the complete destructor name. This is relevant if a
+       // class with a destructor is declared within a destructor.
+       mangleCXXDtorType(Dtor_Complete);
++      writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXConversionFunctionName:
+     // <operator-name> ::= cv <type>    # (cast)
+     Out << "cv";
+     mangleType(Name.getCXXNameType());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXOperatorName: {
+@@ -1223,6 +1483,7 @@
+     // FIXME: This mangling is not yet official.
+     Out << "li";
+     mangleSourceName(Name.getCXXLiteralIdentifier());
++    writeAbiTags(ND, AdditionalAbiTags);
+     break;
+ 
+   case DeclarationName::CXXUsingDirective:
+@@ -1239,7 +1500,9 @@
+ 
+ void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
+                                       const DeclContext *DC,
+-                                      bool NoFunction) {
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool NoFunction,
++                                      bool ExcludeUnqualifiedName) {
+   // <nested-name> 
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
+   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
+@@ -1259,30 +1522,35 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD, NoFunction);
++    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
+     mangleTemplateArgs(*TemplateArgs);
+   }
+   else {
+     manglePrefix(DC, NoFunction);
+-    mangleUnqualifiedName(ND);
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND, AdditionalAbiTags);
+   }
+ 
+   Out << 'E';
+ }
+ void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
++                                      const AbiTagList *AdditionalAbiTags,
++                                      bool ExcludeUnqualifiedName,
+                                       const TemplateArgument *TemplateArgs,
+                                       unsigned NumTemplateArgs) {
+   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
+ 
+   Out << 'N';
+ 
+-  mangleTemplatePrefix(TD);
++  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
+   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
+ 
+   Out << 'E';
+ }
+ 
+-void CXXNameMangler::mangleLocalName(const Decl *D) {
++void CXXNameMangler::mangleLocalName(const Decl *D,
++                                     const AbiTagList *AdditionalAbiTags,
++                                     bool ExcludeUnqualifiedName) {
+   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
+   //              := Z <function encoding> E s [<discriminator>]
+   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
+@@ -1294,15 +1562,25 @@
+ 
+   Out << 'Z';
+ 
+-  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
+-    mangleObjCMethodName(MD);
+-  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
+-    mangleBlockForPrefix(BD);
+-  else
+-    mangleFunctionEncoding(cast<FunctionDecl>(DC));
++  {
++    AbiTagState localAbiTags(AbiTags);
++
++    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
++      mangleObjCMethodName(MD);
++    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
++      mangleBlockForPrefix(BD);
++    else
++      mangleFunctionEncoding(cast<FunctionDecl>(DC));
++
++    // implicit abi tags (from namespace) are not available in the following
++    // entity; reset to actually emitted tags, which are available.
++    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
++  }
+ 
+   Out << 'E';
+ 
++  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
++
+   if (RD) {
+     // The parameter number is omitted for the last parameter, 0 for the 
+     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
+@@ -1327,13 +1605,17 @@
+     // Mangle the name relative to the closest enclosing function.
+     // equality ok because RD derived from ND above
+     if (D == RD)  {
+-      mangleUnqualifiedName(RD);
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedName(RD, AdditionalAbiTags);
+     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
+-      mangleUnqualifiedBlock(BD);
++      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++      if (!ExcludeUnqualifiedName)
++        mangleUnqualifiedBlock(BD);
+     } else {
+       const NamedDecl *ND = cast<NamedDecl>(D);
+-      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
++      mangleNestedName(ND, getEffectiveDeclContext(ND),
++                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
+     }
+   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+     // Mangle a block in a default parameter; see above explanation for
+@@ -1350,30 +1632,35 @@
+       }
+     }
+ 
+-    mangleUnqualifiedBlock(BD);
++    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedBlock(BD);
+   } else {
+-    mangleUnqualifiedName(cast<NamedDecl>(D));
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
+   }
+ 
+-  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
+-    unsigned disc;
+-    if (Context.getNextDiscriminator(ND, disc)) {
+-      if (disc < 10)
+-        Out << '_' << disc;
+-      else
+-        Out << "__" << disc << '_';
++  if (!ExcludeUnqualifiedName) {
++    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
++      unsigned disc;
++      if (Context.getNextDiscriminator(ND, disc)) {
++        if (disc < 10)
++          Out << '_' << disc;
++        else
++          Out << "__" << disc << '_';
++      }
+     }
+   }
+ }
+ 
+ void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
+   if (GetLocalClassDecl(Block)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   const DeclContext *DC = getEffectiveDeclContext(Block);
+   if (isLocalContainerContext(DC)) {
+-    mangleLocalName(Block);
++    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
+     return;
+   }
+   manglePrefix(getEffectiveDeclContext(Block));
+@@ -1384,10 +1671,11 @@
+   if (Decl *Context = Block->getBlockManglingContextDecl()) {
+     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
+         Context->getDeclContext()->isRecord()) {
+-      if (const IdentifierInfo *Name
+-            = cast<NamedDecl>(Context)->getIdentifier()) {
++      const auto *ND = cast<NamedDecl>(Context);
++      if (const IdentifierInfo *Name = ND->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
++        Out << 'M';
+       }
+     }
+   }
+@@ -1420,7 +1708,7 @@
+       if (const IdentifierInfo *Name
+             = cast<NamedDecl>(Context)->getIdentifier()) {
+         mangleSourceName(Name);
+-        Out << 'M';            
++        Out << 'M';
+       }
+     }
+   }
+@@ -1502,11 +1790,11 @@
+   // Check if we have a template.
+   const TemplateArgumentList *TemplateArgs = nullptr;
+   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
+-    mangleTemplatePrefix(TD);
++    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+     mangleTemplateArgs(*TemplateArgs);
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND);
++    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
+   }
+ 
+   addSubstitution(ND);
+@@ -1517,7 +1805,7 @@
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+   if (TemplateDecl *TD = Template.getAsTemplateDecl())
+-    return mangleTemplatePrefix(TD);
++    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
+ 
+   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
+     manglePrefix(Qualified->getQualifier());
+@@ -1525,18 +1813,21 @@
+   if (OverloadedTemplateStorage *Overloaded
+                                       = Template.getAsOverloadedTemplate()) {
+     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
+-                          UnknownArity);
++                          UnknownArity,
++                          /* AdditionalAbiTags */ nullptr);
+     return;
+   }
+    
+   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
+   assert(Dependent && "Unknown template name kind?");
+   manglePrefix(Dependent->getQualifier());
+-  mangleUnscopedTemplateName(Template);
++  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
+ }
+ 
+ void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
+-                                          bool NoFunction) {
++                                          const AbiTagList *AdditionalAbiTags,
++                                          bool NoFunction,
++                                          bool ExcludeUnqualifiedName) {
+   // <template-prefix> ::= <prefix> <template unqualified-name>
+   //                   ::= <template-param>
+   //                   ::= <substitution>
+@@ -1548,10 +1839,12 @@
+ 
+   // <template-template-param> ::= <template-param>
+   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
++    // TODO(abitags): ???
+     mangleTemplateParameter(TTP->getIndex());
+   } else {
+     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
+-    mangleUnqualifiedName(ND->getTemplatedDecl());
++    if (!ExcludeUnqualifiedName)
++      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
+   }
+ 
+   addSubstitution(ND);
+@@ -1595,6 +1888,7 @@
+     // <name> ::= <nested-name>
+     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
+     mangleSourceName(Dependent->getIdentifier());
++    // writeAbiTags(Dependent);
+     break;
+   }
+ 
+@@ -2370,7 +2664,11 @@
+ 
+ void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
+   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
+-    mangleName(TD, T->getArgs(), T->getNumArgs());
++    // types only have explicit abi tags, no addition tags
++    mangleTemplateName(TD,
++                       /* AdditionalAbiTags */ nullptr,
++                       /* ExcludeUnqualifiedName */ false,
++                       T->getArgs(), T->getNumArgs());
+   } else {
+     if (mangleSubstitution(QualType(T, 0)))
+       return;
+@@ -2417,6 +2715,7 @@
+   Out << 'N';
+   manglePrefix(T->getQualifier());
+   mangleSourceName(T->getIdentifier());
++  // writeAbiTags(T); // TODO(abitags)
+   Out << 'E';
+ }
+ 
+@@ -3722,6 +4021,74 @@
+   Substitutions[Ptr] = SeqID++;
+ }
+ 
++std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
++  llvm::raw_null_ostream NullOutStream;
++  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
++
++  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
++    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
++  } else {
++    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
++  }
++
++  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
++  std::set<StringRef> ReturnTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
++
++    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
++    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
++    TrackReturnTypeTags.mangleType(Proto->getReturnType());
++    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
++
++    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: ReturnTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
++CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
++  // when derived abi tags are disabled there is no need to make any list
++  if (DisableDerivedAbiTags) return AbiTagList();
++
++  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
++  std::set<StringRef> VariableTypeTags;
++
++  {
++    llvm::raw_null_ostream NullOutStream;
++    CXXNameMangler TrackVariableType(*this, NullOutStream);
++
++    TrackVariableType.mangleType(VD->getType());
++
++    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
++  }
++
++  AbiTagList AdditionalAbiTags;
++
++  for (const auto& Tag: VariableTypeTags) {
++    if (ImplicitlyAvailableTags.count(Tag) == 0)
++      AdditionalAbiTags.push_back(Tag);
++  }
++
++  return AdditionalAbiTags;
++}
++
+ //
+ 
+ /// \brief Mangles the name of the declaration D and emits that name to the
+@@ -3824,6 +4191,7 @@
+   //  <special-name> ::= GV <object name>       # Guard variable for one-time
+   //                                            # initialization
+   CXXNameMangler Mangler(*this, Out);
++  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
+   Mangler.getStream() << "_ZGV";
+   Mangler.mangleName(D);
+ }
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -3948,6 +3948,58 @@
+       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
+ }
+ 
++static void handleAbiTagAttr(Sema &S, Decl *D,
++                             const AttributeList &Attr) {
++  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
++    return;
++
++  SmallVector<std::string, 4> Tags;
++
++  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
++    StringRef Tag;
++
++    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
++      return;
++
++    Tags.push_back(Tag);
++  }
++  // store tags sorted and without duplicates
++  std::sort(Tags.begin(), Tags.end());
++  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
++
++  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
++    if (!NS->isInline()) {
++      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
++      return;
++    }
++  }
++
++  const auto *CD = D->getCanonicalDecl();
++  if (CD != D) {
++    // redeclarations must not add new abi tags, or abi tags in the first place
++    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
++    if (nullptr == OldAbiTagAttr) {
++      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
++      S.Diag(CD->getLocation(), diag::note_previous_definition);
++      return;
++    }
++    for (const auto& NewTag: Tags) {
++      if (std::find(OldAbiTagAttr->tags_begin(),
++                    OldAbiTagAttr->tags_end(),
++                    NewTag) == OldAbiTagAttr->tags_end()) {
++        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
++        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
++        return;
++      }
++    }
++    return;
++  }
++
++  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
++                                          Tags.data(), Tags.size(),
++                                          Attr.getAttributeSpellingListIndex()));
++}
++
+ static void handleARMInterruptAttr(Sema &S, Decl *D,
+                                    const AttributeList &Attr) {
+   // Check the attribute arguments.
+@@ -4707,6 +4759,9 @@
+   case AttributeList::AT_Thread:
+     handleDeclspecThreadAttr(S, D, Attr);
+     break;
++  case AttributeList::AT_AbiTag:
++    handleAbiTagAttr(S, D, Attr);
++    break;
+ 
+   // Thread safety attributes:
+   case AttributeList::AT_AssertExclusiveLock:
+diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
+--- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
+@@ -79,6 +79,7 @@
+     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
+     .Case("Expr *", "ReadExpr(F)")
+     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
++    .Case("std::string", "ReadString(Record, Idx)")
+     .Default("Record[Idx++]");
+ }
+ 
+@@ -92,6 +93,7 @@
+     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
+     .Case("IdentifierInfo *", 
+           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
++    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
+     .Default("Record.push_back(" + std::string(name) + ");\n");
+ }
+ 
+@@ -986,6 +988,16 @@
+     }
+   };
+ 
++  class VariadicStringArgument : public VariadicArgument {
++  public:
++    VariadicStringArgument(const Record &Arg, StringRef Attr)
++      : VariadicArgument(Arg, Attr, "std::string")
++    {}
++    void writeValueImpl(raw_ostream &OS) const override {
++      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
++    }
++  };
++
+   class TypeArgument : public SimpleArgument {
+   public:
+     TypeArgument(const Record &Arg, StringRef Attr)
+@@ -1047,6 +1059,8 @@
+     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
+   else if (ArgName == "VariadicUnsignedArgument")
+     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
++  else if (ArgName == "VariadicStringArgument")
++    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
+   else if (ArgName == "VariadicEnumArgument")
+     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
+   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
new file mode 100644
index 0000000..d865e30
--- /dev/null
+++ b/root-arm.patch
@@ -0,0 +1,81 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
+@@ -19,7 +19,7 @@
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+ elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
+-  message(STATUS "Found a 64bit system")
++  message(STATUS "Found a 64bit ARM system")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+@@ -42,6 +42,18 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES arm)
++  message(STATUS "Found a 32bit ARM system")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxarm)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxarm)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
+@@ -52,6 +52,8 @@
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
+@@ -47,6 +47,8 @@
+     set(AFTER_CC "${AFTER_CC} -m64")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
+@@ -52,6 +52,10 @@
+     set(FREETYPE_CFLAGS "-m64 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+     set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
++    set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++    set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
+@@ -17,6 +17,8 @@
+ 
+ if(ROOT_ARCHITECTURE MATCHES linuxarm64)
+   set(ROOT_CLING_TARGET "AArch64")
++elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
++  set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
new file mode 100644
index 0000000..776e79a
--- /dev/null
+++ b/root-avoid-gui-crash.patch
@@ -0,0 +1,59 @@
+diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
+--- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
+@@ -30,7 +30,7 @@
+ shape, size, angle.</h2></center>
+ The picture below shows this interface.
+ End_Html
+-Begin_Macro(GUI)
++~~~
+ {
+    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
+    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
+@@ -41,7 +41,8 @@
+    r->SetWindowSize(700,500);
+    return r->GetMainFrame();
+ }
+-End_Macro */
++~~~
++*/
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
+@@ -72,7 +72,7 @@
+ <br><br>
+ A simple macro to use a TGTable with a TGSimpleTableInterface:
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    Int_t i = 0, j = 0;
+    UInt_t nrows = 6, ncolumns = 5;
+@@ -111,13 +111,13 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ Begin_Html
+ 
+ It is also possible to visualise data from a tree. A simple macro
+ showing the use of a TTreeTableInterface follows.
+ End_Html
+-Begin_Macro(source, gui)
++~~~
+ {
+    // Open a root file.
+    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
+@@ -153,7 +153,7 @@
+ 
+    return mainframe;
+ }
+-End_Macro
++~~~
+ */
+ 
+ // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
new file mode 100644
index 0000000..5cbff77
--- /dev/null
+++ b/root-avoid-std-bind-lambda.patch
@@ -0,0 +1,42 @@
+diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
+--- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
+@@ -33,6 +33,9 @@
+    // Total amount of numbers
+    const UInt_t nNumbers = 20000000U;
+ 
++   // We split the work in equal parts
++   const auto workSize = nNumbers / nWorkers;
++
+    // A simple function to fill ntuples randomly
+ 
+    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
+@@ -57,7 +60,7 @@
+    // We now go MP! ------------------------------------------------------------
+ 
+    // We define our work item
+-   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
++   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
+@@ -74,18 +77,10 @@
+    {
+       TimerRAII t("Parallel execution");
+ 
+-      // We split the work in equal parts
+-      const auto workSize = nNumbers / nWorkers;
+-
+-      // The work item requires two arguments, the map infrastructure offer
+-      // an interface to use only one. A standard solution is to use std::bind
+-      using namespace std::placeholders;
+-      auto workItemOneArg = std::bind(workItem, _1, workSize);
+-
+       // Fill the pool with work
+       std::forward_list<UInt_t> workerIDs(nWorkers);
+       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
+-      workers.Map(workItemOneArg, workerIDs);
++      workers.Map(workItem, workerIDs);
+    }
+ 
+    return 0;
diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
new file mode 100644
index 0000000..aaa4a6c
--- /dev/null
+++ b/root-broken-cmake-config.patch
@@ -0,0 +1,156 @@
+diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
+--- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
+@@ -0,0 +1,23 @@
++# - Locate dpm library
++# Defines:
++#
++#  DPM_FOUND
++#  DPM_INCLUDE_DIR
++#  DPM_INCLUDE_DIRS (not cached)
++#  DPM_LIBRARIES
++
++set(DPM_FOUND FALSE)
++
++find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
++find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
++
++set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
++set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
++
++if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
++  set(DPM_FOUND TRUE)
++  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
++endif()
++
++mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
+--- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
+@@ -9,7 +9,7 @@
+ 
+ find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
+           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
+-                /opt/globus/include
++                /opt/globus/include /usr/include
+           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
+                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
+ 
+@@ -24,7 +24,7 @@
+               openssl gsi_proxy_core callout)
+ 
+ foreach( lib ${libraries})
+-  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
++  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
+                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
+   if(GLOBUS_${lib}_LIBRARY)
+     set(GLOBUS_${lib}_FOUND 1)
+diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
+--- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
+@@ -6,7 +6,7 @@
+ #  HDFS_INCLUDE_DIRS (not cached)
+ #  HDFS_LIBRARIES
+ 
+-find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
++find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
+ find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
+ 
+ set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
+--- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
+@@ -2,8 +2,8 @@
+ #
+ # This module defines
+ # PCRE_INCLUDE_DIR, where to locate PCRE header files
+-# PCRE_LIBRARIES, the libraries to link against to use Pythia6
+-# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
++# PCRE_LIBRARIES, the libraries to link against to use PCRE
++# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
+ 
+ if(PCRE_CONFIG_EXECUTABLE)
+   set(PCRE_FIND_QUIETLY 1)
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
+@@ -446,15 +446,29 @@
+ endif()
+ 
+ #---Check for Castor-------------------------------------------------------------------
+-if(castor OR rfio)
++if(castor)
+   message(STATUS "Looking for Castor")
+   find_package(Castor)
+   if(NOT CASTOR_FOUND)
+     if(fail-on-missing)
+       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
+     else()
+-      message(STATUS "Castor not found. Switching off castor/rfio option")
++      message(STATUS "Castor not found. Switching off castor option")
+       set(castor OFF CACHE BOOL "" FORCE)
++    endif()
++  endif()
++endif()
++
++#---Check for RFIO-------------------------------------------------------------------
++if(rfio)
++  message(STATUS "Looking for RFIO")
++  find_package(Castor)
++  find_package(DPM)
++  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
++    if(fail-on-missing)
++      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
++    else()
++      message(STATUS "Castor or DPM not found. Switching off rfio option")
+       set(rfio OFF CACHE BOOL "" FORCE)
+     endif()
+   endif()
+diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
+--- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -0,0 +1,10 @@
++############################################################################
++# CMakeLists.txt file for building ROOT io/hdfs package
++############################################################################
++
++include_directories(${HDFS_INCLUDE_DIRS})
++
++ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
++
++ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
+--- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
+@@ -2,10 +2,16 @@
+ # CMakeLists.txt file for building ROOT io/rfio package
+ ############################################################################
+ 
+-include_directories(${CASTOR_INCLUDE_DIR})
+-
+ ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
+ 
++if(CASTOR_FOUND)
++include_directories(${CASTOR_INCLUDE_DIR})
+ ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
+     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
++else()
++include_directories(${DPM_INCLUDE_DIR})
++ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
++    DEPENDENCIES Net RIO)
++endif()
++
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
+--- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
+@@ -8,7 +8,6 @@
+ endif()
+ 
+ ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
+-ROOT_INSTALL_HEADERS()
+ 
+ if(builtin_openssl)
+   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
new file mode 100644
index 0000000..1cf437e
--- /dev/null
+++ b/root-cache-test.patch
@@ -0,0 +1,284 @@
+diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
+@@ -1907,8 +1907,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    TMultiGraph *mg;
+    TKey *key;
+diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
+--- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
+@@ -1956,7 +1956,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
+--- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
+@@ -10164,7 +10164,8 @@
+       refFile = TFile::Open(refFileName, "RECREATE");
+    }
+    else {
+-      refFile = TFile::Open(refFileName);
++      TFile::SetCacheFileDir(".");
++      refFile = TFile::Open(refFileName, "CACHEREAD");
+    }
+ 
+    if ( refFile != 0 ) {
+diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
+--- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
+@@ -78,9 +78,10 @@
+          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
+          return 1;
+       }
+-      fref = new TWebFile(refFile) ;
++      TFile::SetCacheFileDir(".");
++      fref = TFile::Open(refFile,"CACHEREAD") ;
+     } else {
+-      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
++      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
+     }
+     if (fref->IsZombie()) {
+       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
+diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
+--- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
+@@ -2011,21 +2011,15 @@
+   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
+ 
+   TFile* input(0);
+-
+   FileStat_t stat;
+ 
+-  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
+-  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
++  TString fname = "./tmva_class_example.root";
+   if(!gSystem->GetPathInfo(fname,stat)) {
+      input = TFile::Open( fname );
+-  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-     input = TFile::Open( "../"+fname );
+-  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
+-     input = TFile::Open( fcname );
+   } else {
+-     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
++     TFile::SetCacheFileDir(".");
++     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+   }
+-  delete [] fcname;
+   if (input == NULL) {
+      cerr << "broken/inaccessible input file" << endl;
+   }
+@@ -2440,14 +2434,12 @@
+    TFile* input(0);
+    FileStat_t stat;
+ 
+-   // FIXME:: give the filename of the sample somewhere else?
+-   TString fname = "../tmva/test/tmva_reg_example.root";
++   TString fname = "./tmva_reg_example.root";
+    if(!gSystem->GetPathInfo(fname,stat)) {
+       input = TFile::Open( fname );
+-   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
+-      input = TFile::Open( "../"+fname );
+    } else {
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
+    }
+    if (input == NULL) {
+       cerr << "broken/inaccessible input file" << endl;
+diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
+--- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
+@@ -27,23 +27,26 @@
+    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
+          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
+ 
+-
+    factory->AddVariable("myvar1 := var1+var2", 'F');
+    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
+    factory->AddVariable("var3",                "Variable 3", "units", 'F');
+    factory->AddVariable("var4",                "Variable 4", "units", 'F');
+-
+-
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
+-
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
+--- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
+@@ -36,12 +36,19 @@
+    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
+    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
+ 
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-
+-   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+ 
+diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
+--- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
+@@ -44,8 +44,8 @@
+    Double_t lat2 = 50;
+    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
+ 
+-   TFile *f;
+-   f = TFile::Open("http://root.cern.ch/files/usa.root");
++   TFile::SetCacheFileDir(".");
++   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+ 
+    if (!f) {
+       printf("Cannot access usa.root. Is internet working ?\n");
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
+@@ -221,14 +221,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+-   TString fname = "./tmva_example.root";   
+-   if (!gSystem->AccessPathName( fname )) 
++   TString fname = "./tmva_class_example.root";
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else    
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
+--- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
+@@ -201,13 +201,19 @@
+ 
+    // Read training and test data
+    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-   
+-   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-   
+-   TFile *input = TFile::Open( fname );
+-   
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
+    
+    // --- Register the training and test trees
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
+@@ -123,16 +123,16 @@
+    // Prepare input tree (this must be replaced by your data source)
+    // in this example, there is a toy tree with signal and one with background events
+    // we'll later on use only the "signal" events for the test in this example.
+-   //   
++   //
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+    if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   } 
+-   else { 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+    }
+-   
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
+--- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
+@@ -158,11 +158,13 @@
+    // load the signal and background event samples from ROOT trees
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+-   if (!gSystem->AccessPathName( fname )) 
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else 
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+-   
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
new file mode 100644
index 0000000..eb05d5d
--- /dev/null
+++ b/root-cernlib-doc.patch
@@ -0,0 +1,1307 @@
+diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
+--- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
+@@ -15,7 +15,7 @@
+ #include "Rtypes.h"
+ #include <string.h>
+ 
+-// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
++// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
+ 
+ ///////////////////////////////////////////////////////////////////////////////////////
+ //                                                                                   //
+@@ -25,8 +25,9 @@
+ // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
+ // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
+ // add the result to another matrix, add to square matrix the multiple of a diagonal //
+-// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
+-// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
++// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
++// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
++// Fortran convention.                                                               //
+ //                                                                                   //
+ ///////////////////////////////////////////////////////////////////////////////////////
+ 
+diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
+--- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
+@@ -11,8 +11,8 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // The set of methods to work with the plain matrix / vector
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
+-// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
++// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
+ //
+ // Revision 1.7  2006/05/21 18:05:26  brun
+ // Fix more coding conventions violations
+@@ -33,7 +33,7 @@
+ //
+ // Revision 1.3  2003/04/03 17:39:39  fine
+ // Make merge with ROOT 3.05.03 and add TR package
+-//122
++//
+ // Revision 1.2  2003/02/04 23:35:20  fine
+ // Clean up
+ //
+@@ -154,27 +154,24 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication
++///
+ /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
++// --      ENTRY MXMLRT
++// --                C = A(I,J) X B(J,J) X A*(J,I)
++// --                A* TANDS FOR A-TRANSPOSED
++//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
++//             CALL MXMPY (A,B,X,NI,NJ,NJ)
++//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
+ 
+-// --      ENTRY MXMLRT */
+-// --                C = A(I,J) X B(J,J) X A*(J,I) */
+-// --                A* TANDS FOR A-TRANSPOSED */
+-//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
+-//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
+-//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
+-
+-/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
+-/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
++//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
++//             CALL MXMPY (A,Y,C,NI,NJ,NI)
+ 
+ 
+ // --                C = A*(I,J) X B(J,J) X A(J,I)
+@@ -191,6 +188,12 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Matrix Multiplication (double precision)
++///
++/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
++/// ORIG. 01/01/64 RKB
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
+ {
+@@ -215,36 +218,31 @@
+     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// Matrix Transposition
+ ///
+-///  Matrix Transposition
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ float *TCL::mxtrp(const float *a, float *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ } /* mxtrp */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Matrix Transposition (double precision)
++/// Matrix Transposition (double precision)
++///
+ /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
+ /// ORIG. 01/01/64 RKB
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
+ 
+ double *TCL::mxtrp(const double *a, double *b, int i, int j)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
+- <!--*/
+- // -->END_HTML
+-
+    TCL_MXTRP(a, b, i, j)
+    return b;
+ 
+@@ -283,38 +281,35 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::traat(const float *a, float *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///  Symmetric Multiplication of Rectangular Matrices
++/// Symmetric Multiplication of Rectangular Matrices
++///
+ /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
+-/// ORIG. 18/12/74 WH */
++/// ORIG. 18/12/74 WH
++///
+ /// traat.F -- translated by f2c (version 19970219).
+ ///
+-///BEGIN_HTML <!--
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::traat(const double *a, double *s, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAAT(a, s, m, n)
+    return s;
+ } /* traat_ */
+@@ -346,34 +341,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
++/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tral.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAL(a, u, b, m,  n)
+    return b;
+ } /* tral_ */
+@@ -405,34 +400,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Triangular - Rectangular Multiplication
++///
+ /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
++///
+ /// tralt.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRALT(a, u, b, m, n)
+    return b;
+ } /* tralt_ */
+@@ -470,34 +465,34 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Symmetric - Rectangular Multiplication
+-/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// tras.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRAS(a, s, b, m, n)
+    return b;
+ } /* tras_ */
+@@ -543,51 +538,51 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Transformation of Symmetric Matrix
+-/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
++///
++/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
+ /// trasat.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    TCL_TRASAT(a, s, r__, m, n)
+    return r__;
+ } /* trasat_ */
+@@ -596,17 +591,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trata.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trata(const float *a, float *r__, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+@@ -636,22 +629,21 @@
+    return r__;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -684,25 +676,22 @@
+    return b;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
+-{
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
++{
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -743,26 +732,23 @@
+    return r__;
+ } /* tratsa_ */
+ 
+-//____________________________________________________________
+-// trchlu.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchlu.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ float *TCL::trchlu(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -806,15 +792,17 @@
+    return b;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trchul(const float *a, float *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -823,11 +811,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -875,17 +858,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trinv(const float *t, float *s, int n)
++{
+    int lhor, ipiv, lver, j;
+    double sum = 0;
+    double r__ = 0;
+@@ -934,22 +915,20 @@
+    return s;
+ } /* trinv_ */
+ 
+-//____________________________________________________________
+-// trla.F -- translated by f2c (version 19970219).
+-/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// trla.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -981,22 +960,19 @@
+ } /* trla_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trlta.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trlta.F -- translated by f2c (version 19970219).
+-// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
++float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
+ {
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --u;
+ 
+@@ -1036,16 +1012,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trpck(const float *s, float *u, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1072,17 +1047,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1140,16 +1113,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1190,17 +1162,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
++float *TCL::trsinv(const float *g, float *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -1209,17 +1179,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmlu(const float *u, float *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -1246,17 +1214,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++float *TCL::trsmul(const float *g, float *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -1284,18 +1250,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ float *TCL::trupck(const float *u, float *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -1336,25 +1299,20 @@
+ } /* trupck_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// trsat.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* trsat.F -- translated by f2c (version 19970219).
+-// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
++float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;    --s;
+ 
+@@ -1391,25 +1349,21 @@
+ 
+ // ------  double
+ 
+-//____________________________________________________________
+-// trata.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trata.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trata(const double *a, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int i__, j, ia, mn, ir, iat;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --a;
+ 
+@@ -1437,23 +1391,21 @@
+    return 0;
+ } /* trata_ */
+ 
+-//____________________________________________________________
+-// trats.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trats.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+    /* Parameter adjuTments */
+    --b;    --s;    --a;
+ 
+@@ -1487,24 +1439,22 @@
+    return 0;
+ } /* trats_ */
+ 
+-//____________________________________________________________
+-// tratsa.F -- translated by f2c (version 19970219).
+-/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
++////////////////////////////////////////////////////////////////////////////////
++/// tratsa.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int imax, i__, j, k;
+    int ia, ir, is, iaa, ind;
+    double sum;
+ 
+-   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --r__;    --s;    --a;
+ 
+@@ -1547,25 +1497,21 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trchlu.F -- translated by f2c (version 19970219).
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 W.HART
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trchlu(const double *a, double *b, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__, j;
+    double r__, dc;
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 W.HART */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1609,15 +1555,17 @@
+    return 0;
+ } /* trchlu_ */
+ 
+-//____________________________________________________________
+-// trchul.F -- translated by f2c (version 19970219).
++////////////////////////////////////////////////////////////////////////////////
++/// trchul.F -- translated by f2c (version 19970219).
++///
++/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
+ double *TCL::trchul(const double *a, double *b, int n)
+ {
+- //BEGIN_HTML <!--
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int ipiv, kpiv, i__;
+    double r__;
+@@ -1626,11 +1574,6 @@
+    int id, kd;
+    double sum;
+ 
+-
+-   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
+-   /* ORIG. 18/12/74 WH */
+-
+-
+    /* Parameter adjuTments */
+    --b;    --a;
+ 
+@@ -1677,17 +1620,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trinv.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trinv(const double *t, double *s, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int lhor, ipiv, lver,  j;
+    double r__;
+    int mx, ndTep, ind;
+@@ -1735,19 +1676,16 @@
+ } /* trinv_ */
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///
+ /// trla.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+ ///
+-///BEGIN_HTML <!--
++/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
++double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    int ipiv, ia, ib, iu;
+    double sum;
+ 
+@@ -1782,17 +1720,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trlta.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
+    double sum;
+ 
+@@ -1834,16 +1770,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trpck.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
++
++double *TCL::trpck(const double *s, double *u, int n)
++{
+    int i__, ia, ind, ipiv;
+ 
+    /* Parameter adjuTments */
+@@ -1869,17 +1804,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trqsq.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    int indq, inds, imax, i__, j, k, l;
+    int iq, ir, is, iqq;
+    double sum;
+@@ -1936,16 +1869,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsa.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++///
++/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
+@@ -1985,17 +1917,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsinv.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
++double *TCL::trsinv(const double *g, double *gi, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Function Body */
+    trchlu(g, gi, n);
+    trinv(gi, gi, n);
+@@ -2006,17 +1936,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmlu.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmlu(const double *u, double *s, int n)
++{
+    /* Local variables */
+    int lhor, lver, i__, k, l, ind;
+    double sum;
+@@ -2043,17 +1971,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsmul.F -- translated by f2c (version 19970219).
+-/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
+-/// ORIG. 18/12/74 WH */
+-///BEGIN_HTML <!--
+-
+-/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
+-{
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
++///
++/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
++/// ORIG. 18/12/74 WH
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
++double *TCL::trsmul(const double *g, double *gi, int n)
++{
+    /* Local variables */
+    int lhor, lver, lpiv, i__, j, k, ind;
+    double sum;
+@@ -2081,18 +2007,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trupck.F -- translated by f2c (version 19970219).
++///
+ /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+-/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
++double *TCL::trupck(const double *u, double *s, int m)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+-
+    int i__, im, is, iu, iv, ih, m2;
+ 
+    /* Parameter adjuTments */
+@@ -2133,17 +2056,15 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// trsat.F -- translated by f2c (version 19970219)
++///
+ /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
+ /// ORIG. 18/12/74 WH
+-///BEGIN_HTML <!--
++///
++/// See original documentation of CERNLIB package
++/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
+ 
+ double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
+ {
+- /* -->
+-  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
+- <!--*/
+- // -->END_HTML
+-
+    /* Local variables */
+    int inds, i__, j, k, ia, ib, is;
+    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
new file mode 100644
index 0000000..4f30e9b
--- /dev/null
+++ b/root-compiledata.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
+--- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
+@@ -75,7 +75,7 @@
+ 
+ # Remove the flags turning warnings into errors or extending
+ # the number of warnings.
+-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
++CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
+ 
+ # Determine the compiler version
+ BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
new file mode 100644
index 0000000..0049c46
--- /dev/null
+++ b/root-deprecated-options.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
++++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
+@@ -202,7 +202,7 @@
+     enable_unuran=yes
+     enable_vc=yes
+     enable_vdt=yes
+-    #enable_r=yes
++    enable_r=yes
+ fi
+ 
+ # Remove old log file
+@@ -2288,7 +2288,7 @@
+         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "yes:"; then
+@@ -2318,7 +2318,7 @@
+         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
+         eval prev='$'`echo ${f}`
+         eval prev_expl='$'`echo ${f}_explicit`
+-        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
++        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
+             echo "WARNING: option $1 is deprecated and ignored"'!'
+         else
+             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
new file mode 100644
index 0000000..fdc0091
--- /dev/null
+++ b/root-dont-link-jvm.patch
@@ -0,0 +1,123 @@
+diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
+@@ -263,10 +263,6 @@
+ set(hdfslib ${HDFS_LIBRARY})
+ set(hdfsincdir ${HDFS_INCLUDE_DIR})
+ 
+-set(jniincdir ${Java_INCLUDE_DIRS})
+-set(jvmlib ${Java_LIBRARIES})
+-set(jvmlibdir ${Java_LIBRARY_DIR})
+-
+ set(buildalien ${value${alien}})
+ set(alienlibdir ${ALIEN_LIBRARY_DIR})
+ set(alienlib ${ALIEN_LIBRARY})
+diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
+@@ -251,9 +251,6 @@
+ HDFSLIBDIR     := @hdfslibdir@
+ HDFSCLILIB     := @hdfslib@
+ HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
+-JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
+-JVMCLILIB      := @jvmlib@
+-JVMLIBDIR      := @jvmlibdir@
+ 
+ BUILDALIEN     := @buildalien@
+ ALIENLIBDIR    := @alienlibdir@
+diff -ur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
++++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
+@@ -1822,8 +1822,6 @@
+   hdfs-incdir        HDFS support, location of hdfs.h
+   hdfs-libdir        HDFS support, location of libhdfs
+   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
+-  jni-incdir         HDFS support, location of JNI headers
+-  jvm-libdir         HDFS support, location of JVM library
+   krb5               Kerberos5 support, location of Kerberos distribution
+   krb5-incdir        Kerberos5 support, location of krb5.h
+   krb5-libdir        Kerberos5 support, location of libkrb5
+@@ -2214,8 +2212,6 @@
+       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
+       --with-iosvers=*)        iosvers=$optarg       ;;
+-      --with-jni-incdir=*)     jniincdir=$optarg     ;;
+-      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
+       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
+       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
+       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
+@@ -4535,17 +4531,6 @@
+     hdfsinc=$found_hdr
+     hdfsincdir=$found_dir
+ 
+-    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
+-       JAVA_HOME=`/usr/libexec/java_home`
+-    fi
+-
+-    keepincdir=$jniincdir
+-    check_header "jni.h" "$jniincdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/include} \
+-        /usr/java/default/include /usr/include /usr/local/include
+-    jniinc=$found_hdr
+-    jniincdir=$found_dir
+-
+     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
+         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
+         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
+@@ -4553,26 +4538,12 @@
+     hdfslib=$found_lib
+     hdfslibdir=$found_dir
+ 
+-    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
+-        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
+-        /usr/java/default/jre/lib/amd64/server \
+-        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
+-    jvmlib=$found_lib
+-    jvmlibdir=$found_dir
+-
+-    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
++    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
+         enable_hdfs="no"
+     else
+         case $platform in
+             linux)
+-                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
+-                if test $link_result -eq 0 ; then
+-                    enable_hdfs="no"
+-                fi
+-
+-                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
++                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
+                 if test $link_result -eq 0 ; then
+                     enable_hdfs="no"
+                 fi
+@@ -7641,9 +7612,6 @@
+     -e "s|@iosvers@|$iosvers|"                  \
+     -e "s|@iconpath@|$iconpath|"                \
+     -e "s|@incdir@|$incdir|"                    \
+-    -e "s|@jniincdir@|$jniincdir|g"             \
+-    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
+-    -e "s|@jvmlib@|$jvmlib|g"                   \
+     -e "s|@krb5incdir@|$krb5incdir|"            \
+     -e "s|@krb5lib@|$krb5lib|"                  \
+     -e "s|@krb5libdir@|$krb5libdir|"            \
+diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
+--- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
+@@ -44,7 +44,7 @@
+ $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
+-		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
++		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
+ 
+ $(call pcmrule,HDFS)
+ 	$(noop)
+@@ -72,4 +72,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
++$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
new file mode 100644
index 0000000..1bf85d2
--- /dev/null
+++ b/root-dox-filter.patch
@@ -0,0 +1,86 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
+--- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
+@@ -98,6 +98,7 @@
+ 
+    // Source file.
+    if (gSource) {
++      size_t spos = 0;
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+ 
+@@ -106,10 +107,11 @@
+              gLineString.find("/** \\class")  != string::npos ||
+              gLineString.find("///! \\class") != string::npos) gClass = true;
+ 
+-         if (gLineString.find("End_Macro") != string::npos) {
++         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
+             ReplaceAll(gLineString,"End_Macro","");
+             gImageSource = false;
+             gInMacro = 0;
++            spos = 0;
+             if (m) {
+                fclose(m);
+                m = 0;
+@@ -122,8 +124,9 @@
+          }
+ 
+          if (gInMacro) {
++            if (spos) gLineString = gLineString.substr(spos);
+             if (gInMacro == 1) {
+-               if (EndsWith(gLineString,".C\n")) {
++               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
+                   ExecuteMacro();
+                   gInMacro++;
+                } else {
+@@ -153,14 +156,27 @@
+             }
+          }
+ 
+-         if (gLineString.find("Begin_Macro") != string::npos) {
++         if (gLineString.find("Begin_Macro") != string::npos &&
++             gLineString.find("End_Macro") == string::npos) {
++            if (BeginsWith(gLineString, "///")) {
++               spos = gLineString.find_first_not_of(' ', 3);
++            }
+             if (gLineString.find("source") != string::npos) gImageSource = true;
+             gImageID++;
+             gInMacro++;
+             gLineString = "\n";
+          }
+ 
+-         printf("%s",gLineString.c_str());
++         size_t l = gLineString.length();
++         size_t b = 0;
++         do {
++            size_t e = gLineString.find('\n', b);
++            if (e != string::npos) e++;
++            if (spos) printf("%-*s%s", (int)spos, "///",
++                              gLineString.substr(b, e - b).c_str());
++            else printf("%s", gLineString.substr(b, e - b).c_str());
++            b = e;
++         } while (b < l);
+       }
+       fclose(f);
+       return 0;
+@@ -203,7 +219,8 @@
+    if (gSource) {
+       while (fgets(gLine,255,f)) {
+          gLineString = gLine;
+-         if (gLineString.find("ClassImp") != string::npos) {
++         if (gLineString.find("ClassImp") != string::npos ||
++             gLineString.find("NamespaceImp") != string::npos) {
+             i1         = gLineString.find("(")+1;
+             i2         = gLineString.find(")")-1;
+             gClassName = gLineString.substr(i1,i2-i1+1);
+@@ -238,8 +255,8 @@
+ 
+    // Build the ROOT command to be executed.
+    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
+-   int l = gLineString.length();
+-   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
++   size_t l = gLineString.length();
++   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
+ 
+    ExecuteCommand(gLineString);
+ 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
new file mode 100644
index 0000000..46d6dde
--- /dev/null
+++ b/root-doxyfile.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
+--- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
+@@ -2058,7 +2058,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-MACRO_EXPANSION        = NO
++MACRO_EXPANSION        = YES
+ 
+ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+ # the macro expansion is limited to the macros specified with the PREDEFINED and
+@@ -2066,7 +2066,7 @@
+ # The default value is: NO.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-EXPAND_ONLY_PREDEF     = NO
++EXPAND_ONLY_PREDEF     = YES
+ 
+ # If the SEARCH_INCLUDES tag is set to YES the includes files in the
+ # INCLUDE_PATH will be searched if a #include is found.
+@@ -2098,7 +2098,7 @@
+ # recursively expanded use the := operator instead of the = operator.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+ 
+-PREDEFINED             =
++PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
+ 
+ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+ # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
new file mode 100644
index 0000000..35814e2
--- /dev/null
+++ b/root-doxygen-warnings.patch
@@ -0,0 +1,723 @@
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
+@@ -1,4 +1,4 @@
+-/// \file impl_tuple_apply.h
++/// \file ROOT/impl_tuple_apply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RArrayView.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
+@@ -1,4 +1,4 @@
+-/// \file rhysd_array_view.h
++/// \file ROOT/rhysd_array_view.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
+@@ -1,4 +1,4 @@
+-/// \file RArrayView.h
++/// \file ROOT/RTupleApply.h
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCoopPtr
++/// \file ROOT/TCoopPtr.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDirectory.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TDrawable.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-08-07
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
+@@ -1,4 +1,4 @@
+-/// \file TKey.h
++/// \file ROOT/TKey.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
+--- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
+@@ -1,4 +1,4 @@
+-/// \file TDirectory.h
++/// \file ROOT/TLogger.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-29
+diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
+--- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
+@@ -57,7 +57,7 @@
+       // Same value as TVirtualCollectionProxy.
+       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
+ 
+-   /** @class template TCollectionProxyInfo::IteratorValue
++   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
+     *
+     * Small helper to encapsulate whether to return the value
+     * pointed to by the iterator or its address.
+@@ -76,7 +76,7 @@
+          }
+       };
+ 
+-   /** @class template TCollectionProxyInfo::Iterators
++   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
+     *
+     * Small helper to implement the function to create,access and destroy
+     * iterators.
+@@ -204,7 +204,7 @@
+          }
+       };
+ 
+-  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
++  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
+     *
+     * Small helper to save proxy environment in the event of
+     * recursive calls.
+@@ -276,7 +276,7 @@
+       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
+    };
+ 
+-   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Type
+     *
+     * Small helper to encapsulate basic data accesses for
+     * all STL continers.
+@@ -356,7 +356,7 @@
+ 
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like vector, list, deque
+@@ -389,7 +389,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like forward_list
+@@ -425,7 +425,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+@@ -457,7 +457,7 @@
+       }
+    };
+ 
+-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
++   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
+     *
+     * Small helper to encapsulate all necessary data accesses for
+     * containers like set, multiset etc.
+diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
+--- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
+@@ -1,4 +1,4 @@
+-/// \file TCanvas.h
++/// \file ROOT/TCanvas.h
+ /// \ingroup Gpad ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-08
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
+@@ -26,7 +26,7 @@
+ #include "TClass.h"
+ #include "TError.h"
+ 
+-/** \class
++/** \class TGLPolyMarker
+ \ingroup opengl
+ To draw a 3D polymarker in a GL window.
+ */
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
+@@ -14,7 +14,7 @@
+ 
+ #include <string.h>
+ 
+-/** \class
++/** \class TGLSelectRecordBase
+ \ingroup opengl TGLSelectRecordBase
+ Base class for select records.
+ Supports initialization from a raw GL record (UInt_t*) and
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
+@@ -15,7 +15,7 @@
+ #include "TGLPlotCamera.h"
+ #include "TGLIncludes.h"
+ 
+-/** \class
++/** \class TGLVoxelPainter
+ \ingroup opengl
+ Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
+ */
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
+@@ -49,11 +49,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
+-\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
+-\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
+-\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
+-\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
++\class TH1C
++\brief 1-D histogram with a byte per channel (see TH1 documentation)
++\class TH1S
++\brief 1-D histogram with a short per channel (see TH1 documentation)
++\class TH1I
++\brief 1-D histogram with an int per channel (see TH1 documentation)}
++\class TH1F
++\brief 1-D histogram with a float per channel (see TH1 documentation)}
++\class TH1D
++\brief 1-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
+@@ -30,11 +30,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
+-\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
+-\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
+-\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
+-\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
++\class TH2C
++\brief 2-D histogram with a byte per channel (see TH1 documentation)
++\class TH2S
++\brief 2-D histogram with a short per channel (see TH1 documentation)
++\class TH2I
++\brief 2-D histogram with an int per channel (see TH1 documentation)}
++\class TH2F
++\brief 2-D histogram with a float per channel (see TH1 documentation)}
++\class TH2D
++\brief 2-D histogram with a double per channel (see TH1 documentation)}
+ @}
+ */ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
+--- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
+@@ -28,11 +28,16 @@
+ 
+ /** \addtogroup Hist
+ @{
+-\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
+-\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
+-\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
+-\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
+-\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
++\class TH3C
++\brief 3-D histogram with a byte per channel (see TH1 documentation)
++\class TH3S
++\brief 3-D histogram with a short per channel (see TH1 documentation)
++\class TH3I
++\brief 3-D histogram with an int per channel (see TH1 documentation)}
++\class TH3F
++\brief 3-D histogram with a float per channel (see TH1 documentation)}
++\class TH3D
++\brief 3-D histogram with a double per channel (see TH1 documentation)}
+ @} 
+ */
+ 
+diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
+--- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistDrawable.cxx
++/// \file THistDrawable.cxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-11
+diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
+--- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
+@@ -1,4 +1,4 @@
+-/// \file ROOT/THistPainter.cxx
++/// \file THistPainter.cxx
+ /// \ingroup HistPainter ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
+--- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
+@@ -2463,7 +2463,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Write the first part of the links shown ontop of each doc page;
+-/// one <div> has to be closed by caller so additional items can still
++/// one \<div\> has to be closed by caller so additional items can still
+ /// be added.
+ 
+ void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
+diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
+--- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
+@@ -63,7 +63,7 @@
+                        const char *location = 0);
+    static Bool_t CheckFile(const char *path, const char *location = 0);
+ 
+-   /// Note: This must be kept in sync with values #defined in dcap.h
++   /// Note: This must be kept in sync with values \#defined in dcap.h
+    enum EOnErrorAction {
+       kOnErrorRetry   =  1,
+       kOnErrorFail    =  0,
+diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
+--- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
+@@ -160,7 +160,7 @@
+ };
+ 
+ /**
+- \class TCollectionClassStreamer TCollectionProxy.h
++ \class TCollectionClassStreamer TCollectionProxyFactory.h
+  \ingroup IO
+ 
+  Class streamer object to implement TClassStreamer functionality
+diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
+--- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
+@@ -434,7 +434,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include needed for the argument of
++/// Add to the header file, the \#include needed for the argument of
+ /// this template.
+ 
+ UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
+@@ -587,7 +587,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Add to the header file anything that need to appear after the class
+-/// declaration (this includes some #pragma link).
++/// declaration (this includes some \#pragma link).
+ 
+ void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
+ {
+diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
+--- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
+@@ -3645,7 +3645,7 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Add to the header file, the #include need for this class.
++/// Add to the header file, the \#include need for this class.
+ 
+ UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
+ {
+diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
+--- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFile.h
++/// \file ROOT/TFile.h
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
+--- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
+@@ -4,7 +4,7 @@
+ 
+ \brief The %ROOT Mathematical Libraries.
+ 
+-See the \subpage MathPage "Mathematical Libraries" description page.
++See the \ref MathPage "Mathematical Libraries" description page.
+ 
+ 
+ \page MathPage The ROOT Mathematical Libraries 
+@@ -39,7 +39,7 @@
+ - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
+ 
+    - Physics: library with the TVector3 and TLorentzVector classes.
+-   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
++   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
+ 
+ - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
+@@ -18,9 +18,7 @@
+ #define ROOT_Math_Random
+ 
+ /**
+-@defgroup Random 
+-
+- Interface class for Random number generation
++@defgroup Random Interface class for Random number generation
+ */
+ 
+ #include "Math/RandomFunctions.h"
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
+@@ -209,7 +209,7 @@
+ 
+   /**
+ 
+-  Calculates the real part of the cosine integral \Re(Ci).
++  Calculates the real part of the cosine integral Re(Ci).
+ 
+   For x<0, the imaginary part is \pi i and has to be added by the user,
+   for x>0 the imaginary part of Ci(x) is 0.
+diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
+--- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
+@@ -21,7 +21,8 @@
+ 
+ /**
+ 
+-\class TKDTree class implementing a kd-tree
++\class TKDTree
++\brief Class implementing a kd-tree
+ 
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
+--- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
+@@ -1,4 +1,4 @@
+-/// \file TFit.h
++/// \file ROOT/TFit.h
+ /// \ingroup MathCore ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
+@@ -83,9 +83,6 @@
+ 
+     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
+     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
+-
+-    @ingroup MCIntegration
+-
+    */
+ 
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
+@@ -51,7 +51,7 @@
+    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
+                \cdot \left ( \int \limits_{0}^{1}
+                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
+-               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
++               - \kappa \, e^{\frac{-s}{\kappa}}\f].
+    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
+ 
+    The parameters are:
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
+@@ -84,16 +84,17 @@
+ // [5.2.1.6] (complete) elliptic integral of the third kind
+ // (26.x.17.2)
+ /**
++Complete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+@@ -220,16 +221,17 @@
+ // phi in radians
+ // (26.x.17.1)
+ /**
++Incomplete elliptic integral of the third kind.
+ 
+ There are two different definitions used for the elliptic
+ integral of the third kind:
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ and
+-
+-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
+-
++\f[
++P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
++\f]
+ the former is adopted by
+ 
+ - GSL
+diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
+--- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
+@@ -38,7 +38,7 @@
+     - The user can optionally provide the
+ 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
+ 	  - the mode via **TUnuranContDist::SetMode**,
+-      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
++	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
+ 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
+ 
+ Some of this information is required depending on the chosen UNURAN generation method.
+diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
+--- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.h
++/*! \file TGLiteResult.h
+ *//*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
+--- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
+@@ -10,7 +10,7 @@
+  *************************************************************************/
+ 
+ /************************************************************************/
+-/*! \file TGLiteresult.cxx
++/*! \file TGLiteResult.cxx
+  */ /*
+ 
+          version number:    $LastChangedRevision: 1678 $
+diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
+--- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
+@@ -60,8 +60,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// method used to get or set http header in the string buffer
+ /// Header has following format:
+-///   field1 : value1\r\n
+-///   field2 : value2\r\n
++///   field1 : value1\\r\\n
++///   field2 : value2\\r\\n
+ /// Such format corresponds to header format in HTTP requests
+ 
+ TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
+diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
+--- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
+@@ -1195,7 +1195,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
+-/// line [\r]\n. If so, return the pointer to the position after the line,
++/// line [\\r]\\n. If so, return the pointer to the position after the line,
+ /// otherwise return 0. This is used as callback to GetHunk(). The data
+ /// between START and PEEKED has been read and cannot be "unread"; the
+ /// data after PEEKED has only been peeked.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
+--- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
+@@ -813,7 +813,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+@@ -826,7 +826,7 @@
+ 
+ 	/** @brief I/O manipulator support
+ 	 *
+-	 * @param f manipulator
++	 * @param manip manipulator
+ 	 * @returns pipe with manipulator applied
+ 	 *
+ 	 * example:
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
+@@ -1002,7 +1002,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
+ 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
+@@ -1264,7 +1264,7 @@
+ ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
+ ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
+ ///                                + n specified additional digits (1 is sensible default)
+-///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
++///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
+ ///
+ 
+ RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
+@@ -21,7 +21,7 @@
+    RooAbsReal is the common abstract base class for objects that represent a
+    real value and implements functionality common to all real-valued objects
+    such as the ability to plot them, to construct integrals of them, the
+-   ability to advertise (partial) analytical integrals etc..
++   ability to advertise (partial) analytical integrals etc.
+    
+    Implementation of RooAbsReal may be derived, thus no interface
+    is provided to modify the contents.
+diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
+--- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
+@@ -838,7 +838,7 @@
+ /// L = TLatex mode
+ /// X = Latex mode
+ /// Y = Latex table mode ( '=' replaced by '&' )
+-/// V = Make name \verbatim in Latex mode
++/// V = Make name \\verbatim in Latex mode
+ /// P = use error to control shown precision
+ /// F = force fixed precision
+ ///
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
+@@ -55,7 +55,7 @@
+    confidence level is reached within an acceptable neighborhood as defined by
+    SetEpsilon(). More specifically: we calculate the following for different
+    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
+-   d{normset} \$.
++   d{normset} \f$.
+    Important note: this is not the default method because of a bug in constructing
+    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
+    calling SetUseKeys(true), and the data set will be interpreted without weights.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
+@@ -53,7 +53,7 @@
+ To make Propose(xPrime, x) dependent on x, configure with
+ PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
+ 
+-````{.cpp}
++~~~{.cpp}
+ // our parameter
+ RooRealVar p("p", "p", 5, 0, 10);
+ 
+@@ -74,7 +74,7 @@
+ // number of proposals. If you don't call this function, the default cache size
+ // is 1, which can be slow.
+ pdfProposal.SetCacheSize(desiredCacheSize);
+-````
++~~~
+ 
+ PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
+ for future versions.
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
+@@ -40,8 +40,8 @@
+ By default the calculation is:
+ 
+ \f[
+-	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
+-   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
++        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
+ \f]
+ 
+ where \f$ \lambda \f$ is the profile likeihood ratio, so the 
+@@ -50,11 +50,11 @@
+ If ``SetSubtractMLE(false)`` then it calculates:
+ 
+ \f[
++        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
++                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
++\f]
+ 
+-	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
+-                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
+-
+-where \f$ L\$ is the Likelihood function. 
++where \f$ L \f$ is the Likelihood function.
+ 
+ The values of the parameters of interest for the alternative 
+ hypothesis are taken at the time of the construction.
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
+@@ -9,7 +9,7 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
+-/** \class Detail::TBranchProxy
++/** \class ROOT::Detail::TBranchProxy
+ Base class for all the proxy object. It includes the imeplemtation
+ of the autoloading of branches as well as all the generic setup routine.
+ */
diff --git a/root-fflags.patch b/root-fflags.patch
new file mode 100644
index 0000000..3fd6f0e
--- /dev/null
+++ b/root-fflags.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
+@@ -70,7 +70,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -107,7 +107,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+@@ -144,7 +144,7 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
+ 
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
+@@ -37,12 +37,12 @@
+        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
+     else(${SYSCTL_OUTPUT} MATCHES 64)
+        MESSAGE(STATUS "Found a 32bit system")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
++       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
+     endif(${SYSCTL_OUTPUT} MATCHES 64)
+   endif()
+ 
+@@ -65,7 +65,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+@@ -101,7 +101,7 @@
+ 
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
+-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+ 
+diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
+@@ -13,7 +13,7 @@
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
+-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
++  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
+ 
+   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
+   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
new file mode 100644
index 0000000..b60ac0d
--- /dev/null
+++ b/root-fontconfig.patch
@@ -0,0 +1,1408 @@
+diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
+@@ -265,18 +265,11 @@
+    LoadGraphicsLibs();
+ 
+    // Try to load TrueType font renderer. Only try to load if not in batch
+-   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
++   // mode and Root.UseTTFonts is true. Abort silently
+    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+-   // Check for use of DFSG - fonts
+-   if (!ttfont)
+-      ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
+-
+ #if !defined(R__WIN32)
+    if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
+-       ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
++       gEnv->GetValue("Root.UseTTFonts", 1)) {
+       if (gClassTable->GetDict("TGX11TTF")) {
+          // in principle we should not have linked anything against libGX11TTF
+          // but with ACLiC this can happen, initialize TGX11TTF by hand
+@@ -290,7 +283,6 @@
+       }
+    }
+ #endif
+-   delete [] ttfont;
+ 
+    // Create WM dependent application environment
+    if (fAppImp)
+diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
+@@ -12,7 +12,7 @@
+ 
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+ 
+-ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
++ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
+ 
+ if(builtin_freetype)
+   add_dependencies(${libname} FREETYPE)
+diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
+--- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
+@@ -86,9 +86,8 @@
+    static FT_BBox        fgCBox;                  // string control box
+    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
+    static Int_t          fgCurFontIdx;            // current font index
+-   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
+    static Int_t          fgFontCount;             // number of fonts loaded
+-   static char          *fgFontName[kTTMaxFonts]; // font name
++   static Int_t          fgFontID[kTTMaxFonts];   // font ID
+    static FT_Face        fgFace[kTTMaxFonts];     // font face
+    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
+    static Bool_t         fgHinting;               // use hinting (true by default)
+diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
+--- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
+@@ -46,7 +46,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
+ 		   "$(GRAFO) $(GRAFDO)" \
+-		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
+ 
+ $(call pcmrule,GRAF)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
+@@ -25,6 +25,8 @@
+ #include "TMath.h"
+ #include "TError.h"
+ 
++#include <fontconfig/fontconfig.h>
++
+ // to scale fonts to the same size as the old TT version
+ const Float_t kScale = 0.93376068;
+ 
+@@ -38,10 +40,9 @@
+ Int_t          TTF::fgWidth          = 0;
+ Int_t          TTF::fgAscent         = 0;
+ Int_t          TTF::fgCurFontIdx     = -1;
+-Int_t          TTF::fgSymbItaFontIdx = -1;
+ Int_t          TTF::fgFontCount      = 0;
+ Int_t          TTF::fgNumGlyphs      = 0;
+-char          *TTF::fgFontName[kTTMaxFonts];
++Int_t          TTF::fgFontID[kTTMaxFonts];
+ FT_Matrix     *TTF::fgRotMatrix;
+ FT_Library     TTF::fgLibrary;
+ FT_BBox        TTF::fgCBox;
+@@ -72,6 +73,11 @@
+       return;
+    }
+ 
++   // Add root's font directory
++   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
++                                       TROOT::GetTTFFontDir());
++   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
++
+    // load default font (arialbd)
+    SetTextFont(62);
+ }
+@@ -84,7 +90,6 @@
+    if (!fgInit) return;
+ 
+    for (int i = 0; i < fgFontCount; i++) {
+-      delete [] fgFontName[i];
+       FT_Done_Face(fgFace[i]);
+    }
+    if (fgRotMatrix) delete fgRotMatrix;
+@@ -109,12 +114,19 @@
+          charmap  = fgFace[fgCurFontIdx]->charmaps[i];
+          platform = charmap->platform_id;
+          encoding = charmap->encoding_id;
+-         if ((platform == 3 && encoding == 1) ||
++         if ((platform == 3 && encoding == 1 &&
++              (fgFontID[fgCurFontIdx] != 12 &&
++               fgFontID[fgCurFontIdx] != 14 &&
++               fgFontID[fgCurFontIdx] != 15)) ||
+              (platform == 0 && encoding == 0) ||
++             (platform == 7 && encoding == 2 &&
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)) ||
+              (platform == 1 && encoding == 0 &&
+-              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
+-             (platform == 1 && encoding == 0 &&
+-              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
++              (fgFontID[fgCurFontIdx] == 12 ||
++               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)))
+          {
+             fgCharMap[fgCurFontIdx] = charmap;
+             if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
+@@ -378,27 +390,147 @@
+ 
+    if (!fontname || !fontname[0]) {
+       Warning("TTF::SetTextFont",
+-              "no font name specified, using default font %s", fgFontName[0]);
++              "no font name specified, using default font");
+       fgCurFontIdx = 0;
+       return 0;
+    }
+    const char *basename = gSystem->BaseName(fontname);
+ 
++   if (strcmp(basename, "timesi.ttf") == 0 ||
++       strcmp(basename, "FreeSerifItalic.otf") == 0) {
++      SetTextFont(12);
++   }
++   else if (strcmp(basename, "timesbd.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBold.otf") == 0) {
++      SetTextFont(22);
++   }
++   else if (strcmp(basename, "timesbi.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++      SetTextFont(32);
++   }
++   else if (strcmp(basename, "arial.ttf") == 0 ||
++            strcmp(basename, "FreeSans.otf") == 0) {
++      SetTextFont(42);
++   }
++   else if (strcmp(basename, "ariali.ttf") == 0 ||
++            strcmp(basename, "FreeSansOblique.otf") == 0) {
++      SetTextFont(52);
++   }
++   else if (strcmp(basename, "arialbd.ttf") == 0 ||
++            strcmp(basename, "FreeSansBold.otf") == 0) {
++      SetTextFont(62);
++   }
++   else if (strcmp(basename, "arialbi.ttf") == 0 ||
++            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++      SetTextFont(72);
++   }
++   else if (strcmp(basename, "cour.ttf") == 0 ||
++            strcmp(basename, "FreeMono.otf") == 0) {
++      SetTextFont(82);
++   }
++   else if (strcmp(basename, "couri.ttf") == 0 ||
++            strcmp(basename, "FreeMonoOblique.otf") == 0) {
++      SetTextFont(92);
++   }
++   else if (strcmp(basename, "courbd.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBold.otf") == 0) {
++      SetTextFont(102);
++   }
++   else if (strcmp(basename, "courbi.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++      SetTextFont(112);
++   }
++   else if (strcmp(basename, "symbol.ttf") == 0) {
++      if (italic)
++         SetTextFont(152);
++      else
++         SetTextFont(122);
++   }
++   else if (strcmp(basename, "times.ttf") == 0 ||
++            strcmp(basename, "FreeSerif.otf") == 0) {
++      SetTextFont(132);
++   }
++   else if (strcmp(basename, "wingding.ttf") == 0) {
++      SetTextFont(142);
++   }
++   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
++      SetTextFont(162);
++   }
++   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
++      SetTextFont(172);
++   }
++   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
++      SetTextFont(182);
++   }
++   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
++      SetTextFont(192);
++   }
++   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
++      SetTextFont(202);
++   }
++   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
++      SetTextFont(212);
++   }
++   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
++      SetTextFont(222);
++   }
++   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
++      SetTextFont(232);
++   }
++   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
++      SetTextFont(242);
++   }
++   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
++      SetTextFont(252);
++   }
++   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
++      SetTextFont(262);
++   }
++   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
++      SetTextFont(272);
++   }
++   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
++      SetTextFont(282);
++   }
++   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
++      SetTextFont(292);
++   }
++   else {
++      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
++      if (fgFontCount) {
++         Warning("TTF::SetTextFont", "using default font");
++         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++         return 0;
++      } else {
++         return 1;
++      }
++   }
++
++   return 0;
++}
++
++//______________________________________________________________________________
++void TTF::SetTextFont(Font_t fontnumber)
++{
++   int fontid = fontnumber / 10;
++   if (fontid < 0 || fontid > 31) fontid = 0;
++
++   Int_t italic = 0;
++   if (fontid==15) italic = 1;
++
++   if (!fgInit) Init();
++
++   if (fontid == 0) {
++      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
++      return;
++   }
++
+    // check if font is in cache
+    int i;
+    for (i = 0; i < fgFontCount; i++) {
+-      if (!strcmp(fgFontName[i], basename)) {
+-         if (italic) {
+-            if (i==fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         } else {
+-            if (i!=fgSymbItaFontIdx) {
+-               fgCurFontIdx = i;
+-               return 0;
+-            }
+-         }
++      if (fgFontID[i] == fontid) {
++         fgCurFontIdx = i;
++         return;
+       }
+    }
+ 
+@@ -406,151 +538,215 @@
+    if (fgFontCount >= kTTMaxFonts) {
+       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
+             kTTMaxFonts);
+-      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
++      Warning("TTF::SetTextFont", "using default font");
+       fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-      return 0;
++      return;
+    }
+ 
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++   char *ttfont = NULL;
++   int ttindex = 0;
+ 
+-   if (!ttfont) {
+-      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
+-         return 0;
+-      } else {
+-         return 1;
+-      }
++   FcPattern *pat, *match;
++   FcCharSet *set = NULL;
++   FcResult result;
++
++   pat = FcPatternCreate ();
++
++   switch (fontid) {
++   case 1:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 2:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 3:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 4:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 5:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 6:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 7:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 8:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 9:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 10:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 11:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 12:
++   case 15:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 16:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 17:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 18:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 19:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 20:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 21:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 22:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 23:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 24:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 25:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 26:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 27:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 28:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 29:
++   case 30:
++   case 31:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      set = FcCharSetCreate ();
++      FcCharSetAddChar (set, 0x0410); // Cyrillic
++      FcCharSetAddChar (set, 0x4e00); // CJK
++      FcPatternAddCharSet (pat, FC_CHARSET, set);
++      break;
++   default:
++      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
++      FcPatternDestroy (pat);
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
++      return;
++      break;
+    }
+ 
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   char *ttfnt;
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++   ttfont = StrDup (ttfnt);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
++   if (set) FcCharSetDestroy (set);
++
+    FT_Face  tface = 0;
+ 
+-   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
++   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
+       Error("TTF::SetTextFont", "error loading font %s", ttfont);
+       delete [] ttfont;
+       if (tface) FT_Done_Face(tface);
+-      if (fgFontCount) {
+-         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
+-         fgCurFontIdx = 0;
+-         return 0;
+-      } else {
+-         return 1;
+-      }
++      Warning("TTF::SetTextFont", "using default font");
++      fgCurFontIdx = 0;
++      return;
+    }
+ 
+    delete [] ttfont;
+ 
+-   fgFontName[fgFontCount] = StrDup(basename);
++   fgFontID[fgFontCount]   = fontid;
+    fgCurFontIdx            = fgFontCount;
+    fgFace[fgCurFontIdx]    = tface;
+    fgCharMap[fgCurFontIdx] = 0;
+    fgFontCount++;
+ 
+    if (italic) {
+-      fgSymbItaFontIdx = fgCurFontIdx;
+       FT_Matrix slantMat;
+       slantMat.xx = (1 << 16);
+       slantMat.xy = ((1 << 16) >> 2);
+       slantMat.yx = 0;
+       slantMat.yy = (1 << 16);
+-      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
+-   }
+-
+-   return 0;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Set specified font.
+-/// List of the currently supported fonts (screen and PostScript)
+-///
+-/// | Font ID |   X11                     |     TTF          |
+-/// |---------|---------------------------|------------------|
+-/// |      1  | times-medium-i-normal     | timesi.ttf       |
+-/// |      2  | times-bold-r-normal       | timesbd.ttf      |
+-/// |      3  | times-bold-i-normal       | timesi.ttf       |
+-/// |      4  | helvetica-medium-r-normal | arial.ttf        |
+-/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
+-/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
+-/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
+-/// |      8  | courier-medium-r-normal   | cour.ttf         |
+-/// |      9  | courier-medium-o-normal   | couri.ttf        |
+-/// |     10  | courier-bold-r-normal     | courbd.ttf       |
+-/// |     11  | courier-bold-o-normal     | courbi.ttf       |
+-/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
+-/// |     13  | times-medium-r-normal     | times.ttf        |
+-/// |     14  |                           | wingding.ttf     |
+-/// |     15  | symbol oblique is emulated from symbol.ttf | |
+-
+-void TTF::SetTextFont(Font_t fontnumber)
+-{
+-   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
+-   // Table of Microsoft and (for non-MSFT operating systems) backup
+-   // FreeFont TTF fonts.
+-   static const char *fonttable[][2] = {
+-     { "Root.TTFont.0", "FreeSansBold.otf" },
+-     { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-     { "Root.TTFont.2", "FreeSerifBold.otf" },
+-     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-     { "Root.TTFont.4", "FreeSans.otf" },
+-     { "Root.TTFont.5", "FreeSansOblique.otf" },
+-     { "Root.TTFont.6", "FreeSansBold.otf" },
+-     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-     { "Root.TTFont.8", "FreeMono.otf" },
+-     { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-     { "Root.TTFont.10", "FreeMonoBold.otf" },
+-     { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-     { "Root.TTFont.12", "symbol.ttf" },
+-     { "Root.TTFont.13", "FreeSerif.otf" },
+-     { "Root.TTFont.14", "wingding.ttf" },
+-     { "Root.TTFont.15", "symbol.ttf" },
+-     { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-     { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-     { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-     { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-     { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-     { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-     { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-     { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-     { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-     { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-     { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-     { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-     { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
+-   };
+-
+-   static int fontset = -1;
+-   int        thisset = fontset;
+-
+-   int fontid = fontnumber / 10;
+-   if (fontid < 0 || fontid > 31) fontid = 0;
+-
+-   if (thisset == -1) {
+-      // try to load font (font must be in Root.TTFontPath resource)
+-      // to see which fontset we have available
+-      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                          TROOT::GetTTFFontDir());
+-      char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
+-      if (ttfont) {
+-         delete [] ttfont;
+-         thisset = 0;
+-      } else {
+-         // try backup free font
+-         thisset = 1;
+-      }
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
+    }
+-   Int_t italic = 0;
+-   if (fontid==15) italic = 1;
+-   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
+-   // Do not define font set is we're loading the symbol.ttf - it's
+-   // the same in both cases.
+-   if (ret == 0 && fontid != 12) fontset = thisset;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
+@@ -5,5 +5,5 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
++ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
+ ROOT_INSTALL_HEADERS()
+diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
+--- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
+@@ -50,7 +50,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
+ 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
+-		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
++		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
+ 
+ $(call pcmrule,POSTSCRIPT)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
+@@ -229,6 +229,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <wchar.h>
++#include <fontconfig/fontconfig.h>
+ 
+ #include "Riostream.h"
+ #include "Byteswap.h"
+@@ -1528,56 +1529,179 @@
+ 
+ void TPostScript::FontEmbed(void)
+ {
+-   static const char *fonttable[32][2] = {
+-      { "Root.TTFont.0", "FreeSansBold.otf" },
+-      { "Root.TTFont.1", "FreeSerifItalic.otf" },
+-      { "Root.TTFont.2", "FreeSerifBold.otf" },
+-      { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+-      { "Root.TTFont.4", "FreeSans.otf" },
+-      { "Root.TTFont.5", "FreeSansOblique.otf" },
+-      { "Root.TTFont.6", "FreeSansBold.otf" },
+-      { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-      { "Root.TTFont.8", "FreeMono.otf" },
+-      { "Root.TTFont.9", "FreeMonoOblique.otf" },
+-      { "Root.TTFont.10", "FreeMonoBold.otf" },
+-      { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+-      { "Root.TTFont.12", "symbol.ttf" },
+-      { "Root.TTFont.13", "FreeSerif.otf" },
+-      { "Root.TTFont.14", "wingding.ttf" },
+-      { "Root.TTFont.15", "symbol.ttf" },
+-      { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+-      { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+-      { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+-      { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+-      { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+-      { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+-      { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+-      { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+-      { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+-      { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+-      { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+-      { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+-      { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+-      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+-      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
+-   };
+-
+    PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
+ 
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
+-         const char *filename = gEnv->GetValue(
+-                                               fonttable[fontid][0], fonttable[fontid][1]);
+-         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
++
++         char *ttfont = NULL;
++
++         FcPattern *pat, *match;
++         FcCharSet *set = NULL;
++         FcResult result;
++
++         pat = FcPatternCreate ();
++
++         switch (fontid) {
++         case 1:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 2:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 3:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 4:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 5:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 6:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 7:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 8:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 9:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 10:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 11:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 12:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 13:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 14:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 16:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 17:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 18:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 19:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++            break;
++         case 20:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 21:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 22:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 23:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 24:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 25:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 26:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 27:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 28:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            break;
++         case 29:
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++            set = FcCharSetCreate ();
++            FcCharSetAddChar (set, 0x0410); // Cyrillic
++            FcCharSetAddChar (set, 0x4e00); // CJK
++            FcPatternAddCharSet (pat, FC_CHARSET, set);
++            break;
++         }
++
++         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcDefaultSubstitute (pat);
++         match = FcFontMatch (NULL, pat, &result);
++         char *ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++         ttfont = StrDup(ttfnt);
++         FcPatternDestroy (match);
++         FcPatternDestroy (pat);
++         if (set) FcCharSetDestroy (set);
++
+          if (!ttfont) {
+-            Error("TPostScript::FontEmbed",
+-                  "font %d (filename `%s') not found in path",
+-                  fontid, filename);
++            Error("TPostScript::FontEmbed", "font %d not found in path",
++                  fontid);
+          } else {
+             if (FontEmbedType2(ttfont)) {
+                // nothing
+@@ -1586,9 +1710,8 @@
+             } else if(FontEmbedType42(ttfont)) {
+                // nothing
+             } else {
+-               Error("TPostScript::FontEmbed",
+-                     "failed to embed font %d (filename `%s')",
+-                     fontid, filename);
++               Error("TPostScript::FontEmbed", "failed to embed font %d)",
++                     fontid);
+             }
+             delete [] ttfont;
+          }
+@@ -2536,10 +2659,10 @@
+       { "Root.PSFont.5",             "/Helvetica-Oblique" },
+       { "Root.PSFont.6",             "/Helvetica-Bold" },
+       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
+-      { "Root.PSFont.8",             "/Courrier" },
+-      { "Root.PSFont.9",             "/Courrier-Oblique" },
+-      { "Root.PSFont.10",            "/Courrier-Bold" },
+-      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
++      { "Root.PSFont.8",             "/Courier" },
++      { "Root.PSFont.9",             "/Courier-Oblique" },
++      { "Root.PSFont.10",            "/Courier-Bold" },
++      { "Root.PSFont.11",            "/Courier-BoldOblique" },
+       { "Root.PSFont.12",            "/Symbol" },
+       { "Root.PSFont.13",            "/Times-Roman" },
+       { "Root.PSFont.14",            "/ZapfDingbats" },
+@@ -2745,10 +2868,10 @@
+       { "Root.PSFont.9", "/FreeMonoOblique" },
+       { "Root.PSFont.10", "/FreeMonoBold" },
+       { "Root.PSFont.11", "/FreeMonoBoldOblique" },
+-      { "Root.PSFont.12", "/SymbolMT" },
++      { "Root.PSFont.12", "/StandardSymbolsL" },
+       { "Root.PSFont.13", "/FreeSerif" },
+-      { "Root.PSFont.14", "/Wingdings-Regular" },
+-      { "Root.PSFont.15", "/SymbolMT" },
++      { "Root.PSFont.14", "/Dingbats" },
++      { "Root.PSFont.15", "/StandardSymbolsL" },
+       { "Root.PSFont.STIXGen", "/STIXGeneral" },
+       { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
+       { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
+diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
+@@ -32,6 +32,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
+@@ -78,7 +78,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
+ 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
+-		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
++		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ 
+ $(call pcmrule,GL)
+ 	$(noop)
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
+@@ -37,6 +37,7 @@
+ # include "FTGLBitmapFont.h"
+ #endif
+ 
++#include <fontconfig/fontconfig.h>
+ 
+ /** \class TGLFont
+ \ingroup opengl
+@@ -420,7 +421,7 @@
+ ClassImp(TGLFontManager);
+ 
+ TObjArray   TGLFontManager::fgFontFileArray;
+-Int_t TGLFontManager::fgExtendedFontStart;
++Int_t TGLFontManager::fgExtendedFontStart = 0;
+ TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
+ Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
+ 
+@@ -451,17 +452,175 @@
+    FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
+    if (it == fFontMap.end())
+    {
+-      TString ttpath, file;
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
+-      {
+-         //For extenede we have both ttf and otf.
+-         char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+-                                   ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
+-                                   ((TObjString*)fgFontFileArray[fileID])->String());
+-         file = fp;
+-         delete [] fp;
++      char *file = NULL;
++      int ttindex = 0;
++
++      FcPattern *pat, *match;
++      FcCharSet *set = NULL;
++      FcResult result;
++
++      pat = FcPatternCreate ();
++
++      switch (fileID) {
++      case 0:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 1:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 2:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 3:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 4:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 5:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 6:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 7:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 8:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 9:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 10:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 11:
++      case 14:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 12:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 13:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 15:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 16:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 17:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 18:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++         break;
++      case 19:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 20:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 21:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 22:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 23:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 24:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 25:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 26:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 27:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         break;
++      case 28:
++      case 29:
++      case 30:
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
++         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++         set = FcCharSetCreate ();
++         FcCharSetAddChar (set, 0x0410); // Cyrillic
++         FcCharSetAddChar (set, 0x4e00); // CJK
++         FcPatternAddCharSet (pat, FC_CHARSET, set);
+       }
+ 
++      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (NULL, pat, &result);
++      char *ttfnt;
++      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++      file = StrDup (ttfnt);
++      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++      FcPatternDestroy (match);
++      FcPatternDestroy (pat);
++      if (set) FcCharSetDestroy (set);
++
+       FTFont* ftfont = 0;
+       switch (mode)
+       {
+@@ -485,10 +644,14 @@
+             ftfont = new FTGLTextureFont(file);
+             break;
+          default:
++            delete [] file;
+             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
+             return;
+             break;
+       }
++
++      delete [] file;
++
+       ftfont->FaceSize(size);
+       const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
+       out.CopyAttributes(mf);
+@@ -571,8 +734,6 @@
+ {
+    if (fgStaticInitDone == kFALSE) InitStatics();
+ 
+-   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
+-
+    return fgExtendedFontStart;
+ }
+ 
+@@ -642,28 +803,6 @@
+    fgFontFileArray.Add(new TObjString("wingding")); // 140
+    fgFontFileArray.Add(new TObjString("symbol"));   // 150
+ 
+-   fgExtendedFontStart = fgFontFileArray.GetEntries();
+-   //"Extended" fonts for gl-pad.
+-   //fgPadFontStart + ...
+-   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
+-   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
+-
+-   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
+-   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
+-   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
+-   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
+-
+-   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
+-   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
+-   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
+-   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
+-
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
+-   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
+-   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
+-   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
+-
+    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
+    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
+    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
+diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
+@@ -34,6 +34,8 @@
+ # include "FTGLBitmapFont.h"
+ #endif
+ 
++#include <fontconfig/fontconfig.h>
++
+ #define FTGL_BITMAP  0
+ #define FTGL_PIXMAP  1
+ #define FTGL_OUTLINE 2
+@@ -178,27 +180,92 @@
+ {
+    int fontid = fontnumber / 10;
+ 
+-   const char *fontname=0;
+-   if (fontid == 0)  fontname = "arialbd.ttf";
+-   if (fontid == 1)  fontname = "timesi.ttf";
+-   if (fontid == 2)  fontname = "timesbd.ttf";
+-   if (fontid == 3)  fontname = "timesbi.ttf";
+-   if (fontid == 4)  fontname = "arial.ttf";
+-   if (fontid == 5)  fontname = "ariali.ttf";
+-   if (fontid == 6)  fontname = "arialbd.ttf";
+-   if (fontid == 7)  fontname = "arialbi.ttf";
+-   if (fontid == 8)  fontname = "cour.ttf";
+-   if (fontid == 9)  fontname = "couri.ttf";
+-   if (fontid == 10) fontname = "courbd.ttf";
+-   if (fontid == 11) fontname = "courbi.ttf";
+-   if (fontid == 12) fontname = "symbol.ttf";
+-   if (fontid == 13) fontname = "times.ttf";
+-   if (fontid == 14) fontname = "wingding.ttf";
+-
+-   // try to load font (font must be in Root.TTFontPath resource)
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++   FcPattern *pat, *match;
++   FcResult result;
++   char *ttfont;
++   int ttindex;
++
++   pat = FcPatternCreate ();
++
++   switch (fontid) {
++   case 1:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 2:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 3:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 4:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 5:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 0:
++   case 6:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 7:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 8:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 9:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 10:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 11:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++      break;
++   case 12:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 13:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   case 14:
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++      break;
++   }
++
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
+ 
+    if (fGLTextFont) delete fGLTextFont;
+ 
+@@ -206,7 +273,9 @@
+ 
+    fGLTextFont = new FTGLPolygonFont(ttfont);
+ 
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
++
+    if (!fGLTextFont->FaceSize(1))
+       Error("SetGLTextFont","Cannot set FTGL::FaceSize");
+-   delete [] ttfont;
+ }
+diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
+@@ -83,20 +83,12 @@
+    gROOT->SetBatch(kFALSE);
+ 
+    if (strcmp(appClassName, "proofserv")) {
+-      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                          TROOT::GetTTFFontDir());
+-      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+-      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
+-      if (!ttfont)
+-         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
+-      if (ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
++      if (gEnv->GetValue("Root.UseTTFonts", 1)) {
+          TPluginHandler *h;
+          if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualX", "x11ttf")))
+             if (h->LoadPlugin() == -1)
+                Info("TGApplication", "no TTF support");
+       }
+-
+-      delete [] ttfont;
+    }
+ 
+    // Create the canvas colors early so they are allocated before
+diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
+--- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
+@@ -119,8 +119,7 @@
+ {
+    TString sc;
+    Float_t step, mark[5];
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString ar = fp + "/arialbd.ttf";
++   TString ar = "arialbd.ttf";
+    Int_t i, nexe, offset;
+ 
+    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
+@@ -528,8 +527,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
+@@ -609,8 +607,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
new file mode 100644
index 0000000..c0f9e07
--- /dev/null
+++ b/root-gl2ps.patch
@@ -0,0 +1,254 @@
+diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
+--- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
+@@ -0,0 +1,21 @@
++# - Locate gl2ps library
++# Defines:
++#
++#  GL2PS_FOUND
++#  GL2PS_INCLUDE_DIR
++#  GL2PS_INCLUDE_DIRS (not cached)
++#  GL2PS_LIBRARIES
++
++find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
++find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
++
++set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
++set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
++
++mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
+@@ -70,6 +70,7 @@
+ ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
+ ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
+ ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
++ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
+@@ -153,6 +153,11 @@
+ set(opengllib ${OPENGL_gl_LIBRARY})
+ set(openglincdir ${OPENGL_INCLUDE_DIR})
+ 
++set(builtingl2ps ${value${builtin_gl2ps}})
++set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
++set(gl2pslib ${GL2PS_LIBRARY})
++set(gl2psincdir ${GL2PS_INCLUDE_DIR})
++
+ set(buildldap ${value${ldap}})
+ set(ldaplibdir ${LDAP_LIBRARY_DIR})
+ set(ldaplib ${LDAP_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
+@@ -334,6 +334,16 @@
+   endif()
+ endif()
+ 
++#---Check for gl2ps ------------------------------------------------------------------
++if(NOT builtin_gl2ps)
++  message(STATUS "Looking for gl2ps")
++  find_Package(gl2ps)
++  if(NOT GL2PS_FOUND)
++    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
++    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Graphviz installation-------------------------------------------------------
+ if(gviz)
+   message(STATUS "Looking for Graphviz")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
+@@ -142,6 +142,11 @@
+ OPENGLLIB      := @opengllib@
+ OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
+ 
++BUILTINGL2PS   := @builtingl2ps@
++GL2PSLIBDIR    := @gl2pslibdir@
++GL2PSCLILIB    := @gl2pslib@
++GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
++
+ BUILDLDAP      := @buildldap@
+ LDAPLIBDIR     := @ldaplibdir@
+ LDAPCLILIB     := @ldaplib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
++++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
+@@ -53,6 +53,7 @@
+    enable_builtin_afterimage \
+    enable_builtin_ftgl       \
+    enable_builtin_freetype   \
++   enable_builtin_gl2ps      \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
+    enable_builtin_unuran     \
+@@ -182,6 +183,7 @@
+ enable_winrtdebug=
+ enable_builtin_freetype=no
+ enable_builtin_ftgl=no
++enable_builtin_gl2ps=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
+ enable_builtin_unuran=no
+@@ -1704,6 +1706,7 @@
+   builtin-afterimage Build included libAfterImage, or use system libAfterImage
+   builtin-ftgl       Build included libFTGL, or use system libftgl
+   builtin-freetype   Build included libfreetype, or use system libfreetype
++  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
+   builtin-unuran     Build included libunuran, or use system libunuran
+@@ -2047,6 +2050,7 @@
+    logmsg "Will use by default builtin versions of libraries on Win32"
+    enable_builtin_freetype="yes"
+    enable_builtin_ftgl="yes"
++   enable_builtin_gl2ps="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
+    enable_builtin_unuran="yes"
+@@ -3180,6 +3184,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libgl2ps (builtin or system)
++#
++if test "x$enable_builtin_gl2ps" = "xno" ; then
++    check_header "gl2ps.h" "" \
++        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_gl2ps=yes
++    else
++        gl2psinc=$found_hdr
++        gl2psincdir=$found_dir
++    fi
++
++    check_library "libgl2ps" "$enable_shared" "" \
++        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        gl2pslib=""
++        gl2pslibdir=""
++        enable_builtin_gl2ps="yes"
++    else
++        gl2pslib="$found_lib"
++        gl2pslibdir="$found_dir"
++    fi
++
++    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
++        enable_builtin_gl2ps="yes"
++    fi
++fi
++message "Checking whether to build included gl2ps"
++result "$enable_builtin_gl2ps"
++
++######################################################################
++#
+ ### echo %%% libpcre (builtin or system) - Mandatory lib
+ #
+ # Mandatory test, must succeed (see http://www.pcre.org/)
+@@ -7593,6 +7629,10 @@
+     -e "s|@ftglincdir@|$ftglincdir|"            \
+     -e "s|@ftgllibdir@|$ftgllibdir|"            \
+     -e "s|@ftgllibs@|$ftgllibs|"                \
++    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
++    -e "s|@gl2psincdir@|$gl2psincdir|"          \
++    -e "s|@gl2pslib@|$gl2pslib|"                \
++    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
+     -e "s|@glewincdir@|$glewincdir|"            \
+     -e "s|@glewlibdir@|$glewlibdir|"            \
+     -e "s|@glewlibs@|$glewlibs|"                \
+diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
+--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
+@@ -7,12 +7,20 @@
+ ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
+ list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
+                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
++set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
+ ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
+ 
+ if(WIN32 OR cocoa)
+   list(REMOVE_ITEM headers TX11GL.h)
+   list(REMOVE_ITEM sources TX11GL.cxx)
+-  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
++  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
++endif()
++
++if(builtin_gl2ps)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++else()
++  list(REMOVE_ITEM sources gl2ps.cxx)
++  include_directories(${GL2PS_INCLUDE_DIRS})
+ endif()
+ 
+ if(WIN32)
+@@ -32,6 +40,6 @@
+ 
+ ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
+--- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
++++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
+@@ -19,6 +19,7 @@
+ GLDH         := $(GLDS:.cxx=.h)
+ 
+ GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
++GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
+ GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
+ 
+ # Excluded from win32 builds
+@@ -42,6 +43,13 @@
+ # Used by rootcint
+ GLH2         := $(filter-out $(GLH1), $(GLH))
+ 
++ifeq ($(BUILTINGL2PS),yes)
++GL2PSFLAGS   := -I$(MODDIRI)
++else()
++GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
++GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
++endif()
++
+ ifneq ($(OPENGLLIB),)
+ GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
+                 $(XLIBS) -lm
+@@ -78,6 +86,7 @@
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
+ 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
++		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
+ 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ 
+ $(call pcmrule,GL)
+@@ -107,12 +116,12 @@
+ ##### extra rules ######
+ ifeq ($(ARCH),win32)
+ $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
+-                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
++                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
+ else
+-$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
+-$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
++$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
++$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
+ endif
+ 
+ $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-html-markup.patch b/root-html-markup.patch
new file mode 100644
index 0000000..d6b9d1e
--- /dev/null
+++ b/root-html-markup.patch
@@ -0,0 +1,1031 @@
+diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
+@@ -42,7 +42,6 @@
+ //
+ // This enum type describes the ways in which TGTextEntry can display
+ // its contents. The currently defined values are:
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kNormal - display characters as they are entered. This is the default.
+@@ -50,14 +49,12 @@
+ <li>  kPassword - display asterisks instead of the characters actually entered.
+ </ul>
+ */
+-//End_Html
+ // See also SetEchoMode(), GetEchoMode().
+ //
+ // enum TGTextEntry::EInsertMode
+ //
+ // This enum type describes the way how typed characters are
+ // inserted in the text entry. This mode is switched by "Insert" key.
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kInsert - typed character are inserted (cursor has shape of short line).
+@@ -65,13 +62,11 @@
+                  (cursor has the shape of filled rectangle).
+ </ul>
+ */
+-//End_Html
+ //
+ // enum TGWidget::ETextJustification
+ //
+ // This enum type (defined in TGWidget.h) describes the text alignment modes.
+ // These modes are valid untill text fits the frame width
+-//Begin_Html
+ /*
+ <ul>
+ <li>  kTextLeft    - left-side text alignment
+@@ -79,12 +74,10 @@
+ <li>  kTextCenterX - center text alignment
+ </ul>
+ */
+-//End_Html
+ //
+ //
+ // The key press event handler converts a key press to some line editor action.
+ // Here are the default key bindings:
+-//Begin_Html
+ /*
+ <ul>
+ <li><i> Left Arrow </i>
+@@ -153,7 +146,6 @@
+ </ul>
+ All other keys with valid ASCII codes insert themselves into the line.
+ */
+-//End_Html
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+@@ -658,13 +650,11 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The echo modes available are:
+-///Begin_Html
+ /// <ul>
+ /// <li> kNormal   - display characters as they are entered.  This is the default.
+ /// <li> kNoEcho   - do not display anything.
+ /// <li> kPassword - display asterisks instead of the characters actually entered.
+ /// </ul>
+-///End_Html
+ /// It is always possible to cut and paste any marked text;  only the widget's own
+ /// display is affected.
+ /// See also GetEchoMode(), GetDisplayText().
+@@ -1154,7 +1144,6 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// The key press event handler converts a key press to some line editor
+ /// action. Here are the default key bindings:
+-///Begin_Html
+ ///  <ul>
+ ///  <li><i> Left Arrow </i>
+ ///          Move the cursor one character leftwards.
+@@ -1220,7 +1209,6 @@
+ ///  <li><i> Control-Y </i>
+ ///          Paste the clipboard text into line edit.
+ ///  </ul>
+-///End_Html
+ ///  All other keys with valid ASCII codes insert themselves into the line.
+ 
+ Bool_t TGTextEntry::HandleKey(Event_t* event)
+diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
+@@ -938,17 +938,10 @@
+ ///  NOTE: To access the generated histograms in the current directory, do eg:
+ ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
+ ///
+-/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
+-/// with the following output:
+-///Begin_Html
++/// A complete example of this function is given in tutorial fitslicesy.C.
+ 
+ void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
+ {
+-   /*
+-   <img src="gif/fitslicesy.gif">
+-   */
+-   //End_Html
+-
+    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
+ 
+ }
+diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
+--- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
+@@ -603,7 +603,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -682,7 +682,7 @@
+ /// Please note, that if no error is given Poisson statistics is
+ /// assumed and the square error is set to the value of dependent
+ /// quantity.  See also the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
+ {
+@@ -986,7 +986,7 @@
+ ///     None so far
+ ///
+ /// For detailed description of what this entails, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::FindParameterization(Option_t *)
+ {
+@@ -1005,7 +1005,7 @@
+ ///     M     use Minuit to improve coefficients
+ ///
+ /// Also, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::Fit(Option_t *option)
+ {
+@@ -1097,7 +1097,7 @@
+ /// PRIVATE METHOD:
+ /// Create list of candidate functions for the parameterisation. See
+ /// also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeCandidates()
+ {
+@@ -1354,7 +1354,7 @@
+ /// PRIVATE METHOD:
+ /// Invert the model matrix B, and compute final coefficients. For a
+ /// more thorough discussion of what this means, please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ ///
+ /// First we invert the lower triangle matrix fOrthCurvatureMatrix
+ /// and store the inverted matrix in the upper triangle.
+@@ -1496,7 +1496,7 @@
+ /// Make Gram-Schmidt orthogonalisation. The class description gives
+ /// a thorough account of this algorithm, as well as
+ /// references. Please refer to the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
+ {
+@@ -1589,7 +1589,7 @@
+ ///     R4        Residuals computed on test sample
+ ///
+ /// For a description of these quantities, refer to
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeHistograms(Option_t *option)
+ {
+@@ -1800,7 +1800,7 @@
+ /// PRIVATE METHOD:
+ /// Find the parameterization over the training sample. A full account
+ /// of the algorithm is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::MakeParameterization()
+ {
+@@ -2365,7 +2365,7 @@
+ /// be fitted, and the new candidate function to be included in the
+ /// fit.  By default it is 0, which automatically chooses another
+ /// selection criteria. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxAngle(Double_t ang)
+ {
+@@ -2381,7 +2381,7 @@
+ /// Set the min angle (in degrees) between a new candidate function
+ /// and the subspace spanned by the previously accepted
+ /// functions. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinAngle(Double_t ang)
+ {
+@@ -2401,7 +2401,7 @@
+ /// Where N is the dimension of the data sample, L is the number of
+ /// terms (given in terms) and the first number, labels the term, the
+ /// second the variable.  More information is given in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
+ {
+@@ -2421,7 +2421,7 @@
+ /// Set the user parameter for the function selection. The bigger the
+ /// limit, the more functions are used. The meaning of this variable
+ /// is defined in the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetPowerLimit(Double_t limit)
+ {
+@@ -2431,7 +2431,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Set the maximum power to be considered in the fit for each
+ /// variable. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMaxPowers(const Int_t* powers)
+ {
+@@ -2446,7 +2446,7 @@
+ /// Set the acceptable relative error for when sum of square
+ /// residuals is considered minimized. For a full account, refer to
+ /// the
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ void TMultiDimFit::SetMinRelativeError(Double_t error)
+ {
+@@ -2458,7 +2458,7 @@
+ /// PRIVATE METHOD:
+ /// Test whether the currently considered function contributes to the
+ /// fit. See also
+-/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
++/// <a href="#TMultiDimFit:description">class description</a>
+ 
+ Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
+                                   Double_t dResidur)
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
+@@ -71,8 +71,6 @@
+ //
+ //</div>
+ //
+-//<!-- */
+-// --> End_Html
+ 
+ //______________________________________________________________________________
+ /** \class TSpectrum2
+@@ -372,7 +370,6 @@
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Background(Double_t **spectrum,
+                        Int_t ssizex, Int_t ssizey,
+@@ -381,7 +378,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
+@@ -523,10 +520,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
+@@ -835,8 +830,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, x, y, sampling, r1, r2;
+    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
+@@ -1022,11 +1016,10 @@
+ ///   averWindow-width of averaging smoothing window
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
+@@ -1134,10 +1127,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
+@@ -1239,8 +1230,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t xmin, xmax, ymin, ymax, i, j, l;
+    Double_t a, b, maxch;
+    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
+@@ -1439,7 +1429,6 @@
+ ///   boost, boosting factor, for details we refer to manual
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
+                                        Int_t ssizex, Int_t ssizey,
+@@ -1447,7 +1436,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
+@@ -1602,10 +1591,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
+@@ -1982,8 +1969,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
+        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2177,8 +2163,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
+@@ -2311,10 +2296,8 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
+-//Begin_Html <!--
+-/* -->
++ */
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
+@@ -2856,8 +2839,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k, lindex, priz;
+    Double_t lda, ldb, ldc, area, maximum;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
+@@ -162,11 +162,10 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
+@@ -178,8 +177,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    if (numberPeaks <= 0){
+       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
+       return;
+@@ -1793,11 +1791,10 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrum2Fit::FitAwmi(Double_t **source)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
+@@ -2686,8 +2683,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, pw,
+@@ -4697,8 +4693,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+ //
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
+@@ -4928,8 +4923,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, i1, i2, j, k, shift =
+        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
+@@ -1748,8 +1748,7 @@
+ /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -2018,8 +2017,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j;
+    Int_t size;
+    Double_t *working_vector = 0, **working_matrix = 0;
+@@ -2324,8 +2322,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -2481,8 +2478,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+@@ -2768,8 +2764,7 @@
+ /*           fSizeX*fSizeY                                                              */
+ /*                         */
+ //////////////////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2908,8 +2903,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j;
+    Double_t a, old_area = 0, new_area = 0;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
+@@ -273,7 +273,6 @@
+ ///                                                                           //
+ ///                                                                           //
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Background(Double_t***spectrum,
+                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -283,7 +282,7 @@
+                        Int_t direction,
+                        Int_t filterType)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
+@@ -674,8 +673,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    Int_t i, j, x, y, z, sampling, q1, q2, q3;
+    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
+    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
+@@ -1069,11 +1067,10 @@
+ /// averWindow-width of averaging smoothing window                          //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section2>
+ 
+@@ -1302,8 +1299,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
+    Double_t a,b,maxch;
+@@ -1868,7 +1864,6 @@
+ /// boost, boosting factor, for details we refer to manual                  //
+ ///                                                                         //
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
+                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
+@@ -1876,7 +1871,7 @@
+                                        Int_t numberRepetitions,
+                                        Double_t boost)
+ {
+-/* -->
++/* 
+ 
+ <div class=Section3>
+ 
+@@ -2357,8 +2352,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
+    Double_t lda, ldb, ldc, area, maximum = 0;
+@@ -2590,8 +2584,7 @@
+ //                  we refer to manual (applies only for Markov method)    //
+ //                                                                         //
+ /////////////////////////////////////////////////////////////////////////////
+-//Begin_Html <!--
+-/* -->
++/* 
+ 
+ <div class=Section4>
+ 
+@@ -2901,8 +2894,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+ 
+    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
+    Int_t k,lindex;
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
+@@ -113,7 +113,6 @@
+ ///numberPeaks: number of fitted peaks (must be greater than zero)
+ ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
+ ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
+-///Begin_Html <!--
+ 
+ TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
+ {
+@@ -162,7 +161,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    if (numberPeaks <= 0){
+       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
+@@ -847,7 +845,6 @@
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitAwmi(Double_t *source)
+ {
+@@ -1343,7 +1340,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
+@@ -2312,7 +2308,6 @@
+ ///        source-pointer to the vector of source spectrum
+ ///
+ //////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumFit::FitStiefel(Double_t *source)
+ {
+@@ -2546,7 +2541,6 @@
+ </div>
+ 
+ <!-- */
+-// --> End_Html
+ 
+    Int_t i, j, k, shift =
+        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
+diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
+--- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
+@@ -739,11 +739,10 @@
+ ///             need 2*size length to store real and imaginary coefficients
+ ///
+ ////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section1>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
+@@ -989,8 +988,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t a, b, pi = 3.14159265358979323846;
+@@ -1482,11 +1480,10 @@
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+ ///
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section2>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
+@@ -1618,8 +1615,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+@@ -2091,11 +2087,10 @@
+ ///           need 2*size length to store real and imaginary coefficients
+ ///
+ /////////////////////////////////////////////////////////////////////////////////
+-///Begin_Html <!--
+ 
+ void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
+ {
+-/* -->
++/* 
+ <div class=Section3>
+ 
+ <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
+@@ -2226,8 +2221,7 @@
+ 
+ </div>
+ 
+-<!-- */
+-// --> End_Html
++ */
+    int i, j=0, k = 1, m, l;
+    Double_t val;
+    Double_t *working_space = 0;
+diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
+--- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
+@@ -1162,7 +1162,6 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Paints histogram according to preset parameters.
+-///Begin_Html <!--
+ 
+ void TSpectrum2Painter::Paint(Option_t * /*option*/)
+ {
+@@ -1524,7 +1523,6 @@
+ }
+ </pre>
+ <!-- */
+-// --> End_Html
+ 
+    Int_t turni,turnj,w1,w2,x,y;
+    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
+@@ -7654,14 +7652,12 @@
+ ///                               * * *
+ ///
+ /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
+-///Begin_Html
+ 
+ void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
+ {
+    /*
+    <img src="gif/spectrumpainter.gif">
+    */
+-   //End_Html
+ 
+    TString opt = option;
+ 
+diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
+--- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
+@@ -25,20 +25,15 @@
+ // Monte Carlo event generator (integrator) FOAM.
+ // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
+ // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_MapCamel1000.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_MapCamel1000.gif">
++//
+ // FOAM is now fully integrated with the ROOT package.
+ // The important bonus of the ROOT use is persistency of the FOAM objects!
+ //
+ // For more sophisticated problems full version of FOAM may be more appropriate:
+-//BEGIN_HTML <!--
+-/* -->
+-  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
+-<!--*/
+-// -->END_HTML
++// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
++//
+ // Simple example of the use of FOAM:
+ // ==================================
+ // Int_t kanwa(){
+@@ -81,11 +76,9 @@
+ //   return 0.5*Dist;
+ // }// Camel2
+ // Two-dim. histogram of the MC points generated with the above program looks as follows:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_cKanwa.gif">
+-<!--*/
+-// -->END_HTML
++//
++// <img src="gif/foam_cKanwa.gif">
++//
+ // Canonical nine steering parameters of FOAM
+ // ===========================================
+ //------------------------------------------------------------------------------
+@@ -266,10 +259,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Default destructor
+-///  std::cout<<" DESTRUCTOR entered "<<std::endl;
+ 
+ TFoam::~TFoam()
+ {
++   //std::cout<<" DESTRUCTOR entered "<<std::endl;
+    Int_t i;
+ 
+    if(fCells!= 0) {
+@@ -321,42 +314,35 @@
+ /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
+ /// and reseting (optionally) its internal parameters/switches.
+ /// The overall operational scheme of the FOAM is the following:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_schema2.gif">
++///
++/// This method invokes several other methods:
++/// ==========================================
++/// InitCells initializes memory storage for cells and begins exploration process
++/// from the root cell. The empty cells are allocated/filled using  CellFill.
++/// The procedure Grow which loops over cells, picks up the cell with the biggest
++/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
++/// with the help of PeekMax procedure. The chosen cell is split using Divide.
++/// Subsequently, the procedure Explore called by the Divide
++/// (and by InitCells for the root cell) does the most important
++/// job in the FOAM object build-up: it performs a small MC run for each
++/// newly allocated daughter cell.
++/// Explore calculates how profitable the future split of the cell will be
++/// and defines the optimal cell division geometry with the help of Carver or Varedu
++/// procedures, for maximum weight or variance optimization respectively.
++/// All essential results of the exploration are written into
++/// the explored cell object. At the very end of the foam build-up,
++/// Finally, MakeActiveList is invoked to create a list of pointers to
++/// all active cells, for the purpose of the quick access during the MC generation.
++/// The procedure Explore employs MakeAlpha to generate random coordinates
++/// inside a given cell with the uniform distribution.
++/// The above sequence of the procedure calls is depicted in the following figure:
++///
++//  <img src="gif/foam_Initialize_schema.gif">
+ 
+ void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
+ {
+-/* -->
+-<img src="gif/foam_schema2.gif">
+-<!--*/
+-// -->END_HTML
+-//
+-// This method invokes several other methods:
+-// ==========================================
+-// InitCells initializes memory storage for cells and begins exploration process
+-// from the root cell. The empty cells are allocated/filled using  CellFill.
+-// The procedure Grow which loops over cells, picks up the cell with the biggest
+-// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
+-// with the help of PeekMax procedure. The chosen cell is split using Divide.
+-// Subsequently, the procedure Explore called by the Divide
+-// (and by InitCells for the root cell) does the most important
+-// job in the FOAM object build-up: it performs a small MC run for each
+-// newly allocated daughter cell.
+-// Explore calculates how profitable the future split of the cell will be
+-// and defines the optimal cell division geometry with the help of Carver or Varedu
+-// procedures, for maximum weight or variance optimization respectively.
+-// All essential results of the exploration are written into
+-// the explored cell object. At the very end of the foam build-up,
+-// Finally, MakeActiveList is invoked to create a list of pointers to
+-// all active cells, for the purpose of the quick access during the MC generation.
+-// The procedure Explore employs MakeAlpha to generate random coordinates
+-// inside a given cell with the uniform distribution.
+-// The above sequence of the procedure calls is depicted in the following figure:
+-//BEGIN_HTML <!--
+-/* -->
+-<img src="gif/foam_Initialize_schema.gif">
+-<!--*/
+-// -->END_HTML
+-
+    SetPseRan(PseRan);
+    SetRho(fun);
+    Initialize();
+@@ -1363,15 +1349,11 @@
+ /// It defines which variables are excluded in the process of the cell division.
+ /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
+ /// The resulting map of cells in 2-dim. case will look as follows:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map2.gif">
+ 
+ void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
+ {
+-/* -->
+-<img src="gif/foam_Map2.gif">
+-<!--*/
+-// -->END_HTML
+-
+    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
+    if(fInhiDiv == 0) {
+       fInhiDiv = new Int_t[ fDim ];
+@@ -1391,15 +1373,11 @@
+ ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
+ ///     FoamX->SetXdivPRD(0,3,xDiv);
+ /// results in the following 2-dim. pattern of the cells:
+-///BEGIN_HTML <!--
++///
++//  <img src="gif/foam_Map3.gif">
+ 
+ void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
+ {
+-/* -->
+-<img src="gif/foam_Map3.gif">
+-<!--*/
+-// -->END_HTML
+-
+    Int_t i;
+ 
+    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
+diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
+@@ -238,19 +238,14 @@
+ /// PDG convention already)
+ /// Source: BaBar User Guide, Neil I. Geddes,
+ ///
+-///Begin_Html
++/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
++/// with some fixes by PB, marked with (PB) below. Checked against
++/// PDG listings from 2000.
++///
++/// Paul Balm, Nov 19, 2001
+ 
+ Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
+ {
+-  /*
+-   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
+-  */
+-  //End_Html
+-  // with some fixes by PB, marked with (PB) below. Checked against
+-  // PDG listings from 2000.
+-  //
+-  // Paul Balm, Nov 19, 2001
+-
+    switch(Geant3number) {
+ 
+       case 1   : return 22;       // photon
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
+@@ -50,7 +50,7 @@
+ 
+ The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
+ 
+-The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
++The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
+ 
+ */
+ 
+diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
+--- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
+@@ -3,13 +3,11 @@
+ TCanvas *timeonaxis()
+ {
+ // This macro illustrates the use of the time mode on the axis
+-// with different time intervals and time formats. It's result can
+-// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
++// with different time intervals and time formats.
+ // Through all this script, the time is expressed in UTC. some
+ // information about this format (and others like GPS) may be found at
+-// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
+-//  or
+-// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
++// http://tycho.usno.navy.mil/systime.html or
++// http://www.topology.org/sci/time.html
+ //
+ // The start time is : almost NOW (the time at which the script is executed)
+ // actualy, the nearest preceding hour beginning.
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
new file mode 100644
index 0000000..48e2a28
--- /dev/null
+++ b/root-latex-markup.patch
@@ -0,0 +1,877 @@
+diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
+@@ -185,14 +185,19 @@
+ ## <a name="L8"></a> Accents
+ Several kind of accents are available:
+ 
+-   #hat    = Begin_Latex #hat{a} End_Latex
+-   #check  = Begin_Latex #check{a} End_Latex
+-   #acute  = Begin_Latex #acute{a} End_Latex
+-   #grave  = Begin_Latex #grave{a} End_Latex
+-   #dot    = Begin_Latex #dot{a} End_Latex
+-   #ddot   = Begin_Latex #ddot{a} End_Latex
+-   #tilde  = Begin_Latex #tilde{a} End_Latex
+-
++Begin_Macro(source)
++{
++   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
++   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
++   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
++   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
++   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
++   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
++   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
++   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
++   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
++}
++End_Macro
+ 
+ The special sign: `#slash` draws a slash on top of the text between brackets:
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
+--- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
+@@ -949,9 +949,9 @@
+ /// Getting the error via TF1::DerivativeError:
+ ///   (total error = roundoff error + interpolation error)
+ /// the estimate of the roundoff error is taken as follows:
+-///Begin_Latex
+-///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-///End_Latex
++/// \f[
++///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++/// \f]
+ /// where k is the double precision, ai are coefficients used in
+ /// central difference formulas
+ /// interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
+--- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -360,27 +360,33 @@
+ ///
+ /// If the histograms are not filled with unit weights, the number of effective
+ /// entries is used to normalise the bin contents which might lead to wrong results.
+-/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
+-///
++/// \f[
++/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
++/// \f]
+ /// The points are assigned a x value at the center of each histogram bin.
+-/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
++/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
++/// for all options except for the
+ /// bayesian methods where the result depends on the chosen option.
+ ///
+-/// If the denominator becomes 0 or pass >  total, the corresponding bin is
++/// If the denominator becomes 0 or pass > total, the corresponding bin is
+ /// skipped.
+ ///
+ /// 2) calculating ratios of two Poisson means (option 'pois'):
+ /// --------------------------------------------------------------
+ ///
+ /// The two histograms are interpreted as independent Poisson processes and the ratio
+-/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
+-/// The histogram 'pass' is interpreted as n_{1} and the total histogram
+-/// is used for n_{2}
++/// \f[
++/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
++/// \f]
++/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
++/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
++/// is used for \f$n_{2}\f$.
+ ///
+ /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
+ /// of efficiency by a parameter transformation:
+-/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
+-///
++/// \f[
++/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
++/// \f]
+ /// The x errors span each histogram bin (lowedge ... lowedge+width)
+ /// The y errors depend on the chosen statistic methode which can be determined
+ /// by the options given below. For a detailed description of the used statistic
+@@ -413,8 +419,7 @@
+ /// oscillation on the actual coverage probability a couple of approximations and
+ /// methodes has been developped. For a detailed discussion, please have a look at
+ /// this statistical paper:
+-/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
+-/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
++/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
+ 
+ void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
+ {
+diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
+--- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
+@@ -764,8 +764,7 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Get square of the error of bin addressed by linidx as
+-/// BEGIN_LATEX #sum weight^{2}
+-/// END_LATEX
++/// \f$\sum weight^{2}\f$
+ /// If errors are not enabled (via Sumw2() or CalculateErrors())
+ /// return contents.
+ 
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -92,31 +92,28 @@
+     Method:
+        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
+        and 16-point Gaussian quadrature approximations to
+-   Begin_Latex
+-      I = #int^{b}_{a} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{b}_{a} f(x)dx
++   \f]
+       and define
+-   Begin_Latex
+-      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
+-   End_Latex
++   \f[
++      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
++   \f]
+       Then,
+-   Begin_Latex
+-      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
+-   End_Latex
+-      where, starting with x0 = A and finishing with xk = B,
+-      the subdivision points xi(i=1,2,...) are given by
+-   Begin_Latex
+-      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
+-   End_Latex
+-   Begin_Latex
+-      #lambda
+-   End_Latex
+-      is equal to the first member of the
+-      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
++   \f[
++      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
++   \f]
++      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
++      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
++   \f[
++      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
++   \f]
++      \f$\lambda\f$ is equal to the first member of the
++      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
+       If, at any stage in the process of subdivision, the ratio
+-  Begin_Latex
+-      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
+-  End_Latex
++  \f[
++      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
++  \f]
+       is so small that 1+0.005q is indistinguishable from 1 to
+       machine accuracy, an error exit occurs with the function value
+       set equal to zero.
+@@ -131,13 +128,13 @@
+       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
+       precisely, if k is the number of sub-intervals contributing to the
+       approximation (see Method), and if
+-      Begin_Latex
+-      I_{abs} = #int^{B}_{A} #||{f(x)}dx
+-      End_Latex
++   \f[
++      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
++   \f]
+       then the relation
+-   Begin_Latex
+-    #frac{#||{G-I}}{I_{abs}+k} < EPS
+-   End_Latex
++   \f[
++      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
++   \f]
+       will nearly always be true, provided the routine terminates without
+       printing an error message. For functions f having no singularities in
+       the closed interval [A,B] the accuracy will usually be much higher than
+@@ -156,9 +153,9 @@
+ 
+    /** Returns Integral of function on an infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{-#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{-\infty} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -169,9 +166,9 @@
+ 
+    /** Returns Integral of function on an upper semi-infinite interval.
+       This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{#infinity}_{A} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{\infty}_{A} f(x)dx
++   \f]
+       Usage:
+         In any arithmetic expression, this function has the approximate value
+         of the integral I.
+@@ -183,9 +180,9 @@
+ 
+    /** Returns Integral of function on a lower semi-infinite interval.
+        This function computes, to an attempted specified accuracy, the value of the integral:
+-   Begin_Latex
+-      I = #int^{B}_{#infinity} f(x)dx
+-   End_Latex
++   \f[
++      I = \int^{B}_{-\infty} f(x)dx
++   \f]
+       Usage:
+          In any arithmetic expression, this function has the approximate value
+          of the integral I.
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
+@@ -88,10 +88,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-      D(h) = #frac{f(x+h) - f(x-h)}{2h}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++      D(h) = \frac{f(x+h) - f(x-h)}{2h}
++     \f]
++      the final estimate
++     \f[
++      D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -103,9 +106,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -141,10 +144,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -156,9 +162,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+@@ -177,10 +183,13 @@
+       computed by Richardson's extrapolation method (use 2 derivative estimates
+       to compute a third, more accurate estimation)
+       first, derivatives with steps h and h/2 are computed by central difference formulas
+-     Begin_Latex
+-         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
+-     End_Latex
+-      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
++     \f[
++         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
++     \f]
++      the final estimate
++     \f[
++         D = \frac{4D(h/2) - D(h)}{3}
++     \f]
+        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
+ 
+       the argument eps may be specified to control the step size (precision).
+@@ -192,9 +201,9 @@
+       Getting the error via TF1::DerivativeError:
+         (total error = roundoff error + interpolation error)
+       the estimate of the roundoff error is taken as follows:
+-     Begin_Latex
+-         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
+-     End_Latex
++     \f[
++         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
++     \f]
+       where k is the double precision, ai are coefficients used in
+       central difference formulas
+       interpolation error is decreased by making the step size h smaller.
+diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
+--- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
+@@ -34,35 +34,33 @@
+ double kEulerGamma = 0.577215664901532860606512090082402431042;
+ 
+ 
+-/* Begin_Html
+-<center><h2>KelvinFunctions</h2></center>
++/**
++\class KelvinFunctions
+ 
+-<p>
+ This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
+ Kei(x), and their first derivatives.
+-</p>
+-
+-End_Html */
++*/
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
++/// \f]
+ /// For x > fgMin, Ber(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -102,24 +100,25 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
++/// \f[
++/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
+ /// function of the first kind.
+ ///
+ /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
+-/// End_Latex
++/// \f[
++/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
++/// \f]
+ /// For x > fgMin, Bei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
+-/// End_Latex
+-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
+-/// See also F1(x) and G1(x).
++/// \f[
++/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
++/// \f]
++/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
++///
++/// See also F1() and G1().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -161,29 +160,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Ker(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -227,29 +227,30 @@
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Latex
+-/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
+-/// End_Latex
+-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
++/// \f[
++/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
++/// \f]
++/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
+ /// Bessel function of the second kind.
+ ///
+ /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
+ /// approximation
+-/// Begin_Latex
+-/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
+-/// End_Latex
+-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
+-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
+-/// Begin_Latex
+-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
+-/// End_Latex
++/// \f[
++/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
++/// \f]
++/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
++/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
++/// \f[
++/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
++/// \f]
+ /// For x > fgMin, Kei(x) is computed according to its asymptotic
+ /// expansion:
+-/// Begin_Latex
+-/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
+-/// End_Latex
+-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
+-/// See also F2(x) and G2(x).
++/// \f[
++/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
++/// \f]
++/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
++///
++/// See also F2() and G2().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -298,10 +299,10 @@
+ /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ber(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -343,10 +344,10 @@
+ /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
+ /// the polynomial approximation of Bei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also M(x) and Theta(x).
++/// \f[
++/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
++/// \f]
++/// See also M() and Theta().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -388,10 +389,10 @@
+ /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
+ /// the polynomial approximation of Ker(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -436,10 +437,10 @@
+ /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
+ /// the polynomial approximation of Kei(x). Otherwise it is computed
+ /// according to its asymptotic expansion
+-/// Begin_Latex
+-/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
+-/// End_Latex
+-/// See also N(x) and Phi(x).
++/// \f[
++/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
++/// \f]
++/// See also N() and Phi().
+ ///
+ /// Begin_Macro
+ /// {
+@@ -481,9 +482,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
+-/// Begin_Latex
+-/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F1(double x)
+ {
+@@ -510,9 +511,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
+-/// Begin_Latex
+-/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::F2(double x)
+ {
+@@ -541,9 +542,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
+-/// Begin_Latex
+-/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G1(double x)
+ {
+@@ -568,9 +569,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the calculations of the Kelvin
+ /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
+-/// Begin_Latex
+-/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
+-/// End_Latex
++/// \f[
++/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
++/// \f]
+ 
+ double KelvinFunctions::G2(double x)
+ {
+@@ -597,9 +598,9 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+ /// DBei(x). M(x) is given by
+-/// Begin_Latex
+-/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// \f[
++/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::M(double x)
+ {
+@@ -612,10 +613,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DBer(x) and
+-/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DBei(x). \f$\theta(x)\f$ is given by
++/// \f[
++/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Theta(double x)
+ {
+@@ -628,10 +629,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). (x) is given by
+-/// Begin_Latex
+-/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
+-/// End_Latex
++/// DKei(x). N(x) is given by
++/// \f[
++/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
++/// \f]
+ 
+ double KelvinFunctions::N(double x)
+ {
+@@ -644,10 +645,10 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Utility function appearing in the asymptotic expansions of DKer(x) and
+-/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
+-/// Begin_Latex
+-/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
+-/// End_Latex
++/// DKei(x). \f$\phi(x)\f$ is given by
++/// \f[
++/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
++/// \f]
+ 
+ double KelvinFunctions::Phi(double x)
+ {
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
+@@ -85,7 +85,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+       
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+    private:
+diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
+--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
+@@ -37,11 +37,12 @@
+    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
+    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
+    and an alternate hypothesis (eg. signal+background).  
+-   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
+-   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
+-   not a probability.
+-   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
+-   Significance method.
++   The p-values can also be transformed into confidence levels
++   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
++   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
++   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
++   Finally, the p-value of the null can be transformed into a number of
++   equivalent Gaussian sigma using the Significance method.
+ 
+    The p-value of the null for a given test statistic is rigorously defined and
+    this is the starting point for the following conventions.
+@@ -52,17 +53,17 @@
+ observed value of the test statistic. This is the more standard
+ convention and avoids confusion when doing inverted tests.
+ 
+-For exclusion, we also want the formula
+-CLs = CLs+b / CLb to hold which therefore defines our conventions
+-for CLs+b and CLb. CLs was specifically invented for exclusion
++For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
++to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
++\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
+ and therefore all quantities need be related through the assignments
+-as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
++as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
+ is derived by considering the scenarios of a powerful and not powerful
+-inverted test, where for the not so powerful test, CLs must be
++inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
+ close to one.
+ 
+ For results of Hypothesis tests,
+-CLs has no similar direct interpretation as for exclusion and can
++\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
+ be larger than one.
+ 
+ */
+@@ -101,7 +102,7 @@
+       /// Convert  AlternatePValue into a "confidence level"
+       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
+ 
+-      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
++      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
+       virtual Double_t CLs() const {
+          double thisCLb = CLb();
+          if (thisCLb == 0) {
+@@ -144,7 +145,7 @@
+       /// The error on the "confidence level" of the alternative hypothesis
+       Double_t CLsplusbError() const;
+ 
+-      /// The error on the ratio CLs+b/CLb
++      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
+       Double_t CLsError() const;
+ 
+       /// The error on the Null p-value
+diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -100,11 +100,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$1 - CL_{b}\f$ : the B p-value
+ double HybridResult::NullPValue() const
+ {
+-   // return 1-CL_b : the B p-value
+-
+    if (fComputationsNulDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -131,11 +129,9 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns \f$CL_{s+b}\f$ : the S+B p-value
+ double HybridResult::AlternatePValue() const
+ {
+-   // return CL_s+b : the S+B p-value
+-
+    if (fComputationsAltDoneFlag==false) {
+       int nToys = fTestStat_b.size();
+       if (nToys==0) {
+@@ -162,40 +158,37 @@
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
++/// error on \f$CL_{b}\f$:
++/// \f[
++/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLbError() const
+ {
+-  // Returns an estimate of the error on CLb assuming a binomial error on
+-  // CLb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_b.size();
+   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
++/// error on \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
++/// \f]
+ Double_t HybridResult::CLsplusbError() const
+ {
+-  // Returns an estimate of the error on CLsplusb assuming a binomial
+-  // error on CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
+-  // END_LATEX
+   unsigned const int n = fTestStat_sb.size();
+   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////
+-
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
++/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ Double_t HybridResult::CLsError() const
+ {
+-  // Returns an estimate of the error on CLs through combination of the
+-  // errors on CLb and CLsplusb:
+-  // BEGIN_LATEX
+-  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-  // END_LATEX
+   unsigned const int n_b = fTestStat_b.size();
+   unsigned const int n_sb = fTestStat_sb.size();
+   
+diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
+--- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
+@@ -229,8 +229,8 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// compute CLb error
+-/// Clb =  1 - NullPValue() 
++/// compute \f$CL_{b}\f$ error
++/// \f$CL_{b}\f$ = 1 - NullPValue()
+ /// must use opposite condition that routine above
+ 
+ Double_t HypoTestResult::CLbError() const {
+@@ -251,12 +251,12 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Returns an estimate of the error on CLs through combination of the
+-/// errors on CLb and CLsplusb:
+-/// BEGIN_LATEX
+-/// #sigma_{CL_s} = CL_s
+-/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
+-/// END_LATEX
++/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
++/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
++/// \f[
++/// \sigma_{CL_s} = CL_s
++/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
++/// \f]
+ 
+ Double_t HypoTestResult::CLsError() const {
+    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
new file mode 100644
index 0000000..2af5c42
--- /dev/null
+++ b/root-libgfortranbegin.patch
@@ -0,0 +1,182 @@
+diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
+--- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
+--- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
+--- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
+@@ -55,8 +55,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
+--- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
+--- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
+@@ -49,8 +49,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
+--- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
+@@ -53,8 +53,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
+--- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
+@@ -43,8 +43,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
+--- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -42,8 +42,10 @@
+ endif
+ F77FLAGS      = -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
+--- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
+@@ -50,8 +50,10 @@
+ endif
+ F77FLAGS      = -m32 -fPIC -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
+--- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
+@@ -54,8 +54,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
+--- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -62,8 +62,10 @@
+ else
+ F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
+ endif
++ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
+--- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
+diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
+--- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
+@@ -55,8 +55,10 @@
+ endif
+ F77FLAGS      = -std=legacy
+ F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
++ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
+ F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
+ endif
++endif
+ 
+ ifneq ($(findstring g77, $(F77)),)
+ ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
new file mode 100644
index 0000000..4dfbc44
--- /dev/null
+++ b/root-links.patch
@@ -0,0 +1,376 @@
+diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
+--- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
+@@ -5,7 +5,7 @@
+ and their rotation algorithms. The classes were ported to root from
+ CLHEP see:
+ 
+-<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
++<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
+ 
+ ## The Physics Vector Classes
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
+--- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
+@@ -331,7 +331,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the maximum number of function calls for the minimization algorithm
+ /// For example for MIGRAD this is the maxcalls value passed as first argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetMaxIterations(Int_t niter)
+ {
+@@ -341,7 +341,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the Error Definition (default=1)
+ /// For Minuit this is the value passed with the "SET ERR" command
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
+ 
+ void TVirtualFitter::SetErrorDef(Double_t errdef)
+ {
+@@ -356,7 +356,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// static: Set the tolerance used in the minimization algorithm
+ /// For example for MIGRAD this is tolerance value passed as second argument
+-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
++/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
+ 
+ void TVirtualFitter::SetPrecision(Double_t prec)
+ {
+diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
+--- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
++++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
+@@ -13,7 +13,7 @@
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
+--- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
++++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
+@@ -5,15 +5,15 @@
+ .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+ .\" other parms are allowed: see man(7), man(1)
+ .SH NAME
+-g2rootold \- convert GEANT geomtry files to ROOT files
++g2rootold \- convert GEANT geometry files to ROOT files
+ .SH SYNOPSIS
+-.B g2rootoldd
++.B g2rootold
+ .I [-f map_name] geant_name macro_name
+ .SH "DESCRIPTION"
+ You can convert a
+ .B GEANT
+ (see
+-.I http://wwwinfo.cern.ch/asd/geant/index.html
++.I http://geant.cern.ch/
+ fore more on
+ .BR GEANT )
+ geometry to
+@@ -103,9 +103,9 @@
+ .I JDIGI.
+ .SH "SEE ALSO"
+ .RS
+-.IR root (1),
+-.IR g2root (1),
+-.IR h2root(1),
++.IR root(1) ,
++.IR g2root(1) ,
++.IR h2root(1) ,
+ .RE
+ and
+ .RS
+diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
+--- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
+@@ -74,7 +74,7 @@
+ 
+     <ul>
+   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
+-  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
++  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
+   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
+ New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
+ </li>
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -301,7 +301,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DENLAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -381,7 +381,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (DISLAN) is used.
+ 
+    @param x The argument \f$x\f$
+@@ -756,7 +756,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+@@ -783,7 +783,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (XM1LAN)  is used
+ 
+    @param x The argument \f$x\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
+@@ -528,7 +528,7 @@
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
+    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
+    The same algorithms as in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
+    CERNLIB</A> (RANLAN) is used.
+ 
+    @param z The argument \f$z\f$
+diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
+--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
+@@ -193,7 +193,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+@@ -219,7 +219,7 @@
+   For detailed description see
+   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
+   Mathworld</A>. The implementation used is that of
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
+   CERNLIB</A>,
+   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
+ 
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
+@@ -193,7 +193,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+@@ -408,7 +408,7 @@
+   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
+   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
+   Planetmath</A> and
+-  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
++  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
+   CERNLIB</A>) use the + sign in front of n in the denominator. In
+   order to be C++ compliant, the present library uses the former
+   convention. The implementation used is that of
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
+@@ -81,7 +81,7 @@
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
+@@ -90,7 +90,7 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
+--- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
+@@ -92,14 +92,14 @@
+    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
+    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
+    CERNLIB (G115)</A>.
+ 
+    - VavilovAccurate uses the algorithm by
+    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
+    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
+    which has been implemented in
+-   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
++   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
+    CERNLIB (G116)</A>.
+ 
+    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
+diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
+--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
+@@ -103,7 +103,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+@@ -239,7 +239,7 @@
+      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
+ 
+ - CERNLIB
+-     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
++     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
+ 
+    while the latter is used by
+ 
+diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
+--- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
+@@ -5,7 +5,7 @@
+ <li>The main TMinuit class is documented in class TMinuit.</li>
+ <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
+     </a></li>
+-<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
++<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
+     </a></li>
+ <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
+       </A></li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
+--- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
+@@ -13,7 +13,7 @@
+ <p>
+ <ol>
+ <li>
+-F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
++F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
+ <li>
+ F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
+ <li>
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
+@@ -32,7 +32,7 @@
+ 
+ <h2>References</h2>
+ <ol>
+-<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
++<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
+ <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
+   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
+ <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
+diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
+--- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
+@@ -14,7 +14,7 @@
+ 
+ ## References
+ 
+-1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
++1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
+ 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
+ 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
+ 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
+@@ -163,7 +163,7 @@
+ <h3>Linear Algebra Functions</h3>
+ 
+ Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
+-In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
++In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
+ <pre>
+ <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
+ bool ret = m.<strong>Invert</strong>()
+diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
+--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
+@@ -132,7 +132,7 @@
+ 
+ ### Linear Algebra Functions
+ 
+-Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
++Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
+ 
+ <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
+ bool ret = m.**Invert**()  
+diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
+--- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
+@@ -47,8 +47,8 @@
+ //           V               v      v                     v      v                  //
+ //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
+ //       |        ^                                                                 //
+-//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
+-//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
++//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
++//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
+ // St_PolyLine3D  |                                                                 //
+ //                |                                                                 //
+ //           TPoints3DABC                                                           //
+diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
+--- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
+@@ -142,7 +142,7 @@
+ ///                            10 - this unvisible, but sons are visible
+ ///                            01 - this visible but sons
+ ///                            11 - neither this nor its sons are visible
+-/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
++/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
+ 
+ Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
+ {
+@@ -150,11 +150,12 @@
+    return mapVis[vis];
+ }
+ 
+-//______________________________________________________________________________
+-//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++////////////////////////////////////////////////////////////////////////////////
++/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
++/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
++
+ Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
+ {
+-// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
+    const Int_t mapVis[4] = {1, -2, 0, -1 };
+    Int_t i;
+ //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
new file mode 100644
index 0000000..39d7510
--- /dev/null
+++ b/root-llvm-static.patch
@@ -0,0 +1,11 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
+@@ -59,6 +59,7 @@
+   endif()
+ endif()
+ set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
++set(BUILD_SHARED_LIBS "NO")
+ #--- Do not build cling as part of llvm.
+ set(LLVM_NOCLING "YES")
+ 
diff --git a/root-macro-align.patch b/root-macro-align.patch
new file mode 100644
index 0000000..f8ef9eb
--- /dev/null
+++ b/root-macro-align.patch
@@ -0,0 +1,36 @@
+diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
+--- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
+@@ -329,7 +329,7 @@
+ parameters are shown in the plot below.
+ 
+ Begin_Macro(source)
+-   {
++{
+       //canvas only needed for the documentation
+       TCanvas* c1 = new TCanvas("c1","",600,400);
+       c1->SetFillStyle(1001);
+@@ -363,7 +363,7 @@
+ 
+       //only for this documentation
+       return c1;
+-   }
++}
+ End_Macro
+ 
+ 
+diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
+--- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
+@@ -1809,9 +1809,9 @@
+ /// of comparison of the unweighted histogram with 217 events (minimal expected
+ /// frequency equal to one) and the weighted histogram with 500 events (minimal
+ /// expected frequency equal to 25)
+-///Begin_Macro
++/// Begin_Macro
+ /// ../../../tutorials/math/chi2test.C(17)
+-///End_Macro
++/// End_Macro
+ /// Fig 2. An example of comparison of the unweighted histogram with 217 events
+ /// and the weighted histogram with 500 events:
+ ///   a) unweighted histogram;
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
new file mode 100644
index 0000000..48085d6
--- /dev/null
+++ b/root-missing-cmake-config.patch
@@ -0,0 +1,187 @@
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
+@@ -252,6 +252,12 @@
+   endif()
+   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
+                          REGEX system.rootrc EXCLUDE
++                         REGEX system.rootauthrc EXCLUDE
++                         REGEX system.rootdaemonrc EXCLUDE
++                         REGEX rootd.rc.d EXCLUDE
++                         REGEX proofd.rc.d EXCLUDE
++                         REGEX rootd.xinetd EXCLUDE
++                         REGEX proofd.xinetd EXCLUDE
+                          REGEX root.mimes EXCLUDE)
+   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
+   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
+@@ -404,7 +404,13 @@
+ set(perl ${PERL_EXECUTABLE})
+ 
+ #---RConfigure-------------------------------------------------------------------------------------------------
+-set(setresuid undef)
++CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
++  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
++if(found_setresuid)
++  set(setresuid define)
++else()
++  set(setresuid undef)
++endif()
+ if(mathmore)
+   set(hasmathmore define)
+ else()
+@@ -523,7 +529,16 @@
+ execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
+ 
+ configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
++
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
++configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
++
+ configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
++
+ if(ruby)
+   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
+ endif()
+@@ -665,8 +680,21 @@
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
+               ${CMAKE_BINARY_DIR}/etc/system.rootrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
++              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
+               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
++              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
++                          GROUP_EXECUTE GROUP_READ
++                          WORLD_EXECUTE WORLD_READ
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
++install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
++              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
++              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
++
+ install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
+ 
+ if(NOT gnuinstall)
+diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
+@@ -9,4 +9,9 @@
+ ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
+ 
+ ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
+-ROOT_INSTALL_HEADERS()
++
++if(AIX)
++  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++endif()
++
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
+@@ -7,6 +7,7 @@
+   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
+   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
+   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
++  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
+ endif()
+ ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
+ ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
+diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
+--- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
+@@ -1,6 +1,7 @@
+ 
+ add_subdirectory(net)
+ add_subdirectory(auth)  # special CMakeListst.txt
++add_subdirectory(rootd)
+ 
+ if(bonjour)
+   add_subdirectory(bonjour)
+diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
+--- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
+@@ -0,0 +1,9 @@
++############################################################################
++# CMakeLists.txt file for building ROOT net/rootd package
++# @author Pere Mato, CERN
++############################################################################
++
++ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
++                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
+--- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
+@@ -3,4 +3,7 @@
+ # @author Pere Mato, CERN
+ ############################################################################
+ 
+-ROOT_INSTALL_HEADERS()
+\ No newline at end of file
++ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
++  RIO Net Thread MathCore)
++
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
+@@ -4,6 +4,7 @@
+ ############################################################################
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ add_definitions(${XROOTD_CFLAGS})
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
+ 
+@@ -11,14 +12,16 @@
+   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
+ else()
+   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
+-                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
++                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
+   if (NOT XROOTD_NOMAIN)
+      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
+   endif ()
+   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
+                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+-  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
++  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
++  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
++                         LIBRARIES ${SYSLIBS})
+ endif()
+ 
+ if(builtin_xrootd)
+@@ -38,4 +41,4 @@
+ endif()
+ 
+ 
+-ROOT_INSTALL_HEADERS()
++ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
+diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
+@@ -1,4 +1,3 @@
+-
+ ############################################################################
+ # CMakeLists.txt file for building ROOT proof/proofx package
+ # @author Pere Mato, CERN
+@@ -14,6 +13,7 @@
+ endif()
+ 
+ include_directories(${XROOTD_INCLUDE_DIRS})
++include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
+ link_directories(${XROOTD_LIBRARY_DIR})
+ add_definitions(${XROOTD_CFLAGS})
+ 
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
new file mode 100644
index 0000000..5ce9485
--- /dev/null
+++ b/root-more-fflags.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index f51bcbe..1ee0602 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
+ #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
+-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
++string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+ string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
+ set(ROOT_COMPILER_FLAG_HINTS "#
+ set(ROOT_DEFINITIONS \"${__defs}\")
+diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
+index 045926d..a419744 100644
+--- a/cmake/scripts/RootUseFile.cmake.in
++++ b/cmake/scripts/RootUseFile.cmake.in
+@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
+index b9a8e34..f931ad3 100644
+--- a/etc/cmake/RootUseFile.cmake
++++ b/etc/cmake/RootUseFile.cmake
+@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
new file mode 100644
index 0000000..afad777
--- /dev/null
+++ b/root-no-abi-check.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
+index 896ca4c..51e01905 100644
+--- a/cmake/modules/CheckCompiler.cmake
++++ b/cmake/modules/CheckCompiler.cmake
+@@ -1,7 +1,6 @@
+ #---------------------------------------------------------------------------------------------------
+ #  CheckCompiler.cmake
+ #---------------------------------------------------------------------------------------------------
+-include (CheckCXXSourceCompiles)
+ 
+ #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
+ if(fortran)
+@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
+   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
+-  CHECK_CXX_SOURCE_COMPILES("
+-    #include <string>
+-    #if _GLIBCXX_USE_CXX11_ABI
+-    #error \"cling does not support GCC 5 ABI.\"
+-    #endif
+-    int main() {}" CXX_SUPPORTS_OLD_ABI)
+-  if(NOT CXX_SUPPORTS_OLD_ABI)
+-     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
+-  endif()
+ else()
+   set(GCC_MAJOR 0)
+   set(GCC_MINOR 0)
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
new file mode 100644
index 0000000..1157d56
--- /dev/null
+++ b/root-no-testdata.patch
@@ -0,0 +1,20 @@
+diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
+--- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
+@@ -239,13 +239,14 @@
+ 
+ #--stressProof-------------------------------------------------------------------------------
+ if(NOT WIN32)
+-  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
++  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
+   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
+   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
+                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
+                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
+                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
+-                                         FAILREGEX "FAILED|Error in")
++                                         FAILREGEX "FAILED|Error in"
++                                         DEPENDS TestData)
+ endif()
+ 
+ #--testbits----------------------------------------------------------------------------------
diff --git a/root-ppc64.patch b/root-ppc64.patch
new file mode 100644
index 0000000..cab115c
--- /dev/null
+++ b/root-ppc64.patch
@@ -0,0 +1,38 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
+@@ -30,8 +30,8 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
+-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
+-  message(STATUS "Found a 64bit ppc64 little endian system")
++elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
++  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
+   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     message(STATUS "Found GNU compiler collection")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
+@@ -205,17 +205,12 @@
+    ;;
+ linuxppcgcc)
+    # PPC Linux with gcc
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
++   auxldflags="-m32"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
+ linuxppc64gcc)
+-   # PPC64 (64 bit mode) Linux with gcc 3.x
+-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+-   auxldflags="-m64"
+-   auxlibs="-lm -ldl -rdynamic"
+-   ;;
+-ppc64le)
+-   # PPC64 (64 bit mode) little endian
++   # PPC64/PPC64LE (64 bit mode) Linux with gcc
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
new file mode 100644
index 0000000..cb30e30
--- /dev/null
+++ b/root-private-public.patch
@@ -0,0 +1,156 @@
+diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
+--- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
+@@ -43,8 +43,8 @@
+ #ifndef ROOT_TSocket
+ #include "TSocket.h"
+ #endif
+-#ifndef ROOT_XrdProofConn
+-#include "XrdProofConn.h"
++#ifndef __XPTYPES_H
++#include "XProtocol/XPtypes.hh"
+ #endif
+ #ifndef XRC_UNSOLMSG_H
+ #include "XrdClient/XrdClientUnsolMsg.hh"
+@@ -58,6 +58,7 @@
+ class TXHandler;
+ class TXSocketHandler;
+ class XrdClientMessage;
++class XrdProofConn;
+ 
+ // To transmit info to Handlers
+ typedef struct {
+@@ -140,7 +141,7 @@
+    void                PostMsg(Int_t type, const char *msg = 0);
+ 
+    // Auxilliary
+-   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
++   Int_t               GetLowSocket() const;
+ 
+    static void         SetLocation(const char *loc = ""); // Set location string
+ 
+@@ -170,13 +171,13 @@
+ 
+    virtual Int_t       GetClientID() const { return -1; }
+    virtual Int_t       GetClientIDSize() const { return 1; }
+-   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
+-   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
+-   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
+-   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
++   Int_t               GetLogConnID() const;
++   Int_t               GetOpenError() const;
++   Int_t               GetServType() const;
++   Int_t               GetSessionID() const;
+    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
+ 
+-   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
++   Bool_t              IsValid() const;
+    Bool_t              IsServProofd();
+    virtual void        RemoveClientID() { }
+    virtual void        SetClientID(Int_t) { }
+@@ -215,11 +216,9 @@
+    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
+ 
+    // Interrupt the low level socket
+-   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
+-                                        fRDInterrupt = i;
+-                                        if (i && fConn) fConn->SetInterrupt();
+-                                        if (i && fAWait) fASem.Post(); }
++   void                SetInterrupt(Bool_t i = kTRUE);
+    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
++
+    // Set / Check async msg queue waiting status
+    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
+    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
+diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
+@@ -40,6 +40,8 @@
+ #include "TSysEvtHandler.h"
+ #include "XProofProtocol.h"
+ 
++#include "XrdProofConn.h"
++
+ ClassImp(TXProofMgr)
+ 
+ //
+diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
+--- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
+@@ -912,6 +912,46 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++/// Getter for logical connection ID
++
++Int_t TXSocket::GetLogConnID() const
++{
++   return (fConn ? fConn->GetLogConnID() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for last error
++
++Int_t TXSocket::GetOpenError() const
++{
++   return (fConn ? fConn->GetOpenError() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for server type
++
++Int_t TXSocket::GetServType() const
++{
++   return (fConn ? fConn->GetServType() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for session ID
++
++Int_t TXSocket::GetSessionID() const
++{
++   return (fConn ? fConn->GetSessionID() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Getter for validity status
++
++Bool_t TXSocket::IsValid() const
++{
++   return (fConn ? (fConn->IsValid()) : kFALSE);
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Return kTRUE if the remote server is a 'proofd'
+ 
+ Bool_t TXSocket::IsServProofd()
+@@ -1633,6 +1673,16 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++void TXSocket::SetInterrupt(Bool_t i)
++{
++   R__LOCKGUARD(fAMtx);
++   fRDInterrupt = i;
++   if (i && fConn) fConn->SetInterrupt();
++   if (i && fAWait) fASem.Post();
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Send a TMessage object. Returns the number of bytes in the TMessage
+ /// that were sent and -1 in case of error.
+ 
+@@ -1923,6 +1973,12 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++Int_t TXSocket::GetLowSocket() const {
++   return (fConn ? fConn->GetLowSocket() : -1);
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Init environment variables for XrdClient
+ 
+ void TXSocket::InitEnvs()
diff --git a/root-s390x.patch b/root-s390x.patch
new file mode 100644
index 0000000..39f0b98
--- /dev/null
+++ b/root-s390x.patch
@@ -0,0 +1,147 @@
+diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
+--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
++++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
+@@ -54,6 +54,32 @@
+   else()
+     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+   endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390x)
++  message(STATUS "Found a 64bit system")
++  set(BIT_ENVIRONMENT "-m64")
++  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390xgcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
++elseif(${SYSCTL_OUTPUT} MATCHES s390)
++  message(STATUS "Found a 31bit system")
++  set(BIT_ENVIRONMENT "-m31")
++  set(SPECIAL_CINT_FLAGS "")
++  if(CMAKE_COMPILER_IS_GNUCXX)
++    message(STATUS "Found GNU compiler collection")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
++    message(STATUS "Found CLANG compiler")
++    set(ROOT_ARCHITECTURE linuxs390gcc)
++  else()
++    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
++  endif()
+ else()
+   message(STATUS "Found a 32bit system")
+   set(BIT_ENVIRONMENT "-m32")
+diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
+--- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
++++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
+@@ -215,6 +215,18 @@
+    auxldflags="-m64"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
++linuxs390gcc)
++   # s390 (31 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
++   auxldflags="-m31"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
++linuxs390xgcc)
++   # s390x (64 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
++   auxldflags="-m64"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
+ linuxx8664gcc)
+    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
+    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
+diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
+--- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
+@@ -202,6 +202,19 @@
+ #   define NEED_SIGJMP
+ #endif
+ 
++#if defined(linux) && defined(__s390__)
++#   define R__LINUX
++#   define R__UNIX
++#   define NEED_SIGJMP
++#endif
++
++#if defined(linux) && defined(__s390x__)
++#   define R__LINUX
++#   define R__UNIX
++#   define R__B64
++#   define NEED_SIGJMP
++#endif
++
+ #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
+ #   define R__HURD
+ #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
+diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
+--- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
++++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
+@@ -54,6 +54,10 @@
+     set(PCRE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(PCRE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(PCRE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(PCRE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(PCRE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
+--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
++++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
+@@ -49,6 +49,10 @@
+     set(AFTER_CC "${AFTER_CC}")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(AFTER_CC "${AFTER_CC}")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(AFTER_CC "${AFTER_CC} -m64")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(AFTER_CC "${AFTER_CC} .m31")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(AFTER_CC "${AFTER_CC} -m32")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
+--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
++++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
+@@ -56,6 +56,10 @@
+     set(FREETYPE_CFLAGS "-O")
+   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+     set(FREETYPE_CFLAGS "-O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
++    set(FREETYPE_CFLAGS "-m64 -O")
++  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++    set(FREETYPE_CFLAGS "-m31 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES linux)
+     set(FREETYPE_CFLAGS "-m32 -O")
+   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
+@@ -21,6 +21,8 @@
+   set(ROOT_CLING_TARGET "ARM")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
+   set(ROOT_CLING_TARGET "PowerPC")
++elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
++  set(ROOT_CLING_TARGET "SystemZ")
+ elseif(ROOT_ARCHITECTURE MATCHES linux)
+   set(ROOT_CLING_TARGET "X86")
+ elseif(ROOT_ARCHITECTURE MATCHES macosx)
+diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
+--- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
+@@ -372,6 +372,8 @@
+   set(LLVM_NATIVE_ARCH Hexagon)
+ elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
+   set(LLVM_NATIVE_ARCH SystemZ)
++elseif (LLVM_NATIVE_ARCH MATCHES "s390")
++  set(LLVM_NATIVE_ARCH SystemZ)
+ else ()
+   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
+ endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
new file mode 100644
index 0000000..4952a92
--- /dev/null
+++ b/root-save-memory.patch
@@ -0,0 +1,30 @@
+diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
+@@ -36,7 +36,9 @@
+                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                                     ${corelinklibs})
+ 
+-add_dependencies(rootcling CLING LLVMRES)
++# The dependency on Cling was added to prevent Cling (libCling) and
++# rootcling from being linked in parallel.
++add_dependencies(rootcling CLING LLVMRES Cling)
+ 
+ ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
+ 
+diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
+--- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
+@@ -25,9 +25,11 @@
+ 
+ CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
+ ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
++# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
++# $(ROOTCLINGEXE) from being linked in parallel.
+ $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
+ 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
+-           $(PCREDEP) $(CORELIBDEP)
++           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
+ 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
+ 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
+ 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
new file mode 100644
index 0000000..35b828c
--- /dev/null
+++ b/root-see-macro-output.patch
@@ -0,0 +1,266 @@
+diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
+--- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
+@@ -13,7 +13,6 @@
+ 
+ void fit1() {
+    //Simple fitting example (1-d histogram with an interpreted function)
+-   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
+--- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ void fitslicesy() {
+ //
+ // Illustrates how to use the TH1::FitSlicesY function
+-// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
+ //    It uses the TH2F histogram generated in macro hsimple.C
+ //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
+ //    in 2 sepate pads.
+diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
+--- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
+@@ -3,7 +3,6 @@
+ 
+ void multifit() {
+ //  Fitting multiple functions to different ranges of a 1-D histogram
+-// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ //      Example showing how to fit in a sub-range of an histogram
+ //  An histogram is created and filled with the bin contents and errors
+ //  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
+--- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
+@@ -3,7 +3,6 @@
+ 
+ void shapes() {
+ //The old geometry shapes (see script geodemo.C)
+-//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
+--- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,6 +1,5 @@
+ void basic3d(){
+    // Show 3-D polylines and markers
+-   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
+    //
+ 
+    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
+--- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void canvas(){
+ //Example of primitives in a canvas
+-// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
+ // One of the first actions in a ROOT session is the creation of a Canvas.
+ // Here we create a Canvas named "c1"
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
+--- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
+@@ -1,7 +1,6 @@
+ void feynman()
+ {
+    //Draw Feynman diagrams
+-   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
+    //Author: Otto Schaile
+ 
+    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
+diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
+--- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
+@@ -1,6 +1,5 @@
+ void gaxis(){
+ //Simple example illustrating how to draw TGaxis objects in various formats.
+-//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
+--- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
+@@ -1,6 +1,5 @@
+ void tornado() {
+ //Show 3-d polymarkers
+-// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ //Author: Rene Brun
+ 
+     gBenchmark->Start("tornado");
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
+@@ -1,6 +1,5 @@
+ void gerrors2() {
+    //Draw two graphs with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
+--- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void gerrors() {
+    //Draw a graph with error bars
+-   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
+--- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void graph() {
+    //Draw a simple graph
+-   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
+diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
+--- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
+@@ -1,6 +1,5 @@
+ void surfaces() {
+    //Draw 2-Dim functions
+-   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
+--- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
+@@ -1,6 +1,5 @@
+ void fillrandom() {
+    //Fill a 1-D histogram from a parametric function
+-   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
+diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
+--- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
+@@ -1,7 +1,6 @@
+ // histograms filled and drawn in a loop
+ void hsum() {
+ //
+-// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ //    Simple example illustrating how to use the C++ interpreter
+ //    to fill histograms in a loop and show the graphics results
+ //Author: Rene Brun
+diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
+--- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
+@@ -9,7 +9,6 @@
+ {
+    //example of macro illustrating how to superimpose two histograms
+    //with different scales in the "same" pad.
+-   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
+    //Author: Rene Brun
+ 
+    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
+diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
+--- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
+diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
+--- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
+ #
+ from os import path
+ from ROOT import TCanvas, TFile, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
+--- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraphErrors
+diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
+--- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
+ #
+ 
+ from ROOT import TCanvas, TGraph
+diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
+--- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
+diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
+--- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ #    Simple example illustrating how to use the C++ interpreter	
+ #    to fill histograms in a loop and show the graphics results
+ #
+diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
+--- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
+ #      Example showing how to fit in a sub-range of an histogram
+ #  An histogram is created and filled with the bin contents and errors
+ #  defined in the table below.
+diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
+--- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
+ #
+ 
+ import ROOT
+diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
+--- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,5 +1,4 @@
+ #
+-# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
+ #
+ 
+ from ROOT import TCanvas, TPaveText, TPad, TF2
+diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
+--- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
+@@ -1,4 +1,3 @@
+-# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
+ 
+ from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
+ from ROOT import gROOT, gBenchmark
+diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
+--- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
+@@ -4,7 +4,6 @@
+ # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
+ #
+ # original header:
+-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
+ # Simple example illustrating how to use the C++ interpreter	
+ # to fill histograms in a loop and show the graphics results
+ 
diff --git a/root-soname.patch b/root-soname.patch
new file mode 100644
index 0000000..3367bad
--- /dev/null
+++ b/root-soname.patch
@@ -0,0 +1,11 @@
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
+@@ -39,7 +39,7 @@
+ if(soversion)
+   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
+       VERSION ${ROOT_VERSION}
+-      SOVERSION ${ROOT_MAJOR_VERSION}
++      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
+       SUFFIX ${libsuffix}
+       PREFIX ${libprefix} )
+ else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
new file mode 100644
index 0000000..8834aa4
--- /dev/null
+++ b/root-stressgraphics.patch
@@ -0,0 +1,56 @@
+diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
+--- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
++++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
+@@ -3,18 +3,18 @@
+     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
+     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
+     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
+-    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
++    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
+     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
+     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
+-    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
+-    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
+-   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
+-   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
+-   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
+-   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
+-   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
+-   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
+-   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
++    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
++    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
++   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
++   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
++   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
++   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
++   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
++   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
++   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
+    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
+    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
+@@ -25,7 +25,7 @@
+    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
+    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
+    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
+-   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
++   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
+    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
+    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
+    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
+@@ -35,11 +35,11 @@
+    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
+    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
+    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
+-   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
++   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
+    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
+-   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
++   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
+-   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
++   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
+    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
+    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
+    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
diff --git a/root-template-files.patch b/root-template-files.patch
new file mode 100644
index 0000000..086b8a7
--- /dev/null
+++ b/root-template-files.patch
@@ -0,0 +1,28 @@
+diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
+--- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
+@@ -15,8 +15,8 @@
+    // equal to 1 for the signal and 0 for the background is added.
+    const char *fname = "mlpHiggs.root";
+    TFile *input = 0;
+-   if (!gSystem->AccessPathName(fname)) {
+-      input = TFile::Open(fname);
++   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    } else {
+       printf("accessing %s file from http://root.cern.ch/files\n",fname);
+       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
+--- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
+@@ -273,8 +273,8 @@
+ 
+   const char *fname = "stock.root";
+   TFile *f = 0;
+-  if (!gSystem->AccessPathName(fname)) {
+-     f = TFile::Open(fname);
++  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+   } else {
+      printf("accessing %s file from http://root.cern.ch/files\n",fname);
+      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff --git a/root-test-install.patch b/root-test-install.patch
new file mode 100644
index 0000000..0b61f68
--- /dev/null
+++ b/root-test-install.patch
@@ -0,0 +1,3105 @@
+diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
+--- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
+@@ -37,12 +37,12 @@
+   install(FILES ${pyfile} DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+-  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY ${pyfile} DESTINATION ${localruntimedir})
+ endforeach()
+ 
+-set( ROOTaaSDirName "ROOTaaS")
++set(ROOTaaSDirName "ROOTaaS")
+ install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
+-file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
+ 
+ #---Install headers----------------------------------------------------------
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
+--- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
+@@ -508,7 +508,7 @@
+ 
+           # system logon, user logon, and local logon (skip Rint.Logon)
+             name = '.rootlogon.C'
+-            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
++            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
+                        os.path.expanduser( os.path.join( '~', name ) ) ]
+             if logons[-1] != os.path.join( os.getcwd(), name ):
+                logons.append( name )
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
+@@ -222,7 +222,7 @@
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
+ 
+ # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
+-if(rpath OR gnuinstall)
++if(rpath)
+   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
+   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
+ elseif(APPLE)
+diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
+--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
+@@ -19,6 +19,7 @@
+   set(libprefix lib)
+   set(ld_library_path PATH)
+   set(libsuffix .dll)
++  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_BINDIR})
+ elseif(APPLE)
+   set(ld_library_path DYLD_LIBRARY_PATH)
+@@ -26,6 +27,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ else()
+   set(ld_library_path LD_LIBRARY_PATH)
+@@ -33,6 +35,7 @@
+   set(scomment \#)
+   set(libprefix lib)
+   set(libsuffix .so)
++  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+@@ -322,7 +325,15 @@
+     set(pcm_name)
+   else()
+     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
+-      set(command rootcling -rootbuild)
++      if(gnuinstall)
++        if(WIN32)
++          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
++        else()
++          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
++        endif()
++      else()
++        set(command rootcling -rootbuild)
++      endif()
+       set(ROOTCINTDEP rootcling)
+     else()
+       set(command rootcling)
+@@ -431,9 +442,6 @@
+   if(TARGET G__${library})
+     add_dependencies(${library} G__${library})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
+   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
+   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
+@@ -468,9 +476,6 @@
+   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
+      add_dependencies(${library} ${CMAKE_MATCH_2})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+ 
+   #--- Only for building shared libraries
+   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
+@@ -511,9 +516,6 @@
+   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
+   include_directories(${CMAKE_BINARY_DIR}/include)
+   add_library( ${library} SHARED ${lib_srcs})
+-  if(TARGET move_headers)
+-    add_dependencies(${library} move_headers)
+-  endif()
+   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
+   target_link_libraries(${library} ${ARG_LIBRARIES})
+   #----Installation details-------------------------------------------------------
+@@ -590,6 +592,10 @@
+                            PATTERN ".svn" EXCLUDE
+                            REGEX "LinkDef" EXCLUDE
+                            ${ARG_OPTIONS})
++    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
++                   PATTERN ".svn" EXCLUDE
++                   REGEX "LinkDef" EXCLUDE
++                   ${ARG_OPTIONS})
+     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
+   endforeach()
+ endfunction()
+@@ -629,9 +635,6 @@
+   if (ARG_ADDITIONAL_COMPILE_FLAGS)
+     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
+   endif()
+-  if(TARGET move_headers)
+-    add_dependencies(${executable} move_headers)
+-  endif()
+ 
+   #----Installation details------------------------------------------------------
+   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+@@ -849,6 +852,9 @@
+     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
+   else()
+     add_test(NAME ${test} COMMAND ${_command})
++    if (gnuinstall)
++      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
++    endif()
+   endif()
+ 
+   #- Handle TIMOUT and DEPENDS arguments
+diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
+--- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
+@@ -1,20 +0,0 @@
+-# Arguments:
+-#  PREFIX    - Installation prefix
+-#  COMPONENTS - Installation component
+-
+-set(COMPONENTS ${COMPONENTS})
+-set(ENV{DESTDIR} "")
+-foreach(component ${COMPONENTS})
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
+-                             -DCMAKE_INSTALL_COMPONENT=${component}
+-                             -P cmake_install.cmake
+-    RESULT_VARIABLE result
+-    OUTPUT_QUIET
+-  )
+-
+-  if(result)
+-    set(msg "Local installation of ${component} failed: ${result}\n")
+-    message(FATAL_ERROR "${msg}")
+-  endif()
+-endforeach()
+diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
+--- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
+@@ -135,7 +135,7 @@
+   endif()
+ endforeach()
+ 
+-#---Move (copy) the headers and other directories to binary tree---------------------------------
++#---Move (copy) directories to binary tree------------------------------------------------------
+ set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
+ add_custom_command(OUTPUT ${stamp_file}
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
+@@ -147,11 +147,7 @@
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
+                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
+                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
+-add_custom_target(move_headers DEPENDS ${stamp_file}
+-                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
+-                                                        -DCOMPONENTS="headers"
+-                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
+-include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
++add_custom_target(move_artifacts DEPENDS ${stamp_file})
+ 
+ 
+ #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
+@@ -199,13 +195,23 @@
+                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
+                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
+ 
+-add_custom_command(OUTPUT etc/allDict.cxx.pch
+-                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+-                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
+-                           etc/dictpch/allLinkDefs.h
+-                           etc/dictpch/allHeaders.h
+-                           etc/dictpch/allCppflags.txt
+-                           rootcling)
++if (WIN32)
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++else()
++  add_custom_command(OUTPUT etc/allDict.cxx.pch
++                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
++                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
++                             etc/dictpch/allLinkDefs.h
++                             etc/dictpch/allHeaders.h
++                             etc/dictpch/allCppflags.txt
++                             rootcling)
++endif()
+ add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
+ set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
+ add_dependencies(onepcm ${__allTargets})
+@@ -213,22 +219,20 @@
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+ #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
+-  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-  add_dependencies(hsimple onepcm)
+-  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
+-  if(WIN32)
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  else()
+-    add_custom_command(OUTPUT tutorials/hsimple.root
+-                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+-                               $<TARGET_FILE:hsimple.exe>
+-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-  endif()
+-  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
++add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
++add_dependencies(hsimple onepcm)
++if(WIN32)
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
++else()
++  add_custom_command(OUTPUT tutorials/hsimple.root
++                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     WORKING_DIRECTORY tutorials
++                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+ endif()
++install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+ 
+ #---version--------------------------------------------------------------------------------------
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
+@@ -266,9 +270,6 @@
+ #---Configure Testing using CTest----------------------------------------------------------------
+ configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
+ if(testing)
+-  if(gnuinstall)
+-    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
+-  endif()
+   include(RootCTest)
+   if(roottest)
+     find_package(Git REQUIRED)
+diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
+--- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
+@@ -14,10 +14,11 @@
+ #define ROOTTUTDIR    "@tutdir@"
+ #define ROOTSRCDIR    "@srcdir@"
+ #define ROOTICONPATH  "@iconpath@"
+-#define EXTRAICONPATH "@extraiconpath@"
+ #define TTFFONTDIR    "@ttffontdir@"
+ #endif
+ 
++#define EXTRAICONPATH "@extraiconpath@"
++
+ #@setresuid@ R__HAS_SETRESUID   /**/
+ #@hasmathmore@ R__HAS_MATHMORE   /**/
+ #@haspthread@ R__HAS_PTHREAD    /**/
+diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
+--- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
+@@ -9,24 +9,24 @@
+ # and to PATH on Windows.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.DynamicPath:    .:@libdir@:
+-WinNT.*.Root.DynamicPath:   .;@bindir@;
++#Unix.*.Root.DynamicPath:    .:@libdir@
++#WinNT.*.Root.DynamicPath:   .;@bindir@
+ 
+ # Path used to find macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.MacroPath:      .:@macrodir@:
+-WinNT.*.Root.MacroPath:     .;@macrodir@;
++#Unix.*.Root.MacroPath:      .:@macrodir@
++#WinNT.*.Root.MacroPath:     .;@macrodir@
+ 
+ # Path used to find plugin macros.
+ # Paths are different for Unix and Windows. The example shows the defaults
+ # for all ROOT applications for either Unix or Windows.
+-Unix.*.Root.PluginPath:      :@plugindir@:
+-WinNT.*.Root.PluginPath:     ;@plugindir@;
++#Unix.*.Root.PluginPath:     @plugindir@
++#WinNT.*.Root.PluginPath:    @plugindir@
+ 
+ # Path where to look for TrueType fonts.
+ Unix.*.Root.UseTTFonts:     true
+-*.*.Root.TTFontPath:        @ttffontdir@
++#*.*.Root.TTFontPath:        @ttffontdir@
+ 
+ # Use Net* API functions.
+ WinNT.UseNetAPI:         true
+@@ -222,7 +222,8 @@
+ Gui.DocumentForegroundColor: black
+ Gui.TooltipBackgroundColor:  LightYellow
+ Gui.TooltipForegroundColor:  black
+-Gui.IconPath:                $(HOME)/icons:@iconpath@:.
++#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
++#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
+ Gui.MimeTypeFile:            $(HOME)/.root.mimes
+ # If above does not exists defaults to this:
+ #Gui.MimeTypeFile:            @etcdir@/root.mimes
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
+@@ -8018,6 +8018,7 @@
+     -e "s|@bindir@|$bindir|"               \
+     -e "s|@etcdir@|$etcdir|"               \
+     -e "s|@ttffontdir@|$fontdir|"          \
++    -e "s|@extraiconpath@|$extraiconpath|" \
+     -e "s|@iconpath@|$iconpath|"           \
+     -e "s|@hasxrd@|$hasxrd|"               \
+     -e "s|@hasnotxrd@|$hasnotxrd|"         \
+diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
+--- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
+@@ -325,7 +325,19 @@
+    static Int_t       ConvertVersionInt2Code(Int_t v);
+    static Int_t       RootVersionCode();
+    static const char**&GetExtraInterpreterArgs();
+-   static const char *GetTutorialsDir();
++
++   static const TString& GetRootSys();
++   static const TString& GetBinDir();
++   static const TString& GetLibDir();
++   static const TString& GetIncludeDir();
++   static const TString& GetEtcDir();
++   static const TString& GetDataDir();
++   static const TString& GetDocDir();
++   static const TString& GetMacroDir();
++   static const TString& GetTutorialsDir();
++   static const TString& GetSourceDir();
++   static const TString& GetIconPath();
++   static const TString& GetTTFFontDir();
+ 
+    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
+ };
+diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
+--- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -268,11 +268,7 @@
+    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
+    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR);
+-#else
+-                                       "$(ROOTSYS)/fonts");
+-#endif
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+    // Check for use of DFSG - fonts
+    if (!ttfont)
+@@ -880,29 +876,19 @@
+          Error("ProcessLine", "Cannot show demos in batch mode!");
+          return 1;
+       }
+-#ifdef ROOTTUTDIR
+-      ProcessLine(".x " ROOTTUTDIR "/demos.C");
+-#else
+-      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
+-#endif
++      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
+       return 0;
+    }
+ 
+    if (!strncmp(line, ".license", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/LICENSE");
+-#else
+-      return PrintFile("$(ROOTSYS)/LICENSE");
+-#endif
++      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
+    }
+ 
+    if (!strncmp(line, ".credits", 8)) {
+-#ifdef ROOTDOCDIR
+-      return PrintFile(ROOTDOCDIR "/CREDITS");
+-#else
+-      return PrintFile("$(ROOTSYS)/README/CREDITS");
+-#endif
+-
++      TString credits = TROOT::GetDocDir() + "/CREDITS";
++      if (gSystem->AccessPathName(credits, kReadPermission))
++         credits = TROOT::GetDocDir() + "/README/CREDITS";
++      return PrintFile(credits);
+    }
+ 
+    if (!strncmp(line, ".pwd", 4)) {
+diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
+--- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -399,21 +399,7 @@
+ 
+       TString sname = "system";
+       sname += name;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-      // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-      etc = gRootDir;
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       ReadFile(s, kEnvGlobal);
+       delete [] s;
+       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
+@@ -683,17 +669,7 @@
+ 
+       TString sname = "system";
+       sname += fRcName;
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+       rootrcdir = s;
+       delete [] s;
+    } else if (level == kEnvUser) {
+diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
+--- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
+@@ -468,6 +468,10 @@
+       TPH__IsReadingDirs() = kTRUE;
+ 
+       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
++      if (plugindirs.Length() == 0) {
++         plugindirs = "plugins";
++         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
++      }
+ #ifdef WIN32
+       dirs = plugindirs.Tokenize(";");
+ #else
+diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
+--- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
+@@ -543,6 +543,22 @@
+    // Initialize Operating System interface
+    InitSystem();
+ 
++   // Initialize static directory functions
++   GetRootSys();
++   GetBinDir();
++   GetLibDir();
++   GetIncludeDir();
++   GetEtcDir();
++   GetDataDir();
++   GetDocDir();
++   GetMacroDir();
++   GetTutorialsDir();
++   GetSourceDir();
++   GetIconPath();
++   GetTTFFontDir();
++
++   gRootDir = GetRootSys().Data();
++
+    TDirectory::Build();
+ 
+    // Initialize interface to CINT C++ interpreter
+@@ -1722,21 +1722,9 @@
+                "after the call to TROOT::InitInterpreter()!");
+       }
+ 
+-      const char *libcling = 0;
+-      char *libclingStorage = 0;
+-#ifdef ROOTLIBDIR
+-      libcling = ROOTLIBDIR "/libCling."
+-# ifdef R__WIN32
+-      "dll";
+-# else
+-      "so";
+-# endif
+-#else
+-      libclingStorage = gSystem->DynamicPathName("libCling");
+-      libcling = libclingStorage;
+-#endif
++      char *libcling = gSystem->DynamicPathName("libCling");
+       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
+-      delete [] libclingStorage;
++      delete [] libcling;
+ 
+       if (!gInterpreterLib) {
+          TString err = dlerror();
+@@ -2082,22 +2070,7 @@
+ #endif
+ 
+    TString gitinfo = "gitinfo.txt";
+-   char *filename = 0;
+-#ifdef ROOTETCDIR
+-   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   filename = gSystem->ConcatFileName(etc, gitinfo);
+-#endif
++   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
+ 
+    FILE *fp = fopen(filename, "r");
+    if (fp) {
+@@ -2415,17 +2388,9 @@
+ #endif
+       if (macroPath.Length() == 0)
+ #if !defined(R__WIN32)
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".:" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".:") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".:" + TROOT::GetMacroDir();
+ #else
+-   #ifdef ROOTMACRODIR
+-         macroPath = ".;" ROOTMACRODIR;
+-   #else
+-         macroPath = TString(".;") + gRootDir + "/macros";
+-   #endif
++         macroPath = ".;" + TROOT::GetMacroDir();
+ #endif
+    }
+ 
+@@ -2521,14 +2486,252 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
++
++#ifdef ROOTPREFIX
++static Bool_t IgnorePrefix() {
++   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
++   return ignorePrefix;
++}
++#endif
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the rootsys directory in the installation. Static utility function.
++
++const TString& TROOT::GetRootSys() {
++#ifdef ROOTPREFIX
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsys;
++      if (rootsys.IsNull())
++         rootsys = gSystem->Getenv("ROOTSYS");
++      if (rootsys.IsNull())
++         rootsys = gRootDir;
++      return rootsys;
++#ifdef ROOTPREFIX
++   } else {
++      const static TString rootsys = ROOTPREFIX;
++      return rootsys;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the binary directory in the installation. Static utility function.
++
++const TString& TROOT::GetBinDir() {
++#ifdef ROOTBINDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootbindir;
++      if (rootbindir.IsNull()) {
++         rootbindir = "bin";
++         gSystem->PrependPathName(GetRootSys(), rootbindir);
++      }
++      return rootbindir;
++#ifdef ROOTBINDIR
++   } else {
++      const static TString rootbindir = ROOTBINDIR;
++      return rootbindir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the library directory in the installation. Static utility function.
++
++const TString& TROOT::GetLibDir() {
++#ifdef ROOTLIBDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootlibdir;
++      if (rootlibdir.IsNull()) {
++         rootlibdir = "lib";
++         gSystem->PrependPathName(GetRootSys(), rootlibdir);
++      }
++      return rootlibdir;
++#ifdef ROOTLIBDIR
++   } else {
++      const static TString rootlibdir = ROOTLIBDIR;
++      return rootlibdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the include directory in the installation. Static utility function.
++
++const TString& TROOT::GetIncludeDir() {
++#ifdef ROOTINCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootincdir;
++      if (rootincdir.IsNull()) {
++         rootincdir = "include";
++         gSystem->PrependPathName(GetRootSys(), rootincdir);
++      }
++      return rootincdir;
++#ifdef ROOTINCDIR
++   } else {
++      const static TString rootincdir = ROOTINCDIR;
++      return rootincdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the sysconfig directory in the installation. Static utility function.
++
++const TString& TROOT::GetEtcDir() {
++#ifdef ROOTETCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootetcdir;
++      if (rootetcdir.IsNull()) {
++         rootetcdir = "etc";
++         gSystem->PrependPathName(GetRootSys(), rootetcdir);
++      }
++      return rootetcdir;
++#ifdef ROOTETCDIR
++   } else {
++      const static TString rootetcdir = ROOTETCDIR;
++      return rootetcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the data directory in the installation. Static utility function.
++
++const TString& TROOT::GetDataDir() {
++#ifdef ROOTDATADIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDATADIR
++   } else {
++      const static TString rootdatadir = ROOTDATADIR;
++      return rootdatadir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the documentation directory in the installation. Static utility function.
++
++const TString& TROOT::GetDocDir() {
++#ifdef ROOTDOCDIR
++   if (IgnorePrefix()) {
++#endif
++      return GetRootSys();
++#ifdef ROOTDOCDIR
++   } else {
++      const static TString rootdocdir = ROOTDOCDIR;
++      return rootdocdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the macro directory in the installation. Static utility function.
++
++const TString& TROOT::GetMacroDir() {
++#ifdef ROOTMACRODIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootmacrodir;
++      if (rootmacrodir.IsNull()) {
++         rootmacrodir = "macros";
++         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
++      }
++      return rootmacrodir;
++#ifdef ROOTMACRODIR
++   } else {
++      const static TString rootmacrodir = ROOTMACRODIR;
++      return rootmacrodir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
+ /// Get the tutorials directory in the installation. Static utility function.
+ 
+-const char *TROOT::GetTutorialsDir()
+-{
++const TString& TROOT::GetTutorialsDir() {
+ #ifdef ROOTTUTDIR
+-   return ROOTTUTDIR;
+-#else
+-   static TString tutdir = TString(gRootDir) + "/tutorials";
+-   return tutdir;
++   if (IgnorePrefix()) {
++#endif
++      static TString roottutdir;
++      if (roottutdir.IsNull()) {
++         roottutdir = "tutorials";
++         gSystem->PrependPathName(GetRootSys(), roottutdir);
++      }
++      return roottutdir;
++#ifdef ROOTTUTDIR
++   } else {
++      const static TString roottutdir = ROOTTUTDIR;
++      return roottutdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the source directory in the installation. Static utility function.
++
++const TString& TROOT::GetSourceDir() {
++#ifdef ROOTSRCDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString rootsrcdir;
++      if (rootsrcdir.IsNull()) {
++         rootsrcdir = "src";
++         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
++      }
++      return rootsrcdir;
++#ifdef ROOTSRCDIR
++   } else {
++      const static TString rootsrcdir = ROOTSRCDIR;
++      return rootsrcdir;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the icon path in the installation. Static utility function.
++
++const TString& TROOT::GetIconPath() {
++#ifdef ROOTICONPATH
++   if (IgnorePrefix()) {
++#endif
++      static TString rooticonpath;
++      if (rooticonpath.IsNull()) {
++         rooticonpath = "icons";
++         gSystem->PrependPathName(GetRootSys(), rooticonpath);
++      }
++      return rooticonpath;
++#ifdef ROOTICONPATH
++   } else {
++      const static TString rooticonpath = ROOTICONPATH;
++      return rooticonpath;
++   }
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the fonts directory in the installation. Static utility function.
++
++const TString& TROOT::GetTTFFontDir() {
++#ifdef TTFFONTDIR
++   if (IgnorePrefix()) {
++#endif
++      static TString ttffontdir;
++      if (ttffontdir.IsNull()) {
++         ttffontdir = "fonts";
++         gSystem->PrependPathName(GetRootSys(), ttffontdir);
++      }
++      return ttffontdir;
++#ifdef TTFFONTDIR
++   } else {
++      const static TString ttffontdir = TTFFONTDIR;
++      return ttffontdir;
++   }
+ #endif
+ }
+diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
+@@ -1852,22 +1852,10 @@
+       if (!system) {
+          // Mark the library in $ROOTSYS/lib as system.
+          const char *dirname = DirName(path);
+-#ifdef ROOTLIBDIR
+-         TString rootlibdir = ROOTLIBDIR;
+-#else
+-         TString rootlibdir = "lib";
+-         PrependPathName(gRootDir, rootlibdir);
+-#endif
+-         system = R__MatchFilename(rootlibdir,dirname);
++         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
+ 
+          if (!system) {
+-#ifdef ROOTBINDIR
+-            TString rootbindir = ROOTBINDIR;
+-#else
+-            TString rootbindir = "bin";
+-            PrependPathName(gRootDir, rootbindir);
+-#endif
+-            system = R__MatchFilename(rootbindir,dirname);
++            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
+          }
+       }
+ 
+@@ -2492,12 +2480,9 @@
+ #else
+    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
+ #endif
+-#ifdef ROOTBINDIR
+-   TString builddep = ROOTBINDIR;
+-#else
+-   TString builddep = TString(gRootDir) + "/bin";
+-#endif
+-   builddep += "/rmkdepend \"-f";
++   TString builddep = "rmkdepend";
++   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
++   builddep += " \"-f";
+    builddep += depfilename;
+    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
+    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
+@@ -2519,12 +2504,7 @@
+       builddep += "/\" ";
+    }
+    builddep += " -Y -- ";
+-#ifndef ROOTINCDIR
+-   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
+-   rootsysInclude += "/include";
+-#else
+-   TString rootsysInclude = ROOTINCDIR;
+-#endif
++   TString rootsysInclude = TROOT::GetIncludeDir();
+    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
+    builddep += includes;
+    builddep += defines;
+@@ -3345,27 +3325,17 @@
+       TString name = ".rootmap";
+       TString sname = "system.rootmap";
+       TString file;
+-#ifdef ROOTETCDIR
+-      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      AssignAndDelete(file, ConcatFileName(etc, sname));
++      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
+       if (gSystem->AccessPathName(file)) {
+          // for backward compatibility check also $ROOTSYS/system<name> if
+          // $ROOTSYS/etc/system<name> does not exist
+-         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
++         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
+          if (gSystem->AccessPathName(file)) {
+             // for backward compatibility check also $ROOTSYS/<name> if
+             // $ROOTSYS/system<name> does not exist
+-            AssignAndDelete(file, ConcatFileName(gRootDir, name));
++            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
+          }
+       }
+-#endif
+       mapfileStream << file << std::endl;
+       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
+       mapfileStream << file << std::endl;
+@@ -3379,23 +3349,9 @@
+    mapfileStream.close();
+ 
+    // ======= Generate the rootcling command line
+-   TString rcling;
+-#ifndef ROOTBINDIR
+-   rcling = gSystem->Getenv("ROOTSYS");
+-#ifndef R__WIN32
+-   rcling += "/bin/";
+-#else
+-   rcling += "\\bin\\";
+-#endif
+-#else
+-   rcling = ROOTBINDIR;
+-#ifndef R__WIN32
+-   rcling += "/";
+-#else
+-   rcling += "\\";
+-#endif
+-#endif
+-   rcling += "rootcling -v0 \"--lib-list-prefix=";
++   TString rcling = "rootcling";
++   PrependPathName(TROOT::GetBinDir(), rcling);
++   rcling += " -v0 \"--lib-list-prefix=";
+    rcling += mapfile;
+    rcling += "\" -f \"";
+    rcling.Append(dict).Append("\" -c -p ");
+diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
+--- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
+@@ -66,14 +66,14 @@
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ else()
+   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
+                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
+                      COMMENT "Recording the git revision now"
+-                     DEPENDS ${dep_objects}
++                     DEPENDS ${dep_objects} move_artifacts
+                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ endif()
+ add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
+diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
+--- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
+@@ -1719,17 +1719,7 @@
+ {
+    static const char *suffix = "class.rules";
+    TString sname = suffix;
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   gSystem->PrependPathName(etc, sname);
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t res = -1;
+ 
+diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
+--- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
+@@ -1049,10 +1049,10 @@
+    if (!fromRootCling) {
+       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
+ 
+-      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
+-      clingArgsStorage.push_back(interpInclude);
++      interpInclude = TROOT::GetEtcDir();
++      clingArgsStorage.push_back("-I" + interpInclude);
+ 
+-      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
++      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
+       if (gSystem->Getenv("ROOT_PCH")) {
+          pchFilename = gSystem->Getenv("ROOT_PCH");
+       }
+@@ -1063,14 +1063,8 @@
+       // clingArgsStorage.push_back("-fmodules");
+ 
+       std::string include;
+-#ifndef ROOTINCDIR
+-      include = gSystem->Getenv("ROOTSYS");
+-      include += "/include";
+-#else // ROOTINCDIR
+-      include = ROOTINCDIR;
+-#endif // ROOTINCDIR
+-      clingArgsStorage.push_back("-I");
+-      clingArgsStorage.push_back(include);
++      include = TROOT::GetIncludeDir();
++      clingArgsStorage.push_back("-I" + include);
+       clingArgsStorage.push_back("-Wno-undefined-inline");
+       clingArgsStorage.push_back("-fsigned-char");
+    }
+@@ -1080,7 +1074,11 @@
+            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
+       interpArgs.push_back(iArg->c_str());
+ 
+-   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
++#ifdef R__EXTERN_LLVMDIR
++   TString llvmResourceDir = R__EXTERN_LLVMDIR;
++#else
++   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
++#endif
+    // Add statically injected extra arguments, usually coming from rootcling.
+    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
+         extraArgs && *extraArgs; ++extraArgs) {
+@@ -1094,7 +1092,7 @@
+ 
+    fInterpreter = new cling::Interpreter(interpArgs.size(),
+                                          &(interpArgs[0]),
+-                                         llvmResourceDir.c_str());
++                                         llvmResourceDir);
+ 
+    if (!fromRootCling) {
+       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
+@@ -1103,13 +1101,13 @@
+       // llvm/clang header files shouldn't be there at all. We have to get rid of
+       // that dependency and avoid copying the header files.
+       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
+-      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
++      TCling::AddIncludePath((interpInclude + "/cling").c_str());
+ 
+       // Add the current path to the include path
+       // TCling::AddIncludePath(".");
+ 
+       // Add the root include directory and etc/ to list searched by default.
+-      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
++      TCling::AddIncludePath(TROOT::GetIncludeDir());
+    }
+ 
+    // Don't check whether modules' files exist.
+@@ -4515,21 +4513,7 @@
+ 
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+-   // on iOS etc does not exist and system<name> resides in $ROOTSYS
+-   etc = gRootDir;
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+ 
+    Int_t ret = ReadRootmapFile(s);
+    if (ret == -3) // old format
+diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
+--- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
+@@ -339,10 +339,6 @@
+ //______________________________________________________________________________
+ llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
+ 
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+ enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
+ 
+ //______________________________________________________________________________
+@@ -549,18 +545,6 @@
+                                  const char* headers[]);
+ 
+ //______________________________________________________________________________
+-// Return the -I needed to find RuntimeUniverse.h
+-std::string GetInterpreterExtraIncludePath(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the LLVM / clang resource directory
+-std::string GetLLVMResourceDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+-// Return the ROOT include directory
+-std::string GetROOTIncludeDir(bool rootbuild);
+-
+-//______________________________________________________________________________
+ // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
+ // that can be used in C++ as a variable name.
+ void GetCppName(std::string &output, const char *input);
+diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
+--- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -3407,40 +3407,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Return the -I needed to find RuntimeUniverse.h
+-
+-std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
+-{
+-#ifdef ROOTETCDIR
+-   if (rootbuild) {
+-      // Building ROOT, ignore ROOTETCDIR!
+-#endif
+-      const char* rootsys = getenv("ROOTSYS");
+-      if (!rootsys) {
+-         Error(0, "Environment variable ROOTSYS not set!");
+-         return "-Ietc";
+-      }
+-      return std::string("-I") + rootsys + "/etc";
+-#ifdef ROOTETCDIR
+-   }
+-   return std::string("-I") + ROOTETCDIR;
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Return the LLVM / clang resource directory
+-
+-std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
+-{
+-#ifdef R__EXTERN_LLVMDIR
+-   return R__EXTERN_LLVMDIR;
+-#else
+-   return GetInterpreterExtraIncludePath(rootbuild)
+-      .substr(2, std::string::npos) + "/cling";
+-#endif
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Get the template specialisation decl and template decl behind the qualtype
+ /// Returns true if successfully found, false otherwise
+ 
+@@ -3957,29 +3923,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-
+-std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
+-{
+-   const std::string defaultInclude ("include");
+-   if (!rootbuild) {
+-#ifndef ROOTINCDIR
+-      const char* rootSysContent = getenv("ROOTSYS");
+-      if (rootSysContent) {
+-         std::string incl_rootsys (rootSysContent);
+-         return incl_rootsys + "/" + defaultInclude;
+-      } else {
+-         Error(0,"Environment variable ROOTSYS not set");
+-         return defaultInclude;
+-      }
+-#else
+-      return ROOTINCDIR;
+-#endif
+-   }
+-
+-   return defaultInclude;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Return the dictionary file name for a module
+ 
+ std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
+diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
+--- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
+@@ -301,17 +301,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
+--- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
+@@ -1663,8 +1663,7 @@
+    case kROOT_Load:
+       {
+          const TString fileName = s3("[^\"]*$");
+-//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
+-         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
++         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
+          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
+ 
+ //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
+diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
+--- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
+@@ -445,7 +445,9 @@
+ 
+ static void SetRootSys()
+ {
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+    void *addr = (void *)SetRootSys;
+    Dl_info info;
+    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
+@@ -458,8 +460,8 @@
+          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
+       }
+    }
+-#else
+-   return;
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ #endif
+@@ -487,7 +489,9 @@
+    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
+    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
++#endif
+ #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+    // first loaded is the app so set ROOTSYS to app bundle
+    if (i == 1) {
+@@ -513,6 +517,8 @@
+       }
+    }
+ #endif
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // when libSystem.B.dylib is loaded we have finished loading all dylibs
+@@ -600,13 +606,8 @@
+    SetRootSys();
+ #endif
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0)
+-      gRootDir= "/usr/local/root";
+-#else
+-   gRootDir = ROOTPREFIX;
+-#endif
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   gRootDir = "/usr/local/root";
+ 
+    return kFALSE;
+ }
+@@ -2138,22 +2140,17 @@
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
+          gdbscript = "";
+-      } else {
+-         gdbscript += " ";
+       }
+    }
+    if (gdbscript == "") {
+-#ifdef ROOTETCDIR
+-      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
+-#else
+-      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
+-#endif
++      gdbscript = "gdb-backtrace.sh";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
+       if (AccessPathName(gdbscript, kReadPermission)) {
+          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
+          return;
+       }
+-      gdbscript += " ";
+    }
++   gdbscript += " ";
+ 
+    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
+    gdbmess = gdbmess.Strip();
+@@ -4471,11 +4468,7 @@
+       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
+       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
+       if (rdynpath.IsNull()) {
+-#ifdef ROOTLIBDIR
+-         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
+-#else
+-         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
+-#endif
++         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
+       }
+       TString ldpath;
+ #if defined (R__AIX)
+@@ -4496,16 +4489,9 @@
+       else {
+          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
+       }
+-
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ":"; dynpath += ROOTLIBDIR;
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ":"; dynpath += TROOT::GetLibDir();
+       }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
+-      }
+-#endif
+       if (gCling) {
+          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
+       } else
+diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
+--- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
+@@ -64,27 +64,27 @@
+                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+ endif()
+ 
+-set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
+-configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
++configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
+ 
+ if(WIN32)
+-  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
+ else()
+   if(CXX_HAS_fno_rtti)
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
+   else()
+-    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
++    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
+   endif()
+ endif()
+ 
+ ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
+-                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
++                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
+                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
+                               $<TARGET_OBJECTS:Clib>
+                               $<TARGET_OBJECTS:MetaUtils>
+                               $<TARGET_OBJECTS:MetaUtilsLLVM>
+                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+                               NOINSTALL)
++set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
+ add_dependencies(rootcling_tmp CLING LLVMRES)
+ set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+ set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
+diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
+--- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
+@@ -48,7 +48,7 @@
+ ROOTCINTEXE     := bin/rootcint$(EXEEXT)
+ GENREFLEXEXE    := bin/genreflex$(EXEEXT)
+ ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
+-ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
++ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
+ 
+ ##### Dependencies for all dictionaries
+ ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
+diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
+--- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -295,12 +295,6 @@
+ bool buildingROOT = false;
+ #endif
+ 
+-#ifdef R__EXTERN_LLVMDIR
+-# define R__LLVMDIR R__EXTERN_LLVMDIR
+-#else
+-# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
+-#endif
+-
+ namespace {
+    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
+    template <typename T> struct IsPointerTClassCopy {
+@@ -3977,11 +3971,6 @@
+       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
+    }
+ 
+-#if defined(ROOTINCDIR)
+-   if (!buildingROOT)
+-      SetRootSys();
+-#endif
+-
+    if (ic < argc && !strcmp(argv[ic], "-c")) {
+       // Simply ignore the -c options.
+       ic++;
+@@ -4131,7 +4120,11 @@
+    }
+ 
+    ic = nextStart;
+-   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
++#endif
+ 
+    std::vector<std::string> pcmArgs;
+    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
+@@ -4140,7 +4133,11 @@
+    }
+ 
+    // cling-only arguments
+-   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
++#ifdef ROOT_STAGE1_BUILD
++   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
++#else
++   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
++#endif
+    // We do not want __ROOTCLING__ in the pch!
+    if (!onepcm) {
+       clingArgs.push_back("-D__ROOTCLING__");
+@@ -4162,10 +4159,14 @@
+    }
+ 
+    std::string resourceDir;
+-#ifdef R__LLVMRESOURCEDIR
+-   resourceDir = "@R__LLVMRESOURCEDIR@";
++#ifdef R__EXTERN_LLVMDIR
++   resourceDir = R__EXTERN_LLVMDIR;
+ #else
+-   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
++#ifdef ROOT_STAGE1_BUILD
++   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
++#else
++   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
++#endif
+ #endif
+ 
+ #ifndef ROOT_STAGE1_BUILD
+@@ -4184,11 +4185,6 @@
+ 
+    interp.getOptions().ErrorOut = true;
+    interp.enableRawInput(true);
+-#ifdef ROOTINCDIR
+-   const bool useROOTINCDIR = !buildingROOT;
+-#else
+-   const bool useROOTINCDIR = false;
+-#endif
+    if (isGenreflex) {
+       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
+          // There was an error.
+@@ -4205,17 +4201,10 @@
+                               "#include <math.h>\n"
+                               "#include <string.h>\n"
+                              ) != cling::Interpreter::kSuccess
+-            || (!useROOTINCDIR
+-                && interp.declare("#include \"Rtypes.h\"\n"
+-                                  "#include \"TClingRuntime.h\"\n"
+-                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
+-#ifdef ROOTINCDIR
+-            || (useROOTINCDIR
+-                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
+-                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
+-               )
+-#endif
++            || interp.declare("#include \"Rtypes.h\"\n"
++                              "#include \"TClingRuntime.h\"\n"
++                              "#include \"TObject.h\""
++                             ) != cling::Interpreter::kSuccess
+          ) {
+          // There was an error.
+          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
+@@ -37,6 +37,18 @@
+ }
+ 
+ extern "C"
++const char *TROOT__GetIncludeDir()
++{
++   return TROOT::GetIncludeDir().Data();
++}
++
++extern "C"
++const char *TROOT__GetEtcDir()
++{
++   return TROOT::GetEtcDir().Data();
++}
++
++extern "C"
+ cling::Interpreter *TCling__GetInterpreter()
+ {
+    static bool sInitialized = false;
+diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
+--- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
+@@ -21,6 +21,8 @@
+ 
+ extern "C" {
+    const char ** *TROOT__GetExtraInterpreterArgs();
++   const char *TROOT__GetIncludeDir();
++   const char *TROOT__GetEtcDir();
+    cling::Interpreter *TCling__GetInterpreter();
+    void InitializeStreamerInfoROOTFile(const char *filename);
+    void AddStreamerInfoToROOTFile(const char *normName);
+diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
+--- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
+@@ -362,11 +362,7 @@
+          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
+          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
+          if (rdynpath == "") {
+-#ifdef ROOTBINDIR
+-            rdynpath = ".;"; rdynpath += ROOTBINDIR;
+-#else
+-            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
+-#endif
++            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
+          }
+          TString path = gSystem->Getenv("PATH");
+          if (path == "")
+@@ -376,15 +372,10 @@
+          }
+ 
+       }
+-#ifdef ROOTLIBDIR
+-      if (!dynpath.Contains(ROOTLIBDIR)) {
+-         dynpath += ";"; dynpath += ROOTLIBDIR;
+-      }
+-#else
+-      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
+-         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
++
++      if (!dynpath.Contains(TROOT::GetLibDir())) {
++         dynpath += ";"; dynpath += TROOT::GetLibDir();
+       }
+-#endif
+ 
+       return dynpath;
+    }
+@@ -823,16 +814,8 @@
+       }
+ 
+       // determine the fileopen.C file path:
+-      TString fileopen;
+-#ifndef ROOT_PREFIX
+-      fileopen += sys->TWinNTSystem::DriveName(buf);
+-      fileopen += ":";
+-      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
+-      fileopen += "\\macros";
+-#else
+-      fileopen += ROOTMACRODIR;
+-#endif
+-      fileopen += "\\fileopen.C";
++      TString fileopen = "fileopen.C";
++      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
+ 
+       if (regROOTwrite) {
+          // only write to registry if fileopen.C is readable
+@@ -1007,7 +990,9 @@
+ 
+    char *buf = new char[MAX_MODULE_NAME32 + 1];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
++#endif
+    // set ROOTSYS
+    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
+    if (hModCore) {
+@@ -1035,6 +1020,8 @@
+          }
+       }
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    UpdateRegistry(this, buf);
+@@ -1112,23 +1099,17 @@
+ 
+    fSigcnt = 0;
+ 
+-#ifndef ROOTPREFIX
+-   gRootDir = Getenv("ROOTSYS");
+-   if (gRootDir == 0) {
+-      static char lpFilename[MAX_PATH];
+-      if (::GetModuleFileName(NULL,               // handle to module to find filename for
+-                            lpFilename,           // pointer to buffer to receive module path
+-                            sizeof(lpFilename)))  // size of buffer, in characters
+-      {
+-         const char *dirName = DirName(DirName(lpFilename));
+-         gRootDir = StrDup(dirName);
+-      } else {
+-         gRootDir = 0;
+-      }
++   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
++   static char lpFilename[MAX_PATH];
++   if (::GetModuleFileName(
++          NULL,                   // handle to module to find filename for
++          lpFilename,             // pointer to buffer to receive module path
++          sizeof(lpFilename))) {  // size of buffer, in characters
++      const char *dirName = DirName(DirName(lpFilename));
++      gRootDir = StrDup(dirName);
++   } else {
++      gRootDir = 0;
+    }
+-#else
+-   gRootDir= ROOTPREFIX;
+-#endif
+ 
+    // Increase the accuracy of Sleep() without needing to link to winmm.lib
+    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
+diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
+--- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
+@@ -50,6 +50,7 @@
+ # Define all the header files which should be installed when
+ # doing a "make install"
+ install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
++file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
+ set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ 
+ ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
+diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
+--- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
+@@ -24,6 +24,7 @@
+ #include "Riostream.h"
+ 
+ #include "TSystem.h"
++#include "TROOT.h"
+ #include "TObjArray.h"
+ #include "TVirtualGeoPainter.h"
+ #include "TGeoManager.h"
+@@ -1113,12 +1114,8 @@
+ {
+    if (HasRNElements()) return;
+    TGeoElementRN *elem;
+-   TString rnf;
+-#ifdef ROOTETCDIR
+-   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
+-#else
+-   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++   TString rnf = "RadioNuclides.txt";
++   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
+    FILE *fp = fopen(rnf, "r");
+    if (!fp) {
+       Error("ImportElementsRN","File RadioNuclides.txt not found");
+diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
+@@ -359,33 +359,33 @@
+ 
+ static void init_icon_paths()
+ {
+-   const char *icons = "/icons";
+-#ifdef R__WIN32
+-      icons = "\\icons";
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
++#ifndef R__WIN32
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
+ #endif
++   }
+ 
+-   TString homeIcons = gSystem->HomeDirectory();
+-   homeIcons += icons;
+-
+-   TString rootIcons = gSystem->Getenv("ROOTSYS");
+-   rootIcons += icons;
+-
+-   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
+-
+-   gIconPaths[0] = StrDup(".");
+-   gIconPaths[1] = StrDup(homeIcons.Data());
+-   gIconPaths[2] = StrDup(rootIcons.Data());
+-   gIconPaths[3] = StrDup(guiIcons.Data());
+-
+-#ifdef ROOTICONPATH
+-   gIconPaths[4] = StrDup(ROOTICONPATH);
++   Int_t cnt = 0;
++   Ssiz_t from = 0;
++   TString token;
++#ifndef R__WIN32
++   const char *delim = "/";
++#else
++   const char *delim = "\\";
+ #endif
+-
+-#ifdef EXTRAICONPATH
+-   gIconPaths[5] = StrDup(EXTRAICONPATH);
+-#endif
+-
+-   gIconPaths[6] = 0;
++   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
++      char *path = gSystem->ExpandPathName(token.Data());
++      if (path) {
++         gIconPaths[cnt] = path;
++         cnt++;
++      }
++   }
++   gIconPaths[cnt] = 0;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
+--- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
+@@ -811,11 +811,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+@@ -3077,11 +3073,7 @@
+    }
+ 
+    if (pngFileName) {
+-#ifdef ROOTICONPATH
+-      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
+-#else
+-      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
+-#endif
++      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
+       const Util::ScopedArray<const char> arrayGuard(path);
+ 
+       if (!path || path[0] == 0) {
+diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
+--- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
+@@ -195,11 +195,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -225,11 +221,7 @@
+    fNdata    = 0;
+    SetLabelDx();
+    SetYoffset(0);
+-#ifdef ROOTSRCDIR
+-   SetSourceDir(".:src:" ROOTSRCDIR);
+-#else
+-   SetSourceDir(".:src:$ROOTSYS/src");
+-#endif
++   SetSourceDir(".:src:" + TROOT::GetSourceDir());
+ 
+    // draw list of classes (if specified)
+    if (classes && strlen(classes)) {
+diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
+--- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
+@@ -15,12 +15,10 @@
+ Interface to the freetype 2 library.
+ */
+ 
+-// RConfigure.h is needed for TTFFONTDIR
+-#include "RConfigure.h"
+-
+ #  include <ft2build.h>
+ #  include FT_FREETYPE_H
+ #  include FT_GLYPH_H
++#include "TROOT.h"
+ #include "TTF.h"
+ #include "TSystem.h"
+ #include "TEnv.h"
+@@ -415,13 +413,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-# else
+-                                       "$(ROOTSYS)/fonts"
+-# endif
+-                                      );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (!ttfont) {
+@@ -543,12 +535,7 @@
+       // try to load font (font must be in Root.TTFontPath resource)
+       // to see which fontset we have available
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR
+-#else
+-                                          "$(ROOTSYS)/fonts"
+-#endif
+-                                         );
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
+       if (ttfont) {
+          delete [] ttfont;
+diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
+@@ -1567,12 +1567,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                       TTFFONTDIR
+-#else // TTFFONTDIR
+-                                       "$(ROOTSYS)/fonts"
+-#endif // TTFFONTDIR
+-                                       );
++                                       TROOT::GetTTFFontDir());
+ 
+    for (Int_t fontid = 1; fontid < 30; fontid++) {
+       if (fontid != 15 && MustEmbed[fontid-1]) {
+diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
+--- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -699,13 +699,6 @@
+                           GetSystemMetrics(SM_CYSMICON));
+    HDC dc = tempIcon->handle();
+    DrawIcon (dc, 0, 0, icon);
+-#else
+-# ifdef ROOTICONPATH
+-   gSystem->ExpandPathName(ROOTICONPATH);
+-# else
+-   gSystem->ExpandPathName("$ROOTSYS/icons/");
+-//   tempIcon =new QPixmap (16,16),
+-# endif
+ #endif
+    return tempIcon;
+ }
+@@ -795,13 +788,7 @@
+    static TQtApplication *app = 0;
+    if (!app) {
+       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
+-      static TString argvString (
+-#ifdef ROOTBINDIR
+-             ROOTBINDIR "/root.exe"
+-#else
+-             "$ROOTSYS/bin/root.exe"
+-#endif
+-             );
++      static TString argvString (TROOT::GetBinDir() + "/root.exe");
+       gSystem->ExpandPathName(argvString);
+       static char *argv[] = {(char *)argvString.Data()};
+       static int nArg = 1;
+@@ -989,14 +976,8 @@
+     }
+ 
+     if (isXdfSupport && !symbolFontFound) {
+-// Load the local ROOT font
+-       QString fontdir =
+-#ifdef TTFFONTDIR
+-         TTFFONTDIR
+-#else
+-         "$ROOTSYS/fonts"
+-#endif
+-        ;
++        // Load the local ROOT font
++        QString fontdir = TROOT::GetTTFFontDir().Data();
+         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
+         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
+     }
+@@ -1006,12 +987,7 @@
+         fontFamily = fSymbolFontFamily = "Arial";
+         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
+         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
+-                 <<
+-#ifdef TTFFONTDIR
+-               TTFFONTDIR
+-#else
+-               "$ROOTSYS/fonts"
+-#endif
++                 << TROOT::GetTTFFontDir()
+                  << "\" directory to get the proper support for ROOT TLatex class";
+         // create a custom codec
+         new QSymbolCodec();
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
+@@ -14,6 +14,7 @@
+ #include "TGLFontManager.h"
+ 
+ 
++#include "TROOT.h"
+ #include "TVirtualX.h"
+ #include "TMath.h"
+ #include "TSystem.h"
+@@ -451,11 +452,7 @@
+    if (it == fFontMap.end())
+    {
+       TString ttpath, file;
+-# ifdef TTFFONTDIR
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
+-# else
+-      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
+-# endif
++      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
+       {
+          //For extenede we have both ttf and otf.
+          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -669,14 +669,7 @@
+          switch (parm1) {
+          case kGLHelpAbout: {
+ #ifdef R__UNIX
+-            TString rootx;
+-#ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-#else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-#endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
+--- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -197,13 +197,7 @@
+ 
+    // try to load font (font must be in Root.TTFontPath resource)
+    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-# ifdef TTFFONTDIR
+-                                        TTFFONTDIR
+-# else
+-                                        "$(ROOTSYS)/fonts"
+-# endif
+-                                        );
+-
++                                       TROOT::GetTTFFontDir());
+    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
+ 
+    if (fGLTextFont) delete fGLTextFont;
+diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
+--- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
+@@ -84,12 +84,7 @@
+ 
+    if (strcmp(appClassName, "proofserv")) {
+       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-#ifdef TTFFONTDIR
+-                                          TTFFONTDIR);
+-#else
+-                                          "$(ROOTSYS)/fonts");
+-#endif
+-
++                                          TROOT::GetTTFFontDir());
+       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
+       if (!ttfont)
+diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
+--- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -83,46 +83,29 @@
+    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
+    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
+ 
+-   TString icon_path;
+-   TString mime_file;
+-   TString line;
+-
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
+ #ifndef R__WIN32
+-# ifdef ROOTICONPATH
+-   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
+-                               ROOTICONPATH);
+-#  ifdef EXTRAICONPATH
+-   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
+-#  else
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-#  endif
+-# else
+-   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
+-                                                       gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-# endif
+-   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
++#endif
++   }
+ 
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
++   TString mime_file = ".root.mimes";
++   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
++   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
+    char *mf = gSystem->ExpandPathName(mime_file.Data());
+    if (mf) {
+       mime_file = mf;
+       delete [] mf;
+    }
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-#ifdef ROOTETCDIR
+-      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
+-#else
+-      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
+-#else // R__WIN32
+-   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
+-   icon_path += gEnv->GetValue("Gui.IconPath", "");
+-   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
+-   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
+-   if (gSystem->AccessPathName(mime_file, kReadPermission))
+-      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
+-#endif
++   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
++      mime_file = "root.mimes";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
++   }
+ 
+    // Setup colors...
+    fClient->GetColorByName("white", fWhite);  // white and black always exist
+diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
+--- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -842,14 +842,7 @@
+ void TGTextEditor::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
+@@ -702,14 +702,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1962,14 +1962,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
+--- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
+@@ -1192,14 +1192,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
+--- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
+@@ -629,14 +629,7 @@
+                   case kM_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
+--- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -5812,14 +5812,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++		         TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
+--- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
+@@ -1348,18 +1348,7 @@
+    R__LOCKGUARD(GetMakeClassMutex());
+ 
+    fPathInfo.fEtcDir = "html";
+-
+-#ifdef ROOTETCDIR
+-   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
+-#else
+-   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
+-# ifdef ROOTPREFIX
+-   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
+-# else
+-   if (getenv("ROOTSYS"))
+-      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
+-# endif
+-#endif
++   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
+ 
+    return fPathInfo.fEtcDir;
+ }
+@@ -1666,12 +1655,7 @@
+                   if (posSpace != std::string::npos)
+                      lib.erase(posSpace);
+                   if (rootLibs.find(lib) == rootLibs.end()) {
+-#ifdef ROOTLIBDIR
+-                     TString rootlibdir = ROOTLIBDIR;
+-#else
+-                     TString rootlibdir = "lib";
+-                     gSystem->PrependPathName(gRootDir, rootlibdir);
+-#endif
++                     TString rootlibdir = TROOT::GetLibDir();
+                      TString sLib(lib);
+                      if (sLib.Index('.') == -1) {
+                         sLib += ".";
+diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
+--- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
+@@ -3047,11 +3047,7 @@
+          return;
+       }
+       // Get Makefile.arch
+-#ifdef ROOTETCDIR
+-      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
+-#else
+-      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
+-#endif
++      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(mkarchsrc))
+          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
+       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
+diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
+--- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
+@@ -40,5 +40,5 @@
+   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+-  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
+ endif()
+diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
+--- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
+@@ -173,15 +173,9 @@
+ 
+ int main()
+ {
+-#ifdef ROOTPREFIX
+-   string rootbin(ROOTBINDIR);
+-   string rootlib(ROOTLIBDIR);
+-   string rootetc(ROOTETCDIR);
+-#else
+-   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
+-   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
+-   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
+-#endif
++   string rootbin(TROOT::GetBinDir());
++   string rootlib(TROOT::GetLibDir());
++   string rootetc(TROOT::GetEtcDir());
+ 
+    // If needed, install ROOT notebook files in the user's home directory
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
+--- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
+@@ -690,11 +690,9 @@
+ .NOTPARALLEL:
+ endif
+ 
+-ifeq ($(USECONFIG),FALSE)
+ all: tutorials/hsimple.root
+ tutorials/hsimple.root: rootexecs postbin
+-	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
+-endif
++	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
+ 
+ all:            rootexecs postbin
+ 	@echo " "
+@@ -1119,7 +1117,7 @@
+ 
+ $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
+ 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
+-	@$(MAKEPCH) $@
++	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
+ 
+ $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
+ 	@mkdir -p $(dir $@)
+@@ -1224,8 +1222,6 @@
+ 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
+ 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
+ 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
+-	   (cd $(DESTDIR)$(TUTDIR); \
+-	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+ 	fi
+ 
+ uninstall:
+@@ -1352,7 +1348,6 @@
+ 		--exclude proofd.xinetd \
+ 		--exclude rootd.rc.d \
+ 		--exclude rootd.xinetd \
+-		--exclude gitinfo.txt \
+ 		$(ROOT_SRCDIR)/etc . ; \
+ 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
+ 	$(RSYNC) \
+diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
+--- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
+@@ -22,9 +22,6 @@
+ 
+ 
+ #include "RConfigure.h"
+-// #ifndef ROOTINCDIR
+-// #define MATH_NO_PLUGIN_MANAGER
+-// #endif
+ 
+ #include <algorithm>
+ #include <functional>
+diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
+@@ -551,11 +551,8 @@
+    const char *fn;
+ 
+    if (!FileName[0]) {
+-#ifdef ROOTETCDIR
+-      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
+-#else
+-      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
+-#endif
++      default_name = "pdg_table.txt";
++      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
+       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
+    } else {
+       fn = FileName;
+diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
+--- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
+@@ -23,7 +23,6 @@
+ add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
+                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
+-add_dependencies(rsa move_headers)
+ 
+ if(ssl)
+   include_directories(${OPENSSL_INCLUDE_DIR})
+diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
+--- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
+@@ -95,18 +95,8 @@
+ {
+    // Executables and conf dirs
+ 
+-   string execdir, etcdir;
+-#ifdef ROOTBINDIR
+-   execdir = string(ROOTBINDIR);
+-#endif
+-#ifdef ROOTETCDIR
+-   etcdir = string(ROOTETCDIR);
+-#endif
+-
+-   // Define rootbindir if not done already
+-   if (!execdir.length())
+-      execdir = string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
++   string execdir = TROOT::GetBinDir().Data();
+    if (execdir.length()) {
+       int len = 15 + execdir.length();
+       char *tmp = new char[len+1];
+@@ -117,10 +107,8 @@
+          return -1;
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!etcdir.length())
+-      etcdir = string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
++   string etcdir = TROOT::GetEtcDir().Data();
+    if (etcdir.length()) {
+       int len = 15 + etcdir.length();
+       char *tmp = new char[len+1];
+diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
+--- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -4110,19 +4110,9 @@
+          ::Info("TAuthenticate::ReadRootAuthrc",
+                 "file %s cannot be read (errno: %d)", authrc, errno);
+       delete [] authrc;
+-#ifdef ROOTETCDIR
+-      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
+-#else
+-      char etc[1024];
+-#ifdef WIN32
+-      snprintf(etc, 1024, "%s\\etc", gRootDir);
+-#else
+-      snprintf(etc, 1024, "%s/etc", gRootDir);
+-#endif
+-      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
+-#endif
++      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
+       if (gDebug > 2)
+-         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
++         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
+       if (gSystem->AccessPathName(authrc, kReadPermission)) {
+          if (gDebug > 1)
+             ::Info("TAuthenticate::ReadRootAuthrc",
+diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
+--- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
+@@ -147,11 +147,7 @@
+    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
+ 
+    if (fJSROOTSYS.Length() == 0) {
+-#ifdef ROOTETCDIR
+-      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
+-#else
+-      TString jsdir("$(ROOTSYS)/etc/http");
+-#endif
++      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
+       if (gSystem->ExpandPathName(jsdir)) {
+          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
+          fJSROOTSYS = ".";
+@@ -162,18 +158,7 @@
+ 
+    AddLocation("currentdir/", ".");
+    AddLocation("jsrootsys/", fJSROOTSYS);
+-
+-   const char *rootsys = gSystem->Getenv("ROOTSYS");
+-   if (rootsys != 0) {
+-      AddLocation("rootsys/", rootsys);
+-   } else {
+-#ifdef ROOTPREFIX
+-      TString sysdir = ROOTPREFIX;
+-#else
+-      TString sysdir = "$(ROOTSYS)";
+-#endif
+-      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
+-   }
++   AddLocation("rootsys/", TROOT::GetRootSys());
+ 
+    fDefaultPage = fJSROOTSYS + "/files/online.htm";
+    fDrawPage = fJSROOTSYS + "/files/draw.htm";
+diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
+--- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -1275,17 +1275,7 @@
+    TString name = ".rootlogon.C";
+    TString sname = "system";
+    sname += name;
+-#ifdef ROOTETCDIR
+-   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
+-#else
+-   TString etc = gRootDir;
+-#ifdef WIN32
+-   etc += "\\etc";
+-#else
+-   etc += "/etc";
+-#endif
+-   char *s = gSystem->ConcatFileName(etc, sname);
+-#endif
++   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
+    if (!gSystem->AccessPathName(s, kReadPermission)) {
+       ProcessFile(s);
+    }
+diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
+--- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
+@@ -335,22 +335,7 @@
+       }
+    }
+ 
+-   TString confdir;
+-#ifndef ROOTPREFIX
+-   // try to guess the config directory...
+-   if (gSystem->Getenv("ROOTSYS")) {
+-      confdir = TString(gSystem->Getenv("ROOTSYS"));
+-   } else {
+-      // Try to guess it from 'root.exe' path
+-      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
+-                                     "root.exe", kExecutePermission);
+-      confdir = rootexe;
+-      confdir.Resize(confdir.Last('/'));
+-      delete [] rootexe;
+-   }
+-#else
+-   confdir = TString(ROOTPREFIX);
+-#endif
++   TString confdir = TROOT::GetRootSys();
+    if (!confdir.Length()) {
+       Error("Authenticate", "config dir undefined");
+       return kFALSE;
+diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
+--- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
+@@ -2528,10 +2528,13 @@
+ 
+    if (argc > 0) {
+       confdir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTPREFIX
++   }
++
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
+       if (!confdir.length()) {
++         // try to guess the config directory...
+          if (getenv("ROOTSYS")) {
+             confdir = getenv("ROOTSYS");
+             if (gDebug > 0)
+@@ -2542,31 +2545,26 @@
+                ErrorInfo("main: no config directory specified");
+          }
+       }
+-#else
+-      confdir = ROOTPREFIX;
+-#endif
++      rootbindir = std::string(confdir).append("/bin");
++      rootetcdir = std::string(confdir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else {
++      if (!confdir.length())
++         confdir = ROOTPREFIX;
++      rootbindir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
+    }
+-#ifdef ROOTBINDIR
+-   rootbindir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+ #endif
+ 
+-   // Define rootbindir if not done already
+-   if (!rootbindir.length())
+-      rootbindir = std::string(confdir).append("/bin");
+-   // Make it available to all the session via env
++   // Make rootbindir available to all the session via env
+    if (rootbindir.length()) {
+       char *tmp1 = new char[15 + rootbindir.length()];
+       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
+       putenv(tmp1);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(confdir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp1 = new char[15 + rootetcdir.length()];
+       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
+--- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
+@@ -31,7 +31,6 @@
+ 
+ #---static library needed for rootd and proofd --------------------------------------------
+ add_library(rpdutil STATIC ${rpdutilsrcs})
+-add_dependencies(rpdutil move_headers)
+ 
+ ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
+ 
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
+@@ -436,17 +436,7 @@
+    if (fgWrksMax == -2) {
+       // Find the max number of workers, if any
+       TString sysname = "system.rootrc";
+-#ifdef ROOTETCDIR
+-      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
+-#else
+-      TString etc = gRootDir;
+-#ifdef WIN32
+-      etc += "\\etc";
+-#else
+-      etc += "/etc";
+-#endif
+-      char *s = gSystem->ConcatFileName(etc, sysname);
+-#endif
++      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
+       TEnv sysenv(0);
+       sysenv.ReadFile(s, kEnvGlobal);
+       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
+@@ -792,17 +782,9 @@
+       return -1;
+    }
+    // ROOTSYS
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
+-#else
+-   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
+    // Conf dir
+-#ifdef R__HAVE_CONFIG
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
+-#else
+-   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
+-#endif
++   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
+    // TMPDIR
+    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
+    // Log file in the log dir
+diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
+--- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
+@@ -3026,13 +3026,7 @@
+ #ifdef R__UNIX
+    // Add bindir to PATH
+    TString path(gSystem->Getenv("PATH"));
+-   TString bindir;
+-# ifdef ROOTBINDIR
+-   bindir = ROOTBINDIR;
+-# else
+-   bindir = gSystem->Getenv("ROOTSYS");
+-   if (!bindir.IsNull()) bindir += "/bin";
+-# endif
++   TString bindir(TROOT::GetBinDir());
+    // Augment PATH, if required
+    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
+    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
+diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
+--- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
+@@ -78,13 +78,8 @@
+ {
+    // Command to be executed
+    TString cmd;
+-#ifdef R__HAVE_CONFIG
+    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
+-#else
+-   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
+-            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
+-#endif
++            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
+             gSystem->GetPid(), gDebug);
+    // Execute
+    if (gSystem->Exec(cmd) != 0) {
+diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
+--- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
+@@ -14,7 +14,7 @@
+ # Generation and installation of the PAR files required by the benchmark 
+ add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
+-add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
++add_dependencies(ProofBenchPARFiles move_artifacts)
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
+                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
+     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
+@@ -1331,11 +1331,7 @@
+       // Is it the default selector?
+       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("MakeDataSet", "uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
+@@ -26,6 +26,7 @@
+ #include "TMap.h"
+ #include "TProof.h"
+ #include "TProofBenchTypes.h"
++#include "TROOT.h"
+ 
+ 
+ ClassImp(TProofBenchDataSet)
+@@ -145,11 +146,7 @@
+    TString selName("TSelHandleDataSet");
+    if (!TClass::GetClass(selName)) {
+       // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+       Info("Handle", "Uploading '%s' ...", par.Data());
+       if (fProof->UploadPackage(par) != 0) {
+          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
+@@ -275,11 +275,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelCPUDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
+--- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
+@@ -163,11 +163,7 @@
+       // Is it the default selector?
+       if (fSelName == kPROOF_BenchSelDataDef) {
+          // Load the parfile
+-#ifdef R__HAVE_CONFIG
+-         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#else
+-         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+-#endif
++         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
+          Info("Run", "Uploading '%s' ...", par.Data());
+          if (fProof->UploadPackage(par) != 0) {
+             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
+diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
+--- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
+@@ -1005,49 +1005,48 @@
+ 
+    if (argc > 0) {
+       gConfDir = std::string(*argv);
+-   } else {
+-      // try to guess the config directory...
+-#ifndef ROOTDATADIR
+-      if (getenv("ROOTSYS")) {
+-         gConfDir = getenv("ROOTSYS");
+-         if (gDebug > 0)
+-            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
+-                      gConfDir.c_str());
+-      } else {
+-         Error(ErrFatal, -1, "main: no config directory specified");
+-      }
+-#else
+-      gConfDir = ROOTDATADIR;
+-#endif
+    }
+-#ifdef ROOTBINDIR
+-   gRootBinDir= ROOTBINDIR;
+-#endif
+-#ifdef ROOTETCDIR
+-   rootetcdir= ROOTETCDIR;
+-#endif
+ 
+-   // Define gRootBinDir if not done already
+-   if (!gRootBinDir.length())
++#ifdef ROOTPREFIX
++   if (getenv("IGNOREROOTPREFIX")) {
++#endif
++      if (!gConfDir.length()) {
++         // try to guess the config directory...
++         if (getenv("ROOTSYS")) {
++            gConfDir = getenv("ROOTSYS");
++            if (gDebug > 0)
++               ErrorInfo("main: no config directory specified using"
++                         " ROOTSYS (%s)", gConfDir.c_str());
++         } else {
++            Error(ErrFatal, -1, "main: no config directory specified");
++         }
++      }
+       gRootBinDir = std::string(gConfDir).append("/bin");
++      rootetcdir = std::string(gConfDir).append("/etc");
++#ifdef ROOTPREFIX
++   }
++   else  {
++      if (!gConfDir.length())
++         gConfDir = ROOTPREFIX;
++      gRootBinDir = ROOTBINDIR;
++      rootetcdir = ROOTETCDIR;
++   }
++#endif
+ 
+-   // make sure it contains the executable we want to run
++   // make sure gRootBinDir contains the executable we want to run
+    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
+    if (access(arg0.c_str(), X_OK) == -1) {
+       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
+                         gConfDir.c_str());
+    }
+-   // Make it available to all the session via env
++   // Make gRootBinDir available to all the session via env
+    if (gRootBinDir.length()) {
+       char *tmp = new char[15 + gRootBinDir.length()];
+       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
+       putenv(tmp);
+    }
+ 
+-   // Define rootetcdir if not done already
+-   if (!rootetcdir.length())
+-      rootetcdir = std::string(gConfDir).append("/etc");
+-   // Make it available to all the session via env
++   // Make rootetcdir available to all the session via env
+    if (rootetcdir.length()) {
+       char *tmp = new char[15 + rootetcdir.length()];
+       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
+diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
+--- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
+@@ -384,11 +384,19 @@
+    } else {
+       // Check the ROOT dirs
+       if (fROOT.size() <= 0) {
++         XrdOucString dir, bd, ld, id, dd;
+ #ifdef R__HAVE_CONFIG
+-         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
+-                      id(ROOTINCDIR), dd(ROOTDATADIR);
+-#else
+-         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
++         if (getenv("ROOTIGNOREPREFIX"))
++#endif
++            dir = getenv("ROOTSYS");
++#ifdef R__HAVE_CONFIG
++         else {
++            dir = ROOTPREFIX;
++            bd = ROOTBINDIR;
++            ld = ROOTLIBDIR;
++            id = ROOTINCDIR;
++            dd = ROOTDATADIR;
++         }
+ #endif
+          // None defined: use ROOTSYS as default, if any; otherwise we fail
+          if (dir.length() > 0) {
+diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
+--- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -25,10 +25,4 @@
+                             WORLD_EXECUTE WORLD_READ
+                 DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
+--- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+@@ -8,9 +8,4 @@
+ ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
+                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
+ 
+-#ROOT_INSTALL_HEADERS()
+-install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
+-                       COMPONENT headers
+-                       PATTERN ".svn" EXCLUDE
+-                       REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
+--- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -200,7 +200,6 @@
+    return 0;
+ }
+ 
+-#ifndef ROOTPREFIX
+ static const char *GetExePath()
+ {
+    static std::string exepath;
+@@ -247,7 +246,6 @@
+       delete [] ep;
+    }
+ }
+-#endif
+ 
+ static void SetDisplay()
+ {
+@@ -296,7 +294,9 @@
+ 
+ static void SetLibraryPath()
+ {
+-#ifndef ROOTLIBDIR
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Set library path for the different platforms.
+ 
+    char *msg;
+@@ -343,6 +343,8 @@
+    }
+ #  endif
+    putenv(msg);
++#ifdef ROOTPREFIX
++   }
+ #endif
+ }
+ 
+@@ -440,7 +442,9 @@
+    char **argvv;
+    char  arg0[kMAXPATHLEN];
+ 
+-#ifndef ROOTPREFIX
++#ifdef ROOTPREFIX
++   if (getenv("ROOTIGNOREPREFIX")) {
++#endif
+    // Try to set ROOTSYS depending on pathname of the executable
+    SetRootSys();
+ 
+@@ -449,6 +453,8 @@
+               argv[0], argv[0]);
+       return 1;
+    }
++#ifdef ROOTPREFIX
++   }
+ #endif
+ 
+    // In batch mode don't show splash screen, idem for no logo mode,
+@@ -473,23 +479,20 @@
+    if (notebook) {
+       // Build command
+ #ifdef ROOTBINDIR
+-      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+-#else
+-      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++      if (getenv("ROOTIGNOREPREFIX"))
++#endif
++         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
++#ifdef ROOTBINDIR
++      else
++         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
+ #endif
+ 
+       // Execute ROOT notebook binary
+       execl(arg0, arg0, NULL);
+-  
++
+       // Exec failed
+-#ifndef ROOTBINDIR
+-      fprintf(stderr,
+-              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
+-              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
+-#else
+-      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
+-              argv[0], ROOTBINDIR, ROOTNBBINARY);
+-#endif
++      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
++              argv[0], arg0);
+ 
+       return 1;
+    }
+@@ -586,9 +589,12 @@
+    // Build argv vector
+    argvv = new char* [argc+2];
+ #ifdef ROOTBINDIR
+-   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+-#else
+-   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++   if (getenv("ROOTIGNOREPREFIX"))
++#endif
++      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
++#ifdef ROOTBINDIR
++   else
++      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
+ #endif
+    argvv[0] = arg0;
+    argvv[1] = (char *) "-splash";
+@@ -604,14 +610,8 @@
+    execv(arg0, argvv);
+ 
+    // Exec failed
+-#ifndef ROOTBINDIR
+-   fprintf(stderr,
+-           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
+-           argv[0], getenv("ROOTSYS"), ROOTBINARY);
+-#else
+-   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
+-           argv[0], ROOTBINDIR, ROOTBINARY);
+-#endif
++   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
++           argv[0], arg0);
+ 
+    return 1;
+ }
+diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
+--- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -475,14 +475,7 @@
+                   case M_HELP_ABOUT:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
+--- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
+@@ -1270,14 +1270,7 @@
+ void TGRootIDE::About()
+ {
+ #ifdef R__UNIX
+-   TString rootx;
+-# ifdef ROOTBINDIR
+-   rootx = ROOTBINDIR;
+-# else
+-   rootx = gSystem->Getenv("ROOTSYS");
+-   if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-   rootx += "/root -a &";
++   TString rootx = TROOT::GetBinDir() + "/root -a &";
+    gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -48,11 +48,7 @@
+ ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
+--- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+@@ -31,11 +31,7 @@
+ ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
+                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
+ 
+-install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
+-                            COMPONENT headers
+-                            PATTERN ".svn" EXCLUDE
+-                            REGEX "LinkDef" EXCLUDE )
+-set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
++ROOT_INSTALL_HEADERS()
+ 
+ if(NOT gnuinstall)
+   install(DIRECTORY test DESTINATION tmva 
+diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
+--- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
+@@ -2049,14 +2049,7 @@
+                   case kHelpAbout:
+                      {
+ #ifdef R__UNIX
+-                        TString rootx;
+-# ifdef ROOTBINDIR
+-                        rootx = ROOTBINDIR;
+-# else
+-                        rootx = gSystem->Getenv("ROOTSYS");
+-                        if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-                        rootx += "/root -a &";
++                        TString rootx = TROOT::GetBinDir() + "/root -a &";
+                         gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
+diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
+--- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
+@@ -1017,14 +1017,7 @@
+       case kHelpAbout:
+          {
+ #ifdef R__UNIX
+-            TString rootx;
+-# ifdef ROOTBINDIR
+-            rootx = ROOTBINDIR;
+-# else
+-            rootx = gSystem->Getenv("ROOTSYS");
+-            if (!rootx.IsNull()) rootx += "/bin";
+-# endif
+-            rootx += "/root -a &";
++            TString rootx = TROOT::GetBinDir() + "/root -a &";
+             gSystem->Exec(rootx);
+ #else
+ #ifdef WIN32
diff --git a/root-testfiles.sh b/root-testfiles.sh
new file mode 100755
index 0000000..e7160b8
--- /dev/null
+++ b/root-testfiles.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+
+SITE="http://root.cern.ch/files"
+
+mkdir files
+pushd files
+
+wget -N ${SITE}/aleph_ref_4.root
+wget -N ${SITE}/aleph.root
+wget -N ${SITE}/alice3_ref_4.root
+wget -N ${SITE}/alice3.root
+wget -N ${SITE}/ams_ref_3.root
+wget -N ${SITE}/ams.root
+wget -N ${SITE}/babar2_ref_3.root
+wget -N ${SITE}/babar2.root
+wget -N ${SITE}/barres_ref_3.root
+wget -N ${SITE}/barres.root
+wget -N ${SITE}/belle_ref_3.root
+wget -N ${SITE}/belle.root
+wget -N ${SITE}/bes_ref_3.root
+wget -N ${SITE}/bes.root
+wget -N ${SITE}/brahms_ref_3.root
+wget -N ${SITE}/brahms.root
+wget -N ${SITE}/btev_ref_3.root
+wget -N ${SITE}/btev.root
+wget -N ${SITE}/cdf_ref_4.root
+wget -N ${SITE}/cdf.root
+wget -N ${SITE}/chambers_ref_3.root
+wget -N ${SITE}/chambers.root
+wget -N ${SITE}/cms_ref_3.root
+wget -N ${SITE}/cms.root
+wget -N ${SITE}/dubna_ref_3.root
+wget -N ${SITE}/dubna.root
+wget -N ${SITE}/e907_ref_3.root
+wget -N ${SITE}/e907.root
+wget -N ${SITE}/felix_ref_3.root
+wget -N ${SITE}/felix.root
+wget -N ${SITE}/ganil_ref_3.root
+wget -N ${SITE}/ganil.root
+wget -N ${SITE}/gem_ref_3.root
+wget -N ${SITE}/gem.root
+wget -N ${SITE}/hades2_ref_4.root
+wget -N ${SITE}/hades2.root
+wget -N ${SITE}/hermes_ref_3.root
+wget -N ${SITE}/hermes.root
+wget -N ${SITE}/integral_ref_3.root
+wget -N ${SITE}/integral.root
+wget -N ${SITE}/lhcbfull_ref_3.root
+wget -N ${SITE}/lhcbfull.root
+wget -N ${SITE}/na35_ref_3.root
+wget -N ${SITE}/na35.root
+wget -N ${SITE}/na47_ref_3.root
+wget -N ${SITE}/na47.root
+wget -N ${SITE}/na49_ref_3.root
+wget -N ${SITE}/na49.root
+wget -N ${SITE}/p326_ref_3.root
+wget -N ${SITE}/p326.root
+wget -N ${SITE}/phenix_ref_3.root
+wget -N ${SITE}/phenix.root
+wget -N ${SITE}/phobos2_ref_4.root
+wget -N ${SITE}/phobos2.root
+wget -N ${SITE}/sdc_ref_3.root
+wget -N ${SITE}/sdc.root
+wget -N ${SITE}/sld_ref_3.root
+wget -N ${SITE}/sld.root
+wget -N ${SITE}/star_ref_3.root
+wget -N ${SITE}/star.root
+wget -N ${SITE}/tesla_ref_3.root
+wget -N ${SITE}/tesla.root
+wget -N ${SITE}/wa91_ref_3.root
+wget -N ${SITE}/wa91.root
+
+wget -N ${SITE}/europe.root
+wget -N ${SITE}/linearIO.root
+wget -N ${SITE}/stressHistogram.5.18.00.root
+wget -N ${SITE}/stressRooFit_v534_ref.root
+wget -N ${SITE}/tmva_class_example.root
+wget -N ${SITE}/tmva_reg_example.root
+wget -N ${SITE}/usa.root
+
+for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
+
+popd
+
+tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-tildes.patch b/root-tildes.patch
new file mode 100644
index 0000000..bb03674
--- /dev/null
+++ b/root-tildes.patch
@@ -0,0 +1,194 @@
+diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
+--- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
+@@ -810,7 +810,7 @@
+ ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
+ /// ~~~
+ ///  Note: We recommend using the method TDirectory::GetObject:
+-/// ~~~ {.cpp}~
++/// ~~~ {.cpp}
+ ///      MyClass *obj = 0;
+ ///      directory->GetObject("some object inheriting from MyClass",obj);
+ ///      if (obj) { ... we found what we are looking for ... }
+diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
+--- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
+@@ -1040,7 +1040,7 @@
+ ///
+ ///       TQObject::Connect("TGButton", "Clicked()",
+ ///                         "TH2F", myHist, "Draw(Option_t*)");
+-///~~~
++/// ~~~
+ /// cl == 0 - corresponds to function (interpereted or global)
+ ///           the name of the function is defined by the slot string,
+ ///           parameter receiver should be 0.
+diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
+--- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -2677,7 +2677,7 @@
+ /// We allow them to type:
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C++(arg1,arg2)
+-///  ~~~
++/// ~~~
+ /// or
+ /// ~~~ {.cpp}
+ ///  .X myfunc.C+(arg1,arg2)
+@@ -3843,7 +3843,7 @@
+ /// the use of ';' to separate several instructions. However, shell specific
+ /// construct should be avoided. In particular this description can contain
+ /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ /// Five special variables will be expanded before execution:
+ ///   Variable name       Expands to
+ ///   -------------       ----------
+@@ -3915,7 +3915,7 @@
+ /// IncludePath should contain the list of compiler flags to indicate where
+ /// to find user defined header files. It is used to expand $IncludePath in
+ /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
+-/// ~~~ {.cpp}
++///  ~~~ {.cpp}
+ ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
+ ///  ~~~
+ /// the default value of IncludePath on Unix is:
+diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
+--- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
+@@ -663,7 +663,7 @@
+ /// Create an array of clone objects of class cl. The class must inherit from
+ /// TObject. If the class defines an own operator delete(), make sure that
+ /// it looks like this:
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///    void MyClass::operator delete(void *vp)
+ ///    {
+ ///       if ((Long_t) vp != TObject::GetDtorOnly())
+diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
+--- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
+@@ -321,7 +321,7 @@
+ /// ~~~
+ /// Otherwise override the `Print(Option_t *option, Int_t)`
+ /// variant. Remember to declare:
+-/// ~~~ {.cpp]
++/// ~~~ {.cpp}
+ ///   using TCollection::Print;
+ /// ~~~
+ /// somewhere close to the method declaration.
+diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
+--- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
+@@ -189,7 +189,7 @@
+  int i;
+  i = TMath::LocMin(10, &v[0]);
+  std::cout << v[i] << std::endl;
+- ```
++```
+  
+ Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
+ 
+@@ -233,7 +233,7 @@
+ 
+  // old-style
+  mean = TMath::Mean(n, &v[0], &w[0]);
+- ```
++```
+  
+ ### Special and Statistical Functions.
+ 
+diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
+@@ -5964,7 +5964,7 @@
+ ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
+ ///       TImage *im2 = TImage::Create();
+ ///       im2->SetImageBuffer(&buf, TImage::kXpm);
+-///  ~~~
++/// ~~~
+ ///      2.  xpm as an array of strings (pre-parsed)
+ /// ~~~ {.cpp}
+ ///    For example:
+diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -132,7 +132,7 @@
+ because we clear only the pads and not the main canvas.
+ Note that `c1->Update` must be called at the end of the first picture.
+ 
+-~~~ {.cpp}
++ ~~~ {.cpp}
+      {
+         TFile *f1 = new TFile("hsimple.root");
+         TCanvas *c1 = new TCanvas("c1");
+diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
+--- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -330,7 +330,7 @@
+ ///    | 2-----|-3
+ ///    |/      |/
+ ///    1-------0
+-///~~~
++/// ~~~
+ 
+ void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
+ {
+diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
+--- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
+@@ -71,7 +71,7 @@
+ To change attributes of the rulers attached to the current Pad, one may
+ query its pointer first:
+ 
+-~~~ {.cpp]
++~~~ {.cpp}
+ TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
+ if (axis) {
+   TAxis3D::ToggleRulers()     // To pop axes down
+diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
+--- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
+@@ -80,7 +80,7 @@
+ many times.
+ 
+ The following very simple macro shows how to build and fill a `TH2Poly`:
+-~~~ {.cpp]
++~~~ {.cpp}
+ {
+     TH2Poly *h2p = new TH2Poly();
+ 
+diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
+--- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
+@@ -2584,9 +2584,9 @@
+ ///     T->Fill(); //loop
+ ///     file->Write();
+ ///     file->Close();
+-///~~~
++/// ~~~
+ /// but do the following:
+-///~~~ {.cpp}
++/// ~~~ {.cpp}
+ ///     TFile *file = new TFile("myfile.root","recreate");
+ ///     TTree *T = new TTree("T","title");
+ ///     T->Fill(); //loop
+@@ -6487,7 +6487,7 @@
+ /// ~~~ {.cpp}
+ ///     TPrincipal *principal =
+ ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
+-///  ~~~
++/// ~~~
+ 
+ TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
+ {
+diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
+--- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
+@@ -3004,6 +3004,7 @@
+ /// The function return the status of the fit in the following form
+ /// ~~~{.cpp}
+ ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
++/// ~~~
+ /// -  The fitResult is 0 is the fit is OK.
+ /// -  The fitResult is negative in case of an error not connected with the fit.
+ /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
new file mode 100644
index 0000000..20209ec
--- /dev/null
+++ b/root-tmath-doc.patch
@@ -0,0 +1,274 @@
+diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
+--- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
+@@ -359,9 +359,9 @@
+ /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
+ /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
+ ///
+-///  Begin_Latex
+-///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
+-///   End_Latex
++///  \f[
++///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
++///  \f]
+ ///
+ ///
+ ///--- Nve 14-nov-1998 UU-SAP Utrecht
+@@ -559,15 +559,16 @@
+ /// see TMath::PoissonI to get a non-smooth function.
+ /// Note that for large values of par, it is better to call
+ ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
++///   poisson->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Poisson(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/Poisson.gif">
+-*/
+-//End_Html
+-
+    if (x<0)
+       return 0;
+    else if (x == 0.0)
+@@ -587,15 +588,17 @@
+ /// compute the Poisson distribution function for (x,par)
+ /// This is a non-smooth function.
+ /// This function is equivalent to ROOT::Math::poisson_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
++///   poissoni->SetNpx(1000);
++///   poissoni->Draw("L");
++/// }
++/// End_Macro
+ 
+ Double_t TMath::PoissonI(Double_t x, Double_t par)
+ {
+-/*
+-<img src="gif/PoissonI.gif">
+-*/
+-//End_Html
+-
+    Int_t ix = Int_t(x);
+    return Poisson(ix,par);
+ }
+@@ -630,36 +633,33 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculates the Kolmogorov distribution function,
+-///Begin_Html
++/// \f[
++/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
++/// \f]
++/// which gives the probability that Kolmogorov's test statistic will exceed
++/// the value z assuming the null hypothesis. This gives a very powerful
++/// test for comparing two one-dimensional distributions.
++/// see, for example, Eadie et al, "statistocal Methods in Experimental
++/// Physics', pp 269-270).
++///
++/// This function returns the confidence level for the null hypothesis, where:
++///   z = dn*sqrt(n), and
++///   dn  is the maximum deviation between a hypothetical distribution
++///       function and an experimental distribution with
++///   n   events
++///
++/// NOTE: To compare two experimental distributions with m and n events,
++///       use z = sqrt(m*n/(m+n))*dn
++///
++/// Accuracy: The function is far too accurate for any imaginable application.
++///           Probabilities less than 10^-15 are returned as zero.
++///           However, remember that the formula is only valid for "large" n.
++/// Theta function inversion formula is used for z <= 1
++///
++/// This function was translated by Rene Brun from PROBKL in CERNLIB.
+ 
+ Double_t TMath::KolmogorovProb(Double_t z)
+ {
+-   /*
+-   <img src="gif/kolmogorov.gif">
+-   */
+-   //End_Html
+-   // which gives the probability that Kolmogorov's test statistic will exceed
+-   // the value z assuming the null hypothesis. This gives a very powerful
+-   // test for comparing two one-dimensional distributions.
+-   // see, for example, Eadie et al, "statistocal Methods in Experimental
+-   // Physics', pp 269-270).
+-   //
+-   // This function returns the confidence level for the null hypothesis, where:
+-   //   z = dn*sqrt(n), and
+-   //   dn  is the maximum deviation between a hypothetical distribution
+-   //       function and an experimental distribution with
+-   //   n    events
+-   //
+-   // NOTE: To compare two experimental distributions with m and n events,
+-   //       use z = sqrt(m*n/(m+n))*dn
+-   //
+-   // Accuracy: The function is far too accurate for any imaginable application.
+-   //           Probabilities less than 10^-15 are returned as zero.
+-   //           However, remember that the formula is only valid for "large" n.
+-   // Theta function inversion formula is used for z <= 1
+-   //
+-   // This function was translated by Rene Brun from PROBKL in CERNLIB.
+-
+    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
+    const Double_t w = 2.50662827;
+    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
+@@ -2254,15 +2254,40 @@
+ /// The definition can be found in "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
+ /// use now implementation in ROOT::Math::gamma_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
++///
++///   gdist->SetParameters(0.5, 0., 1.);
++///   gdist->SetLineColor(2);
++///   TF1 *gdist1 = gdist->DrawCopy("L");
++///   gdist->SetParameters(1.0, 0., 1.);
++///   gdist->SetLineColor(3);
++///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(2.0, 0., 1.);
++///   gdist->SetLineColor(4);
++///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
++///   gdist->SetParameters(5.0, 0., 1.);
++///   gdist->SetLineColor(6);
++///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
++///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
+ {
+-   /*
+-   <img src="gif/gammadist.gif">
+-   */
+-   //End_Html
+-
+    if ((x<mu) || (gamma<=0) || (beta <=0)) {
+       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
+       return 0;
+@@ -2308,21 +2333,47 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Computes the density of LogNormal distribution at point x.
+ /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
+-/// sigma is the shape parameter
+-/// theta is the location parameter
+-/// m is the scale parameter
++/// - sigma is the shape parameter
++/// - theta is the location parameter
++/// - m is the scale parameter
+ /// The formula was taken from "Engineering Statistics Handbook" on site
+ /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
+ /// Implementation using ROOT::Math::lognormal_pdf
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetLogy();
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
++///   logn->SetMinimum(1e-3);
++///
++///   logn->SetParameters(0.5, 0., 1.);
++///   logn->SetLineColor(2);
++///   TF1 *logn1 = logn->DrawCopy("L");
++///   logn->SetParameters(1.0, 0., 1.);
++///   logn->SetLineColor(3);
++///   TF1 *logn2 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(2.0, 0., 1.);
++///   logn->SetLineColor(4);
++///   TF1 *logn3 = logn->DrawCopy("LSAME");
++///   logn->SetParameters(5.0, 0., 1.);
++///   logn->SetLineColor(6);
++///   TF1 *logn4 = logn->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
++///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
++///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
+ {
+-   /*
+-   <img src="gif/lognormal.gif">
+-   */
+-   //End_Html
+-
+    if ((x<theta) || (sigma<=0) || (m<=0)) {
+       Error("TMath::Lognormal", "illegal parameter values");
+       return 0;
+@@ -2615,15 +2666,39 @@
+ ///density function computed numerically in an accurate way: our approximation
+ ///shows a difference of less than 3% around the peak of the density function, slowly
+ ///increasing going towards the extreme tails to the right and to the left"
+-///Begin_Html
++/// Begin_Macro
++/// {
++///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
++///
++///   c1->SetGridx();
++///   c1->SetGridy();
++///
++///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
++///
++///   vavilov->SetParameters(0.5, 0.);
++///   vavilov->SetLineColor(2);
++///   TF1 *vavilov1 = vavilov->DrawCopy("L");
++///   vavilov->SetParameters(0.3, 0.);
++///   vavilov->SetLineColor(3);
++///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.2, 0.);
++///   vavilov->SetLineColor(4);
++///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
++///   vavilov->SetParameters(0.1, 0.);
++///   vavilov->SetLineColor(6);
++///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
++///
++///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
++///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
++///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
++///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
++///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
++///   legend->Draw();
++/// }
++/// End_Macro
+ 
+ Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
+ {
+-/*
+-<img src="gif/Vavilov.gif">
+-*/
+-//End_Html
+-
+    Double_t *ac = new Double_t[14];
+    Double_t *hc = new Double_t[9];
+ 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
new file mode 100644
index 0000000..95090d6
--- /dev/null
+++ b/root-tprincipal-doc.patch
@@ -0,0 +1,483 @@
+diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
+index 76bb5d4..d5bab47 100644
+--- a/hist/hist/src/TPrincipal.cxx
++++ b/hist/hist/src/TPrincipal.cxx
+@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
+ error \f$E_N\f$ is minimized.
+ 
+ The transformation matrix to go from the pattern space to the feature
+-space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
++space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
+ \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
+ \f[
+   \mathsf{T} = \left[
+@@ -207,10 +207,6 @@ in the transformed space.
+ Christian Holm August 2000, CERN
+ */
+ 
+-// $Id$
+-// $Date: 2006/05/24 14:55:26 $
+-// $Author: brun $
+-
+ #include "TPrincipal.h"
+ 
+ #include "TVectorD.h"
+@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
+ ClassImp(TPrincipal);
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Empty CTOR, Do not use.
++/// Empty constructor. Do not use.
+ 
+ TPrincipal::TPrincipal()
+   : fMeanValues(0),
+@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Ctor. Argument is number of variables in the sample of data
++/// Constructor. Argument is number of variables in the sample of data
+ /// Options are:
+-///   N       Normalize the covariance matrix (default)
+-///   D       Store input data (default)
++///  - N       Normalize the covariance matrix (default)
++///  - D       Store input data (default)
+ ///
+ /// The created object is  named "principal" by default.
+ 
+@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///copy constructor
++/// Copy constructor.
+ 
+ TPrincipal::TPrincipal(const TPrincipal& pr) :
+   TNamed(pr),
+@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-///assignement operator
++/// Assignment operator.
+ 
+ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ {
+@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// destructor
++/// Destructor.
+ 
+ TPrincipal::~TPrincipal()
+ {
+@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Begin_Html
++/// Add a data point and update the covariance matrix. The input
++/// array must be <TT>fNumberOfVariables</TT> long.
++///
++///
++/// The Covariance matrix and mean values of the input data is calculated
++/// on the fly by the following equations:
++///
++/// \f[
++/// \left<x_i\right>^{(0)}  = x_{i0}
++/// \f]
++///
++///
++/// \f[
++/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
++/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
++/// \f]
++///
++/// \f[
++/// C_{ij}^{(0)} = 0
++/// \f]
++///
++///
++///
++/// \f[
++/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
++/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
++///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
++/// - \frac1n C_{ij}^{(n-1)}
++/// \f]
++///
++/// since this is a really fast method, with no rounding errors (please
++/// refer to CERN 72-21 pp. 54-106).
++///
++///
++/// The data is stored internally in a <TT>TVectorD</TT>, in the following
++/// way:
++///
++/// \f[
++/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
++///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
++/// \f]
++///
++/// With \f$P\f$ as defined in the class description.
+ 
+ void TPrincipal::AddRow(const Double_t *p)
+ {
+-  /*
+-     </PRE>
+-Add a data point and update the covariance matrix. The input
+-array must be <TT>fNumberOfVariables</TT> long.
+-
+-<P>
+-The Covariance matrix and mean values of the input data is caculated
+-on the fly by the following equations:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(0)}  = x_{i0}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="90" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img36.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(0)} = x_{i0}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
+-+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="302" HEIGHT="42" BORDER="0"
+- SRC="gif/principal_img37.gif"
+- ALT="\begin{displaymath}
+-\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
+-+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="62" HEIGHT="34" BORDER="0"
+- SRC="gif/principal_img38.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(0)} = 0
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
+-  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="504" HEIGHT="43" BORDER="0"
+- SRC="gif/principal_img39.gif"
+- ALT="\begin{displaymath}
+-C_{ij}^{(n)} = C_{ij}^{(n-1)}
+-+ \frac1{n-1}\left[\left(x_{i...
+-...\left&lt;x_j\right&gt;^{(n)}\right)\right]
+-- \frac1n C_{ij}^{(n-1)}
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-since this is a really fast method, with no rounding errors (please
+-refer to CERN 72-21 pp. 54-106).
+-
+-<P>
+-The data is stored internally in a <TT>TVectorD</TT>, in the following
+-way:
+-<BR><P></P>
+-<DIV ALIGN="CENTER">
+-
+-<!-- MATH
+- \begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}
+- -->
+-
+-
+-<IMG
+- WIDTH="319" HEIGHT="31" BORDER="0"
+- SRC="gif/principal_img40.gif"
+- ALT="\begin{displaymath}
+-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+-\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+-\end{displaymath}">
+-</DIV>
+-<BR CLEAR="ALL">
+-<P></P>
+-With <IMG
+- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+- SRC="gif/principal_img6.gif"
+- ALT="$P$"> as defined in the class description.
+-     <PRE>
+-  */
+-  // End_Html
+    if (!p)
+       return;
+ 
+@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Generates the file <filename>, with .C appended if it does
++/// Generates the file `<filename>`, with `.C` appended if it does
+ /// argument doesn't end in .cxx or .C.
+ ///
+ /// The file contains the implementation of two functions
+-///
++/// ~~~ {.cpp}
+ ///    void X2P(Double_t *x, Double *p)
+ ///    void P2X(Double_t *p, Double *x, Int_t nTest)
+-///
+-/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
++/// ~~~
++/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
+ /// respectively. Please refer to these methods.
+ ///
+ /// Further, the static variables:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    gNVariables
+ ///    Double_t gEigenValues[]
+ ///    Double_t gEigenVectors[]
+ ///    Double_t gMeanValues[]
+ ///    Double_t gSigmaValues[]
+-///
++/// ~~~
+ /// are initialized. The only ROOT header file needed is Rtypes.h
+ ///
+ /// See TPrincipal::MakeRealCode for a list of options
+@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Make histograms of the result of the analysis.
+ /// The option string say which histograms to create
+-///      X         Histogram original data
+-///      P         Histogram principal components corresponding to
+-///                original data
+-///      D         Histogram the difference between the original data
+-///                and the projection of principal unto a lower
+-///                dimensional subspace (2D histograms)
+-///      E         Histogram the eigenvalues
+-///      S         Histogram the square of the residues
+-///                (see TPrincipal::SumOfSquareResidues)
+-/// The histograms will be named <name>_<type><number>, where <name>
+-/// is the first argument, <type> is one of X,P,D,E,S, and <number>
++///     - X         Histogram original data
++///     - P         Histogram principal components corresponding to
++///                 original data
++///     - D         Histogram the difference between the original data
++///                 and the projection of principal unto a lower
++///                 dimensional subspace (2D histograms)
++///     - E         Histogram the eigenvalues
++///     - S         Histogram the square of the residues
++///                 (see `TPrincipal::SumOfSquareResiduals`)
++/// The histograms will be named `<name>_<type><number>`, where `<name>`
++/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
+ /// is the variable.
+ 
+ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD: Normalize the covariance matrix
++/// Normalize the covariance matrix
+ 
+ void TPrincipal::MakeNormalised()
+ {
+@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Generate the file <classname>PCA.cxx which contains the
+ /// implementation of two methods:
+-///
++/// ~~~ {.cpp}
+ ///    void <classname>::X2P(Double_t *x, Double *p)
+ ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
+-///
++/// ~~~
+ /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
+-/// respectivly. Please refer to these methods.
++/// respectively. Please refer to these methods.
+ ///
+ /// Further, the public static members:
+-///
++/// ~~~ {.cpp}
+ ///    Int_t    <classname>::fgNVariables
+ ///    Double_t <classname>::fgEigenValues[]
+ ///    Double_t <classname>::fgEigenVectors[]
+ ///    Double_t <classname>::fgMeanValues[]
+ ///    Double_t <classname>::fgSigmaValues[]
+-///
++/// ~~~
+ /// are initialized, and assumed to exist. The class declaration is
+ /// assumed to be in <classname>.h and assumed to be provided by the
+ /// user.
+@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
+ /// See TPrincipal::MakeRealCode for a list of options
+ ///
+ /// The minimal class definition is:
+-///
++/// ~~~ {.cpp}
+ ///   class <classname> {
+ ///   public:
+ ///     static Int_t    fgNVariables;
+@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
+ ///     void X2P(Double_t *x, Double_t *p);
+ ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
+ ///   };
+-///
++/// ~~~
+ /// Whether the methods <classname>::X2P and <classname>::P2X should
+ /// be static or not, is up to the user.
+ 
+@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Perform the principal components analysis.
+ /// This is done in several stages in the TMatrix::EigenVectors method:
+-/// * Transform the covariance matrix into a tridiagonal matrix.
+-/// * Find the eigenvalues and vectors of the tridiagonal matrix.
++///  - Transform the covariance matrix into a tridiagonal matrix.
++///  - Find the eigenvalues and vectors of the tridiagonal matrix.
+ 
+ void TPrincipal::MakePrincipals()
+ {
+@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+ /// This is the method that actually generates the code for the
+ /// transformations to and from feature space and pattern space
+ /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
+@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Print the statistics
+ /// Options are
+-///      M            Print mean values of original data
+-///      S            Print sigma values of original data
+-///      E            Print eigenvalues of covariance matrix
+-///      V            Print eigenvectors of covariance matrix
++///  - M            Print mean values of original data
++///  - S            Print sigma values of original data
++///  - E            Print eigenvalues of covariance matrix
++///  - V            Print eigenvectors of covariance matrix
+ /// Default is MSE
+ 
+ void TPrincipal::Print(Option_t *opt) const
+@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// PRIVATE METHOD:
+-/// Begin_html
++/// Calculates the sum of the square residuals, that is
++///
++/// \f[
++/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
++/// \f]
++///
++/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
++/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
++/// \f$x_i\f$, the original data; I.e., the square distance to the space
++/// spanned by \f$N\f$ eigenvectors.
+ 
+ void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
+ {
+-   /*
+-    </PRE>
+-    Calculates the sum of the square residuals, that is
+-    <BR><P></P>
+-    <DIV ALIGN="CENTER">
+-
+-    <!-- MATH
+-    \begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}
+-    -->
+-
+-
+-    <IMG
+-    WIDTH="147" HEIGHT="58" BORDER="0"
+-    SRC="gif/principal_img52.gif"
+-    ALT="\begin{displaymath}
+-    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+-    \end{displaymath}">
+-    </DIV>
+-    <BR CLEAR="ALL">
+-    <P></P>
+-    where
+-    <!-- MATH
+-    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
+-    -->
+-    <IMG
+-    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img53.gif"
+-    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
+-    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img54.gif"
+-    ALT="$p_i$"> is the
+-    <IMG
+-    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img55.gif"
+-    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
+-    <IMG
+-    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+-    SRC="gif/principal_img56.gif"
+-    ALT="$x_i$">, the original data; I.e., the square distance to the space
+-    spanned by <IMG
+-    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
+-    SRC="gif/principal_img12.gif"
+-    ALT="$N$"> eigenvectors.
+-    <BR>
+-    <PRE>
+-   */
+-   // End_Html
++
+    if (!x)
+       return;
+ 
+@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Calculate the principal components from the original data vector
+ /// x, and return it in p.
++///
+ /// It's the users responsibility to make sure that both x and p are
+ /// of the right size (i.e., memory must be allocated for p).
+ 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
new file mode 100644
index 0000000..4a4177b
--- /dev/null
+++ b/root-tvector2-comment.patch
@@ -0,0 +1,13 @@
+diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
+--- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
+@@ -96,7 +96,8 @@
+    TVector2 Rotate (Double_t phi) const;
+ 
+                                         // returns phi angle in the interval [0,2*PI)
+-   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
++   static Double_t Phi_0_2pi(Double_t x);
++
+                                         // returns phi angle in the interval [-PI,PI)
+    static Double_t Phi_mpi_pi(Double_t x);
+ 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
new file mode 100644
index 0000000..f4f3681
--- /dev/null
+++ b/root-type1-embed.patch
@@ -0,0 +1,97 @@
+diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
+--- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
+@@ -30,14 +30,14 @@
+ #ifndef LITTLE_ENDIAN
+ #define LITTLE_ENDIAN 1
+ #endif // LITTLE_ENDIAN
+-#include "Byteswap.h"
+-#define bswap_16(x)   Rbswap_16((x))
+-#define bswap_32(x)   Rbswap_32((x))
+ #else // R__BYTESWAP
+ #ifdef LITTLE_ENDIAN
+ #undef LITTLE_ENDIAN
+ #endif // LITTLE_ENDIAN
+ #endif // R__BYTESWAP
++#include "Byteswap.h"
++#define bswap_16(x)   Rbswap_16((x))
++#define bswap_32(x)   Rbswap_32((x))
+ 
+ // References:
+ //
+@@ -236,29 +236,26 @@
+       if(magic_number[0] == '\200') {
+          // IBM PC format printer font binary
+ 
+-         // FIXME: Maybe the real name can be parsed out of the
+-         // file
+-         font_name = "";
+-
+          struct pfb_segment_header_s segment_header;
+          size_t offset = 0;
+ 
+-         segment_header.type = 0;
++         // The two char elements of struct
++         // pfb_segment_header_s are most likely aligned to
++         // larger than 1 byte boundaries, so copy all the
++         // elements individually
++         segment_header.always_128 = font_data[offset];
++         segment_header.type = font_data[offset + 1];
++
+          while (segment_header.type != TYPE_EOF) {
+-            // The two char elements of struct
+-            // pfb_segment_header_s are most likely aligned to
+-            // larger than 1 byte boundaries, so copy all the
+-            // elements individually
+-            segment_header.always_128 = font_data[offset];
+-            segment_header.type = font_data[offset + 1];
+             memcpy(&segment_header.length, &font_data[offset + 2],
+                    sizeof(unsigned int));
+             offset += sizeof(unsigned int) + 2;
+-#ifdef LITTLE_ENDIAN
++#ifndef LITTLE_ENDIAN
+             segment_header.length =
+             bswap_32(segment_header.length);
+ #endif // LITTLE_ENDIAN
+             char *buffer = new char[segment_header.length];
++            char *fname;
+ 
+             memcpy(buffer, &font_data[offset],
+                    segment_header.length);
+@@ -278,6 +275,26 @@
+                      buffer[segment_header.length - 1] = '\n';
+                   }
+                   ret.append(buffer, segment_header.length);
++
++                  fname = (char*)memmem(buffer, segment_header.length,
++                                        "/FontName", 9);
++                  if (fname) {
++                     fname += 9;
++                     while (fname < buffer + segment_header.length &&
++                            isspace(*fname)) {
++                        fname++;
++                     }
++                     if (fname < buffer + segment_header.length &&
++                         *fname == '/') {
++                        fname++;
++                     }
++                     int len = 0;
++                     while (fname + len < buffer + segment_header.length &&
++                            isgraph(*(fname + len))) {
++                        len++;
++                     }
++                     font_name.assign(fname, len);
++                  }
+                   break;
+                case TYPE_BINARY:
+                   append_asciihex(
+@@ -289,6 +306,9 @@
+             }
+ 
+             delete [] buffer;
++
++            segment_header.always_128 = font_data[offset];
++            segment_header.type = font_data[offset + 1];
+          }
+ 
+          return ret;
diff --git a/root-unuran.patch b/root-unuran.patch
new file mode 100644
index 0000000..0e78176
--- /dev/null
+++ b/root-unuran.patch
@@ -0,0 +1,305 @@
+diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
+--- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
++++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
+@@ -0,0 +1,21 @@
++# - Locate Unuran library
++# Defines:
++#
++#  UNURAN_FOUND
++#  UNURAN_INCLUDE_DIR
++#  UNURAN_INCLUDE_DIRS (not cached)
++#  UNURAN_LIBRARIES
++
++find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
++find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
++
++set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
++set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
++
++
++# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
++
++mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
+diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
++++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
+@@ -73,6 +73,7 @@
+ ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
+ ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
+ ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
++ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
+ ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
+ ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
+ ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
+diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
+--- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
++++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -142,6 +142,11 @@
+ set(zliblib ${ZLIB_LIBRARY})
+ set(zlibincdir ${ZLIB_INCLUDE_DIR})
+ 
++set(builtinunuran ${value${builtin_unuran}})
++set(unuranlibdir ${UNURAN_LIBRARY_DIR})
++set(unuranlib ${UNURAN_LIBRARY})
++set(unuranincdir ${UNURAN_INCLUDE_DIR})
++
+ set(buildgl ${value${opengl}})
+ set(opengllibdir ${OPENGL_LIBRARY_DIR})
+ set(openglulib ${OPENGL_glu_LIBRARY})
+diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
++++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
+@@ -40,6 +40,16 @@
+   endif()
+ endif()
+ 
++#---Check for Unuran ------------------------------------------------------------------
++if(NOT builtin_unuran)
++  message(STATUS "Looking for Unuran")
++  find_Package(Unuran)
++  if(NOT UNURAN_FOUND)
++    message(STATUS "Unuran not found. Switching on builtin_unuran option")
++    set(builtin_unuran ON CACHE BOOL "" FORCE)
++  endif()
++endif()
++
+ #---Check for Freetype---------------------------------------------------------------
+ if(NOT builtin_freetype)
+   message(STATUS "Looking for Freetype")
+diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
+--- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
++++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
+@@ -121,6 +121,11 @@
+ 
+ BUILTINPCRE    := @builtinpcre@
+ 
++BUILTINUNURAN  := @builtinunuran@
++UNURANLIBDIR   := @unuranlibdir@
++UNURANLIB      := @unuranlib@
++UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
++
+ BUILTINZLIB    := @builtinzlib@
+ ZLIBLIBDIR     := @zliblibdir@
+ ZLIBCLILIB     := @zliblib@
+diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
+--- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
++++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
+@@ -55,6 +55,7 @@
+    enable_builtin_freetype   \
+    enable_builtin_glew       \
+    enable_builtin_pcre       \
++   enable_builtin_unuran     \
+    enable_builtin_zlib       \
+    enable_builtin_lzma       \
+    enable_builtin_llvm       \
+@@ -183,6 +184,7 @@
+ enable_builtin_ftgl=no
+ enable_builtin_glew=no
+ enable_builtin_pcre=no
++enable_builtin_unuran=no
+ enable_builtin_zlib=no
+ enable_builtin_lzma=no
+ enable_builtin_llvm=yes
+@@ -1704,6 +1706,7 @@
+   builtin-freetype   Build included libfreetype, or use system libfreetype
+   builtin-glew       Build included libGLEW, or use system libGLEW
+   builtin-pcre       Build included libpcre, or use system libpcre
++  builtin-unuran     Build included libunuran, or use system libunuran
+   builtin-zlib       Build included libz, or use system libz
+   builtin-lzma       Build included liblzma, or use system liblzma
+   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
+@@ -2046,6 +2049,7 @@
+    enable_builtin_ftgl="yes"
+    enable_builtin_glew="yes"
+    enable_builtin_pcre="yes"
++   enable_builtin_unuran="yes"
+    enable_builtin_zlib="yes"
+    enable_builtin_lzma="yes"
+    top_builddir=`cygpath -u $top_builddir`
+@@ -3210,6 +3214,38 @@
+ 
+ ######################################################################
+ #
++### echo %%% libunuran (builtin or system)
++#
++if test "x$enable_builtin_unuran" = "xno" ; then
++    check_header "unuran.h" "" \
++        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
++    if test "x$found_dir" = "x" ; then
++        enable_builtin_unuran=yes
++    else
++        unuraninc=$found_hdr
++        unuranincdir=$found_dir
++    fi
++
++    check_library "libunuran" "$enable_shared" "" \
++        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
++    if test "x$found_lib" = "x" ; then
++        unuranlib=""
++        unuranlibdir=""
++        enable_builtin_unuran="yes"
++    else
++        unuranlib="$found_lib"
++        unuranlibdir="$found_dir"
++    fi
++
++    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
++        enable_builtin_unuran="yes"
++    fi
++fi
++message "Checking whether to build included unuran"
++result "$enable_builtin_unuran"
++
++######################################################################
++#
+ ### echo %%% Use included zLib or use systems
+ #
+ if test "x$enable_builtin_zlib" = "xno" ; then
+@@ -7720,6 +7756,10 @@
+     -e "s|@top_srcdir@|$top_srcdir|"            \
+     -e "s|@ttffontdir@|$fontdir|"               \
+     -e "s|@tutdir@|$tutdir|"                    \
++    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
++    -e "s|@unuranincdir@|$unuranincdir|"        \
++    -e "s|@unuranlib@|$unuranlib|"              \
++    -e "s|@unuranlibdir@|$unuranlibdir|"        \
+     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
+     -e "s|@xmlincdir@|$xmlincdir|"              \
+     -e "s|@xmllib@|$xmllib|"                    \
+diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
+--- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
+@@ -3,6 +3,9 @@
+ ############################################################################
+ 
+ #---Define package related variables-----------------------------------------------------------------
++
++if(builtin_unuran)
++
+ set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ set(UNR_VERSION "1.8.0-root")
+ set(UNR_TARNAME "unuran-${UNR_VERSION}")
+@@ -62,8 +65,17 @@
+                ${UNR_UNTARDIR}/src/tests/*.c
+                ${UNR_UNTARDIR}/src/uniform/*.c
+                ${UNR_UNTARDIR}/src/urng/*.c )
++set(unrconfig ${UNR_UNTARDIR}/config.h)
++
++else()
++
++include_directories(${UNURAN_INCLUDE_DIRS})
++set(unrsources)
++set(unrconfig)
++
++endif()
+ 
+ ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
+ 
+-ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
++ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
+ ROOT_INSTALL_HEADERS()
+diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
+--- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
+@@ -12,6 +12,8 @@
+ UNURANDIRS   := $(UNURANDIR)/src
+ UNURANDIRI   := $(UNURANDIR)/inc
+ 
++ifeq ($(BUILTINUNURAN),yes)
++
+ UNRVERS      := unuran-1.8.0-root
+ 
+ UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
+@@ -43,15 +45,18 @@
+                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
+ endif
+-UNRO         := $(UNRS:.c=.o)
++UNRFLAGS     := -I$(UNRDIRS)/src
+ 
+-ifeq ($(PLATFORM),win32)
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
+ else
+-UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
++
++UNURANETAG   :=
++UNRCFG       :=
++UNRS         :=
++UNRFLAGS     := $(UNURANINCDIR:%=-I%)
++
+ endif
+ 
+-UNRFLAGS     :=  -I$(UNRDIRS)/src
++UNRO         := $(UNRS:.c=.o)
+ 
+ ##### libUnuran #####
+ UNURANL      := $(MODDIRI)/LinkDef.h
+@@ -84,6 +89,8 @@
+ include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
+ 		cp $< $@
+ 
++ifeq ($(BUILTINUNURAN),yes)
++
+ $(UNURANDEP):   $(UNRCFG)
+ $(UNRS):        $(UNURANETAG)
+ 
+@@ -134,12 +141,14 @@
+ 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
+ 		CFLAGS="$$ACFLAGS");
+ 
++endif
++
+ $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
+                 $(MAINLIBS) $(UNURANLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
+ 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
+ 		   "$(UNURANO) $(UNURANDO)"             \
+-		   "$(UNURANLIBEXTRA) $(UNRO)"
++		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
+ 
+ $(call pcmrule,UNURAN)
+ 	$(noop)
+@@ -158,16 +167,19 @@
+ 
+ clean-$(MODNAME):
+ 		@rm -f $(UNURANO) $(UNURANDO)
++ifeq ($(BUILTINUNURAN),yes)
+ 		-@(if [ -d $(UNRDIRS) ]; then \
+ 			cd $(UNRDIRS); \
+ 			$(MAKE) clean; \
+ 		fi)
++endif
+ 
+ clean::         clean-$(MODNAME)
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
+ 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
++ifeq ($(BUILTINUNURAN),yes)
+ 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
+ ifeq ($(UNURKEEP),yes)
+ 		@mv $(UNRDIRS) $(UNRDIRS).keep
+@@ -177,6 +189,7 @@
+ 		@mv $(UNRDIRS).keep $(UNRDIRS)
+ endif
+ 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
++endif
+ 
+ distclean::     distclean-$(MODNAME)
+ 
+@@ -184,6 +197,7 @@
+ 
+ $(UNURANO): CXXFLAGS += $(UNRFLAGS)
+ 
++ifeq ($(BUILTINUNURAN),yes)
+ ifeq ($(PLATFORM),win32)
+ $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
+ else
+@@ -194,3 +208,4 @@
+ ifeq ($(CC),icc)
+ $(UNRO): CFLAGS += -mp
+ endif
++endif
diff --git a/root-werror.patch b/root-werror.patch
new file mode 100644
index 0000000..06e49f1
--- /dev/null
+++ b/root-werror.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
+--- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
++++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
+@@ -40,7 +40,7 @@
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
+ 
+ #---Do not transform warnings in errors-------------------------------------------------------------
+-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+ #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
+ ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root.spec b/root.spec
new file mode 100644
index 0000000..1078ad4
--- /dev/null
+++ b/root.spec
@@ -0,0 +1,3462 @@
+%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
+
+# Ruby support not yet ported to root version 6
+%global ruby 0
+
+%global oce 1
+%global pythia8 1
+%global xrootd 1
+
+%if %{?fedora}%{!?fedora:0} >= 20
+# libhdfs is currently only available on intel architectures in Fedora
+%ifarch %{ix86} x86_64
+%global hadoop 1
+%else
+%global hadoop 0
+%endif
+%else
+%global hadoop 0
+%endif
+
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+# Do not create .orig files when patching source
+%global _default_patch_flags --no-backup-if-mismatch
+
+Name:		root
+Version:	6.06.06
+%global libversion %(cut -d. -f 1-2 <<< %{version})
+Release:	3%{?dist}
+Summary:	Numerical data analysis framework
+
+License:	LGPLv2+
+URL:		https://root.cern.ch/
+#		The upstream source is modified to exclude proprietary fonts:
+#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
+#		tar -z -x -f root_v%{version}.source.tar.gz
+#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
+#		tar -J -c -f root-%{version}.tar.xz root-%{version}
+Source0:	%{name}-%{version}.tar.xz
+#		Input data for the tests
+Source1:	%{name}-testfiles.tar.xz
+#		Script to generate above source
+Source2:	%{name}-testfiles.sh
+#		Adapt to gcc's ABI tags
+#		https://github.com/root-mirror/root/pull/124
+Patch0:		%{name}-abitags.patch
+#		Allow running tests
+#		https://github.com/root-mirror/root/pull/130
+Patch1:		%{name}-test-install.patch
+#		Use system fonts
+Patch2:		%{name}-fontconfig.patch
+#		Fix segfault when embedding Type 1 fonts
+#		https://github.com/root-mirror/root/pull/90
+Patch3:		%{name}-type1-embed.patch
+#		Don't link to libjvm (handled properly inside libhdfs)
+Patch4:		%{name}-dont-link-jvm.patch
+#		Remove gcc ABI check
+#		with the abitags patch above it is not needed
+Patch5:		%{name}-no-abi-check.patch
+#		Public header #includes private header
+#		https://github.com/root-mirror/root/pull/88
+Patch6:		%{name}-private-public.patch
+#		Fix problems with the cmake configuration
+Patch7:		%{name}-broken-cmake-config.patch
+#		Missing stuff in the cmake configuration
+Patch8:		%{name}-missing-cmake-config.patch
+#		Fix broken deprecation check (configure)
+Patch9:		%{name}-deprecated-options.patch
+#		Only link to libgfortranbegin.a if it exists (configure)
+Patch10:	%{name}-libgfortranbegin.patch
+#		Make sure the removal of -Werror doesn't do more than intended
+Patch11:	%{name}-werror.patch
+#		Properly remove -Wall (must also remove Werror=*)
+Patch12:	%{name}-compiledata.patch
+#		Don't overwrite FFLAGS
+Patch13:	%{name}-fflags.patch
+#		Use system unuran
+Patch14:	%{name}-unuran.patch
+#		Use systme gl2ps
+Patch15:	%{name}-gl2ps.patch
+#		More CMAKE_Fortran_FLAGS case issues
+Patch16:	%{name}-more-fflags.patch
+#		Use the same soname for cmake and configure
+Patch17:	%{name}-soname.patch
+#		Save memory during build
+Patch18:	%{name}-save-memory.patch
+#		Fix build configuration for ppc64/ppc64le
+Patch19:	%{name}-ppc64.patch
+#		Fix build configuration for ARM
+Patch20:	%{name}-arm.patch
+#		Fix build configuration for s390/s390x
+Patch21:	%{name}-s390x.patch
+#		Always build the bundled llvm as static libraries
+Patch22:	%{name}-llvm-static.patch
+
+#		Documentation fixes
+
+#		Fixes for doxygen parsing issues:
+#		- warning: Found ';' while parsing initializer list
+#		- warning: Illegal member name found
+#		- warning: no matching file member found for ClassImp()
+#		- warning: documented symbol 'X' was not declared or defined
+Patch23:	%{name}-doxyfile.patch
+#		Improvements to the doxygen filter
+Patch24:	%{name}-dox-filter.patch
+#		Align macros so the doxygen filter works
+Patch25:	%{name}-macro-align.patch
+#		Fix broken ~~~ for doxygen
+#		https://github.com/root-mirror/root/pull/127
+Patch26:	%{name}-tildes.patch
+#		Convert old latex markup to doxygen
+Patch27:	%{name}-latex-markup.patch
+#		Remove some old html markup
+Patch28:	%{name}-html-markup.patch
+#		Fix broken links (cernlib, clhep, geant)
+Patch29:	%{name}-links.patch
+#		Remove duplicated comment
+Patch30:	%{name}-tvector2-comment.patch
+#		Remove links to tutorial macro results
+Patch31:	%{name}-see-macro-output.patch
+#		Fix TMath doxygen
+Patch32:	%{name}-tmath-doc.patch
+#		Fix cernlib doxygen
+Patch33:	%{name}-cernlib-doc.patch
+#		Backported doxygen updates for TPrincipal class
+Patch34:	%{name}-tprincipal-doc.patch
+#		Don't run gui macros
+Patch35:	%{name}-avoid-gui-crash.patch
+#		Doxygen warnings
+Patch36:	%{name}-doxygen-warnings.patch
+
+#		Test fixes
+
+#		User files in source tree during tests
+Patch37:	%{name}-template-files.patch
+#		Use cache read option
+Patch38:	%{name}-cache-test.patch
+#		Fixes for tests on ix86
+Patch39:	%{name}-32bit.patch
+#		Fixes for stressGraphics.ref
+Patch40:	%{name}-stressgraphics.patch
+#		Don't download testdata
+Patch41:	%{name}-no-testdata.patch
+#		Avoid using std::bind with lambdas (fixed upstream)
+Patch42:	%{name}-avoid-std-bind-lambda.patch
+
+#		s390 is not supported by cling: "error: unknown target
+#		triple 's390-ibm-linux', please use -triple or -arch"
+ExcludeArch:	s390
+#		ppc/ppc64/ppc64le does not yet work
+#		https://sft.its.cern.ch/jira/browse/ROOT-6434
+#		https://sft.its.cern.ch/jira/browse/ROOT-7314
+ExcludeArch:	ppc %{power64}
+
+BuildRequires:	cmake
+BuildRequires:	libX11-devel
+BuildRequires:	libXpm-devel
+BuildRequires:	libXft-devel
+BuildRequires:	libXext-devel
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel
+BuildRequires:	fcgi-devel
+BuildRequires:	ftgl-devel
+BuildRequires:	glew-devel
+BuildRequires:	gl2ps-devel
+BuildRequires:	pcre-devel
+BuildRequires:	zlib-devel
+BuildRequires:	xz-devel
+BuildRequires:	libAfterImage-devel >= 1.20
+BuildRequires:	ncurses-devel
+BuildRequires:	avahi-compat-libdns_sd-devel
+BuildRequires:	avahi-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	fftw-devel
+BuildRequires:	gsl-devel
+BuildRequires:	unuran-devel
+BuildRequires:	krb5-devel
+BuildRequires:	krb5-workstation
+BuildRequires:	openldap-devel
+BuildRequires:	mysql-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	unixODBC-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	mesa-libGLU-devel
+BuildRequires:	postgresql-devel
+BuildRequires:	python-devel
+%if %{?fedora}%{!?fedora:0} >= 15
+BuildRequires:	python3-devel
+%global python3pkg python3
+%endif
+%if %{?rhel}%{!?rhel:0} == 7
+BuildRequires:	python34-devel
+%global python3pkg python34
+%endif
+BuildRequires:	qt4-devel
+%if %{ruby}
+BuildRequires:	ruby
+BuildRequires:	ruby-devel
+%endif
+BuildRequires:	openssl-devel
+BuildRequires:	globus-gss-assist-devel
+BuildRequires:	globus-gsi-credential-devel
+BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	dcap-devel
+BuildRequires:	dpm-devel
+%if %{xrootd}
+BuildRequires:	xrootd-client-devel >= 1:3.3.5
+BuildRequires:	xrootd-private-devel >= 1:3.3.5
+%endif
+BuildRequires:	cfitsio-devel
+BuildRequires:	davix-devel >= 0.2.8
+BuildRequires:	gfal2-devel
+BuildRequires:	srm-ifce-devel
+%if %{hadoop}
+BuildRequires:	hadoop-devel
+%endif
+%if %{oce}
+BuildRequires:	OCE-devel
+%endif
+BuildRequires:	R-Rcpp-devel
+BuildRequires:	R-RInside-devel
+BuildRequires:	readline-devel
+BuildRequires:	tbb-devel
+BuildRequires:	emacs
+BuildRequires:	emacs-el
+BuildRequires:	gcc-c++
+BuildRequires:	gcc-gfortran
+BuildRequires:	graphviz-devel
+BuildRequires:	expat-devel
+%if %{pythia8}
+BuildRequires:	pythia8-devel >= 8.1.80
+%endif
+BuildRequires:	numpy
+BuildRequires:	dos2unix
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	perl-generators
+#		Some of the tests call lsb_release
+BuildRequires:	redhat-lsb-core
+BuildRequires:	font(freesans)
+BuildRequires:	font(freeserif)
+BuildRequires:	font(freemono)
+#		Provides "symbol" and "dingbats"
+BuildRequires:	urw-fonts
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
+BuildRequires:	font(droidsansfallback)
+%endif
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	hicolor-icon-theme
+Requires:	emacs-filesystem >= %{_emacs_version}
+Provides:	emacs-%{name} = %{version}-%{release}
+Provides:	emacs-%{name}-el = %{version}-%{release}
+Obsoletes:	emacs-%{name} < 5.34.28
+Obsoletes:	emacs-%{name}-el < 5.34.28
+
+%description
+The ROOT system provides a set of object oriented frameworks with all
+the functionality needed to handle and analyze large amounts of data
+in a very efficient way. Having the data defined as a set of objects,
+specialized storage methods are used to get direct access to the
+separate attributes of the selected objects, without having to touch
+the bulk of the data. Included are histograming methods in an
+arbitrary number of dimensions, curve fitting, function evaluation,
+minimization, graphics and visualization classes to allow the easy
+setup of an analysis system that can query and process the data
+interactively or in batch mode, as well as a general parallel
+processing framework, PROOF, that can considerably speed up an
+analysis.
+
+Thanks to the built-in C++ interpreter cling, the command, the
+scripting and the programming language are all C++. The interpreter
+allows for fast prototyping of the macros since it removes the, time
+consuming, compile/link cycle. It also provides a good environment to
+learn C++. If more performance is needed the interactively developed
+macros can be compiled using a C++ compiler via a machine independent
+transparent compiler interface called ACliC.
+
+The system has been designed in such a way that it can query its
+databases in parallel on clusters of workstations or many-core
+machines. ROOT is an open system that can be dynamically extended by
+linking external libraries. This makes ROOT a premier platform on
+which to build data acquisition, simulation and data analysis systems.
+
+%package icons
+Summary:	ROOT icon collection
+BuildArch:	noarch
+Requires:	%{name}-core = %{version}-%{release}
+
+%description icons
+This package contains icons used by the ROOT GUI.
+
+%package fonts
+Summary:	ROOT font collection
+BuildArch:	noarch
+%if %{?rhel}%{!?rhel:0}
+#		STIX version 0.9 and Driod Sans Fallback
+License:	OFL and ASL 2.0
+%else
+#		STIX version 0.9 only
+License:	OFL
+%endif
+Requires:	%{name}-core = %{version}-%{release}
+
+%description fonts
+This package contains fonts used by ROOT that are not available in Fedora.
+In particular it contains STIX version 0.9 that is used by TMathText.
+%if %{?rhel}%{!?rhel:0}
+For EPEL it also provides the Google Droid Sans Fallback font.
+%endif
+
+%package doc
+Summary:	Documentation for the ROOT system
+BuildArch:	noarch
+License:	LGPLv2+ and GPLv2+ and BSD
+Requires:	mathjax
+
+%description doc
+This package contains the automatically generated ROOT class
+documentation.
+
+%package tutorial
+Summary:	ROOT tutorial scripts and test suite
+BuildArch:	noarch
+Requires:	%{name} = %{version}-%{release}
+
+%description tutorial
+This package contains the tutorial scripts and test suite for ROOT.
+
+%package core
+Summary:	ROOT core libraries
+License:	LGPLv2+ and BSD
+Requires:	%{name}-fonts = %{version}-%{release}
+Requires:	%{name}-icons = %{version}-%{release}
+#		Dynamic dependencies
+Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
+Requires:	xorg-x11-fonts-ISO8859-1-75dpi
+Requires:	font(freesans)
+Requires:	font(freeserif)
+Requires:	font(freemono)
+#		Provides "symbol" and "dingbats"
+Requires:	urw-fonts
+#		The root-fonts package provides Droid Sans Fallback for EPEL
+%if %{?fedora}%{!?fedora:0} >= 11
+Requires:	font(droidsansfallback)
+%endif
+%if %{ruby} == 0
+Obsoletes:	%{name}-ruby < 6.00.00
+%endif
+%if %{hadoop} == 0
+Obsoletes:	%{name}-io-hdfs < 6.06.04-2
+%endif
+
+%description core
+This package contains the core libraries used by ROOT: libCore, libNew,
+libRint and libThread.
+
+%package multiproc
+Summary:	Multi-processor support for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description multiproc
+This package provides ROOT's multi-processor support library: libMultiProc.
+
+%package cling
+Summary:	Cling C++ interpreter
+License:	NCSA and (NCSA or LGPLv2+)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+#		Root's cling interpreter uses a particular git commit of
+#		llvm and clang with application specific changes. It does
+#		not work with the system libraries. The bundled llvm and
+#		clang are compiled using -fvisibility=hidden, and are not
+#		visible outside of the libCling module.
+Requires:	gcc-c++
+Requires:	redhat-rpm-config
+Provides:	bundled(clang-libs)
+Provides:	bundled(llvm-libs)
+Obsoletes:	%{name}-cint7 < 5.26.00c
+Obsoletes:	%{name}-cint < 6.00.00
+Obsoletes:	%{name}-cintex < 6.00.00
+Obsoletes:	%{name}-reflex < 6.00.00
+
+%description cling
+Cling is an interactive C++ interpreter, built on top of Clang and
+LLVM compiler infrastructure.
+
+%package proofd
+Summary:	Parallel ROOT Facility - distributed, parallel computing
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(post):		chkconfig
+Requires(postun):	initscripts
+
+%description proofd
+This package contains the PROOF server. Proofd is the core daemon of
+the PROOF (Parallel ROOT Facility) system for distributed parallel
+computing. Installing this package on a machine makes it possible
+for the machine to participate in a parallel computing farm (cluster
+or via the Internet), either as a master or a slave, using a
+transparent interface.
+
+%package rootd
+Summary:	ROOT remote file server
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(post):		chkconfig
+Requires(postun):	initscripts
+
+%description rootd
+This package contains the ROOT file server. Rootd is a server for ROOT
+files, serving files over the Internet. Using this daemon, you can
+access files on the machine from anywhere on the Internet, using a
+transparent interface.
+
+%package python
+Summary:	Python extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description python
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
+%package %{python3pkg}
+Summary:	Python extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description %{python3pkg}
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
+%if %{ruby}
+%package ruby
+Summary:	Ruby extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Provides:	ruby(libRuby) = %{version}
+
+%description ruby
+This package contains the Ruby extension for ROOT. The interface
+goes both ways - that is, you can call ROOT functions from Ruby, and
+invoke the Ruby interpreter from ROOT.
+%endif
+
+%package r
+Summary:	R interface for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description r
+ROOT R is an interface in ROOT to call R functions using an R C++
+interface. This interface opens the possibility in ROOT to use the
+very large set of mathematical and statistical tools provided by R.
+With ROOT R you can perform a conversion from ROOT's C++ objects to
+R's objects, transform the returned R objects into ROOT's C++ objects,
+then the R functionality can be used directly for statistical studies
+in ROOT.
+
+%package r-tools
+Summary:	R Tools
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+
+%description r-tools
+This package contains a minimizer module for ROOT that uses the ROOT
+R interface.
+
+%package genetic
+Summary:	Genetic algorithms for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description genetic
+This package contains a genetic minimizer module for ROOT.
+
+%package geom
+Summary:	Geometry library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description geom
+This package contains a library for defining geometries in ROOT.
+
+%package gdml
+Summary:	GDML import/export for ROOT geometries
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+
+%description gdml
+This package contains an import/export module for ROOT geometries.
+
+%if %{oce}
+%package geocad
+Summary:	OpenCascade import/export for ROOT geometries
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+
+%description geocad
+This package contains an import/export module for ROOT geometries.
+%endif
+
+%package graf
+Summary:	2D graphics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf
+This package contains the 2-dimensional graphics library for ROOT.
+
+%package graf-asimage
+Summary:	AfterImage graphics renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf-asimage
+This package contains the AfterImage renderer for ROOT, which allows
+you to store output graphics in many formats, including JPEG, PNG and
+TIFF.
+
+%package graf-fitsio
+Summary:	ROOT interface for the Flexible Image Transport System (FITS)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description graf-fitsio
+This package contains a library for using the Flexible Image Transport
+System (FITS) data format in root.
+
+%package graf-gpad
+Summary:	Canvas and pad library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
+
+%description graf-gpad
+This package contains a library for canvas and pad manipulations.
+
+%package graf-gviz
+Summary:	Graphviz 2D library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description graf-gviz
+This package contains the 2-dimensional graphviz library for ROOT.
+
+%package graf-postscript
+Summary:	Postscript/PDF renderer library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+
+%description graf-postscript
+This package contains a library for ROOT, which allows rendering
+postscript and PDF output.
+
+%package graf-qt
+Summary:	Qt renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+
+%description graf-qt
+This package contains the Qt renderer for ROOT.
+
+%package graf-x11
+Summary:	X window system renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+
+%description graf-x11
+This package contains the X11 renderer for ROOT, which allows using an
+X display for showing graphics.
+
+%package graf3d
+Summary:	Basic 3D shapes library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description graf3d
+This library contains the basic 3D shapes and classes for ROOT. For
+a more full-blown geometry library, see the root-geom package.
+
+%package graf3d-eve
+Summary:	Event display library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description graf3d-eve
+This package contains a library for defining event displays in ROOT.
+
+%package graf3d-gl
+Summary:	GL renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description graf3d-gl
+This package contains the GL renderer for ROOT. This library provides
+3D rendering of volumes and shapes defined in ROOT, as well as 3D
+rendering of histograms, and similar. Included is also a high quality
+3D viewer for ROOT defined geometries.
+
+%package graf3d-gviz3d
+Summary:	Graphviz 3D library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-gl%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+
+%description graf3d-gviz3d
+This package contains the 3-dimensional graphviz library for ROOT.
+
+%package graf3d-x3d
+Summary:	X 3D renderer for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+
+%description graf3d-x3d
+This package contains the X 3D renderer for ROOT. This library provides
+3D rendering of volumes and shapes defined in ROOT. Included is also
+a low quality 3D viewer for ROOT defined geometries.
+
+%package gui
+Summary:	GUI library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+#		Dynamic dependencies
+Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+
+%description gui
+This package contains a library for defining graphical user interfaces.
+
+%package gui-fitpanel
+Summary:	GUI element for fits in ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description gui-fitpanel
+This package contains a library to show a pop-up dialog when fitting
+various kinds of data.
+
+%package gui-ged
+Summary:	GUI element for editing various ROOT objects
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description gui-ged
+This package contains a library to show a pop-up window for editing
+various ROOT objects.
+
+%package guibuilder
+Summary:	GUI editor library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description guibuilder
+This package contains a library for editing graphical user interfaces
+in ROOT.
+
+%package gui-qt
+Summary:	Qt GUI for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+
+%description gui-qt
+This package contains the Qt GUI for ROOT.
+
+%package gui-recorder
+Summary:	Interface for recording and replaying events in ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description gui-recorder
+This library provides interface for recording and replaying events in ROOT.
+Recorded events are:
+ - Commands typed by user in command line ('new TCanvas')
+ - GUI events (mouse movement, button clicks, ...)
+All the recorded events from one session are stored in one TFile
+and can be replayed again anytime.
+
+%package hbook
+Summary:	Hbook library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description hbook
+This package contains the Hbook library for ROOT, allowing you to
+access legacy Hbook files (NTuples and Histograms from PAW).
+
+%package hist
+Summary:	Histogram library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
+
+%description hist
+This package contains a library for histogramming in ROOT.
+
+%package hist-painter
+Summary:	Histogram painter plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description hist-painter
+This package contains a painter of histograms for ROOT.
+
+%package spectrum
+Summary:	Spectra analysis library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description spectrum
+This package contains the Spectrum library for ROOT.
+
+%package spectrum-painter
+Summary:	Spectrum painter plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description spectrum-painter
+This package contains a painter of spectra for ROOT.
+
+%package hist-factory
+Summary:	RooFit PDFs from ROOT histograms
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description hist-factory
+Create RooFit probability density functions from ROOT histograms.
+
+%package html
+Summary:	HTML documentation generator for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	graphviz
+
+%description html
+This package contains classes to automatically extract documentation
+from marked up sources.
+
+%package io
+Summary:	Input/output of ROOT objects
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description io
+This package provides I/O routines for ROOT objects.
+
+%package io-dcache
+Summary:	dCache input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-dcache
+This package contains the dCache extension for ROOT.
+
+%package io-gfal
+Summary:	Grid File Access Library input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-gfal
+This package contains the Grid File Access Library extension for ROOT.
+
+%if %{hadoop}
+%package io-hdfs
+Summary:	Hadoop File System input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-hdfs
+This package contains the Hadoop File System extension for ROOT.
+%endif
+
+%package io-rfio
+Summary:	Remote File input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-rfio
+This package contains the Remote File IO extension for ROOT.
+
+%package io-sql
+Summary:	SQL input/output library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description io-sql
+This package contains the SQL extension for ROOT, that allows
+transparent access to files data via an SQL database, using ROOT's
+TFile interface.
+
+%package io-xml
+Summary:	XML reader library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description io-xml
+This package contains the XML reader library for ROOT.
+
+%package foam
+Summary:	A Compact Version of the Cellular Event Generator
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description foam
+The general-purpose self-adapting Monte Carlo (MC) event
+generator/simulator mFOAM (standing for mini-FOAM) is a new compact
+version of the FOAM program, with a slightly limited functionality
+with respect to its parent version. On the other hand, mFOAM is
+easier to use for the average user.
+
+%package fftw
+Summary:	FFTW library for ROOT
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description fftw
+This package contains the Fast Fourier Transform extension for ROOT.
+It uses the very fast fftw (version 3) library.
+
+%package fumili
+Summary:	Fumili library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description fumili
+This package contains the fumili library for ROOT. This provides an
+alternative fitting algorithm for ROOT.
+
+%package genvector
+Summary:	Generalized vector library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description genvector
+This package contains the Genvector library for ROOT. This provides
+a generalized vector library.
+
+%package mathcore
+Summary:	Core mathematics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+
+%description mathcore
+This package contains the MathCore library for ROOT.
+
+%package mathmore
+Summary:	GSL interface library for ROOT
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description mathmore
+This package contains the MathMore library for ROOT. This provides
+a partial GNU Scientific Library interface for ROOT.
+While the rest of root is licensed under LGPLv2+ this optional library
+is licensed under GPLv2+ due to its use of GSL.
+
+%package matrix
+Summary:	Matrix library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description matrix
+This package contains the Matrix library for ROOT.
+
+%package minuit
+Summary:	Minuit library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description minuit
+This package contains the MINUIT library for ROOT. This provides a
+fitting algorithm for ROOT.
+
+%package minuit2
+Summary:	Minuit version 2 library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description minuit2
+This package contains the MINUIT version 2 library for ROOT. This
+provides an fitting algorithm for ROOT.
+
+%package mlp
+Summary:	Multi-layer perceptron extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description mlp
+This package contains the mlp library for ROOT. This library provides
+a multi-layer perceptron neural network package for ROOT.
+
+%package physics
+Summary:	Physics library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description physics
+This package contains the physics library for ROOT.
+
+%package quadp
+Summary:	QuadP library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description quadp
+This package contains the QuadP library for ROOT. This provides the a
+framework in which to do Quadratic Programming. The quadratic
+programming problem involves minimization of a quadratic function
+subject to linear constraints.
+
+%package smatrix
+Summary:	Sparse matrix library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description smatrix
+This package contains the Smatrix library for ROOT.
+
+%package splot
+Summary:	Splot library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description splot
+A common method used in High Energy Physics to perform measurements
+is the maximum Likelihood method, exploiting discriminating variables
+to disentangle signal from background. The crucial point for such an
+analysis to be reliable is to use an exhaustive list of sources of
+events combined with an accurate description of all the Probability
+Density Functions (PDF).
+
+To assess the validity of the fit, a convincing quality check is to
+explore further the data sample by examining the distributions of
+control variables. A control variable can be obtained for instance by
+removing one of the discriminating variables before performing again
+the maximum Likelihood fit: this removed variable is a control
+variable. The expected distribution of this control variable, for
+signal, is to be compared to the one extracted, for signal, from the
+data sample. In order to be able to do so, one must be able to unfold
+from the distribution of the whole data sample.
+
+The SPlot method allows to reconstruct the distributions for the
+control variable, independently for each of the various sources of
+events, without making use of any a priori knowledge on this
+variable. The aim is thus to use the knowledge available for the
+discriminating variables to infer the behavior of the individual
+sources of events with respect to the control variable.
+
+SPlot is optimal if the control variable is uncorrelated with the
+discriminating variables.
+
+%package unuran
+Summary:	Random number generator library
+License:	GPLv2+
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description unuran
+Contains universal (also called automatic or black-box) algorithms
+that can generate random numbers from large classes of continuous or
+discrete distributions, and also from practically all standard
+distributions.
+
+To generate random numbers the user must supply some information
+about the desired distribution, especially a C-function that computes
+the density and - depending on the chosen methods - some additional
+information (like the borders of the domain, the mode, the derivative
+of the density ...). After a user has given this information an
+init-program computes all tables and constants necessary for the
+random variate generation. The sample program can then generate
+variates from the desired distribution.
+
+%package vdt
+Summary:	VDT mathematical library
+BuildArch:	noarch
+
+%description vdt
+VDT is a library of mathematical functions implemented in double and
+single precision. The implementation is fast and with the aid of
+modern compilers (e.g. gcc 4.7) vectorizable.
+
+%package memstat
+Summary:	Memory statistics tool for use with ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description memstat
+This package contains the memory statistics tool for debugging memory
+leaks and such.
+
+%package table
+Summary:	Table library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description table
+This package contains the Table library for ROOT.
+
+%package montecarlo-eg
+Summary:	Event generator library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+
+%description montecarlo-eg
+This package contains an event generator library for ROOT.
+
+%if %{pythia8}
+%package montecarlo-pythia8
+Summary:	Pythia version 8 plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+
+%description montecarlo-pythia8
+This package contains the Pythia version 8 plug-in for ROOT. This
+package provide the ROOT user with transparent interface to the Pythia
+(version 8) event generators for hadronic interactions. If the term
+"hadronic" does not ring any bells, this package is not for you.
+%endif
+
+%package montecarlo-vmc
+Summary:	Virtual Monte-Carlo (simulation) library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+
+%description montecarlo-vmc
+This package contains the VMC library for ROOT.
+
+%package net
+Summary:	Net library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description net
+This package contains the ROOT networking library.
+
+%package net-rpdutils
+Summary:	Authentication utilities used by rootd and proofd
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-rpdutils
+This package contains authentication utilities used by rootd and proofd.
+
+%package net-bonjour
+Summary:	Bonjour extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-bonjour
+This package contains a bonjour extension for ROOT.
+
+%package net-auth
+Summary:	Authentication extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description net-auth
+This package contains the basic authentication algorithms used by ROOT.
+
+%package net-davix
+Summary:	Davix extension for ROOT
+Requires:	davix-libs%{?_isa} >= 0.2.8
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description net-davix
+This package contains the davix extension for ROOT, that provides
+access to http based storage such as webdav and S3.
+
+%package net-globus
+Summary:	Globus extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
+Requires:	globus-proxy-utils
+
+%description net-globus
+This package contains the Globus extension for ROOT, that allows
+authentication and authorization against Globus.
+
+%package net-krb5
+Summary:	Kerberos (version 5) extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
+Requires:	krb5-workstation
+
+%description net-krb5
+This package contains the Kerberos (version 5) extension for ROOT, that
+allows authentication and authorization using Kerberos tokens.
+
+%package net-ldap
+Summary:	LDAP extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description net-ldap
+This package contains the LDAP extension for ROOT. This gives you
+access to LDAP directories via ROOT.
+
+%package net-http
+Summary:	HTTP server extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description net-http
+This package contains the HTTP server extension for ROOT. It provides
+an http interface to arbitrary ROOT applications.
+
+%if %{xrootd}
+%package netx
+Summary:	NetX extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description netx
+This package contains the NetX extension for ROOT, i.e. a client for
+the xrootd server. Both the old (NetX) and the new (NetXNG) version are
+provided.
+%endif
+
+%package proof
+Summary:	PROOF extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+Obsoletes:	%{name}-clarens < 5.34.01
+Obsoletes:	%{name}-peac < 5.34.01
+
+%description proof
+This package contains the proof extension for ROOT. This provides a
+client to use in a PROOF environment.
+
+%package proof-bench
+Summary:	PROOF benchmarking
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description proof-bench
+This package contains the steering class for PROOF benchmarks.
+
+%package proof-pq2
+Summary:	PROOF Quick Query (pq2)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+
+%description proof-pq2
+Shell-based interface to the PROOF dataset handling.
+
+%package proof-sessionviewer
+Summary:	GUI to browse an interactive PROOF session
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description proof-sessionviewer
+This package contains a library for browsing an interactive PROOF
+session in ROOT.
+
+%if %{xrootd}
+%package xproof
+Summary:	XPROOF extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+#		Dynamic dependency
+Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
+Requires:	xrootd-server%{?_isa}
+
+%description xproof
+This package contains the xproof extension for ROOT. This provides a
+client to be used in a PROOF environment.
+%endif
+
+%package roofit
+Summary:	ROOT extension for modeling expected distributions
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description roofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+%package sql-mysql
+Summary:	MySQL client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-mysql
+This package contains the MySQL plugin for ROOT. This plugin
+provides a thin client (interface) to MySQL servers. Using this
+client, one can obtain information from a MySQL database into the
+ROOT environment.
+
+%package sql-odbc
+Summary:	ODBC plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-odbc
+This package contains the ODBC (Open DataBase Connectivity) plugin
+for ROOT, that allows transparent access to any kind of database that
+supports the ODBC protocol.
+
+%package sql-sqlite
+Summary:	Sqlite client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-sqlite
+This package contains the sqlite plugin for ROOT. This plugin
+provides a thin client (interface) to sqlite servers. Using this
+client, one can obtain information from a sqlite database into the
+ROOT environment.
+
+%package sql-pgsql
+Summary:	PostgreSQL client plugin for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description sql-pgsql
+This package contains the PostGreSQL plugin for ROOT. This plugin
+provides a thin client (interface) to PostGreSQL servers. Using this
+client, one can obtain information from a PostGreSQL database into the
+ROOT environment.
+
+%package tmva
+Summary:	Toolkit for multivariate data analysis
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description tmva
+The Toolkit for Multivariate Analysis (TMVA) provides a
+ROOT-integrated environment for the parallel processing and
+evaluation of MVA techniques to discriminate signal from background
+samples. It presently includes (ranked by complexity):
+
+  * Rectangular cut optimization
+  * Correlated likelihood estimator (PDE approach)
+  * Multi-dimensional likelihood estimator (PDE - range-search approach)
+  * Fisher (and Mahalanobis) discriminant
+  * H-Matrix (chi-squared) estimator
+  * Artificial Neural Network (two different implementations)
+  * Boosted Decision Trees
+
+The TMVA package includes an implementation for each of these
+discrimination techniques, their training and testing (performance
+evaluation). In addition all these methods can be tested in parallel,
+and hence their performance on a particular data set may easily be
+compared.
+
+%package tmva-python
+Summary:	Toolkit for multivariate data analysis (Python)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-python
+Python integration with TMVA.
+
+%package tmva-r
+Summary:	Toolkit for multivariate data analysis (R)
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-r%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+
+%description tmva-r
+R integration with TMVA.
+
+%package tmva-gui
+Summary:	Toolkit for multivariate data analysis GUI
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
+
+%description tmva-gui
+GUI for the Toolkit for Multivariate Analysis (TMVA)
+
+%package tree
+Summary:	Tree library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+
+%description tree
+This package contains the Tree library for ROOT.
+
+%package tree-player
+Summary:	Library to loop over a ROOT tree
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description tree-player
+This package contains a plugin to loop over a ROOT tree.
+
+%package tree-viewer
+Summary:	GUI to browse a ROOT tree
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description tree-viewer
+This package contains a plugin for browsing a ROOT tree in ROOT.
+
+%package cli
+Summary:	ROOT command line utilities
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+
+%description cli
+The ROOT command line utilities is a set of scripts for common tasks
+written in python.
+
+%package notebook
+Summary:	ROOT as an IPython Notebook
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-rootaas = %{version}-%{release}
+Requires:	/usr/bin/ipython
+
+%description notebook
+ROOT as an IPython Notebook.
+
+%package rootaas
+Summary:	ROOT as a Service
+BuildArch:	noarch
+Requires:	%{name}-python = %{version}-%{release}
+Requires:	python-ipython-console
+
+%description rootaas
+ROOT as a Service - the IPython kernel for the ROOT notebook.
+
+%prep
+%setup -q -a 1
+
+# Convert from mac line terminators (and remove trailing spaces)
+mac2unix math/smatrix/doc/SMatrixClass.html
+sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
+mac2unix math/smatrix/doc/SVector.html
+sed 's! *$!!' -i math/smatrix/doc/SVector.html
+
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+
+# Remove bundled sources in order to be sure they are not used
+#  * afterimage
+rm -rf graf2d/asimage/src/libAfterImage
+#  * ftgl
+rm -rf graf3d/ftgl/src graf3d/ftgl/inc
+#  * freetype
+rm -rf graf2d/freetype/src
+#  * glew
+rm -rf graf3d/glew/src graf3d/glew/inc
+#  * pcre
+rm -rf core/pcre/src
+#  * zlib
+rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
+#  * lzma
+rm -rf core/lzma/src/*.tar.gz
+#  * gl2ps
+rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
+#  * unuran
+rm -rf math/unuran/src/*.tar.gz
+#  * xrootd-private-devel headers
+rm -rf proof/xrdinc
+#  * x11 extension headers
+rm -rf graf2d/x11/inc/X11
+#  * mathjax
+rm -rf documentation/doxygen/mathjax.tar.gz
+sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
+sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
+    -i documentation/doxygen/Doxyfile
+%if %{?fedora}%{!?fedora:0} >= 24
+#  * string_view
+rm core/metautils/inc/libcpp_string_view.h \
+   core/metautils/inc/RWrap_libcpp_string_view.h
+%endif
+
+# Remove bundled fonts provided by the OS distributions
+%if %{?fedora}%{!?fedora:0} >= 11
+rm fonts/DroidSansFallback.ttf
+%endif
+
+# Remove unsupported man page macros
+sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
+
+# Build PyROOT for python 3
+cp -pr bindings/pyroot bindings/python
+
+%build
+unset QTDIR
+unset QTLIB
+unset QTINC
+
+mkdir builddir
+pushd builddir
+
+# Avoid overlinking (this used to be the default with the old configure script)
+LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
+
+%ifarch s390 s390x
+# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
+%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
+%endif
+
+%ifarch ppc %{power64} s390 s390x
+# On some architectures JIT compilation fails if the stack protector is used
+# https://llvm.org/bugs/show_bug.cgi?id=22248
+# https://llvm.org/bugs/show_bug.cgi?id=26226
+# IncrementalExecutor::executeFunction:
+#   symbol '__stack_chk_guard' unresolved while linking
+%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
+%endif
+
+%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
+       -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
+       -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
+       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
+       -Dgnuinstall:BOOL=ON \
+       -Dbuiltin_afterimage:BOOL=OFF \
+       -Dbuiltin_cfitsio:BOOL=OFF \
+       -Dbuiltin_davix:BOOL=OFF \
+       -Dbuiltin_fftw3:BOOL=OFF \
+       -Dbuiltin_freetype:BOOL=OFF \
+       -Dbuiltin_ftgl:BOOL=OFF \
+       -Dbuiltin_gl2ps:BOOL=OFF \
+       -Dbuiltin_glew:BOOL=OFF \
+       -Dbuiltin_gsl:BOOL=OFF \
+       -Dbuiltin_llvm:BOOL=ON \
+       -Dbuiltin_lzma:BOOL=OFF \
+       -Dbuiltin_openssl:BOOL=OFF \
+       -Dbuiltin_pcre:BOOL=OFF \
+       -Dbuiltin_tbb:BOOL=OFF \
+       -Dbuiltin_unuran:BOOL=OFF \
+       -Dbuiltin_xrootd:BOOL=OFF \
+       -Dbuiltin_zlib:BOOL=OFF \
+       -Dafdsmgrd:BOOL=OFF \
+       -Dafs:BOOL=OFF \
+       -Dalien:BOOL=OFF \
+       -Dasimage:BOOL=ON \
+       -Dastiff:BOOL=ON \
+       -Dbonjour:BOOL=ON \
+       -Dcastor:BOOL=OFF \
+       -Dccache:BOOL=OFF \
+       -Dchirp:BOOL=OFF \
+       -Dcling:BOOL=ON \
+       -Dcocoa:BOOL=OFF \
+%if %{?fedora}%{!?fedora:0} >= 24
+       -Dcxx14:BOOL=ON \
+%else
+       -Dcxx14:BOOL=OFF \
+%endif
+       -Ddavix:BOOL=ON \
+       -Ddcache:BOOL=ON \
+       -Dexceptions:BOOL=ON \
+       -Dexplicitlink:BOOL=ON \
+       -Dfftw3:BOOL=ON \
+       -Dfitsio:BOOL=ON \
+       -Dfortran:BOOL=ON \
+       -Dgdml:BOOL=ON \
+       -Dgenvector:BOOL=ON \
+%if %{oce}
+       -Dgeocad:BOOL=ON \
+%else
+       -Dgeocad:BOOL=OFF \
+%endif
+       -Dgfal:BOOL=ON \
+       -Dglite:BOOL=OFF \
+       -Dglobus:BOOL=ON \
+       -Dgsl_shared:BOOL=ON \
+       -Dgviz:BOOL=ON \
+%if %{hadoop}
+       -Dhdfs:BOOL=ON \
+%else
+       -Dhdfs:BOOL=OFF \
+%endif
+       -Dhttp:BOOL=ON \
+       -Djemalloc:BOOL=OFF \
+       -Dkrb5:BOOL=ON \
+       -Dldap:BOOL=ON \
+       -Dlibcxx:BOOL=OFF \
+       -Dmathmore:BOOL=ON \
+       -Dmemstat:BOOL=ON \
+       -Dminuit2:BOOL=ON \
+       -Dmonalisa:BOOL=OFF \
+       -Dmt:BOOL=ON \
+       -Dmysql:BOOL=ON \
+       -Dodbc:BOOL=ON \
+       -Dopengl:BOOL=ON \
+       -Doracle:BOOL=OFF \
+       -Dpch:BOOL=ON \
+       -Dpgsql:BOOL=ON \
+       -Dpythia6:BOOL=OFF \
+%if %{pythia8}
+       -Dpythia8:BOOL=ON \
+%else
+       -Dpythia8:BOOL=OFF \
+%endif
+       -Dpython:BOOL=ON \
+       -Dqt:BOOL=ON \
+       -Dqtgsi:BOOL=ON \
+       -Dr:BOOL=ON \
+       -Drfio:BOOL=ON \
+       -Droofit:BOOL=ON \
+       -Droot7:BOOL=OFF \
+       -Drpath:BOOL=OFF \
+%if %{ruby}
+       -Druby:BOOL=ON \
+%else
+       -Druby:BOOL=OFF \
+%endif
+       -Dsapdb:BOOL=OFF \
+       -Dshadowpw:BOOL=ON \
+       -Dshared:BOOL=ON \
+       -Dsoversion:BOOL=ON \
+       -Dsqlite:BOOL=ON \
+       -Dsrp:BOOL=OFF \
+       -Dssl:BOOL=ON \
+       -Dtable:BOOL=ON \
+       -Dtbb:BOOL=ON \
+       -Dtcmalloc:BOOL=OFF \
+       -Dthread:BOOL=ON \
+       -Dtmva:BOOL=ON \
+       -Dunuran:BOOL=ON \
+       -Dvc:BOOL=OFF \
+       -Dvdt:BOOL=ON \
+       -Dx11:BOOL=ON \
+       -Dxft:BOOL=ON \
+       -Dxml:BOOL=ON \
+%if %{xrootd}
+       -Dxrootd:BOOL=ON \
+%else
+       -Dxrootd:BOOL=OFF \
+%endif
+       -Dfail-on-missing:BOOL=ON \
+       -Dtesting:BOOL=ON \
+       ..
+
+# Build PyROOT for python 3 (prep)
+cp -pr bindings/pyroot bindings/python
+
+make %{?_smp_mflags}
+
+# Build PyROOT for python 3
+mkdir python
+mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
+sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
+    > CMakeFiles/Makefile2
+py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
+py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
+py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
+make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
+mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+
+popd
+
+%install
+pushd builddir
+make %{?_smp_mflags} install DESTDIR=%{buildroot}
+popd
+
+# Move python modules to the sitelib
+mkdir -p %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python_sitearch}
+
+mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
+
+rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
+mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
+
+# Do emacs byte compilation
+emacs -batch -no-site-file -f batch-byte-compile \
+    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
+
+# Install desktop entry and icon
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+
+cat > root.desktop << EOF
+[Desktop Entry]
+Name=Root
+GenericName=Root
+Comment=Numerical data analysis framework
+Exec=root
+Icon=root
+Terminal=true
+Type=Application
+MimeType=application/x-root;
+Categories=Utility;
+Encoding=UTF-8
+EOF
+
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+		     --vendor "" root.desktop
+install -p -m 644 build/package/debian/root-system-bin.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
+
+# Install mime type and icon
+mkdir -p %{buildroot}%{_datadir}/mime/packages
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
+install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
+    %{buildroot}%{_datadir}/mime/packages/root.xml
+install -p -m 644 build/package/debian/application-x-root.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
+
+# Init scripts for services
+mkdir -p %{buildroot}%{_initrddir}
+mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
+   %{buildroot}%{_initrddir}/proofd
+mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
+   %{buildroot}%{_initrddir}/rootd
+
+# Turn off services by default
+sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
+
+# The Python interface library is handled by alternatives
+mkdir -p %{buildroot}%{python_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
+   %{buildroot}%{python_sitearch}/libPyROOT.so
+
+mkdir -p %{buildroot}%{python3_sitearch}
+install builddir/python/libPyROOT.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
+
+%if %{ruby}
+# The Ruby interface library must be in two places
+mkdir -p %{buildroot}%{ruby_vendorarchdir}
+mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
+   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
+ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
+   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
+%endif
+
+# These should be in PATH
+mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
+
+# Avoid /usr/bin/env shebangs
+sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
+sed 's!/usr/bin/env python!/usr/bin/python!' \
+    -i %{buildroot}%{_bindir}/rootbrowse \
+       %{buildroot}%{_bindir}/rootcp \
+       %{buildroot}%{_bindir}/rooteventselector \
+       %{buildroot}%{_bindir}/rootls \
+       %{buildroot}%{_bindir}/rootmkdir \
+       %{buildroot}%{_bindir}/rootmv \
+       %{buildroot}%{_bindir}/rootprint \
+       %{buildroot}%{_bindir}/rootrm \
+       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
+       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
+
+# Remove some junk
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
+rm %{buildroot}%{_datadir}/%{name}/daemons/README
+rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
+rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
+rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
+rm %{buildroot}%{_datadir}/%{name}/root.desktop
+rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
+rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
+rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
+rm %{buildroot}%{_libdir}/%{name}/libminicern.a
+rm %{buildroot}%{_bindir}/setenvwrap.csh
+rm %{buildroot}%{_bindir}/setxrd*
+rm %{buildroot}%{_bindir}/thisroot*
+rm %{buildroot}%{_mandir}/man1/g2rootold.1
+rm %{buildroot}%{_mandir}/man1/genmap.1
+rm %{buildroot}%{_mandir}/man1/proofserva.1
+rm %{buildroot}%{_mandir}/man1/roota.1
+rm %{buildroot}%{_mandir}/man1/setup-pq2.1
+%if %{xrootd} == 0
+rm %{buildroot}%{_mandir}/man1/xproofd.1
+%endif
+rm %{buildroot}%{_includedir}/%{name}/*.cw
+rm %{buildroot}%{_includedir}/%{name}/*.pri
+rm %{buildroot}%{_includedir}/%{name}/proofdp.h
+rm %{buildroot}%{_includedir}/%{name}/rootdp.h
+rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
+rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
+rm %{buildroot}%{_pkgdocdir}/INSTALL
+rm %{buildroot}%{_pkgdocdir}/README.ALIEN
+rm %{buildroot}%{_pkgdocdir}/README.MONALISA
+
+# Remove mathtext and minicern references from cmake files
+sed -e 's/ mathtext / /' -e /mathtext/d \
+    -e 's/ minicern / /' -e /minicern/d \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
+    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
+
+# Only used on Windows
+rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
+
+# Remove plugin definitions for non-built and obsolete plugins
+pushd %{buildroot}%{_datadir}/%{name}/plugins
+rm TAFS/P010_TAFS.C
+rm TDataProgressDialog/P010_TDataProgressDialog.C
+rm TDataSetManager/P020_TDataSetManagerAliEn.C
+rm TFile/P030_TCastorFile.C
+rm TFile/P060_TChirpFile.C
+rm TFile/P070_TAlienFile.C
+%if %{hadoop} == 0
+rm TFile/P110_THDFSFile.C
+%endif
+rm TGLManager/P020_TGWin32GLManager.C
+rm TGLManager/P030_TGOSXGLManager.C
+rm TGrid/P010_TAlien.C
+rm TGrid/P020_TGLite.C
+rm TImagePlugin/P010_TASPluginGS.C
+rm TSQLServer/P030_TSapDBServer.C
+rm TSQLServer/P040_TOracleServer.C
+rm TSystem/P030_TAlienSystem.C
+%if %{hadoop} == 0
+rm TSystem/P060_THDFSSystem.C
+%endif
+rm TViewerX3D/P020_TQtViewerX3D.C
+rm TVirtualGLImp/P020_TGWin32GL.C
+rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
+rm TVirtualX/P030_TGWin32.C
+rm TVirtualX/P050_TGQuartz.C
+%if %{xrootd} == 0
+rm TFile/P100_TXNetFile.C
+rm TFileStager/P010_TXNetFileStager.C
+rm TProofMgr/P010_TXProofMgr.C
+rm TProofServ/P010_TXProofServ.C
+rm TSlave/P010_TXSlave.C
+rm TSystem/P040_TXNetSystem.C
+%endif
+rmdir TAFS
+rmdir TDataProgressDialog
+rmdir TGrid
+rmdir TImagePlugin
+popd
+
+# Create ldconfig configuration
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/%{name} > \
+     %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
+# Rename to avoid name clashes
+cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
+cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
+cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
+
+# Generate documentation
+pushd documentation/doxygen
+ln -s ../../files files
+sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
+    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
+    ROOTSYS=${PWD}/../../builddir \
+    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
+mv doc/html %{buildroot}%{_pkgdocdir}/html
+popd
+
+# Create includelist files ...
+for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
+    l=`tr / - <<< $l`
+    tmpdir=`mktemp -d`
+    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
+	sort | sed 's!^\.!!' > $l
+    rm -rf $tmpdir
+done
+
+# ... and merge some of them
+cat includelist-core-{[^mw],m[^au]}* > includelist-core
+cat includelist-geom-geom* > includelist-geom
+cat includelist-roofit-roo* > includelist-roofit
+cat includelist-gui-qt* > includelist-gui-qt
+cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
+cat includelist-gui-guihtml >> includelist-gui-gui
+cat includelist-io-xmlparser >> includelist-io-xml
+cat includelist-proof-proofplayer >> includelist-proof-proof
+cat includelist-net-netx* > includelist-netx
+
+%check
+pushd builddir
+pushd test
+ln -s ../../files files
+popd
+pushd runtutorials
+ln -s ../../files files
+popd
+# Exclude some tests that can not be run
+# - test-stressIOPlugins-*
+#   requires network access (by design since they test the remote file IO)
+# - tutorial-tree-run_h1analysis
+#   requires network access: http://root.cern.ch/files/h1/
+# - tutorial-r-*
+#   occasionally causes random crashes
+# - tutorial-multicore-mp*
+#   currently fails on ix86 and arm
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
+%ifarch %{ix86} %{arm}
+excluded="${excluded}|tutorial-multicore-mp.*"
+%endif
+make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
+popd
+
+%post
+touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+update-desktop-database >/dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
+    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+fi
+update-desktop-database >/dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+%post rootd
+/sbin/chkconfig --add rootd
+
+%preun rootd
+if [ $1 = 0 ] ; then
+    /sbin/service rootd stop >/dev/null 2>&1
+    /sbin/chkconfig --del rootd
+fi
+
+%postun rootd
+if [ "$1" -ge "1" ] ; then
+    /sbin/service rootd condrestart >/dev/null 2>&1 || :
+fi
+
+%post proofd
+/sbin/chkconfig --add proofd
+
+%preun proofd
+if [ $1 = 0 ] ; then
+    /sbin/service proofd stop >/dev/null 2>&1
+    /sbin/chkconfig --del proofd
+fi
+
+%postun proofd
+if [ "$1" -ge "1" ] ; then
+    /sbin/service proofd condrestart >/dev/null 2>&1 || :
+fi
+
+%post python
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
+/sbin/ldconfig
+
+%preun python
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python_sitearch}/libPyROOT.so
+fi
+
+%postun python -p /sbin/ldconfig
+
+%post %{python3pkg}
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+/sbin/ldconfig
+
+%preun %{python3pkg}
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
+fi
+
+%postun %{python3pkg} -p /sbin/ldconfig
+
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
+%post cling -p /sbin/ldconfig
+%postun cling -p /sbin/ldconfig
+%if %{ruby}
+%post ruby -p /sbin/ldconfig
+%postun ruby -p /sbin/ldconfig
+%endif
+%post r -p /sbin/ldconfig
+%postun r -p /sbin/ldconfig
+%post r-tools -p /sbin/ldconfig
+%postun r-tools -p /sbin/ldconfig
+%post genetic -p /sbin/ldconfig
+%postun genetic -p /sbin/ldconfig
+%post geom -p /sbin/ldconfig
+%postun geom -p /sbin/ldconfig
+%post gdml -p /sbin/ldconfig
+%postun gdml -p /sbin/ldconfig
+%if %{oce}
+%post geocad -p /sbin/ldconfig
+%postun geocad -p /sbin/ldconfig
+%endif
+%post graf -p /sbin/ldconfig
+%postun graf -p /sbin/ldconfig
+%post graf-asimage -p /sbin/ldconfig
+%postun graf-asimage -p /sbin/ldconfig
+%post graf-fitsio -p /sbin/ldconfig
+%postun graf-fitsio -p /sbin/ldconfig
+%post graf-gpad -p /sbin/ldconfig
+%postun graf-gpad -p /sbin/ldconfig
+%post graf-gviz -p /sbin/ldconfig
+%postun graf-gviz -p /sbin/ldconfig
+%post graf-postscript -p /sbin/ldconfig
+%postun graf-postscript -p /sbin/ldconfig
+%post graf-qt -p /sbin/ldconfig
+%postun graf-qt -p /sbin/ldconfig
+%post graf-x11 -p /sbin/ldconfig
+%postun graf-x11 -p /sbin/ldconfig
+%post graf3d -p /sbin/ldconfig
+%postun graf3d -p /sbin/ldconfig
+%post graf3d-eve -p /sbin/ldconfig
+%postun graf3d-eve -p /sbin/ldconfig
+%post graf3d-gl -p /sbin/ldconfig
+%postun graf3d-gl -p /sbin/ldconfig
+%post graf3d-gviz3d -p /sbin/ldconfig
+%postun graf3d-gviz3d -p /sbin/ldconfig
+%post graf3d-x3d -p /sbin/ldconfig
+%postun graf3d-x3d -p /sbin/ldconfig
+%post gui -p /sbin/ldconfig
+%postun gui -p /sbin/ldconfig
+%post gui-fitpanel -p /sbin/ldconfig
+%postun gui-fitpanel -p /sbin/ldconfig
+%post gui-ged -p /sbin/ldconfig
+%postun gui-ged -p /sbin/ldconfig
+%post guibuilder -p /sbin/ldconfig
+%postun guibuilder -p /sbin/ldconfig
+%post gui-qt -p /sbin/ldconfig
+%postun gui-qt -p /sbin/ldconfig
+%post gui-recorder -p /sbin/ldconfig
+%postun gui-recorder -p /sbin/ldconfig
+%post hbook -p /sbin/ldconfig
+%postun hbook -p /sbin/ldconfig
+%post hist -p /sbin/ldconfig
+%postun hist -p /sbin/ldconfig
+%post hist-painter -p /sbin/ldconfig
+%postun hist-painter -p /sbin/ldconfig
+%post spectrum -p /sbin/ldconfig
+%postun spectrum -p /sbin/ldconfig
+%post spectrum-painter -p /sbin/ldconfig
+%postun spectrum-painter -p /sbin/ldconfig
+%post hist-factory -p /sbin/ldconfig
+%postun hist-factory -p /sbin/ldconfig
+%post html -p /sbin/ldconfig
+%postun html -p /sbin/ldconfig
+%post io -p /sbin/ldconfig
+%postun io -p /sbin/ldconfig
+%post io-dcache -p /sbin/ldconfig
+%postun io-dcache -p /sbin/ldconfig
+%post io-gfal -p /sbin/ldconfig
+%postun io-gfal -p /sbin/ldconfig
+%if %{hadoop}
+%post io-hdfs -p /sbin/ldconfig
+%postun io-hdfs -p /sbin/ldconfig
+%endif
+%post io-rfio -p /sbin/ldconfig
+%postun io-rfio -p /sbin/ldconfig
+%post io-sql -p /sbin/ldconfig
+%postun io-sql -p /sbin/ldconfig
+%post io-xml -p /sbin/ldconfig
+%postun io-xml -p /sbin/ldconfig
+%post foam -p /sbin/ldconfig
+%postun foam -p /sbin/ldconfig
+%post fftw -p /sbin/ldconfig
+%postun fftw -p /sbin/ldconfig
+%post fumili -p /sbin/ldconfig
+%postun fumili -p /sbin/ldconfig
+%post genvector -p /sbin/ldconfig
+%postun genvector -p /sbin/ldconfig
+%post mathcore -p /sbin/ldconfig
+%postun mathcore -p /sbin/ldconfig
+%post mathmore -p /sbin/ldconfig
+%postun mathmore -p /sbin/ldconfig
+%post matrix -p /sbin/ldconfig
+%postun matrix -p /sbin/ldconfig
+%post minuit -p /sbin/ldconfig
+%postun minuit -p /sbin/ldconfig
+%post minuit2 -p /sbin/ldconfig
+%postun minuit2 -p /sbin/ldconfig
+%post mlp -p /sbin/ldconfig
+%postun mlp -p /sbin/ldconfig
+%post physics -p /sbin/ldconfig
+%postun physics -p /sbin/ldconfig
+%post quadp -p /sbin/ldconfig
+%postun quadp -p /sbin/ldconfig
+%post smatrix -p /sbin/ldconfig
+%postun smatrix -p /sbin/ldconfig
+%post splot -p /sbin/ldconfig
+%postun splot -p /sbin/ldconfig
+%post unuran -p /sbin/ldconfig
+%postun unuran -p /sbin/ldconfig
+%post memstat -p /sbin/ldconfig
+%postun memstat -p /sbin/ldconfig
+%post table -p /sbin/ldconfig
+%postun table -p /sbin/ldconfig
+%post montecarlo-eg -p /sbin/ldconfig
+%postun montecarlo-eg -p /sbin/ldconfig
+%if %{pythia8}
+%post montecarlo-pythia8 -p /sbin/ldconfig
+%postun montecarlo-pythia8 -p /sbin/ldconfig
+%endif
+%post montecarlo-vmc -p /sbin/ldconfig
+%postun montecarlo-vmc -p /sbin/ldconfig
+%post net -p /sbin/ldconfig
+%postun net -p /sbin/ldconfig
+%post net-rpdutils -p /sbin/ldconfig
+%postun net-rpdutils -p /sbin/ldconfig
+%post net-bonjour -p /sbin/ldconfig
+%postun net-bonjour -p /sbin/ldconfig
+%post net-auth -p /sbin/ldconfig
+%postun net-auth -p /sbin/ldconfig
+%post net-davix -p /sbin/ldconfig
+%postun net-davix -p /sbin/ldconfig
+%post net-globus -p /sbin/ldconfig
+%postun net-globus -p /sbin/ldconfig
+%post net-krb5 -p /sbin/ldconfig
+%postun net-krb5 -p /sbin/ldconfig
+%post net-ldap -p /sbin/ldconfig
+%postun net-ldap -p /sbin/ldconfig
+%post net-http -p /sbin/ldconfig
+%postun net-http -p /sbin/ldconfig
+%if %{xrootd}
+%post netx -p /sbin/ldconfig
+%postun netx -p /sbin/ldconfig
+%endif
+%post proof -p /sbin/ldconfig
+%postun proof -p /sbin/ldconfig
+%post proof-sessionviewer -p /sbin/ldconfig
+%postun proof-sessionviewer -p /sbin/ldconfig
+%if %{xrootd}
+%post xproof -p /sbin/ldconfig
+%postun xproof -p /sbin/ldconfig
+%endif
+%post roofit -p /sbin/ldconfig
+%postun roofit -p /sbin/ldconfig
+%post sql-mysql -p /sbin/ldconfig
+%postun sql-mysql -p /sbin/ldconfig
+%post sql-odbc -p /sbin/ldconfig
+%postun sql-odbc -p /sbin/ldconfig
+%post sql-sqlite -p /sbin/ldconfig
+%postun sql-sqlite -p /sbin/ldconfig
+%post sql-pgsql -p /sbin/ldconfig
+%postun sql-pgsql -p /sbin/ldconfig
+%post tmva -p /sbin/ldconfig
+%postun tmva -p /sbin/ldconfig
+%post tmva-python -p /sbin/ldconfig
+%postun tmva-python -p /sbin/ldconfig
+%post tmva-r -p /sbin/ldconfig
+%postun tmva-r -p /sbin/ldconfig
+%post tmva-gui -p /sbin/ldconfig
+%postun tmva-gui -p /sbin/ldconfig
+%post tree -p /sbin/ldconfig
+%postun tree -p /sbin/ldconfig
+%post tree-player -p /sbin/ldconfig
+%postun tree-player -p /sbin/ldconfig
+%post tree-viewer -p /sbin/ldconfig
+%postun tree-viewer -p /sbin/ldconfig
+
+%files
+%{_bindir}/hadd
+%{_bindir}/root
+%{_bindir}/root.exe
+%{_bindir}/rootn.exe
+%{_bindir}/roots
+%{_bindir}/roots.exe
+%{_bindir}/ssh2rpd
+%{_mandir}/man1/hadd.1*
+%{_mandir}/man1/root.1*
+%{_mandir}/man1/root.exe.1*
+%{_mandir}/man1/rootn.exe.1*
+%{_mandir}/man1/roots.exe.1*
+%{_mandir}/man1/ssh2rpd.1*
+%{_datadir}/applications/root.desktop
+%{_datadir}/icons/hicolor/48x48/apps/root.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
+%{_datadir}/mime/packages/root.xml
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitelispdir}/%{name}/*.el
+
+%files icons
+%{_datadir}/%{name}/icons
+
+%files fonts
+%{_datadir}/%{name}/fonts
+
+%files core -f includelist-core
+%{_bindir}/memprobe
+%{_bindir}/rlibmap
+%{_bindir}/rmkdepend
+%{_bindir}/root-config
+%{_mandir}/man1/memprobe.1*
+%{_mandir}/man1/rmkdepend.1*
+%{_mandir}/man1/root-config.1*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/libCore.*
+%{_libdir}/%{name}/libNew.*
+%{_libdir}/%{name}/libRint.*
+%{_libdir}/%{name}/libThread.*
+%{_libdir}/%{name}/lib*Dict.*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/allDict.cxx.pch
+%{_datadir}/%{name}/class.rules
+%{_datadir}/%{name}/gdb-backtrace.sh
+%{_datadir}/%{name}/helgrind-root.supp
+%{_datadir}/%{name}/Makefile.arch
+%{_datadir}/%{name}/root.mimes
+%{_datadir}/%{name}/system.rootauthrc
+%{_datadir}/%{name}/system.rootdaemonrc
+%{_datadir}/%{name}/system.rootrc
+%{_datadir}/%{name}/valgrind-root-python.supp
+%{_mandir}/man1/system.rootdaemonrc.1*
+%dir %{_datadir}/%{name}/cmake
+%{_datadir}/%{name}/cmake/*.cmake
+%dir %{_datadir}/%{name}/cmake/modules
+%{_datadir}/%{name}/cmake/modules/*.cmake
+%{_datadir}/%{name}/cmake/modules/*.cmake.in
+%dir %{_datadir}/%{name}/macros
+%{_datadir}/%{name}/macros/Dialogs.C
+%dir %{_datadir}/%{name}/plugins
+%dir %{_datadir}/%{name}/plugins/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/RConfigOptions.h
+%{_includedir}/%{name}/RConfigure.h
+%{_includedir}/%{name}/RGitCommit.h
+%{_includedir}/%{name}/compiledata.h
+%dir %{_includedir}/%{name}/Math
+%{_datadir}/aclocal/root.m4
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%dir %{_pkgdocdir}
+# CREDITS and LICENSE are used at runtime by the .credits and .license commands
+# They therefore should not be marked doc.
+%{_pkgdocdir}/CREDITS
+%{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/ReleaseNotes
+%license LICENSE
+
+%files multiproc -f includelist-core-multiproc
+%{_libdir}/%{name}/libMultiProc.*
+%{_libdir}/%{name}/libMultiProc_rdict.pcm
+
+%files cling
+%{_bindir}/genreflex
+%{_bindir}/rootcint
+%{_bindir}/rootcling
+%{_libdir}/%{name}/libCling.*
+%{_datadir}/%{name}/cling
+%{_datadir}/%{name}/dictpch
+%doc interpreter/cling/CREDITS.txt
+%doc interpreter/cling/README.md
+%license interpreter/cling/LICENSE.TXT
+%doc interpreter/llvm/src/llvm-CREDITS.TXT
+%doc interpreter/llvm/src/llvm-README.txt
+%license interpreter/llvm/src/llvm-LICENSE.TXT
+
+%files doc
+%doc %{_pkgdocdir}/html
+
+%files tutorial
+%doc %{_pkgdocdir}/test
+%doc %{_pkgdocdir}/tutorials
+
+%files proofd
+%{_bindir}/proofd
+%{_bindir}/proofserv
+%{_bindir}/proofserv.exe
+%{_bindir}/xpdtest
+%{_mandir}/man1/proofd.1*
+%{_mandir}/man1/proofserv.1*
+%{_mandir}/man1/xpdtest.1*
+%{_initrddir}/proofd
+
+%files rootd
+%{_bindir}/rootd
+%{_mandir}/man1/rootd.1*
+%{_initrddir}/rootd
+
+%files python -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python_sitearch}/libPyROOT.so
+%{python_sitearch}/ROOT.py*
+%{python_sitearch}/cppyy.py*
+%{python_sitearch}/_pythonization.py*
+
+%files %{python3pkg} -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_sitearch}/libPyROOT%{py3soabi}.so
+%{python3_sitearch}/ROOT.py
+%{python3_sitearch}/cppyy.py
+%{python3_sitearch}/_pythonization.py
+%{python3_sitearch}/__pycache__
+
+%if %{ruby}
+%files ruby -f includelist-bindings-ruby
+%{_libdir}/%{name}/libRuby.*
+%{_libdir}/%{name}/libRuby_rdict.pcm
+%{ruby_vendorarchdir}/libRuby.*
+%endif
+
+%files r -f includelist-bindings-r
+%{_libdir}/%{name}/libRInterface.*
+%{_libdir}/%{name}/libRInterface_rdict.pcm
+%doc bindings/r/doc/users-guide/*.md
+
+%files r-tools -f includelist-math-rtools
+%{_libdir}/%{name}/libRtools.*
+%{_libdir}/%{name}/libRtools_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
+
+%files genetic -f includelist-math-genetic
+%{_libdir}/%{name}/libGenetic.*
+%{_libdir}/%{name}/libGenetic_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
+
+%files geom -f includelist-geom
+%{_libdir}/%{name}/libGeom.*
+%{_libdir}/%{name}/libGeom_rdict.pcm
+%{_libdir}/%{name}/libGeomBuilder.*
+%{_libdir}/%{name}/libGeomBuilder_rdict.pcm
+%{_libdir}/%{name}/libGeomPainter.*
+%{_libdir}/%{name}/libGeomPainter_rdict.pcm
+%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
+%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
+%{_datadir}/%{name}/RadioNuclides.txt
+
+%files gdml -f includelist-geom-gdml
+%{_libdir}/%{name}/libGdml.*
+%{_libdir}/%{name}/libGdml_rdict.pcm
+
+%if %{oce}
+%files geocad -f includelist-geom-geocad
+%{_libdir}/%{name}/libGeoCad.*
+%{_libdir}/%{name}/libGeoCad_rdict.pcm
+%endif
+
+%files graf -f includelist-graf2d-graf
+%{_libdir}/%{name}/libGraf.*
+%{_libdir}/%{name}/libGraf_rdict.pcm
+%{_datadir}/%{name}/plugins/TMinuitGraph/P010_TGraph.C
+
+%files graf-asimage -f includelist-graf2d-asimage
+%{_libdir}/%{name}/libASImage.*
+%{_libdir}/%{name}/libASImage_rdict.pcm
+%{_libdir}/%{name}/libASImageGui.*
+%{_libdir}/%{name}/libASImageGui_rdict.pcm
+%{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
+%{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
+
+%files graf-fitsio -f includelist-graf2d-fitsio
+%{_libdir}/%{name}/libFITSIO.*
+%{_libdir}/%{name}/libFITSIO_rdict.pcm
+
+%files graf-gpad -f includelist-graf2d-gpad
+%{_libdir}/%{name}/libGpad.*
+%{_libdir}/%{name}/libGpad_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPad/P010_TPad.C
+
+%files graf-gviz -f includelist-graf2d-gviz
+%{_libdir}/%{name}/libGviz.*
+%{_libdir}/%{name}/libGviz_rdict.pcm
+
+%files graf-postscript -f includelist-graf2d-postscript
+%{_libdir}/%{name}/libPostscript.*
+%{_libdir}/%{name}/libPostscript_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPS/P010_TPostScript.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P020_TSVG.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P030_TPDF.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
+%{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
+
+%files graf-qt -f includelist-graf2d-qt
+%{_libdir}/%{name}/libGQt.*
+%{_libdir}/%{name}/libGQt_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
+
+%files graf-x11 -f includelist-graf2d-x11
+%{_libdir}/%{name}/libGX11.*
+%{_libdir}/%{name}/libGX11_rdict.pcm
+%{_libdir}/%{name}/libGX11TTF.*
+%{_libdir}/%{name}/libGX11TTF_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualX/P010_TGX11.C
+%{_datadir}/%{name}/plugins/TVirtualX/P020_TGX11TTF.C
+
+%files graf3d -f includelist-graf3d-g3d
+%{_libdir}/%{name}/libGraf3d.*
+%{_libdir}/%{name}/libGraf3d_rdict.pcm
+%{_datadir}/%{name}/plugins/TView/P010_TView3D.C
+
+%files graf3d-eve -f includelist-graf3d-eve
+%{_libdir}/%{name}/libEve.*
+%{_libdir}/%{name}/libEve_rdict.pcm
+
+%files graf3d-gl -f includelist-graf3d-gl
+%{_libdir}/%{name}/libRGL.*
+%{_libdir}/%{name}/libRGL_rdict.pcm
+%{_datadir}/%{name}/plugins/TGLHistPainter/P010_TGLHistPainter.C
+%{_datadir}/%{name}/plugins/TGLManager/P010_TX11GLManager.C
+%{_datadir}/%{name}/plugins/TVirtualGLImp/P010_TX11GL.C
+%{_datadir}/%{name}/plugins/TVirtualPadPainter/P010_TGLPadPainter.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P020_TGLSAViewer.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P030_TGLViewer.C
+
+%files graf3d-gviz3d -f includelist-graf3d-gviz3d
+%{_libdir}/%{name}/libGviz3d.*
+%{_libdir}/%{name}/libGviz3d_rdict.pcm
+
+%files graf3d-x3d -f includelist-graf3d-x3d
+%{_libdir}/%{name}/libX3d.*
+%{_libdir}/%{name}/libX3d_rdict.pcm
+%{_datadir}/%{name}/plugins/TViewerX3D/P010_TViewerX3D.C
+%{_datadir}/%{name}/plugins/TVirtualViewer3D/P010_TVirtualViewerX3D.C
+
+%files gui -f includelist-gui-gui
+%{_libdir}/%{name}/libGui.*
+%{_libdir}/%{name}/libGui_rdict.pcm
+%{_libdir}/%{name}/libGuiHtml.*
+%{_libdir}/%{name}/libGuiHtml_rdict.pcm
+%{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
+%{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
+%{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
+%{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
+
+%files gui-fitpanel -f includelist-gui-fitpanel
+%{_libdir}/%{name}/libFitPanel.*
+%{_libdir}/%{name}/libFitPanel_rdict.pcm
+%{_datadir}/%{name}/plugins/TFitEditor/P010_TFitEditor.C
+
+%files gui-ged -f includelist-gui-ged
+%{_libdir}/%{name}/libGed.*
+%{_libdir}/%{name}/libGed_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
+
+%files guibuilder -f includelist-gui-guibuilder
+%{_libdir}/%{name}/libGuiBld.*
+%{_libdir}/%{name}/libGuiBld_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
+%{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
+
+%files gui-qt -f includelist-gui-qt
+%{_libdir}/%{name}/libQtRoot.*
+%{_libdir}/%{name}/libQtRoot_rdict.pcm
+%{_libdir}/%{name}/libQtGSI.*
+%{_libdir}/%{name}/libQtGSI_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
+
+%files gui-recorder -f includelist-gui-recorder
+%{_libdir}/%{name}/libRecorder.*
+%{_libdir}/%{name}/libRecorder_rdict.pcm
+
+%files hbook -f includelist-hist-hbook
+%{_bindir}/g2root
+%{_bindir}/h2root
+%{_mandir}/man1/g2root.1*
+%{_mandir}/man1/h2root.1*
+%{_libdir}/%{name}/libHbook.*
+%{_libdir}/%{name}/libHbook_rdict.pcm
+
+%files hist -f includelist-hist-hist
+%{_libdir}/%{name}/libHist.*
+%{_libdir}/%{name}/libHist_rdict.pcm
+
+%files hist-painter -f includelist-hist-histpainter
+%{_libdir}/%{name}/libHistPainter.*
+%{_libdir}/%{name}/libHistPainter_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualHistPainter/P010_THistPainter.C
+%{_datadir}/%{name}/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
+
+%files spectrum -f includelist-hist-spectrum
+%{_libdir}/%{name}/libSpectrum.*
+%{_libdir}/%{name}/libSpectrum_rdict.pcm
+
+%files spectrum-painter -f includelist-hist-spectrumpainter
+%{_libdir}/%{name}/libSpectrumPainter.*
+%{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
+
+%files hist-factory -f includelist-roofit-histfactory
+%{_bindir}/hist2workspace
+%{_bindir}/prepareHistFactory
+%{_mandir}/man1/hist2workspace.1*
+%{_mandir}/man1/prepareHistFactory.1*
+%{_libdir}/%{name}/libHistFactory.*
+%{_libdir}/%{name}/libHistFactory_rdict.pcm
+%{_datadir}/%{name}/HistFactorySchema.dtd
+%dir %{_includedir}/%{name}/RooStats/HistFactory
+%doc roofit/histfactory/doc/README
+
+%files html -f includelist-html
+%{_libdir}/%{name}/libHtml.*
+%{_libdir}/%{name}/libHtml_rdict.pcm
+%{_datadir}/%{name}/html
+
+%files io -f includelist-io-io
+%{_libdir}/%{name}/libRIO.*
+%{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
+%{_datadir}/%{name}/plugins/TVirtualStreamerInfo/P010_TStreamerInfo.C
+
+%files io-dcache -f includelist-io-dcache
+%{_libdir}/%{name}/libDCache.*
+%{_libdir}/%{name}/libDCache_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
+%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
+
+%files io-gfal -f includelist-io-gfal
+%{_libdir}/%{name}/libGFAL.*
+%{_libdir}/%{name}/libGFAL_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+
+%if %{hadoop}
+%files io-hdfs -f includelist-io-hdfs
+%{_libdir}/%{name}/libHDFS.*
+%{_libdir}/%{name}/libHDFS_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
+%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
+%endif
+
+%files io-rfio -f includelist-io-rfio
+%{_libdir}/%{name}/libRFIO.*
+%{_libdir}/%{name}/libRFIO_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
+%{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
+
+%files io-sql -f includelist-io-sql
+%{_libdir}/%{name}/libSQLIO.*
+%{_libdir}/%{name}/libSQLIO_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
+
+%files io-xml -f includelist-io-xml
+%{_libdir}/%{name}/libXMLIO.*
+%{_libdir}/%{name}/libXMLIO_rdict.pcm
+%{_libdir}/%{name}/libXMLParser.*
+%{_libdir}/%{name}/libXMLParser_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
+
+%files foam -f includelist-math-foam
+%{_libdir}/%{name}/libFoam.*
+%{_libdir}/%{name}/libFoam_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P020_TFoamSampler.C
+
+%files fftw -f includelist-math-fftw
+%{_libdir}/%{name}/libFFTW.*
+%{_libdir}/%{name}/libFFTW_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualFFT/P010_TFFTComplex.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P020_TFFTComplexReal.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P030_TFFTRealComplex.C
+%{_datadir}/%{name}/plugins/TVirtualFFT/P040_TFFTReal.C
+
+%files fumili -f includelist-math-fumili
+%{_libdir}/%{name}/libFumili.*
+%{_libdir}/%{name}/libFumili_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P070_TFumiliMinimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P020_TFumili.C
+
+%files genvector -f includelist-math-genvector
+%{_libdir}/%{name}/libGenVector.*
+%{_libdir}/%{name}/libGenVector_rdict.pcm
+%{_libdir}/%{name}/libGenVector32.rootmap
+%{_libdir}/%{name}/libGenVector_G__GenVector32_rdict.pcm
+%dir %{_includedir}/%{name}/Math/GenVector
+
+%files mathcore -f includelist-math-mathcore
+%{_libdir}/%{name}/libMathCore.*
+%{_libdir}/%{name}/libMathCore_rdict.pcm
+%dir %{_includedir}/%{name}/Fit
+
+%files mathmore -f includelist-math-mathmore
+%{_libdir}/%{name}/libMathMore.*
+%{_libdir}/%{name}/libMathMore_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P010_Brent.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P020_Bisection.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P030_FalsePos.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P040_Newton.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P050_Secant.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@IRootFinderMethod/P060_Steffenson.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P030_GSLMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P040_GSLNLSMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P050_GSLSimAnMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P010_GSLIntegrator.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@VirtualIntegrator/P020_GSLMCIntegrator.C
+
+%files matrix -f includelist-math-matrix
+%{_libdir}/%{name}/libMatrix.*
+%{_libdir}/%{name}/libMatrix_rdict.pcm
+
+%files minuit -f includelist-math-minuit
+%{_libdir}/%{name}/libMinuit.*
+%{_libdir}/%{name}/libMinuit_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P020_TMinuitMinimizer.C
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P060_TLinearMinimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P010_TFitter.C
+
+%files minuit2 -f includelist-math-minuit2
+%{_libdir}/%{name}/libMinuit2.*
+%{_libdir}/%{name}/libMinuit2_rdict.pcm
+%dir %{_includedir}/%{name}/Minuit2
+%{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
+%{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
+
+%files mlp -f includelist-math-mlp
+%{_libdir}/%{name}/libMLP.*
+%{_libdir}/%{name}/libMLP_rdict.pcm
+
+%files physics -f includelist-math-physics
+%{_libdir}/%{name}/libPhysics.*
+%{_libdir}/%{name}/libPhysics_rdict.pcm
+
+%files quadp -f includelist-math-quadp
+%{_libdir}/%{name}/libQuadp.*
+%{_libdir}/%{name}/libQuadp_rdict.pcm
+
+%files smatrix -f includelist-math-smatrix
+%{_libdir}/%{name}/libSmatrix.*
+%{_libdir}/%{name}/libSmatrix_rdict.pcm
+%{_libdir}/%{name}/libSmatrix32.rootmap
+%{_libdir}/%{name}/libSmatrix_G__Smatrix32_rdict.pcm
+
+%files splot -f includelist-math-splot
+%{_libdir}/%{name}/libSPlot.*
+%{_libdir}/%{name}/libSPlot_rdict.pcm
+
+%files unuran -f includelist-math-unuran
+%{_libdir}/%{name}/libUnuran.*
+%{_libdir}/%{name}/libUnuran_rdict.pcm
+%{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
+
+%files vdt -f includelist-math-vdt
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/vdt
+%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
+%license math/vdt/Licence.md
+
+%files memstat -f includelist-misc-memstat
+%{_libdir}/%{name}/libMemStat.*
+%{_libdir}/%{name}/libMemStat_rdict.pcm
+
+%files table -f includelist-misc-table
+%{_libdir}/%{name}/libTable.*
+%{_libdir}/%{name}/libTable_rdict.pcm
+
+%files montecarlo-eg -f includelist-montecarlo-eg
+%{_libdir}/%{name}/libEG.*
+%{_libdir}/%{name}/libEG_rdict.pcm
+%{_datadir}/%{name}/pdg_table.txt
+%doc %{_pkgdocdir}/cfortran.doc
+
+%if %{pythia8}
+%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
+%{_libdir}/%{name}/libEGPythia8.*
+%{_libdir}/%{name}/libEGPythia8_rdict.pcm
+%endif
+
+%files montecarlo-vmc -f includelist-montecarlo-vmc
+%{_libdir}/%{name}/libVMC.*
+%{_libdir}/%{name}/libVMC_rdict.pcm
+%{_datadir}/%{name}/vmc
+
+%files net -f includelist-net-net
+%{_libdir}/%{name}/libNet.*
+%{_libdir}/%{name}/libNet_rdict.pcm
+%{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
+%{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
+%{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
+%{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
+%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
+%{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
+%{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
+%{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
+%{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
+
+%files net-rpdutils -f includelist-net-rpdutils
+%{_libdir}/%{name}/libSrvAuth.*
+
+%files net-bonjour -f includelist-net-bonjour
+%{_libdir}/%{name}/libBonjour.*
+%{_libdir}/%{name}/libBonjour_rdict.pcm
+
+%files net-auth -f includelist-net-auth
+%{_libdir}/%{name}/libRootAuth.*
+%{_libdir}/%{name}/libRootAuth_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualAuth/P010_TRootAuth.C
+%doc %{_pkgdocdir}/README.AUTH
+
+%files net-davix -f includelist-net-davix
+%{_libdir}/%{name}/libRDAVIX.*
+%{_libdir}/%{name}/libRDAVIX_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
+%{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
+
+%files net-globus
+%{_libdir}/%{name}/libGlobusAuth.*
+%doc %{_pkgdocdir}/README.GLOBUS
+
+%files net-krb5 -f includelist-net-krb5auth
+%{_libdir}/%{name}/libKrb5Auth.*
+%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
+
+%files net-ldap -f includelist-net-ldap
+%{_libdir}/%{name}/libRLDAP.*
+%{_libdir}/%{name}/libRLDAP_rdict.pcm
+
+%files net-http -f includelist-net-http
+%{_libdir}/%{name}/libRHTTP.*
+%{_libdir}/%{name}/libRHTTP_rdict.pcm
+%{_datadir}/%{name}/http
+%doc net/http/README.txt net/http/civetweb/*.md
+
+%if %{xrootd}
+%files netx -f includelist-netx
+%{_libdir}/%{name}/libNetx.*
+%{_libdir}/%{name}/libNetx_rdict.pcm
+%{_libdir}/%{name}/libNetxNG.*
+%{_libdir}/%{name}/libNetxNG_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
+%{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
+%{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
+%endif
+
+%files proof -f includelist-proof-proof
+%{_libdir}/%{name}/libProof.*
+%{_libdir}/%{name}/libProof_rdict.pcm
+%{_libdir}/%{name}/libProofDraw.*
+%{_libdir}/%{name}/libProofDraw_rdict.pcm
+%{_libdir}/%{name}/libProofPlayer.*
+%{_libdir}/%{name}/libProofPlayer_rdict.pcm
+%{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
+%{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
+%{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
+%{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
+%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
+%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
+%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
+%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
+%{_datadir}/%{name}/valgrind-root.supp
+%doc %{_pkgdocdir}/README.PROOF
+
+%files proof-bench -f includelist-proof-proofbench
+%{_libdir}/%{name}/libProofBench.*
+%{_libdir}/%{name}/libProofBench_rdict.pcm
+%{_datadir}/%{name}/proof
+
+%files proof-pq2 -f includelist-proof-pq2
+%{_bindir}/pq2*
+%{_mandir}/man1/pq2*.1*
+
+%files proof-sessionviewer -f includelist-gui-sessionviewer
+%{_libdir}/%{name}/libSessionViewer.*
+%{_libdir}/%{name}/libSessionViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
+%{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
+%{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
+
+%if %{xrootd}
+%files xproof -f includelist-proof-proofx
+%{_bindir}/proofexecv
+%{_bindir}/xproofd
+%{_mandir}/man1/xproofd.1*
+%{_libdir}/%{name}/libProofx.*
+%{_libdir}/%{name}/libProofx_rdict.pcm
+%{_libdir}/%{name}/libXrdProofd.*
+%{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
+%{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
+%{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
+%endif
+
+%files roofit -f includelist-roofit
+%{_libdir}/%{name}/libRooFit.*
+%{_libdir}/%{name}/libRooFit_rdict.pcm
+%{_libdir}/%{name}/libRooFitCore.*
+%{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%{_libdir}/%{name}/libRooStats.*
+%{_libdir}/%{name}/libRooStats_rdict.pcm
+%dir %{_includedir}/%{name}/RooStats
+
+%files sql-mysql -f includelist-sql-mysql
+%{_libdir}/%{name}/libRMySQL.*
+%{_libdir}/%{name}/libRMySQL_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
+
+%files sql-odbc -f includelist-sql-odbc
+%{_libdir}/%{name}/libRODBC.*
+%{_libdir}/%{name}/libRODBC_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
+
+%files sql-sqlite -f includelist-sql-sqlite
+%{_libdir}/%{name}/libRSQLite.*
+%{_libdir}/%{name}/libRSQLite_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
+
+%files sql-pgsql -f includelist-sql-pgsql
+%{_libdir}/%{name}/libPgSQL.*
+%{_libdir}/%{name}/libPgSQL_rdict.pcm
+%{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
+
+%files tmva -f includelist-tmva-tmva
+%{_libdir}/%{name}/libTMVA.*
+%{_libdir}/%{name}/libTMVA_rdict.pcm
+%dir %{_includedir}/%{name}/TMVA
+%license tmva/doc/LICENSE
+
+%files tmva-python -f includelist-tmva-pymva
+%{_libdir}/%{name}/libPyMVA.*
+%{_libdir}/%{name}/libPyMVA_rdict.pcm
+
+%files tmva-r -f includelist-tmva-rmva
+%{_libdir}/%{name}/libRMVA.*
+%{_libdir}/%{name}/libRMVA_rdict.pcm
+
+%files tmva-gui -f includelist-tmva-tmvagui
+%{_libdir}/%{name}/libTMVAGui.*
+%{_libdir}/%{name}/libTMVAGui_rdict.pcm
+
+%files tree -f includelist-tree-tree
+%{_libdir}/%{name}/libTree.*
+%{_libdir}/%{name}/libTree_rdict.pcm
+%doc %{_pkgdocdir}/README.SELECTOR
+
+%files tree-player -f includelist-tree-treeplayer
+%{_libdir}/%{name}/libTreePlayer.*
+%{_libdir}/%{name}/libTreePlayer_rdict.pcm
+%{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
+%{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
+
+%files tree-viewer -f includelist-tree-treeviewer
+%{_libdir}/%{name}/libTreeViewer.*
+%{_libdir}/%{name}/libTreeViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
+
+%files cli
+%{_bindir}/rootbrowse
+%{_bindir}/rootcp
+%{_bindir}/rooteventselector
+%{_bindir}/rootls
+%{_bindir}/rootmkdir
+%{_bindir}/rootmv
+%{_bindir}/rootprint
+%{_bindir}/rootrm
+%{python_sitelib}/cmdLineUtils.py*
+
+%files notebook
+%{_bindir}/rootnb.exe
+%{_datadir}/%{name}/notebook
+
+%files rootaas
+%{python_sitelib}/ROOTaaS
+
+%changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Mon Jul 18 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-2
+- Add requires on redhat-rpm-config to root-cling
+
+* Sun Jul 10 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-1
+- Update to 6.06.06
+- Drop patches root-gfal2.patch and root-keysymbols.patch
+- Make root-vdt package noarch
+
+* Sun Jun 19 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-4
+- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport)
+- Minor updates to patches - mostly backported from upstream
+- Reenable hadoop/hdfs support for F24+
+
+* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
+- Remove mathtext and minicern references from cmake files
+- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
+
+* Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
+- Disable hadoop/hdfs support for F24+ (hadoop was retired)
+
+* Mon May 09 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-1
+- Update to 6.06.04
+- Drop patch root-no-hexfloat-const.patch
+- Add requires on gcc-c++ to root-cling
+
+* Fri Apr 15 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-2
+- Rebuild for OCE-0.17.1
+
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.02-1
+- Update to 6.06.02 (F24+, EPEL7)
+- Change to cmake configuration (was using ./configure)
+- Change to doxygen documentation generation (was using THTML)
+- Run the test suite
+- Remove compatibility with older EPEL (Group tags, BuildRoot tag, etc.)
+- New sub-packages: root-multiproc, root-cling, root-r, root-r-tools,
+  root-geocad, root-tmva-python, root-tmva-r, root-tmva-gui, root-cli,
+  root-notebook and root-rootaas
+- New subpackage for EPEL7: root-python34
+- Dropped sub-packages: root-cint, root-reflex, root-cintex, root-ruby
+
+* Fri Apr 08 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.36-1
+- Update to 5.34.36
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.34.32-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.32-8
+- Rebuild again for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 5.34.32-7
+- Rebuild for glew 1.13
+
+* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 5.34.32-6
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Tue Nov 17 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-5
+- Adapt to gfal 2.10 - uses a different #define
+- Exclude ppc64le - has the same issues with cint as ppc and ppc64
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Fri Sep 25 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-3
+- Add versioned dependencies between packages
+- Reenable hadoop/hdfs support for F23+
+
+* Wed Sep 16 2015 David Abdurachmanov <davidlt@cern.ch> - 5.34.32-2
+- Disable run-time dependency on gccxml in Reflex (allows installing on aarch64) (#1263206)
+- Enable Cintex on aarch64
+
+* Thu Jul 02 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.32-1
+- Update to 5.34.32
+- New sub-package: root-fonts (STIX version 0.9 required by TMathText)
+- Use GNU Free instead of Liberation, works better with TMathText
+- Fix segfault when embedding Type 1 fonts
+- Drop patch root-no-extra-formats.patch (workaround for above problem)
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
+- Update to 5.34.30
+- New sub-package: root-python3
+- Disable hadoop/hdfs support for F23+ (not installable)
+- Drop previously backported gcc 5 patches
+
+* Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
+- Update to 5.34.28
+- Merge emacs support files into main package (guidelines updated)
+
+* Tue Feb 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.26-1
+- Update to 5.34.26
+- Drop patch root-xrdversion.patch
+
+* Thu Jan 29 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-3
+- Rebuild with fixed cairo (bz 1183242)
+
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.34.24-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Fri Dec 19 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.24-1
+- Update to 5.34.24
+- Drop patch root-bsd-misc.patch
+
+* Thu Aug 28 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-2
+- Move xproofd binaries from root-proofd to root-xproof
+- Adjust EPEL 7 font dependencies
+- Rebuild using new binutils (ld bug fixed - F21+)
+
+* Wed Aug 20 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.20-1
+- Update to 5.34.20
+- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4)
+- Do not depend on wine's fonts
+- Drop patch root-gccopt.patch
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jul 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.19-1
+- Update to 5.34.19
+- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4)
+- New sub-package: root-net-http
+- Drop patches root-thtml-revert.patch, root-gfal2.patch and
+  root-proofx-link-iolib.patch
+
+* Mon Jun 30 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-4
+- Add Requires on root-tree-player to root-gui-ged
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
+- Rebuild for ruby 2.1
+- Fix build failure on F21 (missing symbol in libProofx linking)
+
+* Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
+- Update to 5.34.18
+- Build GFAL module using libgfal2
+- New sub-package: root-vdt
+
+* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
+- Update to 5.34.17
+
+* Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
+- Update to 5.34.15
+- Drop patch root-davix.patch
+
+* Thu Jan 09 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-3
+- Rebuild for cfitsio 3.360
+
+* Mon Dec 23 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-2
+- Adapt to davix >= 0.2.8
+
+* Thu Dec 19 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.14-1
+- Update to 5.34.14
+- New sub-package: root-net-davix
+- Drop patch root-pythia8-incdir.patch
+
+* Tue Dec 03 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.13-1
+- Update to 5.34.13
+- Remove java-devel build dependency (not needed with Fedora's libhdfs)
+- Adapt to pythia8 >= 8.1.80
+
+* Mon Nov 25 2013 Orion Poplawski <orion@cora.nwra.com> - 5.34.10-3
+- Fix hadoop lib location
+
+* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 5.34.10-2
+- rebuilt for GLEW 1.10
+
+* Mon Sep 09 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.10-1
+- Update to 5.34.10
+- New sub-package: root-io-hdfs (Fedora 20+)
+- New sub-package: root-sql-sqlite
+
+* Thu Aug 08 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-5
+- Exclude armv7hl - cint is not working
+- Use _pkgdocdir when defined
+- Use texlive-stix
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.09-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 5.34.09-3
+- Perl 5.18 rebuild
+
+* Tue Jul 16 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-2
+- Rebuild for cfitsio 3.350
+
+* Fri Jun 28 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.09-1
+- Update to 5.34.09
+- New sub-package: root-montecarlo-pythia8
+- Drop patch root-gfal-bits.patch
+- Use xz compression for source tarfile
+- Update ancient root version in EPEL
+
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.07-1
+- Update to 5.34.07
+
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.06-1
+- Update to 5.34.06
+- Drop patches root-gviz.patch, root-ruby-version.patch,
+  root-rev48681.patch and root-rev48831.patch
+
+* Wed Mar 20 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-2
+- Rebuild for ruby 2.0
+- Rebuild for cfitsio 3.340
+
+* Wed Feb 27 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.05-1
+- Update to 5.34.05
+- Rebuild for xrootd 3.3
+- Patch for latest graphviz (libcgraph)
+- Drop patches root-glibc.patch and root-tclass-fix.patch
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34.02-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 5.34.02-2
+- Rebuild for glew 1.9.0
+
+* Fri Oct 12 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.02-1
+- Update to 5.34.02
+
+* Sat Jul 28 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-2
+- Rebuild for glew 1.7
+
+* Tue Jul 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.01-1
+- Update to 5.34.01
+- Remove sub-packages root-clarens and root-peac (dropped by upstream)
+
+* Thu Jul 05 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-2
+- Do the glibc 2.16 patch properly
+
+* Sat Jun 09 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.00-1
+- Update to 5.34.00
+- New sub-package: root-io-gfal
+
+* Thu May 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.03-1
+- Update to 5.32.03
+
+* Thu Mar 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.02-1
+- Update to 5.32.02
+
+* Sat Mar 17 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-2
+- Rebuild for xrootd 3.1.1
+
+* Sat Mar 03 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.01-1
+- Update to 5.32.01
+- Drop patches fixed upstream
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.32.00-3
+- Rebuilt for c++ ABI breakage
+
+* Tue Feb 14 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-2
+- Adapt to new ruby packaging guidelines
+
+* Fri Feb 10 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.32.00-1
+- Update to 5.32.00
+
+* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 5.30.04-3
+- Rebuild against PCRE 8.30
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.30.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
+- Update to 5.30.04
+
+* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.03-1
+- Update to 5.30.03
+
+* Fri Sep 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.02-1
+- Update to 5.30.02
+
+* Thu Aug 18 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.01-1
+- Update to 5.30.01
+- Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
+
+* Wed Aug 17 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-3
+- Backport upstream's fix for the i686 rootcint problem
+
+* Tue Jul 26 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-2
+- Add workaround for rootcint problem on i686
+- Pass default LDFLAGS (relro) to make
+
+* Sun Jul 24 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.00-1
+- Update to 5.30.00
+- Drop patch root-listbox-height.patch
+- New sub-package: root-proof-bench
+
+* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-2
+- Change build requires from qt-devel to qt4-devel
+
+* Wed Jun 29 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00e-1
+- Update to 5.28.00e
+
+* Mon Jun 20 2011 ajax@redhat.com - 5.28.00d-2
+- Rebuild for new glew soname
+
+* Fri May 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00d-1
+- Update to 5.28.00d
+
+* Mon May 02 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1.1
+- Fix emacs Requires on RHEL5
+
+* Thu Apr 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1
+- Update to 5.28.00c
+
+* Wed Mar 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-2
+- Rebuild for mysql 5.5.10
+
+* Sat Mar 19 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-1
+- Update to 5.28.00b
+
+* Mon Feb 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00a-1
+- Update to 5.28.00a
+- Drop patches fixed upstream: root-afterimage.patch, root-htmldoc.patch,
+  root-xlibs-ppc.patch, root-cstddef.patch
+- Remove the fedpkg workaround - no longer needed
+
+* Sat Feb 12 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-4
+- Add workaround for changes in fedpkg
+
+* Thu Feb 10 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-3
+- Add Requires on root-graf-postscript to root-gpad
+- Require libAfterImage 1.20 or later to fix issues with circular markers in
+  batch mode
+- Add python26 subpackage for EPEL 5
+- Fix an issue where the last item in a TGFontTypeComboBox is almost
+  invisible (backported from upstream)
+- Add missing cstddef includes for gcc 4.6
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.28.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 14 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1.1
+- Fix linking of Xlibs on ppc
+
+* Wed Dec 15 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00-1
+- Update to 5.28.00
+- Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch,
+  root-missing-explicit-link.patch, root-split-latex.patch,
+  root-cern-filename.patch, root-make-3.82.patch,
+  root-fonttype-combobox-dtor.patch
+- New sub-packages: root-genetic, root-graf-fitsio, root-hist-factory,
+  root-proof-pq2
+- Make root-io a separate package again - the circular dependency with the
+  root-core package was resolved upstream
+
+* Fri Nov 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-3
+- Fix crash in TGFontTypeComboBox destructor
+- Add Requires on root-gui-ged to root-gui
+
+* Mon Nov 01 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-2
+- Rebuild for updated unuran
+
+* Fri Oct 22 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00e-1
+- Update to 5.26.00e
+- Drop patch fixed upstream: root-tmva-segfault.patch
+- Add Requires on root-proof to root-proofd
+
+* Sat Oct 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-3
+- Add Requires on root-graf-asimage to root-core
+- Add Requires on root-graf-x11 to root-gui
+- Add Requires on root-hist-painter to root-hist
+- Add Requires on root-minuit to root-mathcore
+- Add Requires on krb5-workstation to root-net-krb5
+- Add BuildRequires on krb5-workstation
+
+* Mon Aug 30 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-2
+- Adapt makefile to changes in make 3.82
+
+* Fri Aug 27 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00d-1
+- Update to 5.26.00d
+- Improved doc generation script
+
+* Mon Aug 02 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-4
+- Don't remove the prec_stl directory
+- Create a separate tutorial package for the tutorial and test suite
+
+* Thu Jul 29 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-3
+- Correct license tags for: cint, core and roofit
+- Regenerate source tarball due to upstream retag (again)
+
+* Fri Jul 16 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-2
+- Add dependency on gccxml for globus-reflex
+- Split some packages to break circular package dependencies
+- Merge libRIO into root-core
+- Regenerate source tarball due to upstream retag
+
+* Mon Jul 12 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-1
+- Update to 5.26.00c
+- Disable cint7 package - no longer compiles and has been deprecated upstream
+
+* Wed Jun 09 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-3
+- Use external xrootd
+- Make documentation selfcontained - can be read without network access
+
+* Wed May 19 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-2
+- Fix library detection when linker scripts are used
+- Allow building RFIO IO modules using DPM's RFIO implementation
+
+* Sat Mar 20 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00b-1
+- Update to 5.26.00b
+- Enable dCache support - dcap library is now in Fedora
+- Use system unuran library instead of embedded sources
+
+* Mon Feb  1 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
+- Update to 5.26.00a
+- Disable cintex package for non-intel architectures
+- Remove embedded gl2ps sources
+
+* Wed Jan 13 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00-1
+- Update to 5.26.00
+- Drop patches fixed upstream: root-globus.patch, root-dot-png.patch,
+  root-loadmeta.patch, root-openssl.patch, root-hash-endian.patch
+
+* Fri Nov 27 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.24.00b-1
+- Initial build
diff --git a/sources b/sources
new file mode 100644
index 0000000..5330ee7
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
+7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From 4d7d87d75fb8a3c10638add9792c56c0ee420aef Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 14 Aug 2016 06:40:11 +0200
Subject: [PATCH 094/344] Convert init scripts to systemd unit files

---
 proofd.service        |  12 +++++
 root-fontconfig.patch | 112 ++++++++++++++++++++++++++----------------
 root.spec             |  73 +++++++++++++--------------
 rootd.service         |  12 +++++
 4 files changed, 131 insertions(+), 78 deletions(-)
 create mode 100644 proofd.service
 create mode 100644 rootd.service

diff --git a/proofd.service b/proofd.service
new file mode 100644
index 0000000..4972553
--- /dev/null
+++ b/proofd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=PROOF (The Parallel ROOT Facility)
+Documentation=man:proofd(8)
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/proofd
+ExecStart=/usr/bin/proofd $PROOFDOPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index b60ac0d..9efdcb2 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-13 19:55:12.009036203 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-13 19:55:23.296139611 +0100
+diff -ur root-6.06.06.orig/core/base/src/TApplication.cxx root-6.06.06/core/base/src/TApplication.cxx
+--- root-6.06.06.orig/core/base/src/TApplication.cxx	2016-08-13 17:36:58.444770418 +0200
++++ root-6.06.06/core/base/src/TApplication.cxx	2016-08-13 17:38:21.645532552 +0200
 @@ -265,18 +265,11 @@
     LoadGraphicsLibs();
  
@@ -30,9 +30,9 @@ diff -ur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/CMakeLists.txt
---- root-6.06.02.orig/graf2d/graf/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/CMakeLists.txt	2016-03-13 19:56:57.341001209 +0100
+diff -ur root-6.06.06.orig/graf2d/graf/CMakeLists.txt root-6.06.06/graf2d/graf/CMakeLists.txt
+--- root-6.06.06.orig/graf2d/graf/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf2d/graf/CMakeLists.txt	2016-08-13 17:38:21.645532552 +0200
 @@ -12,7 +12,7 @@
  
  include_directories(${FREETYPE_INCLUDE_DIRS})
@@ -42,9 +42,9 @@ diff -ur root-6.06.02.orig/graf2d/graf/CMakeLists.txt root-6.06.02/graf2d/graf/C
  
  if(builtin_freetype)
    add_dependencies(${libname} FREETYPE)
-diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TTF.h
---- root-6.06.02.orig/graf2d/graf/inc/TTF.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/inc/TTF.h	2016-03-13 19:55:23.296139611 +0100
+diff -ur root-6.06.06.orig/graf2d/graf/inc/TTF.h root-6.06.06/graf2d/graf/inc/TTF.h
+--- root-6.06.06.orig/graf2d/graf/inc/TTF.h	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf2d/graf/inc/TTF.h	2016-08-13 17:38:21.645532552 +0200
 @@ -86,9 +86,8 @@
     static FT_BBox        fgCBox;                  // string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
@@ -56,9 +56,9 @@ diff -ur root-6.06.02.orig/graf2d/graf/inc/TTF.h root-6.06.02/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     // font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
     static Bool_t         fgHinting;               // use hinting (true by default)
-diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module.mk
---- root-6.06.02.orig/graf2d/graf/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/Module.mk	2016-03-13 19:55:23.296139611 +0100
+diff -ur root-6.06.06.orig/graf2d/graf/Module.mk root-6.06.06/graf2d/graf/Module.mk
+--- root-6.06.06.orig/graf2d/graf/Module.mk	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf2d/graf/Module.mk	2016-08-13 17:38:21.646532562 +0200
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -68,9 +68,9 @@ diff -ur root-6.06.02.orig/graf2d/graf/Module.mk root-6.06.02/graf2d/graf/Module
  
  $(call pcmrule,GRAF)
  	$(noop)
-diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-13 19:55:23.297139620 +0100
+diff -ur root-6.06.06.orig/graf2d/graf/src/TTF.cxx root-6.06.06/graf2d/graf/src/TTF.cxx
+--- root-6.06.06.orig/graf2d/graf/src/TTF.cxx	2016-08-13 17:36:58.458770546 +0200
++++ root-6.06.06/graf2d/graf/src/TTF.cxx	2016-08-13 17:38:21.647532571 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -631,9 +631,9 @@ diff -ur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/postscript/CMakeLists.txt
---- root-6.06.02.orig/graf2d/postscript/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/CMakeLists.txt	2016-03-13 19:57:59.333569158 +0100
+diff -ur root-6.06.06.orig/graf2d/postscript/CMakeLists.txt root-6.06.06/graf2d/postscript/CMakeLists.txt
+--- root-6.06.06.orig/graf2d/postscript/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf2d/postscript/CMakeLists.txt	2016-08-13 17:38:21.647532571 +0200
 @@ -5,5 +5,5 @@
  
  ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
@@ -641,9 +641,9 @@ diff -ur root-6.06.02.orig/graf2d/postscript/CMakeLists.txt root-6.06.02/graf2d/
 -ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
 +ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
  ROOT_INSTALL_HEADERS()
-diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/postscript/Module.mk
---- root-6.06.02.orig/graf2d/postscript/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/Module.mk	2016-03-13 19:55:23.298139629 +0100
+diff -ur root-6.06.06.orig/graf2d/postscript/Module.mk root-6.06.06/graf2d/postscript/Module.mk
+--- root-6.06.06.orig/graf2d/postscript/Module.mk	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf2d/postscript/Module.mk	2016-08-13 17:38:21.647532571 +0200
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -653,9 +653,9 @@ diff -ur root-6.06.02.orig/graf2d/postscript/Module.mk root-6.06.02/graf2d/posts
  
  $(call pcmrule,POSTSCRIPT)
  	$(noop)
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:12.024036341 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-13 19:55:23.298139629 +0100
+diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/graf2d/postscript/src/TPostScript.cxx
+--- root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx	2016-08-13 17:36:58.459770555 +0200
++++ root-6.06.06/graf2d/postscript/src/TPostScript.cxx	2016-08-13 17:38:21.648532580 +0200
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -930,9 +930,9 @@ diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-13 19:59:09.289210061 +0100
+diff -ur root-6.06.06.orig/graf3d/gl/CMakeLists.txt root-6.06.06/graf3d/gl/CMakeLists.txt
+--- root-6.06.06.orig/graf3d/gl/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf3d/gl/CMakeLists.txt	2016-08-13 17:38:21.648532580 +0200
 @@ -32,6 +32,6 @@
  
  ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
@@ -941,9 +941,9 @@ diff -ur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMake
 +ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
  
  ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-13 19:55:23.299139638 +0100
+diff -ur root-6.06.06.orig/graf3d/gl/Module.mk root-6.06.06/graf3d/gl/Module.mk
+--- root-6.06.06.orig/graf3d/gl/Module.mk	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/graf3d/gl/Module.mk	2016-08-13 17:38:21.648532580 +0200
 @@ -78,7 +78,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
@@ -953,9 +953,9 @@ diff -ur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
  
  $(call pcmrule,GL)
  	$(noop)
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:12.025036350 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-13 19:55:23.299139638 +0100
+diff -ur root-6.06.06.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.06/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.06.06.orig/graf3d/gl/src/TGLFontManager.cxx	2016-08-13 17:36:58.460770564 +0200
++++ root-6.06.06/graf3d/gl/src/TGLFontManager.cxx	2016-08-13 17:38:21.649532589 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1211,9 +1211,9 @@ diff -ur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-13 19:55:23.299139638 +0100
+diff -ur root-6.06.06.orig/graf3d/gl/src/TGLText.cxx root-6.06.06/graf3d/gl/src/TGLText.cxx
+--- root-6.06.06.orig/graf3d/gl/src/TGLText.cxx	2016-08-13 17:36:58.460770564 +0200
++++ root-6.06.06/graf3d/gl/src/TGLText.cxx	2016-08-13 17:38:21.649532589 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1348,9 +1348,9 @@ diff -ur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:12.026036359 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-13 19:55:23.300139647 +0100
+diff -ur root-6.06.06.orig/gui/gui/src/TGApplication.cxx root-6.06.06/gui/gui/src/TGApplication.cxx
+--- root-6.06.06.orig/gui/gui/src/TGApplication.cxx	2016-08-13 17:36:58.461770573 +0200
++++ root-6.06.06/gui/gui/src/TGApplication.cxx	2016-08-13 17:38:21.649532589 +0200
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1373,9 +1373,9 @@ diff -ur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGSpeedo.cxx
---- root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGSpeedo.cxx	2016-03-13 19:55:23.300139647 +0100
+diff -ur root-6.06.06.orig/gui/gui/src/TGSpeedo.cxx root-6.06.06/gui/gui/src/TGSpeedo.cxx
+--- root-6.06.06.orig/gui/gui/src/TGSpeedo.cxx	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/gui/gui/src/TGSpeedo.cxx	2016-08-13 17:38:21.650532598 +0200
 @@ -119,8 +119,7 @@
  {
     TString sc;
@@ -1406,3 +1406,31 @@ diff -ur root-6.06.02.orig/gui/gui/src/TGSpeedo.cxx root-6.06.02/gui/gui/src/TGS
        // format counter value
        Int_t nexe = 0;
        Int_t ww = fCounter;
+diff -ur root-6.06.06.orig/tutorials/eve/SplitGLView.C root-6.06.06/tutorials/eve/SplitGLView.C
+--- root-6.06.06.orig/tutorials/eve/SplitGLView.C	2016-08-13 17:36:58.556771444 +0200
++++ root-6.06.06/tutorials/eve/SplitGLView.C	2016-08-13 17:40:19.046607969 +0200
+@@ -288,8 +288,7 @@
+    const char *str = fText.Data();
+    char *string = strdup(str);
+    Int_t nlines = 0, size = fTextH;
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString ar = fp + "/arial.ttf";
++   TString ar = "arial.ttf";
+    char *s = strtok((char *)string, "\n");
+    TImage *img = (TImage*)fImage->Clone("img");
+    img->DrawText(fTextX, fTextY+(nlines*size), s, size, fTextCol, ar);
+diff -ur root-6.06.06.orig/tutorials/image/rose_image.C root-6.06.06/tutorials/image/rose_image.C
+--- root-6.06.06.orig/tutorials/image/rose_image.C	2016-07-06 18:36:49.000000000 +0200
++++ root-6.06.06/tutorials/image/rose_image.C	2016-08-13 17:42:27.381783543 +0200
+@@ -23,9 +23,8 @@
+    img->SetConstRatio(0);
+    img->SetImageQuality(TAttImage::kImgBest);
+ 
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString bc = fp + "/BlackChancery.ttf";
+-   TString ar = fp + "/arial.ttf";
++   TString bc = "timesi.ttf";
++   TString ar = "arial.ttf";
+ 
+    // draw text over image with funny font
+    img->DrawText(120, 160, "Hello World!", 32,
diff --git a/root.spec b/root.spec
index 1078ad4..9f8a766 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -41,6 +41,9 @@ Source0:	%{name}-%{version}.tar.xz
 Source1:	%{name}-testfiles.tar.xz
 #		Script to generate above source
 Source2:	%{name}-testfiles.sh
+#		systemd unit files
+Source3:	rootd.service
+Source4:	proofd.service
 #		Adapt to gcc's ABI tags
 #		https://github.com/root-mirror/root/pull/124
 Patch0:		%{name}-abitags.patch
@@ -237,6 +240,7 @@ BuildRequires:	dos2unix
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	perl-generators
+BuildRequires:	systemd-units
 #		Some of the tests call lsb_release
 BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
@@ -397,10 +401,9 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
+Requires(preun):	systemd-units
+Requires(post):		systemd-units
+Requires(postun):	systemd-units
 
 %description proofd
 This package contains the PROOF server. Proofd is the core daemon of
@@ -414,10 +417,9 @@ transparent interface.
 Summary:	ROOT remote file server
 #		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(post):		chkconfig
-Requires(postun):	initscripts
+Requires(preun):	systemd-units
+Requires(post):		systemd-units
+Requires(postun):	systemd-units
 
 %description rootd
 This package contains the ROOT file server. Rootd is a server for ROOT
@@ -1857,15 +1859,10 @@ install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
 install -p -m 644 build/package/debian/application-x-root.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
-# Init scripts for services
-mkdir -p %{buildroot}%{_initrddir}
-mv %{buildroot}%{_datadir}/%{name}/daemons/proofd.rc.d \
-   %{buildroot}%{_initrddir}/proofd
-mv %{buildroot}%{_datadir}/%{name}/daemons/rootd.rc.d \
-   %{buildroot}%{_initrddir}/rootd
-
-# Turn off services by default
-sed 's/\(chkconfig: \)[0-9]*/\1-/' -i %{buildroot}%{_initrddir}/*
+# systemd unit files for services
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m 644 %SOURCE3 %{buildroot}%{_unitdir}
+install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
 
 # The Python interface library is handled by alternatives
 mkdir -p %{buildroot}%{python_sitearch}
@@ -1905,6 +1902,7 @@ sed 's!/usr/bin/env python!/usr/bin/python!' \
 
 # Remove some junk
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
+rm %{buildroot}%{_datadir}/%{name}/daemons/*.rc.d
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
 rm %{buildroot}%{_datadir}/%{name}/daemons/README
 rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
@@ -2071,33 +2069,31 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 
+%pre rootd
+# Remove old init config when systemd is used
+/sbin/chkconfig --del rootd >/dev/null 2>&1 || :
+
 %post rootd
-/sbin/chkconfig --add rootd
+%systemd_post rootd.service
 
 %preun rootd
-if [ $1 = 0 ] ; then
-    /sbin/service rootd stop >/dev/null 2>&1
-    /sbin/chkconfig --del rootd
-fi
+%systemd_preun rootd.service
 
 %postun rootd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service rootd condrestart >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart rootd.service
+
+%pre proofd
+# Remove old init config when systemd is used
+/sbin/chkconfig --del proofd >/dev/null 2>&1 || :
 
 %post proofd
-/sbin/chkconfig --add proofd
+%systemd_post proofd.service
 
 %preun proofd
-if [ $1 = 0 ] ; then
-    /sbin/service proofd stop >/dev/null 2>&1
-    /sbin/chkconfig --del proofd
-fi
+%systemd_preun proofd.service
 
 %postun proofd
-if [ "$1" -ge "1" ] ; then
-    /sbin/service proofd condrestart >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart proofd.service
 
 %post python
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2405,6 +2401,7 @@ fi
 %{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
 %dir %{_includedir}/%{name}/Math
+%dir %{_includedir}/%{name}/ROOT
 %{_datadir}/aclocal/root.m4
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %dir %{_pkgdocdir}
@@ -2449,12 +2446,12 @@ fi
 %{_mandir}/man1/proofd.1*
 %{_mandir}/man1/proofserv.1*
 %{_mandir}/man1/xpdtest.1*
-%{_initrddir}/proofd
+%{_unitdir}/proofd.service
 
 %files rootd
 %{_bindir}/rootd
 %{_mandir}/man1/rootd.1*
-%{_initrddir}/rootd
+%{_unitdir}/rootd.service
 
 %files python -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
@@ -2647,6 +2644,7 @@ fi
 %files hist -f includelist-hist-hist
 %{_libdir}/%{name}/libHist.*
 %{_libdir}/%{name}/libHist_rdict.pcm
+%dir %{_includedir}/%{name}/v5
 
 %files hist-painter -f includelist-hist-histpainter
 %{_libdir}/%{name}/libHistPainter.*
@@ -3039,6 +3037,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Sun Aug 14 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-4
+- Convert init scripts to systemd unit files
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06.06-3
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/rootd.service b/rootd.service
new file mode 100644
index 0000000..596a3f9
--- /dev/null
+++ b/rootd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=ROOT file server daemon
+Documentation=man:rootd(8)
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/rootd
+ExecStart=/usr/bin/rootd $ROOTDOPTS
+
+[Install]
+WantedBy=multi-user.target

From 193d74d76af544701f441bd5f5405fcd3e407c7a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 8 Sep 2016 22:18:16 +0200
Subject: [PATCH 095/344] Update to 6.06.08

- Add the packages providing the libraries listed by "root-config --libs"
  as dependencies to root-core
- Add missing scriptlets to root-multiproc
---
 root-stressgraphics.patch | 18 ++++++++++++------
 root.spec                 | 29 +++++++++++++++++++++++++++--
 sources                   |  2 +-
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
index 8834aa4..1ce4430 100644
--- a/root-stressgraphics.patch
+++ b/root-stressgraphics.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
---- root-6.06.04.orig/test/stressGraphics.ref	2016-05-03 20:23:11.000000000 +0200
-+++ root-6.06.04/test/stressGraphics.ref	2016-06-24 15:43:16.130227298 +0200
+diff -ur root-6.06.08.orig/test/stressGraphics.ref root-6.06.08/test/stressGraphics.ref
+--- root-6.06.08.orig/test/stressGraphics.ref	2016-09-01 14:35:07.000000000 +0200
++++ root-6.06.08/test/stressGraphics.ref	2016-09-08 07:24:55.397173483 +0200
 @@ -3,18 +3,18 @@
      2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
      3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
@@ -39,7 +39,7 @@ diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraph
     28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
     29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
     30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
-@@ -35,11 +35,11 @@
+@@ -35,15 +35,15 @@
     34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
     35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
     36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
@@ -47,10 +47,16 @@ diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraph
 +   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
     38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
 -   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
-+   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
+-   40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
 -   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
++   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
++   40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
 +   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
     42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
     43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
     44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
+    45   1666331    160000    529473     50000     38603      3000     29519      3000     71404      7000         0         0
+    46    176455     17000    266221     25000     15528      1500     40859      4000     31451      3000    193640     19000
+    47     13592      1300     16669      1600     24300      2400     52678      5200     22353      2200     13291      1300
+-   48    153915     10000    545717     50000     10242      1000     17106      1000     11410      1000     65219      1000
++   48    153915     10000    545717     50000     10242      1000     17106      1000     11410      1000     65219     10000
diff --git a/root.spec b/root.spec
index 9f8a766..03bafc0 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.06.06
+Version:	6.06.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -342,6 +342,23 @@ Requires:	%{name}-icons = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
+#		Packages providing the libraries listed by "root-config --libs"
+#		(Only root-physics and root-multiproc are not dragged in by
+#		recursively resolving the dependency on root-graf-asimage
+#		above, so it is not that much of a bloat...)
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Fonts
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
 Requires:	font(freeserif)
@@ -2147,6 +2164,8 @@ fi
 
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
+%post multiproc -p /sbin/ldconfig
+%postun multiproc -p /sbin/ldconfig
 %post cling -p /sbin/ldconfig
 %postun cling -p /sbin/ldconfig
 %if %{ruby}
@@ -3037,6 +3056,12 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Thu Sep 08 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.08-1
+- Update to 6.06.08
+- Add the packages providing the libraries listed by "root-config --libs"
+  as dependencies to root-core
+- Add missing scriptlets to root-multiproc
+
 * Sun Aug 14 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.06-4
 - Convert init scripts to systemd unit files
 
diff --git a/sources b/sources
index 5330ee7..3199813 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8ae1d36c9fb30c4ee13099ec55a9339a  root-6.06.06.tar.xz
+3d11a7c2d6c8f8b25717133f9a76c926  root-6.06.08.tar.xz
 7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz

From cc0f4915b914e1a2d9fe542f90c88e848b97f0d8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 29 Sep 2016 19:26:20 +0200
Subject: [PATCH 096/344] Rebuild for gcc 6.2

---
 root.spec | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index 03bafc0..7df4381 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -154,6 +154,9 @@ ExcludeArch:	s390
 #		https://sft.its.cern.ch/jira/browse/ROOT-6434
 #		https://sft.its.cern.ch/jira/browse/ROOT-7314
 ExcludeArch:	ppc %{power64}
+#		aarch64 does not yet work
+#		https://sft.its.cern.ch/jira/browse/ROOT-7291
+ExcludeArch:	aarch64
 
 BuildRequires:	cmake
 BuildRequires:	libX11-devel
@@ -1833,12 +1836,9 @@ popd
 
 # Move python modules to the sitelib
 mkdir -p %{buildroot}%{python_sitelib}
-mkdir -p %{buildroot}%{python_sitearch}
-
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
-
 rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
+rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/.gitignore
 mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
 
 # Do emacs byte compilation
@@ -1885,10 +1885,15 @@ install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{python_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python_sitearch}/libPyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
 
 mkdir -p %{buildroot}%{python3_sitearch}
-install builddir/python/libPyROOT.so.%{version} \
+tmpdir=`mktemp -d`
+DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=libraries \
+   -P builddir/bindings/python/cmake_install.cmake
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+rm -rf $tmpdir
 install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
 
 %if %{ruby}
@@ -1915,7 +1920,10 @@ sed 's!/usr/bin/env python!/usr/bin/python!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{python_sitelib}/cmdLineUtils.py \
-       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
+       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/pyroot/parse_CSV_file_with_TTree_ReadStream.py
 
 # Remove some junk
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
@@ -3056,6 +3064,9 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Wed Sep 28 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.08-2
+- Rebuild for gcc 6.2
+
 * Thu Sep 08 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.08-1
 - Update to 6.06.08
 - Add the packages providing the libraries listed by "root-config --libs"

From ea3d3333d5826f37c5dbbc161ca7649e718cd88c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 7 Dec 2016 15:00:55 +0100
Subject: [PATCH 097/344] Update to 6.08.02

- Drop patches accepted upstream
- Drop previously backported patches
- Drop obsolete patches
- Enable hadoop/hdfs support for all architectures
  * libhdfs is now available for more architectures than ix86 and x86_64
- Enable building on aarch64
- Rename the python packages to python2-root and python3-root
- New sub-packages: python{2,3}-jupyroot, python{2,3}-jsmva
- Dropped sub-package: root-rootaas (replaced by python{2,3}-jupyroot)
---
 root-32bit.patch                   |   77 +-
 root-abitags.patch                 | 1267 ----------------------
 root-arm.patch                     |   81 --
 root-avoid-gui-crash.patch         |   22 -
 root-avoid-std-bind-lambda.patch   |   42 -
 root-broken-cmake-config.patch     |  156 ---
 root-cache-test.patch              |  227 ++--
 root-cernlib-doc.patch             | 1307 ----------------------
 root-compiledata.patch             |   12 -
 root-deprecated-options.patch      |   30 -
 root-doc-no-notebooks.patch        |   24 +
 root-dox-filter.patch              |   86 --
 root-doxyfile.patch                |   30 -
 root-doxygen-warnings.patch        |  723 -------------
 root-fflags.patch                  |   78 --
 root-fontconfig.patch              |  377 ++++---
 root-fsf-addr.patch                |   15 +
 root-gl2ps.patch                   |  254 -----
 root-global-name-not-defined.patch |   32 +
 root-html-markup.patch             | 1031 ------------------
 root-hz.patch                      |   15 +
 root-latex-markup.patch            |  877 ---------------
 root-libgfortranbegin.patch        |  182 ----
 root-links.patch                   |  376 -------
 root-llvm-static.patch             |   11 -
 root-macro-align.patch             |   36 -
 root-missing-cmake-config.patch    |  187 ----
 root-missing-includes.patch        |   12 +
 root-more-fflags.patch             |   33 -
 root-no-abi-check.patch            |   28 -
 root-ppc64.patch                   |   38 -
 root-private-public.patch          |  156 ---
 root-rose-image.patch              |   27 +
 root-s390x.patch                   |  147 ---
 root-save-memory.patch             |   30 -
 root-see-macro-output.patch        |  266 -----
 root-soname.patch                  |   11 -
 root-stressgraphics.patch          |   75 +-
 root-template-files.patch          |   47 +-
 root-test-install.patch            | 1621 ++++++++++++++++++++--------
 root-testfiles.sh                  |   25 +-
 root-tformulaparsingtests.patch    |  906 ++++++++++++++++
 root-tformulatests-typo.patch      |   13 +
 root-tildes.patch                  |  194 ----
 root-tmath-doc.patch               |  274 -----
 root-tprincipal-doc.patch          |  483 ---------
 root-tvector2-comment.patch        |   13 -
 root-type1-embed.patch             |   97 --
 root-unuran.patch                  |  305 ------
 root-werror.patch                  |   12 -
 root.spec                          |  466 ++++----
 sources                            |    4 +-
 52 files changed, 2925 insertions(+), 9913 deletions(-)
 delete mode 100644 root-abitags.patch
 delete mode 100644 root-arm.patch
 delete mode 100644 root-avoid-std-bind-lambda.patch
 delete mode 100644 root-broken-cmake-config.patch
 delete mode 100644 root-cernlib-doc.patch
 delete mode 100644 root-compiledata.patch
 delete mode 100644 root-deprecated-options.patch
 create mode 100644 root-doc-no-notebooks.patch
 delete mode 100644 root-dox-filter.patch
 delete mode 100644 root-doxyfile.patch
 delete mode 100644 root-doxygen-warnings.patch
 delete mode 100644 root-fflags.patch
 create mode 100644 root-fsf-addr.patch
 delete mode 100644 root-gl2ps.patch
 create mode 100644 root-global-name-not-defined.patch
 delete mode 100644 root-html-markup.patch
 create mode 100644 root-hz.patch
 delete mode 100644 root-latex-markup.patch
 delete mode 100644 root-libgfortranbegin.patch
 delete mode 100644 root-links.patch
 delete mode 100644 root-llvm-static.patch
 delete mode 100644 root-macro-align.patch
 delete mode 100644 root-missing-cmake-config.patch
 create mode 100644 root-missing-includes.patch
 delete mode 100644 root-more-fflags.patch
 delete mode 100644 root-no-abi-check.patch
 delete mode 100644 root-ppc64.patch
 delete mode 100644 root-private-public.patch
 create mode 100644 root-rose-image.patch
 delete mode 100644 root-s390x.patch
 delete mode 100644 root-save-memory.patch
 delete mode 100644 root-see-macro-output.patch
 delete mode 100644 root-soname.patch
 create mode 100644 root-tformulaparsingtests.patch
 create mode 100644 root-tformulatests-typo.patch
 delete mode 100644 root-tildes.patch
 delete mode 100644 root-tmath-doc.patch
 delete mode 100644 root-tprincipal-doc.patch
 delete mode 100644 root-tvector2-comment.patch
 delete mode 100644 root-type1-embed.patch
 delete mode 100644 root-unuran.patch
 delete mode 100644 root-werror.patch

diff --git a/root-32bit.patch b/root-32bit.patch
index 326a8d8..ecd62a4 100644
--- a/root-32bit.patch
+++ b/root-32bit.patch
@@ -1,7 +1,8 @@
-diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
---- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx	2016-04-09 20:03:06.376713840 +0200
-@@ -179,7 +179,7 @@
+diff --git a/math/mathmore/test/testSpecFunc.cxx b/math/mathmore/test/testSpecFunc.cxx
+index d768160..8c223ee 100644
+--- a/math/mathmore/test/testSpecFunc.cxx
++++ b/math/mathmore/test/testSpecFunc.cxx
+@@ -186,7 +186,7 @@ int testSpecFunc() {
  
     iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
  
@@ -10,10 +11,16 @@ diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math
  
     iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
  
-diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
---- root-6.06.02.orig/test/stressMathCore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressMathCore.cxx	2016-04-09 20:03:06.395714018 +0200
-@@ -1121,7 +1121,7 @@
+diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
+index 1006dd1..5dc96ee 100644
+--- a/test/stressMathCore.cxx
++++ b/test/stressMathCore.cxx
+@@ -1117,11 +1117,11 @@ int testVector(int ngen, bool testio=false) {
+ 
+    s1 = a.testOperations(v1);  a.print(VecType<V1>::name()+" operations");
+    scale = Dim*20;
+-   if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 10; // for problem with RhoEtaPhi
++   if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
     if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
  #if defined (R__LINUX) && !defined(R__B64)
     // problem of precision on linux 32
@@ -22,57 +29,3 @@ diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathC
  #endif
     // for problem with PtEtaPhiE
     if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
-diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
---- root-6.06.02.orig/test/TFormulaParsingTests.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/TFormulaParsingTests.h	2016-04-09 20:03:06.395714018 +0200
-@@ -312,7 +312,7 @@
-    ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
-    double par[2] = {3,4};
-    double xx[2] = {0.8,1.6};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -326,7 +326,7 @@
-    ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
-    double par[2] = {3,4};
-    double xx[3] = {0.8,1.6,2.2};
--   ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
-+   ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-    return ok; 
- }
- 
-@@ -369,12 +369,12 @@
-    TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
-    f2.SetParameters(10,1,0,1);
-    f0.SetParameters(f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
- 
-    TF1 f3("f3","f1+[0]");
-    // param order should be the same
-    f3.SetParameters( f2.GetParameters() );
--   ok &= (f2.Eval(1) == f0.Eval(1) );
-+   ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
-    return ok;
- }
- 
-@@ -465,7 +465,7 @@
-    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
-    TF1 f6("f6",func,-10,10,4);
-    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
--   ok &= (f5.Eval(2) == f6.Eval(2) );
-+   ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
-    return ok;
- }
- 
-@@ -485,7 +485,7 @@
-    // keep same order in evaluation
-    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
-    f0.SetParameters(1.1,2.1);
--   ok &= (fsincos.Eval(2) == f0.Eval(2) );
-+   ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
-    return ok;
- 
- }
diff --git a/root-abitags.patch b/root-abitags.patch
deleted file mode 100644
index 040474a..0000000
--- a/root-abitags.patch
+++ /dev/null
@@ -1,1267 +0,0 @@
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst
---- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst	2016-03-20 14:30:16.912570532 +0100
-@@ -0,0 +1,90 @@
-+========
-+Abi Tags
-+========
-+
-+Introduction
-+============
-+
-+This text tries to describe gcc semantic for mangling "abi_tag" attributes
-+described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html
-+
-+There is no guarantee the following rules are correct, complete or make sense
-+in any way as they were determined empirically by experiments with gcc5.
-+
-+Declaration
-+===========
-+
-+Abi tags are declared in an abi_tag attribute and can be applied to a
-+function, variable, class or inline namespace declaration. The attribute takes
-+one or more strings (called tags); the order does not matter.
-+
-+See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for
-+details.
-+
-+Tags on an inline namespace are called "implicit tags", all other tags are
-+"explicit tags".
-+
-+Mangling
-+========
-+
-+All tags that are "active" on a <unqualified-name> are emitted after the
-+<unqualified-name>, before <template-args> or <discriminator>, and are part of
-+the same <substitution> the <unqualified-name> is.
-+
-+They are mangled as:
-+
-+    <abi-tags> ::= <abi-tag>*   # sort by name
-+    <abi-tag> ::= B <tag source-name>
-+
-+Example:
-+
-+    __attribute__((abi_tag("test")))
-+    void Func();
-+
-+    gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`)
-+
-+Active tags
-+===========
-+
-+A namespace has never any active tags; for types (class / struct / union /
-+enum) the explicit tags are the active tags.
-+
-+For variables and functions the active tags are the explicit tags plus any
-+"required tags" which are not in the "available tags" set:
-+
-+    derived-tags := (required-tags - available-tags)
-+    active-tags := explicit-tags + derived-tags
-+
-+Required tags for a function
-+============================
-+
-+If a function is used as a local scope for another name, and is part of
-+another function as local scope, it doesn't have any required tags.
-+
-+If a function is used as a local scope for a guard variable name, it doesn't
-+have any required tags.
-+
-+Otherwise the function requires any implicit or explicit tag used in the name
-+for the return type.
-+
-+Required tags for a variable
-+============================
-+
-+A variable requires any implicit or explicit tag used in its type.
-+
-+Available tags
-+==============
-+
-+All tags used in the prefix and in the template arguments for a name are
-+available; for functions also all  tags from the <bare-function-type> (which
-+might include the return type for template functions) are available.
-+
-+For <local-name>s all active tags used in the local part (<function-
-+encoding>) are available, but not implicit tags which were not active!
-+
-+Implicit and explicit tags used in the <unqualified-name> for a function (as
-+in the type of a cast operator) are NOT available.
-+
-+Example: a cast operator to std::string (which is
-+std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is
-+required from the return type `std::string` but not available.
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td	2016-03-20 14:30:16.913570542 +0100
-@@ -144,6 +144,7 @@
- class UnsignedArgument<string name, bit opt = 0> : Argument<name, opt>;
- class VariadicUnsignedArgument<string name> : Argument<name, 1>;
- class VariadicExprArgument<string name> : Argument<name, 1>;
-+class VariadicStringArgument<string name> : Argument<name, 1>;
- 
- // A version of the form major.minor[.subminor].
- class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
-@@ -336,6 +337,14 @@
- // Attributes begin here
- //
- 
-+def AbiTag : Attr {
-+  let Spellings = [GCC<"abi_tag">];
-+  let Args = [VariadicStringArgument<"Tags">];
-+  let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag,
-+                             "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">;
-+  let Documentation = [Undocumented];
-+}
-+
- def AddressSpace : TypeAttr {
-   let Spellings = [GNU<"address_space">];
-   let Args = [IntArgument<"AddressSpace">];
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	2016-03-20 14:30:16.928570683 +0100
-@@ -2255,7 +2255,8 @@
-   "Objective-C instance methods|init methods of interface or class extension declarations|"
-   "variables, functions and classes|Objective-C protocols|"
-   "functions and global variables|structs, unions, and typedefs|structs and typedefs|"
--  "interface or protocol declarations|kernel functions}1">,
-+  "interface or protocol declarations|kernel functions|"
-+  "structs, classes, variables, functions, methods and inline namespaces}1">,
-   InGroup<IgnoredAttributes>;
- def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
- def warn_type_attribute_wrong_type : Warning<
-@@ -3922,6 +3923,12 @@
- def err_redefinition_extern_inline : Error<
-   "redefinition of a 'extern inline' function %0 is not supported in "
-   "%select{C99 mode|C++}1">;
-+def err_attr_abi_tag_only_on_inline_namespace :
-+  Error<"abi_tag attribute only allowed on inline namespaces">;
-+def err_abi_tag_on_redeclaration :
-+  Error<"cannot add abi_tag attribute in redeclaration">;
-+def err_new_abi_tag_on_redeclaration :
-+  Error<"abi_tag %0 missing in original declaration">;
- 
- def note_deleted_dtor_no_operator_delete : Note<
-   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h	2016-03-20 14:30:16.928570683 +0100
-@@ -846,7 +846,8 @@
-   ExpectedStructOrUnionOrTypedef,
-   ExpectedStructOrTypedef,
-   ExpectedObjectiveCInterfaceOrProtocol,
--  ExpectedKernelFunction
-+  ExpectedKernelFunction,
-+  ExpectedStructClassVariableFunctionMethodOrInlineNamespace
- };
- 
- }  // end namespace clang
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp	2016-03-20 14:30:16.930570702 +0100
-@@ -202,6 +202,8 @@
- class CXXNameMangler {
-   ItaniumMangleContextImpl &Context;
-   raw_ostream &Out;
-+  bool NullOut = false;
-+  bool DisableDerivedAbiTags = false;
- 
-   /// The "structor" is the top-level declaration being mangled, if
-   /// that's not a template specialization; otherwise it's the pattern
-@@ -251,6 +253,167 @@
- 
-   } FunctionTypeDepth;
- 
-+  // abi_tag is a gcc attribute, taking one or more strings called "tags".
-+  //
-+  // the goal is to annotage against which version of a library an object was
-+  // build and to be able to provide backwards compatibility ("dual abi").
-+  //
-+  // for this the emitted mangled names have to be different, while you don't
-+  // want the user to have to use different names in the source.
-+  //
-+  // the abi_tag can be present on Struct, Var and Function  declarations as
-+  // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags
-+  // are always emitted after the unqualified name, and (implicit) tags on
-+  // namespace are not.
-+  //
-+  // For functions and variables there is a set of "implicitly available"
-+  // tags. These tags are: all tags from the namespace/structs the name is
-+  // embedded in, all tags from any template arguments of the name, and, for
-+  // functions, alls tags used anywhere in the <bare-function-type> (i.e.
-+  // parameters and sometimes the return type).
-+  //
-+  // For functions this is basically the list of all tags from the signature
-+  // without the unqualified name and usually without the return type of the
-+  // function. In `operator Type()` Type is NOT part of that list, as it is
-+  // part of the unqualified name!
-+  //
-+  // Now all tags from the function return type/variable type which are not
-+  // "implicitly available" must be added to the explicit list of tags, and
-+  // are emitted after the unqualified name.
-+  //
-+  // Example:
-+  // namespace std {
-+  //   inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { }
-+  //   inline namespace __cxx11 {
-+  //     struct string { };
-+  //   }
-+  // }
-+  //
-+  // std::string foo(); // needs abi tag "cxx11" on foo
-+  // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo
-+  // __attribute__((__abi_tag__("cxx11")))
-+  // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway
-+  //
-+  // The tags are sorted by name before emitting, and are serialized as
-+  //   <abitag> ::= B <"tag" source-name>
-+
-+  typedef SmallVector<StringRef, 4> AbiTagList;
-+
-+  // state to gather all implicit and explicit tags used in a mangled name.
-+  // must always have an instance of this while emitting any name to keep
-+  // track.
-+  //
-+  // TODO(abitags): how to handle substituted names? they should add the tags used in
-+  // the substitution to the list of available tags.
-+  class AbiTagState final {
-+  public:
-+    //! all abi tags used implicitly or explicitly
-+    std::set<StringRef> UsedAbiTags;
-+    //! all explicit abi tags (i.e. not from namespace)
-+    std::set<StringRef> EmittedAbiTags;
-+
-+    AbiTagState* &LinkHead;
-+    AbiTagState *Parent{nullptr};
-+
-+    bool LinkActive{false};
-+
-+    explicit AbiTagState(AbiTagState* &linkHead)
-+      : LinkHead(linkHead) {
-+      Parent = LinkHead;
-+      LinkHead = this;
-+      LinkActive = true;
-+    }
-+
-+    // no copy, no move
-+    AbiTagState(AbiTagState const&) = delete;
-+    AbiTagState& operator=(AbiTagState const&) = delete;
-+
-+    ~AbiTagState() {
-+      pop();
-+    }
-+
-+    void pop() {
-+      if (!LinkActive) return;
-+
-+      assert(LinkHead == this && "abi tag link head must point to us on destruction");
-+      LinkActive = false;
-+      if (Parent) {
-+        Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end());
-+        Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end());
-+      }
-+      LinkHead = Parent;
-+    }
-+
-+    void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+      ND = cast<NamedDecl>(ND->getCanonicalDecl());
-+
-+      if (dyn_cast<FunctionDecl>(ND) || dyn_cast<VarDecl>(ND)) {
-+        // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags");
-+      } else {
-+        assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags");
-+        if (const auto* NS = dyn_cast<NamespaceDecl>(ND)) {
-+          if (const auto* AbiTag = NS->getAttr<AbiTagAttr>()) {
-+            for (const auto& Tag: AbiTag->tags()) {
-+              UsedAbiTags.insert(Tag);
-+            }
-+          }
-+          // don't emit abi tags for namespaces
-+          return;
-+        }
-+      }
-+
-+      AbiTagList TagList;
-+      if (const auto* AbiTag = ND->getAttr<AbiTagAttr>()) {
-+        for (const auto& Tag: AbiTag->tags()) {
-+          UsedAbiTags.insert(Tag);
-+          // AbiTag->tags() is sorted and has no duplicates
-+          TagList.push_back(Tag);
-+        }
-+      }
-+
-+      if (AdditionalAbiTags) {
-+        for (const auto& Tag: *AdditionalAbiTags) {
-+          UsedAbiTags.insert(Tag);
-+          if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) {
-+            // don't insert duplicates
-+            TagList.push_back(Tag);
-+          }
-+        }
-+        // AbiTag->tags() are already sorted; only add if we had additional tags
-+        std::sort(TagList.begin(), TagList.end());
-+      }
-+
-+      writeSortedUniqueAbiTags(Out, TagList);
-+    }
-+
-+  protected:
-+    template<typename TagList>
-+    void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) {
-+      for (const auto& Tag: AbiTags) {
-+        EmittedAbiTags.insert(Tag);
-+        Out << "B";
-+        Out << Tag.size();
-+        Out << Tag;
-+      }
-+    }
-+  } *AbiTags = nullptr;
-+  AbiTagState AbiTagsRoot{AbiTags};
-+
-+  struct TemporaryDisableDerivedAbiTags {
-+    bool& StateRef;
-+    bool OldState;
-+
-+    TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true)
-+    : StateRef(State) {
-+      OldState = StateRef;
-+      StateRef = Disable;
-+    }
-+    TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete;
-+    ~TemporaryDisableDerivedAbiTags() {
-+      StateRef = OldState;
-+    }
-+  };
-+
-   llvm::DenseMap<uintptr_t, unsigned> Substitutions;
- 
-   ASTContext &getASTContext() const { return Context.getASTContext(); }
-@@ -273,6 +436,10 @@
-     : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
-       SeqID(0) { }
- 
-+  CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_)
-+    : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType),
-+      SeqID(Outer.SeqID) { }
-+
- #if MANGLE_CHECKER
-   ~CXXNameMangler() {
-     if (Out.str()[0] == '\01')
-@@ -286,18 +453,21 @@
- #endif
-   raw_ostream &getStream() { return Out; }
- 
-+  void disableDerivedAbiTags() { DisableDerivedAbiTags = true; }
-+
-   void mangle(const NamedDecl *D, StringRef Prefix = "_Z");
-   void mangleCallOffset(int64_t NonVirtual, int64_t Virtual);
-   void mangleNumber(const llvm::APSInt &I);
-   void mangleNumber(int64_t Number);
-   void mangleFloat(const llvm::APFloat &F);
--  void mangleFunctionEncoding(const FunctionDecl *FD);
-+  void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false);
-   void mangleSeqID(unsigned SeqID);
--  void mangleName(const NamedDecl *ND);
-+  void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false);
-   void mangleType(QualType T);
-   void mangleNameOrStandardSubstitution(const NamedDecl *ND);
-   
- private:
-+  void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr);
- 
-   bool mangleSubstitution(const NamedDecl *ND);
-   bool mangleSubstitution(QualType T);
-@@ -326,31 +496,49 @@
-                             DeclarationName name,
-                             unsigned KnownArity = UnknownArity);
- 
--  void mangleName(const TemplateDecl *TD,
-+  void mangleFunctionEncodingBareType(const FunctionDecl *FD);
-+
-+  void mangleNameWithAbiTags(const NamedDecl *ND,
-+                             const AbiTagList *AdditionalAbiTags,
-+                             bool ExcludeUnqualifiedName);
-+  void mangleTemplateName(const TemplateDecl *TD,
-+                  const AbiTagList *AdditionalAbiTags,
-+                  bool ExcludeUnqualifiedName,
-                   const TemplateArgument *TemplateArgs,
-                   unsigned NumTemplateArgs);
--  void mangleUnqualifiedName(const NamedDecl *ND) {
--    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity);
-+  void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+    mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags);
-   }
-   void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name,
--                             unsigned KnownArity);
--  void mangleUnscopedName(const NamedDecl *ND);
--  void mangleUnscopedTemplateName(const TemplateDecl *ND);
--  void mangleUnscopedTemplateName(TemplateName);
-+                             unsigned KnownArity, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                  const AbiTagList *AdditionalAbiTags);
-+  void mangleUnscopedTemplateName(TemplateName,
-+                                  const AbiTagList *AdditionalAbiTags);
-   void mangleSourceName(const IdentifierInfo *II);
--  void mangleLocalName(const Decl *D);
-+  void mangleLocalName(const Decl *D,
-+                       const AbiTagList *AdditionalAbiTags,
-+                       bool ExcludeUnqualifiedName);
-   void mangleBlockForPrefix(const BlockDecl *Block);
-   void mangleUnqualifiedBlock(const BlockDecl *Block);
-   void mangleLambda(const CXXRecordDecl *Lambda);
-   void mangleNestedName(const NamedDecl *ND, const DeclContext *DC,
--                        bool NoFunction=false);
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool NoFunction,
-+                        bool ExcludeUnqualifiedName);
-   void mangleNestedName(const TemplateDecl *TD,
-+                        const AbiTagList *AdditionalAbiTags,
-+                        bool ExcludeUnqualifiedName,
-                         const TemplateArgument *TemplateArgs,
-                         unsigned NumTemplateArgs);
-   void manglePrefix(NestedNameSpecifier *qualifier);
-   void manglePrefix(const DeclContext *DC, bool NoFunction=false);
-   void manglePrefix(QualType type);
--  void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false);
-+  void mangleTemplatePrefix(const TemplateDecl *ND,
-+                            const AbiTagList *AdditionalAbiTags,
-+                            bool NoFunction = false,
-+                            bool ExcludeUnqualifiedName = false);
-   void mangleTemplatePrefix(TemplateName Template);
-   void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
-   void mangleQualifiers(Qualifiers Quals);
-@@ -391,6 +579,10 @@
-   void mangleTemplateParameter(unsigned Index);
- 
-   void mangleFunctionParam(const ParmVarDecl *parm);
-+
-+  std::set<StringRef> getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND);
-+  AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD);
-+  AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD);
- };
- 
- }
-@@ -441,6 +633,11 @@
-   return true;
- }
- 
-+void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-+  assert(AbiTags && "require AbiTagState");
-+  if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags);
-+}
-+
- void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) {
-   // <mangled-name> ::= _Z <encoding>
-   //            ::= <data name>
-@@ -456,14 +653,28 @@
-     mangleName(cast<FieldDecl>(D));
- }
- 
--void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
--  // <encoding> ::= <function name> <bare-function-type>
--  mangleName(FD);
--
-+void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) {
-   // Don't mangle in the type if this isn't a decl we should typically mangle.
--  if (!Context.shouldMangleDeclName(FD))
-+  if (!Context.shouldMangleDeclName(FD)) {
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-     return;
-+  }
-+
-+  // <encoding> ::= <function name> <bare-function-type>
-+
-+  if (ExcludeUnqualifiedName)
-+  {
-+    // running makeAdditionalTagsForFunction would loop, don't need it here anyway
-+    mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName);
-+  } else {
-+    AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD);
-+    mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName);
-+  }
-+
-+  mangleFunctionEncodingBareType(FD);
-+}
- 
-+void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) {
-   if (FD->hasAttr<EnableIfAttr>()) {
-     FunctionTypeDepthState Saved = FunctionTypeDepth.push();
-     Out << "Ua9enable_ifI";
-@@ -509,7 +720,7 @@
-     FD = PrimaryTemplate->getTemplatedDecl();
-   }
- 
--  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(), 
-+  mangleBareFunctionType(FD->getType()->getAs<FunctionType>(),
-                          MangleReturnType);
- }
- 
-@@ -567,7 +778,21 @@
-   return nullptr;
- }
- 
--void CXXNameMangler::mangleName(const NamedDecl *ND) {
-+// must not be run from mangleLocalName for the <entity name> as it would loop otherwise.
-+void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) {
-+  if (!ExcludeUnqualifiedName) {
-+    if (const VarDecl *VD = dyn_cast<VarDecl>(ND)) {
-+      AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD);
-+      mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName);
-+      return;
-+    }
-+  }
-+  mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName);
-+}
-+
-+void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND,
-+                                           const AbiTagList *AdditionalAbiTags,
-+                                           bool ExcludeUnqualifiedName) {
-   //  <name> ::= <nested-name>
-   //         ::= <unscoped-name>
-   //         ::= <unscoped-template-name> <template-args>
-@@ -583,7 +808,7 @@
-     while (!DC->isNamespace() && !DC->isTranslationUnit())
-       DC = getEffectiveParentContext(DC);
-   else if (GetLocalClassDecl(ND)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
-@@ -593,76 +818,88 @@
-     // Check if we have a template.
-     const TemplateArgumentList *TemplateArgs = nullptr;
-     if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--      mangleUnscopedTemplateName(TD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-       mangleTemplateArgs(*TemplateArgs);
-       return;
-     }
- 
--    mangleUnscopedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedName(ND, AdditionalAbiTags);
-     return;
-   }
- 
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(ND);
-+    mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName);
-     return;
-   }
- 
--  mangleNestedName(ND, DC);
-+  mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName);
- }
--void CXXNameMangler::mangleName(const TemplateDecl *TD,
--                                const TemplateArgument *TemplateArgs,
--                                unsigned NumTemplateArgs) {
-+
-+void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD,
-+                                        const AbiTagList *AdditionalAbiTags,
-+                                        bool ExcludeUnqualifiedName,
-+                                        const TemplateArgument *TemplateArgs,
-+                                        unsigned NumTemplateArgs) {
-   const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD));
- 
-   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
--    mangleUnscopedTemplateName(TD);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-     mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
-   } else {
--    mangleNestedName(TD, TemplateArgs, NumTemplateArgs);
-+    mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs);
-   }
- }
- 
--void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
-+void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) {
-   //  <unscoped-name> ::= <unqualified-name>
-   //                  ::= St <unqualified-name>   # ::std::
- 
-   if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND))))
-     Out << "St";
- 
--  mangleUnqualifiedName(ND);
-+  mangleUnqualifiedName(ND, AdditionalAbiTags);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) {
-+void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (mangleSubstitution(ND))
-     return;
- 
-   // <template-template-param> ::= <template-param>
--  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND))
-+  if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags)
-     mangleTemplateParameter(TTP->getIndex());
--  else
--    mangleUnscopedName(ND->getTemplatedDecl());
-+  } else {
-+    mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-+  }
- 
-   addSubstitution(ND);
- }
- 
--void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) {
-+void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template,
-+                                                const AbiTagList *AdditionalAbiTags) {
-   //     <unscoped-template-name> ::= <unscoped-name>
-   //                              ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleUnscopedTemplateName(TD);
-+    return mangleUnscopedTemplateName(TD, AdditionalAbiTags);
-   
-   if (mangleSubstitution(Template))
-     return;
- 
-+  assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags)
-+
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Not a dependent template name?");
-   if (const IdentifierInfo *Id = Dependent->getIdentifier())
-     mangleSourceName(Id);
-   else
-     mangleOperatorName(Dependent->getOperator(), UnknownArity);
--  
-+
-   addSubstitution(Template);
- }
- 
-@@ -824,6 +1061,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespace()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespace());
-     break;
-   case NestedNameSpecifier::NamespaceAlias:
-     if (qualifier->getPrefix())
-@@ -832,6 +1070,7 @@
-     else
-       Out << "sr";
-     mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
- 
-   case NestedNameSpecifier::TypeSpec:
-@@ -917,15 +1156,18 @@
- 
-     case Type::Typedef:
-       mangleSourceName(cast<TypedefType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TypedefType>(type)->getDecl());
-       break;
- 
-     case Type::UnresolvedUsing:
-       mangleSourceName(cast<UnresolvedUsingType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<UnresolvedUsingType>(type)->getDecl());
-       break;
- 
-     case Type::Record:
-       mangleSourceName(cast<RecordType>(type)->getDecl()->getIdentifier());
-+      writeAbiTags(cast<TagType>(type)->getDecl());
-       break;
- 
-     case Type::TemplateSpecialization: {
-@@ -943,6 +1185,7 @@
-         if (isa<TemplateTemplateParmDecl>(temp)) goto unresolvedType;
- 
-         mangleSourceName(temp->getIdentifier());
-+        writeAbiTags(temp);
-         break;
-       }
- 
-@@ -974,16 +1217,19 @@
-     case Type::InjectedClassName:
-       mangleSourceName(cast<InjectedClassNameType>(type)->getDecl()
-                          ->getIdentifier());
-+      writeAbiTags(cast<InjectedClassNameType>(type)->getDecl());
-       break;
- 
-     case Type::DependentName:
-       mangleSourceName(cast<DependentNameType>(type)->getIdentifier());
-+      // writeAbiTags(cast<DependentNameType>(type));
-       break;
- 
-     case Type::DependentTemplateSpecialization: {
-       const DependentTemplateSpecializationType *tst
-         = cast<DependentTemplateSpecializationType>(type);
-       mangleSourceName(tst->getIdentifier());
-+      // writeAbiTags(tst);
-       mangleTemplateArgs(tst->getArgs(), tst->getNumArgs());
-       break;
-     }
-@@ -1033,6 +1279,7 @@
-     }
- 
-     mangleSourceName(qualifier->getAsIdentifier());
-+    writeAbiTags(qualifier->getAsNamespaceAlias());
-     break;
-   }
- 
-@@ -1049,12 +1296,14 @@
-                                           DeclarationName name,
-                                           unsigned knownArity) {
-   if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup);
--  mangleUnqualifiedName(nullptr, name, knownArity);
-+  mangleUnqualifiedName(nullptr, name, knownArity,
-+                        /*AdditionalAbiTags*/ nullptr);
- }
- 
- void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
-                                            DeclarationName Name,
--                                           unsigned KnownArity) {
-+                                           unsigned KnownArity,
-+                                           const AbiTagList *AdditionalAbiTags) {
-   //  <unqualified-name> ::= <operator-name>
-   //                     ::= <ctor-dtor-name>
-   //                     ::= <source-name>
-@@ -1072,6 +1321,8 @@
-         Out << 'L';
- 
-       mangleSourceName(II);
-+      if (ND)
-+        writeAbiTags(ND, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1111,6 +1362,7 @@
-       assert(FD->getIdentifier() && "Data member name isn't an identifier!");
- 
-       mangleSourceName(FD->getIdentifier());
-+      // TODO(abitags): not emitting abi tags: internal name anyway
-       break;
-     }
- 
-@@ -1131,6 +1383,9 @@
-       assert(D->getDeclName().getAsIdentifierInfo() &&
-              "Typedef was not named!");
-       mangleSourceName(D->getDeclName().getAsIdentifierInfo());
-+      assert(!AdditionalAbiTags && "Type cannot have additional abi tags");
-+      // explicit abi tags are still possible; take from underlying type, not from typedef.
-+      writeAbiTags(TD, nullptr);
-       break;
-     }
- 
-@@ -1140,6 +1395,7 @@
-     // <lambda-sig> ::= <parameter-type>+   # Parameter types or 'v' for 'void'.
-     if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(TD)) {
-       if (Record->isLambda() && Record->getLambdaManglingNumber()) {
-+        assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags");
-         mangleLambda(Record);
-         break;
-       }
-@@ -1151,6 +1407,7 @@
-       if (UnnamedMangle > 1)
-         Out << llvm::utostr(UnnamedMangle - 2);
-       Out << '_';
-+      writeAbiTags(TD, AdditionalAbiTags);
-       break;
-     }
- 
-@@ -1183,6 +1440,7 @@
-       // Otherwise, use the complete constructor name. This is relevant if a
-       // class with a constructor is declared within a constructor.
-       mangleCXXCtorType(Ctor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXDestructorName:
-@@ -1194,12 +1452,14 @@
-       // Otherwise, use the complete destructor name. This is relevant if a
-       // class with a destructor is declared within a destructor.
-       mangleCXXDtorType(Dtor_Complete);
-+      writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXConversionFunctionName:
-     // <operator-name> ::= cv <type>    # (cast)
-     Out << "cv";
-     mangleType(Name.getCXXNameType());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXOperatorName: {
-@@ -1223,6 +1483,7 @@
-     // FIXME: This mangling is not yet official.
-     Out << "li";
-     mangleSourceName(Name.getCXXLiteralIdentifier());
-+    writeAbiTags(ND, AdditionalAbiTags);
-     break;
- 
-   case DeclarationName::CXXUsingDirective:
-@@ -1239,7 +1500,9 @@
- 
- void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
-                                       const DeclContext *DC,
--                                      bool NoFunction) {
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool NoFunction,
-+                                      bool ExcludeUnqualifiedName) {
-   // <nested-name> 
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
-   //   ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> 
-@@ -1259,30 +1522,35 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD, NoFunction);
-+    mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName);
-     mangleTemplateArgs(*TemplateArgs);
-   }
-   else {
-     manglePrefix(DC, NoFunction);
--    mangleUnqualifiedName(ND);
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND, AdditionalAbiTags);
-   }
- 
-   Out << 'E';
- }
- void CXXNameMangler::mangleNestedName(const TemplateDecl *TD,
-+                                      const AbiTagList *AdditionalAbiTags,
-+                                      bool ExcludeUnqualifiedName,
-                                       const TemplateArgument *TemplateArgs,
-                                       unsigned NumTemplateArgs) {
-   // <nested-name> ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
- 
-   Out << 'N';
- 
--  mangleTemplatePrefix(TD);
-+  mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName);
-   mangleTemplateArgs(TemplateArgs, NumTemplateArgs);
- 
-   Out << 'E';
- }
- 
--void CXXNameMangler::mangleLocalName(const Decl *D) {
-+void CXXNameMangler::mangleLocalName(const Decl *D,
-+                                     const AbiTagList *AdditionalAbiTags,
-+                                     bool ExcludeUnqualifiedName) {
-   // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
-   //              := Z <function encoding> E s [<discriminator>]
-   // <local-name> := Z <function encoding> E d [ <parameter number> ] 
-@@ -1294,15 +1562,25 @@
- 
-   Out << 'Z';
- 
--  if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
--    mangleObjCMethodName(MD);
--  else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
--    mangleBlockForPrefix(BD);
--  else
--    mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+  {
-+    AbiTagState localAbiTags(AbiTags);
-+
-+    if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
-+      mangleObjCMethodName(MD);
-+    else if (const BlockDecl *BD = dyn_cast<BlockDecl>(DC))
-+      mangleBlockForPrefix(BD);
-+    else
-+      mangleFunctionEncoding(cast<FunctionDecl>(DC));
-+
-+    // implicit abi tags (from namespace) are not available in the following
-+    // entity; reset to actually emitted tags, which are available.
-+    localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags;
-+  }
- 
-   Out << 'E';
- 
-+  TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast<NamedDecl>(D)) != Structor);
-+
-   if (RD) {
-     // The parameter number is omitted for the last parameter, 0 for the 
-     // second-to-last parameter, 1 for the third-to-last parameter, etc. The 
-@@ -1327,13 +1605,17 @@
-     // Mangle the name relative to the closest enclosing function.
-     // equality ok because RD derived from ND above
-     if (D == RD)  {
--      mangleUnqualifiedName(RD);
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedName(RD, AdditionalAbiTags);
-     } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-       manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/);
--      mangleUnqualifiedBlock(BD);
-+      assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+      if (!ExcludeUnqualifiedName)
-+        mangleUnqualifiedBlock(BD);
-     } else {
-       const NamedDecl *ND = cast<NamedDecl>(D);
--      mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/);
-+      mangleNestedName(ND, getEffectiveDeclContext(ND),
-+                       AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName);
-     }
-   } else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
-     // Mangle a block in a default parameter; see above explanation for
-@@ -1350,30 +1632,35 @@
-       }
-     }
- 
--    mangleUnqualifiedBlock(BD);
-+    assert(!AdditionalAbiTags && "Block cannot have additional abi tags");
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedBlock(BD);
-   } else {
--    mangleUnqualifiedName(cast<NamedDecl>(D));
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(cast<NamedDecl>(D), AdditionalAbiTags);
-   }
- 
--  if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
--    unsigned disc;
--    if (Context.getNextDiscriminator(ND, disc)) {
--      if (disc < 10)
--        Out << '_' << disc;
--      else
--        Out << "__" << disc << '_';
-+  if (!ExcludeUnqualifiedName) {
-+    if (const NamedDecl *ND = dyn_cast<NamedDecl>(RD ? RD : D)) {
-+      unsigned disc;
-+      if (Context.getNextDiscriminator(ND, disc)) {
-+        if (disc < 10)
-+          Out << '_' << disc;
-+        else
-+          Out << "__" << disc << '_';
-+      }
-     }
-   }
- }
- 
- void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) {
-   if (GetLocalClassDecl(Block)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   const DeclContext *DC = getEffectiveDeclContext(Block);
-   if (isLocalContainerContext(DC)) {
--    mangleLocalName(Block);
-+    mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false);
-     return;
-   }
-   manglePrefix(getEffectiveDeclContext(Block));
-@@ -1384,10 +1671,11 @@
-   if (Decl *Context = Block->getBlockManglingContextDecl()) {
-     if ((isa<VarDecl>(Context) || isa<FieldDecl>(Context)) &&
-         Context->getDeclContext()->isRecord()) {
--      if (const IdentifierInfo *Name
--            = cast<NamedDecl>(Context)->getIdentifier()) {
-+      const auto *ND = cast<NamedDecl>(Context);
-+      if (const IdentifierInfo *Name = ND->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        writeAbiTags(ND, /* AdditionalAbiTags */ nullptr);
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1420,7 +1708,7 @@
-       if (const IdentifierInfo *Name
-             = cast<NamedDecl>(Context)->getIdentifier()) {
-         mangleSourceName(Name);
--        Out << 'M';            
-+        Out << 'M';
-       }
-     }
-   }
-@@ -1502,11 +1790,11 @@
-   // Check if we have a template.
-   const TemplateArgumentList *TemplateArgs = nullptr;
-   if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) {
--    mangleTemplatePrefix(TD);
-+    mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
-     mangleTemplateArgs(*TemplateArgs);
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND);
-+    mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr);
-   }
- 
-   addSubstitution(ND);
-@@ -1517,7 +1805,7 @@
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-   if (TemplateDecl *TD = Template.getAsTemplateDecl())
--    return mangleTemplatePrefix(TD);
-+    return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr);
- 
-   if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName())
-     manglePrefix(Qualified->getQualifier());
-@@ -1525,18 +1813,21 @@
-   if (OverloadedTemplateStorage *Overloaded
-                                       = Template.getAsOverloadedTemplate()) {
-     mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(),
--                          UnknownArity);
-+                          UnknownArity,
-+                          /* AdditionalAbiTags */ nullptr);
-     return;
-   }
-    
-   DependentTemplateName *Dependent = Template.getAsDependentTemplateName();
-   assert(Dependent && "Unknown template name kind?");
-   manglePrefix(Dependent->getQualifier());
--  mangleUnscopedTemplateName(Template);
-+  mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr);
- }
- 
- void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND,
--                                          bool NoFunction) {
-+                                          const AbiTagList *AdditionalAbiTags,
-+                                          bool NoFunction,
-+                                          bool ExcludeUnqualifiedName) {
-   // <template-prefix> ::= <prefix> <template unqualified-name>
-   //                   ::= <template-param>
-   //                   ::= <substitution>
-@@ -1548,10 +1839,12 @@
- 
-   // <template-template-param> ::= <template-param>
-   if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(ND)) {
-+    // TODO(abitags): ???
-     mangleTemplateParameter(TTP->getIndex());
-   } else {
-     manglePrefix(getEffectiveDeclContext(ND), NoFunction);
--    mangleUnqualifiedName(ND->getTemplatedDecl());
-+    if (!ExcludeUnqualifiedName)
-+      mangleUnqualifiedName(ND->getTemplatedDecl(), AdditionalAbiTags);
-   }
- 
-   addSubstitution(ND);
-@@ -1595,6 +1888,7 @@
-     // <name> ::= <nested-name>
-     mangleUnresolvedPrefix(Dependent->getQualifier(), nullptr);
-     mangleSourceName(Dependent->getIdentifier());
-+    // writeAbiTags(Dependent);
-     break;
-   }
- 
-@@ -2370,7 +2664,11 @@
- 
- void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
-   if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
--    mangleName(TD, T->getArgs(), T->getNumArgs());
-+    // types only have explicit abi tags, no addition tags
-+    mangleTemplateName(TD,
-+                       /* AdditionalAbiTags */ nullptr,
-+                       /* ExcludeUnqualifiedName */ false,
-+                       T->getArgs(), T->getNumArgs());
-   } else {
-     if (mangleSubstitution(QualType(T, 0)))
-       return;
-@@ -2417,6 +2715,7 @@
-   Out << 'N';
-   manglePrefix(T->getQualifier());
-   mangleSourceName(T->getIdentifier());
-+  // writeAbiTags(T); // TODO(abitags)
-   Out << 'E';
- }
- 
-@@ -3722,6 +4021,74 @@
-   Substitutions[Ptr] = SeqID++;
- }
- 
-+std::set<StringRef> CXXNameMangler::getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND) {
-+  llvm::raw_null_ostream NullOutStream;
-+  CXXNameMangler TrackPrefixAndTemplateArguments(*this, NullOutStream);
-+
-+  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) {
-+    TrackPrefixAndTemplateArguments.mangleFunctionEncoding(FD, /* ExcludeUnqualifiedName */ true);
-+  } else {
-+    TrackPrefixAndTemplateArguments.mangleName(ND, /* ExcludeUnqualifiedName */ true);
-+  }
-+
-+  return std::move(TrackPrefixAndTemplateArguments.AbiTagsRoot.UsedAbiTags);
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForFunction(const FunctionDecl *FD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(FD);
-+  std::set<StringRef> ReturnTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackReturnTypeTags(*this, NullOutStream);
-+
-+    const FunctionProtoType *Proto = cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
-+    TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
-+    TrackReturnTypeTags.mangleType(Proto->getReturnType());
-+    TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
-+
-+    ReturnTypeTags = std::move(TrackReturnTypeTags.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: ReturnTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
-+CXXNameMangler::AbiTagList CXXNameMangler::makeAdditionalTagsForVariable(const VarDecl *VD) {
-+  // when derived abi tags are disabled there is no need to make any list
-+  if (DisableDerivedAbiTags) return AbiTagList();
-+
-+  std::set<StringRef> ImplicitlyAvailableTags = getTagsFromPrefixAndTemplateArguments(VD);
-+  std::set<StringRef> VariableTypeTags;
-+
-+  {
-+    llvm::raw_null_ostream NullOutStream;
-+    CXXNameMangler TrackVariableType(*this, NullOutStream);
-+
-+    TrackVariableType.mangleType(VD->getType());
-+
-+    VariableTypeTags = std::move(TrackVariableType.AbiTagsRoot.UsedAbiTags);
-+  }
-+
-+  AbiTagList AdditionalAbiTags;
-+
-+  for (const auto& Tag: VariableTypeTags) {
-+    if (ImplicitlyAvailableTags.count(Tag) == 0)
-+      AdditionalAbiTags.push_back(Tag);
-+  }
-+
-+  return AdditionalAbiTags;
-+}
-+
- //
- 
- /// \brief Mangles the name of the declaration D and emits that name to the
-@@ -3824,6 +4191,7 @@
-   //  <special-name> ::= GV <object name>       # Guard variable for one-time
-   //                                            # initialization
-   CXXNameMangler Mangler(*this, Out);
-+  Mangler.disableDerivedAbiTags(); // GCC: doesn't emit derived abi tags for guard variables
-   Mangler.getStream() << "_ZGV";
-   Mangler.mangleName(D);
- }
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/Sema/SemaDeclAttr.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -3948,6 +3948,58 @@
-       Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex()));
- }
- 
-+static void handleAbiTagAttr(Sema &S, Decl *D,
-+                             const AttributeList &Attr) {
-+  if (!checkAttributeAtLeastNumArgs(S, Attr, 1))
-+    return;
-+
-+  SmallVector<std::string, 4> Tags;
-+
-+  for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) {
-+    StringRef Tag;
-+
-+    if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag))
-+      return;
-+
-+    Tags.push_back(Tag);
-+  }
-+  // store tags sorted and without duplicates
-+  std::sort(Tags.begin(), Tags.end());
-+  Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end());
-+
-+  if (const auto *NS = dyn_cast<NamespaceDecl>(D)) {
-+    if (!NS->isInline()) {
-+      S.Diag(Attr.getLoc(), diag::err_attr_abi_tag_only_on_inline_namespace);
-+      return;
-+    }
-+  }
-+
-+  const auto *CD = D->getCanonicalDecl();
-+  if (CD != D) {
-+    // redeclarations must not add new abi tags, or abi tags in the first place
-+    const auto *OldAbiTagAttr = D->getAttr<AbiTagAttr>();
-+    if (nullptr == OldAbiTagAttr) {
-+      S.Diag(Attr.getLoc(), diag::err_abi_tag_on_redeclaration);
-+      S.Diag(CD->getLocation(), diag::note_previous_definition);
-+      return;
-+    }
-+    for (const auto& NewTag: Tags) {
-+      if (std::find(OldAbiTagAttr->tags_begin(),
-+                    OldAbiTagAttr->tags_end(),
-+                    NewTag) == OldAbiTagAttr->tags_end()) {
-+        S.Diag(Attr.getLoc(), diag::err_new_abi_tag_on_redeclaration) << NewTag;
-+        S.Diag(OldAbiTagAttr->getLocation(), diag::note_previous_definition);
-+        return;
-+      }
-+    }
-+    return;
-+  }
-+
-+  D->addAttr(::new (S.Context) AbiTagAttr(Attr.getRange(), S.Context,
-+                                          Tags.data(), Tags.size(),
-+                                          Attr.getAttributeSpellingListIndex()));
-+}
-+
- static void handleARMInterruptAttr(Sema &S, Decl *D,
-                                    const AttributeList &Attr) {
-   // Check the attribute arguments.
-@@ -4707,6 +4759,9 @@
-   case AttributeList::AT_Thread:
-     handleDeclspecThreadAttr(S, D, Attr);
-     break;
-+  case AttributeList::AT_AbiTag:
-+    handleAbiTagAttr(S, D, Attr);
-+    break;
- 
-   // Thread safety attributes:
-   case AttributeList::AT_AssertExclusiveLock:
-diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/tools/clang/utils/TableGen/ClangAttrEmitter.cpp	2016-03-20 14:30:16.931570712 +0100
-@@ -79,6 +79,7 @@
-     .Case("TypeSourceInfo *", "GetTypeSourceInfo(F, Record, Idx)")
-     .Case("Expr *", "ReadExpr(F)")
-     .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
-+    .Case("std::string", "ReadString(Record, Idx)")
-     .Default("Record[Idx++]");
- }
- 
-@@ -92,6 +93,7 @@
-     .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
-     .Case("IdentifierInfo *", 
-           "AddIdentifierRef(" + std::string(name) + ", Record);\n")
-+    .Case("std::string", "AddString(" + std::string(name) + ", Record);\n")
-     .Default("Record.push_back(" + std::string(name) + ");\n");
- }
- 
-@@ -986,6 +988,16 @@
-     }
-   };
- 
-+  class VariadicStringArgument : public VariadicArgument {
-+  public:
-+    VariadicStringArgument(const Record &Arg, StringRef Attr)
-+      : VariadicArgument(Arg, Attr, "std::string")
-+    {}
-+    void writeValueImpl(raw_ostream &OS) const override {
-+      OS << "    OS << \"\\\"\" << Val << \"\\\"\";\n";
-+    }
-+  };
-+
-   class TypeArgument : public SimpleArgument {
-   public:
-     TypeArgument(const Record &Arg, StringRef Attr)
-@@ -1047,6 +1059,8 @@
-     Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "unsigned");
-   else if (ArgName == "VariadicUnsignedArgument")
-     Ptr = llvm::make_unique<VariadicArgument>(Arg, Attr, "unsigned");
-+  else if (ArgName == "VariadicStringArgument")
-+    Ptr = llvm::make_unique<VariadicStringArgument>(Arg, Attr);
-   else if (ArgName == "VariadicEnumArgument")
-     Ptr = llvm::make_unique<VariadicEnumArgument>(Arg, Attr);
-   else if (ArgName == "VariadicExprArgument")
diff --git a/root-arm.patch b/root-arm.patch
deleted file mode 100644
index d865e30..0000000
--- a/root-arm.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-@@ -19,7 +19,7 @@
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
- elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
--  message(STATUS "Found a 64bit system")
-+  message(STATUS "Found a 64bit ARM system")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-@@ -42,6 +42,18 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES arm)
-+  message(STATUS "Found a 32bit ARM system")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxarm)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-@@ -52,6 +52,8 @@
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-@@ -47,6 +47,8 @@
-     set(AFTER_CC "${AFTER_CC} -m64")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-@@ -52,6 +52,10 @@
-     set(FREETYPE_CFLAGS "-m64 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-     set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
-+    set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+    set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-@@ -17,6 +17,8 @@
- 
- if(ROOT_ARCHITECTURE MATCHES linuxarm64)
-   set(ROOT_CLING_TARGET "AArch64")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+  set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
index 776e79a..98c0c1c 100644
--- a/root-avoid-gui-crash.patch
+++ b/root-avoid-gui-crash.patch
@@ -1,25 +1,3 @@
-diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
---- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/ged/src/TArrowEditor.cxx	2016-03-29 15:00:55.706652094 +0200
-@@ -30,7 +30,7 @@
- shape, size, angle.</h2></center>
- The picture below shows this interface.
- End_Html
--Begin_Macro(GUI)
-+~~~
- {
-    gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
-    TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
-@@ -41,7 +41,8 @@
-    r->SetWindowSize(700,500);
-    return r->GetMainFrame();
- }
--End_Macro */
-+~~~
-+*/
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
 diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
 --- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
 +++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
diff --git a/root-avoid-std-bind-lambda.patch b/root-avoid-std-bind-lambda.patch
deleted file mode 100644
index 5cbff77..0000000
--- a/root-avoid-std-bind-lambda.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
---- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C	2016-03-21 19:56:55.414726427 +0100
-@@ -33,6 +33,9 @@
-    // Total amount of numbers
-    const UInt_t nNumbers = 20000000U;
- 
-+   // We split the work in equal parts
-+   const auto workSize = nNumbers / nWorkers;
-+
-    // A simple function to fill ntuples randomly
- 
-    auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
-@@ -57,7 +60,7 @@
-    // We now go MP! ------------------------------------------------------------
- 
-    // We define our work item
--   auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
-+   auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
-       TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
-@@ -74,18 +77,10 @@
-    {
-       TimerRAII t("Parallel execution");
- 
--      // We split the work in equal parts
--      const auto workSize = nNumbers / nWorkers;
--
--      // The work item requires two arguments, the map infrastructure offer
--      // an interface to use only one. A standard solution is to use std::bind
--      using namespace std::placeholders;
--      auto workItemOneArg = std::bind(workItem, _1, workSize);
--
-       // Fill the pool with work
-       std::forward_list<UInt_t> workerIDs(nWorkers);
-       std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
--      workers.Map(workItemOneArg, workerIDs);
-+      workers.Map(workItem, workerIDs);
-    }
- 
-    return 0;
diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch
deleted file mode 100644
index aaa4a6c..0000000
--- a/root-broken-cmake-config.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
---- root-6.06.02.orig/cmake/modules/FindDPM.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindDPM.cmake	2016-03-20 17:08:52.124461048 +0100
-@@ -0,0 +1,23 @@
-+# - Locate dpm library
-+# Defines:
-+#
-+#  DPM_FOUND
-+#  DPM_INCLUDE_DIR
-+#  DPM_INCLUDE_DIRS (not cached)
-+#  DPM_LIBRARIES
-+
-+set(DPM_FOUND FALSE)
-+
-+find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
-+find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
-+
-+set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
-+set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
-+
-+if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
-+  set(DPM_FOUND TRUE)
-+  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
-+endif()
-+
-+mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
---- root-6.06.02.orig/cmake/modules/FindGlobus.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindGlobus.cmake	2016-03-20 17:08:52.183461633 +0100
-@@ -9,7 +9,7 @@
- 
- find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
-           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
--                /opt/globus/include
-+                /opt/globus/include /usr/include
-           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
-                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
- 
-@@ -24,7 +24,7 @@
-               openssl gsi_proxy_core callout)
- 
- foreach( lib ${libraries})
--  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
-+  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
-                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
-   if(GLOBUS_${lib}_LIBRARY)
-     set(GLOBUS_${lib}_FOUND 1)
-diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
---- root-6.06.02.orig/cmake/modules/Findhdfs.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findhdfs.cmake	2016-03-20 17:08:52.185461652 +0100
-@@ -6,7 +6,7 @@
- #  HDFS_INCLUDE_DIRS (not cached)
- #  HDFS_LIBRARIES
- 
--find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
-+find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
- find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
- 
- set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
---- root-6.06.02.orig/cmake/modules/FindPCRE.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindPCRE.cmake	2016-03-20 17:08:52.184461642 +0100
-@@ -2,8 +2,8 @@
- #
- # This module defines
- # PCRE_INCLUDE_DIR, where to locate PCRE header files
--# PCRE_LIBRARIES, the libraries to link against to use Pythia6
--# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
-+# PCRE_LIBRARIES, the libraries to link against to use PCRE
-+# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
- 
- if(PCRE_CONFIG_EXECUTABLE)
-   set(PCRE_FIND_QUIETLY 1)
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-@@ -446,15 +446,29 @@
- endif()
- 
- #---Check for Castor-------------------------------------------------------------------
--if(castor OR rfio)
-+if(castor)
-   message(STATUS "Looking for Castor")
-   find_package(Castor)
-   if(NOT CASTOR_FOUND)
-     if(fail-on-missing)
-       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
-     else()
--      message(STATUS "Castor not found. Switching off castor/rfio option")
-+      message(STATUS "Castor not found. Switching off castor option")
-       set(castor OFF CACHE BOOL "" FORCE)
-+    endif()
-+  endif()
-+endif()
-+
-+#---Check for RFIO-------------------------------------------------------------------
-+if(rfio)
-+  message(STATUS "Looking for RFIO")
-+  find_package(Castor)
-+  find_package(DPM)
-+  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
-+    if(fail-on-missing)
-+      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
-+    else()
-+      message(STATUS "Castor or DPM not found. Switching off rfio option")
-       set(rfio OFF CACHE BOOL "" FORCE)
-     endif()
-   endif()
-diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
---- root-6.06.02.orig/io/hdfs/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/io/hdfs/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -0,0 +1,10 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT io/hdfs package
-+############################################################################
-+
-+include_directories(${HDFS_INCLUDE_DIRS})
-+
-+ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
-+
-+ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
---- root-6.06.02.orig/io/rfio/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/rfio/CMakeLists.txt	2016-03-20 17:08:52.186461662 +0100
-@@ -2,10 +2,16 @@
- # CMakeLists.txt file for building ROOT io/rfio package
- ############################################################################
- 
--include_directories(${CASTOR_INCLUDE_DIR})
--
- ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO  LINKDEF LinkDef.h)
- 
-+if(CASTOR_FOUND)
-+include_directories(${CASTOR_INCLUDE_DIR})
- ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
-     ${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
-+else()
-+include_directories(${DPM_INCLUDE_DIR})
-+ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
-+    DEPENDENCIES Net RIO)
-+endif()
-+
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
---- root-6.06.02.orig/net/globusauth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/globusauth/CMakeLists.txt	2016-03-20 17:08:52.207461871 +0100
-@@ -8,7 +8,6 @@
- endif()
- 
- ROOT_LINKER_LIBRARY(GlobusAuth *.cxx  LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
--ROOT_INSTALL_HEADERS()
- 
- if(builtin_openssl)
-   ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)
diff --git a/root-cache-test.patch b/root-cache-test.patch
index 1cf437e..3af6575 100644
--- a/root-cache-test.patch
+++ b/root-cache-test.patch
@@ -1,7 +1,8 @@
-diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/src/THistPainter.cxx	2016-03-31 20:09:00.566638573 +0200
-@@ -1907,8 +1907,8 @@
+diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
+index 778381a..e9701c6 100644
+--- a/hist/histpainter/src/THistPainter.cxx
++++ b/hist/histpainter/src/THistPainter.cxx
+@@ -2264,8 +2264,8 @@ Begin_Macro(source)
     Double_t lat2 = 50;
     TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
  
@@ -12,10 +13,11 @@ diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hi
  
     TMultiGraph *mg;
     TKey *key;
-diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
---- root-6.06.02.orig/test/stressGraphics.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressGraphics.cxx	2016-03-31 20:09:57.680125335 +0200
-@@ -1956,7 +1956,8 @@
+diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
+index c734bf6..a95b226 100644
+--- a/test/stressGraphics.cxx
++++ b/test/stressGraphics.cxx
+@@ -1984,7 +1984,8 @@ void th2poly()
     Double_t lat2 = 50;
     TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
  
@@ -25,10 +27,11 @@ diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraph
  
     if (!f) {
        printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
---- root-6.06.02.orig/test/stressHistogram.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressHistogram.cxx	2016-03-30 05:39:17.309313821 +0200
-@@ -10164,7 +10164,8 @@
+diff --git a/test/stressHistogram.cxx b/test/stressHistogram.cxx
+index 25f2c59..f6a3c67 100644
+--- a/test/stressHistogram.cxx
++++ b/test/stressHistogram.cxx
+@@ -10167,7 +10167,8 @@ int stressHistogram()
        refFile = TFile::Open(refFileName, "RECREATE");
     }
     else {
@@ -38,27 +41,30 @@ diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHist
     }
  
     if ( refFile != 0 ) {
-diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
---- root-6.06.02.orig/test/stressRooFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressRooFit.cxx	2016-03-30 05:39:17.330313983 +0200
-@@ -78,9 +78,10 @@
+diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
+index 8256069..fe2a3e1 100644
+--- a/test/stressRooFit.cxx
++++ b/test/stressRooFit.cxx
+@@ -78,10 +78,11 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
           cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
           return 1;
        }
 -      fref = new TWebFile(refFile) ;
 +      TFile::SetCacheFileDir(".");
 +      fref = TFile::Open(refFile,"CACHEREAD") ;
+       //std::cout << "using WEB file " << refFile << std::endl;
      } else {
 -      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
 +      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
+       //std::cout << "using file " << refFile << std::endl;
      }
      if (fref->IsZombie()) {
-       cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
-diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
---- root-6.06.02.orig/test/stressTMVA.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/stressTMVA.cxx	2016-03-30 06:11:11.630058265 +0200
-@@ -2011,21 +2011,15 @@
-   factory->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
+diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
+index 23f522c..128024a 100644
+--- a/test/stressTMVA.cxx
++++ b/test/stressTMVA.cxx
+@@ -2020,21 +2020,15 @@ void MethodUnitTestWithROCLimits::run()
+   dataloader->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
  
    TFile* input(0);
 -
@@ -82,7 +88,7 @@ diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
    if (input == NULL) {
       cerr << "broken/inaccessible input file" << endl;
    }
-@@ -2440,14 +2434,12 @@
+@@ -2451,14 +2445,12 @@ void RegressionUnitTestWithDeviation::run()
     TFile* input(0);
     FileStat_t stat;
  
@@ -100,10 +106,11 @@ diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
     }
     if (input == NULL) {
        cerr << "broken/inaccessible input file" << endl;
-diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
---- root-6.06.02.orig/tmva/pymva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/pymva/test/Classification.C	2016-04-01 18:09:27.283029169 +0200
-@@ -27,23 +27,26 @@
+diff --git a/tmva/pymva/test/Classification.C b/tmva/pymva/test/Classification.C
+index 71987a7..d5c8c6e 100644
+--- a/tmva/pymva/test/Classification.C
++++ b/tmva/pymva/test/Classification.C
+@@ -27,23 +27,26 @@ void Classification()
     TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
           "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
  
@@ -139,10 +146,11 @@ diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/py
  
     std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
  
-diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
---- root-6.06.02.orig/tmva/rmva/test/Classification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/rmva/test/Classification.C	2016-04-01 18:09:50.932225431 +0200
-@@ -36,12 +36,19 @@
+diff --git a/tmva/rmva/test/Classification.C b/tmva/rmva/test/Classification.C
+index 5a2668f..fba8505 100644
+--- a/tmva/rmva/test/Classification.C
++++ b/tmva/rmva/test/Classification.C
+@@ -36,12 +36,19 @@ void Classification()
     factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
     factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
  
@@ -167,10 +175,11 @@ diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmv
  
     std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
  
-diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
---- root-6.06.02.orig/tutorials/hist/th2polyUSA.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/th2polyUSA.C	2016-03-31 20:10:42.970511332 +0200
-@@ -44,8 +44,8 @@
+diff --git a/tutorials/hist/th2polyUSA.C b/tutorials/hist/th2polyUSA.C
+index 5dc69fe..f7adef0 100644
+--- a/tutorials/hist/th2polyUSA.C
++++ b/tutorials/hist/th2polyUSA.C
+@@ -49,8 +49,8 @@ void th2polyUSA()
     Double_t lat2 = 50;
     TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
  
@@ -181,47 +190,22 @@ diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hi
  
     if (!f) {
        printf("Cannot access usa.root. Is internet working ?\n");
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C	2016-04-01 18:06:14.522429453 +0200
-@@ -221,14 +221,16 @@
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
--   TString fname = "./tmva_example.root";   
--   if (!gSystem->AccessPathName( fname )) 
-+   TString fname = "./tmva_class_example.root";
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else    
--      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
---- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVAClassification.C	2016-04-01 18:05:40.808149659 +0200
-@@ -201,13 +201,19 @@
+diff --git a/tutorials/tmva/TMVAClassification.C b/tutorials/tmva/TMVAClassification.C
+index ee2056f..1602cab 100644
+--- a/tutorials/tmva/TMVAClassification.C
++++ b/tutorials/tmva/TMVAClassification.C
+@@ -164,13 +164,19 @@ int TMVAClassification( TString myMethodList = "" )
  
     // Read training and test data
     // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
 +   TFile *input(0);
     TString fname = "./tmva_class_example.root";
--   
+-
 -   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
 -      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--   
+-
 -   TFile *input = TFile::Open( fname );
--   
+-
 +   if (!gSystem->AccessPathName( fname )) {
 +      input = TFile::Open( fname ); // check if file in local directory exists
 +   }
@@ -234,12 +218,86 @@ diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tuto
 +      exit(1);
 +   }
     std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
-    
-    // --- Register the training and test trees
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C	2016-04-01 18:07:00.137808013 +0200
-@@ -123,16 +123,16 @@
+ 
+    // Register the training and test trees
+diff --git a/tutorials/tmva/TMVAClassificationApplication.C b/tutorials/tmva/TMVAClassificationApplication.C
+index 255e187..b03b472 100644
+--- a/tutorials/tmva/TMVAClassificationApplication.C
++++ b/tutorials/tmva/TMVAClassificationApplication.C
+@@ -232,12 +232,14 @@ void TMVAClassificationApplication( TString myMethodList = "" )
+    // we'll later on use only the "signal" events for the test in this example.
+    //
+    TFile *input(0);
+-   TString fname = "./tmva_example.root";
+-   if (!gSystem->AccessPathName( fname ))
++   TString fname = "./tmva_class_example.root";
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
+-
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff --git a/tutorials/tmva/TMVACrossValidation.C b/tutorials/tmva/TMVACrossValidation.C
+index 1b85b98..b46004e 100644
+--- a/tutorials/tmva/TMVACrossValidation.C
++++ b/tutorials/tmva/TMVACrossValidation.C
+@@ -26,10 +26,19 @@ void TMVACrossValidation()
+    TMVA::Tools::Instance();
+ 
+    // Load data
++   TFile *input(0);
+    TString fname = "./tmva_class_example.root";
+-   if (gSystem->AccessPathName(fname))
+-      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
+-   TFile *input = TFile::Open(fname);
++   if (!gSystem->AccessPathName( fname )) {
++      input = TFile::Open( fname ); // check if file in local directory exists
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
++   }
++   if (!input) {
++      std::cout << "ERROR: could not open data file" << std::endl;
++      exit(1);
++   }
+ 
+    TTree* signalTree = (TTree*)input->Get("TreeS");
+    TTree* background = (TTree*)input->Get("TreeB");
+diff --git a/tutorials/tmva/TMVARegression.C b/tutorials/tmva/TMVARegression.C
+index 850ff84..c94ce13 100644
+--- a/tutorials/tmva/TMVARegression.C
++++ b/tutorials/tmva/TMVARegression.C
+@@ -166,11 +166,13 @@ void TMVARegression( TString myMethodList = "" )
+    // load the signal and background event samples from ROOT trees
+    TFile *input(0);
+    TString fname = "./tmva_reg_example.root";
+-   if (!gSystem->AccessPathName( fname ))
++   if (!gSystem->AccessPathName( fname )) {
+       input = TFile::Open( fname ); // check if file in local directory exists
+-   else
+-      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
+-
++   }
++   else {
++      TFile::SetCacheFileDir(".");
++      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
++   }
+    if (!input) {
+       std::cout << "ERROR: could not open data file" << std::endl;
+       exit(1);
+diff --git a/tutorials/tmva/TMVARegressionApplication.C b/tutorials/tmva/TMVARegressionApplication.C
+index 9ceefdf..8a8e62f 100644
+--- a/tutorials/tmva/TMVARegressionApplication.C
++++ b/tutorials/tmva/TMVARegressionApplication.C
+@@ -128,16 +128,16 @@ void TMVARegressionApplication( TString myMethodList = "" )
     // Prepare input tree (this must be replaced by your data source)
     // in this example, there is a toy tree with signal and one with background events
     // we'll later on use only the "signal" events for the test in this example.
@@ -261,24 +319,3 @@ diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.
     if (!input) {
        std::cout << "ERROR: could not open data file" << std::endl;
        exit(1);
-diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
---- root-6.06.02.orig/tutorials/tmva/TMVARegression.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/tmva/TMVARegression.C	2016-03-30 05:58:14.955076174 +0200
-@@ -158,11 +158,13 @@
-    // load the signal and background event samples from ROOT trees
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
--   if (!gSystem->AccessPathName( fname )) 
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
--   
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
diff --git a/root-cernlib-doc.patch b/root-cernlib-doc.patch
deleted file mode 100644
index eb05d5d..0000000
--- a/root-cernlib-doc.patch
+++ /dev/null
@@ -1,1307 +0,0 @@
-diff -ur root-6.06.02.orig/misc/table/inc/TCernLib.h root-6.06.02/misc/table/inc/TCernLib.h
---- root-6.06.02.orig/misc/table/inc/TCernLib.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/inc/TCernLib.h	2016-03-07 19:15:34.726025891 +0100
-@@ -15,7 +15,7 @@
- #include "Rtypes.h"
- #include <string.h>
- 
--// http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
-+// https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
- 
- ///////////////////////////////////////////////////////////////////////////////////////
- //                                                                                   //
-@@ -25,8 +25,9 @@
- // its negative, or a multiple of it, transpose a given matrix, build up a unit      //
- // matrix, multiply a matrix by a diagonal (from left or from right) and may         //
- // add the result to another matrix, add to square matrix the multiple of a diagonal //
--// matrix, compute the products <IMG WIDTH=79 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline191" SRC="gif/mxpack_ABAt.gif"> (<IMG WIDTH=16 HEIGHT=12 ALIGN=BOTTOM ALT="tex2html_wrap_inline193" SRC="gif/mxpack_At.gif"> denotes the transpose of <IMG WIDTH=1
--// It is assumed that matrices are begin_html <B>row-wise without gaps</B> end_html without gaps.                     //
-+// matrix, compute the products X=ABA' (A' denotes the transpose of A) and X=A'BA.   //
-+// It is assumed that matrices are <B>row-wise without gaps</B>, contrary to the     //
-+// Fortran convention.                                                               //
- //                                                                                   //
- ///////////////////////////////////////////////////////////////////////////////////////
- 
-diff -ur root-6.06.02.orig/misc/table/src/TCernLib.cxx root-6.06.02/misc/table/src/TCernLib.cxx
---- root-6.06.02.orig/misc/table/src/TCernLib.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TCernLib.cxx	2016-03-07 19:15:34.728025914 +0100
-@@ -11,8 +11,8 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- // The set of methods to work with the plain matrix / vector
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f110/top.html
--// "derived" from  http://wwwinfo.cern.ch/asdoc/shortwrupsdir/f112/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html
-+// "derived" from  https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html
- //
- // Revision 1.7  2006/05/21 18:05:26  brun
- // Fix more coding conventions violations
-@@ -33,7 +33,7 @@
- //
- // Revision 1.3  2003/04/03 17:39:39  fine
- // Make merge with ROOT 3.05.03 and add TR package
--//122
-+//
- // Revision 1.2  2003/02/04 23:35:20  fine
- // Clean up
- //
-@@ -154,27 +154,24 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication
-+///
- /// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxmlrt_0_(int n__, const float *a, const float *b, float *c, int ni,int nj)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-+// --      ENTRY MXMLRT
-+// --                C = A(I,J) X B(J,J) X A*(J,I)
-+// --                A* TANDS FOR A-TRANSPOSED
-+//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO
-+//             CALL MXMPY (A,B,X,NI,NJ,NJ)
-+//             CALL MXMPY1 (X,A,C,NI,NJ,NI)
- 
--// --      ENTRY MXMLRT */
--// --                C = A(I,J) X B(J,J) X A*(J,I) */
--// --                A* TANDS FOR A-TRANSPOSED */
--//             mxmlrt (A,B,C,NI,NJ)     IS EQUIVALENT TO */
--//             CALL MXMPY (A,B,X,NI,NJ,NJ) */
--//             CALL MXMPY1 (X,A,C,NI,NJ,NI) */
--
--/*        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI) */
--/*             CALL MXMPY (A,Y,C,NI,NJ,NI) */
-+//        OR   CALL MXMPY1 (B,A,Y,NJ,NJ,NI)
-+//             CALL MXMPY (A,Y,C,NI,NJ,NI)
- 
- 
- // --                C = A*(I,J) X B(J,J) X A(J,I)
-@@ -191,6 +188,12 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Matrix Multiplication (double precision)
-+///
-+/// CERN PROGLIB# F110    MXMLRT          .VERSION KERNFOR  2.00  720707
-+/// ORIG. 01/01/64 RKB
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxmlrt_0_(int n__, const double *a, const double *b, double *c, int ni,int nj)
- {
-@@ -215,36 +218,31 @@
-     for (int l = 1; l <= i; ++l,ia += j,++ib) b[ib] = a[ia]; }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Matrix Transposition
- ///
--///  Matrix Transposition
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- float *TCL::mxtrp(const float *a, float *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- } /* mxtrp */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Matrix Transposition (double precision)
-+/// Matrix Transposition (double precision)
-+///
- /// CERN PROGLIB# F110    MXTRP           .VERSION KERNFOR  1.0   650809
- /// ORIG. 01/01/64 RKB
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F110](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f110/top.html)
- 
- double *TCL::mxtrp(const double *a, double *b, int i, int j)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f110/top.html">F110</A>
-- <!--*/
-- // -->END_HTML
--
-    TCL_MXTRP(a, b, i, j)
-    return b;
- 
-@@ -283,38 +281,35 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::traat(const float *a, float *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///  Symmetric Multiplication of Rectangular Matrices
-+/// Symmetric Multiplication of Rectangular Matrices
-+///
- /// CERN PROGLIB# F112    TRAAT           .VERSION KERNFOR  4.15  861204
--/// ORIG. 18/12/74 WH */
-+/// ORIG. 18/12/74 WH
-+///
- /// traat.F -- translated by f2c (version 19970219).
- ///
--///BEGIN_HTML <!--
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::traat(const double *a, double *s, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAAT(a, s, m, n)
-    return s;
- } /* traat_ */
-@@ -346,34 +341,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tral(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
-+/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tral.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRAL            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tral(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAL(a, u, b, m,  n)
-    return b;
- } /* tral_ */
-@@ -405,34 +400,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tralt(const float *a, const float *u, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Triangular - Rectangular Multiplication
-+///
- /// CERN PROGLIB# F112    TRALT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
-+///
- /// tralt.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tralt(const double *a, const double *u, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRALT(a, u, b, m, n)
-    return b;
- } /* tralt_ */
-@@ -470,34 +465,34 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::tras(const float *a, const float *s, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Symmetric - Rectangular Multiplication
--/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRAS            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// tras.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::tras(const double *a, const double *s, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRAS(a, s, b, m, n)
-    return b;
- } /* tras_ */
-@@ -543,51 +538,51 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const float *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trasat(const double *a, const double *s, double *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Transformation of Symmetric Matrix
--/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
-+///
-+/// CERN PROGLIB# F112    TRASAT          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
- /// trasat.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trasat(const double *a, const float *s, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    TCL_TRASAT(a, s, r__, m, n)
-    return r__;
- } /* trasat_ */
-@@ -596,17 +591,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trata.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trata(const float *a, float *r__, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
-@@ -636,22 +629,21 @@
-    return r__;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trats(const float *a, const float *s, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -684,25 +676,22 @@
-    return b;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
--{
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::tratsa(const float *a, const float *s, float *r__, int m, int n)
-+{
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -743,26 +732,23 @@
-    return r__;
- } /* tratsa_ */
- 
--//____________________________________________________________
--// trchlu.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchlu.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- float *TCL::trchlu(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -806,15 +792,17 @@
-    return b;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trchul(const float *a, float *b, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trchul(const float *a, float *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -823,11 +811,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -875,17 +858,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trinv(const float *t, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trinv(const float *t, float *s, int n)
-+{
-    int lhor, ipiv, lver, j;
-    double sum = 0;
-    double r__ = 0;
-@@ -934,22 +915,20 @@
-    return s;
- } /* trinv_ */
- 
--//____________________________________________________________
--// trla.F -- translated by f2c (version 19970219).
--/* Subroutine */float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// trla.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+float *TCL::trla(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, ia, ib, iu;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -981,22 +960,19 @@
- } /* trla_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trlta.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trlta.F -- translated by f2c (version 19970219).
--// Subroutine */float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
-+float *TCL::trlta(const float *u, const float *a, float *b, int m, int n)
- {
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --u;
- 
-@@ -1036,16 +1012,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trpck(const float *s, float *u, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1072,17 +1047,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trqsq(const float *q, const float *s, float *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1140,16 +1113,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trsa(const float *s, const float *a, float *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1190,17 +1162,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */float *TCL::trsinv(const float *g, float *gi, int n)
-+float *TCL::trsinv(const float *g, float *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -1209,17 +1179,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmlu(const float *u, float *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmlu(const float *u, float *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -1246,17 +1214,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */float *TCL::trsmul(const float *g, float *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+float *TCL::trsmul(const float *g, float *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -1284,18 +1250,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- float *TCL::trupck(const float *u, float *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -1336,25 +1299,20 @@
- } /* trupck_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// trsat.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* trsat.F -- translated by f2c (version 19970219).
--// Subroutine */ float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
-+float *TCL::trsat(const float *s, const float *a, float *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;    --s;
- 
-@@ -1391,25 +1349,21 @@
- 
- // ------  double
- 
--//____________________________________________________________
--// trata.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trata.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trata(const double *a, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int i__, j, ia, mn, ir, iat;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATA           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --a;
- 
-@@ -1437,23 +1391,21 @@
-    return 0;
- } /* trata_ */
- 
--//____________________________________________________________
--// trats.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trats.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trats(const double *a, const double *s, double *b, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRATS           .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
-    /* Parameter adjuTments */
-    --b;    --s;    --a;
- 
-@@ -1487,24 +1439,22 @@
-    return 0;
- } /* trats_ */
- 
--//____________________________________________________________
--// tratsa.F -- translated by f2c (version 19970219).
--/* Subroutine */double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
-+////////////////////////////////////////////////////////////////////////////////
-+/// tratsa.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::tratsa(const double *a, const double *s, double *r__, int m, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int imax, i__, j, k;
-    int ia, ir, is, iaa, ind;
-    double sum;
- 
--   /* CERN PROGLIB# F112    TRATSA          .VERSION KERNFOR  4.15  861204 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --r__;    --s;    --a;
- 
-@@ -1547,25 +1497,21 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trchlu.F -- translated by f2c (version 19970219).
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 W.HART
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trchlu(const double *a, double *b, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__, j;
-    double r__, dc;
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHLU          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 W.HART */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1609,15 +1555,17 @@
-    return 0;
- } /* trchlu_ */
- 
--//____________________________________________________________
--// trchul.F -- translated by f2c (version 19970219).
-+////////////////////////////////////////////////////////////////////////////////
-+/// trchul.F -- translated by f2c (version 19970219).
-+///
-+/// CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
- double *TCL::trchul(const double *a, double *b, int n)
- {
-- //BEGIN_HTML <!--
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int ipiv, kpiv, i__;
-    double r__;
-@@ -1626,11 +1574,6 @@
-    int id, kd;
-    double sum;
- 
--
--   /* CERN PROGLIB# F112    TRCHUL          .VERSION KERNFOR  4.16  870601 */
--   /* ORIG. 18/12/74 WH */
--
--
-    /* Parameter adjuTments */
-    --b;    --a;
- 
-@@ -1677,17 +1620,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trinv.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRINV           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trinv(const double *t, double *s, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int lhor, ipiv, lver,  j;
-    double r__;
-    int mx, ndTep, ind;
-@@ -1735,19 +1676,16 @@
- } /* trinv_ */
- 
- ////////////////////////////////////////////////////////////////////////////////
--///
- /// trla.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
- ///
--///BEGIN_HTML <!--
-+/// CERN PROGLIB# F112    TRLA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
-+double *TCL::trla(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    int ipiv, ia, ib, iu;
-    double sum;
- 
-@@ -1782,17 +1720,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trlta.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRLTA           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trlta(const double *u, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int ipiv, mxpn, i__, nTep, ia, ib, iu, mx;
-    double sum;
- 
-@@ -1834,16 +1770,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trpck.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trpck(const double *s, double *u, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRPCK           .VERSION KERNFOR  2.08  741218
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
-+
-+double *TCL::trpck(const double *s, double *u, int n)
-+{
-    int i__, ia, ind, ipiv;
- 
-    /* Parameter adjuTments */
-@@ -1869,17 +1804,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trqsq.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRQSQ           .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trqsq(const double *q, const double *s, double *r__, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    int indq, inds, imax, i__, j, k, l;
-    int iq, ir, is, iqq;
-    double sum;
-@@ -1936,16 +1869,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsa.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+///
-+/// CERN PROGLIB# F112    TRSA            .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsa(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
-@@ -1985,17 +1917,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsinv.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRSINV          .VERSION KERNFOR  2.08  741218
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trsinv(const double *g, double *gi, int n)
-+double *TCL::trsinv(const double *g, double *gi, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Function Body */
-    trchlu(g, gi, n);
-    trinv(gi, gi, n);
-@@ -2006,17 +1936,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmlu.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmlu(const double *u, double *s, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMLU          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmlu(const double *u, double *s, int n)
-+{
-    /* Local variables */
-    int lhor, lver, i__, k, l, ind;
-    double sum;
-@@ -2043,17 +1971,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsmul.F -- translated by f2c (version 19970219).
--/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204 */
--/// ORIG. 18/12/74 WH */
--///BEGIN_HTML <!--
--
--/* Subroutine */double *TCL::trsmul(const double *g, double *gi, int n)
--{
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
-+///
-+/// CERN PROGLIB# F112    TRSMUL          .VERSION KERNFOR  4.15  861204
-+/// ORIG. 18/12/74 WH
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
-+double *TCL::trsmul(const double *g, double *gi, int n)
-+{
-    /* Local variables */
-    int lhor, lver, lpiv, i__, j, k, ind;
-    double sum;
-@@ -2081,18 +2007,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trupck.F -- translated by f2c (version 19970219).
-+///
- /// CERN PROGLIB# F112    TRUPCK          .VERSION KERNFOR  2.08  741218
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
--/* Subroutine */double *TCL::trupck(const double *u, double *s, int m)
-+double *TCL::trupck(const double *u, double *s, int m)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
--
-    int i__, im, is, iu, iv, ih, m2;
- 
-    /* Parameter adjuTments */
-@@ -2133,17 +2056,15 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// trsat.F -- translated by f2c (version 19970219)
-+///
- /// CERN PROGLIB# F112    TRSAT           .VERSION KERNFOR  4.15  861204
- /// ORIG. 18/12/74 WH
--///BEGIN_HTML <!--
-+///
-+/// See original documentation of CERNLIB package
-+/// [F112](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f112/top.html)
- 
- double *TCL::trsat(const double *s, const double *a, double *b, int m, int n)
- {
-- /* -->
--  <b>see original documentation of CERNLIB package</b> <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f112/top.html">F112</A>
-- <!--*/
-- // -->END_HTML
--
-    /* Local variables */
-    int inds, i__, j, k, ia, ib, is;
-    double sum;
diff --git a/root-compiledata.patch b/root-compiledata.patch
deleted file mode 100644
index 4f30e9b..0000000
--- a/root-compiledata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
---- root-6.06.02.orig/build/unix/compiledata.sh	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/build/unix/compiledata.sh	2016-03-18 16:27:27.360982151 +0100
-@@ -75,7 +75,7 @@
- 
- # Remove the flags turning warnings into errors or extending
- # the number of warnings.
--CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
-+CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
- 
- # Determine the compiler version
- BXX="`basename $CXX`"
diff --git a/root-deprecated-options.patch b/root-deprecated-options.patch
deleted file mode 100644
index 0049c46..0000000
--- a/root-deprecated-options.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 15:54:26.038192410 +0100
-+++ root-6.06.02/configure	2016-03-20 16:48:49.767492974 +0100
-@@ -202,7 +202,7 @@
-     enable_unuran=yes
-     enable_vc=yes
-     enable_vdt=yes
--    #enable_r=yes
-+    enable_r=yes
- fi
- 
- # Remove old log file
-@@ -2288,7 +2288,7 @@
-         f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "yes:"; then
-@@ -2318,7 +2318,7 @@
-         f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
-         eval prev='$'`echo ${f}`
-         eval prev_expl='$'`echo ${f}_explicit`
--        if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
-+        if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
-             echo "WARNING: option $1 is deprecated and ignored"'!'
-         else
-             if test "${prev}:${prev_expl}" = "xno:"; then
diff --git a/root-doc-no-notebooks.patch b/root-doc-no-notebooks.patch
new file mode 100644
index 0000000..d2b3625
--- /dev/null
+++ b/root-doc-no-notebooks.patch
@@ -0,0 +1,24 @@
+diff -ur root-6.08.02.orig/documentation/doxygen/filter.cxx root-6.08.02/documentation/doxygen/filter.cxx
+--- root-6.08.02.orig/documentation/doxygen/filter.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/documentation/doxygen/filter.cxx	2016-12-06 20:59:12.642635390 +0100
+@@ -306,18 +306,9 @@
+ 
+       // notebook found
+       if (gLineString.find("\\notebook") != string::npos) {
+-         ExecuteCommand(StringFormat("python converttonotebook.py %s %s/notebooks/",
+-                                          gFileName.c_str(), gOutDir.c_str()));
+-
+-         if (gPython){
+-             gLineString = "## ";
+-         }
+-         else{
+-             gLineString = "/// ";
+-         }
+-         gLineString += StringFormat( "\\htmlonly <a href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
+-
++         gLineString = "";
+       }
++
+       // \macro_output found
+       if (gLineString.find("\\macro_output") != string::npos) {
+          if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()).c_str());
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
deleted file mode 100644
index 1bf85d2..0000000
--- a/root-dox-filter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
---- root-6.06.02.orig/documentation/doxygen/filter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/filter.cxx	2016-03-20 18:25:55.319293945 +0100
-@@ -98,6 +98,7 @@
- 
-    // Source file.
-    if (gSource) {
-+      size_t spos = 0;
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
- 
-@@ -106,10 +107,11 @@
-              gLineString.find("/** \\class")  != string::npos ||
-              gLineString.find("///! \\class") != string::npos) gClass = true;
- 
--         if (gLineString.find("End_Macro") != string::npos) {
-+         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
-             ReplaceAll(gLineString,"End_Macro","");
-             gImageSource = false;
-             gInMacro = 0;
-+            spos = 0;
-             if (m) {
-                fclose(m);
-                m = 0;
-@@ -122,8 +124,9 @@
-          }
- 
-          if (gInMacro) {
-+            if (spos) gLineString = gLineString.substr(spos);
-             if (gInMacro == 1) {
--               if (EndsWith(gLineString,".C\n")) {
-+               if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
-                   ExecuteMacro();
-                   gInMacro++;
-                } else {
-@@ -153,14 +156,27 @@
-             }
-          }
- 
--         if (gLineString.find("Begin_Macro") != string::npos) {
-+         if (gLineString.find("Begin_Macro") != string::npos &&
-+             gLineString.find("End_Macro") == string::npos) {
-+            if (BeginsWith(gLineString, "///")) {
-+               spos = gLineString.find_first_not_of(' ', 3);
-+            }
-             if (gLineString.find("source") != string::npos) gImageSource = true;
-             gImageID++;
-             gInMacro++;
-             gLineString = "\n";
-          }
- 
--         printf("%s",gLineString.c_str());
-+         size_t l = gLineString.length();
-+         size_t b = 0;
-+         do {
-+            size_t e = gLineString.find('\n', b);
-+            if (e != string::npos) e++;
-+            if (spos) printf("%-*s%s", (int)spos, "///",
-+                              gLineString.substr(b, e - b).c_str());
-+            else printf("%s", gLineString.substr(b, e - b).c_str());
-+            b = e;
-+         } while (b < l);
-       }
-       fclose(f);
-       return 0;
-@@ -203,7 +219,8 @@
-    if (gSource) {
-       while (fgets(gLine,255,f)) {
-          gLineString = gLine;
--         if (gLineString.find("ClassImp") != string::npos) {
-+         if (gLineString.find("ClassImp") != string::npos ||
-+             gLineString.find("NamespaceImp") != string::npos) {
-             i1         = gLineString.find("(")+1;
-             i2         = gLineString.find(")")-1;
-             gClassName = gLineString.substr(i1,i2-i1+1);
-@@ -238,8 +255,8 @@
- 
-    // Build the ROOT command to be executed.
-    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
--   int l = gLineString.length();
--   gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
-+   size_t l = gLineString.length();
-+   gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
- 
-    ExecuteCommand(gLineString);
- 
diff --git a/root-doxyfile.patch b/root-doxyfile.patch
deleted file mode 100644
index 46d6dde..0000000
--- a/root-doxyfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
---- root-6.06.02.orig/documentation/doxygen/Doxyfile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/doxygen/Doxyfile	2016-04-04 04:40:27.000000000 +0200
-@@ -2058,7 +2058,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--MACRO_EXPANSION        = NO
-+MACRO_EXPANSION        = YES
- 
- # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
- # the macro expansion is limited to the macros specified with the PREDEFINED and
-@@ -2066,7 +2066,7 @@
- # The default value is: NO.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--EXPAND_ONLY_PREDEF     = NO
-+EXPAND_ONLY_PREDEF     = YES
- 
- # If the SEARCH_INCLUDES tag is set to YES the includes files in the
- # INCLUDE_PATH will be searched if a #include is found.
-@@ -2098,7 +2098,7 @@
- # recursively expanded use the := operator instead of the = operator.
- # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
- 
--PREDEFINED             =
-+PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
- 
- # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
- # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/root-doxygen-warnings.patch b/root-doxygen-warnings.patch
deleted file mode 100644
index 35814e2..0000000
--- a/root-doxygen-warnings.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h	2016-04-06 15:27:12.238754375 +0200
-@@ -1,4 +1,4 @@
--/// \file impl_tuple_apply.h
-+/// \file ROOT/impl_tuple_apply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h	2016-04-06 15:26:02.228280069 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RArrayView.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h	2016-04-06 15:27:03.919698016 +0200
-@@ -1,4 +1,4 @@
--/// \file rhysd_array_view.h
-+/// \file ROOT/rhysd_array_view.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h	2016-04-06 15:26:30.392470876 +0200
-@@ -1,4 +1,4 @@
--/// \file RArrayView.h
-+/// \file ROOT/RTupleApply.h
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h	2016-04-06 15:22:08.629702559 +0200
-@@ -1,4 +1,4 @@
--/// \file TCoopPtr
-+/// \file ROOT/TCoopPtr.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h	2016-04-06 15:22:35.960886031 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDirectory.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h	2016-04-06 15:23:28.468238508 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TDrawable.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-08-07
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h	2016-04-06 15:23:57.359434110 +0200
-@@ -1,4 +1,4 @@
--/// \file TKey.h
-+/// \file ROOT/TKey.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
---- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h	2016-04-06 15:24:38.710714256 +0200
-@@ -1,4 +1,4 @@
--/// \file TDirectory.h
-+/// \file ROOT/TLogger.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-29
-diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
---- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h	2016-04-07 06:52:03.825926112 +0200
-@@ -57,7 +57,7 @@
-       // Same value as TVirtualCollectionProxy.
-       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
- 
--   /** @class template TCollectionProxyInfo::IteratorValue
-+   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
-     *
-     * Small helper to encapsulate whether to return the value
-     * pointed to by the iterator or its address.
-@@ -76,7 +76,7 @@
-          }
-       };
- 
--   /** @class template TCollectionProxyInfo::Iterators
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
-     *
-     * Small helper to implement the function to create,access and destroy
-     * iterators.
-@@ -204,7 +204,7 @@
-          }
-       };
- 
--  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
-+  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
-     *
-     * Small helper to save proxy environment in the event of
-     * recursive calls.
-@@ -276,7 +276,7 @@
-       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
-    };
- 
--   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Type
-     *
-     * Small helper to encapsulate basic data accesses for
-     * all STL continers.
-@@ -356,7 +356,7 @@
- 
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like vector, list, deque
-@@ -389,7 +389,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like forward_list
-@@ -425,7 +425,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-@@ -457,7 +457,7 @@
-       }
-    };
- 
--   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
-+   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
-     *
-     * Small helper to encapsulate all necessary data accesses for
-     * containers like set, multiset etc.
-diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
---- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h	2016-04-06 15:29:40.178756637 +0200
-@@ -1,4 +1,4 @@
--/// \file TCanvas.h
-+/// \file ROOT/TCanvas.h
- /// \ingroup Gpad ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-08
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx	2016-04-06 13:52:29.064736441 +0200
-@@ -26,7 +26,7 @@
- #include "TClass.h"
- #include "TError.h"
- 
--/** \class
-+/** \class TGLPolyMarker
- \ingroup opengl
- To draw a 3D polymarker in a GL window.
- */
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx	2016-04-06 13:53:23.837160381 +0200
-@@ -14,7 +14,7 @@
- 
- #include <string.h>
- 
--/** \class
-+/** \class TGLSelectRecordBase
- \ingroup opengl TGLSelectRecordBase
- Base class for select records.
- Supports initialization from a raw GL record (UInt_t*) and
-diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx	2016-04-06 13:54:42.651770407 +0200
-@@ -15,7 +15,7 @@
- #include "TGLPlotCamera.h"
- #include "TGLIncludes.h"
- 
--/** \class
-+/** \class TGLVoxelPainter
- \ingroup opengl
- Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
- */
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-04-07 06:55:45.067740071 +0200
-@@ -49,11 +49,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
--\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
--\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
--\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
--\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
-+\class TH1C
-+\brief 1-D histogram with a byte per channel (see TH1 documentation)
-+\class TH1S
-+\brief 1-D histogram with a short per channel (see TH1 documentation)
-+\class TH1I
-+\brief 1-D histogram with an int per channel (see TH1 documentation)}
-+\class TH1F
-+\brief 1-D histogram with a float per channel (see TH1 documentation)}
-+\class TH1D
-+\brief 1-D histogram with a double per channel (see TH1 documentation)}
- @}
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-04-07 09:26:40.573880803 +0200
-@@ -30,11 +30,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
--\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
--\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
--\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
--\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
-+\class TH2C
-+\brief 2-D histogram with a byte per channel (see TH1 documentation)
-+\class TH2S
-+\brief 2-D histogram with a short per channel (see TH1 documentation)
-+\class TH2I
-+\brief 2-D histogram with an int per channel (see TH1 documentation)}
-+\class TH2F
-+\brief 2-D histogram with a float per channel (see TH1 documentation)}
-+\class TH2D
-+\brief 2-D histogram with a double per channel (see TH1 documentation)}
- @}
- */ 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
---- root-6.06.02.orig/hist/hist/src/TH3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH3.cxx	2016-04-07 09:27:06.173017889 +0200
-@@ -28,11 +28,16 @@
- 
- /** \addtogroup Hist
- @{
--\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
--\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
--\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
--\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
--\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
-+\class TH3C
-+\brief 3-D histogram with a byte per channel (see TH1 documentation)
-+\class TH3S
-+\brief 3-D histogram with a short per channel (see TH1 documentation)
-+\class TH3I
-+\brief 3-D histogram with an int per channel (see TH1 documentation)}
-+\class TH3F
-+\brief 3-D histogram with a float per channel (see TH1 documentation)}
-+\class TH3D
-+\brief 3-D histogram with a double per channel (see TH1 documentation)}
- @} 
- */
- 
-diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
---- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx	2016-04-06 15:34:29.885719340 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistDrawable.cxx
-+/// \file THistDrawable.cxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-11
-diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
---- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx	2016-04-06 15:36:05.225365245 +0200
-@@ -1,4 +1,4 @@
--/// \file ROOT/THistPainter.cxx
-+/// \file THistPainter.cxx
- /// \ingroup HistPainter ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
---- root-6.06.02.orig/html/src/TDocOutput.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/TDocOutput.cxx	2016-04-06 17:05:08.613380373 +0200
-@@ -2463,7 +2463,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Write the first part of the links shown ontop of each doc page;
--/// one <div> has to be closed by caller so additional items can still
-+/// one \<div\> has to be closed by caller so additional items can still
- /// be added.
- 
- void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
-diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
---- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/dcache/inc/TDCacheFile.h	2016-04-06 17:05:58.695761365 +0200
-@@ -63,7 +63,7 @@
-                        const char *location = 0);
-    static Bool_t CheckFile(const char *path, const char *location = 0);
- 
--   /// Note: This must be kept in sync with values #defined in dcap.h
-+   /// Note: This must be kept in sync with values \#defined in dcap.h
-    enum EOnErrorAction {
-       kOnErrorRetry   =  1,
-       kOnErrorFail    =  0,
-diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
---- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h	2016-04-06 15:50:50.695248333 +0200
-@@ -160,7 +160,7 @@
- };
- 
- /**
-- \class TCollectionClassStreamer TCollectionProxy.h
-+ \class TCollectionClassStreamer TCollectionProxyFactory.h
-  \ingroup IO
- 
-  Class streamer object to implement TClassStreamer functionality
-diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
---- root-6.06.02.orig/io/io/src/TMakeProject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TMakeProject.cxx	2016-04-06 17:07:01.370235962 +0200
-@@ -434,7 +434,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include needed for the argument of
-+/// Add to the header file, the \#include needed for the argument of
- /// this template.
- 
- UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
-@@ -587,7 +587,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Add to the header file anything that need to appear after the class
--/// declaration (this includes some #pragma link).
-+/// declaration (this includes some \#pragma link).
- 
- void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
- {
-diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
---- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TStreamerInfo.cxx	2016-04-06 17:07:43.579564101 +0200
-@@ -3645,7 +3645,7 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Add to the header file, the #include need for this class.
-+/// Add to the header file, the \#include need for this class.
- 
- UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
- {
-diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
---- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h	2016-04-06 15:37:54.096102821 +0200
-@@ -1,4 +1,4 @@
--/// \file TFile.h
-+/// \file ROOT/TFile.h
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
---- root-6.06.02.orig/math/doc/Math.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/Math.md	2016-04-07 10:27:29.799138394 +0200
-@@ -4,7 +4,7 @@
- 
- \brief The %ROOT Mathematical Libraries.
- 
--See the \subpage MathPage "Mathematical Libraries" description page.
-+See the \ref MathPage "Mathematical Libraries" description page.
- 
- 
- \page MathPage The ROOT Mathematical Libraries 
-@@ -39,7 +39,7 @@
- - **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
- 
-    - Physics: library with the TVector3 and TLorentzVector classes.
--   - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page. 
-+   - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
- 
- - \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions. 
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
---- root-6.06.02.orig/math/mathcore/inc/Math/Random.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/Random.h	2016-04-07 05:35:46.482275553 +0200
-@@ -18,9 +18,7 @@
- #define ROOT_Math_Random
- 
- /**
--@defgroup Random 
--
-- Interface class for Random number generation
-+@defgroup Random Interface class for Random number generation
- */
- 
- #include "Math/RandomFunctions.h"
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-04-06 17:10:52.593135769 +0200
-@@ -209,7 +209,7 @@
- 
-   /**
- 
--  Calculates the real part of the cosine integral \Re(Ci).
-+  Calculates the real part of the cosine integral Re(Ci).
- 
-   For x<0, the imaginary part is \pi i and has to be added by the user,
-   for x>0 the imaginary part of Ci(x) is 0.
-diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
---- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TKDTree.cxx	2016-04-06 15:52:05.037737876 +0200
-@@ -21,7 +21,8 @@
- 
- /**
- 
--\class TKDTree class implementing a kd-tree
-+\class TKDTree
-+\brief Class implementing a kd-tree
- 
- 
- 
-diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
---- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h	2016-04-06 17:54:03.364574676 +0200
-@@ -1,4 +1,4 @@
--/// \file TFit.h
-+/// \file ROOT/TFit.h
- /// \ingroup MathCore ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
---- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h	2016-04-06 15:19:36.635682240 +0200
-@@ -83,9 +83,6 @@
- 
-     It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
-     instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
--
--    @ingroup MCIntegration
--
-    */
- 
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h	2016-04-06 15:05:19.713897159 +0200
-@@ -51,7 +51,7 @@
-    and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
-                \cdot \left ( \int \limits_{0}^{1}
-                \frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
--               - \kappa \, e^{\frac{-s}{\kappa}}\f$.
-+               - \kappa \, e^{\frac{-s}{\kappa}}\f].
-    \f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
- 
-    The parameters are:
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-04-07 09:55:57.093992371 +0200
-@@ -84,16 +84,17 @@
- // [5.2.1.6] (complete) elliptic integral of the third kind
- // (26.x.17.2)
- /**
-+Complete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-@@ -220,16 +221,17 @@
- // phi in radians
- // (26.x.17.1)
- /**
-+Incomplete elliptic integral of the third kind.
- 
- There are two different definitions used for the elliptic
- integral of the third kind:
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- and
--
--P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
--
-+\f[
-+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
-+\f]
- the former is adopted by
- 
- - GSL
-diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
---- root-6.06.02.orig/math/unuran/doc/Unuran.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/doc/Unuran.md	2016-04-06 17:30:53.517632259 +0200
-@@ -38,7 +38,7 @@
-     - The user can optionally provide the
- 	  - cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
- 	  - the mode via **TUnuranContDist::SetMode**,
--      - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
-+	  - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
- 	  - the area below the pdf via **TUnuranContDist::SetPdfArea**.
- 
- Some of this information is required depending on the chosen UNURAN generation method.
-diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
---- root-6.06.02.orig/net/glite/inc/TGLiteResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/inc/TGLiteResult.h	2016-04-06 15:41:31.962569095 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.h
-+/*! \file TGLiteResult.h
- *//*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
---- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/glite/src/TGLiteResult.cxx	2016-04-06 15:41:59.755752113 +0200
-@@ -10,7 +10,7 @@
-  *************************************************************************/
- 
- /************************************************************************/
--/*! \file TGLiteresult.cxx
-+/*! \file TGLiteResult.cxx
-  */ /*
- 
-          version number:    $LastChangedRevision: 1678 $
-diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
---- root-6.06.02.orig/net/http/src/THttpCallArg.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpCallArg.cxx	2016-04-07 09:18:31.987498647 +0200
-@@ -60,8 +60,8 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// method used to get or set http header in the string buffer
- /// Header has following format:
--///   field1 : value1\r\n
--///   field2 : value2\r\n
-+///   field1 : value1\\r\\n
-+///   field2 : value2\\r\\n
- /// Such format corresponds to header format in HTTP requests
- 
- TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
-diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
---- root-6.06.02.orig/net/net/src/TWebFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TWebFile.cxx	2016-04-06 17:18:57.433964872 +0200
-@@ -1195,7 +1195,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
--/// line [\r]\n. If so, return the pointer to the position after the line,
-+/// line [\\r]\\n. If so, return the pointer to the position after the line,
- /// otherwise return 0. This is used as callback to GetHunk(). The data
- /// between START and PEEKED has been read and cannot be "unread"; the
- /// data after PEEKED has only been peeked.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
---- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h	2016-04-06 17:34:02.717120497 +0200
-@@ -813,7 +813,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-@@ -826,7 +826,7 @@
- 
- 	/** @brief I/O manipulator support
- 	 *
--	 * @param f manipulator
-+	 * @param manip manipulator
- 	 * @returns pipe with manipulator applied
- 	 *
- 	 * example:
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx	2016-04-06 17:35:25.398770868 +0200
-@@ -1002,7 +1002,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- /// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
- 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx	2016-04-06 17:36:08.129106984 +0200
-@@ -1264,7 +1264,7 @@
- ///   FixedPrecision(int n)     -- Controls precision, set fixed number of digits
- ///   AutoPrecision(int n)      -- Controls precision. Number of shown digits is calculated from error 
- ///                                + n specified additional digits (1 is sensible default)
--///   VerbatimName(Bool_t flag) -- Put variable name in a \verb+   + clause.
-+///   VerbatimName(Bool_t flag) -- Put variable name in a \\verb+   + clause.
- ///
- 
- RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2, 
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx	2016-04-06 17:37:51.058916416 +0200
-@@ -21,7 +21,7 @@
-    RooAbsReal is the common abstract base class for objects that represent a
-    real value and implements functionality common to all real-valued objects
-    such as the ability to plot them, to construct integrals of them, the
--   ability to advertise (partial) analytical integrals etc..
-+   ability to advertise (partial) analytical integrals etc.
-    
-    Implementation of RooAbsReal may be derived, thus no interface
-    is provided to modify the contents.
-diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
---- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx	2016-04-06 15:08:46.129315457 +0200
-@@ -838,7 +838,7 @@
- /// L = TLatex mode
- /// X = Latex mode
- /// Y = Latex table mode ( '=' replaced by '&' )
--/// V = Make name \verbatim in Latex mode
-+/// V = Make name \\verbatim in Latex mode
- /// P = use error to control shown precision
- /// F = force fixed precision
- ///
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h	2016-04-06 15:09:46.205718743 +0200
-@@ -55,7 +55,7 @@
-    confidence level is reached within an acceptable neighborhood as defined by
-    SetEpsilon(). More specifically: we calculate the following for different
-    cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
--   d{normset} \$.
-+   d{normset} \f$.
-    Important note: this is not the default method because of a bug in constructing
-    the RooNDKeysPdf from a weighted data set.  Configure to use this method by
-    calling SetUseKeys(true), and the data set will be interpreted without weights.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h	2016-04-07 06:17:01.453676714 +0200
-@@ -53,7 +53,7 @@
- To make Propose(xPrime, x) dependent on x, configure with
- PdfProposal::AddMapping(varToUpdate, valueToUse).  For example, suppose we have:
- 
--````{.cpp}
-+~~~{.cpp}
- // our parameter
- RooRealVar p("p", "p", 5, 0, 10);
- 
-@@ -74,7 +74,7 @@
- // number of proposals. If you don't call this function, the default cache size
- // is 1, which can be slow.
- pdfProposal.SetCacheSize(desiredCacheSize);
--````
-+~~~
- 
- PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
- for future versions.
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h	2016-04-07 07:05:58.067764467 +0200
-@@ -40,8 +40,8 @@
- By default the calculation is:
- 
- \f[
--	\log{    \frac{  \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
--   	              { \lambda(\mu_{null} , {conditional \: MLE \: for \:  null \: nuisance}) } }
-+        \log{    \frac{ \lambda(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
- \f]
- 
- where \f$ \lambda \f$ is the profile likeihood ratio, so the 
-@@ -50,11 +50,11 @@
- If ``SetSubtractMLE(false)`` then it calculates:
- 
- \f[
-+        \log{    \frac{ L(\mu_{alt}  , {conditional \: MLE \: for \: alt  \: nuisance}) }
-+                      { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
-+\f]
- 
--	\log{    \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }         
--                      { L(\mu_null , {conditional \: MLE \: for \:  null \: nuisance}) } }
--
--where \f$ L\$ is the Likelihood function. 
-+where \f$ L \f$ is the Likelihood function.
- 
- The values of the parameters of interest for the alternative 
- hypothesis are taken at the time of the construction.
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx	2016-04-06 16:16:28.650063487 +0200
-@@ -9,7 +9,7 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
--/** \class Detail::TBranchProxy
-+/** \class ROOT::Detail::TBranchProxy
- Base class for all the proxy object. It includes the imeplemtation
- of the autoloading of branches as well as all the generic setup routine.
- */
diff --git a/root-fflags.patch b/root-fflags.patch
deleted file mode 100644
index 3fd6f0e..0000000
--- a/root-fflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-03-15 18:28:14.350609028 +0100
-@@ -70,7 +70,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -107,7 +107,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-@@ -144,7 +144,7 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
- 
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
---- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpMacOS.cmake	2016-03-15 18:28:14.348609011 +0100
-@@ -37,12 +37,12 @@
-        SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
-     else(${SYSCTL_OUTPUT} MATCHES 64)
-        MESSAGE(STATUS "Found a 32bit system")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
-+       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
-     endif(${SYSCTL_OUTPUT} MATCHES 64)
-   endif()
- 
-@@ -65,7 +65,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-@@ -101,7 +101,7 @@
- 
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
--     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+     SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
-      SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-      SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
- 
-diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
---- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpWindows.cmake	2016-03-15 18:28:14.347609002 +0100
-@@ -13,7 +13,7 @@
- 
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe  -Wall -W -Woverloaded-virtual -fPIC")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
--  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
- 
-   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
-   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 9efdcb2..587fc3f 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.06.06.orig/core/base/src/TApplication.cxx root-6.06.06/core/base/src/TApplication.cxx
---- root-6.06.06.orig/core/base/src/TApplication.cxx	2016-08-13 17:36:58.444770418 +0200
-+++ root-6.06.06/core/base/src/TApplication.cxx	2016-08-13 17:38:21.645532552 +0200
-@@ -265,18 +265,11 @@
+diff -ur root-6.08.02.orig/core/base/src/TApplication.cxx root-6.08.02/core/base/src/TApplication.cxx
+--- root-6.08.02.orig/core/base/src/TApplication.cxx	2016-12-06 12:46:10.308969599 +0100
++++ root-6.08.02/core/base/src/TApplication.cxx	2016-12-06 12:54:51.662058443 +0100
+@@ -273,18 +273,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.06.06.orig/core/base/src/TApplication.cxx root-6.06.06/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -290,7 +283,6 @@
+@@ -298,7 +291,6 @@
        }
     }
  #endif
@@ -30,35 +30,217 @@ diff -ur root-6.06.06.orig/core/base/src/TApplication.cxx root-6.06.06/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.06.06.orig/graf2d/graf/CMakeLists.txt root-6.06.06/graf2d/graf/CMakeLists.txt
---- root-6.06.06.orig/graf2d/graf/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf2d/graf/CMakeLists.txt	2016-08-13 17:38:21.645532552 +0200
-@@ -12,7 +12,7 @@
+diff -ur root-6.08.02.orig/graf2d/asimage/CMakeLists.txt root-6.08.02/graf2d/asimage/CMakeLists.txt
+--- root-6.08.02.orig/graf2d/asimage/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/asimage/CMakeLists.txt	2016-12-06 12:54:51.691058115 +0100
+@@ -13,7 +13,7 @@
+ ROOT_GENERATE_DICTIONARY(G__ASImage TASImage.h TASImagePlugin.h TASPluginGS.h MODULE ASImage LINKDEF LinkDef.h  OPTIONS "-writeEmptyRootPCM")
+ 
+ ROOT_LINKER_LIBRARY(ASImage TASImage.cxx TASPluginGS.cxx  G__ASImage.cxx
+-                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
++                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
+                     ${ZLIB_LIBRARIES} DEPENDENCIES Graf)
+ if(builtin_afterimage)
+   ROOT_ADD_BUILTIN_DEPENDENCIES(ASImage AFTERIMAGE)
+diff -ur root-6.08.02.orig/graf2d/asimage/Module.mk root-6.08.02/graf2d/asimage/Module.mk
+--- root-6.08.02.orig/graf2d/asimage/Module.mk	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/asimage/Module.mk	2016-12-06 12:54:51.692058104 +0100
+@@ -226,7 +226,7 @@
+ 		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
+ 		   "$(ASIMAGEO) $(ASIMAGEDO)" \
+ 		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \
+-                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
++                    $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig \
+ 		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(ASNEEDX11LIBS)"
+ 
+ $(call pcmrule,ASIMAGE)
+diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:46:10.320969463 +0100
++++ root-6.08.02/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:54:51.693058093 +0100
+@@ -110,6 +110,8 @@
+ #   include <draw.h>
+ }
+ 
++#include <fontconfig/fontconfig.h>
++
+ // auxiliary functions for general polygon filling
+ #include "TASPolyUtils.c"
+ 
+@@ -2593,14 +2595,120 @@
+    TString fn = font_name;
+    fn.Strip();
+ 
+-   // This is for backward compatibility...
+-   if (fn.Last('/') == 0) fn = fn(1, f.Length() - 1);
++   const char *basename = gSystem->BaseName(fn);
++
++   char *ttfnt = NULL;
++   int ttindex = 0;
++
++   FcPattern *pat, *match;
++   FcResult result;
++
++   pat = FcPatternCreate ();
++
++   if (strcmp(basename, "timesi.ttf") == 0 ||
++       strcmp(basename, "FreeSerifItalic.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "timesbd.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBold.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "timesbi.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "arial.ttf") == 0 ||
++            strcmp(basename, "FreeSans.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "ariali.ttf") == 0 ||
++            strcmp(basename, "FreeSansOblique.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "arialbd.ttf") == 0 ||
++            strcmp(basename, "FreeSansBold.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "arialbi.ttf") == 0 ||
++            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "cour.ttf") == 0 ||
++            strcmp(basename, "FreeMono.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "couri.ttf") == 0 ||
++            strcmp(basename, "FreeMonoOblique.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "courbd.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBold.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "courbi.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else if (strcmp(basename, "symbol.ttf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "times.ttf") == 0 ||
++            strcmp(basename, "FreeSerif.otf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "wingding.ttf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++   else if (strcmp(basename, "BlackChancery.ttf") == 0) {
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"urwchanceryl");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
++   }
++   else {
++      Warning("DrawText", "cannot find a font %s", font_name);
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
++      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
++      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
++   }
++
++   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcDefaultSubstitute (pat);
++   match = FcFontMatch (NULL, pat, &result);
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
++   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
+ 
+-   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                       TROOT::GetTTFFontDir());
+-   char *tmpstr = gSystem->Which(ttpath, fn, kReadPermission);
+-   fn = tmpstr;
+-   delete [] tmpstr;
++   fn = ttfnt;
++
++   FcPatternDestroy (match);
++   FcPatternDestroy (pat);
+ 
+    if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
+       ttfont = kTRUE;
+@@ -2624,14 +2732,11 @@
+       return;
+    }
+ 
+-   ASFont *font = get_asfont(gFontManager, fn.Data(), 0, size, ASF_GuessWho);
++   ASFont *font = get_asfont(gFontManager, fn.Data(), ttindex, size, ASF_GuessWho);
+ 
+    if (!font) {
+-      font = get_asfont(gFontManager, "fixed", 0, size, ASF_GuessWho);
+-      if (!font) {
+-         Warning("DrawText", "cannot find a font %s", font_name);
+-         return;
+-      }
++      Warning("DrawText", "cannot find a font %s", font_name);
++      return;
+    }
+ 
+    get_text_size(text, font, (ASText3DType)type, &width, &height);
+diff -ur root-6.08.02.orig/graf2d/graf/CMakeLists.txt root-6.08.02/graf2d/graf/CMakeLists.txt
+--- root-6.08.02.orig/graf2d/graf/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/graf/CMakeLists.txt	2016-12-06 12:54:51.693058093 +0100
+@@ -10,7 +10,7 @@
  
  include_directories(${FREETYPE_INCLUDE_DIRS})
  
--ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
-+ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
+-ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
++ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
  
  if(builtin_freetype)
-   add_dependencies(${libname} FREETYPE)
-diff -ur root-6.06.06.orig/graf2d/graf/inc/TTF.h root-6.06.06/graf2d/graf/inc/TTF.h
---- root-6.06.06.orig/graf2d/graf/inc/TTF.h	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf2d/graf/inc/TTF.h	2016-08-13 17:38:21.645532552 +0200
-@@ -86,9 +86,8 @@
-    static FT_BBox        fgCBox;                  // string control box
-    static FT_CharMap     fgCharMap[kTTMaxFonts];  // font character map
-    static Int_t          fgCurFontIdx;            // current font index
--   static Int_t          fgSymbItaFontIdx;        // Symbol italic font index
-    static Int_t          fgFontCount;             // number of fonts loaded
--   static char          *fgFontName[kTTMaxFonts]; // font name
-+   static Int_t          fgFontID[kTTMaxFonts];   // font ID
-    static FT_Face        fgFace[kTTMaxFonts];     // font face
-    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    // glyphs
-    static Bool_t         fgHinting;               // use hinting (true by default)
-diff -ur root-6.06.06.orig/graf2d/graf/Module.mk root-6.06.06/graf2d/graf/Module.mk
---- root-6.06.06.orig/graf2d/graf/Module.mk	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf2d/graf/Module.mk	2016-08-13 17:38:21.646532562 +0200
+   ROOT_ADD_BUILTIN_DEPENDENCIES(${libname} FREETYPE)
+diff -ur root-6.08.02.orig/graf2d/graf/inc/TTF.h root-6.08.02/graf2d/graf/inc/TTF.h
+--- root-6.08.02.orig/graf2d/graf/inc/TTF.h	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/graf/inc/TTF.h	2016-12-06 12:54:51.693058093 +0100
+@@ -78,9 +78,8 @@
+    static FT_BBox        fgCBox;                  ///< string control box
+    static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
+    static Int_t          fgCurFontIdx;            ///< current font index
+-   static Int_t          fgSymbItaFontIdx;        ///< Symbol italic font index
+    static Int_t          fgFontCount;             ///< number of fonts loaded
+-   static char          *fgFontName[kTTMaxFonts]; ///< font name
++   static Int_t          fgFontID[kTTMaxFonts];   ///< font ID
+    static FT_Face        fgFace[kTTMaxFonts];     ///< font face
+    static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
+    static Bool_t         fgHinting;               ///< use hinting (true by default)
+diff -ur root-6.08.02.orig/graf2d/graf/Module.mk root-6.08.02/graf2d/graf/Module.mk
+--- root-6.08.02.orig/graf2d/graf/Module.mk	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/graf/Module.mk	2016-12-06 12:54:51.693058093 +0100
 @@ -46,7 +46,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -68,9 +250,9 @@ diff -ur root-6.06.06.orig/graf2d/graf/Module.mk root-6.06.06/graf2d/graf/Module
  
  $(call pcmrule,GRAF)
  	$(noop)
-diff -ur root-6.06.06.orig/graf2d/graf/src/TTF.cxx root-6.06.06/graf2d/graf/src/TTF.cxx
---- root-6.06.06.orig/graf2d/graf/src/TTF.cxx	2016-08-13 17:36:58.458770546 +0200
-+++ root-6.06.06/graf2d/graf/src/TTF.cxx	2016-08-13 17:38:21.647532571 +0200
+diff -ur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/TTF.cxx
+--- root-6.08.02.orig/graf2d/graf/src/TTF.cxx	2016-12-06 12:46:10.322969441 +0100
++++ root-6.08.02/graf2d/graf/src/TTF.cxx	2016-12-06 12:54:51.700058013 +0100
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -631,19 +813,19 @@ diff -ur root-6.06.06.orig/graf2d/graf/src/TTF.cxx root-6.06.06/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.06.06.orig/graf2d/postscript/CMakeLists.txt root-6.06.06/graf2d/postscript/CMakeLists.txt
---- root-6.06.06.orig/graf2d/postscript/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf2d/postscript/CMakeLists.txt	2016-08-13 17:38:21.647532571 +0200
+diff -ur root-6.08.02.orig/graf2d/postscript/CMakeLists.txt root-6.08.02/graf2d/postscript/CMakeLists.txt
+--- root-6.08.02.orig/graf2d/postscript/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/postscript/CMakeLists.txt	2016-12-06 12:54:51.700058013 +0100
 @@ -5,5 +5,5 @@
  
  ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
  
--ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
-+ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext fontconfig DEPENDENCIES Graf)
+-ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Graf)
++ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Graf)
  ROOT_INSTALL_HEADERS()
-diff -ur root-6.06.06.orig/graf2d/postscript/Module.mk root-6.06.06/graf2d/postscript/Module.mk
---- root-6.06.06.orig/graf2d/postscript/Module.mk	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf2d/postscript/Module.mk	2016-08-13 17:38:21.647532571 +0200
+diff -ur root-6.08.02.orig/graf2d/postscript/Module.mk root-6.08.02/graf2d/postscript/Module.mk
+--- root-6.08.02.orig/graf2d/postscript/Module.mk	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/postscript/Module.mk	2016-12-06 12:54:51.700058013 +0100
 @@ -50,7 +50,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -653,9 +835,9 @@ diff -ur root-6.06.06.orig/graf2d/postscript/Module.mk root-6.06.06/graf2d/posts
  
  $(call pcmrule,POSTSCRIPT)
  	$(noop)
-diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx	2016-08-13 17:36:58.459770555 +0200
-+++ root-6.06.06/graf2d/postscript/src/TPostScript.cxx	2016-08-13 17:38:21.648532580 +0200
+diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:46:10.322969441 +0100
++++ root-6.08.02/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:54:51.701058002 +0100
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -664,7 +846,7 @@ diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1528,56 +1529,179 @@
+@@ -1529,56 +1530,179 @@
  
  void TPostScript::FontEmbed(void)
  {
@@ -889,7 +1071,7 @@ diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1586,9 +1710,8 @@
+@@ -1587,9 +1711,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -901,7 +1083,7 @@ diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/gr
              }
              delete [] ttfont;
           }
-@@ -2536,10 +2659,10 @@
+@@ -2548,10 +2671,10 @@
        { "Root.PSFont.5",             "/Helvetica-Oblique" },
        { "Root.PSFont.6",             "/Helvetica-Bold" },
        { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
@@ -916,7 +1098,7 @@ diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/gr
        { "Root.PSFont.12",            "/Symbol" },
        { "Root.PSFont.13",            "/Times-Roman" },
        { "Root.PSFont.14",            "/ZapfDingbats" },
-@@ -2745,10 +2868,10 @@
+@@ -2757,10 +2880,10 @@
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -930,32 +1112,32 @@ diff -ur root-6.06.06.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.06/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.06.06.orig/graf3d/gl/CMakeLists.txt root-6.06.06/graf3d/gl/CMakeLists.txt
---- root-6.06.06.orig/graf3d/gl/CMakeLists.txt	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf3d/gl/CMakeLists.txt	2016-08-13 17:38:21.648532580 +0200
-@@ -32,6 +32,6 @@
+diff -ur root-6.08.02.orig/graf3d/gl/CMakeLists.txt root-6.08.02/graf3d/gl/CMakeLists.txt
+--- root-6.08.02.orig/graf3d/gl/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf3d/gl/CMakeLists.txt	2016-12-06 12:54:51.701058002 +0100
+@@ -43,6 +43,6 @@
  
  ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
  
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
++ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
  
  ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.06.06.orig/graf3d/gl/Module.mk root-6.06.06/graf3d/gl/Module.mk
---- root-6.06.06.orig/graf3d/gl/Module.mk	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/graf3d/gl/Module.mk	2016-08-13 17:38:21.648532580 +0200
-@@ -78,7 +78,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+diff -ur root-6.08.02.orig/graf3d/gl/Module.mk root-6.08.02/graf3d/gl/Module.mk
+--- root-6.08.02.orig/graf3d/gl/Module.mk	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf3d/gl/Module.mk	2016-12-06 12:54:51.702057991 +0100
+@@ -86,7 +86,7 @@
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
  		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
+ 		    $(GL2PSLIBDIR) $(GL2PSLIB) \
 -		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
 +		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
  
  $(call pcmrule,GL)
  	$(noop)
-diff -ur root-6.06.06.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.06/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.06.orig/graf3d/gl/src/TGLFontManager.cxx	2016-08-13 17:36:58.460770564 +0200
-+++ root-6.06.06/graf3d/gl/src/TGLFontManager.cxx	2016-08-13 17:38:21.649532589 +0200
+diff -ur root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.08.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:46:10.323969430 +0100
++++ root-6.08.02/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:54:51.702057991 +0100
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1211,9 +1393,9 @@ diff -ur root-6.06.06.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.06/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.06.06.orig/graf3d/gl/src/TGLText.cxx root-6.06.06/graf3d/gl/src/TGLText.cxx
---- root-6.06.06.orig/graf3d/gl/src/TGLText.cxx	2016-08-13 17:36:58.460770564 +0200
-+++ root-6.06.06/graf3d/gl/src/TGLText.cxx	2016-08-13 17:38:21.649532589 +0200
+diff -ur root-6.08.02.orig/graf3d/gl/src/TGLText.cxx root-6.08.02/graf3d/gl/src/TGLText.cxx
+--- root-6.08.02.orig/graf3d/gl/src/TGLText.cxx	2016-12-06 12:46:10.323969430 +0100
++++ root-6.08.02/graf3d/gl/src/TGLText.cxx	2016-12-06 12:54:51.702057991 +0100
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1348,9 +1530,9 @@ diff -ur root-6.06.06.orig/graf3d/gl/src/TGLText.cxx root-6.06.06/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.06.06.orig/gui/gui/src/TGApplication.cxx root-6.06.06/gui/gui/src/TGApplication.cxx
---- root-6.06.06.orig/gui/gui/src/TGApplication.cxx	2016-08-13 17:36:58.461770573 +0200
-+++ root-6.06.06/gui/gui/src/TGApplication.cxx	2016-08-13 17:38:21.649532589 +0200
+diff -ur root-6.08.02.orig/gui/gui/src/TGApplication.cxx root-6.08.02/gui/gui/src/TGApplication.cxx
+--- root-6.08.02.orig/gui/gui/src/TGApplication.cxx	2016-12-06 12:46:10.324969418 +0100
++++ root-6.08.02/gui/gui/src/TGApplication.cxx	2016-12-06 12:54:51.703057979 +0100
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
@@ -1373,64 +1555,3 @@ diff -ur root-6.06.06.orig/gui/gui/src/TGApplication.cxx root-6.06.06/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
-diff -ur root-6.06.06.orig/gui/gui/src/TGSpeedo.cxx root-6.06.06/gui/gui/src/TGSpeedo.cxx
---- root-6.06.06.orig/gui/gui/src/TGSpeedo.cxx	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/gui/gui/src/TGSpeedo.cxx	2016-08-13 17:38:21.650532598 +0200
-@@ -119,8 +119,7 @@
- {
-    TString sc;
-    Float_t step, mark[5];
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arialbd.ttf";
-+   TString ar = "arialbd.ttf";
-    Int_t i, nexe, offset;
- 
-    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -528,8 +527,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-@@ -609,8 +607,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-diff -ur root-6.06.06.orig/tutorials/eve/SplitGLView.C root-6.06.06/tutorials/eve/SplitGLView.C
---- root-6.06.06.orig/tutorials/eve/SplitGLView.C	2016-08-13 17:36:58.556771444 +0200
-+++ root-6.06.06/tutorials/eve/SplitGLView.C	2016-08-13 17:40:19.046607969 +0200
-@@ -288,8 +288,7 @@
-    const char *str = fText.Data();
-    char *string = strdup(str);
-    Int_t nlines = 0, size = fTextH;
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arial.ttf";
-+   TString ar = "arial.ttf";
-    char *s = strtok((char *)string, "\n");
-    TImage *img = (TImage*)fImage->Clone("img");
-    img->DrawText(fTextX, fTextY+(nlines*size), s, size, fTextCol, ar);
-diff -ur root-6.06.06.orig/tutorials/image/rose_image.C root-6.06.06/tutorials/image/rose_image.C
---- root-6.06.06.orig/tutorials/image/rose_image.C	2016-07-06 18:36:49.000000000 +0200
-+++ root-6.06.06/tutorials/image/rose_image.C	2016-08-13 17:42:27.381783543 +0200
-@@ -23,9 +23,8 @@
-    img->SetConstRatio(0);
-    img->SetImageQuality(TAttImage::kImgBest);
- 
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString bc = fp + "/BlackChancery.ttf";
--   TString ar = fp + "/arial.ttf";
-+   TString bc = "timesi.ttf";
-+   TString ar = "arial.ttf";
- 
-    // draw text over image with funny font
-    img->DrawText(120, 160, "Hello World!", 32,
diff --git a/root-fsf-addr.patch b/root-fsf-addr.patch
new file mode 100644
index 0000000..b06480d
--- /dev/null
+++ b/root-fsf-addr.patch
@@ -0,0 +1,15 @@
+diff --git a/config/root-help.el.in b/config/root-help.el.in
+index eab32de..8e6f8f9 100644
+--- a/config/root-help.el.in
++++ b/config/root-help.el.in
+@@ -18,8 +18,8 @@
+ ;;
+ ;;  You should have received a copy of the GNU General Public License
+ ;;  along with this program; if not, write to the Free Software
+-;;  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-;;  02111-1307 USA
++;;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++;;  02110-1301, USA
+ ;;
+ ;; Author: Christian Holm Christensen <cholm@nbi.dk>
+ ;; Maintainer: Christian Holm Christensen <cholm@nbi.dk>
diff --git a/root-gl2ps.patch b/root-gl2ps.patch
deleted file mode 100644
index c0f9e07..0000000
--- a/root-gl2ps.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
---- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/Findgl2ps.cmake	2016-03-20 18:08:33.673986381 +0100
-@@ -0,0 +1,21 @@
-+# - Locate gl2ps library
-+# Defines:
-+#
-+#  GL2PS_FOUND
-+#  GL2PS_INCLUDE_DIR
-+#  GL2PS_INCLUDE_DIRS (not cached)
-+#  GL2PS_LIBRARIES
-+
-+find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
-+find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
-+
-+set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
-+set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
-+
-+mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 18:14:26.140474123 +0100
-@@ -70,6 +70,7 @@
- ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
- ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
- ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
-+ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 18:08:33.674986391 +0100
-@@ -153,6 +153,11 @@
- set(opengllib ${OPENGL_gl_LIBRARY})
- set(openglincdir ${OPENGL_INCLUDE_DIR})
- 
-+set(builtingl2ps ${value${builtin_gl2ps}})
-+set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
-+set(gl2pslib ${GL2PS_LIBRARY})
-+set(gl2psincdir ${GL2PS_INCLUDE_DIR})
-+
- set(buildldap ${value${ldap}})
- set(ldaplibdir ${LDAP_LIBRARY_DIR})
- set(ldaplib ${LDAP_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 18:08:33.690986549 +0100
-@@ -334,6 +334,16 @@
-   endif()
- endif()
- 
-+#---Check for gl2ps ------------------------------------------------------------------
-+if(NOT builtin_gl2ps)
-+  message(STATUS "Looking for gl2ps")
-+  find_Package(gl2ps)
-+  if(NOT GL2PS_FOUND)
-+    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
-+    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Graphviz installation-------------------------------------------------------
- if(gviz)
-   message(STATUS "Looking for Graphviz")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 18:08:33.690986549 +0100
-@@ -142,6 +142,11 @@
- OPENGLLIB      := @opengllib@
- OPENGLINCDIR   := $(filter-out /usr/include, @openglincdir@)
- 
-+BUILTINGL2PS   := @builtingl2ps@
-+GL2PSLIBDIR    := @gl2pslibdir@
-+GL2PSCLILIB    := @gl2pslib@
-+GL2PSINCDIR    := $(filter-out /usr/include, @gl2psincdir@)
-+
- BUILDLDAP      := @buildldap@
- LDAPLIBDIR     := @ldaplibdir@
- LDAPCLILIB     := @ldaplib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 17:53:02.513806142 +0100
-+++ root-6.06.02/configure	2016-03-20 18:08:33.691986559 +0100
-@@ -53,6 +53,7 @@
-    enable_builtin_afterimage \
-    enable_builtin_ftgl       \
-    enable_builtin_freetype   \
-+   enable_builtin_gl2ps      \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-    enable_builtin_unuran     \
-@@ -182,6 +183,7 @@
- enable_winrtdebug=
- enable_builtin_freetype=no
- enable_builtin_ftgl=no
-+enable_builtin_gl2ps=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
- enable_builtin_unuran=no
-@@ -1704,6 +1706,7 @@
-   builtin-afterimage Build included libAfterImage, or use system libAfterImage
-   builtin-ftgl       Build included libFTGL, or use system libftgl
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-+  builtin-gl2ps      Build included libgl2ps, or use system libgl2ps
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-   builtin-unuran     Build included libunuran, or use system libunuran
-@@ -2047,6 +2050,7 @@
-    logmsg "Will use by default builtin versions of libraries on Win32"
-    enable_builtin_freetype="yes"
-    enable_builtin_ftgl="yes"
-+   enable_builtin_gl2ps="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-    enable_builtin_unuran="yes"
-@@ -3180,6 +3184,38 @@
- 
- ######################################################################
- #
-+### echo %%% libgl2ps (builtin or system)
-+#
-+if test "x$enable_builtin_gl2ps" = "xno" ; then
-+    check_header "gl2ps.h" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_gl2ps=yes
-+    else
-+        gl2psinc=$found_hdr
-+        gl2psincdir=$found_dir
-+    fi
-+
-+    check_library "libgl2ps" "$enable_shared" "" \
-+        $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        gl2pslib=""
-+        gl2pslibdir=""
-+        enable_builtin_gl2ps="yes"
-+    else
-+        gl2pslib="$found_lib"
-+        gl2pslibdir="$found_dir"
-+    fi
-+
-+    if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
-+        enable_builtin_gl2ps="yes"
-+    fi
-+fi
-+message "Checking whether to build included gl2ps"
-+result "$enable_builtin_gl2ps"
-+
-+######################################################################
-+#
- ### echo %%% libpcre (builtin or system) - Mandatory lib
- #
- # Mandatory test, must succeed (see http://www.pcre.org/)
-@@ -7593,6 +7629,10 @@
-     -e "s|@ftglincdir@|$ftglincdir|"            \
-     -e "s|@ftgllibdir@|$ftgllibdir|"            \
-     -e "s|@ftgllibs@|$ftgllibs|"                \
-+    -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
-+    -e "s|@gl2psincdir@|$gl2psincdir|"          \
-+    -e "s|@gl2pslib@|$gl2pslib|"                \
-+    -e "s|@gl2pslibdir@|$gl2pslibdir|"          \
-     -e "s|@glewincdir@|$glewincdir|"            \
-     -e "s|@glewlibdir@|$glewlibdir|"            \
-     -e "s|@glewlibs@|$glewlibs|"                \
-diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
---- root-6.06.02.orig/graf3d/gl/CMakeLists.txt	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/CMakeLists.txt	2016-03-20 18:11:50.286931862 +0100
-@@ -7,12 +7,20 @@
- ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
- list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
-                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
-+set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
- ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
- 
- if(WIN32 OR cocoa)
-   list(REMOVE_ITEM headers TX11GL.h)
-   list(REMOVE_ITEM sources TX11GL.cxx)
--  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
-+  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
-+endif()
-+
-+if(builtin_gl2ps)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+else()
-+  list(REMOVE_ITEM sources gl2ps.cxx)
-+  include_directories(${GL2PS_INCLUDE_DIRS})
- endif()
- 
- if(WIN32)
-@@ -32,6 +40,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
---- root-6.06.02.orig/graf3d/gl/Module.mk	2016-03-20 14:47:57.684579337 +0100
-+++ root-6.06.02/graf3d/gl/Module.mk	2016-03-20 18:12:53.943561781 +0100
-@@ -19,6 +19,7 @@
- GLDH         := $(GLDS:.cxx=.h)
- 
- GLH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
-+GLH          := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
- GLS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
- 
- # Excluded from win32 builds
-@@ -42,6 +43,13 @@
- # Used by rootcint
- GLH2         := $(filter-out $(GLH1), $(GLH))
- 
-+ifeq ($(BUILTINGL2PS),yes)
-+GL2PSFLAGS   := -I$(MODDIRI)
-+else()
-+GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
-+GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
-+endif()
-+
- ifneq ($(OPENGLLIB),)
- GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
-                 $(XLIBS) -lm
-@@ -78,6 +86,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
-+		    $(GL2PSLIBDIR) $(GL2PSLIBS) \
- 		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
-@@ -107,12 +116,12 @@
- ##### extra rules ######
- ifeq ($(ARCH),win32)
- $(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                            $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- $(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
--                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
-+                             $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
- else
--$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
--$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%)
-+$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
-+$(GLDS):        CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
- endif
- 
- $(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)
diff --git a/root-global-name-not-defined.patch b/root-global-name-not-defined.patch
new file mode 100644
index 0000000..f682748
--- /dev/null
+++ b/root-global-name-not-defined.patch
@@ -0,0 +1,32 @@
+diff --git a/tutorials/pyroot/zdemo.py b/tutorials/pyroot/zdemo.py
+index 28db48f..603c7cb 100644
+--- a/tutorials/pyroot/zdemo.py
++++ b/tutorials/pyroot/zdemo.py
+@@ -18,7 +18,6 @@
+ 
+ import ROOT
+ from array import array
+-from math import *
+ 
+ NMAX = 20
+ Z      = array( 'f', [0.]*NMAX )
+@@ -31,6 +30,7 @@ saves = {}
+ 
+ #_______________________________________________________________________________
+ def hz_calc( ENERG, DENS, TGRAD, PTMIN, PTMAX, DELP ):
++   from math import sin, cos, sqrt
+    global NLOOP
+    global Z, HZ, PT, INVSIG
+ 
+@@ -104,9 +104,11 @@ def hz_calc( ENERG, DENS, TGRAD, PTMIN, PTMAX, DELP ):
+ 
+ #_______________________________________________________________________________
+ def zdemo():
++    from array import array
+     global NLOOP
+     global Z, HZ, PT, INVSIG
+     global saves
++    global hz_calc
+ 
+     # Create a new canvas.
+     c1 = ROOT.TCanvas( 'zdemo', 'Monte Carlo Study of Z scaling', 10, 40, 800, 600 )
diff --git a/root-html-markup.patch b/root-html-markup.patch
deleted file mode 100644
index d6b9d1e..0000000
--- a/root-html-markup.patch
+++ /dev/null
@@ -1,1031 +0,0 @@
-diff -ur root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx root-6.06.02/gui/gui/src/TGTextEntry.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEntry.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEntry.cxx	2016-03-10 07:19:40.000000000 +0100
-@@ -42,7 +42,6 @@
- //
- // This enum type describes the ways in which TGTextEntry can display
- // its contents. The currently defined values are:
--//Begin_Html
- /*
- <ul>
- <li>  kNormal - display characters as they are entered. This is the default.
-@@ -50,14 +49,12 @@
- <li>  kPassword - display asterisks instead of the characters actually entered.
- </ul>
- */
--//End_Html
- // See also SetEchoMode(), GetEchoMode().
- //
- // enum TGTextEntry::EInsertMode
- //
- // This enum type describes the way how typed characters are
- // inserted in the text entry. This mode is switched by "Insert" key.
--//Begin_Html
- /*
- <ul>
- <li>  kInsert - typed character are inserted (cursor has shape of short line).
-@@ -65,13 +62,11 @@
-                  (cursor has the shape of filled rectangle).
- </ul>
- */
--//End_Html
- //
- // enum TGWidget::ETextJustification
- //
- // This enum type (defined in TGWidget.h) describes the text alignment modes.
- // These modes are valid untill text fits the frame width
--//Begin_Html
- /*
- <ul>
- <li>  kTextLeft    - left-side text alignment
-@@ -79,12 +74,10 @@
- <li>  kTextCenterX - center text alignment
- </ul>
- */
--//End_Html
- //
- //
- // The key press event handler converts a key press to some line editor action.
- // Here are the default key bindings:
--//Begin_Html
- /*
- <ul>
- <li><i> Left Arrow </i>
-@@ -153,7 +146,6 @@
- </ul>
- All other keys with valid ASCII codes insert themselves into the line.
- */
--//End_Html
- //
- ////////////////////////////////////////////////////////////////////////////////
- 
-@@ -658,13 +650,11 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// The echo modes available are:
--///Begin_Html
- /// <ul>
- /// <li> kNormal   - display characters as they are entered.  This is the default.
- /// <li> kNoEcho   - do not display anything.
- /// <li> kPassword - display asterisks instead of the characters actually entered.
- /// </ul>
--///End_Html
- /// It is always possible to cut and paste any marked text;  only the widget's own
- /// display is affected.
- /// See also GetEchoMode(), GetDisplayText().
-@@ -1154,7 +1144,6 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// The key press event handler converts a key press to some line editor
- /// action. Here are the default key bindings:
--///Begin_Html
- ///  <ul>
- ///  <li><i> Left Arrow </i>
- ///          Move the cursor one character leftwards.
-@@ -1220,7 +1209,6 @@
- ///  <li><i> Control-Y </i>
- ///          Paste the clipboard text into line edit.
- ///  </ul>
--///End_Html
- ///  All other keys with valid ASCII codes insert themselves into the line.
- 
- Bool_t TGTextEntry::HandleKey(Event_t* event)
-diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
---- root-6.06.02.orig/hist/hist/src/TH2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2.cxx	2016-03-10 08:51:26.491321275 +0100
-@@ -938,17 +938,10 @@
- ///  NOTE: To access the generated histograms in the current directory, do eg:
- ///     TH1D *h2_1 = (TH1D*)gDirectory->Get("h2_1");
- ///
--/// A complete example of this function is given in begin_html <a href="examples/fitslicesy.C.html">tutorial:fitslicesy.C</a> end_html
--/// with the following output:
--///Begin_Html
-+/// A complete example of this function is given in tutorial fitslicesy.C.
- 
- void TH2::FitSlicesY(TF1 *f1, Int_t firstxbin, Int_t lastxbin, Int_t cut, Option_t *option, TObjArray* arr)
- {
--   /*
--   <img src="gif/fitslicesy.gif">
--   */
--   //End_Html
--
-    DoFitSlices(false, f1, firstxbin, lastxbin, cut, option, arr);
- 
- }
-diff -ur root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx root-6.06.02/hist/hist/src/TMultiDimFit.cxx
---- root-6.06.02.orig/hist/hist/src/TMultiDimFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TMultiDimFit.cxx	2016-03-09 00:26:13.030291477 +0100
-@@ -603,7 +603,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -682,7 +682,7 @@
- /// Please note, that if no error is given Poisson statistics is
- /// assumed and the square error is set to the value of dependent
- /// quantity.  See also the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
- {
-@@ -986,7 +986,7 @@
- ///     None so far
- ///
- /// For detailed description of what this entails, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::FindParameterization(Option_t *)
- {
-@@ -1005,7 +1005,7 @@
- ///     M     use Minuit to improve coefficients
- ///
- /// Also, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::Fit(Option_t *option)
- {
-@@ -1097,7 +1097,7 @@
- /// PRIVATE METHOD:
- /// Create list of candidate functions for the parameterisation. See
- /// also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeCandidates()
- {
-@@ -1354,7 +1354,7 @@
- /// PRIVATE METHOD:
- /// Invert the model matrix B, and compute final coefficients. For a
- /// more thorough discussion of what this means, please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- ///
- /// First we invert the lower triangle matrix fOrthCurvatureMatrix
- /// and store the inverted matrix in the upper triangle.
-@@ -1496,7 +1496,7 @@
- /// Make Gram-Schmidt orthogonalisation. The class description gives
- /// a thorough account of this algorithm, as well as
- /// references. Please refer to the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
- {
-@@ -1589,7 +1589,7 @@
- ///     R4        Residuals computed on test sample
- ///
- /// For a description of these quantities, refer to
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeHistograms(Option_t *option)
- {
-@@ -1800,7 +1800,7 @@
- /// PRIVATE METHOD:
- /// Find the parameterization over the training sample. A full account
- /// of the algorithm is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::MakeParameterization()
- {
-@@ -2365,7 +2365,7 @@
- /// be fitted, and the new candidate function to be included in the
- /// fit.  By default it is 0, which automatically chooses another
- /// selection criteria. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxAngle(Double_t ang)
- {
-@@ -2381,7 +2381,7 @@
- /// Set the min angle (in degrees) between a new candidate function
- /// and the subspace spanned by the previously accepted
- /// functions. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinAngle(Double_t ang)
- {
-@@ -2401,7 +2401,7 @@
- /// Where N is the dimension of the data sample, L is the number of
- /// terms (given in terms) and the first number, labels the term, the
- /// second the variable.  More information is given in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowers(const Int_t* powers, Int_t terms)
- {
-@@ -2421,7 +2421,7 @@
- /// Set the user parameter for the function selection. The bigger the
- /// limit, the more functions are used. The meaning of this variable
- /// is defined in the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetPowerLimit(Double_t limit)
- {
-@@ -2431,7 +2431,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Set the maximum power to be considered in the fit for each
- /// variable. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMaxPowers(const Int_t* powers)
- {
-@@ -2446,7 +2446,7 @@
- /// Set the acceptable relative error for when sum of square
- /// residuals is considered minimized. For a full account, refer to
- /// the
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- void TMultiDimFit::SetMinRelativeError(Double_t error)
- {
-@@ -2458,7 +2458,7 @@
- /// PRIVATE METHOD:
- /// Test whether the currently considered function contributes to the
- /// fit. See also
--/// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-+/// <a href="#TMultiDimFit:description">class description</a>
- 
- Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
-                                   Double_t dResidur)
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx root-6.06.02/hist/spectrum/src/TSpectrum2.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2.cxx	2016-03-10 18:41:15.609812954 +0100
-@@ -71,8 +71,6 @@
- //
- //</div>
- //
--//<!-- */
--// --> End_Html
- 
- //______________________________________________________________________________
- /** \class TSpectrum2
-@@ -372,7 +370,6 @@
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- const char *TSpectrum2::Background(Double_t **spectrum,
-                        Int_t ssizex, Int_t ssizey,
-@@ -381,7 +378,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Background
-@@ -523,10 +520,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:18.0pt'>Example 1� script Back_gamma64.c
-@@ -835,8 +830,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, x, y, sampling, r1, r2;
-    Double_t a, b, p1, p2, p3, p4, s1, s2, s3, s4;
-@@ -1022,11 +1016,10 @@
- ///   averWindow-width of averaging smoothing window
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum2::SmoothMarkov(Double_t **source, Int_t ssizex, Int_t ssizey, Int_t averWindow)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Smoothing</span></b></p>
-@@ -1134,10 +1127,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 4 � script Smooth.c
-@@ -1239,8 +1230,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t xmin, xmax, ymin, ymax, i, j, l;
-    Double_t a, b, maxch;
-    Double_t nom, nip, nim, sp, sm, spx, spy, smx, smy, plocha = 0;
-@@ -1439,7 +1429,6 @@
- ///   boost, boosting factor, for details we refer to manual
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum2::Deconvolution(Double_t **source, Double_t **resp,
-                                        Int_t ssizex, Int_t ssizey,
-@@ -1447,7 +1436,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:20.0pt'>Deconvolution</span></b></p>
-@@ -1602,10 +1591,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><i><span style='font-size:16.0pt'>Example 5 � script Decon.c
-@@ -1982,8 +1969,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, lhx, lhy, i1, i2, j1, j2, k1, k2, lindex, i1min, i1max,
-        i2min, i2max, j1min, j1max, j2min, j2max, positx = 0, posity = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2177,8 +2163,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:20.0pt'>Peaks searching</span></b></p>
-@@ -2311,10 +2296,8 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
--//Begin_Html <!--
--/* -->
-+ */
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:18.0pt'>Examples of peak searching
-@@ -2856,8 +2839,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k, lindex, priz;
-    Double_t lda, ldb, ldc, area, maximum;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Fit.cxx	2016-03-10 18:30:15.018839468 +0100
-@@ -162,11 +162,10 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrum2Fit::TSpectrum2Fit(Int_t numberPeaks) :TNamed("Spectrum2Fit", "Miroslav Morhac peak fitter")
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'>Shape function of the fitted
-@@ -178,8 +177,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    if (numberPeaks <= 0){
-       Error ("TSpectrum2Fit","Invalid number of peaks, must be > than 0");
-       return;
-@@ -1793,11 +1791,10 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrum2Fit::FitAwmi(Double_t **source)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Fitting</span></b></p>
-@@ -2686,8 +2683,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, pw,
-@@ -4697,8 +4693,7 @@
- //
- /////////////////////////////////////////////////////////////////////////////
- //
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Stiefel fitting algorithm</span></b></p>
-@@ -4928,8 +4923,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, i1, i2, j, k, shift =
-        7 * fNPeaks + 14, peak_vel, size, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum2Transform.cxx	2016-03-10 18:30:29.040934692 +0100
-@@ -1748,8 +1748,7 @@
- /* fSizex,fSizey-basic dimensions of source and dest spectra                       */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -2018,8 +2017,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j;
-    Int_t size;
-    Double_t *working_vector = 0, **working_matrix = 0;
-@@ -2324,8 +2322,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -2481,8 +2478,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-@@ -2768,8 +2764,7 @@
- /*           fSizeX*fSizeY                                                              */
- /*                         */
- //////////////////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2908,8 +2903,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j;
-    Double_t a, old_area = 0, new_area = 0;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx root-6.06.02/hist/spectrum/src/TSpectrum3.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrum3.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrum3.cxx	2016-03-10 18:31:47.355466523 +0100
-@@ -273,7 +273,6 @@
- ///                                                                           //
- ///                                                                           //
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Background(Double_t***spectrum,
-                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -283,7 +282,7 @@
-                        Int_t direction,
-                        Int_t filterType)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal style='text-align:justify'><b><span style='font-size:14.0pt'>Background
-@@ -674,8 +673,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    Int_t i, j, x, y, z, sampling, q1, q2, q3;
-    Double_t a, b, c, d, p1, p2, p3, p4, p5, p6, p7, p8, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, r1, r2, r3, r4, r5, r6;
-    if (ssizex <= 0 || ssizey <= 0 || ssizez <= 0)
-@@ -1069,11 +1067,10 @@
- /// averWindow-width of averaging smoothing window                          //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char* TSpectrum3::SmoothMarkov(Double_t***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow)
- {
--/* -->
-+/* 
- 
- <div class=Section2>
- 
-@@ -1302,8 +1299,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t xmin,xmax,ymin,ymax,zmin,zmax,i,j,k,l;
-    Double_t a,b,maxch;
-@@ -1868,7 +1864,6 @@
- /// boost, boosting factor, for details we refer to manual                  //
- ///                                                                         //
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- const char *TSpectrum3::Deconvolution(Double_t***source, const Double_t***resp,
-                                        Int_t ssizex, Int_t ssizey, Int_t ssizez,
-@@ -1876,7 +1871,7 @@
-                                        Int_t numberRepetitions,
-                                        Double_t boost)
- {
--/* -->
-+/* 
- 
- <div class=Section3>
- 
-@@ -2357,8 +2352,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t i, j, k, lhx, lhy, lhz, i1, i2, i3, j1, j2, j3, k1, k2, k3, lindex, i1min, i1max, i2min, i2max, i3min, i3max, j1min, j1max, j2min, j2max, j3min, j3max, positx = 0, posity = 0, positz = 0, repet;
-    Double_t lda, ldb, ldc, area, maximum = 0;
-@@ -2590,8 +2584,7 @@
- //                  we refer to manual (applies only for Markov method)    //
- //                                                                         //
- /////////////////////////////////////////////////////////////////////////////
--//Begin_Html <!--
--/* -->
-+/* 
- 
- <div class=Section4>
- 
-@@ -2901,8 +2894,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
- 
-    Int_t number_of_iterations = (Int_t)(4 * sigma + 0.5);
-    Int_t k,lindex;
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumFit.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumFit.cxx	2016-03-09 01:58:25.390463585 +0100
-@@ -113,7 +113,6 @@
- ///numberPeaks: number of fitted peaks (must be greater than zero)
- ///the constructor allocates arrays for all fitted parameters (peak positions, amplitudes etc) and sets the member
- ///variables to their default values. One can change these variables by member functions (setters) of TSpectrumFit class.
--///Begin_Html <!--
- 
- TSpectrumFit::TSpectrumFit(Int_t numberPeaks) :TNamed("SpectrumFit", "Miroslav Morhac peak fitter")
- {
-@@ -162,7 +161,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    if (numberPeaks <= 0){
-       Error ("TSpectrumFit","Invalid number of peaks, must be > than 0");
-@@ -847,7 +845,6 @@
- ///
- //////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumFit::FitAwmi(Double_t *source)
- {
-@@ -1343,7 +1340,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, pw, regul_cycle,
-@@ -2312,7 +2308,6 @@
- ///        source-pointer to the vector of source spectrum
- ///
- //////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumFit::FitStiefel(Double_t *source)
- {
-@@ -2546,7 +2541,6 @@
- </div>
- 
- <!-- */
--// --> End_Html
- 
-    Int_t i, j, k, shift =
-        2 * fNPeaks + 7, peak_vel, rozmer, iter, regul_cycle,
-diff -ur root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx
---- root-6.06.02.orig/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrum/src/TSpectrumTransform.cxx	2016-03-10 18:39:27.847980211 +0100
-@@ -739,11 +739,10 @@
- ///             need 2*size length to store real and imaginary coefficients
- ///
- ////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Transform(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section1>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Transform methods</span></b></p>
-@@ -989,8 +988,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t a, b, pi = 3.14159265358979323846;
-@@ -1482,11 +1480,10 @@
- ///
- /////////////////////////////////////////////////////////////////////////////////
- ///
--///Begin_Html <!--
- 
- void TSpectrumTransform::FilterZonal(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section2>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of zonal filtering</span></b></p>
-@@ -1618,8 +1615,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-@@ -2091,11 +2087,10 @@
- ///           need 2*size length to store real and imaginary coefficients
- ///
- /////////////////////////////////////////////////////////////////////////////////
--///Begin_Html <!--
- 
- void TSpectrumTransform::Enhance(const Double_t *source, Double_t *destVector)
- {
--/* -->
-+/* 
- <div class=Section3>
- 
- <p class=MsoNormal><b><span style='font-size:14.0pt'>Example of enhancement</span></b></p>
-@@ -2226,8 +2221,7 @@
- 
- </div>
- 
--<!-- */
--// --> End_Html
-+ */
-    int i, j=0, k = 1, m, l;
-    Double_t val;
-    Double_t *working_space = 0;
-diff -ur root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx
---- root-6.06.02.orig/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/spectrumpainter/src/TSpectrum2Painter.cxx	2016-03-09 01:56:01.961261823 +0100
-@@ -1162,7 +1162,6 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Paints histogram according to preset parameters.
--///Begin_Html <!--
- 
- void TSpectrum2Painter::Paint(Option_t * /*option*/)
- {
-@@ -1524,7 +1523,6 @@
- }
- </pre>
- <!-- */
--// --> End_Html
- 
-    Int_t turni,turnj,w1,w2,x,y;
-    Int_t q1=0,q2=0,qv=0,smer=0,flag=0,i=0,j=0,x1=0,y1=0,x2=0,y2=0,x3=0,y3=0,x4=0,y4=0,uhl=0,xp1=0,yp1=0,xp2=0,yp2=0;
-@@ -7654,14 +7652,12 @@
- ///                               * * *
- ///
- /// See example in $ROOTSYS/tutorials/spectrum/spectrumpainter.C
--///Begin_Html
- 
- void TSpectrum2Painter::PaintSpectrum(TH2* h2, Option_t *option, Int_t bs)
- {
-    /*
-    <img src="gif/spectrumpainter.gif">
-    */
--   //End_Html
- 
-    TString opt = option;
- 
-diff -ur root-6.06.02.orig/math/foam/src/TFoam.cxx root-6.06.02/math/foam/src/TFoam.cxx
---- root-6.06.02.orig/math/foam/src/TFoam.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/foam/src/TFoam.cxx	2016-03-09 20:34:37.000000000 +0100
-@@ -25,20 +25,15 @@
- // Monte Carlo event generator (integrator) FOAM.
- // It creates hyper-rectangular "foam of cells", which is more dense around its peaks.
- // See the following 2-dim. example of the map of 1000 cells for doubly peaked distribution:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_MapCamel1000.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_MapCamel1000.gif">
-+//
- // FOAM is now fully integrated with the ROOT package.
- // The important bonus of the ROOT use is persistency of the FOAM objects!
- //
- // For more sophisticated problems full version of FOAM may be more appropriate:
--//BEGIN_HTML <!--
--/* -->
--  See <A HREF="http://jadach.home.cern.ch/jadach/Foam/Index.html"> full version of FOAM</A>
--<!--*/
--// -->END_HTML
-+// See [full version of FOAM](http://jadach.home.cern.ch/jadach/Foam/Index.html)
-+//
- // Simple example of the use of FOAM:
- // ==================================
- // Int_t kanwa(){
-@@ -81,11 +76,9 @@
- //   return 0.5*Dist;
- // }// Camel2
- // Two-dim. histogram of the MC points generated with the above program looks as follows:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_cKanwa.gif">
--<!--*/
--// -->END_HTML
-+//
-+// <img src="gif/foam_cKanwa.gif">
-+//
- // Canonical nine steering parameters of FOAM
- // ===========================================
- //------------------------------------------------------------------------------
-@@ -266,10 +259,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Default destructor
--///  std::cout<<" DESTRUCTOR entered "<<std::endl;
- 
- TFoam::~TFoam()
- {
-+   //std::cout<<" DESTRUCTOR entered "<<std::endl;
-    Int_t i;
- 
-    if(fCells!= 0) {
-@@ -321,42 +314,35 @@
- /// This is done BEFORE generating first MC event and AFTER allocating FOAM object
- /// and reseting (optionally) its internal parameters/switches.
- /// The overall operational scheme of the FOAM is the following:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_schema2.gif">
-+///
-+/// This method invokes several other methods:
-+/// ==========================================
-+/// InitCells initializes memory storage for cells and begins exploration process
-+/// from the root cell. The empty cells are allocated/filled using  CellFill.
-+/// The procedure Grow which loops over cells, picks up the cell with the biggest
-+/// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
-+/// with the help of PeekMax procedure. The chosen cell is split using Divide.
-+/// Subsequently, the procedure Explore called by the Divide
-+/// (and by InitCells for the root cell) does the most important
-+/// job in the FOAM object build-up: it performs a small MC run for each
-+/// newly allocated daughter cell.
-+/// Explore calculates how profitable the future split of the cell will be
-+/// and defines the optimal cell division geometry with the help of Carver or Varedu
-+/// procedures, for maximum weight or variance optimization respectively.
-+/// All essential results of the exploration are written into
-+/// the explored cell object. At the very end of the foam build-up,
-+/// Finally, MakeActiveList is invoked to create a list of pointers to
-+/// all active cells, for the purpose of the quick access during the MC generation.
-+/// The procedure Explore employs MakeAlpha to generate random coordinates
-+/// inside a given cell with the uniform distribution.
-+/// The above sequence of the procedure calls is depicted in the following figure:
-+///
-+//  <img src="gif/foam_Initialize_schema.gif">
- 
- void TFoam::Initialize(TRandom *PseRan, TFoamIntegrand *fun )
- {
--/* -->
--<img src="gif/foam_schema2.gif">
--<!--*/
--// -->END_HTML
--//
--// This method invokes several other methods:
--// ==========================================
--// InitCells initializes memory storage for cells and begins exploration process
--// from the root cell. The empty cells are allocated/filled using  CellFill.
--// The procedure Grow which loops over cells, picks up the cell with the biggest
--// ``driver integral'', see Comp. Phys. Commun. 152 152 (2003) 55 for explanations,
--// with the help of PeekMax procedure. The chosen cell is split using Divide.
--// Subsequently, the procedure Explore called by the Divide
--// (and by InitCells for the root cell) does the most important
--// job in the FOAM object build-up: it performs a small MC run for each
--// newly allocated daughter cell.
--// Explore calculates how profitable the future split of the cell will be
--// and defines the optimal cell division geometry with the help of Carver or Varedu
--// procedures, for maximum weight or variance optimization respectively.
--// All essential results of the exploration are written into
--// the explored cell object. At the very end of the foam build-up,
--// Finally, MakeActiveList is invoked to create a list of pointers to
--// all active cells, for the purpose of the quick access during the MC generation.
--// The procedure Explore employs MakeAlpha to generate random coordinates
--// inside a given cell with the uniform distribution.
--// The above sequence of the procedure calls is depicted in the following figure:
--//BEGIN_HTML <!--
--/* -->
--<img src="gif/foam_Initialize_schema.gif">
--<!--*/
--// -->END_HTML
--
-    SetPseRan(PseRan);
-    SetRho(fun);
-    Initialize();
-@@ -1363,15 +1349,11 @@
- /// It defines which variables are excluded in the process of the cell division.
- /// For example 'FoamX->SetInhiDiv(1, 1);' inhibits division of y-variable.
- /// The resulting map of cells in 2-dim. case will look as follows:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map2.gif">
- 
- void  TFoam::SetInhiDiv(Int_t iDim, Int_t InhiDiv)
- {
--/* -->
--<img src="gif/foam_Map2.gif">
--<!--*/
--// -->END_HTML
--
-    if(fDim==0) Error("TFoam","SetInhiDiv: fDim=0 \n");
-    if(fInhiDiv == 0) {
-       fInhiDiv = new Int_t[ fDim ];
-@@ -1391,15 +1373,11 @@
- ///     xDiv[0]=0.30; xDiv[1]=0.40; xDiv[2]=0.65;
- ///     FoamX->SetXdivPRD(0,3,xDiv);
- /// results in the following 2-dim. pattern of the cells:
--///BEGIN_HTML <!--
-+///
-+//  <img src="gif/foam_Map3.gif">
- 
- void  TFoam::SetXdivPRD(Int_t iDim, Int_t len, Double_t xDiv[])
- {
--/* -->
--<img src="gif/foam_Map3.gif">
--<!--*/
--// -->END_HTML
--
-    Int_t i;
- 
-    if(fDim<=0)  Error("SetXdivPRD", "fDim=0 \n");
-diff -ur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-09 23:01:55.705319822 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-08 23:40:27.936824677 +0100
-@@ -238,19 +238,14 @@
- /// PDG convention already)
- /// Source: BaBar User Guide, Neil I. Geddes,
- ///
--///Begin_Html
-+/// See <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html">Conversion table</A>
-+/// with some fixes by PB, marked with (PB) below. Checked against
-+/// PDG listings from 2000.
-+///
-+/// Paul Balm, Nov 19, 2001
- 
- Int_t TDatabasePDG::ConvertGeant3ToPdg(Int_t Geant3number) const
- {
--  /*
--   see <A href="http://www.slac.stanford.edu/BFROOT/www/Computing/Environment/NewUser/htmlbug/node51.html"> Conversion table</A>
--  */
--  //End_Html
--  // with some fixes by PB, marked with (PB) below. Checked against
--  // PDG listings from 2000.
--  //
--  // Paul Balm, Nov 19, 2001
--
-    switch(Geant3number) {
- 
-       case 1   : return 22;       // photon
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/IntervalCalculator.h	2016-03-07 19:15:34.728025914 +0100
-@@ -50,7 +50,7 @@
- 
- The concrete implementations of this interface should deal with the details of how the nuisance parameters are dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
- 
--The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.END_HTML
-+The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
- 
- */
- 
-diff -ur root-6.06.02.orig/tutorials/graphs/timeonaxis.C root-6.06.02/tutorials/graphs/timeonaxis.C
---- root-6.06.02.orig/tutorials/graphs/timeonaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/timeonaxis.C	2016-03-08 23:47:58.944143869 +0100
-@@ -3,13 +3,11 @@
- TCanvas *timeonaxis()
- {
- // This macro illustrates the use of the time mode on the axis
--// with different time intervals and time formats. It's result can
--// be seen begin_html <a href="gif/timeonaxis.gif">here</a> end_html
-+// with different time intervals and time formats.
- // Through all this script, the time is expressed in UTC. some
- // information about this format (and others like GPS) may be found at
--// begin_html <a href="http://tycho.usno.navy.mil/systime.html">http://tycho.usno.navy.mil/systime.html</a> end_html
--//  or
--// begin_html <a href="http://www.topology.org/sci/time.html">http://www.topology.org/sci/time.html</a> end_html
-+// http://tycho.usno.navy.mil/systime.html or
-+// http://www.topology.org/sci/time.html
- //
- // The start time is : almost NOW (the time at which the script is executed)
- // actualy, the nearest preceding hour beginning.
diff --git a/root-hz.patch b/root-hz.patch
new file mode 100644
index 0000000..d9ea509
--- /dev/null
+++ b/root-hz.patch
@@ -0,0 +1,15 @@
+diff --git a/tutorials/graphs/zdemo.C b/tutorials/graphs/zdemo.C
+index 15257ce..0364123 100644
+--- a/tutorials/graphs/zdemo.C
++++ b/tutorials/graphs/zdemo.C
+@@ -25,6 +25,10 @@
+ #include "TGraph.h"
+ #include "TFrame.h"
+ 
++#ifdef HZ
++#undef HZ
++#endif
++
+ const Int_t NMAX = 20;
+ Int_t NLOOP;
+ Float_t Z[NMAX], HZ[NMAX], PT[NMAX], INVSIG[NMAX];
diff --git a/root-latex-markup.patch b/root-latex-markup.patch
deleted file mode 100644
index 48e2a28..0000000
--- a/root-latex-markup.patch
+++ /dev/null
@@ -1,877 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
---- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TLatex.cxx	2016-03-20 18:30:30.836024753 +0100
-@@ -185,14 +185,19 @@
- ## <a name="L8"></a> Accents
- Several kind of accents are available:
- 
--   #hat    = Begin_Latex #hat{a} End_Latex
--   #check  = Begin_Latex #check{a} End_Latex
--   #acute  = Begin_Latex #acute{a} End_Latex
--   #grave  = Begin_Latex #grave{a} End_Latex
--   #dot    = Begin_Latex #dot{a} End_Latex
--   #ddot   = Begin_Latex #ddot{a} End_Latex
--   #tilde  = Begin_Latex #tilde{a} End_Latex
--
-+Begin_Macro(source)
-+{
-+   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
-+   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
-+   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
-+   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
-+   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
-+   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
-+   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
-+   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
-+   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
-+}
-+End_Macro
- 
- The special sign: `#slash` draws a slash on top of the text between brackets:
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
---- root-6.06.02.orig/hist/hist/src/TF1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TF1.cxx	2016-03-20 18:30:30.871025101 +0100
-@@ -949,9 +949,9 @@
- /// Getting the error via TF1::DerivativeError:
- ///   (total error = roundoff error + interpolation error)
- /// the estimate of the roundoff error is taken as follows:
--///Begin_Latex
--///    err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--///End_Latex
-+/// \f[
-+///    err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+/// \f]
- /// where k is the double precision, ai are coefficients used in
- /// central difference formulas
- /// interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
---- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -360,27 +360,33 @@
- ///
- /// If the histograms are not filled with unit weights, the number of effective
- /// entries is used to normalise the bin contents which might lead to wrong results.
--/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
--///
-+/// \f[
-+/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
-+/// \f]
- /// The points are assigned a x value at the center of each histogram bin.
--/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
-+/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
-+/// for all options except for the
- /// bayesian methods where the result depends on the chosen option.
- ///
--/// If the denominator becomes 0 or pass >  total, the corresponding bin is
-+/// If the denominator becomes 0 or pass > total, the corresponding bin is
- /// skipped.
- ///
- /// 2) calculating ratios of two Poisson means (option 'pois'):
- /// --------------------------------------------------------------
- ///
- /// The two histograms are interpreted as independent Poisson processes and the ratio
--/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
--/// The histogram 'pass' is interpreted as n_{1} and the total histogram
--/// is used for n_{2}
-+/// \f[
-+/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
-+/// \f]
-+/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
-+/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
-+/// is used for \f$n_{2}\f$.
- ///
- /// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
- /// of efficiency by a parameter transformation:
--/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
--///
-+/// \f[
-+/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
-+/// \f]
- /// The x errors span each histogram bin (lowedge ... lowedge+width)
- /// The y errors depend on the chosen statistic methode which can be determined
- /// by the options given below. For a detailed description of the used statistic
-@@ -413,8 +419,7 @@
- /// oscillation on the actual coverage probability a couple of approximations and
- /// methodes has been developped. For a detailed discussion, please have a look at
- /// this statistical paper:
--/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
--/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
-+/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
- 
- void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
- {
-diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
---- root-6.06.02.orig/hist/hist/src/THnSparse.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/THnSparse.cxx	2016-03-20 18:30:30.872025110 +0100
-@@ -764,8 +764,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Get square of the error of bin addressed by linidx as
--/// BEGIN_LATEX #sum weight^{2}
--/// END_LATEX
-+/// \f$\sum weight^{2}\f$
- /// If errors are not enabled (via Sumw2() or CalculateErrors())
- /// return contents.
- 
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -92,31 +92,28 @@
-     Method:
-        For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
-        and 16-point Gaussian quadrature approximations to
--   Begin_Latex
--      I = #int^{b}_{a} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{b}_{a} f(x)dx
-+   \f]
-       and define
--   Begin_Latex
--      r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
--   End_Latex
-+   \f[
-+      r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
-+   \f]
-       Then,
--   Begin_Latex
--      G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
--   End_Latex
--      where, starting with x0 = A and finishing with xk = B,
--      the subdivision points xi(i=1,2,...) are given by
--   Begin_Latex
--      x_{i} = x_{i-1} + #lambda(B-x_{i-1})
--   End_Latex
--   Begin_Latex
--      #lambda
--   End_Latex
--      is equal to the first member of the
--      sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
-+   \f[
-+      G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
-+   \f]
-+      where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
-+      the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
-+   \f[
-+      x_{i} = x_{i-1} + \lambda(B-x_{i-1})
-+   \f]
-+      \f$\lambda\f$ is equal to the first member of the
-+      sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
-       If, at any stage in the process of subdivision, the ratio
--  Begin_Latex
--      q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
--  End_Latex
-+  \f[
-+      q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
-+  \f]
-       is so small that 1+0.005q is indistinguishable from 1 to
-       machine accuracy, an error exit occurs with the function value
-       set equal to zero.
-@@ -131,13 +128,13 @@
-       |I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
-       precisely, if k is the number of sub-intervals contributing to the
-       approximation (see Method), and if
--      Begin_Latex
--      I_{abs} = #int^{B}_{A} #||{f(x)}dx
--      End_Latex
-+   \f[
-+      I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
-+   \f]
-       then the relation
--   Begin_Latex
--    #frac{#||{G-I}}{I_{abs}+k} < EPS
--   End_Latex
-+   \f[
-+      \frac{\left|G-I\right|}{I_{abs}+k} < EPS
-+   \f]
-       will nearly always be true, provided the routine terminates without
-       printing an error message. For functions f having no singularities in
-       the closed interval [A,B] the accuracy will usually be much higher than
-@@ -156,9 +153,9 @@
- 
-    /** Returns Integral of function on an infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{-#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -169,9 +166,9 @@
- 
-    /** Returns Integral of function on an upper semi-infinite interval.
-       This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{#infinity}_{A} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{\infty}_{A} f(x)dx
-+   \f]
-       Usage:
-         In any arithmetic expression, this function has the approximate value
-         of the integral I.
-@@ -183,9 +180,9 @@
- 
-    /** Returns Integral of function on a lower semi-infinite interval.
-        This function computes, to an attempted specified accuracy, the value of the integral:
--   Begin_Latex
--      I = #int^{B}_{#infinity} f(x)dx
--   End_Latex
-+   \f[
-+      I = \int^{B}_{-\infty} f(x)dx
-+   \f]
-       Usage:
-          In any arithmetic expression, this function has the approximate value
-          of the integral I.
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
---- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h	2016-03-20 18:30:30.910025487 +0100
-@@ -88,10 +88,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--      D(h) = #frac{f(x+h) - f(x-h)}{2h}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+      D(h) = \frac{f(x+h) - f(x-h)}{2h}
-+     \f]
-+      the final estimate
-+     \f[
-+      D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -103,9 +106,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -141,10 +144,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -156,9 +162,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-@@ -177,10 +183,13 @@
-       computed by Richardson's extrapolation method (use 2 derivative estimates
-       to compute a third, more accurate estimation)
-       first, derivatives with steps h and h/2 are computed by central difference formulas
--     Begin_Latex
--         D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
--     End_Latex
--      the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
-+     \f[
-+         D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
-+     \f]
-+      the final estimate
-+     \f[
-+         D = \frac{4D(h/2) - D(h)}{3}
-+     \f]
-        "Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
- 
-       the argument eps may be specified to control the step size (precision).
-@@ -192,9 +201,9 @@
-       Getting the error via TF1::DerivativeError:
-         (total error = roundoff error + interpolation error)
-       the estimate of the roundoff error is taken as follows:
--     Begin_Latex
--         err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
--     End_Latex
-+     \f[
-+         err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
-+     \f]
-       where k is the double precision, ai are coefficients used in
-       central difference formulas
-       interpolation error is decreased by making the step size h smaller.
-diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
---- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx	2016-03-20 18:30:30.911025497 +0100
-@@ -34,35 +34,33 @@
- double kEulerGamma = 0.577215664901532860606512090082402431042;
- 
- 
--/* Begin_Html
--<center><h2>KelvinFunctions</h2></center>
-+/**
-+\class KelvinFunctions
- 
--<p>
- This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
- Kei(x), and their first derivatives.
--</p>
--
--End_Html */
-+*/
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Ber(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
-+/// \f]
- /// For x > fgMin, Ber(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -102,24 +100,25 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
-+/// \f[
-+/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
- /// function of the first kind.
- ///
- /// If x < fgMin (=20), Bei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
--/// End_Latex
-+/// \f[
-+/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
-+/// \f]
- /// For x > fgMin, Bei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
--/// End_Latex
--/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
--/// See also F1(x) and G1(x).
-+/// \f[
-+/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
-+/// \f]
-+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
-+///
-+/// See also F1() and G1().
- ///
- /// Begin_Macro
- /// {
-@@ -161,29 +160,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Ker(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Ker(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -227,29 +227,30 @@
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Latex
--/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
--/// End_Latex
--/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
-+/// \f[
-+/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
-+/// \f]
-+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
- /// Bessel function of the second kind.
- ///
- /// If x < fgMin (=20), Kei(x) is computed according to its polynomial
- /// approximation
--/// Begin_Latex
--/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
--/// End_Latex
--/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
--/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
--/// Begin_Latex
--/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
--/// End_Latex
-+/// \f[
-+/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
-+/// \f]
-+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
-+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
-+/// \f[
-+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
-+/// \f]
- /// For x > fgMin, Kei(x) is computed according to its asymptotic
- /// expansion:
--/// Begin_Latex
--/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
--/// End_Latex
--/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
--/// See also F2(x) and G2(x).
-+/// \f[
-+/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
-+/// \f]
-+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
-+///
-+/// See also F2() and G2().
- ///
- /// Begin_Macro
- /// {
-@@ -298,10 +299,10 @@
- /// If x < fgMin (=20), DBer(x) is computed according to the derivative of
- /// the polynomial approximation of Ber(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -343,10 +344,10 @@
- /// If x < fgMin (=20), DBei(x) is computed according to the derivative of
- /// the polynomial approximation of Bei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also M(x) and Theta(x).
-+/// \f[
-+/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also M() and Theta().
- ///
- /// Begin_Macro
- /// {
-@@ -388,10 +389,10 @@
- /// If x < fgMin (=20), DKer(x) is computed according to the derivative of
- /// the polynomial approximation of Ker(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -436,10 +437,10 @@
- /// If x < fgMin (=20), DKei(x) is computed according to the derivative of
- /// the polynomial approximation of Kei(x). Otherwise it is computed
- /// according to its asymptotic expansion
--/// Begin_Latex
--/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
--/// End_Latex
--/// See also N(x) and Phi(x).
-+/// \f[
-+/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
-+/// \f]
-+/// See also N() and Phi().
- ///
- /// Begin_Macro
- /// {
-@@ -481,9 +482,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
--/// Begin_Latex
--/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F1(double x)
- {
-@@ -510,9 +511,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
--/// Begin_Latex
--/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::F2(double x)
- {
-@@ -541,9 +542,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
--/// Begin_Latex
--/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G1(double x)
- {
-@@ -568,9 +569,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the calculations of the Kelvin
- /// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
--/// Begin_Latex
--/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
--/// End_Latex
-+/// \f[
-+/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
-+/// \f]
- 
- double KelvinFunctions::G2(double x)
- {
-@@ -597,9 +598,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
- /// DBei(x). M(x) is given by
--/// Begin_Latex
--/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// \f[
-+/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::M(double x)
- {
-@@ -612,10 +613,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DBer(x) and
--/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
--/// Begin_Latex
--/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DBei(x). \f$\theta(x)\f$ is given by
-+/// \f[
-+/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Theta(double x)
- {
-@@ -628,10 +629,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). (x) is given by
--/// Begin_Latex
--/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
--/// End_Latex
-+/// DKei(x). N(x) is given by
-+/// \f[
-+/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
-+/// \f]
- 
- double KelvinFunctions::N(double x)
- {
-@@ -644,10 +645,10 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Utility function appearing in the asymptotic expansions of DKer(x) and
--/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
--/// Begin_Latex
--/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
--/// End_Latex
-+/// DKei(x). \f$\phi(x)\f$ is given by
-+/// \f[
-+/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
-+/// \f]
- 
- double KelvinFunctions::Phi(double x)
- {
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h	2016-03-20 18:30:30.945025834 +0100
-@@ -85,7 +85,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
-       
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-    private:
-diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
---- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h	2016-03-20 18:30:30.972026102 +0100
-@@ -37,11 +37,12 @@
-    Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
-    As such, it stores a p-value for the null-hypothesis (eg. background-only) 
-    and an alternate hypothesis (eg. signal+background).  
--   The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
--   The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is 
--   not a probability.
--   Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the 
--   Significance method.
-+   The p-values can also be transformed into confidence levels
-+   (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
-+   The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
-+   \f$CL_{s}\f$, and is considered useful, though it is not a probability.
-+   Finally, the p-value of the null can be transformed into a number of
-+   equivalent Gaussian sigma using the Significance method.
- 
-    The p-value of the null for a given test statistic is rigorously defined and
-    this is the starting point for the following conventions.
-@@ -52,17 +53,17 @@
- observed value of the test statistic. This is the more standard
- convention and avoids confusion when doing inverted tests.
- 
--For exclusion, we also want the formula
--CLs = CLs+b / CLb to hold which therefore defines our conventions
--for CLs+b and CLb. CLs was specifically invented for exclusion
-+For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
-+to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
-+\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
- and therefore all quantities need be related through the assignments
--as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
-+as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
- is derived by considering the scenarios of a powerful and not powerful
--inverted test, where for the not so powerful test, CLs must be
-+inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
- close to one.
- 
- For results of Hypothesis tests,
--CLs has no similar direct interpretation as for exclusion and can
-+\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
- be larger than one.
- 
- */
-@@ -101,7 +102,7 @@
-       /// Convert  AlternatePValue into a "confidence level"
-       virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
- 
--      /// CLs is simply CLs+b/CLb (not a method, but a quantity)
-+      /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
-       virtual Double_t CLs() const {
-          double thisCLb = CLb();
-          if (thisCLb == 0) {
-@@ -144,7 +145,7 @@
-       /// The error on the "confidence level" of the alternative hypothesis
-       Double_t CLsplusbError() const;
- 
--      /// The error on the ratio CLs+b/CLb
-+      /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
-       Double_t CLsError() const;
- 
-       /// The error on the Null p-value
-diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HybridResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -100,11 +100,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$1 - CL_{b}\f$ : the B p-value
- double HybridResult::NullPValue() const
- {
--   // return 1-CL_b : the B p-value
--
-    if (fComputationsNulDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -131,11 +129,9 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns \f$CL_{s+b}\f$ : the S+B p-value
- double HybridResult::AlternatePValue() const
- {
--   // return CL_s+b : the S+B p-value
--
-    if (fComputationsAltDoneFlag==false) {
-       int nToys = fTestStat_b.size();
-       if (nToys==0) {
-@@ -162,40 +158,37 @@
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
-+/// error on \f$CL_{b}\f$:
-+/// \f[
-+/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLbError() const
- {
--  // Returns an estimate of the error on CLb assuming a binomial error on
--  // CLb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_b.size();
-   return TMath::Sqrt(CLb() * (1. - CLb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
-+/// error on \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
-+/// \f]
- Double_t HybridResult::CLsplusbError() const
- {
--  // Returns an estimate of the error on CLsplusb assuming a binomial
--  // error on CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
--  // END_LATEX
-   unsigned const int n = fTestStat_sb.size();
-   return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
- }
- 
- ///////////////////////////////////////////////////////////////////////////
--
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
-+/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- Double_t HybridResult::CLsError() const
- {
--  // Returns an estimate of the error on CLs through combination of the
--  // errors on CLb and CLsplusb:
--  // BEGIN_LATEX
--  // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--  // END_LATEX
-   unsigned const int n_b = fTestStat_b.size();
-   unsigned const int n_sb = fTestStat_sb.size();
-   
-diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
---- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx	2016-03-20 18:30:30.973026112 +0100
-@@ -229,8 +229,8 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// compute CLb error
--/// Clb =  1 - NullPValue() 
-+/// compute \f$CL_{b}\f$ error
-+/// \f$CL_{b}\f$ = 1 - NullPValue()
- /// must use opposite condition that routine above
- 
- Double_t HypoTestResult::CLbError() const {
-@@ -251,12 +251,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Returns an estimate of the error on CLs through combination of the
--/// errors on CLb and CLsplusb:
--/// BEGIN_LATEX
--/// #sigma_{CL_s} = CL_s
--/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
--/// END_LATEX
-+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
-+/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
-+/// \f[
-+/// \sigma_{CL_s} = CL_s
-+/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
-+/// \f]
- 
- Double_t HypoTestResult::CLsError() const {
-    if(!fAltDistr || !fNullDistr) return 0.0;
diff --git a/root-libgfortranbegin.patch b/root-libgfortranbegin.patch
deleted file mode 100644
index 2af5c42..0000000
--- a/root-libgfortranbegin.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
---- root-6.06.02.orig/config/Makefile.freebsd7	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.freebsd7	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
---- root-6.06.02.orig/config/Makefile.hurddeb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.hurddeb	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
---- root-6.06.02.orig/config/Makefile.linux	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linux	2016-03-20 16:55:12.753322362 +0100
-@@ -55,8 +55,10 @@
- else
- F77LIBS      := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
---- root-6.06.02.orig/config/Makefile.linuxalphagcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxalphagcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
---- root-6.06.02.orig/config/Makefile.linuxarm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm	2016-03-20 16:55:12.753322362 +0100
-@@ -49,8 +49,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
---- root-6.06.02.orig/config/Makefile.linuxarm64	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxarm64	2016-03-20 16:55:12.753322362 +0100
-@@ -53,8 +53,10 @@
- else
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
---- root-6.06.02.orig/config/Makefile.linuxhppa	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxhppa	2016-03-20 16:55:12.753322362 +0100
-@@ -43,8 +43,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
---- root-6.06.02.orig/config/Makefile.linuxia64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxia64gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -42,8 +42,10 @@
- endif
- F77FLAGS      = -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
---- root-6.06.02.orig/config/Makefile.linuxppcgcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxppcgcc	2016-03-20 16:55:12.753322362 +0100
-@@ -50,8 +50,10 @@
- endif
- F77FLAGS      = -m32 -fPIC -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
---- root-6.06.02.orig/config/Makefile.linuxx32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx32gcc	2016-03-20 16:55:12.753322362 +0100
-@@ -54,8 +54,10 @@
- else
- F77LIBS      := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
---- root-6.06.02.orig/config/Makefile.linuxx8664gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.linuxx8664gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -62,8 +62,10 @@
- else
- F77LIBS      := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
- endif
-+ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
---- root-6.06.02.orig/config/Makefile.win32gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win32gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
-diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
---- root-6.06.02.orig/config/Makefile.win64gcc	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.win64gcc	2016-03-20 16:55:12.754322372 +0100
-@@ -55,8 +55,10 @@
- endif
- F77FLAGS      = -std=legacy
- F77LIBS      := $(shell $(F77) -print-file-name=libgfortran.a)
-+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
- F77LIBS      += $(shell $(F77) -print-file-name=libgfortranbegin.a)
- endif
-+endif
- 
- ifneq ($(findstring g77, $(F77)),)
- ifeq ($(F77),)
diff --git a/root-links.patch b/root-links.patch
deleted file mode 100644
index 4dfbc44..0000000
--- a/root-links.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
---- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/PhysicsVectors.md	2016-03-07 19:15:32.945004806 +0100
-@@ -5,7 +5,7 @@
- and their rotation algorithms. The classes were ported to root from
- CLHEP see:
- 
--<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
-+<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
- 
- ## The Physics Vector Classes
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
---- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx	2016-03-07 19:15:32.945004806 +0100
-@@ -331,7 +331,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the maximum number of function calls for the minimization algorithm
- /// For example for MIGRAD this is the maxcalls value passed as first argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetMaxIterations(Int_t niter)
- {
-@@ -341,7 +341,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the Error Definition (default=1)
- /// For Minuit this is the value passed with the "SET ERR" command
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
- 
- void TVirtualFitter::SetErrorDef(Double_t errdef)
- {
-@@ -356,7 +356,7 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// static: Set the tolerance used in the minimization algorithm
- /// For example for MIGRAD this is tolerance value passed as second argument
--/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
-+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
- 
- void TVirtualFitter::SetPrecision(Double_t prec)
- {
-diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
---- root-6.06.02.orig/man/man1/g2root.1	2016-03-09 23:32:55.884697035 +0100
-+++ root-6.06.02/man/man1/g2root.1	2016-03-07 19:15:34.837027205 +0100
-@@ -13,7 +13,7 @@
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
---- root-6.06.02.orig/man/man1/g2rootold.1	2016-03-09 23:32:55.886697054 +0100
-+++ root-6.06.02/man/man1/g2rootold.1	2016-03-07 19:15:34.838027217 +0100
-@@ -5,15 +5,15 @@
- .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
- .\" other parms are allowed: see man(7), man(1)
- .SH NAME
--g2rootold \- convert GEANT geomtry files to ROOT files
-+g2rootold \- convert GEANT geometry files to ROOT files
- .SH SYNOPSIS
--.B g2rootoldd
-+.B g2rootold
- .I [-f map_name] geant_name macro_name
- .SH "DESCRIPTION"
- You can convert a
- .B GEANT
- (see
--.I http://wwwinfo.cern.ch/asd/geant/index.html
-+.I http://geant.cern.ch/
- fore more on
- .BR GEANT )
- geometry to
-@@ -103,9 +103,9 @@
- .I JDIGI.
- .SH "SEE ALSO"
- .RS
--.IR root (1),
--.IR g2root (1),
--.IR h2root(1),
-+.IR root(1) ,
-+.IR g2root(1) ,
-+.IR h2root(1) ,
- .RE
- and
- .RS
-diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
---- root-6.06.02.orig/math/doc/v520/index.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/doc/v520/index.html	2016-03-07 19:15:34.407022114 +0100
-@@ -74,7 +74,7 @@
- 
-     <ul>
-   <li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian  8 and 16 point  quadrature approximation, it provides the translation of the CERNLIB algorithm
--  <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-+  <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig,  and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
-   These classes implement both the same  virtual interface as the adaptive integration methods provided by the MathMore library.  They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
- New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
- </li>
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -301,7 +301,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DENLAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -381,7 +381,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (DISLAN) is used.
- 
-    @param x The argument \f$x\f$
-@@ -756,7 +756,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-@@ -783,7 +783,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (XM1LAN)  is used
- 
-    @param x The argument \f$x\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h	2016-03-07 19:15:34.407022114 +0100
-@@ -528,7 +528,7 @@
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
-    <A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
-    The same algorithms as in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
-    CERNLIB</A> (RANLAN) is used.
- 
-    @param z The argument \f$z\f$
-diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
---- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h	2016-03-07 19:15:34.408022126 +0100
-@@ -193,7 +193,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/SineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-@@ -219,7 +219,7 @@
-   For detailed description see
-   <A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
-   Mathworld</A>. The implementation used is that of
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
-   CERNLIB</A>,
-   based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
- 
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
---- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h	2016-03-07 19:15:34.681025358 +0100
-@@ -193,7 +193,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-@@ -408,7 +408,7 @@
-   (<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
-   GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
-   Planetmath</A> and
--  <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
-+  <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
-   CERNLIB</A>) use the + sign in front of n in the denominator. In
-   order to be C++ compliant, the present library uses the former
-   convention. The implementation used is that of
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h	2016-03-07 19:15:34.681025358 +0100
-@@ -81,7 +81,7 @@
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
---- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h	2016-03-07 19:15:34.681025358 +0100
-@@ -90,7 +90,7 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
---- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h	2016-03-07 19:15:34.681025358 +0100
-@@ -92,14 +92,14 @@
-    A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
-    <A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
-    CERNLIB (G115)</A>.
- 
-    - VavilovAccurate uses the algorithm by
-    B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
-    <A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
-    which has been implemented in
--   <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
-+   <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
-    CERNLIB (G116)</A>.
- 
-    Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
-diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
---- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx	2016-03-07 19:15:34.681025358 +0100
-@@ -103,7 +103,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-@@ -239,7 +239,7 @@
-      http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- 
- - CERNLIB
--     http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
-+     https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
- 
-    while the latter is used by
- 
-diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
---- root-6.06.02.orig/math/minuit/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit/doc/index.txt	2016-03-07 19:15:34.681025358 +0100
-@@ -5,7 +5,7 @@
- <li>The main TMinuit class is documented in class TMinuit.</li>
- <li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
-     </a></li>
--<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
-+<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
-     </a></li>
- <li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
-       </A></li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
---- root-6.06.02.orig/math/minuit2/doc/index.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/index.txt	2016-03-07 19:15:34.682025370 +0100
-@@ -13,7 +13,7 @@
- <p>
- <ol>
- <li>
--F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
-+F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
- <li>
- F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
- <li>
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.html	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.html	2016-03-07 19:15:34.681025358 +0100
-@@ -32,7 +32,7 @@
- 
- <h2>References</h2>
- <ol>
--<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
-+<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
- <li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
-   <a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
- <li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
-diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
---- root-6.06.02.orig/math/minuit2/doc/Minuit2.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/minuit2/doc/Minuit2.md	2016-03-07 19:15:34.682025370 +0100
-@@ -14,7 +14,7 @@
- 
- ## References
- 
--1.  F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
-+1.  F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
- 2.  F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
- 3.  F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
- 4.  F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html	2016-03-11 18:29:45.555122263 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.html	2016-03-07 19:15:34.682025370 +0100
-@@ -163,7 +163,7 @@
- <h3>Linear Algebra Functions</h3>
- 
- Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN,  to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
--In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
-+In the case of a small matrix, a faster direct inversion is used. For a large (N > 6)  symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
- <pre>
- <em>//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
- bool ret = m.<strong>Invert</strong>()
-diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
---- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/smatrix/doc/SMatrixClass.md	2016-03-07 19:15:34.682025370 +0100
-@@ -132,7 +132,7 @@
- 
- ### Linear Algebra Functions
- 
--Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
-+Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
- 
- <pre>_//  Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
- bool ret = m.**Invert**()  
-diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
---- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TPolyLineShape.cxx	2016-03-10 22:03:03.211002438 +0100
-@@ -47,8 +47,8 @@
- //           V               v      v                     v      v                  //
- //      TPolyLineShape     TBRIK  TTUBE                 TPCON  TTRD1                //
- //       |        ^                                                                 //
--//       |        |       begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>end_html                          //
--//       V        |       (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well)                           //
-+//       |        |       <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R  O  O  T        S  H  A  P  E  S</a>                          //
-+//       V        |       (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well)                           //
- // St_PolyLine3D  |                                                                 //
- //                |                                                                 //
- //           TPoints3DABC                                                           //
-diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
---- root-6.06.02.orig/misc/table/src/TVolume.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/misc/table/src/TVolume.cxx	2016-03-09 06:11:44.976464126 +0100
-@@ -142,7 +142,7 @@
- ///                            10 - this unvisible, but sons are visible
- ///                            01 - this visible but sons
- ///                            11 - neither this nor its sons are visible
--/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
-+/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
- 
- Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN  vis)
- {
-@@ -150,11 +150,12 @@
-    return mapVis[vis];
- }
- 
--//______________________________________________________________________________
--//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+////////////////////////////////////////////////////////////////////////////////
-+/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
-+/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
-+
- Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
- {
--// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
-    const Int_t mapVis[4] = {1, -2, 0, -1 };
-    Int_t i;
- //  for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;
diff --git a/root-llvm-static.patch b/root-llvm-static.patch
deleted file mode 100644
index 39d7510..0000000
--- a/root-llvm-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 19:43:31.596966193 +0200
-@@ -59,6 +59,7 @@
-   endif()
- endif()
- set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
-+set(BUILD_SHARED_LIBS "NO")
- #--- Do not build cling as part of llvm.
- set(LLVM_NOCLING "YES")
- 
diff --git a/root-macro-align.patch b/root-macro-align.patch
deleted file mode 100644
index f8ef9eb..0000000
--- a/root-macro-align.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
---- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TEfficiency.cxx	2016-03-08 21:34:59.673902466 +0100
-@@ -329,7 +329,7 @@
- parameters are shown in the plot below.
- 
- Begin_Macro(source)
--   {
-+{
-       //canvas only needed for the documentation
-       TCanvas* c1 = new TCanvas("c1","",600,400);
-       c1->SetFillStyle(1001);
-@@ -363,7 +363,7 @@
- 
-       //only for this documentation
-       return c1;
--   }
-+}
- End_Macro
- 
- 
-diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
---- root-6.06.02.orig/hist/hist/src/TH1.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH1.cxx	2016-03-08 13:45:25.689411795 +0100
-@@ -1809,9 +1809,9 @@
- /// of comparison of the unweighted histogram with 217 events (minimal expected
- /// frequency equal to one) and the weighted histogram with 500 events (minimal
- /// expected frequency equal to 25)
--///Begin_Macro
-+/// Begin_Macro
- /// ../../../tutorials/math/chi2test.C(17)
--///End_Macro
-+/// End_Macro
- /// Fig 2. An example of comparison of the unweighted histogram with 217 events
- /// and the weighted histogram with 500 events:
- ///   a) unweighted histogram;
diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch
deleted file mode 100644
index 48085d6..0000000
--- a/root-missing-cmake-config.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-04-04 13:15:41.550400890 +0200
-@@ -252,6 +252,12 @@
-   endif()
-   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
-                          REGEX system.rootrc EXCLUDE
-+                         REGEX system.rootauthrc EXCLUDE
-+                         REGEX system.rootdaemonrc EXCLUDE
-+                         REGEX rootd.rc.d EXCLUDE
-+                         REGEX proofd.rc.d EXCLUDE
-+                         REGEX rootd.xinetd EXCLUDE
-+                         REGEX proofd.xinetd EXCLUDE
-                          REGEX root.mimes EXCLUDE)
-   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
-   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-04-04 13:15:41.491400432 +0200
-@@ -404,7 +404,13 @@
- set(perl ${PERL_EXECUTABLE})
- 
- #---RConfigure-------------------------------------------------------------------------------------------------
--set(setresuid undef)
-+CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
-+  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
-+if(found_setresuid)
-+  set(setresuid define)
-+else()
-+  set(setresuid undef)
-+endif()
- if(mathmore)
-   set(hasmathmore define)
- else()
-@@ -523,7 +529,16 @@
- execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
- 
- configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
-+
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
-+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
-+
- configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
-+
- if(ruby)
-   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
- endif()
-@@ -665,8 +680,21 @@
- 
- install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
-               ${CMAKE_BINARY_DIR}/etc/system.rootrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
-+              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
-               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- 
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
-+              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-+                          GROUP_EXECUTE GROUP_READ
-+                          WORLD_EXECUTE WORLD_READ
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
-+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
-+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
-+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
-+
- install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
- 
- if(NOT gnuinstall)
-diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
---- root-6.06.02.orig/graf2d/x11/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/x11/CMakeLists.txt	2016-04-04 13:15:47.557447569 +0200
-@@ -9,4 +9,9 @@
- ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
- ROOT_LINKER_LIBRARY(${libname} *.cxx  *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
--ROOT_INSTALL_HEADERS()
-+
-+if(AIX)
-+  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+endif()
-+
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-04-04 13:15:41.568401030 +0200
-@@ -7,6 +7,7 @@
-   ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
-   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
-   ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
-+  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
- endif()
- ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
- ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
-diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
---- root-6.06.02.orig/net/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/CMakeLists.txt	2016-04-04 13:15:41.576401092 +0200
-@@ -1,6 +1,7 @@
- 
- add_subdirectory(net)
- add_subdirectory(auth)  # special CMakeListst.txt
-+add_subdirectory(rootd)
- 
- if(bonjour)
-   add_subdirectory(bonjour)
-diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
---- root-6.06.02.orig/net/rootd/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/net/rootd/CMakeLists.txt	2016-04-04 13:15:41.577401100 +0200
-@@ -0,0 +1,9 @@
-+############################################################################
-+# CMakeLists.txt file for building ROOT net/rootd package
-+# @author Pere Mato, CERN
-+############################################################################
-+
-+ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
-+                      LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
---- root-6.06.02.orig/proof/pq2/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/pq2/CMakeLists.txt	2016-04-04 13:15:41.580401123 +0200
-@@ -3,4 +3,7 @@
- # @author Pere Mato, CERN
- ############################################################################
- 
--ROOT_INSTALL_HEADERS()
-\ No newline at end of file
-+ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
-+  RIO Net Thread MathCore)
-+
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
---- root-6.06.02.orig/proof/proofd/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/CMakeLists.txt	2016-04-04 13:15:41.583401147 +0200
-@@ -4,6 +4,7 @@
- ############################################################################
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- add_definitions(${XROOTD_CFLAGS})
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
- 
-@@ -11,14 +12,16 @@
-   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
- else()
-   ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
--                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
-+                         LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
-   if (NOT XROOTD_NOMAIN)
-      ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
-   endif ()
-   ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
-                          LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
--  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
-+  set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
-+  ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
-+                         LIBRARIES ${SYSLIBS})
- endif()
- 
- if(builtin_xrootd)
-@@ -38,4 +41,4 @@
- endif()
- 
- 
--ROOT_INSTALL_HEADERS()
-+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
-diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
---- root-6.06.02.orig/proof/proofx/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/CMakeLists.txt	2016-04-04 13:15:41.595401240 +0200
-@@ -1,4 +1,3 @@
--
- ############################################################################
- # CMakeLists.txt file for building ROOT proof/proofx package
- # @author Pere Mato, CERN
-@@ -14,6 +13,7 @@
- endif()
- 
- include_directories(${XROOTD_INCLUDE_DIRS})
-+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
- link_directories(${XROOTD_LIBRARY_DIR})
- add_definitions(${XROOTD_CFLAGS})
- 
diff --git a/root-missing-includes.patch b/root-missing-includes.patch
new file mode 100644
index 0000000..b798c6a
--- /dev/null
+++ b/root-missing-includes.patch
@@ -0,0 +1,12 @@
+diff --git a/tmva/tmva/inc/TMVA/DNN/DataLoader.h b/tmva/tmva/inc/TMVA/DNN/DataLoader.h
+index a3a960f..bf4a922 100644
+--- a/tmva/tmva/inc/TMVA/DNN/DataLoader.h
++++ b/tmva/tmva/inc/TMVA/DNN/DataLoader.h
+@@ -21,6 +21,7 @@
+ #include "TMatrix.h"
+ #include <vector>
+ #include <iostream>
++#include <algorithm>
+ 
+ #include "TMVA/Event.h"
+ 
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
deleted file mode 100644
index 5ce9485..0000000
--- a/root-more-fflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index f51bcbe..1ee0602 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
- #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
--string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
-+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
- string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
-diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
-index 045926d..a419744 100644
---- a/cmake/scripts/RootUseFile.cmake.in
-+++ b/cmake/scripts/RootUseFile.cmake.in
-@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
-index b9a8e34..f931ad3 100644
---- a/etc/cmake/RootUseFile.cmake
-+++ b/etc/cmake/RootUseFile.cmake
-@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
- add_definitions(${ROOT_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
--set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
-+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root-no-abi-check.patch b/root-no-abi-check.patch
deleted file mode 100644
index afad777..0000000
--- a/root-no-abi-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
-index 896ca4c..51e01905 100644
---- a/cmake/modules/CheckCompiler.cmake
-+++ b/cmake/modules/CheckCompiler.cmake
-@@ -1,7 +1,6 @@
- #---------------------------------------------------------------------------------------------------
- #  CheckCompiler.cmake
- #---------------------------------------------------------------------------------------------------
--include (CheckCXXSourceCompiles)
- 
- #---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
- if(fortran)
-@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-   endif()
-   message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
-   set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
--  CHECK_CXX_SOURCE_COMPILES("
--    #include <string>
--    #if _GLIBCXX_USE_CXX11_ABI
--    #error \"cling does not support GCC 5 ABI.\"
--    #endif
--    int main() {}" CXX_SUPPORTS_OLD_ABI)
--  if(NOT CXX_SUPPORTS_OLD_ABI)
--     message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
--  endif()
- else()
-   set(GCC_MAJOR 0)
-   set(GCC_MINOR 0)
diff --git a/root-ppc64.patch b/root-ppc64.patch
deleted file mode 100644
index cab115c..0000000
--- a/root-ppc64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
-@@ -30,8 +30,8 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
--elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
--  message(STATUS "Found a 64bit ppc64 little endian system")
-+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
-+  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
-   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-   if(CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-@@ -205,17 +205,12 @@
-    ;;
- linuxppcgcc)
-    # PPC Linux with gcc
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
-+   auxldflags="-m32"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
- linuxppc64gcc)
--   # PPC64 (64 bit mode) Linux with gcc 3.x
--   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
--   auxldflags="-m64"
--   auxlibs="-lm -ldl -rdynamic"
--   ;;
--ppc64le)
--   # PPC64 (64 bit mode) little endian
-+   # PPC64/PPC64LE (64 bit mode) Linux with gcc
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
diff --git a/root-private-public.patch b/root-private-public.patch
deleted file mode 100644
index cb30e30..0000000
--- a/root-private-public.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
---- root-6.06.02.orig/proof/proofx/inc/TXSocket.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/inc/TXSocket.h	2016-04-03 11:21:57.879553149 +0200
-@@ -43,8 +43,8 @@
- #ifndef ROOT_TSocket
- #include "TSocket.h"
- #endif
--#ifndef ROOT_XrdProofConn
--#include "XrdProofConn.h"
-+#ifndef __XPTYPES_H
-+#include "XProtocol/XPtypes.hh"
- #endif
- #ifndef XRC_UNSOLMSG_H
- #include "XrdClient/XrdClientUnsolMsg.hh"
-@@ -58,6 +58,7 @@
- class TXHandler;
- class TXSocketHandler;
- class XrdClientMessage;
-+class XrdProofConn;
- 
- // To transmit info to Handlers
- typedef struct {
-@@ -140,7 +141,7 @@
-    void                PostMsg(Int_t type, const char *msg = 0);
- 
-    // Auxilliary
--   Int_t               GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
-+   Int_t               GetLowSocket() const;
- 
-    static void         SetLocation(const char *loc = ""); // Set location string
- 
-@@ -170,13 +171,13 @@
- 
-    virtual Int_t       GetClientID() const { return -1; }
-    virtual Int_t       GetClientIDSize() const { return 1; }
--   Int_t               GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
--   Int_t               GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
--   Int_t               GetServType() const { return (fConn ? fConn->GetServType() : -1); }
--   Int_t               GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
-+   Int_t               GetLogConnID() const;
-+   Int_t               GetOpenError() const;
-+   Int_t               GetServType() const;
-+   Int_t               GetSessionID() const;
-    Int_t               GetXrdProofdVersion() const { return fXrdProofdVersion; }
- 
--   Bool_t              IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
-+   Bool_t              IsValid() const;
-    Bool_t              IsServProofd();
-    virtual void        RemoveClientID() { }
-    virtual void        SetClientID(Int_t) { }
-@@ -215,11 +216,9 @@
-    void                SendUrgent(Int_t type, Int_t int1, Int_t int2);
- 
-    // Interrupt the low level socket
--   inline void         SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
--                                        fRDInterrupt = i;
--                                        if (i && fConn) fConn->SetInterrupt();
--                                        if (i && fAWait) fASem.Post(); }
-+   void                SetInterrupt(Bool_t i = kTRUE);
-    inline Bool_t       IsInterrupt()  { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
-+
-    // Set / Check async msg queue waiting status
-    inline void         SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
-    inline Bool_t       IsAWait()  { R__LOCKGUARD(fAMtx); return fAWait; }
-diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
---- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx	2016-04-03 11:09:26.464327948 +0200
-@@ -40,6 +40,8 @@
- #include "TSysEvtHandler.h"
- #include "XProofProtocol.h"
- 
-+#include "XrdProofConn.h"
-+
- ClassImp(TXProofMgr)
- 
- //
-diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
---- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofx/src/TXSocket.cxx	2016-04-03 11:58:23.937790633 +0200
-@@ -912,6 +912,46 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+/// Getter for logical connection ID
-+
-+Int_t TXSocket::GetLogConnID() const
-+{
-+   return (fConn ? fConn->GetLogConnID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for last error
-+
-+Int_t TXSocket::GetOpenError() const
-+{
-+   return (fConn ? fConn->GetOpenError() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for server type
-+
-+Int_t TXSocket::GetServType() const
-+{
-+   return (fConn ? fConn->GetServType() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for session ID
-+
-+Int_t TXSocket::GetSessionID() const
-+{
-+   return (fConn ? fConn->GetSessionID() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Getter for validity status
-+
-+Bool_t TXSocket::IsValid() const
-+{
-+   return (fConn ? (fConn->IsValid()) : kFALSE);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Return kTRUE if the remote server is a 'proofd'
- 
- Bool_t TXSocket::IsServProofd()
-@@ -1633,6 +1673,16 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+void TXSocket::SetInterrupt(Bool_t i)
-+{
-+   R__LOCKGUARD(fAMtx);
-+   fRDInterrupt = i;
-+   if (i && fConn) fConn->SetInterrupt();
-+   if (i && fAWait) fASem.Post();
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Send a TMessage object. Returns the number of bytes in the TMessage
- /// that were sent and -1 in case of error.
- 
-@@ -1923,6 +1973,12 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+Int_t TXSocket::GetLowSocket() const {
-+   return (fConn ? fConn->GetLowSocket() : -1);
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Init environment variables for XrdClient
- 
- void TXSocket::InitEnvs()
diff --git a/root-rose-image.patch b/root-rose-image.patch
new file mode 100644
index 0000000..0f13693
--- /dev/null
+++ b/root-rose-image.patch
@@ -0,0 +1,27 @@
+diff --git a/tutorials/image/rose_image.C b/tutorials/image/rose_image.C
+index 0614406..4e1b905 100644
+--- a/tutorials/image/rose_image.C
++++ b/tutorials/image/rose_image.C
+@@ -20,7 +20,9 @@ TCanvas *c1;
+ 
+ void rose_image()
+ {
+-   TImage *img = TImage::Open("$ROOTSYS/tutorials/image/rose512.jpg");
++   TString dir = TROOT::GetTutorialDir();
++
++   TImage *img = TImage::Open(dir + "/image/rose512.jpg");
+ 
+    if (!img) {
+       printf("Could not create an image... exit\n");
+@@ -41,9 +43,9 @@ void rose_image()
+ 
+    // draw text over image with foreground specified by pixmap
+    img->DrawText(250, 350, "goodbye cruel world ...", 24, 0,
+-                 ar, TImage::kPlain, "fore.xpm");
++                 ar, TImage::kPlain, dir + "/image/fore.xpm");
+ 
+-   TImage *img2 = TImage::Open("mditestbg.xpm");
++   TImage *img2 = TImage::Open(dir + "/image/mditestbg.xpm");
+ 
+    // tile image
+    img2->Tile(img->GetWidth(), img->GetHeight());
diff --git a/root-s390x.patch b/root-s390x.patch
deleted file mode 100644
index 39f0b98..0000000
--- a/root-s390x.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
---- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-04-06 10:07:33.109883779 +0200
-+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 10:10:14.541179186 +0200
-@@ -54,6 +54,32 @@
-   else()
-     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-   endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390x)
-+  message(STATUS "Found a 64bit system")
-+  set(BIT_ENVIRONMENT "-m64")
-+  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390xgcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
-+elseif(${SYSCTL_OUTPUT} MATCHES s390)
-+  message(STATUS "Found a 31bit system")
-+  set(BIT_ENVIRONMENT "-m31")
-+  set(SPECIAL_CINT_FLAGS "")
-+  if(CMAKE_COMPILER_IS_GNUCXX)
-+    message(STATUS "Found GNU compiler collection")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-+    message(STATUS "Found CLANG compiler")
-+    set(ROOT_ARCHITECTURE linuxs390gcc)
-+  else()
-+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
-+  endif()
- else()
-   message(STATUS "Found a 32bit system")
-   set(BIT_ENVIRONMENT "-m32")
-diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
---- root-6.06.02.orig/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
-+++ root-6.06.02/config/root-config.in	2016-04-06 10:13:04.506542626 +0200
-@@ -215,6 +215,18 @@
-    auxldflags="-m64"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
-+linuxs390gcc)
-+   # s390 (31 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
-+   auxldflags="-m31"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
-+linuxs390xgcc)
-+   # s390x (64 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
-+   auxldflags="-m64"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
- linuxx8664gcc)
-    # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
-    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
-diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
---- root-6.06.02.orig/core/base/inc/RConfig.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/RConfig.h	2016-04-06 10:10:14.675180260 +0200
-@@ -202,6 +202,19 @@
- #   define NEED_SIGJMP
- #endif
- 
-+#if defined(linux) && defined(__s390__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define NEED_SIGJMP
-+#endif
-+
-+#if defined(linux) && defined(__s390x__)
-+#   define R__LINUX
-+#   define R__UNIX
-+#   define R__B64
-+#   define NEED_SIGJMP
-+#endif
-+
- #if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
- #   define R__HURD
- #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
-diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
---- root-6.06.02.orig/core/pcre/CMakeLists.txt	2016-04-06 09:53:37.247748077 +0200
-+++ root-6.06.02/core/pcre/CMakeLists.txt	2016-04-06 10:16:45.144317047 +0200
-@@ -54,6 +54,10 @@
-     set(PCRE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(PCRE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(PCRE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(PCRE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(PCRE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
---- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 09:53:37.258748191 +0200
-+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake	2016-04-06 10:17:44.948798562 +0200
-@@ -49,6 +49,10 @@
-     set(AFTER_CC "${AFTER_CC}")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(AFTER_CC "${AFTER_CC}")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(AFTER_CC "${AFTER_CC} -m64")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(AFTER_CC "${AFTER_CC} .m31")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(AFTER_CC "${AFTER_CC} -m32")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
---- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt	2016-04-06 09:59:35.237876779 +0200
-+++ root-6.06.02/graf2d/freetype/CMakeLists.txt	2016-04-06 10:18:44.239276178 +0200
-@@ -56,6 +56,10 @@
-     set(FREETYPE_CFLAGS "-O")
-   elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-     set(FREETYPE_CFLAGS "-O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
-+    set(FREETYPE_CFLAGS "-m64 -O")
-+  elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+    set(FREETYPE_CFLAGS "-m31 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES linux)
-     set(FREETYPE_CFLAGS "-m32 -O")
-   elseif(ROOT_ARCHITECTURE MATCHES macosx64)
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-04-06 09:53:37.270748316 +0200
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-04-06 10:10:14.704180492 +0200
-@@ -21,6 +21,8 @@
-   set(ROOT_CLING_TARGET "ARM")
- elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-   set(ROOT_CLING_TARGET "PowerPC")
-+elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+  set(ROOT_CLING_TARGET "SystemZ")
- elseif(ROOT_ARCHITECTURE MATCHES linux)
-   set(ROOT_CLING_TARGET "X86")
- elseif(ROOT_ARCHITECTURE MATCHES macosx)
-diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
---- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake	2016-04-06 10:10:14.747180837 +0200
-@@ -372,6 +372,8 @@
-   set(LLVM_NATIVE_ARCH Hexagon)
- elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
-   set(LLVM_NATIVE_ARCH SystemZ)
-+elseif (LLVM_NATIVE_ARCH MATCHES "s390")
-+  set(LLVM_NATIVE_ARCH SystemZ)
- else ()
-   message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
- endif ()
diff --git a/root-save-memory.patch b/root-save-memory.patch
deleted file mode 100644
index 4952a92..0000000
--- a/root-save-memory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-18 00:28:13.225932434 +0100
-@@ -36,7 +36,9 @@
-                                     ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                                     ${corelinklibs})
- 
--add_dependencies(rootcling CLING LLVMRES)
-+# The dependency on Cling was added to prevent Cling (libCling) and
-+# rootcling from being linked in parallel.
-+add_dependencies(rootcling CLING LLVMRES Cling)
- 
- ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
- 
-diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
---- root-6.06.02.orig/core/utils/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/Module.mk	2016-03-18 00:10:57.995028698 +0100
-@@ -25,9 +25,11 @@
- 
- CLINGMETAUTILSO    = $(METAUTILSTO) $(METAUTILSOLLVM)
- ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
-+# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
-+# $(ROOTCLINGEXE) from being linked in parallel.
- $(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
- 	   $(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
--           $(PCREDEP) $(CORELIBDEP)
-+           $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
- 	$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
- 	   $(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
- 	   $(SNPRINTFO)  $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \
diff --git a/root-see-macro-output.patch b/root-see-macro-output.patch
deleted file mode 100644
index 35b828c..0000000
--- a/root-see-macro-output.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
---- root-6.06.02.orig/tutorials/fit/fit1.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fit1.C	2016-03-07 19:06:10.039340647 +0100
-@@ -13,7 +13,6 @@
- 
- void fit1() {
-    //Simple fitting example (1-d histogram with an interpreted function)
--   //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
---- root-6.06.02.orig/tutorials/fit/fitslicesy.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/fitslicesy.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- void fitslicesy() {
- //
- // Illustrates how to use the TH1::FitSlicesY function
--// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
- //    It uses the TH2F histogram generated in macro hsimple.C
- //    It invokes FitSlicesY and draw the fitted "mean" and "sigma"
- //    in 2 sepate pads.
-diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
---- root-6.06.02.orig/tutorials/fit/multifit.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/fit/multifit.C	2016-03-07 19:06:10.039340647 +0100
-@@ -3,7 +3,6 @@
- 
- void multifit() {
- //  Fitting multiple functions to different ranges of a 1-D histogram
--// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- //      Example showing how to fit in a sub-range of an histogram
- //  An histogram is created and filled with the bin contents and errors
- //  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
---- root-6.06.02.orig/tutorials/geom/shapes.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/geom/shapes.C	2016-03-07 19:06:10.038340635 +0100
-@@ -3,7 +3,6 @@
- 
- void shapes() {
- //The old geometry shapes (see script geodemo.C)
--//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
---- root-6.06.02.orig/tutorials/graphics/basic3d.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/basic3d.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,6 +1,5 @@
- void basic3d(){
-    // Show 3-D polylines and markers
--   // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
-    //
- 
-    TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
---- root-6.06.02.orig/tutorials/graphics/canvas.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/canvas.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void canvas(){
- //Example of primitives in a canvas
--// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
- // One of the first actions in a ROOT session is the creation of a Canvas.
- // Here we create a Canvas named "c1"
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
---- root-6.06.02.orig/tutorials/graphics/feynman.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/feynman.C	2016-03-07 19:06:10.029340528 +0100
-@@ -1,7 +1,6 @@
- void feynman()
- {
-    //Draw Feynman diagrams
--   // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
-    //Author: Otto Schaile
- 
-    TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
-diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
---- root-6.06.02.orig/tutorials/graphics/gaxis.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/gaxis.C	2016-03-07 19:06:10.027340505 +0100
-@@ -1,6 +1,5 @@
- void gaxis(){
- //Simple example illustrating how to draw TGaxis objects in various formats.
--//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
- //Author: Rene Brun
- 
-   TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
---- root-6.06.02.orig/tutorials/graphics/tornado.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphics/tornado.C	2016-03-07 19:06:10.028340516 +0100
-@@ -1,6 +1,5 @@
- void tornado() {
- //Show 3-d polymarkers
--// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- //Author: Rene Brun
- 
-     gBenchmark->Start("tornado");
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
---- root-6.06.02.orig/tutorials/graphs/gerrors2.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors2.C	2016-03-07 19:06:10.030340540 +0100
-@@ -1,6 +1,5 @@
- void gerrors2() {
-    //Draw two graphs with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
---- root-6.06.02.orig/tutorials/graphs/gerrors.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/gerrors.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void gerrors() {
-    //Draw a graph with error bars
--   // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
---- root-6.06.02.orig/tutorials/graphs/graph.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/graph.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void graph() {
-    //Draw a simple graph
--   // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
-diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
---- root-6.06.02.orig/tutorials/graphs/surfaces.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/graphs/surfaces.C	2016-03-07 19:06:10.031340552 +0100
-@@ -1,6 +1,5 @@
- void surfaces() {
-    //Draw 2-Dim functions
--   // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
---- root-6.06.02.orig/tutorials/hist/fillrandom.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/fillrandom.C	2016-03-07 19:06:10.037340623 +0100
-@@ -1,6 +1,5 @@
- void fillrandom() {
-    //Fill a 1-D histogram from a parametric function
--   // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
-diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
---- root-6.06.02.orig/tutorials/hist/hsum.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/hsum.C	2016-03-07 19:06:10.038340635 +0100
-@@ -1,7 +1,6 @@
- // histograms filled and drawn in a loop
- void hsum() {
- //
--// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- //    Simple example illustrating how to use the C++ interpreter
- //    to fill histograms in a loop and show the graphics results
- //Author: Rene Brun
-diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
---- root-6.06.02.orig/tutorials/hist/twoscales.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/hist/twoscales.C	2016-03-07 19:06:10.037340623 +0100
-@@ -9,7 +9,6 @@
- {
-    //example of macro illustrating how to superimpose two histograms
-    //with different scales in the "same" pad.
--   // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
-    //Author: Rene Brun
- 
-    TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
-diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
---- root-6.06.02.orig/tutorials/pyroot/fillrandom.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fillrandom.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
-diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
---- root-6.06.02.orig/tutorials/pyroot/fit1.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/fit1.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
- #
- from os import path
- from ROOT import TCanvas, TFile, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
---- root-6.06.02.orig/tutorials/pyroot/gerrors.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/gerrors.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraphErrors
-diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
---- root-6.06.02.orig/tutorials/pyroot/graph.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/graph.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
- #
- 
- from ROOT import TCanvas, TGraph
-diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
---- root-6.06.02.orig/tutorials/pyroot/h1draw.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/h1draw.py	2016-03-07 19:06:10.032340564 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
-diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
---- root-6.06.02.orig/tutorials/pyroot/hsum.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/hsum.py	2016-03-07 19:06:10.034340587 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- #    Simple example illustrating how to use the C++ interpreter	
- #    to fill histograms in a loop and show the graphics results
- #
-diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
---- root-6.06.02.orig/tutorials/pyroot/multifit.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/multifit.py	2016-03-07 19:06:10.035340599 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
- #      Example showing how to fit in a sub-range of an histogram
- #  An histogram is created and filled with the bin contents and errors
- #  defined in the table below.
-diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
---- root-6.06.02.orig/tutorials/pyroot/shapes.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/shapes.py	2016-03-07 19:06:10.036340611 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
- #
- 
- import ROOT
-diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
---- root-6.06.02.orig/tutorials/pyroot/surfaces.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/surfaces.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,5 +1,4 @@
- #
--# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
- #
- 
- from ROOT import TCanvas, TPaveText, TPad, TF2
-diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
---- root-6.06.02.orig/tutorials/pyroot/tornado.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/pyroot/tornado.py	2016-03-07 19:06:10.033340576 +0100
-@@ -1,4 +1,3 @@
--# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
- 
- from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
- from ROOT import gROOT, gBenchmark
-diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
---- root-6.06.02.orig/tutorials/ruby/hsum.rb	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/ruby/hsum.rb	2016-03-07 19:06:10.036340611 +0100
-@@ -4,7 +4,6 @@
- # (20/01/2004)  --elathan  <elathan@phys.uoa.gr>
- #
- # original header:
--# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
- # Simple example illustrating how to use the C++ interpreter	
- # to fill histograms in a loop and show the graphics results
- 
diff --git a/root-soname.patch b/root-soname.patch
deleted file mode 100644
index 3367bad..0000000
--- a/root-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-15 18:37:23.252408979 +0100
-@@ -39,7 +39,7 @@
- if(soversion)
-   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
-       VERSION ${ROOT_VERSION}
--      SOVERSION ${ROOT_MAJOR_VERSION}
-+      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
-       SUFFIX ${libsuffix}
-       PREFIX ${libprefix} )
- else()
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
index 1ce4430..eff695d 100644
--- a/root-stressgraphics.patch
+++ b/root-stressgraphics.patch
@@ -1,62 +1,13 @@
-diff -ur root-6.06.08.orig/test/stressGraphics.ref root-6.06.08/test/stressGraphics.ref
---- root-6.06.08.orig/test/stressGraphics.ref	2016-09-01 14:35:07.000000000 +0200
-+++ root-6.06.08/test/stressGraphics.ref	2016-09-08 07:24:55.397173483 +0200
-@@ -3,18 +3,18 @@
-     2      3940       600     14009       100      5437      1500     15379      7900      9282      3000      3778       600
-     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
-     4     23617      1500     19255       100     43077     12000    143320    123000     45665     11000     24908      1500
--    5      1025        50     12802        50     19715      2900     33468      9900     30846      5000      1072        50
-+    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
-     6       430        50     12616        50      4041       400      9558       100      5325       700       471        50
-     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
--    8      5442        80     13415        50      9599       150     18430       400     12398       200      5469        80
--    9      9253       100     14310        50      9664       400     19851      2400     12199       300      9449       100
--   10      8863        70     13539       100     14622       200     25627       150     25264       200      8894        70
--   11     12971       100     14377        50     20508       700     34063       600     32033       500     12864       150
--   12      7674       100     13482        50     27519      2500     83557       800     38505      4000      7720       150
--   13      5600       100     13242       100      9805       400     16881       400     15063       800      5638       100
--   14  14190539    500000     12926       100     15663       800     23076      9500     25987       900  14190704    500000
--   15     15690      5000     17179       100     12037       800     23076      9500     15202       900     10437      5000
--   16     28072       400     23287       200     25845      2000     44462     11000     30062      3500     38007       400
-+    8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
-+    9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
-+   10      8863        70     13539       100     14622      1100     25627      1100     25264      1700      8894        70
-+   11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
-+   12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
-+   13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
-+   14  14190539   4000000     12926       100     15663       800     23076      9500     25987      3000  14190704   4000000
-+   15     15690      5000     17179       200     12037       800     23076      9500     15202       900     10437      5000
-+   16     28072       400     23287       200     25845      2000     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       100     12050       800     27511     11000     16867       600     20721       400
-    18     15894       100     19305       100     12943       550     27187     10300     16309       350     15925       100
-    19     22521       300     42774       150     21207      6800     43868     17000     19232     11000     22729       300
-@@ -25,7 +25,7 @@
-    24      7813       300     23739       100      4662      2300     11085      6000      6973      3100      8081       300
-    25      4545       150     14541       100     11094      1400     27602     14800     13094      2800      4467       150
-    26      6141       200     15967       100     14776      4200     39594     21600     19331      7000      6126       200
--   27      9110       500     16737       100      9738      4200     21346     21600     10645      7000      8869       500
-+   27      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
-    28     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
-    29     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
-    30   3304592       100    709013       100    155478     32000     62688     19000    123056      7000         0         0
-@@ -35,15 +35,15 @@
-    34    310239      6500    123808       500     38898     10400     62719     34100     45592     14000    317918      6500
-    35    352426      5000    156863       750     43638      6300     65828     31800     53934      6500    357204      5000
-    36   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
--   37   1456993      2000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      5000
-+   37   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
-    38     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
--   39     15025      1500     29289       500     34091      1500     42525     11300     33336      3900     14787      1500
--   40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      5000
--   41      4846        50     14075       100     24281       100     33239       150     25636       100      4877        50
-+   39     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-+   40    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
-+   41      4846       150     14075       100     24281       200     33239       600     25636       300      4877       150
-    42   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
-    43      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
-    44      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
-    45   1666331    160000    529473     50000     38603      3000     29519      3000     71404      7000         0         0
-    46    176455     17000    266221     25000     15528      1500     40859      4000     31451      3000    193640     19000
-    47     13592      1300     16669      1600     24300      2400     52678      5200     22353      2200     13291      1300
--   48    153915     10000    545717     50000     10242      1000     17106      1000     11410      1000     65219      1000
-+   48    153915     10000    545717     50000     10242      1000     17106      1000     11410      1000     65219     10000
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 7a58dc2..14560ce 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -36,7 +36,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
+    35    310239      6500    120909       500     38898     10400     62719     34100     45592     14000    317918      6500
+    36    344170      5000    153264       750     43638      6300     65828     31800     53934      6500    348704      5000
+    37   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
+-   38   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
++   38   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7500
+    39     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
+    40     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    41    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
diff --git a/root-template-files.patch b/root-template-files.patch
index 086b8a7..73a8c62 100644
--- a/root-template-files.patch
+++ b/root-template-files.patch
@@ -1,8 +1,9 @@
-diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
---- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/mlp/mlpHiggs.C	2016-03-23 21:58:56.072799219 +0100
-@@ -15,8 +15,8 @@
-    // equal to 1 for the signal and 0 for the background is added.
+diff --git a/tutorials/mlp/mlpHiggs.C b/tutorials/mlp/mlpHiggs.C
+index 8c5743f..d2a2769 100644
+--- a/tutorials/mlp/mlpHiggs.C
++++ b/tutorials/mlp/mlpHiggs.C
+@@ -16,8 +16,8 @@
+ void mlpHiggs(Int_t ntrain=100) {
     const char *fname = "mlpHiggs.root";
     TFile *input = 0;
 -   if (!gSystem->AccessPathName(fname)) {
@@ -12,17 +13,27 @@ diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/m
     } else {
        printf("accessing %s file from http://root.cern.ch/files\n",fname);
        input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
---- root-6.06.02.orig/tutorials/quadp/portfolio.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/quadp/portfolio.C	2016-03-23 22:19:31.309867477 +0100
-@@ -273,8 +273,8 @@
+diff --git a/tutorials/quadp/portfolio.C b/tutorials/quadp/portfolio.C
+index 9f8bb8a..ca96365 100644
+--- a/tutorials/quadp/portfolio.C
++++ b/tutorials/quadp/portfolio.C
+@@ -289,8 +289,8 @@ void portfolio()
  
-   const char *fname = "stock.root";
-   TFile *f = 0;
--  if (!gSystem->AccessPathName(fname)) {
--     f = TFile::Open(fname);
-+  if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+     f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
-   } else {
-      printf("accessing %s file from http://root.cern.ch/files\n",fname);
-      f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+    const char *fname = "stock.root";
+    TFile *f = 0;
+-   if (!gSystem->AccessPathName(fname)) {
+-      f = TFile::Open(fname);
++   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
++      f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    } else {
+       printf("accessing %s file from http://root.cern.ch/files\n",fname);
+       f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+@@ -314,7 +314,7 @@ void portfolio()
+       for (Int_t j = 0; j <= i; j++) {
+          Double_t sum = 0.;
+          for (Int_t k = 0; k < nrData; k++)
+-         sum += (data[i][k]-r[i])*(data[j][k]-r[j]);
++            sum += (data[i][k]-r[i])*(data[j][k]-r[j]);
+          Covar(i,j) = Covar(j,i) = sum/nrData;
+       }
+    }
diff --git a/root-test-install.patch b/root-test-install.patch
index 0b61f68..ad4544f 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -1,38 +1,47 @@
-diff -Nur root-6.06.02.orig/bindings/pyroot/CMakeLists.txt root-6.06.02/bindings/pyroot/CMakeLists.txt
---- root-6.06.02.orig/bindings/pyroot/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/CMakeLists.txt	2016-03-20 14:37:23.588596390 +0100
-@@ -37,12 +37,12 @@
+diff -Nur root-6.08.02.orig/bindings/pyroot/CMakeLists.txt root-6.08.02/bindings/pyroot/CMakeLists.txt
+--- root-6.08.02.orig/bindings/pyroot/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/bindings/pyroot/CMakeLists.txt	2016-12-06 12:46:10.280969916 +0100
+@@ -36,18 +36,18 @@
+ file(GLOB pyfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
+ foreach(pyfile ${pyfiles})
    install(FILES ${pyfile} DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
-   install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+-  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+-  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
 -  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
++  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
 +  file(COPY ${pyfile} DESTINATION ${localruntimedir})
  endforeach()
  
--set( ROOTaaSDirName "ROOTaaS")
-+set(ROOTaaSDirName "ROOTaaS")
- install (DIRECTORY ${ROOTaaSDirName} DESTINATION ${runtimedir})
--file(COPY ${ROOTaaSDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+file(COPY ${ROOTaaSDirName} DESTINATION ${localruntimedir})
+-set( JupyROOTDirName "JupyROOT")
++set(JupyROOTDirName "JupyROOT")
+ install (DIRECTORY ${JupyROOTDirName} DESTINATION ${runtimedir})
+-file(COPY ${JupyROOTDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++file(COPY ${JupyROOTDirName} DESTINATION ${localruntimedir})
+ 
+ set( JsMVADirName "JsMVA")
+ install (DIRECTORY ${JsMVADirName} DESTINATION ${runtimedir})
+-file(COPY ${JsMVADirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
++file(COPY ${JsMVADirName} DESTINATION ${localruntimedir})
  
  #---Install headers----------------------------------------------------------
  ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/bindings/pyroot/ROOT.py root-6.06.02/bindings/pyroot/ROOT.py
---- root-6.06.02.orig/bindings/pyroot/ROOT.py	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/bindings/pyroot/ROOT.py	2016-03-20 14:37:23.646596937 +0100
-@@ -508,7 +508,7 @@
+diff -Nur root-6.08.02.orig/bindings/pyroot/ROOT.py root-6.08.02/bindings/pyroot/ROOT.py
+--- root-6.08.02.orig/bindings/pyroot/ROOT.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/bindings/pyroot/ROOT.py	2016-12-06 12:46:10.281969905 +0100
+@@ -516,7 +516,7 @@
  
            # system logon, user logon, and local logon (skip Rint.Logon)
              name = '.rootlogon.C'
 -            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
-+            logons = [ os.path.join( self.TROOT.GetEtcDir().Data(), 'system' + name ),
++            logons = [ os.path.join( str(self.TROOT.GetEtcDir()), 'system' + name ),
                         os.path.expanduser( os.path.join( '~', name ) ) ]
              if logons[-1] != os.path.join( os.getcwd(), name ):
                 logons.append( name )
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-@@ -222,7 +222,7 @@
+diff -Nur root-6.08.02.orig/cmake/modules/RootBuildOptions.cmake root-6.08.02/cmake/modules/RootBuildOptions.cmake
+--- root-6.08.02.orig/cmake/modules/RootBuildOptions.cmake	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/cmake/modules/RootBuildOptions.cmake	2016-12-06 12:46:10.281969905 +0100
+@@ -234,7 +234,7 @@
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
  
  # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
@@ -41,9 +50,9 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cm
    set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
    set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
  elseif(APPLE)
-diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake/modules/RootNewMacros.cmake
---- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootNewMacros.cmake	2016-03-20 14:37:23.671597173 +0100
+diff -Nur root-6.08.02.orig/cmake/modules/RootNewMacros.cmake root-6.08.02/cmake/modules/RootNewMacros.cmake
+--- root-6.08.02.orig/cmake/modules/RootNewMacros.cmake	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/cmake/modules/RootNewMacros.cmake	2016-12-06 12:46:10.281969905 +0100
 @@ -19,6 +19,7 @@
    set(libprefix lib)
    set(ld_library_path PATH)
@@ -68,7 +77,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
    set(runtimedir ${CMAKE_INSTALL_LIBDIR})
  endif()
  
-@@ -322,7 +325,15 @@
+@@ -325,7 +328,15 @@
      set(pcm_name)
    else()
      if(CMAKE_PROJECT_NAME STREQUAL ROOT)
@@ -85,7 +94,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
        set(ROOTCINTDEP rootcling)
      else()
        set(command rootcling)
-@@ -431,9 +442,6 @@
+@@ -441,9 +452,6 @@
    if(TARGET G__${library})
      add_dependencies(${library} G__${library})
    endif()
@@ -95,7 +104,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
    set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
    set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
    set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
-@@ -468,9 +476,6 @@
+@@ -484,9 +492,6 @@
    if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
       add_dependencies(${library} ${CMAKE_MATCH_2})
    endif()
@@ -105,7 +114,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
  
    #--- Only for building shared libraries
    set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
-@@ -511,9 +516,6 @@
+@@ -532,9 +537,6 @@
    ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
    include_directories(${CMAKE_BINARY_DIR}/include)
    add_library( ${library} SHARED ${lib_srcs})
@@ -113,9 +122,9 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
 -    add_dependencies(${library} move_headers)
 -  endif()
    set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
-   target_link_libraries(${library} ${ARG_LIBRARIES})
-   #----Installation details-------------------------------------------------------
-@@ -590,6 +592,10 @@
+   # Do not add -Dname_EXPORTS to the command-line when building files in this
+   # target. Doing so is actively harmful for the modules build because it
+@@ -617,6 +619,10 @@
                             PATTERN ".svn" EXCLUDE
                             REGEX "LinkDef" EXCLUDE
                             ${ARG_OPTIONS})
@@ -126,7 +135,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
      set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
    endforeach()
  endfunction()
-@@ -629,9 +635,6 @@
+@@ -656,9 +662,6 @@
    if (ARG_ADDITIONAL_COMPILE_FLAGS)
      set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
    endif()
@@ -136,7 +145,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
  
    #----Installation details------------------------------------------------------
    if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-@@ -849,6 +852,9 @@
+@@ -878,6 +881,9 @@
      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
    else()
      add_test(NAME ${test} COMMAND ${_command})
@@ -146,9 +155,9 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootNewMacros.cmake root-6.06.02/cmake
    endif()
  
    #- Handle TIMOUT and DEPENDS arguments
-diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake/scripts/local_install.cmake
---- root-6.06.02.orig/cmake/scripts/local_install.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
+diff -Nur root-6.08.02.orig/cmake/scripts/local_install.cmake root-6.08.02/cmake/scripts/local_install.cmake
+--- root-6.08.02.orig/cmake/scripts/local_install.cmake	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
 @@ -1,20 +0,0 @@
 -# Arguments:
 -#  PREFIX    - Installation prefix
@@ -170,10 +179,10 @@ diff -Nur root-6.06.02.orig/cmake/scripts/local_install.cmake root-6.06.02/cmake
 -    message(FATAL_ERROR "${msg}")
 -  endif()
 -endforeach()
-diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
---- root-6.06.02.orig/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/CMakeLists.txt	2016-03-20 14:37:23.686597315 +0100
-@@ -135,7 +135,7 @@
+diff -Nur root-6.08.02.orig/CMakeLists.txt root-6.08.02/CMakeLists.txt
+--- root-6.08.02.orig/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/CMakeLists.txt	2016-12-06 12:46:10.290969803 +0100
+@@ -91,7 +91,7 @@
    endif()
  endforeach()
  
@@ -182,20 +191,20 @@ diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
  set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
  add_custom_command(OUTPUT ${stamp_file}
                     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
-@@ -147,11 +147,7 @@
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README
-                    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
-                    COMMENT "Moving directories such as etc, icons, fonts, etc. to build area")
--add_custom_target(move_headers DEPENDS ${stamp_file}
+@@ -119,11 +119,7 @@
+   endif()
+ endforeach()
+ 
+-add_custom_target(move_headers DEPENDS ${stamp_file} ${tutorial_files_builddir}
 -                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
 -                                                        -DCOMPONENTS="headers"
 -                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
 -include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
-+add_custom_target(move_artifacts DEPENDS ${stamp_file})
++add_custom_target(move_artifacts DEPENDS ${stamp_file} ${tutorial_files_builddir})
  
  
  #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
-@@ -199,13 +195,23 @@
+@@ -179,13 +175,23 @@
                     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
                     DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
  
@@ -226,43 +235,51 @@ diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
  add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
  set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
  add_dependencies(onepcm ${__allTargets})
-@@ -213,22 +219,20 @@
- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+@@ -198,26 +204,27 @@
+                     DEPENDS build/unix/module.modulemap
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/unix/module.modulemap ${CMAKE_BINARY_DIR}/include/module.modulemap
+                     )
+-  add_dependencies(copymodulemap move_headers)
+ endif(cxxmodules)
  
  #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
 -if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
 -  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
 -  add_dependencies(hsimple onepcm)
--  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
 -  if(WIN32)
 -    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && 
+-                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+-                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
 -  else()
 -    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
--                               $<TARGET_FILE:hsimple.exe>
--                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+-                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} 
+-                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+-                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
 -  endif()
 -  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
 +add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
 +add_dependencies(hsimple onepcm)
 +if(WIN32)
 +  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
++                             set ROOTIGNOREPREFIX=1 &&
++                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
 +                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
++                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
 +else()
 +  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} ROOTIGNOREPREFIX=1 $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
++                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
++                             ROOTIGNOREPREFIX=1
++                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
 +                     WORKING_DIRECTORY tutorials
-+                     DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter move_artifacts)
++                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
  endif()
 +install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
  
  #---version--------------------------------------------------------------------------------------
  add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
-@@ -266,9 +270,6 @@
+@@ -262,9 +269,6 @@
  #---Configure Testing using CTest----------------------------------------------------------------
  configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
  if(testing)
@@ -272,9 +289,9 @@ diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
    include(RootCTest)
    if(roottest)
      find_package(Git REQUIRED)
-diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.in
---- root-6.06.02.orig/config/RConfigure.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/RConfigure.in	2016-03-20 14:37:23.686597315 +0100
+diff -Nur root-6.08.02.orig/config/RConfigure.in root-6.08.02/config/RConfigure.in
+--- root-6.08.02.orig/config/RConfigure.in	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/config/RConfigure.in	2016-12-06 12:46:10.290969803 +0100
 @@ -14,10 +14,11 @@
  #define ROOTTUTDIR    "@tutdir@"
  #define ROOTSRCDIR    "@srcdir@"
@@ -288,9 +305,9 @@ diff -Nur root-6.06.02.orig/config/RConfigure.in root-6.06.02/config/RConfigure.
  #@setresuid@ R__HAS_SETRESUID   /**/
  #@hasmathmore@ R__HAS_MATHMORE   /**/
  #@haspthread@ R__HAS_PTHREAD    /**/
-diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
---- root-6.06.02.orig/config/rootrc.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/rootrc.in	2016-03-20 14:37:23.706597503 +0100
+diff -Nur root-6.08.02.orig/config/rootrc.in root-6.08.02/config/rootrc.in
+--- root-6.08.02.orig/config/rootrc.in	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/config/rootrc.in	2016-12-06 12:46:10.291969792 +0100
 @@ -9,24 +9,24 @@
  # and to PATH on Windows.
  # Paths are different for Unix and Windows. The example shows the defaults
@@ -333,10 +350,10 @@ diff -Nur root-6.06.02.orig/config/rootrc.in root-6.06.02/config/rootrc.in
  Gui.MimeTypeFile:            $(HOME)/.root.mimes
  # If above does not exists defaults to this:
  #Gui.MimeTypeFile:            @etcdir@/root.mimes
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/configure	2016-03-20 14:37:23.733597759 +0100
-@@ -8018,6 +8018,7 @@
+diff -Nur root-6.08.02.orig/configure root-6.08.02/configure
+--- root-6.08.02.orig/configure	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/configure	2016-12-06 12:46:10.307969611 +0100
+@@ -8229,6 +8229,7 @@
      -e "s|@bindir@|$bindir|"               \
      -e "s|@etcdir@|$etcdir|"               \
      -e "s|@ttffontdir@|$fontdir|"          \
@@ -344,14 +361,13 @@ diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
      -e "s|@iconpath@|$iconpath|"           \
      -e "s|@hasxrd@|$hasxrd|"               \
      -e "s|@hasnotxrd@|$hasnotxrd|"         \
-diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TROOT.h
---- root-6.06.02.orig/core/base/inc/TROOT.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/inc/TROOT.h	2016-03-20 14:37:23.733597759 +0100
-@@ -325,7 +325,19 @@
+diff -Nur root-6.08.02.orig/core/base/inc/TROOT.h root-6.08.02/core/base/inc/TROOT.h
+--- root-6.08.02.orig/core/base/inc/TROOT.h	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/inc/TROOT.h	2016-12-06 12:46:10.307969611 +0100
+@@ -349,6 +349,21 @@
     static Int_t       ConvertVersionInt2Code(Int_t v);
     static Int_t       RootVersionCode();
     static const char**&GetExtraInterpreterArgs();
--   static const char *GetTutorialsDir();
 +
 +   static const TString& GetRootSys();
 +   static const TString& GetBinDir();
@@ -361,17 +377,19 @@ diff -Nur root-6.06.02.orig/core/base/inc/TROOT.h root-6.06.02/core/base/inc/TRO
 +   static const TString& GetDataDir();
 +   static const TString& GetDocDir();
 +   static const TString& GetMacroDir();
-+   static const TString& GetTutorialsDir();
++   static const TString& GetTutorialDir();
 +   static const TString& GetSourceDir();
 +   static const TString& GetIconPath();
 +   static const TString& GetTTFFontDir();
++
++   // Backward compatibility function - do not use for new code
+    static const char *GetTutorialsDir();
  
     ClassDef(TROOT,0)  //Top level (or root) structure for all classes
- };
-diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/base/src/TApplication.cxx
---- root-6.06.02.orig/core/base/src/TApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TApplication.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -268,11 +268,7 @@
+diff -Nur root-6.08.02.orig/core/base/src/TApplication.cxx root-6.08.02/core/base/src/TApplication.cxx
+--- root-6.08.02.orig/core/base/src/TApplication.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/src/TApplication.cxx	2016-12-06 12:46:10.308969599 +0100
+@@ -276,11 +276,7 @@
     // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
     // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
     const char *ttpath = gEnv->GetValue("Root.TTFontPath",
@@ -384,7 +402,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/bas
     char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
     // Check for use of DFSG - fonts
     if (!ttfont)
-@@ -880,29 +876,19 @@
+@@ -888,29 +884,19 @@
           Error("ProcessLine", "Cannot show demos in batch mode!");
           return 1;
        }
@@ -393,7 +411,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/bas
 -#else
 -      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
 -#endif
-+      ProcessLine(".x " + TROOT::GetTutorialsDir() + "/demos.C");
++      ProcessLine(".x " + TROOT::GetTutorialDir() + "/demos.C");
        return 0;
     }
  
@@ -420,10 +438,10 @@ diff -Nur root-6.06.02.orig/core/base/src/TApplication.cxx root-6.06.02/core/bas
     }
  
     if (!strncmp(line, ".pwd", 4)) {
-diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TEnv.cxx
---- root-6.06.02.orig/core/base/src/TEnv.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TEnv.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -399,21 +399,7 @@
+diff -Nur root-6.08.02.orig/core/base/src/TEnv.cxx root-6.08.02/core/base/src/TEnv.cxx
+--- root-6.08.02.orig/core/base/src/TEnv.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/src/TEnv.cxx	2016-12-06 12:46:10.308969599 +0100
+@@ -401,21 +401,7 @@
  
        TString sname = "system";
        sname += name;
@@ -446,7 +464,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TE
        ReadFile(s, kEnvGlobal);
        delete [] s;
        if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
-@@ -683,17 +669,7 @@
+@@ -685,17 +671,7 @@
  
        TString sname = "system";
        sname += fRcName;
@@ -465,10 +483,10 @@ diff -Nur root-6.06.02.orig/core/base/src/TEnv.cxx root-6.06.02/core/base/src/TE
        rootrcdir = s;
        delete [] s;
     } else if (level == kEnvUser) {
-diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/base/src/TPluginManager.cxx
---- root-6.06.02.orig/core/base/src/TPluginManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TPluginManager.cxx	2016-03-20 14:37:23.734597768 +0100
-@@ -468,6 +468,10 @@
+diff -Nur root-6.08.02.orig/core/base/src/TPluginManager.cxx root-6.08.02/core/base/src/TPluginManager.cxx
+--- root-6.08.02.orig/core/base/src/TPluginManager.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/src/TPluginManager.cxx	2016-12-06 12:46:10.308969599 +0100
+@@ -470,6 +470,10 @@
        TPH__IsReadingDirs() = kTRUE;
  
        TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
@@ -479,10 +497,10 @@ diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/b
  #ifdef WIN32
        dirs = plugindirs.Tokenize(";");
  #else
-diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx
---- root-6.06.02.orig/core/base/src/TROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TROOT.cxx	2016-03-20 14:37:23.735597777 +0100
-@@ -543,6 +543,22 @@
+diff -Nur root-6.08.02.orig/core/base/src/TROOT.cxx root-6.08.02/core/base/src/TROOT.cxx
+--- root-6.08.02.orig/core/base/src/TROOT.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/src/TROOT.cxx	2016-12-06 12:46:10.309969588 +0100
+@@ -643,6 +643,22 @@
     // Initialize Operating System interface
     InitSystem();
  
@@ -495,7 +513,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
 +   GetDataDir();
 +   GetDocDir();
 +   GetMacroDir();
-+   GetTutorialsDir();
++   GetTutorialDir();
 +   GetSourceDir();
 +   GetIconPath();
 +   GetTTFFontDir();
@@ -505,7 +523,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
     TDirectory::Build();
  
     // Initialize interface to CINT C++ interpreter
-@@ -1722,21 +1722,9 @@
+@@ -1876,21 +1892,9 @@
                 "after the call to TROOT::InitInterpreter()!");
        }
  
@@ -529,7 +547,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
  
        if (!gInterpreterLib) {
           TString err = dlerror();
-@@ -2082,22 +2070,7 @@
+@@ -2237,22 +2241,7 @@
  #endif
  
     TString gitinfo = "gitinfo.txt";
@@ -553,7 +571,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
  
     FILE *fp = fopen(filename, "r");
     if (fp) {
-@@ -2415,17 +2388,9 @@
+@@ -2570,17 +2559,9 @@
  #endif
        if (macroPath.Length() == 0)
  #if !defined(R__WIN32)
@@ -573,7 +591,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
  #endif
     }
  
-@@ -2521,14 +2486,252 @@
+@@ -2676,14 +2657,260 @@
  }
  
  ////////////////////////////////////////////////////////////////////////////////
@@ -748,7 +766,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
  
 -const char *TROOT::GetTutorialsDir()
 -{
-+const TString& TROOT::GetTutorialsDir() {
++const TString& TROOT::GetTutorialDir() {
  #ifdef ROOTTUTDIR
 -   return ROOTTUTDIR;
 -#else
@@ -767,8 +785,8 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
 +      const static TString roottutdir = ROOTTUTDIR;
 +      return roottutdir;
 +   }
-+#endif
-+}
+ #endif
+ }
 +
 +////////////////////////////////////////////////////////////////////////////////
 +/// Get the source directory in the installation. Static utility function.
@@ -830,12 +848,20 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T
 +      const static TString ttffontdir = TTFFONTDIR;
 +      return ttffontdir;
 +   }
- #endif
- }
-diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-03-20 14:37:23.736597787 +0100
-@@ -1852,22 +1852,10 @@
++#endif
++}
++
++////////////////////////////////////////////////////////////////////////////////
++/// Get the tutorials directory in the installation. Static utility function.
++/// Backward compatibility function - do not use for new code
++
++const char *TROOT::GetTutorialsDir() {
++   return GetTutorialDir();
++}
+diff -Nur root-6.08.02.orig/core/base/src/TSystem.cxx root-6.08.02/core/base/src/TSystem.cxx
+--- root-6.08.02.orig/core/base/src/TSystem.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/base/src/TSystem.cxx	2016-12-06 12:46:10.310969577 +0100
+@@ -1904,22 +1904,10 @@
        if (!system) {
           // Mark the library in $ROOTSYS/lib as system.
           const char *dirname = DirName(path);
@@ -860,7 +886,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src
           }
        }
  
-@@ -2492,12 +2480,9 @@
+@@ -2571,12 +2559,9 @@
  #else
     TString touch = "echo > "; touch += "\"" + depfilename + "\"";
  #endif
@@ -876,7 +902,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src
     builddep += depfilename;
     builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
     if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
-@@ -2519,12 +2504,7 @@
+@@ -2598,12 +2583,7 @@
        builddep += "/\" ";
     }
     builddep += " -Y -- ";
@@ -890,7 +916,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src
     builddep += " \"-I"+rootsysInclude+"\" "; // cflags
     builddep += includes;
     builddep += defines;
-@@ -3345,27 +3325,17 @@
+@@ -3434,27 +3414,17 @@
        TString name = ".rootmap";
        TString sname = "system.rootmap";
        TString file;
@@ -921,7 +947,7 @@ diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src
        mapfileStream << file << std::endl;
        AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
        mapfileStream << file << std::endl;
-@@ -3379,23 +3349,9 @@
+@@ -3468,23 +3438,9 @@
     mapfileStream.close();
  
     // ======= Generate the rootcling command line
@@ -948,10 +974,10 @@ diff -Nur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src
     rcling += mapfile;
     rcling += "\" -f \"";
     rcling.Append(dict).Append("\" -c -p ");
-diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
---- root-6.06.02.orig/core/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/CMakeLists.txt	2016-03-20 14:37:23.736597787 +0100
-@@ -66,14 +66,14 @@
+diff -Nur root-6.08.02.orig/core/CMakeLists.txt root-6.08.02/core/CMakeLists.txt
+--- root-6.08.02.orig/core/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/CMakeLists.txt	2016-12-06 12:46:10.310969577 +0100
+@@ -63,14 +63,14 @@
                       COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
                       COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
                       COMMENT "Recording the git revision now"
@@ -968,10 +994,10 @@ diff -Nur root-6.06.02.orig/core/CMakeLists.txt root-6.06.02/core/CMakeLists.txt
                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
  endif()
  add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
-diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/TClass.cxx
---- root-6.06.02.orig/core/meta/src/TClass.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TClass.cxx	2016-03-20 14:37:23.737597796 +0100
-@@ -1719,17 +1719,7 @@
+diff -Nur root-6.08.02.orig/core/meta/src/TClass.cxx root-6.08.02/core/meta/src/TClass.cxx
+--- root-6.08.02.orig/core/meta/src/TClass.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/meta/src/TClass.cxx	2016-12-06 12:46:10.311969565 +0100
+@@ -1722,17 +1722,7 @@
  {
     static const char *suffix = "class.rules";
     TString sname = suffix;
@@ -990,41 +1016,43 @@ diff -Nur root-6.06.02.orig/core/meta/src/TClass.cxx root-6.06.02/core/meta/src/
  
     Int_t res = -1;
  
-diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/TCling.cxx
---- root-6.06.02.orig/core/meta/src/TCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/meta/src/TCling.cxx	2016-03-20 14:37:23.739597815 +0100
-@@ -1049,10 +1049,10 @@
+diff -Nur root-6.08.02.orig/core/meta/src/TCling.cxx root-6.08.02/core/meta/src/TCling.cxx
+--- root-6.08.02.orig/core/meta/src/TCling.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/meta/src/TCling.cxx	2016-12-06 12:46:10.313969543 +0100
+@@ -1056,27 +1056,26 @@
+    std::vector<std::string> clingArgsStorage;
+    clingArgsStorage.push_back("cling4root");
+ 
+-   std::string interpInclude;
+    // rootcling sets its arguments through TROOT::GetExtraInterpreterArgs().
     if (!fromRootCling) {
        ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
  
--      interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
+       // Add -I early so ASTReader can find the headers.
+-      std::string interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
 -      clingArgsStorage.push_back(interpInclude);
-+      interpInclude = TROOT::GetEtcDir();
++      std::string interpInclude(TROOT::GetEtcDir());
 +      clingArgsStorage.push_back("-I" + interpInclude);
  
+       // Add include path to etc/cling. FIXME: This is a short term solution. The
+       // llvm/clang header files shouldn't be there at all. We have to get rid of
+       // that dependency and avoid copying the header files.
+-      clingArgsStorage.push_back(interpInclude + "/cling");
++      clingArgsStorage.push_back("-I" + interpInclude + "/cling");
+ 
+       // Add the root include directory and etc/ to list searched by default.
+-      clingArgsStorage.push_back(std::string("-I") + ROOT::TMetaUtils::GetROOTIncludeDir(false));
++      clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir()));
+ 
+       // Add the current path to the include path
+       // TCling::AddIncludePath(".");
+ 
 -      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
 +      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
        if (gSystem->Getenv("ROOT_PCH")) {
           pchFilename = gSystem->Getenv("ROOT_PCH");
        }
-@@ -1063,14 +1063,8 @@
-       // clingArgsStorage.push_back("-fmodules");
- 
-       std::string include;
--#ifndef ROOTINCDIR
--      include = gSystem->Getenv("ROOTSYS");
--      include += "/include";
--#else // ROOTINCDIR
--      include = ROOTINCDIR;
--#endif // ROOTINCDIR
--      clingArgsStorage.push_back("-I");
--      clingArgsStorage.push_back(include);
-+      include = TROOT::GetIncludeDir();
-+      clingArgsStorage.push_back("-I" + include);
-       clingArgsStorage.push_back("-Wno-undefined-inline");
-       clingArgsStorage.push_back("-fsigned-char");
-    }
-@@ -1080,7 +1074,11 @@
+@@ -1095,7 +1094,11 @@
             eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
        interpArgs.push_back(iArg->c_str());
  
@@ -1037,7 +1065,7 @@ diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/
     // Add statically injected extra arguments, usually coming from rootcling.
     for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
          extraArgs && *extraArgs; ++extraArgs) {
-@@ -1094,7 +1092,7 @@
+@@ -1109,7 +1112,7 @@
  
     fInterpreter = new cling::Interpreter(interpArgs.size(),
                                           &(interpArgs[0]),
@@ -1046,23 +1074,7 @@ diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/
  
     if (!fromRootCling) {
        fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
-@@ -1103,13 +1101,13 @@
-       // llvm/clang header files shouldn't be there at all. We have to get rid of
-       // that dependency and avoid copying the header files.
-       // Use explicit TCling::AddIncludePath() to avoid vtable: we're in the c'tor!
--      TCling::AddIncludePath((interpInclude.substr(2) + "/cling").c_str());
-+      TCling::AddIncludePath((interpInclude + "/cling").c_str());
- 
-       // Add the current path to the include path
-       // TCling::AddIncludePath(".");
- 
-       // Add the root include directory and etc/ to list searched by default.
--      TCling::AddIncludePath(ROOT::TMetaUtils::GetROOTIncludeDir(false).c_str());
-+      TCling::AddIncludePath(TROOT::GetIncludeDir());
-    }
- 
-    // Don't check whether modules' files exist.
-@@ -4515,21 +4513,7 @@
+@@ -4722,21 +4725,7 @@
  
     TString sname = "system";
     sname += name;
@@ -1085,10 +1097,10 @@ diff -Nur root-6.06.02.orig/core/meta/src/TCling.cxx root-6.06.02/core/meta/src/
  
     Int_t ret = ReadRootmapFile(s);
     if (ret == -3) // old format
-diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/metautils/inc/TMetaUtils.h
---- root-6.06.02.orig/core/metautils/inc/TMetaUtils.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/inc/TMetaUtils.h	2016-03-20 14:37:23.739597815 +0100
-@@ -339,10 +339,6 @@
+diff -Nur root-6.08.02.orig/core/metautils/inc/TMetaUtils.h root-6.08.02/core/metautils/inc/TMetaUtils.h
+--- root-6.08.02.orig/core/metautils/inc/TMetaUtils.h	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/metautils/inc/TMetaUtils.h	2016-12-06 12:46:10.313969543 +0100
+@@ -334,10 +334,6 @@
  //______________________________________________________________________________
  llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
  
@@ -1099,7 +1111,7 @@ diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/me
  enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
  
  //______________________________________________________________________________
-@@ -549,18 +545,6 @@
+@@ -544,18 +540,6 @@
                                   const char* headers[]);
  
  //______________________________________________________________________________
@@ -1118,10 +1130,10 @@ diff -Nur root-6.06.02.orig/core/metautils/inc/TMetaUtils.h root-6.06.02/core/me
  // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
  // that can be used in C++ as a variable name.
  void GetCppName(std::string &output, const char *input);
-diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/metautils/src/TMetaUtils.cxx
---- root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/metautils/src/TMetaUtils.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -3407,40 +3407,6 @@
+diff -Nur root-6.08.02.orig/core/metautils/src/TMetaUtils.cxx root-6.08.02/core/metautils/src/TMetaUtils.cxx
+--- root-6.08.02.orig/core/metautils/src/TMetaUtils.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/metautils/src/TMetaUtils.cxx	2016-12-06 12:46:10.314969531 +0100
+@@ -3303,40 +3303,6 @@
  }
  
  ////////////////////////////////////////////////////////////////////////////////
@@ -1162,7 +1174,7 @@ diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/
  /// Get the template specialisation decl and template decl behind the qualtype
  /// Returns true if successfully found, false otherwise
  
-@@ -3957,29 +3923,6 @@
+@@ -3967,29 +3933,6 @@
  }
  
  ////////////////////////////////////////////////////////////////////////////////
@@ -1192,10 +1204,10 @@ diff -Nur root-6.06.02.orig/core/metautils/src/TMetaUtils.cxx root-6.06.02/core/
  /// Return the dictionary file name for a module
  
  std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
-diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/TRint.cxx
---- root-6.06.02.orig/core/rint/src/TRint.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TRint.cxx	2016-03-20 14:37:23.740597824 +0100
-@@ -301,17 +301,7 @@
+diff -Nur root-6.08.02.orig/core/rint/src/TRint.cxx root-6.08.02/core/rint/src/TRint.cxx
+--- root-6.08.02.orig/core/rint/src/TRint.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/rint/src/TRint.cxx	2016-12-06 12:46:10.314969531 +0100
+@@ -305,17 +305,7 @@
     TString name = ".rootlogon.C";
     TString sname = "system";
     sname += name;
@@ -1214,10 +1226,10 @@ diff -Nur root-6.06.02.orig/core/rint/src/TRint.cxx root-6.06.02/core/rint/src/T
     if (!gSystem->AccessPathName(s, kReadPermission)) {
        ProcessFile(s);
     }
-diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src/TTabCom.cxx
---- root-6.06.02.orig/core/rint/src/TTabCom.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/rint/src/TTabCom.cxx	2016-03-20 14:37:23.741597834 +0100
-@@ -1663,8 +1663,7 @@
+diff -Nur root-6.08.02.orig/core/rint/src/TTabCom.cxx root-6.08.02/core/rint/src/TTabCom.cxx
+--- root-6.08.02.orig/core/rint/src/TTabCom.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/rint/src/TTabCom.cxx	2016-12-06 12:46:10.315969520 +0100
+@@ -1671,8 +1671,7 @@
     case kROOT_Load:
        {
           const TString fileName = s3("[^\"]*$");
@@ -1227,10 +1239,10 @@ diff -Nur root-6.06.02.orig/core/rint/src/TTabCom.cxx root-6.06.02/core/rint/src
           const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
  
  //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
-diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix/src/TUnixSystem.cxx
---- root-6.06.02.orig/core/unix/src/TUnixSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/unix/src/TUnixSystem.cxx	2016-03-20 14:37:23.742597843 +0100
-@@ -445,7 +445,9 @@
+diff -Nur root-6.08.02.orig/core/unix/src/TUnixSystem.cxx root-6.08.02/core/unix/src/TUnixSystem.cxx
+--- root-6.08.02.orig/core/unix/src/TUnixSystem.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/unix/src/TUnixSystem.cxx	2016-12-06 12:46:10.316969509 +0100
+@@ -458,7 +458,9 @@
  
  static void SetRootSys()
  {
@@ -1241,7 +1253,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
     void *addr = (void *)SetRootSys;
     Dl_info info;
     if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
-@@ -458,8 +460,8 @@
+@@ -471,8 +473,8 @@
           gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
        }
     }
@@ -1252,7 +1264,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  #endif
  }
  #endif
-@@ -487,7 +489,9 @@
+@@ -500,7 +502,9 @@
     TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
     TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
  
@@ -1263,7 +1275,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
     // first loaded is the app so set ROOTSYS to app bundle
     if (i == 1) {
-@@ -513,6 +517,8 @@
+@@ -526,6 +530,8 @@
        }
     }
  #endif
@@ -1272,7 +1284,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  #endif
  
     // when libSystem.B.dylib is loaded we have finished loading all dylibs
-@@ -600,13 +606,8 @@
+@@ -613,13 +619,8 @@
     SetRootSys();
  #endif
  
@@ -1288,7 +1300,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  
     return kFALSE;
  }
-@@ -2138,22 +2140,17 @@
+@@ -2240,22 +2241,17 @@
        if (AccessPathName(gdbscript, kReadPermission)) {
           fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
           gdbscript = "";
@@ -1314,7 +1326,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
  
     TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
     gdbmess = gdbmess.Strip();
-@@ -4471,11 +4468,7 @@
+@@ -4602,11 +4598,7 @@
        TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
        rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
        if (rdynpath.IsNull()) {
@@ -1327,7 +1339,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
        }
        TString ldpath;
  #if defined (R__AIX)
-@@ -4496,16 +4489,9 @@
+@@ -4627,16 +4619,9 @@
        else {
           dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
        }
@@ -1346,10 +1358,10 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix
        if (gCling) {
           dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
        } else
-diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
---- root-6.06.02.orig/core/utils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/CMakeLists.txt	2016-03-20 14:37:23.742597843 +0100
-@@ -64,27 +64,27 @@
+diff -Nur root-6.08.02.orig/core/utils/CMakeLists.txt root-6.08.02/core/utils/CMakeLists.txt
+--- root-6.08.02.orig/core/utils/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/utils/CMakeLists.txt	2016-12-06 12:46:10.316969509 +0100
+@@ -66,27 +66,27 @@
                      DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
  endif()
  
@@ -1383,9 +1395,9 @@ diff -Nur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CM
  add_dependencies(rootcling_tmp CLING LLVMRES)
  set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
  set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
-diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/ModuleVars.mk
---- root-6.06.02.orig/core/utils/ModuleVars.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/ModuleVars.mk	2016-03-20 14:37:23.742597843 +0100
+diff -Nur root-6.08.02.orig/core/utils/ModuleVars.mk root-6.08.02/core/utils/ModuleVars.mk
+--- root-6.08.02.orig/core/utils/ModuleVars.mk	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/utils/ModuleVars.mk	2016-12-06 12:46:10.316969509 +0100
 @@ -48,7 +48,7 @@
  ROOTCINTEXE     := bin/rootcint$(EXEEXT)
  GENREFLEXEXE    := bin/genreflex$(EXEEXT)
@@ -1395,10 +1407,10 @@ diff -Nur root-6.06.02.orig/core/utils/ModuleVars.mk root-6.06.02/core/utils/Mod
  
  ##### Dependencies for all dictionaries
  ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
-diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils/src/rootcling.cxx
---- root-6.06.02.orig/core/utils/src/rootcling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootcling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -295,12 +295,6 @@
+diff -Nur root-6.08.02.orig/core/utils/src/rootcling.cxx root-6.08.02/core/utils/src/rootcling.cxx
+--- root-6.08.02.orig/core/utils/src/rootcling.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/utils/src/rootcling.cxx	2016-12-06 12:46:10.317969497 +0100
+@@ -270,12 +270,6 @@
  bool buildingROOT = false;
  #endif
  
@@ -1411,7 +1423,7 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
  namespace {
     // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
     template <typename T> struct IsPointerTClassCopy {
-@@ -3977,11 +3971,6 @@
+@@ -3909,11 +3903,6 @@
        clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
     }
  
@@ -1423,7 +1435,7 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
     if (ic < argc && !strcmp(argv[ic], "-c")) {
        // Simply ignore the -c options.
        ic++;
-@@ -4131,7 +4120,11 @@
+@@ -4069,7 +4058,11 @@
     }
  
     ic = nextStart;
@@ -1436,7 +1448,7 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
  
     std::vector<std::string> pcmArgs;
     for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
-@@ -4140,7 +4133,11 @@
+@@ -4093,7 +4086,11 @@
     }
  
     // cling-only arguments
@@ -1449,7 +1461,7 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
     // We do not want __ROOTCLING__ in the pch!
     if (!onepcm) {
        clingArgs.push_back("-D__ROOTCLING__");
-@@ -4162,10 +4159,14 @@
+@@ -4118,10 +4115,14 @@
     }
  
     std::string resourceDir;
@@ -1467,7 +1479,7 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
  #endif
  
  #ifndef ROOT_STAGE1_BUILD
-@@ -4184,11 +4185,6 @@
+@@ -4162,11 +4163,6 @@
  
     interp.getOptions().ErrorOut = true;
     interp.enableRawInput(true);
@@ -1479,8 +1491,8 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
     if (isGenreflex) {
        if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
           // There was an error.
-@@ -4205,17 +4201,10 @@
-                               "#include <math.h>\n"
+@@ -4182,17 +4178,10 @@
+                               "#include <stddef.h>\n"
                                "#include <string.h>\n"
                               ) != cling::Interpreter::kSuccess
 -            || (!useROOTINCDIR
@@ -1501,10 +1513,10 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootcling.cxx root-6.06.02/core/utils
           ) {
           // There was an error.
           ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core/utils/src/rootclingTCling.cxx
---- root-6.06.02.orig/core/utils/src/rootclingTCling.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.cxx	2016-03-20 14:37:23.744597862 +0100
-@@ -37,6 +37,18 @@
+diff -Nur root-6.08.02.orig/core/utils/src/rootclingTCling.cxx root-6.08.02/core/utils/src/rootclingTCling.cxx
+--- root-6.08.02.orig/core/utils/src/rootclingTCling.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/utils/src/rootclingTCling.cxx	2016-12-06 12:46:10.317969497 +0100
+@@ -40,6 +40,18 @@
  }
  
  extern "C"
@@ -1522,10 +1534,10 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.cxx root-6.06.02/core
 +extern "C"
  cling::Interpreter *TCling__GetInterpreter()
  {
-    static bool sInitialized = false;
-diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/utils/src/rootclingTCling.h
---- root-6.06.02.orig/core/utils/src/rootclingTCling.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/utils/src/rootclingTCling.h	2016-03-20 14:37:23.744597862 +0100
+    static bool isInitialized = false;
+diff -Nur root-6.08.02.orig/core/utils/src/rootclingTCling.h root-6.08.02/core/utils/src/rootclingTCling.h
+--- root-6.08.02.orig/core/utils/src/rootclingTCling.h	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/utils/src/rootclingTCling.h	2016-12-06 12:46:10.318969486 +0100
 @@ -21,6 +21,8 @@
  
  extern "C" {
@@ -1535,9 +1547,9 @@ diff -Nur root-6.06.02.orig/core/utils/src/rootclingTCling.h root-6.06.02/core/u
     cling::Interpreter *TCling__GetInterpreter();
     void InitializeStreamerInfoROOTFile(const char *filename);
     void AddStreamerInfoToROOTFile(const char *normName);
-diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/winnt/src/TWinNTSystem.cxx
---- root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/winnt/src/TWinNTSystem.cxx	2016-03-20 14:37:23.745597871 +0100
+diff -Nur root-6.08.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.08.02/core/winnt/src/TWinNTSystem.cxx
+--- root-6.08.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/winnt/src/TWinNTSystem.cxx	2016-12-06 12:46:10.318969486 +0100
 @@ -362,11 +362,7 @@
           TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
           rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
@@ -1643,10 +1655,10 @@ diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/wi
  
     // Increase the accuracy of Sleep() without needing to link to winmm.lib
     typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
-diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeLists.txt
---- root-6.06.02.orig/core/zip/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/zip/CMakeLists.txt	2016-03-20 14:37:23.745597871 +0100
-@@ -50,6 +50,7 @@
+diff -Nur root-6.08.02.orig/core/zip/CMakeLists.txt root-6.08.02/core/zip/CMakeLists.txt
+--- root-6.08.02.orig/core/zip/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/core/zip/CMakeLists.txt	2016-12-06 12:46:10.319969475 +0100
+@@ -22,6 +22,7 @@
  # Define all the header files which should be installed when
  # doing a "make install"
  install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
@@ -1654,10 +1666,22 @@ diff -Nur root-6.06.02.orig/core/zip/CMakeLists.txt root-6.06.02/core/zip/CMakeL
  set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
  
  ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
-diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom/src/TGeoElement.cxx
---- root-6.06.02.orig/geom/geom/src/TGeoElement.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/geom/geom/src/TGeoElement.cxx	2016-03-20 14:37:23.746597881 +0100
-@@ -24,6 +24,7 @@
+diff -Nur root-6.08.02.orig/documentation/doxygen/converttonotebook.py root-6.08.02/documentation/doxygen/converttonotebook.py
+--- root-6.08.02.orig/documentation/doxygen/converttonotebook.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/documentation/doxygen/converttonotebook.py	2016-12-06 12:46:10.319969475 +0100
+@@ -601,7 +601,7 @@
+ def rs401dGetFiles(code):
+     if tutName == "rs401d_FeldmanCousins":
+         code = code.replace(
+-         """#if !defined(__CINT__) || defined(__MAKECINT__)\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n#endif""" , """std::string tutDir = gROOT->GetTutorialsDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.c_str());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.c_str());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
++         """#if !defined(__CINT__) || defined(__MAKECINT__)\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n#endif""" , """TString tutDir = gROOT->GetTutorialDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.Data());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.Data());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
+     return code
+ 
+ 
+diff -Nur root-6.08.02.orig/geom/geom/src/TGeoElement.cxx root-6.08.02/geom/geom/src/TGeoElement.cxx
+--- root-6.08.02.orig/geom/geom/src/TGeoElement.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/geom/geom/src/TGeoElement.cxx	2016-12-06 12:46:10.319969475 +0100
+@@ -39,6 +39,7 @@
  #include "Riostream.h"
  
  #include "TSystem.h"
@@ -1665,7 +1689,7 @@ diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom
  #include "TObjArray.h"
  #include "TVirtualGeoPainter.h"
  #include "TGeoManager.h"
-@@ -1113,12 +1114,8 @@
+@@ -1128,12 +1129,8 @@
  {
     if (HasRNElements()) return;
     TGeoElementRN *elem;
@@ -1680,27 +1704,18 @@ diff -Nur root-6.06.02.orig/geom/geom/src/TGeoElement.cxx root-6.06.02/geom/geom
     FILE *fp = fopen(rnf, "r");
     if (!fp) {
        Error("ImportElementsRN","File RadioNuclides.txt not found");
-diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-03-20 14:37:23.755597966 +0100
-@@ -359,33 +359,33 @@
+diff -Nur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:46:10.320969463 +0100
+@@ -357,33 +357,33 @@
  
  static void init_icon_paths()
  {
 -   const char *icons = "/icons";
 -#ifdef R__WIN32
 -      icons = "\\icons";
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
-+#ifndef R__WIN32
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
- #endif
-+   }
- 
+-#endif
+-
 -   TString homeIcons = gSystem->HomeDirectory();
 -   homeIcons += icons;
 -
@@ -1716,6 +1731,19 @@ diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/
 -
 -#ifdef ROOTICONPATH
 -   gIconPaths[4] = StrDup(ROOTICONPATH);
++   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
++   if (icon_path.IsNull()) {
++      icon_path = "icons";
++      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
++#ifndef R__WIN32
++      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
++#else
++      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
+ #endif
++   }
+ 
+-#ifdef EXTRAICONPATH
+-   gIconPaths[5] = StrDup(EXTRAICONPATH);
 +   Int_t cnt = 0;
 +   Ssiz_t from = 0;
 +   TString token;
@@ -1725,10 +1753,6 @@ diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/
 +   const char *delim = "\\";
  #endif
 -
--#ifdef EXTRAICONPATH
--   gIconPaths[5] = StrDup(EXTRAICONPATH);
--#endif
--
 -   gIconPaths[6] = 0;
 +   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
 +      char *path = gSystem->ExpandPathName(token.Data());
@@ -1741,10 +1765,34 @@ diff -Nur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm
---- root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/cocoa/src/QuartzWindow.mm	2016-03-20 14:37:23.762598032 +0100
-@@ -811,11 +811,7 @@
+@@ -2592,14 +2592,19 @@
+ 
+    TString fn = font_name;
+    fn.Strip();
+-   char *tmpstr = 0;
++
++   // This is for backward compatibility...
++   if (fn.Last('/') == 0) fn = fn(1, f.Length() - 1);
++
++   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
++                                       TROOT::GetTTFFontDir());
++   char *tmpstr = gSystem->Which(ttpath, fn, kReadPermission);
++   fn = tmpstr;
++   delete [] tmpstr;
+ 
+    if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
+-      tmpstr = gSystem->ExpandPathName(fn.Data());
+-      fn = tmpstr;
+       ttfont = kTRUE;
+    }
+-   delete [] tmpstr;
+ 
+    if (color) {
+       parse_argb_color(color, &text_color);
+diff -Nur root-6.08.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.08.02/graf2d/cocoa/src/QuartzWindow.mm
+--- root-6.08.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/cocoa/src/QuartzWindow.mm	2016-12-06 12:46:10.321969452 +0100
+@@ -814,11 +814,7 @@
     }
  
     if (pngFileName) {
@@ -1757,7 +1805,7 @@ diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d
        const Util::ScopedArray<const char> arrayGuard(path);
  
        if (!path || path[0] == 0) {
-@@ -3077,11 +3073,7 @@
+@@ -3083,11 +3079,7 @@
     }
  
     if (pngFileName) {
@@ -1770,9 +1818,9 @@ diff -Nur root-6.06.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.06.02/graf2d
        const Util::ScopedArray<const char> arrayGuard(path);
  
        if (!path || path[0] == 0) {
-diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/gpad/src/TClassTree.cxx
---- root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/gpad/src/TClassTree.cxx	2016-03-20 14:37:23.768598088 +0100
+diff -Nur root-6.08.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.08.02/graf2d/gpad/src/TClassTree.cxx
+--- root-6.08.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/gpad/src/TClassTree.cxx	2016-12-06 12:46:10.321969452 +0100
 @@ -195,11 +195,7 @@
     fNdata    = 0;
     SetLabelDx();
@@ -1799,9 +1847,9 @@ diff -Nur root-6.06.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.06.02/graf2d/g
  
     // draw list of classes (if specified)
     if (classes && strlen(classes)) {
-diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src/TTF.cxx
---- root-6.06.02.orig/graf2d/graf/src/TTF.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/graf/src/TTF.cxx	2016-03-20 14:37:23.775598154 +0100
+diff -Nur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/TTF.cxx
+--- root-6.08.02.orig/graf2d/graf/src/TTF.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/graf/src/TTF.cxx	2016-12-06 12:46:10.322969441 +0100
 @@ -15,12 +15,10 @@
  Interface to the freetype 2 library.
  */
@@ -1845,10 +1893,10 @@ diff -Nur root-6.06.02.orig/graf2d/graf/src/TTF.cxx root-6.06.02/graf2d/graf/src
        char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
        if (ttfont) {
           delete [] ttfont;
-diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-03-20 14:37:23.788598277 +0100
-@@ -1567,12 +1567,7 @@
+diff -Nur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:46:10.322969441 +0100
+@@ -1568,12 +1568,7 @@
  
     // try to load font (font must be in Root.TTFontPath resource)
     const char *ttpath = gEnv->GetValue("Root.TTFontPath",
@@ -1862,10 +1910,10 @@ diff -Nur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/g
  
     for (Int_t fontid = 1; fontid < 30; fontid++) {
        if (fontid != 15 && MustEmbed[fontid-1]) {
-diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TGQt.cxx
---- root-6.06.02.orig/graf2d/qt/src/TGQt.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/qt/src/TGQt.cxx	2016-03-20 14:37:23.800598390 +0100
-@@ -699,13 +699,6 @@
+diff -Nur root-6.08.02.orig/graf2d/qt/src/TGQt.cxx root-6.08.02/graf2d/qt/src/TGQt.cxx
+--- root-6.08.02.orig/graf2d/qt/src/TGQt.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf2d/qt/src/TGQt.cxx	2016-12-06 12:46:10.323969430 +0100
+@@ -707,13 +707,6 @@
                            GetSystemMetrics(SM_CYSMICON));
     HDC dc = tempIcon->handle();
     DrawIcon (dc, 0, 0, icon);
@@ -1879,7 +1927,7 @@ diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TG
  #endif
     return tempIcon;
  }
-@@ -795,13 +788,7 @@
+@@ -803,13 +796,7 @@
     static TQtApplication *app = 0;
     if (!app) {
        //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
@@ -1894,7 +1942,7 @@ diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TG
        gSystem->ExpandPathName(argvString);
        static char *argv[] = {(char *)argvString.Data()};
        static int nArg = 1;
-@@ -989,14 +976,8 @@
+@@ -997,14 +984,8 @@
      }
  
      if (isXdfSupport && !symbolFontFound) {
@@ -1911,7 +1959,7 @@ diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TG
          QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
          symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
      }
-@@ -1006,12 +987,7 @@
+@@ -1014,12 +995,7 @@
          fontFamily = fSymbolFontFamily = "Arial";
          qDebug() << " Substitute it with \""<<fontFamily <<"\"";
          qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
@@ -1925,9 +1973,9 @@ diff -Nur root-6.06.02.orig/graf2d/qt/src/TGQt.cxx root-6.06.02/graf2d/qt/src/TG
                   << "\" directory to get the proper support for ROOT TLatex class";
          // create a custom codec
          new QSymbolCodec();
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLFontManager.cxx	2016-03-20 14:37:23.800598390 +0100
+diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.08.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:46:10.323969430 +0100
 @@ -14,6 +14,7 @@
  #include "TGLFontManager.h"
  
@@ -1949,9 +1997,9 @@ diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.06.02/graf3d
        {
           //For extenede we have both ttf and otf.
           char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLSAViewer.cxx	2016-03-20 14:37:23.801598400 +0100
+diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.08.02/graf3d/gl/src/TGLSAViewer.cxx
+--- root-6.08.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf3d/gl/src/TGLSAViewer.cxx	2016-12-06 12:46:10.323969430 +0100
 @@ -669,14 +669,7 @@
           switch (parm1) {
           case kGLHelpAbout: {
@@ -1968,9 +2016,9 @@ diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.06.02/graf3d/gl
              gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src/TGLText.cxx
---- root-6.06.02.orig/graf3d/gl/src/TGLText.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/gl/src/TGLText.cxx	2016-03-20 14:37:23.801598400 +0100
+diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLText.cxx root-6.08.02/graf3d/gl/src/TGLText.cxx
+--- root-6.08.02.orig/graf3d/gl/src/TGLText.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/graf3d/gl/src/TGLText.cxx	2016-12-06 12:46:10.323969430 +0100
 @@ -197,13 +197,7 @@
  
     // try to load font (font must be in Root.TTFontPath resource)
@@ -1986,9 +2034,9 @@ diff -Nur root-6.06.02.orig/graf3d/gl/src/TGLText.cxx root-6.06.02/graf3d/gl/src
     char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
  
     if (fGLTextFont) delete fGLTextFont;
-diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/src/TGApplication.cxx
---- root-6.06.02.orig/gui/gui/src/TGApplication.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGApplication.cxx	2016-03-20 14:37:23.801598400 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TGApplication.cxx root-6.08.02/gui/gui/src/TGApplication.cxx
+--- root-6.08.02.orig/gui/gui/src/TGApplication.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TGApplication.cxx	2016-12-06 12:46:10.324969418 +0100
 @@ -84,12 +84,7 @@
  
     if (strcmp(appClassName, "proofserv")) {
@@ -2003,9 +2051,9 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TGApplication.cxx root-6.06.02/gui/gui/s
        char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
        // Added by cholm for use of DFSG - fonts - based on fix by Kevin
        if (!ttfont)
-diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/src/TGResourcePool.cxx
---- root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGResourcePool.cxx	2016-03-20 14:37:23.802598409 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TGResourcePool.cxx root-6.08.02/gui/gui/src/TGResourcePool.cxx
+--- root-6.08.02.orig/gui/gui/src/TGResourcePool.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TGResourcePool.cxx	2016-12-06 12:46:10.324969418 +0100
 @@ -83,46 +83,29 @@
     TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
     TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
@@ -2069,9 +2117,42 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TGResourcePool.cxx root-6.06.02/gui/gui/
  
     // Setup colors...
     fClient->GetColorByName("white", fWhite);  // white and black always exist
-diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/src/TGTextEditor.cxx
---- root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTextEditor.cxx	2016-03-20 14:37:23.802598409 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TGSpeedo.cxx root-6.08.02/gui/gui/src/TGSpeedo.cxx
+--- root-6.08.02.orig/gui/gui/src/TGSpeedo.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TGSpeedo.cxx	2016-12-06 12:46:10.324969418 +0100
+@@ -119,8 +119,7 @@
+ {
+    TString sc;
+    Float_t step, mark[5];
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString ar = fp + "/arialbd.ttf";
++   TString ar = "arialbd.ttf";
+    Int_t i, nexe, offset;
+ 
+    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
+@@ -528,8 +527,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
+@@ -609,8 +607,7 @@
+          delete fImage2;
+       fImage2 = (TImage*)fImage->Clone("fImage2");
+       if (!fImage2 || !fImage2->IsValid()) return;
+-      TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-      TString ar = fp + "/arialbd.ttf";
++      TString ar = "arialbd.ttf";
+       // format counter value
+       Int_t nexe = 0;
+       Int_t ww = fCounter;
+diff -Nur root-6.08.02.orig/gui/gui/src/TGTextEditor.cxx root-6.08.02/gui/gui/src/TGTextEditor.cxx
+--- root-6.08.02.orig/gui/gui/src/TGTextEditor.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TGTextEditor.cxx	2016-12-06 12:46:10.324969418 +0100
 @@ -842,14 +842,7 @@
  void TGTextEditor::About()
  {
@@ -2088,9 +2169,9 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TGTextEditor.cxx root-6.06.02/gui/gui/sr
     gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/src/TRootBrowser.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowser.cxx	2016-03-20 14:37:23.802598409 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TRootBrowser.cxx root-6.08.02/gui/gui/src/TRootBrowser.cxx
+--- root-6.08.02.orig/gui/gui/src/TRootBrowser.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TRootBrowser.cxx	2016-12-06 12:46:10.325969407 +0100
 @@ -702,14 +702,7 @@
        case kHelpAbout:
           {
@@ -2107,9 +2188,9 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowser.cxx root-6.06.02/gui/gui/sr
              gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gui/src/TRootBrowserLite.cxx
---- root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootBrowserLite.cxx	2016-03-20 14:37:23.803598419 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.08.02/gui/gui/src/TRootBrowserLite.cxx
+--- root-6.08.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TRootBrowserLite.cxx	2016-12-06 12:46:10.325969407 +0100
 @@ -1962,14 +1962,7 @@
                    case kHelpAbout:
                       {
@@ -2126,9 +2207,9 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.06.02/gui/gu
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src/TRootCanvas.cxx
---- root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TRootCanvas.cxx	2016-03-20 14:37:23.803598419 +0100
+diff -Nur root-6.08.02.orig/gui/gui/src/TRootCanvas.cxx root-6.08.02/gui/gui/src/TRootCanvas.cxx
+--- root-6.08.02.orig/gui/gui/src/TRootCanvas.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/gui/src/TRootCanvas.cxx	2016-12-06 12:46:10.326969396 +0100
 @@ -1192,14 +1192,7 @@
                    case kHelpAbout:
                       {
@@ -2145,9 +2226,9 @@ diff -Nur root-6.06.02.orig/gui/gui/src/TRootCanvas.cxx root-6.06.02/gui/gui/src
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx
---- root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-03-20 14:37:23.804598428 +0100
+diff -Nur root-6.08.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.08.02/gui/guihtml/src/TGHtmlBrowser.cxx
+--- root-6.08.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-12-06 12:46:10.326969396 +0100
 @@ -629,14 +629,7 @@
                    case kM_HELP_ABOUT:
                       {
@@ -2164,9 +2245,9 @@ diff -Nur root-6.06.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.06.02/gui/g
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx
---- root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-03-20 14:37:23.805598437 +0100
+diff -Nur root-6.08.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.08.02/gui/sessionviewer/src/TSessionViewer.cxx
+--- root-6.08.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-12-06 12:46:10.327969384 +0100
 @@ -5812,14 +5812,7 @@
                    case kHelpAbout:
                       {
@@ -2183,10 +2264,10 @@ diff -Nur root-6.06.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.06.0
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
---- root-6.06.02.orig/html/src/THtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/html/src/THtml.cxx	2016-03-20 14:37:23.805598437 +0100
-@@ -1348,18 +1348,7 @@
+diff -Nur root-6.08.02.orig/html/src/THtml.cxx root-6.08.02/html/src/THtml.cxx
+--- root-6.08.02.orig/html/src/THtml.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/html/src/THtml.cxx	2016-12-06 12:46:10.328969373 +0100
+@@ -1349,18 +1349,7 @@
     R__LOCKGUARD(GetMakeClassMutex());
  
     fPathInfo.fEtcDir = "html";
@@ -2206,7 +2287,7 @@ diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
  
     return fPathInfo.fEtcDir;
  }
-@@ -1666,12 +1655,7 @@
+@@ -1669,12 +1658,7 @@
                    if (posSpace != std::string::npos)
                       lib.erase(posSpace);
                    if (rootLibs.find(lib) == rootLibs.end()) {
@@ -2220,10 +2301,10 @@ diff -Nur root-6.06.02.orig/html/src/THtml.cxx root-6.06.02/html/src/THtml.cxx
                       TString sLib(lib);
                       if (sLib.Index('.') == -1) {
                          sLib += ".";
-diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
---- root-6.06.02.orig/io/io/src/TFile.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/io/src/TFile.cxx	2016-03-20 14:37:23.806598447 +0100
-@@ -3047,11 +3047,7 @@
+diff -Nur root-6.08.02.orig/io/io/src/TFile.cxx root-6.08.02/io/io/src/TFile.cxx
+--- root-6.08.02.orig/io/io/src/TFile.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/io/io/src/TFile.cxx	2016-12-06 12:46:10.328969373 +0100
+@@ -3098,11 +3098,7 @@
           return;
        }
        // Get Makefile.arch
@@ -2236,19 +2317,23 @@ diff -Nur root-6.06.02.orig/io/io/src/TFile.cxx root-6.06.02/io/io/src/TFile.cxx
        if (gSystem->ExpandPathName(mkarchsrc))
           Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
        TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
-diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
---- root-6.06.02.orig/main/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/CMakeLists.txt	2016-03-20 14:37:23.807598456 +0100
-@@ -40,5 +40,5 @@
+diff -Nur root-6.08.02.orig/main/CMakeLists.txt root-6.08.02/main/CMakeLists.txt
+--- root-6.08.02.orig/main/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/main/CMakeLists.txt	2016-12-06 12:46:10.329969362 +0100
+@@ -40,7 +40,7 @@
+   endforeach()
+ 
    install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
-   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
--  file(COPY python/cmdLineUtils.py DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  file(COPY python/cmdLineUtils.py DESTINATION ${localruntimedir})
+-  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+-  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
+-  configure_file(python/cmdLineUtils.py ${CMAKE_BINARY_DIR}/${runtimedir}/cmdLineUtils.py @ONLY)
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
++  configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
  endif()
-diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
---- root-6.06.02.orig/main/src/nbmain.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/main/src/nbmain.cxx	2016-03-20 14:37:23.824598617 +0100
+diff -Nur root-6.08.02.orig/main/src/nbmain.cxx root-6.08.02/main/src/nbmain.cxx
+--- root-6.08.02.orig/main/src/nbmain.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/main/src/nbmain.cxx	2016-12-06 12:46:10.329969362 +0100
 @@ -173,15 +173,9 @@
  
  int main()
@@ -2268,10 +2353,10 @@ diff -Nur root-6.06.02.orig/main/src/nbmain.cxx root-6.06.02/main/src/nbmain.cxx
  
     // If needed, install ROOT notebook files in the user's home directory
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
---- root-6.06.02.orig/Makefile	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/Makefile	2016-03-20 14:37:23.841598777 +0100
-@@ -690,11 +690,9 @@
+diff -Nur root-6.08.02.orig/Makefile root-6.08.02/Makefile
+--- root-6.08.02.orig/Makefile	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/Makefile	2016-12-06 12:46:10.336969282 +0100
+@@ -708,11 +708,9 @@
  .NOTPARALLEL:
  endif
  
@@ -2284,25 +2369,25 @@ diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
  
  all:            rootexecs postbin
  	@echo " "
-@@ -1119,7 +1117,7 @@
+@@ -1152,7 +1150,7 @@
  
  $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
- 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
+ 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(ROOTCLING_CXXFLAGS)
 -	@$(MAKEPCH) $@
 +	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
  
  $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
  	@mkdir -p $(dir $@)
-@@ -1224,8 +1222,6 @@
+@@ -1257,8 +1255,6 @@
  	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
  	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
  	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
 -	   (cd $(DESTDIR)$(TUTDIR); \
--	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+-	      ! LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
  	fi
  
  uninstall:
-@@ -1352,7 +1348,6 @@
+@@ -1385,7 +1381,6 @@
  		--exclude proofd.xinetd \
  		--exclude rootd.rc.d \
  		--exclude rootd.xinetd \
@@ -2310,9 +2395,9 @@ diff -Nur root-6.06.02.orig/Makefile root-6.06.02/Makefile
  		$(ROOT_SRCDIR)/etc . ; \
  	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
  	$(RSYNC) \
-diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/mathcore/src/Integrator.cxx
---- root-6.06.02.orig/math/mathcore/src/Integrator.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/Integrator.cxx	2016-03-20 14:37:23.841598777 +0100
+diff -Nur root-6.08.02.orig/math/mathcore/src/Integrator.cxx root-6.08.02/math/mathcore/src/Integrator.cxx
+--- root-6.08.02.orig/math/mathcore/src/Integrator.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/math/mathcore/src/Integrator.cxx	2016-12-06 12:46:10.336969282 +0100
 @@ -22,9 +22,6 @@
  
  
@@ -2323,10 +2408,10 @@ diff -Nur root-6.06.02.orig/math/mathcore/src/Integrator.cxx root-6.06.02/math/m
  
  #include <algorithm>
  #include <functional>
-diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-03-20 14:37:23.885599192 +0100
-@@ -551,11 +551,8 @@
+diff -Nur root-6.08.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.08.02/montecarlo/eg/src/TDatabasePDG.cxx
+--- root-6.08.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-12-06 12:46:10.336969282 +0100
+@@ -564,11 +564,8 @@
     const char *fn;
  
     if (!FileName[0]) {
@@ -2340,9 +2425,9 @@ diff -Nur root-6.06.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.06.02/mont
        fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
     } else {
        fn = FileName;
-diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeLists.txt
---- root-6.06.02.orig/net/auth/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/CMakeLists.txt	2016-03-20 14:37:23.886599202 +0100
+diff -Nur root-6.08.02.orig/net/auth/CMakeLists.txt root-6.08.02/net/auth/CMakeLists.txt
+--- root-6.08.02.orig/net/auth/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/auth/CMakeLists.txt	2016-12-06 12:46:10.336969282 +0100
 @@ -23,7 +23,6 @@
  add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
                         ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
@@ -2351,9 +2436,9 @@ diff -Nur root-6.06.02.orig/net/auth/CMakeLists.txt root-6.06.02/net/auth/CMakeL
  
  if(ssl)
    include_directories(${OPENSSL_INCLUDE_DIR})
-diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/src/DaemonUtils.cxx
---- root-6.06.02.orig/net/auth/src/DaemonUtils.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/DaemonUtils.cxx	2016-03-20 14:37:23.886599202 +0100
+diff -Nur root-6.08.02.orig/net/auth/src/DaemonUtils.cxx root-6.08.02/net/auth/src/DaemonUtils.cxx
+--- root-6.08.02.orig/net/auth/src/DaemonUtils.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/auth/src/DaemonUtils.cxx	2016-12-06 12:46:10.337969271 +0100
 @@ -95,18 +95,8 @@
  {
     // Executables and conf dirs
@@ -2388,10 +2473,10 @@ diff -Nur root-6.06.02.orig/net/auth/src/DaemonUtils.cxx root-6.06.02/net/auth/s
     if (etcdir.length()) {
        int len = 15 + etcdir.length();
        char *tmp = new char[len+1];
-diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth/src/TAuthenticate.cxx
---- root-6.06.02.orig/net/auth/src/TAuthenticate.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/auth/src/TAuthenticate.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -4110,19 +4110,9 @@
+diff -Nur root-6.08.02.orig/net/auth/src/TAuthenticate.cxx root-6.08.02/net/auth/src/TAuthenticate.cxx
+--- root-6.08.02.orig/net/auth/src/TAuthenticate.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/auth/src/TAuthenticate.cxx	2016-12-06 12:46:10.338969260 +0100
+@@ -4107,19 +4107,9 @@
           ::Info("TAuthenticate::ReadRootAuthrc",
                  "file %s cannot be read (errno: %d)", authrc, errno);
        delete [] authrc;
@@ -2413,10 +2498,10 @@ diff -Nur root-6.06.02.orig/net/auth/src/TAuthenticate.cxx root-6.06.02/net/auth
        if (gSystem->AccessPathName(authrc, kReadPermission)) {
           if (gDebug > 1)
              ::Info("TAuthenticate::ReadRootAuthrc",
-diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/src/THttpServer.cxx
---- root-6.06.02.orig/net/http/src/THttpServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/http/src/THttpServer.cxx	2016-03-20 14:37:23.887599211 +0100
-@@ -147,11 +147,7 @@
+diff -Nur root-6.08.02.orig/net/http/src/THttpServer.cxx root-6.08.02/net/http/src/THttpServer.cxx
+--- root-6.08.02.orig/net/http/src/THttpServer.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/http/src/THttpServer.cxx	2016-12-06 12:46:10.338969260 +0100
+@@ -148,11 +148,7 @@
     if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
  
     if (fJSROOTSYS.Length() == 0) {
@@ -2429,7 +2514,7 @@ diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/s
        if (gSystem->ExpandPathName(jsdir)) {
           Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
           fJSROOTSYS = ".";
-@@ -162,18 +158,7 @@
+@@ -163,18 +159,7 @@
  
     AddLocation("currentdir/", ".");
     AddLocation("jsrootsys/", fJSROOTSYS);
@@ -2449,9 +2534,9 @@ diff -Nur root-6.06.02.orig/net/http/src/THttpServer.cxx root-6.06.02/net/http/s
  
     fDefaultPage = fJSROOTSYS + "/files/online.htm";
     fDrawPage = fJSROOTSYS + "/files/draw.htm";
-diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/net/src/TApplicationServer.cxx
---- root-6.06.02.orig/net/net/src/TApplicationServer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TApplicationServer.cxx	2016-03-20 14:37:23.888599221 +0100
+diff -Nur root-6.08.02.orig/net/net/src/TApplicationServer.cxx root-6.08.02/net/net/src/TApplicationServer.cxx
+--- root-6.08.02.orig/net/net/src/TApplicationServer.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/net/src/TApplicationServer.cxx	2016-12-06 12:46:10.338969260 +0100
 @@ -1275,17 +1275,7 @@
     TString name = ".rootlogon.C";
     TString sname = "system";
@@ -2471,9 +2556,9 @@ diff -Nur root-6.06.02.orig/net/net/src/TApplicationServer.cxx root-6.06.02/net/
     if (!gSystem->AccessPathName(s, kReadPermission)) {
        ProcessFile(s);
     }
-diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/src/TServerSocket.cxx
---- root-6.06.02.orig/net/net/src/TServerSocket.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/net/src/TServerSocket.cxx	2016-03-20 14:37:23.888599221 +0100
+diff -Nur root-6.08.02.orig/net/net/src/TServerSocket.cxx root-6.08.02/net/net/src/TServerSocket.cxx
+--- root-6.08.02.orig/net/net/src/TServerSocket.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/net/src/TServerSocket.cxx	2016-12-06 12:46:10.338969260 +0100
 @@ -335,22 +335,7 @@
        }
     }
@@ -2498,10 +2583,10 @@ diff -Nur root-6.06.02.orig/net/net/src/TServerSocket.cxx root-6.06.02/net/net/s
     if (!confdir.Length()) {
        Error("Authenticate", "config dir undefined");
        return kFALSE;
-diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/rootd.cxx
---- root-6.06.02.orig/net/rootd/src/rootd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rootd/src/rootd.cxx	2016-03-20 14:37:23.889599230 +0100
-@@ -2528,10 +2528,13 @@
+diff -Nur root-6.08.02.orig/net/rootd/src/rootd.cxx root-6.08.02/net/rootd/src/rootd.cxx
+--- root-6.08.02.orig/net/rootd/src/rootd.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/rootd/src/rootd.cxx	2016-12-06 12:46:10.339969248 +0100
+@@ -2523,10 +2523,13 @@
  
     if (argc > 0) {
        confdir = std::string(*argv);
@@ -2518,7 +2603,7 @@ diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/r
           if (getenv("ROOTSYS")) {
              confdir = getenv("ROOTSYS");
              if (gDebug > 0)
-@@ -2542,31 +2545,26 @@
+@@ -2537,31 +2540,26 @@
                 ErrorInfo("main: no config directory specified");
           }
        }
@@ -2561,9 +2646,9 @@ diff -Nur root-6.06.02.orig/net/rootd/src/rootd.cxx root-6.06.02/net/rootd/src/r
     if (rootetcdir.length()) {
        char *tmp1 = new char[15 + rootetcdir.length()];
        sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutils/CMakeLists.txt
---- root-6.06.02.orig/net/rpdutils/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/net/rpdutils/CMakeLists.txt	2016-03-20 14:37:23.889599230 +0100
+diff -Nur root-6.08.02.orig/net/rpdutils/CMakeLists.txt root-6.08.02/net/rpdutils/CMakeLists.txt
+--- root-6.08.02.orig/net/rpdutils/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/net/rpdutils/CMakeLists.txt	2016-12-06 12:46:10.339969248 +0100
 @@ -31,7 +31,6 @@
  
  #---static library needed for rootd and proofd --------------------------------------------
@@ -2572,10 +2657,10 @@ diff -Nur root-6.06.02.orig/net/rpdutils/CMakeLists.txt root-6.06.02/net/rpdutil
  
  ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
  
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/proof/src/TProofLite.cxx
---- root-6.06.02.orig/proof/proof/src/TProofLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofLite.cxx	2016-03-20 14:37:23.922599542 +0100
-@@ -436,17 +436,7 @@
+diff -Nur root-6.08.02.orig/proof/proof/src/TProofLite.cxx root-6.08.02/proof/proof/src/TProofLite.cxx
+--- root-6.08.02.orig/proof/proof/src/TProofLite.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proof/src/TProofLite.cxx	2016-12-06 12:46:10.340969237 +0100
+@@ -409,17 +409,7 @@
     if (fgWrksMax == -2) {
        // Find the max number of workers, if any
        TString sysname = "system.rootrc";
@@ -2594,7 +2679,7 @@ diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/pr
        TEnv sysenv(0);
        sysenv.ReadFile(s, kEnvGlobal);
        fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
-@@ -792,17 +782,9 @@
+@@ -765,17 +755,9 @@
        return -1;
     }
     // ROOTSYS
@@ -2614,10 +2699,10 @@ diff -Nur root-6.06.02.orig/proof/proof/src/TProofLite.cxx root-6.06.02/proof/pr
     // TMPDIR
     fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
     // Log file in the log dir
-diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/proof/src/TProofServ.cxx
---- root-6.06.02.orig/proof/proof/src/TProofServ.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TProofServ.cxx	2016-03-20 14:37:23.945599759 +0100
-@@ -3026,13 +3026,7 @@
+diff -Nur root-6.08.02.orig/proof/proof/src/TProofServ.cxx root-6.08.02/proof/proof/src/TProofServ.cxx
+--- root-6.08.02.orig/proof/proof/src/TProofServ.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proof/src/TProofServ.cxx	2016-12-06 12:46:10.341969226 +0100
+@@ -2964,13 +2964,7 @@
  #ifdef R__UNIX
     // Add bindir to PATH
     TString path(gSystem->Getenv("PATH"));
@@ -2632,10 +2717,10 @@ diff -Nur root-6.06.02.orig/proof/proof/src/TProofServ.cxx root-6.06.02/proof/pr
     // Augment PATH, if required
     // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
     TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
-diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/proof/src/TSlaveLite.cxx
---- root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proof/src/TSlaveLite.cxx	2016-03-20 14:37:24.000600278 +0100
-@@ -78,13 +78,8 @@
+diff -Nur root-6.08.02.orig/proof/proof/src/TSlaveLite.cxx root-6.08.02/proof/proof/src/TSlaveLite.cxx
+--- root-6.08.02.orig/proof/proof/src/TSlaveLite.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proof/src/TSlaveLite.cxx	2016-12-06 12:46:10.341969226 +0100
+@@ -88,13 +88,8 @@
  {
     // Command to be executed
     TString cmd;
@@ -2650,9 +2735,9 @@ diff -Nur root-6.06.02.orig/proof/proof/src/TSlaveLite.cxx root-6.06.02/proof/pr
              gSystem->GetPid(), gDebug);
     // Execute
     if (gSystem->Exec(cmd) != 0) {
-diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/proofbench/CMakeLists.txt
---- root-6.06.02.orig/proof/proofbench/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/CMakeLists.txt	2016-03-20 14:37:24.041600664 +0100
+diff -Nur root-6.08.02.orig/proof/proofbench/CMakeLists.txt root-6.08.02/proof/proofbench/CMakeLists.txt
+--- root-6.08.02.orig/proof/proofbench/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofbench/CMakeLists.txt	2016-12-06 12:46:10.341969226 +0100
 @@ -14,7 +14,7 @@
  # Generation and installation of the PAR files required by the benchmark 
  add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
@@ -2662,10 +2747,10 @@ diff -Nur root-6.06.02.orig/proof/proofbench/CMakeLists.txt root-6.06.02/proof/p
  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
                            ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
      COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/proof/proofbench/src/TProofBench.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBench.cxx	2016-03-20 14:37:24.059600834 +0100
-@@ -1331,11 +1331,7 @@
+diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBench.cxx root-6.08.02/proof/proofbench/src/TProofBench.cxx
+--- root-6.08.02.orig/proof/proofbench/src/TProofBench.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofbench/src/TProofBench.cxx	2016-12-06 12:46:10.342969214 +0100
+@@ -1338,11 +1338,7 @@
        // Is it the default selector?
        if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
           // Load the parfile
@@ -2678,10 +2763,10 @@ diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBench.cxx root-6.06.02/pr
           Info("MakeDataSet", "uploading '%s' ...", par.Data());
           if (fProof->UploadPackage(par) != 0) {
              Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-03-20 14:37:24.070600938 +0100
-@@ -26,6 +26,7 @@
+diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.08.02/proof/proofbench/src/TProofBenchDataSet.cxx
+--- root-6.08.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-12-06 12:46:10.342969214 +0100
+@@ -25,6 +25,7 @@
  #include "TMap.h"
  #include "TProof.h"
  #include "TProofBenchTypes.h"
@@ -2689,7 +2774,7 @@ diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.0
  
  
  ClassImp(TProofBenchDataSet)
-@@ -145,11 +146,7 @@
+@@ -144,11 +145,7 @@
     TString selName("TSelHandleDataSet");
     if (!TClass::GetClass(selName)) {
        // Load the parfile
@@ -2702,10 +2787,10 @@ diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.0
        Info("Handle", "Uploading '%s' ...", par.Data());
        if (fProof->UploadPackage(par) != 0) {
           Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-03-20 14:37:24.079601023 +0100
-@@ -275,11 +275,7 @@
+diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.08.02/proof/proofbench/src/TProofBenchRunCPU.cxx
+--- root-6.08.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-12-06 12:46:10.342969214 +0100
+@@ -274,11 +274,7 @@
        // Is it the default selector?
        if (fSelName == kPROOF_BenchSelCPUDef) {
           // Load the parfile
@@ -2718,10 +2803,10 @@ diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.06
           Info("Run", "Uploading '%s' ...", par.Data());
           if (fProof->UploadPackage(par) != 0) {
              Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
---- root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-03-20 14:37:24.088601108 +0100
-@@ -163,11 +163,7 @@
+diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.08.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
+--- root-6.08.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-12-06 12:46:10.342969214 +0100
+@@ -162,11 +162,7 @@
        // Is it the default selector?
        if (fSelName == kPROOF_BenchSelDataDef) {
           // Load the parfile
@@ -2734,10 +2819,10 @@ diff -Nur root-6.06.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root
           Info("Run", "Uploading '%s' ...", par.Data());
           if (fProof->UploadPackage(par) != 0) {
              Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proofd/src/proofd.cxx
---- root-6.06.02.orig/proof/proofd/src/proofd.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/proofd.cxx	2016-03-20 14:37:24.097601193 +0100
-@@ -1005,49 +1005,48 @@
+diff -Nur root-6.08.02.orig/proof/proofd/src/proofd.cxx root-6.08.02/proof/proofd/src/proofd.cxx
+--- root-6.08.02.orig/proof/proofd/src/proofd.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofd/src/proofd.cxx	2016-12-06 12:46:10.343969203 +0100
+@@ -1001,49 +1001,48 @@
  
     if (argc > 0) {
        gConfDir = std::string(*argv);
@@ -2814,9 +2899,9 @@ diff -Nur root-6.06.02.orig/proof/proofd/src/proofd.cxx root-6.06.02/proof/proof
     if (rootetcdir.length()) {
        char *tmp = new char[15 + rootetcdir.length()];
        snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proofd/src/XrdROOT.cxx
---- root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/proof/proofd/src/XrdROOT.cxx	2016-03-20 14:37:24.102601240 +0100
+diff -Nur root-6.08.02.orig/proof/proofd/src/XrdROOT.cxx root-6.08.02/proof/proofd/src/XrdROOT.cxx
+--- root-6.08.02.orig/proof/proofd/src/XrdROOT.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/proof/proofd/src/XrdROOT.cxx	2016-12-06 12:46:10.343969203 +0100
 @@ -384,11 +384,19 @@
     } else {
        // Check the ROOT dirs
@@ -2841,9 +2926,9 @@ diff -Nur root-6.06.02.orig/proof/proofd/src/XrdROOT.cxx root-6.06.02/proof/proo
  #endif
           // None defined: use ROOTSYS as default, if any; otherwise we fail
           if (dir.length() > 0) {
-diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofit/histfactory/CMakeLists.txt
---- root-6.06.02.orig/roofit/histfactory/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/histfactory/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+diff -Nur root-6.08.02.orig/roofit/histfactory/CMakeLists.txt root-6.08.02/roofit/histfactory/CMakeLists.txt
+--- root-6.08.02.orig/roofit/histfactory/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/roofit/histfactory/CMakeLists.txt	2016-12-06 12:46:10.343969203 +0100
 @@ -25,10 +25,4 @@
                              WORLD_EXECUTE WORLD_READ
                  DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2856,9 +2941,32 @@ diff -Nur root-6.06.02.orig/roofit/histfactory/CMakeLists.txt root-6.06.02/roofi
 -                       REGEX "LinkDef" EXCLUDE )
 -set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
 +ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/roostats/CMakeLists.txt
---- root-6.06.02.orig/roofit/roostats/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/roofit/roostats/CMakeLists.txt	2016-03-20 14:37:24.102601240 +0100
+diff -Nur root-6.08.02.orig/roofit/histfactory/config/prepareHistFactory root-6.08.02/roofit/histfactory/config/prepareHistFactory
+--- root-6.08.02.orig/roofit/histfactory/config/prepareHistFactory	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/roofit/histfactory/config/prepareHistFactory	2016-12-06 12:46:10.343969203 +0100
+@@ -2,16 +2,10 @@
+ 
+ # HistFactory workplace setup script
+ 
+-ROOTPREFDIR=`root-config --prefix`
+-ROOTETCDIR=`root-config --etcdir`
++ROOTETCDIR=`root -b -q -l -n -e "std::cout << TROOT::GetEtcDir() << std::endl;" | tail -1`
+ echo "Using etcdir "$ROOTETCDIR
+-ROOTTUTDIR=$ROOTPREFDIR/tutorials
+-if test -e $ROOTTUTDIR; then
+-    echo "Using tutorials dir" $ROOTTUTDIR 
+-else     
+-    ROOTTUTDIR=${ROOTPREFDIR}/share/doc/root/tutorials
+-    echo "Using tutorials dir" $ROOTTUTDIR 
+-fi
++ROOTTUTDIR=`root -b -q -l -n -e "std::cout << TROOT::GetTutorialDir() << std::endl;" | tail -1`
++echo "Using tutorials dir" $ROOTTUTDIR 
+ 
+ if [ $# -eq 1 ]
+ then
+diff -Nur root-6.08.02.orig/roofit/roostats/CMakeLists.txt root-6.08.02/roofit/roostats/CMakeLists.txt
+--- root-6.08.02.orig/roofit/roostats/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/roofit/roostats/CMakeLists.txt	2016-12-06 12:46:10.344969192 +0100
 @@ -8,9 +8,4 @@
  ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
                                 DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
@@ -2870,10 +2978,10 @@ diff -Nur root-6.06.02.orig/roofit/roostats/CMakeLists.txt root-6.06.02/roofit/r
 -                       REGEX "LinkDef" EXCLUDE )
 -set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
 +ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
---- root-6.06.02.orig/rootx/src/rootx.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/rootx/src/rootx.cxx	2016-03-20 14:37:24.103601249 +0100
-@@ -200,7 +200,6 @@
+diff -Nur root-6.08.02.orig/rootx/src/rootx.cxx root-6.08.02/rootx/src/rootx.cxx
+--- root-6.08.02.orig/rootx/src/rootx.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/rootx/src/rootx.cxx	2016-12-06 12:46:10.344969192 +0100
+@@ -218,7 +218,6 @@
     return 0;
  }
  
@@ -2881,7 +2989,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  static const char *GetExePath()
  {
     static std::string exepath;
-@@ -247,7 +246,6 @@
+@@ -265,7 +264,6 @@
        delete [] ep;
     }
  }
@@ -2889,7 +2997,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  
  static void SetDisplay()
  {
-@@ -296,7 +294,9 @@
+@@ -314,7 +312,9 @@
  
  static void SetLibraryPath()
  {
@@ -2900,7 +3008,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
     // Set library path for the different platforms.
  
     char *msg;
-@@ -343,6 +343,8 @@
+@@ -361,6 +361,8 @@
     }
  #  endif
     putenv(msg);
@@ -2909,7 +3017,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  #endif
  }
  
-@@ -440,7 +442,9 @@
+@@ -458,7 +460,9 @@
     char **argvv;
     char  arg0[kMAXPATHLEN];
  
@@ -2920,7 +3028,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
     // Try to set ROOTSYS depending on pathname of the executable
     SetRootSys();
  
-@@ -449,6 +453,8 @@
+@@ -467,6 +471,8 @@
                argv[0], argv[0]);
        return 1;
     }
@@ -2929,7 +3037,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  #endif
  
     // In batch mode don't show splash screen, idem for no logo mode,
-@@ -473,23 +479,20 @@
+@@ -491,23 +497,20 @@
     if (notebook) {
        // Build command
  #ifdef ROOTBINDIR
@@ -2962,7 +3070,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  
        return 1;
     }
-@@ -586,9 +589,12 @@
+@@ -604,9 +607,12 @@
     // Build argv vector
     argvv = new char* [argc+2];
  #ifdef ROOTBINDIR
@@ -2978,7 +3086,7 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  #endif
     argvv[0] = arg0;
     argvv[1] = (char *) "-splash";
-@@ -604,14 +610,8 @@
+@@ -622,14 +628,8 @@
     execv(arg0, argvv);
  
     // Exec failed
@@ -2995,9 +3103,9 @@ diff -Nur root-6.06.02.orig/rootx/src/rootx.cxx root-6.06.02/rootx/src/rootx.cxx
  
     return 1;
  }
-diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.cxx
---- root-6.06.02.orig/test/rhtml/rhtml.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/rhtml/rhtml.cxx	2016-03-20 14:37:24.103601249 +0100
+diff -Nur root-6.08.02.orig/test/rhtml/rhtml.cxx root-6.08.02/test/rhtml/rhtml.cxx
+--- root-6.08.02.orig/test/rhtml/rhtml.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/test/rhtml/rhtml.cxx	2016-12-06 12:46:10.344969192 +0100
 @@ -475,14 +475,7 @@
                    case M_HELP_ABOUT:
                       {
@@ -3014,9 +3122,9 @@ diff -Nur root-6.06.02.orig/test/rhtml/rhtml.cxx root-6.06.02/test/rhtml/rhtml.c
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE/TGRootIDE.cxx
---- root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/RootIDE/TGRootIDE.cxx	2016-03-20 14:37:24.103601249 +0100
+diff -Nur root-6.08.02.orig/test/RootIDE/TGRootIDE.cxx root-6.08.02/test/RootIDE/TGRootIDE.cxx
+--- root-6.08.02.orig/test/RootIDE/TGRootIDE.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/test/RootIDE/TGRootIDE.cxx	2016-12-06 12:46:10.344969192 +0100
 @@ -1270,14 +1270,7 @@
  void TGRootIDE::About()
  {
@@ -3033,11 +3141,11 @@ diff -Nur root-6.06.02.orig/test/RootIDE/TGRootIDE.cxx root-6.06.02/test/RootIDE
     gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmva/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmva/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
-@@ -48,11 +48,7 @@
- ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA.cxx LIBRARIES Core
+diff -Nur root-6.08.02.orig/tmva/tmva/CMakeLists.txt root-6.08.02/tmva/tmva/CMakeLists.txt
+--- root-6.08.02.orig/tmva/tmva/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tmva/tmva/CMakeLists.txt	2016-12-06 12:46:10.345969180 +0100
+@@ -79,11 +79,7 @@
+                     LIBRARIES Core ${DNN_CUDA_LIBRARIES} ${DNN_CPU_LIBRARIES}
                      DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
  
 -install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
@@ -3049,9 +3157,9 @@ diff -Nur root-6.06.02.orig/tmva/tmva/CMakeLists.txt root-6.06.02/tmva/tmva/CMak
  
  if(NOT gnuinstall)
    install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagui/CMakeLists.txt
---- root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tmva/tmvagui/CMakeLists.txt	2016-03-20 14:37:24.104601259 +0100
+diff -Nur root-6.08.02.orig/tmva/tmvagui/CMakeLists.txt root-6.08.02/tmva/tmvagui/CMakeLists.txt
+--- root-6.08.02.orig/tmva/tmvagui/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tmva/tmvagui/CMakeLists.txt	2016-12-06 12:46:10.345969180 +0100
 @@ -31,11 +31,7 @@
  ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
                      DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
@@ -3065,10 +3173,10 @@ diff -Nur root-6.06.02.orig/tmva/tmvagui/CMakeLists.txt root-6.06.02/tmva/tmvagu
  
  if(NOT gnuinstall)
    install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx
---- root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeviewer/src/TTreeViewer.cxx	2016-03-20 14:37:24.115601363 +0100
-@@ -2049,14 +2049,7 @@
+diff -Nur root-6.08.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.08.02/tree/treeviewer/src/TTreeViewer.cxx
+--- root-6.08.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tree/treeviewer/src/TTreeViewer.cxx	2016-12-06 12:46:10.345969180 +0100
+@@ -2048,14 +2048,7 @@
                    case kHelpAbout:
                       {
  #ifdef R__UNIX
@@ -3084,10 +3192,20 @@ diff -Nur root-6.06.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.06.02/tre
                          gSystem->Exec(rootx);
  #else
  #ifdef WIN32
-diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/eve/SplitGLView.C
---- root-6.06.02.orig/tutorials/eve/SplitGLView.C	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tutorials/eve/SplitGLView.C	2016-03-20 14:37:24.116601372 +0100
-@@ -1017,14 +1017,7 @@
+diff -Nur root-6.08.02.orig/tutorials/eve/SplitGLView.C root-6.08.02/tutorials/eve/SplitGLView.C
+--- root-6.08.02.orig/tutorials/eve/SplitGLView.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/eve/SplitGLView.C	2016-12-06 12:46:10.346969169 +0100
+@@ -291,8 +291,7 @@
+    const char *str = fText.Data();
+    char *string = strdup(str);
+    Int_t nlines = 0, size = fTextH;
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString ar = fp + "/arial.ttf";
++   TString ar = "arial.ttf";
+    char *s = strtok((char *)string, "\n");
+    TImage *img = (TImage*)fImage->Clone("img");
+    img->DrawText(fTextX, fTextY+(nlines*size), s, size, fTextCol, ar);
+@@ -1020,14 +1019,7 @@
        case kHelpAbout:
           {
  #ifdef R__UNIX
@@ -3103,3 +3221,608 @@ diff -Nur root-6.06.02.orig/tutorials/eve/SplitGLView.C root-6.06.02/tutorials/e
              gSystem->Exec(rootx);
  #else
  #ifdef WIN32
+diff -Nur root-6.08.02.orig/tutorials/fit/fit1.C root-6.08.02/tutorials/fit/fit1.C
+--- root-6.08.02.orig/tutorials/fit/fit1.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/fit/fit1.C	2016-12-06 12:46:10.346969169 +0100
+@@ -35,7 +35,7 @@
+    // We connect the ROOT file generated in a previous tutorial
+    // (see <a href="fillrandom.C.nbconvert.ipynb">Filling histograms with random numbers from a function</a>) 
+    //
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/fit/");
+    TFile *file = TFile::Open("fillrandom.root");
+    if (!file) {
+diff -Nur root-6.08.02.orig/tutorials/fit/fitslicesy.C root-6.08.02/tutorials/fit/fitslicesy.C
+--- root-6.08.02.orig/tutorials/fit/fitslicesy.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/fit/fitslicesy.C	2016-12-06 12:46:10.346969169 +0100
+@@ -23,7 +23,7 @@
+    gStyle->SetTitleH(0.1);
+ 
+ // Connect the input file and get the 2-d histogram in memory
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/hsimple.C");
+    dir.ReplaceAll("/./","/");
+    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
+diff -Nur root-6.08.02.orig/tutorials/fit/myfit.C root-6.08.02/tutorials/fit/myfit.C
+--- root-6.08.02.orig/tutorials/fit/myfit.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/fit/myfit.C	2016-12-06 12:46:10.346969169 +0100
+@@ -25,7 +25,7 @@
+ }
+ void myfit()
+ {
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/hsimple.C");
+    dir.ReplaceAll("/./","/");
+    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
+diff -Nur root-6.08.02.orig/tutorials/foam/foam_demopers.C root-6.08.02/tutorials/foam/foam_demopers.C
+--- root-6.08.02.orig/tutorials/foam/foam_demopers.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/foam/foam_demopers.C	2016-12-06 12:46:10.347969158 +0100
+@@ -24,7 +24,7 @@
+    gSystem->Load("libFoam");
+ 
+    // need to load the foam_demo tutorial for the definition of the function
+-   TString macroName = gROOT->GetTutorialsDir();
++   TString macroName = gROOT->GetTutorialDir();
+    macroName.Append("/foam/foam_demo.C");
+    gROOT->ProcessLine(TString::Format(".L %s+",macroName.Data()));
+ 
+diff -Nur root-6.08.02.orig/tutorials/geom/runplugin.C root-6.08.02/tutorials/geom/runplugin.C
+--- root-6.08.02.orig/tutorials/geom/runplugin.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/geom/runplugin.C	2016-12-06 12:46:10.347969158 +0100
+@@ -27,7 +27,7 @@
+ {
+ 
+ 
+-   TString tutdir = gROOT->GetTutorialsDir();
++   TString tutdir = gROOT->GetTutorialDir();
+    gROOT->ProcessLine(".x " + tutdir + "/geom/rootgeom.C");
+    plugin = new iterplugin();
+    gGeoManager->GetGeomPainter()->SetIteratorPlugin(plugin);
+diff -Nur root-6.08.02.orig/tutorials/graphics/earth.C root-6.08.02/tutorials/graphics/earth.C
+--- root-6.08.02.orig/tutorials/graphics/earth.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/graphics/earth.C	2016-12-06 12:46:10.347969158 +0100
+@@ -26,7 +26,7 @@
+    TH2F *hs = new TH2F("hs","Sinusoidal",180, -180, 180, 181, -90.5, 90.5);
+    TH2F *hp = new TH2F("hp","Parabolic", 180, -180, 180, 181, -90.5, 90.5);
+ 
+-   TString dat = gROOT->GetTutorialsDir();
++   TString dat = gROOT->GetTutorialDir();
+    dat.Append("/graphics/earth.dat");
+    dat.ReplaceAll("/./","/");
+ 
+diff -Nur root-6.08.02.orig/tutorials/graphics/psview.C root-6.08.02/tutorials/graphics/psview.C
+--- root-6.08.02.orig/tutorials/graphics/psview.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/graphics/psview.C	2016-12-06 12:46:10.347969158 +0100
+@@ -32,7 +32,7 @@
+    gROOT->SetBatch(1);
+ 
+    // create a PostScript file
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/graphics/feynman.C");
+    gROOT->Macro(dir);
+    gPad->Print("feynman.eps");
+diff -Nur root-6.08.02.orig/tutorials/graphs/motorcycle.C root-6.08.02/tutorials/graphs/motorcycle.C
+--- root-6.08.02.orig/tutorials/graphs/motorcycle.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/graphs/motorcycle.C	2016-12-06 12:46:10.347969158 +0100
+@@ -43,7 +43,7 @@
+ void motorcycle()
+ {
+ // data taken from R library MASS: mcycle.txt
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/graphs/");
+    dir.ReplaceAll("/./","/");
+ 
+diff -Nur root-6.08.02.orig/tutorials/hist/FirstContour.C root-6.08.02/tutorials/hist/FirstContour.C
+--- root-6.08.02.orig/tutorials/hist/FirstContour.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/hist/FirstContour.C	2016-12-06 12:46:10.347969158 +0100
+@@ -13,7 +13,7 @@
+ 
+ void FirstContour()
+ {
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/hsimple.C");
+    dir.ReplaceAll("/./","/");
+    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
+diff -Nur root-6.08.02.orig/tutorials/hist/h1draw.C root-6.08.02/tutorials/hist/h1draw.C
+--- root-6.08.02.orig/tutorials/hist/h1draw.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/hist/h1draw.C	2016-12-06 12:46:10.348969146 +0100
+@@ -25,7 +25,7 @@
+ 
+ void h1draw()
+ {
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/hsimple.C");
+    dir.ReplaceAll("/./","/");
+    if (gBenchmark->GetBench("hsimple") < 0) gInterpreter->LoadMacro(dir.Data());
+diff -Nur root-6.08.02.orig/tutorials/hist/hbars.C root-6.08.02/tutorials/hist/hbars.C
+--- root-6.08.02.orig/tutorials/hist/hbars.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/hist/hbars.C	2016-12-06 12:46:10.348969146 +0100
+@@ -10,7 +10,7 @@
+ 
+ TCanvas *hbars() {
+      // Try to open first the file cernstaff.root in tutorials/tree directory
+-   TString filedir = gROOT->GetTutorialsDir();
++   TString filedir = gROOT->GetTutorialDir();
+    filedir += TString("/tree/");
+    TString filename = "cernstaff.root";
+    bool fileNotFound = gSystem->AccessPathName(filename); // note opposite return code
+diff -Nur root-6.08.02.orig/tutorials/hsimple.C root-6.08.02/tutorials/hsimple.C
+--- root-6.08.02.orig/tutorials/hsimple.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/hsimple.C	2016-12-06 12:46:10.348969146 +0100
+@@ -34,7 +34,7 @@
+ TFile *hsimple(Int_t getFile=0)
+ {
+    TString filename = "hsimple.root";
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.ReplaceAll("/./","/");
+    TFile *hfile = 0;
+    if (getFile) {
+diff -Nur root-6.08.02.orig/tutorials/image/rose_image.C root-6.08.02/tutorials/image/rose_image.C
+--- root-6.08.02.orig/tutorials/image/rose_image.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/image/rose_image.C	2016-12-06 12:46:10.348969146 +0100
+@@ -30,9 +30,8 @@
+    img->SetConstRatio(0);
+    img->SetImageQuality(TAttImage::kImgBest);
+ 
+-   TString fp = gEnv->GetValue("Root.TTFontPath", "");
+-   TString bc = fp + "/BlackChancery.ttf";
+-   TString ar = fp + "/arial.ttf";
++   TString bc = "BlackChancery.ttf";
++   TString ar = "arial.ttf";
+ 
+    // draw text over image with funny font
+    img->DrawText(120, 160, "Hello World!", 32,
+diff -Nur root-6.08.02.orig/tutorials/io/importCode.C root-6.08.02/tutorials/io/importCode.C
+--- root-6.08.02.orig/tutorials/io/importCode.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/io/importCode.C	2016-12-06 12:46:10.348969146 +0100
+@@ -54,7 +54,7 @@
+ }
+ void importCode() {
+    TFile *f = new TFile("code.root","recreate");
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    importdir(dir); //change the directory as you like
+    delete f;
+ }
+diff -Nur root-6.08.02.orig/tutorials/io/mergeSelective.C root-6.08.02/tutorials/io/mergeSelective.C
+--- root-6.08.02.orig/tutorials/io/mergeSelective.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/io/mergeSelective.C	2016-12-06 12:46:10.348969146 +0100
+@@ -49,7 +49,7 @@
+    // Create the files to be merged
+    TStopwatch timer;
+    timer.Start();
+-   TString tutdir = gROOT->GetTutorialsDir();
++   TString tutdir = gROOT->GetTutorialDir();
+    if (gROOT->LoadMacro(tutdir + "/hsimple.C")) return;
+    Int_t i;
+    for (i=0; i<nfiles; i++) CreateFile(Form("tomerge%03d.root",i));
+diff -Nur root-6.08.02.orig/tutorials/io/testMergeCont.C root-6.08.02/tutorials/io/testMergeCont.C
+--- root-6.08.02.orig/tutorials/io/testMergeCont.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/io/testMergeCont.C	2016-12-06 12:46:10.349969135 +0100
+@@ -39,7 +39,7 @@
+ 
+ void testMergeCont()
+ {
+-   TString tutdir = gROOT->GetTutorialsDir();
++   TString tutdir = gROOT->GetTutorialDir();
+    gROOT->LoadMacro(tutdir+"/hsimple.C");
+    TList *list1 = (TList *)GetCollection();
+    TList *inputs = new TList();
+diff -Nur root-6.08.02.orig/tutorials/multicore/mp103_processSelector.C root-6.08.02/tutorials/multicore/mp103_processSelector.C
+--- root-6.08.02.orig/tutorials/multicore/mp103_processSelector.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/multicore/mp103_processSelector.C	2016-12-06 12:46:10.349969135 +0100
+@@ -26,7 +26,7 @@
+   // MacOSX may generate connection to WindowServer errors
+   gROOT->SetBatch(kTRUE);
+ 
+-  TString selectorPath = gROOT->GetTutorialsDir();
++  TString selectorPath = gROOT->GetTutorialDir();
+   selectorPath += "/tree/h1analysis.C+";
+   std::cout << "selector used is: "<< selectorPath<<"\n";
+   TSelector *sel = TSelector::GetSelector(selectorPath);
+diff -Nur root-6.08.02.orig/tutorials/pyroot/benchmarks.py root-6.08.02/tutorials/pyroot/benchmarks.py
+--- root-6.08.02.orig/tutorials/pyroot/benchmarks.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/pyroot/benchmarks.py	2016-12-06 12:46:10.349969135 +0100
+@@ -45,7 +45,7 @@
+ ## --------------------------------------------------------------------------
+ if __name__ == '__main__':
+ 
+-   macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
++   macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
+ 
+  # window for keeping track of bench marks that are run
+    bench = ROOT.TCanvas( 'bench','Benchmarks Summary', -1000, 50, 200, 500 )
+diff -Nur root-6.08.02.orig/tutorials/pyroot/fit1.py root-6.08.02/tutorials/pyroot/fit1.py
+--- root-6.08.02.orig/tutorials/pyroot/fit1.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/pyroot/fit1.py	2016-12-06 12:46:10.349969135 +0100
+@@ -51,7 +51,7 @@
+ fitlabel = TPaveText( 0.6, 0.3, 0.9, 0.80, 'NDC' )
+ fitlabel.SetTextAlign( 12 )
+ fitlabel.SetFillColor( 42 )
+-fitlabel.ReadFile(path.join(gROOT.GetTutorialsDir(), 'pyroot', 'fit1_py.py'))
++fitlabel.ReadFile(path.join(str(gROOT.GetTutorialDir()), 'pyroot', 'fit1_py.py'))
+ fitlabel.Draw()
+ c1.Update()
+ gBenchmark.Show( 'fit1' )
+diff -Nur root-6.08.02.orig/tutorials/pyroot/geometry.py root-6.08.02/tutorials/pyroot/geometry.py
+--- root-6.08.02.orig/tutorials/pyroot/geometry.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/pyroot/geometry.py	2016-12-06 12:46:10.349969135 +0100
+@@ -10,7 +10,7 @@
+ import os
+ import ROOT
+ 
+-macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
++macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
+ 
+ # the na49.C file was generated, so no python conversion is provided
+ ROOT.gROOT.Macro( ROOT.gSystem.UnixPathName( os.path.join( macrodir, os.pardir, 'geom', 'na49.C' ) ) )
+diff -Nur root-6.08.02.orig/tutorials/pyroot/rootmarks.py root-6.08.02/tutorials/pyroot/rootmarks.py
+--- root-6.08.02.orig/tutorials/pyroot/rootmarks.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/pyroot/rootmarks.py	2016-12-06 12:46:10.349969135 +0100
+@@ -13,7 +13,7 @@
+ import os
+ import ROOT
+ 
+-macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
++macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
+ 
+ # use ROOT macro to make sure that bench numbers get updated in one place
+ ROOT.gROOT.Macro( ROOT.gSystem.UnixPathName( os.path.join( macrodir, os.pardir, 'rootmarks.C' ) ) )
+diff -Nur root-6.08.02.orig/tutorials/pyroot/staff.py root-6.08.02/tutorials/pyroot/staff.py
+--- root-6.08.02.orig/tutorials/pyroot/staff.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/pyroot/staff.py	2016-12-06 12:46:10.350969124 +0100
+@@ -47,7 +47,7 @@
+     tree.Branch( 'Nation', AddressOf( staff, 'Nation' ), 'Nation/C' )
+ 
+     # note that the branches Division and Nation cannot be on the first branch
+-    fname = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'tree', 'cernstaff.dat')
++    fname = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'tree', 'cernstaff.dat')
+     for line in open(fname).readlines():
+         t = list(filter( lambda x: x, re.split( '\s+', line ) ) )
+         staff.Category = int(t[0])             # assign as integers
+diff -Nur root-6.08.02.orig/tutorials/roofit/rf505_asciicfg.C root-6.08.02/tutorials/roofit/rf505_asciicfg.C
+--- root-6.08.02.orig/tutorials/roofit/rf505_asciicfg.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/roofit/rf505_asciicfg.C	2016-12-06 12:46:10.350969124 +0100
+@@ -60,9 +60,9 @@
+    params->writeToFile("rf505_asciicfg_example.txt") ;
+ 
+ 
+-   TString dir1 = gROOT->GetTutorialsDir() ;
++   TString dir1 = gROOT->GetTutorialDir() ;
+    dir1.Append("/roofit/rf505_asciicfg.txt") ;
+-   TString dir2 = gROOT->GetTutorialsDir() ;
++   TString dir2 = gROOT->GetTutorialDir() ;
+    dir2.Append("/roofit/rf505_asciicfg_example.txt") ;
+    // R e a d    p a r a m e t e r s   f r o m    a s c i i   f i l e 
+    // ----------------------------------------------------------------
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_compton.C root-6.08.02/tutorials/spectrum/Background_compton.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_compton.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_compton.C	2016-12-06 12:46:10.350969124 +0100
+@@ -19,7 +19,7 @@
+ 
+    TH1F *d1 = new TH1F("d1","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back3");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_decr.C root-6.08.02/tutorials/spectrum/Background_decr.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_decr.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_decr.C	2016-12-06 12:46:10.350969124 +0100
+@@ -18,7 +18,7 @@
+ 
+    TH1F *d    = new TH1F("d","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back1");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_incr.C root-6.08.02/tutorials/spectrum/Background_incr.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_incr.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_incr.C	2016-12-06 12:46:10.350969124 +0100
+@@ -18,7 +18,7 @@
+ 
+    TH1F *d    = new TH1F("d","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back1");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_order.C root-6.08.02/tutorials/spectrum/Background_order.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_order.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_order.C	2016-12-06 12:46:10.350969124 +0100
+@@ -22,7 +22,7 @@
+    TH1F *d3 = new TH1F("d3","",nbins,xmin,xmax);
+    TH1F *d4 = new TH1F("d4","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back2");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_smooth.C root-6.08.02/tutorials/spectrum/Background_smooth.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_smooth.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_smooth.C	2016-12-06 12:46:10.351969112 +0100
+@@ -20,7 +20,7 @@
+    TH1F *d1 = new TH1F("d1","",nbins,xmin,xmax);
+    TH1F *d2 = new TH1F("d2","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back1");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_width2.C root-6.08.02/tutorials/spectrum/Background_width2.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_width2.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_width2.C	2016-12-06 12:46:10.351969112 +0100
+@@ -22,7 +22,7 @@
+    TH1F *d3 = new TH1F("d3","",nbins,xmin,xmax);
+    TH1F *d4 = new TH1F("d4","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back2");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_width.C root-6.08.02/tutorials/spectrum/Background_width.C
+--- root-6.08.02.orig/tutorials/spectrum/Background_width.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Background_width.C	2016-12-06 12:46:10.352969101 +0100
+@@ -17,7 +17,7 @@
+    Double_t source[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *back = (TH1F*) f->Get("back1");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution.C root-6.08.02/tutorials/spectrum/Deconvolution.C
+--- root-6.08.02.orig/tutorials/spectrum/Deconvolution.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Deconvolution.C	2016-12-06 12:46:10.352969101 +0100
+@@ -17,7 +17,7 @@
+    Double_t response[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *h = (TH1F*) f->Get("decon1");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide_boost.C root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide_boost.C
+--- root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide_boost.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide_boost.C	2016-12-06 12:46:10.353969090 +0100
+@@ -17,7 +17,7 @@
+    Double_t response[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    h = (TH1F*) f->Get("decon3");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide.C root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide.C
+--- root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide.C	2016-12-06 12:46:10.353969090 +0100
+@@ -17,7 +17,7 @@
+    Double_t response[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    h = (TH1F*) f->Get("decon3");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide_boost.C root-6.08.02/tutorials/spectrum/Deconvolution_wide_boost.C
+--- root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide_boost.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Deconvolution_wide_boost.C	2016-12-06 12:46:10.353969090 +0100
+@@ -20,7 +20,7 @@
+    TH1F *h = new TH1F("h","Deconvolution",nbins,xmin,xmax);
+    TH1F *d = new TH1F("d","",nbins,xmin,xmax);
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    h = (TH1F*) f->Get("decon3");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide.C root-6.08.02/tutorials/spectrum/Deconvolution_wide.C
+--- root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Deconvolution_wide.C	2016-12-06 12:46:10.353969090 +0100
+@@ -17,7 +17,7 @@
+    Double_t response[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *h = (TH1F*) f->Get("decon3");
+diff -Nur root-6.08.02.orig/tutorials/spectrum/Smoothing.C root-6.08.02/tutorials/spectrum/Smoothing.C
+--- root-6.08.02.orig/tutorials/spectrum/Smoothing.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/spectrum/Smoothing.C	2016-12-06 12:46:10.353969090 +0100
+@@ -16,7 +16,7 @@
+    Double_t source[nbins];
+    gROOT->ForceStyle();
+ 
+-   TString dir  = gROOT->GetTutorialsDir();
++   TString dir  = gROOT->GetTutorialDir();
+    TString file = dir+"/spectrum/TSpectrum.root";
+    TFile *f     = new TFile(file.Data());
+    TH1F *h = (TH1F*) f->Get("back1");
+diff -Nur root-6.08.02.orig/tutorials/tmva/keras/MulticlassKeras.py root-6.08.02/tutorials/tmva/keras/MulticlassKeras.py
+--- root-6.08.02.orig/tutorials/tmva/keras/MulticlassKeras.py	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tmva/keras/MulticlassKeras.py	2016-12-06 12:46:10.354969079 +0100
+@@ -19,7 +19,7 @@
+ 
+ # Load data
+ if not isfile('tmva_example_multiple_background.root'):
+-    createDataMacro = gROOT.GetTutorialsDir() + '/tmva/createData.C'
++    createDataMacro = str(gROOT.GetTutorialDir()) + '/tmva/createData.C'
+     print(createDataMacro)
+     gROOT.ProcessLine('.L {}'.format(createDataMacro))
+     gROOT.ProcessLine('create_MultipleBackground(4000)')
+diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategoryApplication.C root-6.08.02/tutorials/tmva/TMVAClassificationCategoryApplication.C
+--- root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategoryApplication.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tmva/TMVAClassificationCategoryApplication.C	2016-12-06 12:46:10.354969079 +0100
+@@ -85,7 +85,7 @@
+    TString fname = TString(gSystem->DirName(__FILE__) ) + "/data/";
+    // if directory data not found try using tutorials dir
+    if (gSystem->AccessPathName( fname + "toy_sigbkg_categ_offset.root"  )) {
+-      fname = TString(gROOT->GetTutorialsDir()) + "/tmva/data/";
++      fname = gROOT->GetTutorialDir() + "/tmva/data/";
+    }
+    if (UseOffsetMethod) fname += "toy_sigbkg_categ_offset.root";
+    else                 fname += "toy_sigbkg_categ_varoff.root";
+diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategory.C root-6.08.02/tutorials/tmva/TMVAClassificationCategory.C
+--- root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategory.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tmva/TMVAClassificationCategory.C	2016-12-06 12:46:10.354969079 +0100
+@@ -89,7 +89,7 @@
+    TString fname = TString(gSystem->DirName(__FILE__) ) + "/data/";
+    if (gSystem->AccessPathName( fname + "toy_sigbkg_categ_offset.root")) {
+       // if directory data not found try using tutorials dir
+-      fname = TString(gROOT->GetTutorialsDir()) + "/tmva/data/";
++      fname = gROOT->GetTutorialDir() + "/tmva/data/";
+    }
+    if (UseOffsetMethod) fname += "toy_sigbkg_categ_offset.root";
+    else                 fname += "toy_sigbkg_categ_varoff.root";
+diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAMulticlass.C root-6.08.02/tutorials/tmva/TMVAMulticlass.C
+--- root-6.08.02.orig/tutorials/tmva/TMVAMulticlass.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tmva/TMVAMulticlass.C	2016-12-06 12:46:10.354969079 +0100
+@@ -98,7 +98,7 @@
+    }
+    else {
+       std::cout << "Creating testdata...." << std::endl;
+-      TString createDataMacro = TString(gROOT->GetTutorialsDir()) + "/tmva/createData.C";
++      TString createDataMacro = gROOT->GetTutorialDir() + "/tmva/createData.C";
+       gROOT->ProcessLine(TString::Format(".L %s",createDataMacro.Data()));
+       gROOT->ProcessLine("create_MultipleBackground(2000)");
+       std::cout << " created tmva_example_multiple_background.root for tests of the multiclass features"<<std::endl;
+diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAMultipleBackgroundExample.C root-6.08.02/tutorials/tmva/TMVAMultipleBackgroundExample.C
+--- root-6.08.02.orig/tutorials/tmva/TMVAMultipleBackgroundExample.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tmva/TMVAMultipleBackgroundExample.C	2016-12-06 12:46:10.354969079 +0100
+@@ -476,7 +476,7 @@
+         << "========================" << endl
+         << endl;
+ 
+-   TString createDataMacro = TString(gROOT->GetTutorialsDir()) + "/tmva/createData.C";
++   TString createDataMacro = gROOT->GetTutorialDir() + "/tmva/createData.C";
+    gROOT->ProcessLine(TString::Format(".L %s",createDataMacro.Data()));
+    gROOT->ProcessLine("create_MultipleBackground(2000)");
+ 
+diff -Nur root-6.08.02.orig/tutorials/tree/basic2.C root-6.08.02/tutorials/tree/basic2.C
+--- root-6.08.02.orig/tutorials/tree/basic2.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/basic2.C	2016-12-06 12:46:10.354969079 +0100
+@@ -10,7 +10,7 @@
+ /// \author Rene Brun
+ 
+ void basic2() {
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/tree/");
+    dir.ReplaceAll("/./","/");
+ 
+diff -Nur root-6.08.02.orig/tutorials/tree/basic.C root-6.08.02/tutorials/tree/basic.C
+--- root-6.08.02.orig/tutorials/tree/basic.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/basic.C	2016-12-06 12:46:10.355969067 +0100
+@@ -12,7 +12,7 @@
+ void basic() {
+ // read file $ROOTSYS/tutorials/tree/basic.dat
+ // this file has 3 columns of float data
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/tree/");
+    dir.ReplaceAll("/./","/");
+    ifstream in;
+diff -Nur root-6.08.02.orig/tutorials/tree/cernbuild.C root-6.08.02/tutorials/tree/cernbuild.C
+--- root-6.08.02.orig/tutorials/tree/cernbuild.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/cernbuild.C	2016-12-06 12:46:10.355969067 +0100
+@@ -25,7 +25,7 @@
+    //The input file cern.dat is a copy of the CERN staff data base
+    //from 1988
+    TString filename = "cernstaff.root";
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/tree/");
+    dir.ReplaceAll("/./","/");
+    FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
+diff -Nur root-6.08.02.orig/tutorials/tree/cernstaff.C root-6.08.02/tutorials/tree/cernstaff.C
+--- root-6.08.02.orig/tutorials/tree/cernstaff.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/cernstaff.C	2016-12-06 12:46:10.355969067 +0100
+@@ -9,7 +9,7 @@
+ /// \author Rene Brun
+ 
+ void cernstaff () {
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/tree/cernstaff.C");
+    if (gSystem->AccessPathName("cernstaff.root")) {
+       gROOT->SetMacroPath(dir);
+diff -Nur root-6.08.02.orig/tutorials/tree/jets.C root-6.08.02/tutorials/tree/jets.C
+--- root-6.08.02.orig/tutorials/tree/jets.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/jets.C	2016-12-06 12:46:10.355969067 +0100
+@@ -99,7 +99,7 @@
+ //void jets(Int_t nev=100, Int_t npileup=200, Bool_t secondrun);
+ void jets(Int_t nev=100, Int_t npileup=200) {
+    gSystem->Load("libPhysics");
+-   TString tutdir = gROOT->GetTutorialsDir();
++   TString tutdir = gROOT->GetTutorialDir();
+    gROOT->ProcessLine(".L " + tutdir + "/tree/JetEvent.cxx+");
+    gROOT->ProcessLine("#define JETS_SECOND_RUN yes");
+    gROOT->ProcessLine("#include \"" __FILE__ "\"");
+diff -Nur root-6.08.02.orig/tutorials/tree/ntuple1.C root-6.08.02/tutorials/tree/ntuple1.C
+--- root-6.08.02.orig/tutorials/tree/ntuple1.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/tree/ntuple1.C	2016-12-06 12:46:10.355969067 +0100
+@@ -31,7 +31,7 @@
+    //
+    // Connect ROOT histogram/ntuple demonstration file
+    // generated by example $ROOTSYS/tutorials/hsimple.C.
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    dir.Append("/hsimple.C");
+    dir.ReplaceAll("/./","/");
+    if (gBenchmark->GetBench("hsimple") < 0) gInterpreter->LoadMacro(dir.Data());
+diff -Nur root-6.08.02.orig/tutorials/xml/DOMParsePerson.C root-6.08.02/tutorials/xml/DOMParsePerson.C
+--- root-6.08.02.orig/tutorials/xml/DOMParsePerson.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/xml/DOMParsePerson.C	2016-12-06 12:46:10.356969056 +0100
+@@ -234,7 +234,7 @@
+ {
+    PersonList personlist;
+    gROOT->ProcessLine(".O 0");
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    if (personlist.ParseFile(dir+"/xml/person.xml") == 0)
+       cout << personlist << endl;
+ }
+diff -Nur root-6.08.02.orig/tutorials/xml/DOMRecursive.C root-6.08.02/tutorials/xml/DOMRecursive.C
+--- root-6.08.02.orig/tutorials/xml/DOMRecursive.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/xml/DOMRecursive.C	2016-12-06 12:46:10.356969056 +0100
+@@ -54,7 +54,7 @@
+ void DOMRecursive()
+ {
+   TDOMParser *domParser = new TDOMParser();
+-  TString dir = gROOT->GetTutorialsDir();
++  TString dir = gROOT->GetTutorialDir();
+   domParser->SetValidate(false); // do not validate with DTD
+   domParser->ParseFile(dir+"/xml/person.xml");
+ 
+diff -Nur root-6.08.02.orig/tutorials/xml/SAXHandler.C root-6.08.02/tutorials/xml/SAXHandler.C
+--- root-6.08.02.orig/tutorials/xml/SAXHandler.C	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/tutorials/xml/SAXHandler.C	2016-12-06 12:46:10.356969056 +0100
+@@ -104,6 +104,6 @@
+    SaxHandler *saxHandler = new SaxHandler();
+ 
+    saxParser->ConnectToHandler("SaxHandler", saxHandler);
+-   TString dir = gROOT->GetTutorialsDir();
++   TString dir = gROOT->GetTutorialDir();
+    saxParser->ParseFile(dir+"/xml/saxexample.xml");
+ }
diff --git a/root-testfiles.sh b/root-testfiles.sh
index e7160b8..f84635f 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -5,13 +5,15 @@ SITE="http://root.cern.ch/files"
 mkdir files
 pushd files
 
-wget -N ${SITE}/aleph_ref_4.root
+wget -N ${SITE}/aleph_ref_5.root
 wget -N ${SITE}/aleph.root
-wget -N ${SITE}/alice3_ref_4.root
+wget -N ${SITE}/alice3_ref_5.root
 wget -N ${SITE}/alice3.root
 wget -N ${SITE}/ams_ref_3.root
 wget -N ${SITE}/ams.root
-wget -N ${SITE}/babar2_ref_3.root
+wget -N ${SITE}/atlas_ref_5.root
+wget -N ${SITE}/atlas.root
+wget -N ${SITE}/babar2_ref_4.root
 wget -N ${SITE}/babar2.root
 wget -N ${SITE}/barres_ref_3.root
 wget -N ${SITE}/barres.root
@@ -23,11 +25,11 @@ wget -N ${SITE}/brahms_ref_3.root
 wget -N ${SITE}/brahms.root
 wget -N ${SITE}/btev_ref_3.root
 wget -N ${SITE}/btev.root
-wget -N ${SITE}/cdf_ref_4.root
+wget -N ${SITE}/cdf_ref_5.root
 wget -N ${SITE}/cdf.root
 wget -N ${SITE}/chambers_ref_3.root
 wget -N ${SITE}/chambers.root
-wget -N ${SITE}/cms_ref_3.root
+wget -N ${SITE}/cms_ref_4.root
 wget -N ${SITE}/cms.root
 wget -N ${SITE}/dubna_ref_3.root
 wget -N ${SITE}/dubna.root
@@ -37,15 +39,15 @@ wget -N ${SITE}/felix_ref_3.root
 wget -N ${SITE}/felix.root
 wget -N ${SITE}/ganil_ref_3.root
 wget -N ${SITE}/ganil.root
-wget -N ${SITE}/gem_ref_3.root
+wget -N ${SITE}/gem_ref_4.root
 wget -N ${SITE}/gem.root
 wget -N ${SITE}/hades2_ref_4.root
 wget -N ${SITE}/hades2.root
 wget -N ${SITE}/hermes_ref_3.root
 wget -N ${SITE}/hermes.root
-wget -N ${SITE}/integral_ref_3.root
+wget -N ${SITE}/integral_ref_4.root
 wget -N ${SITE}/integral.root
-wget -N ${SITE}/lhcbfull_ref_3.root
+wget -N ${SITE}/lhcbfull_ref_4.root
 wget -N ${SITE}/lhcbfull.root
 wget -N ${SITE}/na35_ref_3.root
 wget -N ${SITE}/na35.root
@@ -53,7 +55,7 @@ wget -N ${SITE}/na47_ref_3.root
 wget -N ${SITE}/na47.root
 wget -N ${SITE}/na49_ref_3.root
 wget -N ${SITE}/na49.root
-wget -N ${SITE}/p326_ref_3.root
+wget -N ${SITE}/p326_ref_4.root
 wget -N ${SITE}/p326.root
 wget -N ${SITE}/phenix_ref_3.root
 wget -N ${SITE}/phenix.root
@@ -61,9 +63,9 @@ wget -N ${SITE}/phobos2_ref_4.root
 wget -N ${SITE}/phobos2.root
 wget -N ${SITE}/sdc_ref_3.root
 wget -N ${SITE}/sdc.root
-wget -N ${SITE}/sld_ref_3.root
+wget -N ${SITE}/sld_ref_4.root
 wget -N ${SITE}/sld.root
-wget -N ${SITE}/star_ref_3.root
+wget -N ${SITE}/star_ref_4.root
 wget -N ${SITE}/star.root
 wget -N ${SITE}/tesla_ref_3.root
 wget -N ${SITE}/tesla.root
@@ -73,7 +75,6 @@ wget -N ${SITE}/wa91.root
 wget -N ${SITE}/europe.root
 wget -N ${SITE}/linearIO.root
 wget -N ${SITE}/stressHistogram.5.18.00.root
-wget -N ${SITE}/stressRooFit_v534_ref.root
 wget -N ${SITE}/tmva_class_example.root
 wget -N ${SITE}/tmva_reg_example.root
 wget -N ${SITE}/usa.root
diff --git a/root-tformulaparsingtests.patch b/root-tformulaparsingtests.patch
new file mode 100644
index 0000000..49b3571
--- /dev/null
+++ b/root-tformulaparsingtests.patch
@@ -0,0 +1,906 @@
+diff --git a/test/TFormulaParsingTests.h b/test/TFormulaParsingTests.h
+index 1ba19ce..d9e3ee8 100644
+--- a/test/TFormulaParsingTests.h
++++ b/test/TFormulaParsingTests.h
+@@ -6,26 +6,26 @@
+ #include "TMath.h"
+ #include "Math/ChebyshevPol.h"
+ 
+-#include <limits>
+-#include <cstdlib>
+ #include <stdio.h>
+ // test of tformula neeeded to be run
+ 
+-
+ class TFormulaParsingTests {
+ 
+-   
+-bool verbose; 
+-std::vector<int> failedTests; 
++bool verbose;
++std::vector<int> failedTests;
+ 
+ // We need a softer way to reason about equality in 32 bits
+ // Being this a quick test, doing the check at runtime is really no problem.
+-bool fpEqual(double x, double y, bool epsilon = false)
++bool fpEqual(double x, double y, double epsilon = 0.)
+ {
+-   bool isEqual = epsilon ? std::abs(x-y) <= std::numeric_limits<double>::epsilon() : x == y;
++   bool isEqual;
++   if (epsilon == 0.)
++      isEqual = (x == y);
++   else
++      isEqual = TMath::AreEqualAbs(x, y, epsilon);
+    if (!isEqual) {
+-       // std::hexfloat not there for older gcc versions
+-       printf("\nThe numbers differ: %A and %A\n", x, y);
++      // std::hexfloat not there for older gcc versions
++      printf("\nThe numbers differ: %A and %A\n", x, y);
+    }
+    return isEqual;
+ }
+@@ -42,65 +42,53 @@ bool test1() {
+    f2.SetParameters(1,2,3,4);
+ 
+    return (f2.Eval(2) == 39.);
+-
+ }
+ 
+ bool test2() {
+-
+    TF1 f1("f1","[0]+[1]*x");
+    TF1 f2("f2","[0]+[1]*x*f1");
+ 
+-   TF1 f3("f3",f2.GetExpFormula() ); 
++   TF1 f3("f3",f2.GetExpFormula());
+ 
+    f3.SetParameters(1,2,3,4);
+ 
+    return (f3.Eval(2) == 45.);
+-
+ }
+ 
+-
+ bool test3() {
+-
+-   // still tets composition of functions
++   // still test composition of functions
+    TF1 f1("f1","gaus");
+    TF1 f2("f2","[0]+[1]*x+f1");
+ 
+-
+    f2.SetParameters(10,2,5,2,1);
+ 
+-   f1.SetParameters(5,2,1); 
+-
+-   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
++   f1.SetParameters(5,2,1);
+ 
++   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
+ }
+ 
+ bool test4() {
+-
+    // similar but with different name (it contains gaus)
+    TF1 f1("fgaus","gaus");
+    TF1 f2("f2","[0]+[1]*x+fgaus");
+ 
+-
+    f2.SetParameters(10,2,5,2,1);
+ 
+-   f1.SetParameters(5,2,1); 
+-
+-   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
++   f1.SetParameters(5,2,1);
+ 
++   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
+ }
+-bool test5() {
+ 
++bool test5() {
+    // similar but with different name (it contains gaus)
+    TF1 f1("gausnfunc","gaus");
+    TF1 f2("f2","[0]+[1]*x+gausnfunc");
+ 
+-
+    f2.SetParameters(10,2,5,2,1);
+ 
+-   f1.SetParameters(5,2,1); 
+-
+-   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
++   f1.SetParameters(5,2,1);
+ 
++   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
+ }
+ 
+ bool test1a() {
+@@ -111,10 +99,9 @@ bool test1a() {
+    return true;
+ }
+ 
+-
+ bool test6() {
+    // test linear function used in fitting
+-   bool ok = true; 
++   bool ok = true;
+    double x[] = {1,2,3,4,5};
+    double y[] = {1,4,7,9,10};
+    TGraph g(5,x,y);
+@@ -122,7 +109,7 @@ bool test6() {
+    int iret = g.Fit("x++1","Q");
+    ok &= (iret == 0);
+    iret = g.Fit("1++x","Q");
+-   return iret == 0; 
++   return iret == 0;
+ }
+ 
+ bool test7() {
+@@ -130,45 +117,44 @@ bool test7() {
+    TF1 * f1 = new TF1("f1","1++x");
+    if (f1->GetNpar() != 2) return false;
+    f1->SetParameters(2,3);
+-   if (f1->Eval(3) != 11) return  false;
++   if (f1->Eval(3) != 11) return false;
+ 
+-   if (verbose) printf("Test7: test linear part1 of function\n"); 
++   if (verbose) printf("Test7: test linear part1 of function\n");
+    TFormula * lin1 = (TFormula*) f1->GetLinearPart(1);
+    assert (lin1);
+-   if (lin1->Eval(3) != 3) return false; 
++   if (lin1->Eval(3) != 3) return false;
++
++   if (verbose) printf("Test7: test copying linear function\n");
+ 
+-   if (verbose) printf("Test7: test copying linear function\n"); 
+-   
+    TF1 * f2 = new TF1(*f1);
+-   if (f2->Eval(3) != 11) return  false;
++   if (f2->Eval(3) != 11) return false;
+ 
+    if (verbose) printf("Test7: test linear part1 of copied function\n");
+-   if (!f2->IsLinear()) return false; 
++   if (!f2->IsLinear()) return false;
+    lin1 = (TFormula*) f2->GetLinearPart(1);
+    assert (lin1);
+-   if (lin1->Eval(3) != 3) return false; 
++   if (lin1->Eval(3) != 3) return false;
+ 
+    delete f1;
+ 
+-   if (verbose) printf("Test7: test cloning linear function\n"); 
++   if (verbose) printf("Test7: test cloning linear function\n");
+ 
+    TF1 * f3 = (TF1*) f2->Clone("f3");
+-   if (f3->Eval(3) != 11) return  false;
++   if (f3->Eval(3) != 11) return false;
+ 
+-   if (verbose) printf("Test7: test deleting the copied function\n"); 
++   if (verbose) printf("Test7: test deleting the copied function\n");
+    delete f2;
+ 
+-   if (verbose) printf("Test7: test linear part1 of cloned function\n"); 
+-   if (!f3->IsLinear()) return false; 
++   if (verbose) printf("Test7: test linear part1 of cloned function\n");
++   if (!f3->IsLinear()) return false;
+    lin1 = (TFormula*) f3->GetLinearPart(1);
+    assert (lin1);
+-   if (verbose) printf("Test7: test evaluating linear part1 of cloned function\n"); 
+-   if (lin1->Eval(3) != 3) return false; 
+-
++   if (verbose) printf("Test7: test evaluating linear part1 of cloned function\n");
++   if (lin1->Eval(3) != 3) return false;
+ 
+-   if (verbose) printf("Test7: test deleting the cloned function\n"); 
+-   delete f3; 
+-   return true; 
++   if (verbose) printf("Test7: test deleting the cloned function\n");
++   delete f3;
++   return true;
+ }
+ 
+ bool test8() {
+@@ -178,39 +164,38 @@ bool test8() {
+    f = new TFormula("f","x^y");
+ 
+    ok &= (f->Eval(2,3) == 8);
+-   delete f; 
++   delete f;
+ 
+    f = new TFormula("f","(x+[0])^y");
+    f->SetParameter(0,1);
+    ok &= (f->Eval(2,3) == 27);
+-   delete f; 
++   delete f;
+ 
+    f = new TFormula("f","sqrt(x+[0])^y");
+    f->SetParameter(0,2);
+    ok &= (f->Eval(2,3) == 8);
+-   delete f; 
++   delete f;
+ 
+    f = new TFormula("f","[0]/((x+2)^y)");
+    f->SetParameter(0,27);
+    ok &= (f->Eval(1,3) == 1);
+-   delete f; 
+-   
++   delete f;
++
+    f = new TFormula("f","[0]/((x+2)^(y+1))");
+    f->SetParameter(0,27);
+    ok &= (f->Eval(1,2) == 1);
+-   delete f; 
++   delete f;
+ 
+    // test also nested operators
+    f = new TFormula("f","((x+1)^y)^z");
+    ok &= (f->Eval(1,3,4) == 4096);
+-   delete f; 
++   delete f;
+ 
+    f = new TFormula("f","x^((y+1)^z)");
+    ok &= (f->Eval(2,1,3) == 256);
+    delete f;
+-   
++
+    return ok;
+-   
+ }
+ 
+ bool test9() {
+@@ -220,7 +205,7 @@ bool test9() {
+    TFormula * f = 0;
+    f = new TFormula("f","x+2.0e1");
+    ok &= (f->Eval(1) == 21.);
+-   
++
+    f = new TFormula("f","x*2.e-1");
+    ok &= (f->Eval(10) == 2.);
+ 
+@@ -232,25 +217,23 @@ bool test9() {
+ 
+    delete f;
+    return ok;
+-
+-   
+ }
+ 
+ bool test10() {
+    // test the operator "? : "
+    bool ok = true;
+    TFormula * f = 0;
+-   f  = new TFormula("f","(x<0)?-x:x");
+-   ok &= (f->Eval(-2) == 2); 
++   f = new TFormula("f","(x<0)?-x:x");
++   ok &= (f->Eval(-2) == 2);
+    ok &= (f->Eval(2) == 2);
+ 
+    f = new TFormula("f","(x<0)?x:pol2");
+    f->SetParameters(1,2,3);
+-   ok &= (f->Eval(-2) == -2); 
+-   ok &= (f->Eval(2) == 1 + 2*2 + 2*2*3); 
++   ok &= (f->Eval(-2) == -2);
++   ok &= (f->Eval(2) == 1 + 2*2 + 2*2*3);
+ 
+    delete f;
+-   return ok; 
++   return ok;
+ }
+ 
+ bool test11() {
+@@ -260,17 +243,18 @@ bool test11() {
+    TFormula f1("f","ROOT::Math::normal_pdf(x,1,2)");
+    TFormula f2("f","[0]+TMath::Gaus(x,2,1,true)");
+    f2.SetParameter(0,1);
+-   ok &= ( (f1.Eval(2) +1. ) == f2.Eval(2) );
++   ok &= ((f1.Eval(2) + 1.) == f2.Eval(2));
+    return ok;
+ }
+-bool test12() { 
+-   // test parameters order 
+-   bool ok = true; 
+-   TFormula * f = 0; 
++
++bool test12() {
++   // test parameters order
++   bool ok = true;
++   TFormula * f = 0;
+    f = new TFormula("f","[2] + [3]*x + [0]*x^2 + [1]*x^3");
+    f->SetParameters(1,2,3,4);
+    double result = 3+4*2+1*4+2*8;
+-   ok &= (f->Eval(2) == result); 
++   ok &= (f->Eval(2) == result);
+    f = new TFormula("f","[b] + [c]*x + [d]*x^2 + [a]*x^3");
+    f->SetParameters(1,2,3,4);
+    result = 2+3*2+4*4+1*8;
+@@ -281,29 +265,32 @@ bool test12() {
+    return ok;
+ }
+ 
+-bool test13()  {
++bool test13() {
+    // test GetExpFormula
+    TFormula f("f","[2] + [0]*x + [1]*x*x");
+    f.SetParameters(1,2,3);
+    return (f.GetExpFormula() == TString("[p2]+[p0]*x+[p1]*x*x"));
+ }
+-bool test14()  {
++
++bool test14() {
+    // test GetExpFormula
+    TFormula f("f","[2] + [0]*x + [1]*x*x");
+    f.SetParameters(1,2,3);
+    return (f.GetExpFormula("P") == TString("3+1*x+2*x*x"));
+ }
+-bool test15()  {
++
++bool test15() {
+    // test GetExpFormula
+    TFormula f("f","[2] + [0]*x + [1]*x*x");
+    f.SetParameters(1,2,3);
+-   return (f.GetExpFormula("CLING") == TString("p[2]+p[0]*x[0]+p[1]*x[0]*x[0] ") ); // need an extra white space
++   return (f.GetExpFormula("CLING") == TString("p[2]+p[0]*x[0]+p[1]*x[0]*x[0] ")); // need an extra white space
+ }
+-bool test16()  {
++
++bool test16() {
+    // test GetExpFormula
+    TFormula f("f","[2] + [0]*x + [1]*x*x");
+    f.SetParameters(1,2,3);
+-   return (f.GetExpFormula("CLING P") == TString("3.000000+1.000000*x[0]+2.000000*x[0]*x[0] ") );
++   return (f.GetExpFormula("CLING P") == TString("3.000000+1.000000*x[0]+2.000000*x[0]*x[0] "));
+ }
+ 
+ bool test17() {
+@@ -312,10 +299,10 @@ bool test17() {
+    f1->SetParameters(2,3);
+    TF1 * f0 = new TF1("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]); },0,10,2);
+    f0->SetParameters(2,3);
+-   bool ok = true; 
+-   ok &= fpEqual(f1->Eval(1.5) , f0->Eval(1.5) );
++   bool ok = true;
++   ok &= fpEqual(f1->Eval(1.5), f0->Eval(1.5));
+    double xx[1] = {2.5};
+-   ok &= fpEqual(f1->EvalPar(xx) , f0->Eval(2.5) );
++   ok &= fpEqual(f1->EvalPar(xx), f0->Eval(2.5));
+    return ok;
+ }
+ 
+@@ -325,12 +312,12 @@ bool test18() {
+    f1->SetParameters(2,3);
+    TF2 * f0 = new TF2("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]*x[1]); },0,10,0,10,2);
+    f0->SetParameters(2,3);
+-   bool ok = true; 
+-   ok &= fpEqual(f1->Eval(1.5,2.5) , f0->Eval(1.5,2.5) );
++   bool ok = true;
++   ok &= fpEqual(f1->Eval(1.5,2.5), f0->Eval(1.5,2.5));
+    double par[2] = {3,4};
+    double xx[2] = {0.8,1.6};
+-   ok &= fpEqual(f1->EvalPar(xx,par) , f0->EvalPar(xx,par) );
+-   return ok; 
++   ok &= fpEqual(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
++   return ok;
+ }
+ 
+ bool test19() {
+@@ -339,12 +326,12 @@ bool test19() {
+    f1->SetParameters(2,3);
+    TF3 * f0 = new TF3("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]*x[1]*x[2]); },0,10,0,10,0,10,2);
+    f0->SetParameters(2,3);
+-   bool ok = true; 
+-   ok &= fpEqual(f1->Eval(1.5,2.5,3.5) , f0->Eval(1.5,2.5,3.5) );
++   bool ok = true;
++   ok &= fpEqual(f1->Eval(1.5,2.5,3.5), f0->Eval(1.5,2.5,3.5));
+    double par[2] = {3,4};
+    double xx[3] = {0.8,1.6,2.2};
+-   ok &= fpEqual(f1->EvalPar(xx,par) , f0->EvalPar(xx,par) );
+-   return ok; 
++   ok &= fpEqual(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
++   return ok;
+ }
+ 
+ bool test20() {
+@@ -353,12 +340,12 @@ bool test20() {
+    double params[16] = {1,0,1,1,1, 2,-1,2,0,2, 2,1,3,-1,2, 10};
+    f2.SetParameters(params);
+    TF2 f0("f2",[](double *x, double *p){ return p[0]*TMath::Gaus(x[0],p[1],p[2])*TMath::Gaus(x[1],p[3],p[4]) +
+-            p[5]*TMath::Gaus(x[0],p[6],p[7])*TMath::Gaus(x[1],p[8],p[9]) + 
++            p[5]*TMath::Gaus(x[0],p[6],p[7])*TMath::Gaus(x[1],p[8],p[9]) +
+             p[10]*TMath::Gaus(x[0],p[11],p[12])*TMath::Gaus(x[1],p[13],p[14]) + p[15]; },
+       -10,10,-10,10,16);
+    double xx[2]={1,2};
+-   //printf(" difference = %f , value %f \n", f2.Eval(1,2) - f0.EvalPar(xx,params), f2.Eval(1,2) );
+-   return fpEqual( f2.Eval(1,2) , f0.EvalPar(xx,params) );
++   //printf(" difference = %f, value %f \n", f2.Eval(1,2) - f0.EvalPar(xx,params), f2.Eval(1,2));
++   return fpEqual(f2.Eval(1,2), f0.EvalPar(xx,params));
+ }
+ 
+ bool test21() {
+@@ -366,8 +353,8 @@ bool test21() {
+    TFormula f("f","pol2+gaus(3)");
+    f.SetParameters(1,2,3,1,0,1);
+    TF1 f0("f0",[](double *x, double *p){ return p[0]+x[0]*p[1]+x[0]*x[0]*p[2]+p[3]*TMath::Gaus(x[0],p[4],p[5]); },0,1,6);
+-   f0.SetParameters(f.GetParameters() );
+-   return fpEqual(f.Eval(2) , f0.Eval(2) );
++   f0.SetParameters(f.GetParameters());
++   return fpEqual(f.Eval(2), f0.Eval(2));
+ }
+ 
+ bool test22() {
+@@ -375,36 +362,36 @@ bool test22() {
+    TF1 f("f","cheb10+[offset]");
+    double p[12] = {1,1,1,1,1,1,1,1,1,1,1,10 };
+    f.SetParameters(p);
+-   return (f.Eval(0.5) == ROOT::Math::ChebyshevN(10, 0.5, p ) + f.GetParameter("offset"));
++   return (f.Eval(0.5) == ROOT::Math::ChebyshevN(10, 0.5, p) + f.GetParameter("offset"));
+ }
+ 
+ bool test23() {
+    // fix function compositions using pre-defined functions
+-   bool ok = true; 
++   bool ok = true;
+    TF1 f1("f1","gaus");
+    TF1 f2("f2","[0]+f1");
+-   TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
++   TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4);
+    f2.SetParameters(10,1,0,1);
+-   f0.SetParameters(f2.GetParameters() );
+-   ok &= fpEqual(f2.Eval(1) , f0.Eval(1) );
++   f0.SetParameters(f2.GetParameters());
++   ok &= fpEqual(f2.Eval(1), f0.Eval(1), 7e-16);
+ 
+    TF1 f3("f3","f1+[0]");
+    // param order should be the same
+-   f3.SetParameters( f2.GetParameters() );
+-   ok &= fpEqual(f2.Eval(1) , f0.Eval(1) );
++   f3.SetParameters(f2.GetParameters());
++   ok &= fpEqual(f3.Eval(1), f0.Eval(1), 7e-16);
+    return ok;
+ }
+ 
+ bool test24() {
+    // test I/O for parameter ordering
+-   bool ok = true; 
++   bool ok = true;
+    TF2 f("f","xygaus");
+    f.SetParameters(10,0,1,-1,2);
+    TF2 * f2 = (TF2*) f.Clone();
+-   ok &= ( f.Eval(1,1) == f2->Eval(1,1) );
++   ok &= (f.Eval(1,1) == f2->Eval(1,1));
+    // test with copy
+    TF2 f3(f);
+-   ok &= ( f.Eval(1,1) == f3.Eval(1,1) );
++   ok &= (f.Eval(1,1) == f3.Eval(1,1));
+    return ok;
+ }
+ 
+@@ -412,61 +399,61 @@ bool test25() {
+    // fix parsing of operator^ (ROOT-7349)
+    bool ok = true;
+    TF1 f1("f1","x^-2.5");
+-   ok &= (f1.Eval(3.) == TMath::Power(3,-2.5) );
+-   if (!ok)  std::cout << "Error in test25 - f != x^-2.5 " << f1.Eval(3.) << "  " <<  TMath::Power(3,-2.5) << std::endl;
++   ok &= (f1.Eval(3.) == TMath::Power(3,-2.5));
++   if (!ok) std::cout << "Error in test25 - f != x^-2.5 " << f1.Eval(3.) << "  " << TMath::Power(3,-2.5) << std::endl;
+ 
+    TF1 f2("f2","x^+2.5");
+    //TF1 f3("f3","std::pow(x,2.5)");  // this needed to be fixed
+    TF1 f3("f3","TMath::Power(x,2.5)");
+-   bool ret =  (f2.Eval(3.) == f3.Eval(3) );
+-   if (!ret)  std::cout << "Error in test25 - f2 != f3 " << f2.Eval(3.) << "  " <<  f3.Eval(3.) << std::endl;
+-   ok &= ret; 
++   bool ret = (f2.Eval(3.) == f3.Eval(3));
++   if (!ret) std::cout << "Error in test25 - f2 != f3 " << f2.Eval(3.) << "  " << f3.Eval(3.) << std::endl;
++   ok &= ret;
+ 
+    //cms test
+    TF1 t1("t1","(x<190)?(-18.7813+(((2.49368+(10.3321/(x^0.881126)))*exp(-((x^-1.66603)/0.074916)))-(-17.5757*exp(-((x^-1464.26)/-7.94004e+06))))):(1.09984+(0.394544*exp(-(x/562.407))))");
+    double x = 2;
+    double y =(x<190)?(-18.7813+(((2.49368+(10.3321/(std::pow(x,0.881126))))*exp(-((std::pow(x,-1.66603))/0.074916)))-(-17.5757*exp(-((std::pow(x,-1464.26))/-7.94004e+06))))):(1.09984+(0.394544*exp(-(x/562.407))));
+    // this fails on 32 bits - put a tolerance
+-   ret = TMath::AreEqualAbs(t1.Eval(2) , y , 1.E-8);
+-   if (!ret)  std::cout << "Error in test25 - t1 != y " << t1.Eval(2.) << "  " <<  y << std::endl;
+-   ok &= ret; 
++   ret = fpEqual(t1.Eval(2), y, 1.E-8);
++   if (!ret) std::cout << "Error in test25 - t1 != y " << t1.Eval(2.) << "  " << y << std::endl;
++   ok &= ret;
+ 
+    // tests with scientific notations
+    auto ff = new TFormula("ff","x+2.e-2^1.2e-1");
+-   ret = ( ff->Eval(1.) == (1. + std::pow(2.e-2,1.2e-1) ) );
+-   if (!ret) std::cout << "Error in test25 - ff != expr " << ff->Eval(1.) << "  " <<   (1. + std::pow(2.e-2,1.2e-1) ) << std::endl;
+-   ok &= ret; 
++   ret = (ff->Eval(1.) == (1. + std::pow(2.e-2,1.2e-1)));
++   if (!ret) std::cout << "Error in test25 - ff != expr " << ff->Eval(1.) << "  " << (1. + std::pow(2.e-2,1.2e-1)) << std::endl;
++   ok &= ret;
+ 
+    ff = new TFormula("ff","x^-1.2e1");
+-   ret = ( ff->Eval(1.5) == std::pow(1.5,-1.2e1) ) ;
+-   if (!ret) std::cout << "Error in test25 - ff(1.5) != pow " <<  ff->Eval(1.5) << "  " <<  std::pow(1.5,-1.2e1) << std::endl; 
+-   ok &= ret; 
++   ret = (ff->Eval(1.5) == std::pow(1.5,-1.2e1));
++   if (!ret) std::cout << "Error in test25 - ff(1.5) != pow " << ff->Eval(1.5) << "  " << std::pow(1.5,-1.2e1) << std::endl;
++   ok &= ret;
+ 
+    ff = new TFormula("ff","1.5e2^x");
+-   ret = ( ff->Eval(2) == std::pow(1.5e2,2) );
+-   if (!ret) std::cout << "Error in test25 - ff(2) != pow " << ff->Eval(2) << "  " <<  std::pow(1.5e2,2) << std::endl; 
+-   ok &= ret; 
++   ret = (ff->Eval(2) == std::pow(1.5e2,2));
++   if (!ret) std::cout << "Error in test25 - ff(2) != pow " << ff->Eval(2) << "  " << std::pow(1.5e2,2) << std::endl;
++   ok &= ret;
+ 
+    ff = new TFormula("ff","1.5e2^x^-1.1e-2");
+-   ret = ( ff->Eval(2.) == std::pow(1.5e2, std::pow(2,-1.1e-2) ) );
+-   if (!ret) std::cout << "Error in test25 - ff(2) != pow^pow " << ff->Eval(2.) << "  " <<  std::pow(1.5e2, std::pow(2,-1.1e-2) ) << std::endl; 
+-   ok &= ret; 
++   ret = (ff->Eval(2.) == std::pow(1.5e2, std::pow(2,-1.1e-2)));
++   if (!ret) std::cout << "Error in test25 - ff(2) != pow^pow " << ff->Eval(2.) << "  " << std::pow(1.5e2, std::pow(2,-1.1e-2)) << std::endl;
++   ok &= ret;
+ 
+    // test same prelacements
+    ff = new TFormula("ff","pol10(3)+pol2");
+    std::vector<double> p = {1,2,3,4,5,6,7,8,9,10,11,12,13,14};
+-   ff->SetParameters(p.data() );
+-   double sum = 0; for (auto &a : p) { sum+= a;} 
+-   ret = ( ff->Eval(1.) == sum );
+-   if (!ret) std::cout << "Error in test25 - ff(1) != sum " << ff->Eval(1.) << "  " <<  sum << std::endl; 
+-   ok &= ret; 
++   ff->SetParameters(p.data());
++   double sum = 0; for (auto &a : p) { sum+= a;}
++   ret = (ff->Eval(1.) == sum);
++   if (!ret) std::cout << "Error in test25 - ff(1) != sum " << ff->Eval(1.) << "  " << sum << std::endl;
++   ok &= ret;
+ 
+-   return ok;   
++   return ok;
+ }
+ 
+ bool test26() {
+    // test sign function
+-   bool ok = true;  
++   bool ok = true;
+    TF1 f("f","x*sign(1.,x+2.)");
+    ok &= (f.Eval(2) == 2);
+    ok &= (f.Eval(-1) == -1);
+@@ -483,104 +470,95 @@ bool test26() {
+ 
+ bool test27() {
+    // test ssq function
+-   bool ok = true;  
++   bool ok = true;
+    TF1 f1("f1","x+sq(x+2)+sq(x+[0])");
+    TF1 f2("f2","x+(x+2)^2+(x+[0])^2");
+    f1.SetParameter(0,3); f2.SetParameter(0,3);
+-   ok &= fpEqual(f1.Eval(2) , f2.Eval(2));
+-   ok &= fpEqual(f1.Eval(-4) , f2.Eval(-4));
++   ok &= fpEqual(f1.Eval(2), f2.Eval(2));
++   ok &= fpEqual(f1.Eval(-4), f2.Eval(-4));
+    // test nested expressions and conflict with sqrt
+    TF1 f3("f3","sqrt(1.+sq(x))");
+-   ok &= fpEqual(f3.Eval(2) , sqrt(5) );
++   ok &= fpEqual(f3.Eval(2), sqrt(5));
+    TF1 f4("f4","sq(1.+std::sqrt(x))");
+-   ok &= fpEqual(f4.Eval(2) , TMath::Sq(1.+sqrt(2)) );
++   ok &= fpEqual(f4.Eval(2), TMath::Sq(1.+sqrt(2)));
+    TF1 f5("f5","sqrt(((TMath::Sign(1,[0])*sq([0]/x))+(sq([1])*(x^([3]-1))))+sq([2]))");
+    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
+    TF1 f6("f6",func,-10,10,4);
+    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
+-   ok &= fpEqual(f5.Eval(2) , f6.Eval(2) );
++   ok &= fpEqual(f5.Eval(2), f6.Eval(2), 4.e-16);
+    return ok;
+ }
+ 
+ bool test28() {
+-   bool ok = true; 
++   bool ok = true;
+    // test composition of two functions
+    TF1 fsin("fsin", "[0]*sin(x)", 0., 10.);
+-   fsin.SetParNames( "sin");
+-   fsin.SetParameter( 0, 2.1);
++   fsin.SetParNames("sin");
++   fsin.SetParameter(0, 2.1);
+ 
+-   TF1  fcos("fcos", "[0]*cos(x)", 0., 10.);
+-   fcos.SetParNames( "cos");
+-   fcos.SetParameter( 0, 1.1);
++   TF1 fcos("fcos", "[0]*cos(x)", 0., 10.);
++   fcos.SetParNames("cos");
++   fcos.SetParameter(0, 1.1);
+ 
+    TF1 fsincos("fsc", "fsin+fcos");
+ 
+    // keep same order in evaluation
+    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
+    f0.SetParameters(1.1,2.1);
+-#ifdef R__B64
+-   bool epsilon = false;
+-#else
+-   bool epsilon = true;
+-#endif
+-   ok &= fpEqual(fsincos.Eval(2) , f0.Eval(2), epsilon);
++   ok &= fpEqual(fsincos.Eval(2), f0.Eval(2), 3e-16);
+    return ok;
+-
+ }
+ 
+ bool test29() {
+-   // test hexadecimal numbers 
+-   bool ok = true; 
++   // test hexadecimal numbers
++   bool ok = true;
+    TF1 f1("f1","x+[0]*0xaf");
+    f1.SetParameter(0,2);
+-   ok &= (f1.Eval(3) == (3.+2*175.) );
++   ok &= (f1.Eval(3) == (3.+2*175.));
+ 
+    TF1 f2("f2","0x64^2+x");
+-   ok &= (f2.Eval(1) == 10001 );
++   ok &= (f2.Eval(1) == 10001);
+ 
+    TF1 f3("f3","x^0x000c+1");
+-   ok &= (f3.Eval(2) == 4097 );
+-
+-   return ok; 
++   ok &= (f3.Eval(2) == 4097);
+ 
++   return ok;
+ }
+ 
+ bool test30() {
+ // handle -- (++ is in linear expressions)
+-   bool ok = true;    
++   bool ok = true;
+    TF1 f1("f1","x--[0]");
+    f1.SetParameter(0,2);
+-   ok &= (f1.Eval(3) == 5. );
+-
+-   return ok; 
++   ok &= (f1.Eval(3) == 5.);
+ 
++   return ok;
+ }
+ 
+ bool test31() {
+ // test whitespaces in par name and cloning
+-   bool ok = true;    
++   bool ok = true;
+    TF1 f1("f1","x*[0]");
+    f1.SetParameter(0,2);
+    f1.SetParName(0,"First Param");
+    auto f2 = (TF1*) f1.Clone();
+-   
+-   ok &= (f1.Eval(3) == f2->Eval(3) );
+-   ok &= (TString(f1.GetParName(0) ) == TString(f2->GetParName(0) ) );
+ 
+-   return ok; 
++   ok &= (f1.Eval(3) == f2->Eval(3));
++   ok &= (TString(f1.GetParName(0)) == TString(f2->GetParName(0)));
+ 
++   return ok;
+ }
+ 
+-bool test32() { 
++bool test32() {
+ // test polynomial are linear and have right number
+-   bool ok = true; 
+-   TF1 f1("f1","pol2"); 
+-   ok &= (f1.GetNumber() == 302); 
+-   ok &= (f1.IsLinear() ); 
+-
+-   TF1 f2("f2","gaus(0)+pol1(3)"); 
+-   ok &= (f2.GetNumber() == 0); 
+-   ok &= (!f2.IsLinear()); 
++   bool ok = true;
++   TF1 f1("f1","pol2");
++   ok &= (f1.GetNumber() == 302);
++   ok &= (f1.IsLinear());
++
++   TF1 f2("f2","gaus(0)+pol1(3)");
++   ok &= (f2.GetNumber() == 0);
++   ok &= (!f2.IsLinear());
+    return ok;
+ }
+ 
+@@ -593,129 +571,128 @@ bool test33() {
+    f1.SetParameters(1,0,1,1,2,0.);
+    TF2 f2("f2","xygaus",-10,10,-10,10);
+    f2.SetParameters(1,0,1,1,2);
+-   ok &= TMath::AreEqualAbs( f1.Eval(0), f2.Eval(0)/(f2.Integral(-10,10,-20,20) ), 1.E-4 );
++   ok &= fpEqual(f1.Eval(0), f2.Eval(0)/(f2.Integral(-10,10,-20,20)), 1.E-4);
+    if (!ok) std::cout << "Error in test33 - " << f1.Eval(0) << "  " << f2.Eval(0)/f2.Integral(-10,10,-10,10) << std::endl;
+-   return ok;          
++   return ok;
+ }
+ 
+ bool test34() {
+    // test for bug 8105
+-   bool ok  = true;
++   bool ok = true;
+    TF1 f1("f1","(1.- gaus)*[3]",-10,10);
+-   f1.SetParameters(1,0,1,3); 
+-   ok &=  TMath::AreEqualAbs( f1.Eval(1), (1.- TMath::Gaus(1,0,1) )*3., 1.E-10);
+-   return ok; 
+-   
++   f1.SetParameters(1,0,1,3);
++   ok &= fpEqual(f1.Eval(1), (1.- TMath::Gaus(1,0,1))*3., 1.E-10);
++   return ok;
+ }
+-bool test35() { 
++
++bool test35() {
+    // test for similar pre-defined functions
+    bool ok = true;
+    TF1 f1("f1","cheb1(0)+cheb10(2)",-1,1);
+    std::vector<double> par(13);
+    par.assign(13,1.); par[1] = 2; par[2] = 3;
+-   TF1 g1("g1",[](double *x, double *p){ return ROOT::Math::ChebyshevN(1, x[0], p ) + ROOT::Math::ChebyshevN(10,x[0],p+2 ); }, -1, 1, 13);
+-   f1.SetParameters(par.data()); 
+-   g1.SetParameters(par.data()); 
++   TF1 g1("g1",[](double *x, double *p){ return ROOT::Math::ChebyshevN(1, x[0], p) + ROOT::Math::ChebyshevN(10,x[0],p+2); }, -1, 1, 13);
++   f1.SetParameters(par.data());
++   g1.SetParameters(par.data());
+ 
+-   ok &=  TMath::AreEqualRel( f1.Eval(2), g1.Eval(2), 1.E-6);
++   ok &= TMath::AreEqualRel(f1.Eval(2), g1.Eval(2), 1.E-6);
+    if (!ok) std::cout << "Error in test35 - f1 != g1 " << f1.Eval(2) << "  " << g1.Eval(2) << std::endl;
+-   
++
+    TF1 f2("f2","cheb10(0)+cheb1(11)",-1,1);
+-   TF1 g2("g2",[](double *x, double *p){ return ROOT::Math::ChebyshevN(10, x[0], p ) + ROOT::Math::ChebyshevN(1,x[0],p+11 ); }, -1, 1, 13);
+-   f2.SetParameters(par.data()); 
+-   g2.SetParameters(par.data()); 
++   TF1 g2("g2",[](double *x, double *p){ return ROOT::Math::ChebyshevN(10, x[0], p) + ROOT::Math::ChebyshevN(1,x[0],p+11); }, -1, 1, 13);
++   f2.SetParameters(par.data());
++   g2.SetParameters(par.data());
+ 
+-   ok &=  TMath::AreEqualRel( f2.Eval(2), g2.Eval(2), 1.E-6);
++   ok &= TMath::AreEqualRel(f2.Eval(2), g2.Eval(2), 1.E-6);
+    if (!ok) std::cout << "Error in test35 - f2 != g2 " << f2.Eval(2.) << "  " << g2.Eval(2.) << std::endl;
+-   
+-   return ok; 
++
++   return ok;
+ }
+-bool test36() { 
++
++bool test36() {
+    // test for mixed dim functions
+    bool ok = true;
+    TF2 f1("f1","xygaus(0) + gaus(5)");
+    f1.SetParameters(1,0,1,1,2,2,-1,1);
+    auto g1 = [](double x, double y){ return TMath::Gaus(x,0,1)*TMath::Gaus(y,1,2)+2.*TMath::Gaus(x,-1,1); };
+-   ok &=  TMath::AreEqualAbs( f1.Eval(1,1), g1(1,1), 1.E-10);
++   ok &= fpEqual(f1.Eval(1,1), g1(1,1), 1.E-10);
+ 
+    TF2 f2("f2","xygaus(0) + gaus[y](5)");
+    f2.SetParameters(1,0,1,1,2,2,-1,1);
+    auto g2 = [](double x, double y){ return TMath::Gaus(x,0,1)*TMath::Gaus(y,1,2)+2.*TMath::Gaus(y,-1,1); };
+-   ok &=  TMath::AreEqualAbs( f2.Eval(1,1), g2(1,1), 1.E-10);
++   ok &= fpEqual(f2.Eval(1,1), g2(1,1), 1.E-10);
+ 
+-   
+-   return ok; 
+-} 
+-   
+-void PrintError(int itest)  { 
++   return ok;
++}
++
++void PrintError(int itest) {
+    Error("TFormula test","test%d FAILED ",itest);
+    failedTests.push_back(itest);
+ }
++
+ void IncrTest(int & itest) {
+    if (itest > 0) std::cout << ".\n";
+    itest++;
+    std::cout << "Test " << itest << " :        ";
+-} 
++}
+ 
+ int runTests(bool debug = false) {
+ 
+    verbose = debug;
+-         
++
+    int itest = 0;
+ 
+-   
+-   IncrTest(itest); if (!test1() ) { PrintError(itest); } 
+-   IncrTest(itest); if (!test2() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test3() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test4() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test5() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test6() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test7() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test8() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test9() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test10() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test11() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test12() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test13() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test14() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test15() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test16() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test17() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test18() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test19() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test20() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test21() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test22() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test23() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test24() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test25() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test26() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test27() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test28() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test29() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test30() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test31() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test32() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test33() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test34() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test35() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test36() ) { PrintError(itest); }
++   IncrTest(itest); if (!test1()) { PrintError(itest); }
++   IncrTest(itest); if (!test2()) { PrintError(itest); }
++   IncrTest(itest); if (!test3()) { PrintError(itest); }
++   IncrTest(itest); if (!test4()) { PrintError(itest); }
++   IncrTest(itest); if (!test5()) { PrintError(itest); }
++   IncrTest(itest); if (!test6()) { PrintError(itest); }
++   IncrTest(itest); if (!test7()) { PrintError(itest); }
++   IncrTest(itest); if (!test8()) { PrintError(itest); }
++   IncrTest(itest); if (!test9()) { PrintError(itest); }
++   IncrTest(itest); if (!test10()) { PrintError(itest); }
++   IncrTest(itest); if (!test11()) { PrintError(itest); }
++   IncrTest(itest); if (!test12()) { PrintError(itest); }
++   IncrTest(itest); if (!test13()) { PrintError(itest); }
++   IncrTest(itest); if (!test14()) { PrintError(itest); }
++   IncrTest(itest); if (!test15()) { PrintError(itest); }
++   IncrTest(itest); if (!test16()) { PrintError(itest); }
++   IncrTest(itest); if (!test17()) { PrintError(itest); }
++   IncrTest(itest); if (!test18()) { PrintError(itest); }
++   IncrTest(itest); if (!test19()) { PrintError(itest); }
++   IncrTest(itest); if (!test20()) { PrintError(itest); }
++   IncrTest(itest); if (!test21()) { PrintError(itest); }
++   IncrTest(itest); if (!test22()) { PrintError(itest); }
++   IncrTest(itest); if (!test23()) { PrintError(itest); }
++   IncrTest(itest); if (!test24()) { PrintError(itest); }
++   IncrTest(itest); if (!test25()) { PrintError(itest); }
++   IncrTest(itest); if (!test26()) { PrintError(itest); }
++   IncrTest(itest); if (!test27()) { PrintError(itest); }
++   IncrTest(itest); if (!test28()) { PrintError(itest); }
++   IncrTest(itest); if (!test29()) { PrintError(itest); }
++   IncrTest(itest); if (!test30()) { PrintError(itest); }
++   IncrTest(itest); if (!test31()) { PrintError(itest); }
++   IncrTest(itest); if (!test32()) { PrintError(itest); }
++   IncrTest(itest); if (!test33()) { PrintError(itest); }
++   IncrTest(itest); if (!test34()) { PrintError(itest); }
++   IncrTest(itest); if (!test35()) { PrintError(itest); }
++   IncrTest(itest); if (!test36()) { PrintError(itest); }
+ 
+    std::cout << ".\n";
+-    
+-   if (failedTests.size() == 0)  
++
++   if (failedTests.size() == 0)
+       std::cout << "All TFormula Parsing tests PASSED !" << std::endl;
+    else {
+-      Error("TFORMULA Tests","%d tests failed ",int(failedTests.size()) );
++      Error("TFORMULA Tests","%d tests failed ",int(failedTests.size()));
+       std::cout << "failed tests are : ";
+-      for (auto & ittest : failedTests) { 
++      for (auto & ittest : failedTests) {
+          std::cout << ittest << "   ";
+       }
+       std::cout << std::endl;
+    }
+-   
+-   return failedTests.size(); 
+-   
++
++   return failedTests.size();
+ }
+ 
+ };
diff --git a/root-tformulatests-typo.patch b/root-tformulatests-typo.patch
new file mode 100644
index 0000000..c1fd12f
--- /dev/null
+++ b/root-tformulatests-typo.patch
@@ -0,0 +1,13 @@
+diff --git a/test/TFormulaTests.cxx b/test/TFormulaTests.cxx
+index fd24825..ca4fd1d 100644
+--- a/test/TFormulaTests.cxx
++++ b/test/TFormulaTests.cxx
+@@ -500,7 +500,7 @@ bool TFormulaTests::Parser() {
+ 
+ int main(int argc, char **argv)
+ {
+-   printf("strting .....\n");
++   printf("starting .....\n");
+ 
+    TApplication theApp("App", &argc, argv);
+    gBenchmark = new TBenchmark();
diff --git a/root-tildes.patch b/root-tildes.patch
deleted file mode 100644
index bb03674..0000000
--- a/root-tildes.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
---- root-6.06.02.orig/core/base/src/TDirectory.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TDirectory.cxx	2016-04-06 10:30:12.110817348 +0200
-@@ -810,7 +810,7 @@
- ///      MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
- /// ~~~
- ///  Note: We recommend using the method TDirectory::GetObject:
--/// ~~~ {.cpp}~
-+/// ~~~ {.cpp}
- ///      MyClass *obj = 0;
- ///      directory->GetObject("some object inheriting from MyClass",obj);
- ///      if (obj) { ... we found what we are looking for ... }
-diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
---- root-6.06.02.orig/core/base/src/TQObject.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TQObject.cxx	2016-04-06 10:30:12.132817525 +0200
-@@ -1040,7 +1040,7 @@
- ///
- ///       TQObject::Connect("TGButton", "Clicked()",
- ///                         "TH2F", myHist, "Draw(Option_t*)");
--///~~~
-+/// ~~~
- /// cl == 0 - corresponds to function (interpereted or global)
- ///           the name of the function is defined by the slot string,
- ///           parameter receiver should be 0.
-diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
---- root-6.06.02.orig/core/base/src/TSystem.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/base/src/TSystem.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -2677,7 +2677,7 @@
- /// We allow them to type:
- /// ~~~ {.cpp}
- ///  .X myfunc.C++(arg1,arg2)
--///  ~~~
-+/// ~~~
- /// or
- /// ~~~ {.cpp}
- ///  .X myfunc.C+(arg1,arg2)
-@@ -3843,7 +3843,7 @@
- /// the use of ';' to separate several instructions. However, shell specific
- /// construct should be avoided. In particular this description can contain
- /// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- /// Five special variables will be expanded before execution:
- ///   Variable name       Expands to
- ///   -------------       ----------
-@@ -3915,7 +3915,7 @@
- /// IncludePath should contain the list of compiler flags to indicate where
- /// to find user defined header files. It is used to expand $IncludePath in
- /// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
--/// ~~~ {.cpp}
-+///  ~~~ {.cpp}
- ///    gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
- ///  ~~~
- /// the default value of IncludePath on Unix is:
-diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
---- root-6.06.02.orig/core/cont/src/TClonesArray.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TClonesArray.cxx	2016-04-06 10:30:12.133817533 +0200
-@@ -663,7 +663,7 @@
- /// Create an array of clone objects of class cl. The class must inherit from
- /// TObject. If the class defines an own operator delete(), make sure that
- /// it looks like this:
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///    void MyClass::operator delete(void *vp)
- ///    {
- ///       if ((Long_t) vp != TObject::GetDtorOnly())
-diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
---- root-6.06.02.orig/core/cont/src/TCollection.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/core/cont/src/TCollection.cxx	2016-04-06 10:30:12.134817541 +0200
-@@ -321,7 +321,7 @@
- /// ~~~
- /// Otherwise override the `Print(Option_t *option, Int_t)`
- /// variant. Remember to declare:
--/// ~~~ {.cpp]
-+/// ~~~ {.cpp}
- ///   using TCollection::Print;
- /// ~~~
- /// somewhere close to the method declaration.
-diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
---- root-6.06.02.orig/documentation/users-guide/MathLibraries.md	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/documentation/users-guide/MathLibraries.md	2016-04-06 10:30:19.094873608 +0200
-@@ -189,7 +189,7 @@
-  int i;
-  i = TMath::LocMin(10, &v[0]);
-  std::cout << v[i] << std::endl;
-- ```
-+```
-  
- Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
- 
-@@ -233,7 +233,7 @@
- 
-  // old-style
-  mean = TMath::Mean(n, &v[0], &w[0]);
-- ```
-+```
-  
- ### Special and Statistical Functions.
- 
-diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
---- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx	2016-04-06 10:30:12.135817549 +0200
-@@ -5964,7 +5964,7 @@
- ///       im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
- ///       TImage *im2 = TImage::Create();
- ///       im2->SetImageBuffer(&buf, TImage::kXpm);
--///  ~~~
-+/// ~~~
- ///      2.  xpm as an array of strings (pre-parsed)
- /// ~~~ {.cpp}
- ///    For example:
-diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -132,7 +132,7 @@
- because we clear only the pads and not the main canvas.
- Note that `c1->Update` must be called at the end of the first picture.
- 
--~~~ {.cpp}
-+ ~~~ {.cpp}
-      {
-         TFile *f1 = new TFile("hsimple.root");
-         TCanvas *c1 = new TCanvas("c1");
-diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
---- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -330,7 +330,7 @@
- ///    | 2-----|-3
- ///    |/      |/
- ///    1-------0
--///~~~
-+/// ~~~
- 
- void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
- {
-diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
---- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx	2016-04-06 10:30:12.136817557 +0200
-@@ -71,7 +71,7 @@
- To change attributes of the rulers attached to the current Pad, one may
- query its pointer first:
- 
--~~~ {.cpp]
-+~~~ {.cpp}
- TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
- if (axis) {
-   TAxis3D::ToggleRulers()     // To pop axes down
-diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
---- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/hist/hist/src/TH2Poly.cxx	2016-04-06 10:30:12.137817565 +0200
-@@ -80,7 +80,7 @@
- many times.
- 
- The following very simple macro shows how to build and fill a `TH2Poly`:
--~~~ {.cpp]
-+~~~ {.cpp}
- {
-     TH2Poly *h2p = new TH2Poly();
- 
-diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
---- root-6.06.02.orig/tree/tree/src/TTree.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/tree/src/TTree.cxx	2016-04-06 10:30:12.138817573 +0200
-@@ -2584,9 +2584,9 @@
- ///     T->Fill(); //loop
- ///     file->Write();
- ///     file->Close();
--///~~~
-+/// ~~~
- /// but do the following:
--///~~~ {.cpp}
-+/// ~~~ {.cpp}
- ///     TFile *file = new TFile("myfile.root","recreate");
- ///     TTree *T = new TTree("T","title");
- ///     T->Fill(); //loop
-@@ -6487,7 +6487,7 @@
- /// ~~~ {.cpp}
- ///     TPrincipal *principal =
- ///     (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
--///  ~~~
-+/// ~~~
- 
- TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
- {
-diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
---- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx	2016-04-06 10:30:12.139817582 +0200
-@@ -3004,6 +3004,7 @@
- /// The function return the status of the fit in the following form
- /// ~~~{.cpp}
- ///     fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
-+/// ~~~
- /// -  The fitResult is 0 is the fit is OK.
- /// -  The fitResult is negative in case of an error not connected with the fit.
- /// -  The number of entries used in the fit can be obtained via
diff --git a/root-tmath-doc.patch b/root-tmath-doc.patch
deleted file mode 100644
index 20209ec..0000000
--- a/root-tmath-doc.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
---- root-6.06.02.orig/math/mathcore/src/TMath.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/mathcore/src/TMath.cxx	2016-03-09 06:21:28.492819438 +0100
-@@ -359,9 +359,9 @@
- /// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
- /// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
- ///
--///  Begin_Latex
--///  P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
--///   End_Latex
-+///  \f[
-+///  P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
-+///  \f]
- ///
- ///
- ///--- Nve 14-nov-1998 UU-SAP Utrecht
-@@ -559,15 +559,16 @@
- /// see TMath::PoissonI to get a non-smooth function.
- /// Note that for large values of par, it is better to call
- ///     TMath::Gaus(x,par,sqrt(par),kTRUE)
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
-+///   poisson->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Poisson(Double_t x, Double_t par)
- {
--/*
--<img src="gif/Poisson.gif">
--*/
--//End_Html
--
-    if (x<0)
-       return 0;
-    else if (x == 0.0)
-@@ -587,15 +588,17 @@
- /// compute the Poisson distribution function for (x,par)
- /// This is a non-smooth function.
- /// This function is equivalent to ROOT::Math::poisson_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///   TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
-+///   poissoni->SetNpx(1000);
-+///   poissoni->Draw("L");
-+/// }
-+/// End_Macro
- 
- Double_t TMath::PoissonI(Double_t x, Double_t par)
- {
--/*
--<img src="gif/PoissonI.gif">
--*/
--//End_Html
--
-    Int_t ix = Int_t(x);
-    return Poisson(ix,par);
- }
-@@ -630,36 +633,33 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculates the Kolmogorov distribution function,
--///Begin_Html
-+/// \f[
-+/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
-+/// \f]
-+/// which gives the probability that Kolmogorov's test statistic will exceed
-+/// the value z assuming the null hypothesis. This gives a very powerful
-+/// test for comparing two one-dimensional distributions.
-+/// see, for example, Eadie et al, "statistocal Methods in Experimental
-+/// Physics', pp 269-270).
-+///
-+/// This function returns the confidence level for the null hypothesis, where:
-+///   z = dn*sqrt(n), and
-+///   dn  is the maximum deviation between a hypothetical distribution
-+///       function and an experimental distribution with
-+///   n   events
-+///
-+/// NOTE: To compare two experimental distributions with m and n events,
-+///       use z = sqrt(m*n/(m+n))*dn
-+///
-+/// Accuracy: The function is far too accurate for any imaginable application.
-+///           Probabilities less than 10^-15 are returned as zero.
-+///           However, remember that the formula is only valid for "large" n.
-+/// Theta function inversion formula is used for z <= 1
-+///
-+/// This function was translated by Rene Brun from PROBKL in CERNLIB.
- 
- Double_t TMath::KolmogorovProb(Double_t z)
- {
--   /*
--   <img src="gif/kolmogorov.gif">
--   */
--   //End_Html
--   // which gives the probability that Kolmogorov's test statistic will exceed
--   // the value z assuming the null hypothesis. This gives a very powerful
--   // test for comparing two one-dimensional distributions.
--   // see, for example, Eadie et al, "statistocal Methods in Experimental
--   // Physics', pp 269-270).
--   //
--   // This function returns the confidence level for the null hypothesis, where:
--   //   z = dn*sqrt(n), and
--   //   dn  is the maximum deviation between a hypothetical distribution
--   //       function and an experimental distribution with
--   //   n    events
--   //
--   // NOTE: To compare two experimental distributions with m and n events,
--   //       use z = sqrt(m*n/(m+n))*dn
--   //
--   // Accuracy: The function is far too accurate for any imaginable application.
--   //           Probabilities less than 10^-15 are returned as zero.
--   //           However, remember that the formula is only valid for "large" n.
--   // Theta function inversion formula is used for z <= 1
--   //
--   // This function was translated by Rene Brun from PROBKL in CERNLIB.
--
-    Double_t fj[4] = {-2,-8,-18,-32}, r[4];
-    const Double_t w = 2.50662827;
-    // c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
-@@ -2254,15 +2254,40 @@
- /// The definition can be found in "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
- /// use now implementation in ROOT::Math::gamma_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
-+///
-+///   gdist->SetParameters(0.5, 0., 1.);
-+///   gdist->SetLineColor(2);
-+///   TF1 *gdist1 = gdist->DrawCopy("L");
-+///   gdist->SetParameters(1.0, 0., 1.);
-+///   gdist->SetLineColor(3);
-+///   TF1 *gdist2 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(2.0, 0., 1.);
-+///   gdist->SetLineColor(4);
-+///   TF1 *gdist3 = gdist->DrawCopy("LSAME");
-+///   gdist->SetParameters(5.0, 0., 1.);
-+///   gdist->SetLineColor(6);
-+///   TF1 *gdist4 = gdist->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
-+///   legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
- {
--   /*
--   <img src="gif/gammadist.gif">
--   */
--   //End_Html
--
-    if ((x<mu) || (gamma<=0) || (beta <=0)) {
-       Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
-       return 0;
-@@ -2308,21 +2333,47 @@
- ////////////////////////////////////////////////////////////////////////////////
- /// Computes the density of LogNormal distribution at point x.
- /// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
--/// sigma is the shape parameter
--/// theta is the location parameter
--/// m is the scale parameter
-+/// - sigma is the shape parameter
-+/// - theta is the location parameter
-+/// - m is the scale parameter
- /// The formula was taken from "Engineering Statistics Handbook" on site
- /// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
- /// Implementation using ROOT::Math::lognormal_pdf
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetLogy();
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
-+///   logn->SetMinimum(1e-3);
-+///
-+///   logn->SetParameters(0.5, 0., 1.);
-+///   logn->SetLineColor(2);
-+///   TF1 *logn1 = logn->DrawCopy("L");
-+///   logn->SetParameters(1.0, 0., 1.);
-+///   logn->SetLineColor(3);
-+///   TF1 *logn2 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(2.0, 0., 1.);
-+///   logn->SetLineColor(4);
-+///   TF1 *logn3 = logn->DrawCopy("LSAME");
-+///   logn->SetParameters(5.0, 0., 1.);
-+///   logn->SetLineColor(6);
-+///   TF1 *logn4 = logn->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.15, 0.15, 0.5, 0.35);
-+///   legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
-+///   legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
- {
--   /*
--   <img src="gif/lognormal.gif">
--   */
--   //End_Html
--
-    if ((x<theta) || (sigma<=0) || (m<=0)) {
-       Error("TMath::Lognormal", "illegal parameter values");
-       return 0;
-@@ -2615,15 +2666,39 @@
- ///density function computed numerically in an accurate way: our approximation
- ///shows a difference of less than 3% around the peak of the density function, slowly
- ///increasing going towards the extreme tails to the right and to the left"
--///Begin_Html
-+/// Begin_Macro
-+/// {
-+///   TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
-+///
-+///   c1->SetGridx();
-+///   c1->SetGridy();
-+///
-+///   TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
-+///
-+///   vavilov->SetParameters(0.5, 0.);
-+///   vavilov->SetLineColor(2);
-+///   TF1 *vavilov1 = vavilov->DrawCopy("L");
-+///   vavilov->SetParameters(0.3, 0.);
-+///   vavilov->SetLineColor(3);
-+///   TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.2, 0.);
-+///   vavilov->SetLineColor(4);
-+///   TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
-+///   vavilov->SetParameters(0.1, 0.);
-+///   vavilov->SetLineColor(6);
-+///   TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
-+///
-+///   legend = new TLegend(0.5, 0.65, 0.85, 0.85);
-+///   legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
-+///   legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
-+///   legend->Draw();
-+/// }
-+/// End_Macro
- 
- Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
- {
--/*
--<img src="gif/Vavilov.gif">
--*/
--//End_Html
--
-    Double_t *ac = new Double_t[14];
-    Double_t *hc = new Double_t[9];
- 
diff --git a/root-tprincipal-doc.patch b/root-tprincipal-doc.patch
deleted file mode 100644
index 95090d6..0000000
--- a/root-tprincipal-doc.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
-index 76bb5d4..d5bab47 100644
---- a/hist/hist/src/TPrincipal.cxx
-+++ b/hist/hist/src/TPrincipal.cxx
-@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
- error \f$E_N\f$ is minimized.
- 
- The transformation matrix to go from the pattern space to the feature
--space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$ 
-+space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
- \f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
- \f[
-   \mathsf{T} = \left[
-@@ -207,10 +207,6 @@ in the transformed space.
- Christian Holm August 2000, CERN
- */
- 
--// $Id$
--// $Date: 2006/05/24 14:55:26 $
--// $Author: brun $
--
- #include "TPrincipal.h"
- 
- #include "TVectorD.h"
-@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
- ClassImp(TPrincipal);
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Empty CTOR, Do not use.
-+/// Empty constructor. Do not use.
- 
- TPrincipal::TPrincipal()
-   : fMeanValues(0),
-@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Ctor. Argument is number of variables in the sample of data
-+/// Constructor. Argument is number of variables in the sample of data
- /// Options are:
--///   N       Normalize the covariance matrix (default)
--///   D       Store input data (default)
-+///  - N       Normalize the covariance matrix (default)
-+///  - D       Store input data (default)
- ///
- /// The created object is  named "principal" by default.
- 
-@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///copy constructor
-+/// Copy constructor.
- 
- TPrincipal::TPrincipal(const TPrincipal& pr) :
-   TNamed(pr),
-@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--///assignement operator
-+/// Assignment operator.
- 
- TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- {
-@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// destructor
-+/// Destructor.
- 
- TPrincipal::~TPrincipal()
- {
-@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Begin_Html
-+/// Add a data point and update the covariance matrix. The input
-+/// array must be <TT>fNumberOfVariables</TT> long.
-+///
-+///
-+/// The Covariance matrix and mean values of the input data is calculated
-+/// on the fly by the following equations:
-+///
-+/// \f[
-+/// \left<x_i\right>^{(0)}  = x_{i0}
-+/// \f]
-+///
-+///
-+/// \f[
-+/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
-+/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
-+/// \f]
-+///
-+/// \f[
-+/// C_{ij}^{(0)} = 0
-+/// \f]
-+///
-+///
-+///
-+/// \f[
-+/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
-+/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
-+///   \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
-+/// - \frac1n C_{ij}^{(n-1)}
-+/// \f]
-+///
-+/// since this is a really fast method, with no rounding errors (please
-+/// refer to CERN 72-21 pp. 54-106).
-+///
-+///
-+/// The data is stored internally in a <TT>TVectorD</TT>, in the following
-+/// way:
-+///
-+/// \f[
-+/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
-+///     \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
-+/// \f]
-+///
-+/// With \f$P\f$ as defined in the class description.
- 
- void TPrincipal::AddRow(const Double_t *p)
- {
--  /*
--     </PRE>
--Add a data point and update the covariance matrix. The input
--array must be <TT>fNumberOfVariables</TT> long.
--
--<P>
--The Covariance matrix and mean values of the input data is caculated
--on the fly by the following equations:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(0)}  = x_{i0}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="90" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img36.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(0)} = x_{i0}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
--+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="302" HEIGHT="42" BORDER="0"
-- SRC="gif/principal_img37.gif"
-- ALT="\begin{displaymath}
--\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
--+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="62" HEIGHT="34" BORDER="0"
-- SRC="gif/principal_img38.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(0)} = 0
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
--  \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="504" HEIGHT="43" BORDER="0"
-- SRC="gif/principal_img39.gif"
-- ALT="\begin{displaymath}
--C_{ij}^{(n)} = C_{ij}^{(n-1)}
--+ \frac1{n-1}\left[\left(x_{i...
--...\left&lt;x_j\right&gt;^{(n)}\right)\right]
--- \frac1n C_{ij}^{(n-1)}
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--since this is a really fast method, with no rounding errors (please
--refer to CERN 72-21 pp. 54-106).
--
--<P>
--The data is stored internally in a <TT>TVectorD</TT>, in the following
--way:
--<BR><P></P>
--<DIV ALIGN="CENTER">
--
--<!-- MATH
-- \begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--    \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}
-- -->
--
--
--<IMG
-- WIDTH="319" HEIGHT="31" BORDER="0"
-- SRC="gif/principal_img40.gif"
-- ALT="\begin{displaymath}
--\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
--\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
--\end{displaymath}">
--</DIV>
--<BR CLEAR="ALL">
--<P></P>
--With <IMG
-- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
-- SRC="gif/principal_img6.gif"
-- ALT="$P$"> as defined in the class description.
--     <PRE>
--  */
--  // End_Html
-    if (!p)
-       return;
- 
-@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Generates the file <filename>, with .C appended if it does
-+/// Generates the file `<filename>`, with `.C` appended if it does
- /// argument doesn't end in .cxx or .C.
- ///
- /// The file contains the implementation of two functions
--///
-+/// ~~~ {.cpp}
- ///    void X2P(Double_t *x, Double *p)
- ///    void P2X(Double_t *p, Double *x, Int_t nTest)
--///
--/// which does the same as  TPrincipal::X2P and TPrincipal::P2X
-+/// ~~~
-+/// which does the same as  `TPrincipal::X2P` and `TPrincipal::P2X`
- /// respectively. Please refer to these methods.
- ///
- /// Further, the static variables:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    gNVariables
- ///    Double_t gEigenValues[]
- ///    Double_t gEigenVectors[]
- ///    Double_t gMeanValues[]
- ///    Double_t gSigmaValues[]
--///
-+/// ~~~
- /// are initialized. The only ROOT header file needed is Rtypes.h
- ///
- /// See TPrincipal::MakeRealCode for a list of options
-@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Make histograms of the result of the analysis.
- /// The option string say which histograms to create
--///      X         Histogram original data
--///      P         Histogram principal components corresponding to
--///                original data
--///      D         Histogram the difference between the original data
--///                and the projection of principal unto a lower
--///                dimensional subspace (2D histograms)
--///      E         Histogram the eigenvalues
--///      S         Histogram the square of the residues
--///                (see TPrincipal::SumOfSquareResidues)
--/// The histograms will be named <name>_<type><number>, where <name>
--/// is the first argument, <type> is one of X,P,D,E,S, and <number>
-+///     - X         Histogram original data
-+///     - P         Histogram principal components corresponding to
-+///                 original data
-+///     - D         Histogram the difference between the original data
-+///                 and the projection of principal unto a lower
-+///                 dimensional subspace (2D histograms)
-+///     - E         Histogram the eigenvalues
-+///     - S         Histogram the square of the residues
-+///                 (see `TPrincipal::SumOfSquareResiduals`)
-+/// The histograms will be named `<name>_<type><number>`, where `<name>`
-+/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
- /// is the variable.
- 
- void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
-@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD: Normalize the covariance matrix
-+/// Normalize the covariance matrix
- 
- void TPrincipal::MakeNormalised()
- {
-@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
- ////////////////////////////////////////////////////////////////////////////////
- /// Generate the file <classname>PCA.cxx which contains the
- /// implementation of two methods:
--///
-+/// ~~~ {.cpp}
- ///    void <classname>::X2P(Double_t *x, Double *p)
- ///    void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
--///
-+/// ~~~
- /// which does the same as  TPrincipal::X2P and TPrincipal::P2X
--/// respectivly. Please refer to these methods.
-+/// respectively. Please refer to these methods.
- ///
- /// Further, the public static members:
--///
-+/// ~~~ {.cpp}
- ///    Int_t    <classname>::fgNVariables
- ///    Double_t <classname>::fgEigenValues[]
- ///    Double_t <classname>::fgEigenVectors[]
- ///    Double_t <classname>::fgMeanValues[]
- ///    Double_t <classname>::fgSigmaValues[]
--///
-+/// ~~~
- /// are initialized, and assumed to exist. The class declaration is
- /// assumed to be in <classname>.h and assumed to be provided by the
- /// user.
-@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
- /// See TPrincipal::MakeRealCode for a list of options
- ///
- /// The minimal class definition is:
--///
-+/// ~~~ {.cpp}
- ///   class <classname> {
- ///   public:
- ///     static Int_t    fgNVariables;
-@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
- ///     void X2P(Double_t *x, Double_t *p);
- ///     void P2X(Double_t *p, Double_t *x, Int_t nTest);
- ///   };
--///
-+/// ~~~
- /// Whether the methods <classname>::X2P and <classname>::P2X should
- /// be static or not, is up to the user.
- 
-@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
- ////////////////////////////////////////////////////////////////////////////////
- /// Perform the principal components analysis.
- /// This is done in several stages in the TMatrix::EigenVectors method:
--/// * Transform the covariance matrix into a tridiagonal matrix.
--/// * Find the eigenvalues and vectors of the tridiagonal matrix.
-+///  - Transform the covariance matrix into a tridiagonal matrix.
-+///  - Find the eigenvalues and vectors of the tridiagonal matrix.
- 
- void TPrincipal::MakePrincipals()
- {
-@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
- /// This is the method that actually generates the code for the
- /// transformations to and from feature space and pattern space
- /// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
-@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
- ////////////////////////////////////////////////////////////////////////////////
- /// Print the statistics
- /// Options are
--///      M            Print mean values of original data
--///      S            Print sigma values of original data
--///      E            Print eigenvalues of covariance matrix
--///      V            Print eigenvectors of covariance matrix
-+///  - M            Print mean values of original data
-+///  - S            Print sigma values of original data
-+///  - E            Print eigenvalues of covariance matrix
-+///  - V            Print eigenvectors of covariance matrix
- /// Default is MSE
- 
- void TPrincipal::Print(Option_t *opt) const
-@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// PRIVATE METHOD:
--/// Begin_html
-+/// Calculates the sum of the square residuals, that is
-+///
-+/// \f[
-+/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
-+/// \f]
-+///
-+/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
-+/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
-+/// \f$x_i\f$, the original data; I.e., the square distance to the space
-+/// spanned by \f$N\f$ eigenvectors.
- 
- void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
- {
--   /*
--    </PRE>
--    Calculates the sum of the square residuals, that is
--    <BR><P></P>
--    <DIV ALIGN="CENTER">
--
--    <!-- MATH
--    \begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}
--    -->
--
--
--    <IMG
--    WIDTH="147" HEIGHT="58" BORDER="0"
--    SRC="gif/principal_img52.gif"
--    ALT="\begin{displaymath}
--    E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
--    \end{displaymath}">
--    </DIV>
--    <BR CLEAR="ALL">
--    <P></P>
--    where
--    <!-- MATH
--    $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
--    -->
--    <IMG
--    WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img53.gif"
--    ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
--    WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img54.gif"
--    ALT="$p_i$"> is the
--    <IMG
--    WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img55.gif"
--    ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
--    <IMG
--    WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
--    SRC="gif/principal_img56.gif"
--    ALT="$x_i$">, the original data; I.e., the square distance to the space
--    spanned by <IMG
--    WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
--    SRC="gif/principal_img12.gif"
--    ALT="$N$"> eigenvectors.
--    <BR>
--    <PRE>
--   */
--   // End_Html
-+
-    if (!x)
-       return;
- 
-@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
- ////////////////////////////////////////////////////////////////////////////////
- /// Calculate the principal components from the original data vector
- /// x, and return it in p.
-+///
- /// It's the users responsibility to make sure that both x and p are
- /// of the right size (i.e., memory must be allocated for p).
- 
diff --git a/root-tvector2-comment.patch b/root-tvector2-comment.patch
deleted file mode 100644
index 4a4177b..0000000
--- a/root-tvector2-comment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
---- root-6.06.02.orig/math/physics/inc/TVector2.h	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/physics/inc/TVector2.h	2016-03-06 19:07:23.115476536 +0100
-@@ -96,7 +96,8 @@
-    TVector2 Rotate (Double_t phi) const;
- 
-                                         // returns phi angle in the interval [0,2*PI)
--   static Double_t Phi_0_2pi(Double_t x);                                                                               // returns phi angle in the interval
-+   static Double_t Phi_0_2pi(Double_t x);
-+
-                                         // returns phi angle in the interval [-PI,PI)
-    static Double_t Phi_mpi_pi(Double_t x);
- 
diff --git a/root-type1-embed.patch b/root-type1-embed.patch
deleted file mode 100644
index f4f3681..0000000
--- a/root-type1-embed.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
---- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx	2016-03-20 14:52:11.268005800 +0100
-@@ -30,14 +30,14 @@
- #ifndef LITTLE_ENDIAN
- #define LITTLE_ENDIAN 1
- #endif // LITTLE_ENDIAN
--#include "Byteswap.h"
--#define bswap_16(x)   Rbswap_16((x))
--#define bswap_32(x)   Rbswap_32((x))
- #else // R__BYTESWAP
- #ifdef LITTLE_ENDIAN
- #undef LITTLE_ENDIAN
- #endif // LITTLE_ENDIAN
- #endif // R__BYTESWAP
-+#include "Byteswap.h"
-+#define bswap_16(x)   Rbswap_16((x))
-+#define bswap_32(x)   Rbswap_32((x))
- 
- // References:
- //
-@@ -236,29 +236,26 @@
-       if(magic_number[0] == '\200') {
-          // IBM PC format printer font binary
- 
--         // FIXME: Maybe the real name can be parsed out of the
--         // file
--         font_name = "";
--
-          struct pfb_segment_header_s segment_header;
-          size_t offset = 0;
- 
--         segment_header.type = 0;
-+         // The two char elements of struct
-+         // pfb_segment_header_s are most likely aligned to
-+         // larger than 1 byte boundaries, so copy all the
-+         // elements individually
-+         segment_header.always_128 = font_data[offset];
-+         segment_header.type = font_data[offset + 1];
-+
-          while (segment_header.type != TYPE_EOF) {
--            // The two char elements of struct
--            // pfb_segment_header_s are most likely aligned to
--            // larger than 1 byte boundaries, so copy all the
--            // elements individually
--            segment_header.always_128 = font_data[offset];
--            segment_header.type = font_data[offset + 1];
-             memcpy(&segment_header.length, &font_data[offset + 2],
-                    sizeof(unsigned int));
-             offset += sizeof(unsigned int) + 2;
--#ifdef LITTLE_ENDIAN
-+#ifndef LITTLE_ENDIAN
-             segment_header.length =
-             bswap_32(segment_header.length);
- #endif // LITTLE_ENDIAN
-             char *buffer = new char[segment_header.length];
-+            char *fname;
- 
-             memcpy(buffer, &font_data[offset],
-                    segment_header.length);
-@@ -278,6 +275,26 @@
-                      buffer[segment_header.length - 1] = '\n';
-                   }
-                   ret.append(buffer, segment_header.length);
-+
-+                  fname = (char*)memmem(buffer, segment_header.length,
-+                                        "/FontName", 9);
-+                  if (fname) {
-+                     fname += 9;
-+                     while (fname < buffer + segment_header.length &&
-+                            isspace(*fname)) {
-+                        fname++;
-+                     }
-+                     if (fname < buffer + segment_header.length &&
-+                         *fname == '/') {
-+                        fname++;
-+                     }
-+                     int len = 0;
-+                     while (fname + len < buffer + segment_header.length &&
-+                            isgraph(*(fname + len))) {
-+                        len++;
-+                     }
-+                     font_name.assign(fname, len);
-+                  }
-                   break;
-                case TYPE_BINARY:
-                   append_asciihex(
-@@ -289,6 +306,9 @@
-             }
- 
-             delete [] buffer;
-+
-+            segment_header.always_128 = font_data[offset];
-+            segment_header.type = font_data[offset + 1];
-          }
- 
-          return ret;
diff --git a/root-unuran.patch b/root-unuran.patch
deleted file mode 100644
index 0e78176..0000000
--- a/root-unuran.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
---- root-6.06.02.orig/cmake/modules/FindUnuran.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ root-6.06.02/cmake/modules/FindUnuran.cmake	2016-03-20 17:53:02.393804958 +0100
-@@ -0,0 +1,21 @@
-+# - Locate Unuran library
-+# Defines:
-+#
-+#  UNURAN_FOUND
-+#  UNURAN_INCLUDE_DIR
-+#  UNURAN_INCLUDE_DIRS (not cached)
-+#  UNURAN_LIBRARIES
-+
-+find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
-+find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
-+
-+set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
-+set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
-+
-+
-+# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
-+
-+mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
-diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
---- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake	2016-03-20 14:37:23.656597032 +0100
-+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake	2016-03-20 17:54:50.896874682 +0100
-@@ -73,6 +73,7 @@
- ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
- ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
- ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-+ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
- ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
- ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
- ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
-diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -142,6 +142,11 @@
- set(zliblib ${ZLIB_LIBRARY})
- set(zlibincdir ${ZLIB_INCLUDE_DIR})
- 
-+set(builtinunuran ${value${builtin_unuran}})
-+set(unuranlibdir ${UNURAN_LIBRARY_DIR})
-+set(unuranlib ${UNURAN_LIBRARY})
-+set(unuranincdir ${UNURAN_INCLUDE_DIR})
-+
- set(buildgl ${value${opengl}})
- set(opengllibdir ${OPENGL_LIBRARY_DIR})
- set(openglulib ${OPENGL_glu_LIBRARY})
-diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:08:52.186461662 +0100
-+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake	2016-03-20 17:53:02.394804968 +0100
-@@ -40,6 +40,16 @@
-   endif()
- endif()
- 
-+#---Check for Unuran ------------------------------------------------------------------
-+if(NOT builtin_unuran)
-+  message(STATUS "Looking for Unuran")
-+  find_Package(Unuran)
-+  if(NOT UNURAN_FOUND)
-+    message(STATUS "Unuran not found. Switching on builtin_unuran option")
-+    set(builtin_unuran ON CACHE BOOL "" FORCE)
-+  endif()
-+endif()
-+
- #---Check for Freetype---------------------------------------------------------------
- if(NOT builtin_freetype)
-   message(STATUS "Looking for Freetype")
-diff -Nur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 17:53:02.468805698 +0100
-@@ -121,6 +121,11 @@
- 
- BUILTINPCRE    := @builtinpcre@
- 
-+BUILTINUNURAN  := @builtinunuran@
-+UNURANLIBDIR   := @unuranlibdir@
-+UNURANLIB      := @unuranlib@
-+UNURANINCDIR   := $(filter-out /usr/include, @unuranincdir@)
-+
- BUILTINZLIB    := @builtinzlib@
- ZLIBLIBDIR     := @zliblibdir@
- ZLIBCLILIB     := @zliblib@
-diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 16:48:49.767492974 +0100
-+++ root-6.06.02/configure	2016-03-20 17:53:02.513806142 +0100
-@@ -55,6 +55,7 @@
-    enable_builtin_freetype   \
-    enable_builtin_glew       \
-    enable_builtin_pcre       \
-+   enable_builtin_unuran     \
-    enable_builtin_zlib       \
-    enable_builtin_lzma       \
-    enable_builtin_llvm       \
-@@ -183,6 +184,7 @@
- enable_builtin_ftgl=no
- enable_builtin_glew=no
- enable_builtin_pcre=no
-+enable_builtin_unuran=no
- enable_builtin_zlib=no
- enable_builtin_lzma=no
- enable_builtin_llvm=yes
-@@ -1704,6 +1706,7 @@
-   builtin-freetype   Build included libfreetype, or use system libfreetype
-   builtin-glew       Build included libGLEW, or use system libGLEW
-   builtin-pcre       Build included libpcre, or use system libpcre
-+  builtin-unuran     Build included libunuran, or use system libunuran
-   builtin-zlib       Build included libz, or use system libz
-   builtin-lzma       Build included liblzma, or use system liblzma
-   libcxx             Build using libc++, required by clang option (MacOS X only, for the time being)
-@@ -2046,6 +2049,7 @@
-    enable_builtin_ftgl="yes"
-    enable_builtin_glew="yes"
-    enable_builtin_pcre="yes"
-+   enable_builtin_unuran="yes"
-    enable_builtin_zlib="yes"
-    enable_builtin_lzma="yes"
-    top_builddir=`cygpath -u $top_builddir`
-@@ -3210,6 +3214,38 @@
- 
- ######################################################################
- #
-+### echo %%% libunuran (builtin or system)
-+#
-+if test "x$enable_builtin_unuran" = "xno" ; then
-+    check_header "unuran.h" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
-+    if test "x$found_dir" = "x" ; then
-+        enable_builtin_unuran=yes
-+    else
-+        unuraninc=$found_hdr
-+        unuranincdir=$found_dir
-+    fi
-+
-+    check_library "libunuran" "$enable_shared" "" \
-+        $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
-+    if test "x$found_lib" = "x" ; then
-+        unuranlib=""
-+        unuranlibdir=""
-+        enable_builtin_unuran="yes"
-+    else
-+        unuranlib="$found_lib"
-+        unuranlibdir="$found_dir"
-+    fi
-+
-+    if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
-+        enable_builtin_unuran="yes"
-+    fi
-+fi
-+message "Checking whether to build included unuran"
-+result "$enable_builtin_unuran"
-+
-+######################################################################
-+#
- ### echo %%% Use included zLib or use systems
- #
- if test "x$enable_builtin_zlib" = "xno" ; then
-@@ -7720,6 +7756,10 @@
-     -e "s|@top_srcdir@|$top_srcdir|"            \
-     -e "s|@ttffontdir@|$fontdir|"               \
-     -e "s|@tutdir@|$tutdir|"                    \
-+    -e "s|@builtinunuran@|$enable_builtin_unuran|" \
-+    -e "s|@unuranincdir@|$unuranincdir|"        \
-+    -e "s|@unuranlib@|$unuranlib|"              \
-+    -e "s|@unuranlibdir@|$unuranlibdir|"        \
-     -e "s|@winrtdebug@|$enable_winrtdebug|"     \
-     -e "s|@xmlincdir@|$xmlincdir|"              \
-     -e "s|@xmllib@|$xmllib|"                    \
-diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
---- root-6.06.02.orig/math/unuran/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/CMakeLists.txt	2016-03-20 17:53:02.552806526 +0100
-@@ -3,6 +3,9 @@
- ############################################################################
- 
- #---Define package related variables-----------------------------------------------------------------
-+
-+if(builtin_unuran)
-+
- set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
- set(UNR_VERSION "1.8.0-root")
- set(UNR_TARNAME "unuran-${UNR_VERSION}")
-@@ -62,8 +65,17 @@
-                ${UNR_UNTARDIR}/src/tests/*.c
-                ${UNR_UNTARDIR}/src/uniform/*.c
-                ${UNR_UNTARDIR}/src/urng/*.c )
-+set(unrconfig ${UNR_UNTARDIR}/config.h)
-+
-+else()
-+
-+include_directories(${UNURAN_INCLUDE_DIRS})
-+set(unrsources)
-+set(unrconfig)
-+
-+endif()
- 
- ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
- 
--ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h  LIBRARIES Core DEPENDENCIES Hist MathCore)
-+ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
---- root-6.06.02.orig/math/unuran/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/math/unuran/Module.mk	2016-03-20 17:53:02.553806536 +0100
-@@ -12,6 +12,8 @@
- UNURANDIRS   := $(UNURANDIR)/src
- UNURANDIRI   := $(UNURANDIR)/inc
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- UNRVERS      := unuran-1.8.0-root
- 
- UNRSRCS      := $(MODDIRS)/$(UNRVERS).tar.gz
-@@ -43,15 +45,18 @@
-                 $(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
- endif
--UNRO         := $(UNRS:.c=.o)
-+UNRFLAGS     := -I$(UNRDIRS)/src
- 
--ifeq ($(PLATFORM),win32)
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.lib
- else
--UNRLIBS      := $(UNRDIRS)/src/.libs/libunuran.a
-+
-+UNURANETAG   :=
-+UNRCFG       :=
-+UNRS         :=
-+UNRFLAGS     := $(UNURANINCDIR:%=-I%)
-+
- endif
- 
--UNRFLAGS     :=  -I$(UNRDIRS)/src
-+UNRO         := $(UNRS:.c=.o)
- 
- ##### libUnuran #####
- UNURANL      := $(MODDIRI)/LinkDef.h
-@@ -84,6 +89,8 @@
- include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
- 		cp $< $@
- 
-+ifeq ($(BUILTINUNURAN),yes)
-+
- $(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
-@@ -134,12 +141,14 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
-+endif
-+
- $(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
- 
- $(call pcmrule,UNURAN)
- 	$(noop)
-@@ -158,16 +167,19 @@
- 
- clean-$(MODNAME):
- 		@rm -f $(UNURANO) $(UNURANDO)
-+ifeq ($(BUILTINUNURAN),yes)
- 		-@(if [ -d $(UNRDIRS) ]; then \
- 			cd $(UNRDIRS); \
- 			$(MAKE) clean; \
- 		fi)
-+endif
- 
- clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
- 		   $(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
-+ifeq ($(BUILTINUNURAN),yes)
- 		@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
- ifeq ($(UNURKEEP),yes)
- 		@mv $(UNRDIRS) $(UNRDIRS).keep
-@@ -177,6 +189,7 @@
- 		@mv $(UNRDIRS).keep $(UNRDIRS)
- endif
- 		@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
-+endif
- 
- distclean::     distclean-$(MODNAME)
- 
-@@ -184,6 +197,7 @@
- 
- $(UNURANO): CXXFLAGS += $(UNRFLAGS)
- 
-+ifeq ($(BUILTINUNURAN),yes)
- ifeq ($(PLATFORM),win32)
- $(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
- else
-@@ -194,3 +208,4 @@
- ifeq ($(CC),icc)
- $(UNRO): CFLAGS += -mp
- endif
-+endif
diff --git a/root-werror.patch b/root-werror.patch
deleted file mode 100644
index 06e49f1..0000000
--- a/root-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
---- root-6.06.02.orig/interpreter/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/interpreter/CMakeLists.txt	2016-03-20 17:33:36.288203832 +0100
-@@ -40,7 +40,7 @@
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
- 
- #---Do not transform warnings in errors-------------------------------------------------------------
--string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- 
- #---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
- ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)
diff --git a/root.spec b/root.spec
index 7df4381..7991372 100644
--- a/root.spec
+++ b/root.spec
@@ -7,16 +7,13 @@
 %global pythia8 1
 %global xrootd 1
 
-%if %{?fedora}%{!?fedora:0} >= 20
-# libhdfs is currently only available on intel architectures in Fedora
-%ifarch %{ix86} x86_64
+%if %{?fedora}%{!?fedora:0} >= 24
+# libhdfs is available for all architectures for Fedora 24 and later.
+# For Fedora 20-23 it was only available on Intel (ix86 and x86_64).
 %global hadoop 1
 %else
 %global hadoop 0
 %endif
-%else
-%global hadoop 0
-%endif
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -24,9 +21,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.06.08
+Version:	6.08.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -35,7 +32,7 @@ URL:		https://root.cern.ch/
 #		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
 #		tar -z -x -f root_v%{version}.source.tar.gz
 #		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
-#		tar -J -c -f root-%{version}.tar.xz root-%{version}
+#		tar -J -c --group root --owner root -f root-%{version}.tar.xz root-%{version}
 Source0:	%{name}-%{version}.tar.xz
 #		Input data for the tests
 Source1:	%{name}-testfiles.tar.xz
@@ -44,108 +41,54 @@ Source2:	%{name}-testfiles.sh
 #		systemd unit files
 Source3:	rootd.service
 Source4:	proofd.service
-#		Adapt to gcc's ABI tags
-#		https://github.com/root-mirror/root/pull/124
-Patch0:		%{name}-abitags.patch
 #		Allow running tests
 #		https://github.com/root-mirror/root/pull/130
-Patch1:		%{name}-test-install.patch
+Patch0:		%{name}-test-install.patch
 #		Use system fonts
-Patch2:		%{name}-fontconfig.patch
-#		Fix segfault when embedding Type 1 fonts
-#		https://github.com/root-mirror/root/pull/90
-Patch3:		%{name}-type1-embed.patch
+Patch1:		%{name}-fontconfig.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
-Patch4:		%{name}-dont-link-jvm.patch
-#		Remove gcc ABI check
-#		with the abitags patch above it is not needed
-Patch5:		%{name}-no-abi-check.patch
-#		Public header #includes private header
-#		https://github.com/root-mirror/root/pull/88
-Patch6:		%{name}-private-public.patch
-#		Fix problems with the cmake configuration
-Patch7:		%{name}-broken-cmake-config.patch
-#		Missing stuff in the cmake configuration
-Patch8:		%{name}-missing-cmake-config.patch
-#		Fix broken deprecation check (configure)
-Patch9:		%{name}-deprecated-options.patch
-#		Only link to libgfortranbegin.a if it exists (configure)
-Patch10:	%{name}-libgfortranbegin.patch
-#		Make sure the removal of -Werror doesn't do more than intended
-Patch11:	%{name}-werror.patch
-#		Properly remove -Wall (must also remove Werror=*)
-Patch12:	%{name}-compiledata.patch
-#		Don't overwrite FFLAGS
-Patch13:	%{name}-fflags.patch
-#		Use system unuran
-Patch14:	%{name}-unuran.patch
-#		Use systme gl2ps
-Patch15:	%{name}-gl2ps.patch
-#		More CMAKE_Fortran_FLAGS case issues
-Patch16:	%{name}-more-fflags.patch
-#		Use the same soname for cmake and configure
-Patch17:	%{name}-soname.patch
-#		Save memory during build
-Patch18:	%{name}-save-memory.patch
-#		Fix build configuration for ppc64/ppc64le
-Patch19:	%{name}-ppc64.patch
-#		Fix build configuration for ARM
-Patch20:	%{name}-arm.patch
-#		Fix build configuration for s390/s390x
-Patch21:	%{name}-s390x.patch
-#		Always build the bundled llvm as static libraries
-Patch22:	%{name}-llvm-static.patch
-
-#		Documentation fixes
-
-#		Fixes for doxygen parsing issues:
-#		- warning: Found ';' while parsing initializer list
-#		- warning: Illegal member name found
-#		- warning: no matching file member found for ClassImp()
-#		- warning: documented symbol 'X' was not declared or defined
-Patch23:	%{name}-doxyfile.patch
-#		Improvements to the doxygen filter
-Patch24:	%{name}-dox-filter.patch
-#		Align macros so the doxygen filter works
-Patch25:	%{name}-macro-align.patch
-#		Fix broken ~~~ for doxygen
-#		https://github.com/root-mirror/root/pull/127
-Patch26:	%{name}-tildes.patch
-#		Convert old latex markup to doxygen
-Patch27:	%{name}-latex-markup.patch
-#		Remove some old html markup
-Patch28:	%{name}-html-markup.patch
-#		Fix broken links (cernlib, clhep, geant)
-Patch29:	%{name}-links.patch
-#		Remove duplicated comment
-Patch30:	%{name}-tvector2-comment.patch
-#		Remove links to tutorial macro results
-Patch31:	%{name}-see-macro-output.patch
-#		Fix TMath doxygen
-Patch32:	%{name}-tmath-doc.patch
-#		Fix cernlib doxygen
-Patch33:	%{name}-cernlib-doc.patch
-#		Backported doxygen updates for TPrincipal class
-Patch34:	%{name}-tprincipal-doc.patch
+Patch2:		%{name}-dont-link-jvm.patch
+#		Don't create documentation notebooks
+Patch3:		%{name}-doc-no-notebooks.patch
 #		Don't run gui macros
-Patch35:	%{name}-avoid-gui-crash.patch
-#		Doxygen warnings
-Patch36:	%{name}-doxygen-warnings.patch
+Patch4:		%{name}-avoid-gui-crash.patch
 
 #		Test fixes
+#		https://github.com/root-mirror/root/pull/155
 
-#		User files in source tree during tests
-Patch37:	%{name}-template-files.patch
+#		Use files in source tree during tests
+Patch5:		%{name}-template-files.patch
 #		Use cache read option
-Patch38:	%{name}-cache-test.patch
+Patch6:		%{name}-cache-test.patch
 #		Fixes for tests on ix86
-Patch39:	%{name}-32bit.patch
-#		Fixes for stressGraphics.ref
-Patch40:	%{name}-stressgraphics.patch
+Patch7:		%{name}-32bit.patch
+#		Clean up TFormulaParsingTests
+Patch8:		%{name}-tformulaparsingtests.patch
+#		Typo in TFormulaTests
+Patch9:		%{name}-tformulatests-typo.patch
 #		Don't download testdata
-Patch41:	%{name}-no-testdata.patch
-#		Avoid using std::bind with lambdas (fixed upstream)
-Patch42:	%{name}-avoid-std-bind-lambda.patch
+Patch10:	%{name}-no-testdata.patch
+
+#		Miscellaneous
+
+#		Missing includes
+#		https://github.com/root-mirror/root/pull/269
+Patch11:	%{name}-missing-includes.patch
+#		Old FSF address
+#		https://github.com/root-mirror/root/pull/270
+Patch12:	%{name}-fsf-addr.patch
+#		Name clash HZ
+#		https://github.com/root-mirror/root/pull/309
+Patch13:	%{name}-hz.patch
+#		Fix errors when building documentation
+#		https://github.com/root-mirror/root/pull/310
+Patch14:	%{name}-global-name-not-defined.patch
+#		Fix paths in image tutorial
+#		https://github.com/root-mirror/root/pull/311
+Patch15:	%{name}-rose-image.patch
+#		Fix stressGraphics.ref
+#		https://github.com/root-mirror/root/pull/312
+Patch16:	%{name}-stressgraphics.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -154,11 +97,12 @@ ExcludeArch:	s390
 #		https://sft.its.cern.ch/jira/browse/ROOT-6434
 #		https://sft.its.cern.ch/jira/browse/ROOT-7314
 ExcludeArch:	ppc %{power64}
-#		aarch64 does not yet work
-#		https://sft.its.cern.ch/jira/browse/ROOT-7291
-ExcludeArch:	aarch64
 
-BuildRequires:	cmake
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	cmake >= 3.4.3
+%else
+BuildRequires:	cmake3 >= 3.4.3
+%endif
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -228,7 +172,9 @@ BuildRequires:	OCE-devel
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
-BuildRequires:	tbb-devel
+%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	tbb-devel >= 4.3
+%endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	gcc-c++
@@ -239,13 +185,13 @@ BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
 %endif
 BuildRequires:	numpy
-BuildRequires:	dos2unix
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	perl-generators
 BuildRequires:	systemd-units
 #		Some of the tests call lsb_release
 BuildRequires:	redhat-lsb-core
+#		Fonts
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
@@ -255,6 +201,8 @@ BuildRequires:	urw-fonts
 %if %{?fedora}%{!?fedora:0} >= 11
 BuildRequires:	font(droidsansfallback)
 %endif
+#		With gdb installed test failures will show backtraces
+BuildRequires:	gdb
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
@@ -378,6 +326,7 @@ Obsoletes:	%{name}-ruby < 6.00.00
 %if %{hadoop} == 0
 Obsoletes:	%{name}-io-hdfs < 6.06.04-2
 %endif
+Obsoletes:	%{name}-rootaas < 6.08.00
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -447,26 +396,62 @@ files, serving files over the Internet. Using this daemon, you can
 access files on the machine from anywhere on the Internet, using a
 transparent interface.
 
-%package python
+%package -n python2-%{name}
 Summary:	Python extension for ROOT
+Provides:	root-python = %{version}-%{release}
+Obsoletes:	root-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
-%description python
+%description -n python2-%{name}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
-%package %{python3pkg}
+%package -n %{python3pkg}-%{name}
 Summary:	Python extension for ROOT
+Provides:	root-%{python3pkg} = %{version}-%{release}
+Obsoletes:	root-%{python3pkg} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
-%description %{python3pkg}
+%description -n %{python3pkg}-%{name}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
+%package -n python2-jupyroot
+Summary:	ROOT Jupyter kernel
+Requires:	python2-%{name} = %{version}-%{release}
+
+%description -n python2-jupyroot
+The Jupyter kernel for the ROOT notebook.
+
+%package -n %{python3pkg}-jupyroot
+Summary:	ROOT Jupyter kernel
+Requires:	%{python3pkg}-%{name} = %{version}-%{release}
+
+%description -n %{python3pkg}-jupyroot
+The Jupyter kernel for the ROOT notebook.
+
+%package -n python2-jsmva
+Summary:	TMVA interface used by JupyROOT
+BuildArch:	noarch
+Requires:	%{name}-tmva = %{version}-%{release}
+Requires:	python2-jupyroot = %{version}-%{release}
+
+%description -n python2-jsmva
+TMVA interface used by JupyROOT.
+
+%package -n %{python3pkg}-jsmva
+Summary:	TMVA interface used by JupyROOT
+BuildArch:	noarch
+Requires:	%{name}-tmva = %{version}-%{release}
+Requires:	%{python3pkg}-jupyroot = %{version}-%{release}
+
+%description -n %{python3pkg}-jsmva
+TMVA interface used by JupyROOT.
+
 %if %{ruby}
 %package ruby
 Summary:	Ruby extension for ROOT
@@ -1535,39 +1520,30 @@ This package contains a plugin for browsing a ROOT tree in ROOT.
 %package cli
 Summary:	ROOT command line utilities
 BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
+Requires:	python2-%{name} = %{version}-%{release}
 
 %description cli
 The ROOT command line utilities is a set of scripts for common tasks
 written in python.
 
 %package notebook
-Summary:	ROOT as an IPython Notebook
+Summary:	ROOT as a Jupyter Notebook
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-rootaas = %{version}-%{release}
-Requires:	/usr/bin/ipython
+%if %{?fedora}%{!?fedora:0} >= 23
+#		Jupyter is not available in RHEL/EPEL
+Requires:	/usr/bin/jupyter
+#		Fedora's /usr/bin/jupyter uses Python 3
+#		Therefore depend on the Python 3 JupyROOT kernel
+Requires:	%{python3pkg}-jupyroot = %{version}-%{release}
+Requires:	%{python3pkg}-jsmva = %{version}-%{release}
+%endif
 
 %description notebook
-ROOT as an IPython Notebook.
-
-%package rootaas
-Summary:	ROOT as a Service
-BuildArch:	noarch
-Requires:	%{name}-python = %{version}-%{release}
-Requires:	python-ipython-console
-
-%description rootaas
-ROOT as a Service - the IPython kernel for the ROOT notebook.
+ROOT as a Jupyter Notebook.
 
 %prep
 %setup -q -a 1
 
-# Convert from mac line terminators (and remove trailing spaces)
-mac2unix math/smatrix/doc/SMatrixClass.html
-sed 's! *$!!' -i math/smatrix/doc/SMatrixClass.html
-mac2unix math/smatrix/doc/SVector.html
-sed 's! *$!!' -i math/smatrix/doc/SVector.html
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1585,32 +1561,6 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1628,7 +1578,7 @@ rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
 #  * gl2ps
-rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
+rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
 #  * unuran
 rm -rf math/unuran/src/*.tar.gz
 #  * xrootd-private-devel headers
@@ -1673,16 +1623,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
 %endif
 
-%ifarch ppc %{power64} s390 s390x
-# On some architectures JIT compilation fails if the stack protector is used
-# https://llvm.org/bugs/show_bug.cgi?id=22248
-# https://llvm.org/bugs/show_bug.cgi?id=26226
-# IncrementalExecutor::executeFunction:
-#   symbol '__stack_chk_guard' unresolved while linking
-%global optflags %(sed 's/-fstack-protector\\S* //g' <<< '%{optflags}')
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+%cmake \
+%else
+%cmake3 \
 %endif
-
-%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
@@ -1703,6 +1649,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_pcre:BOOL=OFF \
        -Dbuiltin_tbb:BOOL=OFF \
        -Dbuiltin_unuran:BOOL=OFF \
+       -Dbuiltin_vc:BOOL=OFF \
        -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dafdsmgrd:BOOL=OFF \
@@ -1718,9 +1665,13 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcocoa:BOOL=OFF \
 %if %{?fedora}%{!?fedora:0} >= 24
        -Dcxx14:BOOL=ON \
+       -Droot7:BOOL=ON \
 %else
        -Dcxx14:BOOL=OFF \
+       -Droot7:BOOL=OFF \
 %endif
+       -Dcxxmodules:BOOL=OFF \
+       -Dcuda:BOOL=OFF \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Dexceptions:BOOL=ON \
@@ -1746,6 +1697,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dhdfs:BOOL=OFF \
 %endif
        -Dhttp:BOOL=ON \
+%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
+       -Dimt:BOOL=ON \
+%else
+       -Dimt:BOOL=OFF \
+%endif
        -Djemalloc:BOOL=OFF \
        -Dkrb5:BOOL=ON \
        -Dldap:BOOL=ON \
@@ -1754,7 +1710,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dmemstat:BOOL=ON \
        -Dminuit2:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
-       -Dmt:BOOL=ON \
        -Dmysql:BOOL=ON \
        -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
@@ -1768,12 +1723,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dpythia8:BOOL=OFF \
 %endif
        -Dpython:BOOL=ON \
+       -Dpython3:BOOL=OFF \
        -Dqt:BOOL=ON \
        -Dqtgsi:BOOL=ON \
        -Dr:BOOL=ON \
        -Drfio:BOOL=ON \
        -Droofit:BOOL=ON \
-       -Droot7:BOOL=OFF \
        -Drpath:BOOL=OFF \
 %if %{ruby}
        -Druby:BOOL=ON \
@@ -1788,13 +1743,13 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dsrp:BOOL=OFF \
        -Dssl:BOOL=ON \
        -Dtable:BOOL=ON \
-       -Dtbb:BOOL=ON \
        -Dtcmalloc:BOOL=OFF \
        -Dthread:BOOL=ON \
        -Dtmva:BOOL=ON \
        -Dunuran:BOOL=ON \
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=ON \
+       -Dvecgeom:BOOL=OFF \
        -Dx11:BOOL=ON \
        -Dxft:BOOL=ON \
        -Dxml:BOOL=ON \
@@ -1822,9 +1777,11 @@ py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
 py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
 py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,lib/libPyROOT,python/libPyROOT,g' \
+    -e "s,lib${py2l},lib${py3l},g" -e 's, python , python3 ,g' \
+    -e 's,lib/libPyROOT,python/libPyROOT,g' \
+    -e 's,lib/libJupyROOT,python/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
-make %{?_smp_mflags} -f bindings/python/Makefile PyROOT
+make %{?_smp_mflags} -f bindings/python/Makefile PyROOT JupyROOT
 mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
 
 popd
@@ -1834,13 +1791,6 @@ pushd builddir
 make %{?_smp_mflags} install DESTDIR=%{buildroot}
 popd
 
-# Move python modules to the sitelib
-mkdir -p %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* %{buildroot}%{python_sitelib}
-rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/README.md
-rm %{buildroot}%{_libdir}/%{name}/ROOTaaS/.gitignore
-mv %{buildroot}%{_libdir}/%{name}/ROOTaaS %{buildroot}%{python_sitelib}
-
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
     %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
@@ -1881,20 +1831,50 @@ mkdir -p %{buildroot}%{_unitdir}
 install -p -m 644 %SOURCE3 %{buildroot}%{_unitdir}
 install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
 
-# The Python interface library is handled by alternatives
+# Move python cli helper to its own directory
+mkdir -p %{buildroot}%{_datadir}/%{name}/cli
+mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
+   %{buildroot}%{_datadir}/%{name}/cli
+
+# Move the python modules to sitearch/sitelib
 mkdir -p %{buildroot}%{python_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python_sitearch}/libPyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
+   %{buildroot}%{python_sitearch}/libJupyROOT.so
 mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
+rm %{buildroot}%{_libdir}/%{name}/JupyROOT/README.md
+mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python_sitearch}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
+
+mkdir -p %{buildroot}%{python_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python_sitelib}
+
+tmpdir=`mktemp -d`
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+DESTDIR=$tmpdir cmake -P builddir/bindings/python/cmake_install.cmake
+%else
+DESTDIR=$tmpdir cmake3 -P builddir/bindings/python/cmake_install.cmake
+%endif
 
 mkdir -p %{buildroot}%{python3_sitearch}
-tmpdir=`mktemp -d`
-DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=libraries \
-   -P builddir/bindings/python/cmake_install.cmake
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libJupyROOT%{py3soabi}.so
+mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
+mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
+rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
+mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
+
+mkdir -p %{buildroot}%{python3_sitelib}
+mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
+
 rm -rf $tmpdir
-install -m 644 bindings/python/*.py %{buildroot}%{python3_sitearch}
 
 %if %{ruby}
 # The Ruby interface library must be in two places
@@ -1908,9 +1888,12 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
 # These should be in PATH
 mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
-# Avoid /usr/bin/env shebangs
+# Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed 's!/usr/bin/env python!/usr/bin/python!' \
+sed -e 's!/usr/bin/env python!/usr/bin/python!' \
+    -e '/import sys/d' \
+    -e '/import cmdLineUtils/iimport sys' \
+    -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
     -i %{buildroot}%{_bindir}/rootbrowse \
        %{buildroot}%{_bindir}/rootcp \
        %{buildroot}%{_bindir}/rooteventselector \
@@ -1918,8 +1901,10 @@ sed 's!/usr/bin/env python!/usr/bin/python!' \
        %{buildroot}%{_bindir}/rootmkdir \
        %{buildroot}%{_bindir}/rootmv \
        %{buildroot}%{_bindir}/rootprint \
-       %{buildroot}%{_bindir}/rootrm \
-       %{buildroot}%{python_sitelib}/cmdLineUtils.py \
+       %{buildroot}%{_bindir}/rootrm
+sed '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
+sed 's!/usr/bin/env python!/usr/bin/python!' \
+    -i %{buildroot}%{_bindir}/rootdrawtree \
        %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
@@ -1935,7 +1920,6 @@ rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
 rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
-rm %{buildroot}%{_datadir}/%{name}/gitinfo.txt
 rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
 rm %{buildroot}%{_libdir}/%{name}/libminicern.a
 rm %{buildroot}%{_bindir}/setenvwrap.csh
@@ -1953,8 +1937,6 @@ rm %{buildroot}%{_includedir}/%{name}/*.cw
 rm %{buildroot}%{_includedir}/%{name}/*.pri
 rm %{buildroot}%{_includedir}/%{name}/proofdp.h
 rm %{buildroot}%{_includedir}/%{name}/rootdp.h
-rm %{buildroot}%{_pkgdocdir}/BUILDSYSTEM
-rm %{buildroot}%{_pkgdocdir}/ChangeLog-2-24
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
@@ -1993,6 +1975,7 @@ rm TSystem/P030_TAlienSystem.C
 rm TSystem/P060_THDFSSystem.C
 %endif
 rm TViewerX3D/P020_TQtViewerX3D.C
+rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
@@ -2009,6 +1992,7 @@ rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
 rmdir TImagePlugin
+rmdir TVirtualGeoConverter
 popd
 
 # Create ldconfig configuration
@@ -2024,10 +2008,16 @@ cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
 # Generate documentation
 pushd documentation/doxygen
 ln -s ../../files files
-sed -e 's!\(GENERATE_LATEX\s*=\).*!\1 NO!' \
-    -e 's!\(GENERATE_MAN\s*=\).*!\1 NO!' -i Doxyfile
+# Create the py-hsimple.root file in advance (needed as input)
 ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
+    LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
+    PYTHONPATH=${PWD}/../../builddir/lib \
+    python ../../tutorials/pyroot/hsimple.py
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
+    ROOTSYS=${PWD}/../../builddir \
+    LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
+    PYTHONPATH=${PWD}/../../builddir/lib \
     make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
 mv doc/html %{buildroot}%{_pkgdocdir}/html
 popd
@@ -2037,7 +2027,11 @@ for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
     l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
     DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%else
+    DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%endif
     ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
 	sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
@@ -2063,17 +2057,26 @@ pushd runtutorials
 ln -s ../../files files
 popd
 # Exclude some tests that can not be run
+#
 # - test-stressIOPlugins-*
 #   requires network access (by design since they test the remote file IO)
+#
 # - tutorial-tree-run_h1analysis
+# - tutorial-multicore-imt001_parBranchProcessing
+# - tutorial-multicore-mp103_processSelector
 #   requires network access: http://root.cern.ch/files/h1/
+#
+# - tutorial-multicore-imt101_parTreeProcessing
+#   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
+#
+# - test-stressiterators-interpreted
+# - tutorial-hist-sparsehist
 # - tutorial-r-*
-#   occasionally causes random crashes
-# - tutorial-multicore-mp*
-#   currently fails on ix86 and arm
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-r-.*"
-%ifarch %{ix86} %{arm}
-excluded="${excluded}|tutorial-multicore-mp.*"
+#   currently fails on 32 bit arm - reported upstream:
+#   https://sft.its.cern.ch/jira/browse/ROOT-8500
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing"
+%ifarch %{arm}
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
 %endif
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
@@ -2120,7 +2123,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %postun proofd
 %systemd_postun_with_restart proofd.service
 
-%post python
+%post -n python2-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
 	/var/lib/alternatives/libPyROOT.so || \
@@ -2137,15 +2140,23 @@ fi
     libPyROOT.so %{python_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
-%preun python
+%preun -n python2-%{name}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python_sitearch}/libPyROOT.so
 fi
 
-%postun python -p /sbin/ldconfig
+%postun -n python2-%{name} -p /sbin/ldconfig
 
-%post %{python3pkg}
+%triggerpostun -n python2-%{name} -- %{name}-python
+# Uninstalling the old %{name}-python will remove the alternatives
+# for python2-%{name} - put them back in this triggerpostun script
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
+/sbin/ldconfig
+
+%post -n %{python3pkg}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
 	/var/lib/alternatives/libPyROOT.so || \
@@ -2162,13 +2173,21 @@ fi
     libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
 /sbin/ldconfig
 
-%preun %{python3pkg}
+%preun -n %{python3pkg}-%{name}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
 fi
 
-%postun %{python3pkg} -p /sbin/ldconfig
+%postun -n %{python3pkg}-%{name} -p /sbin/ldconfig
+
+%triggerpostun -n %{python3pkg}-%{name} -- %{name}-%{python3pkg}
+# Uninstalling the old %{name}-%{python3pkg} will remove the alternatives
+# for %{python3pkg}-%{name} - put them back in this triggerpostun script
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+/sbin/ldconfig
 
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
@@ -2405,6 +2424,7 @@ fi
 %{_datadir}/%{name}/allDict.cxx.pch
 %{_datadir}/%{name}/class.rules
 %{_datadir}/%{name}/gdb-backtrace.sh
+%{_datadir}/%{name}/gitinfo.txt
 %{_datadir}/%{name}/helgrind-root.supp
 %{_datadir}/%{name}/Makefile.arch
 %{_datadir}/%{name}/root.mimes
@@ -2480,7 +2500,7 @@ fi
 %{_mandir}/man1/rootd.1*
 %{_unitdir}/rootd.service
 
-%files python -f includelist-bindings-pyroot
+%files -n python2-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
@@ -2491,7 +2511,7 @@ fi
 %{python_sitearch}/cppyy.py*
 %{python_sitearch}/_pythonization.py*
 
-%files %{python3pkg} -f includelist-bindings-pyroot
+%files -n %{python3pkg}-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
@@ -2503,6 +2523,22 @@ fi
 %{python3_sitearch}/_pythonization.py
 %{python3_sitearch}/__pycache__
 
+%files -n python2-jupyroot
+%{python_sitearch}/JupyROOT
+%{python_sitearch}/libJupyROOT.so
+%doc bindings/pyroot/JupyROOT/README.md
+
+%files -n %{python3pkg}-jupyroot
+%{python3_sitearch}/JupyROOT
+%{python3_sitearch}/libJupyROOT%{py3soabi}.so
+%doc bindings/pyroot/JupyROOT/README.md
+
+%files -n python2-jsmva
+%{python_sitelib}/JsMVA
+
+%files -n %{python3pkg}-jsmva
+%{python3_sitelib}/JsMVA
+
 %if %{ruby}
 %files ruby -f includelist-bindings-ruby
 %{_libdir}/%{name}/libRuby.*
@@ -3048,22 +3084,32 @@ fi
 %files cli
 %{_bindir}/rootbrowse
 %{_bindir}/rootcp
+%{_bindir}/rootdrawtree
 %{_bindir}/rooteventselector
 %{_bindir}/rootls
 %{_bindir}/rootmkdir
 %{_bindir}/rootmv
 %{_bindir}/rootprint
 %{_bindir}/rootrm
-%{python_sitelib}/cmdLineUtils.py*
+%{_datadir}/%{name}/cli
 
 %files notebook
 %{_bindir}/rootnb.exe
 %{_datadir}/%{name}/notebook
 
-%files rootaas
-%{python_sitelib}/ROOTaaS
-
 %changelog
+* Tue Dec 06 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.02-1
+- Update to 6.08.02
+- Drop patches accepted upstream
+- Drop previously backported patches
+- Drop obsolete patches
+- Enable hadoop/hdfs support for all architectures
+  * libhdfs is now available for more architectures than ix86 and x86_64
+- Enable building on aarch64
+- Rename the python packages to python2-root and python3-root
+- New sub-packages: python{2,3}-jupyroot, python{2,3}-jsmva
+- Dropped sub-package: root-rootaas (replaced by python{2,3}-jupyroot)
+
 * Wed Sep 28 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.06.08-2
 - Rebuild for gcc 6.2
 
diff --git a/sources b/sources
index 3199813..a29e64d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3d11a7c2d6c8f8b25717133f9a76c926  root-6.06.08.tar.xz
-7bb34ac86cae35a58bf226a22a328b9b  root-testfiles.tar.xz
+9189288329c2f7c230c67ed98028d924  root-6.08.02.tar.xz
+804e11d45d87cd63fc903fe99f7e75d2  root-testfiles.tar.xz

From 9caef0bcab0589c1820ccd6fd4032e0ad16a3d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 22 Dec 2016 13:08:41 +0100
Subject: [PATCH 098/344] Rebuild for Python 3.6

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 7991372..0813d45 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3098,6 +3098,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 6.08.02-2
+- Rebuild for Python 3.6
+
 * Tue Dec 06 2016 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.02-1
 - Update to 6.08.02
 - Drop patches accepted upstream

From 0224f3ec83f8fe1e614eeece9a743a77d9596481 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 10 Jan 2017 08:53:53 -0700
Subject: [PATCH 099/344] Rebuild for glew 2.0.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0813d45..0ee0ba0 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3098,6 +3098,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 6.08.02-3
+- Rebuild for glew 2.0.0
+
 * Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 6.08.02-2
 - Rebuild for Python 3.6
 

From 11c792e3342752e3055844e685bac6b3a19ad6b7 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Thu, 12 Jan 2017 17:30:40 +0100
Subject: [PATCH 100/344] Rebuild for readline 7.x

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0ee0ba0..ae257c4 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3098,6 +3098,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 6.08.02-4
+- Rebuild for readline 7.x
+
 * Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 6.08.02-3
 - Rebuild for glew 2.0.0
 

From ec7f16e89cee0a633792f64cd5b197207fc7ffb5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 15 Jan 2017 08:35:38 +0100
Subject: [PATCH 101/344] Update to 6.08.04 Fix broken TPad::WaitPrimitive
 (backport from git) Rebuild for gcc 6.3

---
 root-TPad-WaitPrimitive.patch   | 22 +++++++++++++++++
 root-fontconfig.patch           |  2 +-
 root-spectrum-batch.patch       | 17 +++++++++++++
 root-test-install.patch         |  2 +-
 root-tformulaparsingtests.patch | 42 +++++++++++++++++++++++++++------
 root.spec                       | 24 +++++++++++++------
 sources                         |  4 ++--
 7 files changed, 95 insertions(+), 18 deletions(-)
 create mode 100644 root-TPad-WaitPrimitive.patch
 create mode 100644 root-spectrum-batch.patch

diff --git a/root-TPad-WaitPrimitive.patch b/root-TPad-WaitPrimitive.patch
new file mode 100644
index 0000000..5e849d5
--- /dev/null
+++ b/root-TPad-WaitPrimitive.patch
@@ -0,0 +1,22 @@
+diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
+index 06bd216..6efeec5 100644
+--- a/graf2d/gpad/src/TPad.cxx
++++ b/graf2d/gpad/src/TPad.cxx
+@@ -6312,6 +6312,8 @@ void TPad::UseCurrentStyle()
+ 
+ TObject *TPad::WaitPrimitive(const char *pname, const char *emode)
+ {
++   if (!gPad) return 0;
++
+    if (strlen(emode)) gROOT->SetEditorMode(emode);
+    if (gROOT->GetEditorMode() == 0 && strlen(pname) > 2) gROOT->SetEditorMode(&pname[1]);
+ 
+@@ -6323,7 +6325,7 @@ TObject *TPad::WaitPrimitive(const char *pname, const char *emode)
+    Bool_t hasname = strlen(pname) > 0;
+    if (!pname[0] && !emode[0]) testlast = kTRUE;
+    if (testlast) gROOT->SetEditorMode();
+-   while (!gSystem->ProcessEvents() && gROOT->GetSelectedPad()) {
++   while (!gSystem->ProcessEvents() && gPad) {
+       if (gROOT->GetEditorMode() == 0) {
+          if (hasname) {
+             obj = FindObject(pname);
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 587fc3f..ffa412c 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -71,7 +71,7 @@ diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/a
     fn.Strip();
  
 -   // This is for backward compatibility...
--   if (fn.Last('/') == 0) fn = fn(1, f.Length() - 1);
+-   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
 +   const char *basename = gSystem->BaseName(fn);
 +
 +   char *ttfnt = NULL;
diff --git a/root-spectrum-batch.patch b/root-spectrum-batch.patch
new file mode 100644
index 0000000..6254cae
--- /dev/null
+++ b/root-spectrum-batch.patch
@@ -0,0 +1,17 @@
+diff --git a/tutorials/spectrum/peaks2.C b/tutorials/spectrum/peaks2.C
+index 76cc5ab..f05d394 100644
+--- a/tutorials/spectrum/peaks2.C
++++ b/tutorials/spectrum/peaks2.C
+@@ -107,8 +107,10 @@ void findPeak2() {
+ 
+    s->Print();
+    printf("Gener=%d, Found=%d, Good=%d, Ghost=%d\n",npeaks,nfound,ngood,nghost);
+-   printf("\nDouble click in the bottom right corner of the pad to continue\n");
+-   c1->WaitPrimitive();
++   if (!gROOT->IsBatch()) {
++      printf("\nDouble click in the bottom right corner of the pad to continue\n");
++      c1->WaitPrimitive();
++   }
+ }
+ void peaks2(Int_t maxpeaks=50) {
+    s = new TSpectrum2(2*maxpeaks);
diff --git a/root-test-install.patch b/root-test-install.patch
index ad4544f..08d28ab 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -1772,7 +1772,7 @@ diff -Nur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/
 -   char *tmpstr = 0;
 +
 +   // This is for backward compatibility...
-+   if (fn.Last('/') == 0) fn = fn(1, f.Length() - 1);
++   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
 +
 +   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 +                                       TROOT::GetTTFFontDir());
diff --git a/root-tformulaparsingtests.patch b/root-tformulaparsingtests.patch
index 49b3571..956c6dc 100644
--- a/root-tformulaparsingtests.patch
+++ b/root-tformulaparsingtests.patch
@@ -1,5 +1,5 @@
 diff --git a/test/TFormulaParsingTests.h b/test/TFormulaParsingTests.h
-index 1ba19ce..d9e3ee8 100644
+index 060d149..4a2957c 100644
 --- a/test/TFormulaParsingTests.h
 +++ b/test/TFormulaParsingTests.h
 @@ -6,26 +6,26 @@
@@ -451,7 +451,7 @@ index 1ba19ce..d9e3ee8 100644
     TF1 f3("f3","f1+[0]");
     // param order should be the same
 -   f3.SetParameters( f2.GetParameters() );
--   ok &= fpEqual(f2.Eval(1) , f0.Eval(1) );
+-   ok &= fpEqual(f3.Eval(1) , f0.Eval(1) );
 +   f3.SetParameters(f2.GetParameters());
 +   ok &= fpEqual(f3.Eval(1), f0.Eval(1), 7e-16);
     return ok;
@@ -702,7 +702,7 @@ index 1ba19ce..d9e3ee8 100644
     return ok;
  }
  
-@@ -593,129 +571,128 @@ bool test33() {
+@@ -593,69 +571,69 @@ bool test33() {
     f1.SetParameters(1,0,1,1,2,0.);
     TF2 f2("f2","xygaus",-10,10,-10,10);
     f2.SetParameters(1,0,1,1,2);
@@ -781,11 +781,35 @@ index 1ba19ce..d9e3ee8 100644
  
 -   
 -   return ok; 
--} 
--   
--void PrintError(int itest)  { 
 +   return ok;
-+}
+ }
+ 
+ bool test37() {
+   // test for inserting correcting polynomials (bug ROOT-8496)
+   bool ok = true;
+   TF1 f1("f1","[0]*pol1(1) + pol2(3)*[6]",0,1);
+-  f1.SetParameters(2,1,2,1,2,3,4); 
++  f1.SetParameters(2,1,2,1,2,3,4);
+   auto ref = [](double x) { return 2 * (1 + 2*x ) +  (1 + 2*x + 3*x*x) * 4 ; };
+ 
+-  ok &= TMath::AreEqualAbs( f1.Eval(0.5), ref(0.5), 1.E-10);
+-  return ok; 
++  ok &= fpEqual(f1.Eval(0.5), ref(0.5), 1.E-10);
++  return ok;
+ }
+ 
+ bool test38() {
+@@ -666,81 +644,80 @@ bool test38() {
+   ok &= (f1.Eval(0) == 2.);
+   TF1 f2("f2","[A]+[1]*x",0,1);
+   f2.SetParameters(999,2,3);
+-  ok &= (f2.Eval(2) == 7.);  
+-  return ok; 
++  ok &= (f2.Eval(2) == 7.);
++  return ok;
+ }
+- 
+-void PrintError(int itest)  { 
 +
 +void PrintError(int itest) {
     Error("TFormula test","test%d FAILED ",itest);
@@ -843,6 +867,8 @@ index 1ba19ce..d9e3ee8 100644
 -   IncrTest(itest); if (!test34() ) { PrintError(itest); }
 -   IncrTest(itest); if (!test35() ) { PrintError(itest); }
 -   IncrTest(itest); if (!test36() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test37() ) { PrintError(itest); }
+-   IncrTest(itest); if (!test38() ) { PrintError(itest); }
 +   IncrTest(itest); if (!test1()) { PrintError(itest); }
 +   IncrTest(itest); if (!test2()) { PrintError(itest); }
 +   IncrTest(itest); if (!test3()) { PrintError(itest); }
@@ -879,6 +905,8 @@ index 1ba19ce..d9e3ee8 100644
 +   IncrTest(itest); if (!test34()) { PrintError(itest); }
 +   IncrTest(itest); if (!test35()) { PrintError(itest); }
 +   IncrTest(itest); if (!test36()) { PrintError(itest); }
++   IncrTest(itest); if (!test37()) { PrintError(itest); }
++   IncrTest(itest); if (!test38()) { PrintError(itest); }
  
     std::cout << ".\n";
 -    
diff --git a/root.spec b/root.spec
index ae257c4..bae97ae 100644
--- a/root.spec
+++ b/root.spec
@@ -21,9 +21,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.08.02
+Version:	6.08.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -89,6 +89,11 @@ Patch15:	%{name}-rose-image.patch
 #		Fix stressGraphics.ref
 #		https://github.com/root-mirror/root/pull/312
 Patch16:	%{name}-stressgraphics.patch
+#		Fix broken TPad::WaitPrimitive (backport from git)
+Patch17:	%{name}-TPad-WaitPrimitive.patch
+#		Don't wait for user interaction in batch mode
+#		https://github.com/root-mirror/root/pull/322
+Patch18:	%{name}-spectrum-batch.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -326,7 +331,6 @@ Obsoletes:	%{name}-ruby < 6.00.00
 %if %{hadoop} == 0
 Obsoletes:	%{name}-io-hdfs < 6.06.04-2
 %endif
-Obsoletes:	%{name}-rootaas < 6.08.00
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -423,6 +427,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
 Requires:	python2-%{name} = %{version}-%{release}
+Obsoletes:	%{name}-rootaas < 6.08.00
 
 %description -n python2-jupyroot
 The Jupyter kernel for the ROOT notebook.
@@ -1532,11 +1537,9 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 23
 #		Jupyter is not available in RHEL/EPEL
 Requires:	/usr/bin/jupyter
-#		Fedora's /usr/bin/jupyter uses Python 3
-#		Therefore depend on the Python 3 JupyROOT kernel
-Requires:	%{python3pkg}-jupyroot = %{version}-%{release}
-Requires:	%{python3pkg}-jsmva = %{version}-%{release}
 %endif
+Requires:	python2-jupyroot = %{version}-%{release}
+Requires:	python2-jsmva = %{version}-%{release}
 
 %description notebook
 ROOT as a Jupyter Notebook.
@@ -1561,6 +1564,8 @@ ROOT as a Jupyter Notebook.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3098,6 +3103,11 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Jan 14 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.04-1
+- Update to 6.08.04
+- Fix broken TPad::WaitPrimitive (backport from git)
+- Rebuild for gcc 6.3
+
 * Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 6.08.02-4
 - Rebuild for readline 7.x
 
diff --git a/sources b/sources
index a29e64d..8e66c44 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9189288329c2f7c230c67ed98028d924  root-6.08.02.tar.xz
-804e11d45d87cd63fc903fe99f7e75d2  root-testfiles.tar.xz
+SHA512 (root-6.08.04.tar.xz) = db3480e6de919cf09ac32b9e3ce9901a0772313024786f053786b3df400a660683aca65e4d91c7f76d8c62ebf4a36deda6d556df1196d76277ccb060445531ce
+SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From e910032e7286ddae3fd5dd60d3c4c34e2107636c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 11:48:26 +0000
Subject: [PATCH 102/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bae97ae..c356c1b 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3103,6 +3103,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.08.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Sat Jan 14 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.04-1
 - Update to 6.08.04
 - Fix broken TPad::WaitPrimitive (backport from git)

From f8ad33edc6a26d8d591024bc9294e2ccfc2b3e47 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 2 Mar 2017 11:49:00 +0100
Subject: [PATCH 103/344] Disable building on aarch64 (it is now broken again)
 Add missing header (gcc 7) Fix a test failure on Fedora 26 i686 Fix some
 format warnings/errors in GlobusAuth Use the right delimiter when splitting
 the icon path in TASImage Disable two more tests on 32 bit arm

---
 root-Quantiles.patch           | 15 ++++++
 root-format.patch              | 94 ++++++++++++++++++++++++++++++++++
 root-missing-header-gcc7.patch | 12 +++++
 root-python-install-path.patch | 39 ++++++++++++++
 root-test-install.patch        |  4 +-
 root.spec                      | 41 +++++++++++++--
 6 files changed, 198 insertions(+), 7 deletions(-)
 create mode 100644 root-Quantiles.patch
 create mode 100644 root-format.patch
 create mode 100644 root-missing-header-gcc7.patch
 create mode 100644 root-python-install-path.patch

diff --git a/root-Quantiles.patch b/root-Quantiles.patch
new file mode 100644
index 0000000..580314a
--- /dev/null
+++ b/root-Quantiles.patch
@@ -0,0 +1,15 @@
+diff --git a/math/mathcore/src/TMath.cxx b/math/mathcore/src/TMath.cxx
+index 942bb55..72618fc 100644
+--- a/math/mathcore/src/TMath.cxx
++++ b/math/mathcore/src/TMath.cxx
+@@ -1210,7 +1210,9 @@ void TMath::Quantiles(Int_t n, Int_t nprob, Double_t *x, Double_t *quantiles, Do
+          else
+             nppm = n*prob[i]; // use m = 0
+ 
+-         j = TMath::FloorNint(nppm);
++         // be careful with machine precision
++         double eps = 4 * TMath::Limits<Double_t>::Epsilon();
++         j = TMath::FloorNint(nppm + eps);
+ 
+          // LM : fix for numerical problems if nppm is actually equal to j, but results different for numerical error
+          // g in the paper is nppm -j
diff --git a/root-format.patch b/root-format.patch
new file mode 100644
index 0000000..789afd4
--- /dev/null
+++ b/root-format.patch
@@ -0,0 +1,94 @@
+diff --git a/net/globusauth/src/GlobusAuth.cxx b/net/globusauth/src/GlobusAuth.cxx
+index 6e0a00a..0b778bf 100644
+--- a/net/globusauth/src/GlobusAuth.cxx
++++ b/net/globusauth/src/GlobusAuth.cxx
+@@ -139,7 +139,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
+       return -1;
+    }
+    if (gDebug > 3)
+-      Info("GlobusAuthenticate", " Credential Handle is 0x%x",
++      Info("GlobusAuthenticate", " Credential Handle is %p",
+            gGlbCredHandle);
+ 
+    // Inquire credentials for subject name and convert it in human readable form ...
+@@ -193,7 +193,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
+          if (gDebug > 0)
+             Error("GlobusAuthenticate",
+                   "Length of Issuer name not send correctly: bytes sent: %d (tot len: %d)",
+-                  bsnd - 1, strlen(buf));
++                  bsnd - 1, (int) strlen(buf));
+          return 0;
+       }
+       // Now we send it to the server daemon
+@@ -240,7 +240,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
+                   "recv host subj: did not receive all the bytes"
+                   " (recv: %d, due >%d)", brcv, retval);
+                Error("GlobusAuthenticate", "recv host subj: (%d) %s",
+-                  strlen(host_subj), host_subj);
++                  (int) strlen(host_subj), host_subj);
+             }
+             if (host_subj) delete[] host_subj;
+             return 0;
+@@ -262,7 +262,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
+        0 ? (GSS_C_DELEG_FLAG | GSS_C_MUTUAL_FLAG) : GSS_C_MUTUAL_FLAG;
+    if (gDebug > 3)
+       Info("GlobusAuthenticate",
+-           " gssReqFlags: %p, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
++           " gssReqFlags: 0x%x, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
+ 
+    // Now we are ready to start negotiating with the Server
+    if ((majStat =
+@@ -417,7 +417,7 @@ int GlobusGetDelCred()
+       return 1;
+    } else if (gDebug > 3)
+       Info("GlobusGetDelCred:",
+-           "Globus Credentials successfully imported (0x%x)",
++           "Globus Credentials successfully imported (%p)",
+            gGlbDelCredHandle);
+ 
+    if (credential) delete[] credential;
+@@ -494,7 +494,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
+             Info("GlobusGetLocalEnv",
+                  "PROOF environment, called by the MASTER/SLAVE");
+             Info("GlobusGetLocalEnv",
+-                 "string with pointer to del cred is 0x%x",
++                 "string with pointer to del cred is %p",
+                  gGlbDelCredHandle);
+          }
+          *localEnv = 2;
+@@ -542,7 +542,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
+ Int_t GlobusNameFromCred(gss_cred_id_t cred, TString &subjName)
+ {
+    if (gDebug > 2)
+-      Info("GlobusNamesFromCred", "Enter: Handle: 0x%p", cred);
++      Info("GlobusNamesFromCred", "Enter: Handle: %p", cred);
+ 
+    // Inquire credentials for Subject name and convert it in human readable form ...
+    OM_uint32 majStat = 0;
+@@ -662,7 +662,7 @@ void GlobusCleanupShm()
+             if ((rc == EINVAL) || (rc == EIDRM)) {
+                if (gDebug > 3)
+                   Info("GlobusCleanupShm:",
+-                       "credentials shared memory segment %s"
++                       "credentials shared memory segment "
+                        "already marked as destroyed");
+             } else {
+                Warning("GlobusCleanupShm:",
+@@ -730,7 +730,7 @@ Int_t GlobusCheckSecContext(const char *subjName, gss_ctx_id_t ctx)
+             theName[nameBuffer.length]= '\0';
+             if (gDebug > 2)
+                Info("GlobusCheckSecContext","with subject name: %s (%d)",
+-                                             theName, nameBuffer.length);
++                                             theName, (int) nameBuffer.length);
+             if (!strcmp(theName, subjName)) {
+                if (gDebug > 2)
+                   Info("GlobusCheckSecContext",
+@@ -1010,7 +1010,7 @@ Int_t GlobusIssuerName(TString &issuerName)
+          fn = Form("%s/.globus/usercert.pem",gSystem->HomeDirectory());
+       if (gSystem->AccessPathName(fn, kReadPermission)) {
+          emsg += fn;
+-         Error("GlobusIssuerName", emsg.Data());
++         Error("GlobusIssuerName", "%s", emsg.Data());
+          return 1;
+       }
+    }
diff --git a/root-missing-header-gcc7.patch b/root-missing-header-gcc7.patch
new file mode 100644
index 0000000..1a2e2bd
--- /dev/null
+++ b/root-missing-header-gcc7.patch
@@ -0,0 +1,12 @@
+diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
+index e39a80b..ee6303b 100644
+--- a/test/stressEntryList.cxx
++++ b/test/stressEntryList.cxx
+@@ -38,6 +38,7 @@
+ #include <map>
+ #include <list>
+ #include <array>
++#include <functional>
+ #include <stdlib.h>
+ #include "TApplication.h"
+ #include "TEntryList.h"
diff --git a/root-python-install-path.patch b/root-python-install-path.patch
new file mode 100644
index 0000000..e0a02a2
--- /dev/null
+++ b/root-python-install-path.patch
@@ -0,0 +1,39 @@
+diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
+index c537bae..3a2118e 100644
+--- a/bindings/pyroot/CMakeLists.txt
++++ b/bindings/pyroot/CMakeLists.txt
+@@ -36,8 +36,13 @@ endif()
+ file(GLOB pyfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
+ foreach(pyfile ${pyfiles})
+   install(FILES ${pyfile} DESTINATION ${runtimedir})
+-  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
+-  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
++  if(IS_ABSOLUTE ${runtimedir})
++    set(absruntimedir ${runtimedir})
++  else()
++    set(absruntimedir ${CMAKE_INSTALL_PREFIX}/${runtimedir})
++  endif()
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${absruntimedir}/${pyfile})")
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${absruntimedir}/${pyfile})")
+   file(COPY ${pyfile} DESTINATION ${localruntimedir})
+ endforeach()
+ 
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 0f430c9..a431a2b 100644
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -43,7 +43,12 @@ if(python)
+   endforeach()
+ 
+   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
+-  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
+-  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
++  if(IS_ABSOLUTE ${runtimedir})
++    set(absruntimedir ${runtimedir})
++  else()
++    set(absruntimedir ${CMAKE_INSTALL_PREFIX}/${runtimedir})
++  endif()
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${absruntimedir}/cmdLineUtils.py)")
++  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${absruntimedir}/cmdLineUtils.py)")
+   configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
+ endif()
diff --git a/root-test-install.patch b/root-test-install.patch
index 08d28ab..84f782b 100644
--- a/root-test-install.patch
+++ b/root-test-install.patch
@@ -1748,9 +1748,9 @@ diff -Nur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/
 +   Ssiz_t from = 0;
 +   TString token;
 +#ifndef R__WIN32
-+   const char *delim = "/";
++   const char *delim = ":";
 +#else
-+   const char *delim = "\\";
++   const char *delim = ";";
  #endif
 -
 -   gIconPaths[6] = 0;
diff --git a/root.spec b/root.spec
index c356c1b..0fd4a8d 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -94,7 +94,22 @@ Patch17:	%{name}-TPad-WaitPrimitive.patch
 #		Don't wait for user interaction in batch mode
 #		https://github.com/root-mirror/root/pull/322
 Patch18:	%{name}-spectrum-batch.patch
+#		Add missing header (gcc 7)
+#		https://github.com/root-mirror/root/pull/353
+Patch19:	%{name}-missing-header-gcc7.patch
+#		Fix for test suite on Fedora 26 i686
+#		https://github.com/root-mirror/root/pull/359
+Patch20:	%{name}-Quantiles.patch
+#		Fix format warnings/errors
+#		https://github.com/root-mirror/root/pull/376
+Patch21:	%{name}-format.patch
+#		Allow both absolute and relative python install paths
+#		https://github.com/root-mirror/root/pull/382
+Patch22:	%{name}-python-install-path.patch
 
+#		The build on aarch64 used to work, but is now broken again
+#		https://pagure.io/releng/issue/6653
+ExcludeArch:	aarch64
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
@@ -1566,6 +1581,10 @@ ROOT as a Jupyter Notebook.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1782,7 +1801,7 @@ py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
 py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
 py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's, python , python3 ,g' \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python},%{__python3},g' \
     -e 's,lib/libPyROOT,python/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
@@ -2074,14 +2093,18 @@ popd
 # - tutorial-multicore-imt101_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
+# - tutorial-r-*
+#   occasionally causes random crashes
+#
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
-# - tutorial-r-*
+# - test-stressHistFactory-interpreted
+# - tutorial-histfactory-example
 #   currently fails on 32 bit arm - reported upstream:
 #   https://sft.its.cern.ch/jira/browse/ROOT-8500
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing"
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing|tutorial-r-.*"
 %ifarch %{arm}
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|test-stressHistFactory-interpreted|tutorial-histfactory-example"
 %endif
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
@@ -3103,6 +3126,14 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Wed Mar 01 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.04-3
+- Disable building on aarch64 (it is now broken again)
+- Add missing header (gcc 7)
+- Fix a test failure on Fedora 26 i686
+- Fix some format warnings/errors in GlobusAuth
+- Use the right delimiter when splitting the icon path in TASImage
+- Disable two more tests on 32 bit arm
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.08.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 9848b20c1e2e8ebd3bab4ba37208a85bb3228f7c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 9 Mar 2017 06:43:53 +0100
Subject: [PATCH 104/344] Update to 6.08.06 Drop obsolete patch:
 root-tformulaparsingtests.patch Drop patches accepted upstream:
 root-spectrum-batch.patch and   root-missing-header-gcc7.patch Disable
 failing tests on s390x

---
 root-32bit.patch                |   9 +-
 root-TPad-WaitPrimitive.patch   |   4 +-
 root-missing-header-gcc7.patch  |  12 -
 root-s390x.patch                |  23 +
 root-spectrum-batch.patch       |  17 -
 root-template-files.patch       |  30 +-
 root-tformulaparsingtests.patch | 934 --------------------------------
 root.spec                       |  91 ++--
 sources                         |   2 +-
 9 files changed, 95 insertions(+), 1027 deletions(-)
 delete mode 100644 root-missing-header-gcc7.patch
 create mode 100644 root-s390x.patch
 delete mode 100644 root-spectrum-batch.patch
 delete mode 100644 root-tformulaparsingtests.patch

diff --git a/root-32bit.patch b/root-32bit.patch
index ecd62a4..75a9eae 100644
--- a/root-32bit.patch
+++ b/root-32bit.patch
@@ -12,10 +12,10 @@ index d768160..8c223ee 100644
     iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
  
 diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
-index 1006dd1..5dc96ee 100644
+index 1006dd1..b862f36 100644
 --- a/test/stressMathCore.cxx
 +++ b/test/stressMathCore.cxx
-@@ -1117,11 +1117,11 @@ int testVector(int ngen, bool testio=false) {
+@@ -1117,7 +1117,7 @@ int testVector(int ngen, bool testio=false) {
  
     s1 = a.testOperations(v1);  a.print(VecType<V1>::name()+" operations");
     scale = Dim*20;
@@ -24,8 +24,3 @@ index 1006dd1..5dc96ee 100644
     if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
  #if defined (R__LINUX) && !defined(R__B64)
     // problem of precision on linux 32
--   if (Dim ==4) scale = 1000000000;
-+   if (Dim ==4) scale = 5000000000;
- #endif
-    // for problem with PtEtaPhiE
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
diff --git a/root-TPad-WaitPrimitive.patch b/root-TPad-WaitPrimitive.patch
index 5e849d5..ca329e3 100644
--- a/root-TPad-WaitPrimitive.patch
+++ b/root-TPad-WaitPrimitive.patch
@@ -1,5 +1,5 @@
 diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
-index 06bd216..6efeec5 100644
+index 2b2b5b8..6efeec5 100644
 --- a/graf2d/gpad/src/TPad.cxx
 +++ b/graf2d/gpad/src/TPad.cxx
 @@ -6312,6 +6312,8 @@ void TPad::UseCurrentStyle()
@@ -15,7 +15,7 @@ index 06bd216..6efeec5 100644
     Bool_t hasname = strlen(pname) > 0;
     if (!pname[0] && !emode[0]) testlast = kTRUE;
     if (testlast) gROOT->SetEditorMode();
--   while (!gSystem->ProcessEvents() && gROOT->GetSelectedPad()) {
+-   while (!gSystem->ProcessEvents()) {
 +   while (!gSystem->ProcessEvents() && gPad) {
        if (gROOT->GetEditorMode() == 0) {
           if (hasname) {
diff --git a/root-missing-header-gcc7.patch b/root-missing-header-gcc7.patch
deleted file mode 100644
index 1a2e2bd..0000000
--- a/root-missing-header-gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
-index e39a80b..ee6303b 100644
---- a/test/stressEntryList.cxx
-+++ b/test/stressEntryList.cxx
-@@ -38,6 +38,7 @@
- #include <map>
- #include <list>
- #include <array>
-+#include <functional>
- #include <stdlib.h>
- #include "TApplication.h"
- #include "TEntryList.h"
diff --git a/root-s390x.patch b/root-s390x.patch
new file mode 100644
index 0000000..733061e
--- /dev/null
+++ b/root-s390x.patch
@@ -0,0 +1,23 @@
+diff --git a/config/root-config.in b/config/root-config.in
+index bdb90ad..1b4cdba 100755
+--- a/config/root-config.in
++++ b/config/root-config.in
+@@ -247,6 +247,18 @@ linuxarm64)
+    auxcflags="${cxxversionflag} -fsigned-char"
+    auxlibs="-lm -ldl -rdynamic"
+    ;;
++linuxs390gcc)
++   # s390 (31 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -m31 -fsigned-char"
++   auxldflags="-m31"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
++linuxs390xgcc)
++   # s390x (64 bit mode) Linux with gcc
++   auxcflags="${cxxversionflag} -m64 -fsigned-char"
++   auxldflags="-m64"
++   auxlibs="-lm -ldl -rdynamic"
++   ;;
+ freebsd)
+    # FreeBSD with libc5
+    auxcflags="${cxxversionflag}"
diff --git a/root-spectrum-batch.patch b/root-spectrum-batch.patch
deleted file mode 100644
index 6254cae..0000000
--- a/root-spectrum-batch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tutorials/spectrum/peaks2.C b/tutorials/spectrum/peaks2.C
-index 76cc5ab..f05d394 100644
---- a/tutorials/spectrum/peaks2.C
-+++ b/tutorials/spectrum/peaks2.C
-@@ -107,8 +107,10 @@ void findPeak2() {
- 
-    s->Print();
-    printf("Gener=%d, Found=%d, Good=%d, Ghost=%d\n",npeaks,nfound,ngood,nghost);
--   printf("\nDouble click in the bottom right corner of the pad to continue\n");
--   c1->WaitPrimitive();
-+   if (!gROOT->IsBatch()) {
-+      printf("\nDouble click in the bottom right corner of the pad to continue\n");
-+      c1->WaitPrimitive();
-+   }
- }
- void peaks2(Int_t maxpeaks=50) {
-    s = new TSpectrum2(2*maxpeaks);
diff --git a/root-template-files.patch b/root-template-files.patch
index 73a8c62..fcf91e6 100644
--- a/root-template-files.patch
+++ b/root-template-files.patch
@@ -1,34 +1,30 @@
 diff --git a/tutorials/mlp/mlpHiggs.C b/tutorials/mlp/mlpHiggs.C
-index 8c5743f..d2a2769 100644
+index 8c5743f..49d3ca2 100644
 --- a/tutorials/mlp/mlpHiggs.C
 +++ b/tutorials/mlp/mlpHiggs.C
-@@ -16,8 +16,8 @@
- void mlpHiggs(Int_t ntrain=100) {
-    const char *fname = "mlpHiggs.root";
+@@ -18,6 +18,8 @@ void mlpHiggs(Int_t ntrain=100) {
     TFile *input = 0;
--   if (!gSystem->AccessPathName(fname)) {
--      input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+      input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    if (!gSystem->AccessPathName(fname)) {
+       input = TFile::Open(fname);
++   } else if (!gSystem->AccessPathName(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
++      input = TFile::Open(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
     } else {
        printf("accessing %s file from http://root.cern.ch/files\n",fname);
        input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
 diff --git a/tutorials/quadp/portfolio.C b/tutorials/quadp/portfolio.C
-index 9f8bb8a..ca96365 100644
+index 9f8bb8a..6c39446 100644
 --- a/tutorials/quadp/portfolio.C
 +++ b/tutorials/quadp/portfolio.C
-@@ -289,8 +289,8 @@ void portfolio()
- 
-    const char *fname = "stock.root";
+@@ -291,6 +291,8 @@ void portfolio()
     TFile *f = 0;
--   if (!gSystem->AccessPathName(fname)) {
--      f = TFile::Open(fname);
-+   if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
-+      f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
+    if (!gSystem->AccessPathName(fname)) {
+       f = TFile::Open(fname);
++   } else if (!gSystem->AccessPathName(Form("%s/quadp/%s", TROOT::GetTutorialDir().Data(), fname))) {
++      f = TFile::Open(Form("%s/quadp/%s", TROOT::GetTutorialDir().Data(), fname));
     } else {
        printf("accessing %s file from http://root.cern.ch/files\n",fname);
        f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-@@ -314,7 +314,7 @@ void portfolio()
+@@ -314,7 +316,7 @@ void portfolio()
        for (Int_t j = 0; j <= i; j++) {
           Double_t sum = 0.;
           for (Int_t k = 0; k < nrData; k++)
diff --git a/root-tformulaparsingtests.patch b/root-tformulaparsingtests.patch
deleted file mode 100644
index 956c6dc..0000000
--- a/root-tformulaparsingtests.patch
+++ /dev/null
@@ -1,934 +0,0 @@
-diff --git a/test/TFormulaParsingTests.h b/test/TFormulaParsingTests.h
-index 060d149..4a2957c 100644
---- a/test/TFormulaParsingTests.h
-+++ b/test/TFormulaParsingTests.h
-@@ -6,26 +6,26 @@
- #include "TMath.h"
- #include "Math/ChebyshevPol.h"
- 
--#include <limits>
--#include <cstdlib>
- #include <stdio.h>
- // test of tformula neeeded to be run
- 
--
- class TFormulaParsingTests {
- 
--   
--bool verbose; 
--std::vector<int> failedTests; 
-+bool verbose;
-+std::vector<int> failedTests;
- 
- // We need a softer way to reason about equality in 32 bits
- // Being this a quick test, doing the check at runtime is really no problem.
--bool fpEqual(double x, double y, bool epsilon = false)
-+bool fpEqual(double x, double y, double epsilon = 0.)
- {
--   bool isEqual = epsilon ? std::abs(x-y) <= std::numeric_limits<double>::epsilon() : x == y;
-+   bool isEqual;
-+   if (epsilon == 0.)
-+      isEqual = (x == y);
-+   else
-+      isEqual = TMath::AreEqualAbs(x, y, epsilon);
-    if (!isEqual) {
--       // std::hexfloat not there for older gcc versions
--       printf("\nThe numbers differ: %A and %A\n", x, y);
-+      // std::hexfloat not there for older gcc versions
-+      printf("\nThe numbers differ: %A and %A\n", x, y);
-    }
-    return isEqual;
- }
-@@ -42,65 +42,53 @@ bool test1() {
-    f2.SetParameters(1,2,3,4);
- 
-    return (f2.Eval(2) == 39.);
--
- }
- 
- bool test2() {
--
-    TF1 f1("f1","[0]+[1]*x");
-    TF1 f2("f2","[0]+[1]*x*f1");
- 
--   TF1 f3("f3",f2.GetExpFormula() ); 
-+   TF1 f3("f3",f2.GetExpFormula());
- 
-    f3.SetParameters(1,2,3,4);
- 
-    return (f3.Eval(2) == 45.);
--
- }
- 
--
- bool test3() {
--
--   // still tets composition of functions
-+   // still test composition of functions
-    TF1 f1("f1","gaus");
-    TF1 f2("f2","[0]+[1]*x+f1");
- 
--
-    f2.SetParameters(10,2,5,2,1);
- 
--   f1.SetParameters(5,2,1); 
--
--   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
-+   f1.SetParameters(5,2,1);
- 
-+   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
- }
- 
- bool test4() {
--
-    // similar but with different name (it contains gaus)
-    TF1 f1("fgaus","gaus");
-    TF1 f2("f2","[0]+[1]*x+fgaus");
- 
--
-    f2.SetParameters(10,2,5,2,1);
- 
--   f1.SetParameters(5,2,1); 
--
--   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
-+   f1.SetParameters(5,2,1);
- 
-+   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
- }
--bool test5() {
- 
-+bool test5() {
-    // similar but with different name (it contains gaus)
-    TF1 f1("gausnfunc","gaus");
-    TF1 f2("f2","[0]+[1]*x+gausnfunc");
- 
--
-    f2.SetParameters(10,2,5,2,1);
- 
--   f1.SetParameters(5,2,1); 
--
--   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)) );
-+   f1.SetParameters(5,2,1);
- 
-+   return (f2.Eval(2) == (10. + 2*2 + f1.Eval(2)));
- }
- 
- bool test1a() {
-@@ -111,10 +99,9 @@ bool test1a() {
-    return true;
- }
- 
--
- bool test6() {
-    // test linear function used in fitting
--   bool ok = true; 
-+   bool ok = true;
-    double x[] = {1,2,3,4,5};
-    double y[] = {1,4,7,9,10};
-    TGraph g(5,x,y);
-@@ -122,7 +109,7 @@ bool test6() {
-    int iret = g.Fit("x++1","Q");
-    ok &= (iret == 0);
-    iret = g.Fit("1++x","Q");
--   return iret == 0; 
-+   return iret == 0;
- }
- 
- bool test7() {
-@@ -130,45 +117,44 @@ bool test7() {
-    TF1 * f1 = new TF1("f1","1++x");
-    if (f1->GetNpar() != 2) return false;
-    f1->SetParameters(2,3);
--   if (f1->Eval(3) != 11) return  false;
-+   if (f1->Eval(3) != 11) return false;
- 
--   if (verbose) printf("Test7: test linear part1 of function\n"); 
-+   if (verbose) printf("Test7: test linear part1 of function\n");
-    TFormula * lin1 = (TFormula*) f1->GetLinearPart(1);
-    assert (lin1);
--   if (lin1->Eval(3) != 3) return false; 
-+   if (lin1->Eval(3) != 3) return false;
-+
-+   if (verbose) printf("Test7: test copying linear function\n");
- 
--   if (verbose) printf("Test7: test copying linear function\n"); 
--   
-    TF1 * f2 = new TF1(*f1);
--   if (f2->Eval(3) != 11) return  false;
-+   if (f2->Eval(3) != 11) return false;
- 
-    if (verbose) printf("Test7: test linear part1 of copied function\n");
--   if (!f2->IsLinear()) return false; 
-+   if (!f2->IsLinear()) return false;
-    lin1 = (TFormula*) f2->GetLinearPart(1);
-    assert (lin1);
--   if (lin1->Eval(3) != 3) return false; 
-+   if (lin1->Eval(3) != 3) return false;
- 
-    delete f1;
- 
--   if (verbose) printf("Test7: test cloning linear function\n"); 
-+   if (verbose) printf("Test7: test cloning linear function\n");
- 
-    TF1 * f3 = (TF1*) f2->Clone("f3");
--   if (f3->Eval(3) != 11) return  false;
-+   if (f3->Eval(3) != 11) return false;
- 
--   if (verbose) printf("Test7: test deleting the copied function\n"); 
-+   if (verbose) printf("Test7: test deleting the copied function\n");
-    delete f2;
- 
--   if (verbose) printf("Test7: test linear part1 of cloned function\n"); 
--   if (!f3->IsLinear()) return false; 
-+   if (verbose) printf("Test7: test linear part1 of cloned function\n");
-+   if (!f3->IsLinear()) return false;
-    lin1 = (TFormula*) f3->GetLinearPart(1);
-    assert (lin1);
--   if (verbose) printf("Test7: test evaluating linear part1 of cloned function\n"); 
--   if (lin1->Eval(3) != 3) return false; 
--
-+   if (verbose) printf("Test7: test evaluating linear part1 of cloned function\n");
-+   if (lin1->Eval(3) != 3) return false;
- 
--   if (verbose) printf("Test7: test deleting the cloned function\n"); 
--   delete f3; 
--   return true; 
-+   if (verbose) printf("Test7: test deleting the cloned function\n");
-+   delete f3;
-+   return true;
- }
- 
- bool test8() {
-@@ -178,39 +164,38 @@ bool test8() {
-    f = new TFormula("f","x^y");
- 
-    ok &= (f->Eval(2,3) == 8);
--   delete f; 
-+   delete f;
- 
-    f = new TFormula("f","(x+[0])^y");
-    f->SetParameter(0,1);
-    ok &= (f->Eval(2,3) == 27);
--   delete f; 
-+   delete f;
- 
-    f = new TFormula("f","sqrt(x+[0])^y");
-    f->SetParameter(0,2);
-    ok &= (f->Eval(2,3) == 8);
--   delete f; 
-+   delete f;
- 
-    f = new TFormula("f","[0]/((x+2)^y)");
-    f->SetParameter(0,27);
-    ok &= (f->Eval(1,3) == 1);
--   delete f; 
--   
-+   delete f;
-+
-    f = new TFormula("f","[0]/((x+2)^(y+1))");
-    f->SetParameter(0,27);
-    ok &= (f->Eval(1,2) == 1);
--   delete f; 
-+   delete f;
- 
-    // test also nested operators
-    f = new TFormula("f","((x+1)^y)^z");
-    ok &= (f->Eval(1,3,4) == 4096);
--   delete f; 
-+   delete f;
- 
-    f = new TFormula("f","x^((y+1)^z)");
-    ok &= (f->Eval(2,1,3) == 256);
-    delete f;
--   
-+
-    return ok;
--   
- }
- 
- bool test9() {
-@@ -220,7 +205,7 @@ bool test9() {
-    TFormula * f = 0;
-    f = new TFormula("f","x+2.0e1");
-    ok &= (f->Eval(1) == 21.);
--   
-+
-    f = new TFormula("f","x*2.e-1");
-    ok &= (f->Eval(10) == 2.);
- 
-@@ -232,25 +217,23 @@ bool test9() {
- 
-    delete f;
-    return ok;
--
--   
- }
- 
- bool test10() {
-    // test the operator "? : "
-    bool ok = true;
-    TFormula * f = 0;
--   f  = new TFormula("f","(x<0)?-x:x");
--   ok &= (f->Eval(-2) == 2); 
-+   f = new TFormula("f","(x<0)?-x:x");
-+   ok &= (f->Eval(-2) == 2);
-    ok &= (f->Eval(2) == 2);
- 
-    f = new TFormula("f","(x<0)?x:pol2");
-    f->SetParameters(1,2,3);
--   ok &= (f->Eval(-2) == -2); 
--   ok &= (f->Eval(2) == 1 + 2*2 + 2*2*3); 
-+   ok &= (f->Eval(-2) == -2);
-+   ok &= (f->Eval(2) == 1 + 2*2 + 2*2*3);
- 
-    delete f;
--   return ok; 
-+   return ok;
- }
- 
- bool test11() {
-@@ -260,17 +243,18 @@ bool test11() {
-    TFormula f1("f","ROOT::Math::normal_pdf(x,1,2)");
-    TFormula f2("f","[0]+TMath::Gaus(x,2,1,true)");
-    f2.SetParameter(0,1);
--   ok &= ( (f1.Eval(2) +1. ) == f2.Eval(2) );
-+   ok &= ((f1.Eval(2) + 1.) == f2.Eval(2));
-    return ok;
- }
--bool test12() { 
--   // test parameters order 
--   bool ok = true; 
--   TFormula * f = 0; 
-+
-+bool test12() {
-+   // test parameters order
-+   bool ok = true;
-+   TFormula * f = 0;
-    f = new TFormula("f","[2] + [3]*x + [0]*x^2 + [1]*x^3");
-    f->SetParameters(1,2,3,4);
-    double result = 3+4*2+1*4+2*8;
--   ok &= (f->Eval(2) == result); 
-+   ok &= (f->Eval(2) == result);
-    f = new TFormula("f","[b] + [c]*x + [d]*x^2 + [a]*x^3");
-    f->SetParameters(1,2,3,4);
-    result = 2+3*2+4*4+1*8;
-@@ -281,29 +265,32 @@ bool test12() {
-    return ok;
- }
- 
--bool test13()  {
-+bool test13() {
-    // test GetExpFormula
-    TFormula f("f","[2] + [0]*x + [1]*x*x");
-    f.SetParameters(1,2,3);
-    return (f.GetExpFormula() == TString("[p2]+[p0]*x+[p1]*x*x"));
- }
--bool test14()  {
-+
-+bool test14() {
-    // test GetExpFormula
-    TFormula f("f","[2] + [0]*x + [1]*x*x");
-    f.SetParameters(1,2,3);
-    return (f.GetExpFormula("P") == TString("3+1*x+2*x*x"));
- }
--bool test15()  {
-+
-+bool test15() {
-    // test GetExpFormula
-    TFormula f("f","[2] + [0]*x + [1]*x*x");
-    f.SetParameters(1,2,3);
--   return (f.GetExpFormula("CLING") == TString("p[2]+p[0]*x[0]+p[1]*x[0]*x[0] ") ); // need an extra white space
-+   return (f.GetExpFormula("CLING") == TString("p[2]+p[0]*x[0]+p[1]*x[0]*x[0] ")); // need an extra white space
- }
--bool test16()  {
-+
-+bool test16() {
-    // test GetExpFormula
-    TFormula f("f","[2] + [0]*x + [1]*x*x");
-    f.SetParameters(1,2,3);
--   return (f.GetExpFormula("CLING P") == TString("3.000000+1.000000*x[0]+2.000000*x[0]*x[0] ") );
-+   return (f.GetExpFormula("CLING P") == TString("3.000000+1.000000*x[0]+2.000000*x[0]*x[0] "));
- }
- 
- bool test17() {
-@@ -312,10 +299,10 @@ bool test17() {
-    f1->SetParameters(2,3);
-    TF1 * f0 = new TF1("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]); },0,10,2);
-    f0->SetParameters(2,3);
--   bool ok = true; 
--   ok &= fpEqual(f1->Eval(1.5) , f0->Eval(1.5) );
-+   bool ok = true;
-+   ok &= fpEqual(f1->Eval(1.5), f0->Eval(1.5));
-    double xx[1] = {2.5};
--   ok &= fpEqual(f1->EvalPar(xx) , f0->Eval(2.5) );
-+   ok &= fpEqual(f1->EvalPar(xx), f0->Eval(2.5));
-    return ok;
- }
- 
-@@ -325,12 +312,12 @@ bool test18() {
-    f1->SetParameters(2,3);
-    TF2 * f0 = new TF2("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]*x[1]); },0,10,0,10,2);
-    f0->SetParameters(2,3);
--   bool ok = true; 
--   ok &= fpEqual(f1->Eval(1.5,2.5) , f0->Eval(1.5,2.5) );
-+   bool ok = true;
-+   ok &= fpEqual(f1->Eval(1.5,2.5), f0->Eval(1.5,2.5));
-    double par[2] = {3,4};
-    double xx[2] = {0.8,1.6};
--   ok &= fpEqual(f1->EvalPar(xx,par) , f0->EvalPar(xx,par) );
--   return ok; 
-+   ok &= fpEqual(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-+   return ok;
- }
- 
- bool test19() {
-@@ -339,12 +326,12 @@ bool test19() {
-    f1->SetParameters(2,3);
-    TF3 * f0 = new TF3("f0",[](double *x, double *p){ return p[0]*sin(p[1]*x[0]*x[1]*x[2]); },0,10,0,10,0,10,2);
-    f0->SetParameters(2,3);
--   bool ok = true; 
--   ok &= fpEqual(f1->Eval(1.5,2.5,3.5) , f0->Eval(1.5,2.5,3.5) );
-+   bool ok = true;
-+   ok &= fpEqual(f1->Eval(1.5,2.5,3.5), f0->Eval(1.5,2.5,3.5));
-    double par[2] = {3,4};
-    double xx[3] = {0.8,1.6,2.2};
--   ok &= fpEqual(f1->EvalPar(xx,par) , f0->EvalPar(xx,par) );
--   return ok; 
-+   ok &= fpEqual(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
-+   return ok;
- }
- 
- bool test20() {
-@@ -353,12 +340,12 @@ bool test20() {
-    double params[16] = {1,0,1,1,1, 2,-1,2,0,2, 2,1,3,-1,2, 10};
-    f2.SetParameters(params);
-    TF2 f0("f2",[](double *x, double *p){ return p[0]*TMath::Gaus(x[0],p[1],p[2])*TMath::Gaus(x[1],p[3],p[4]) +
--            p[5]*TMath::Gaus(x[0],p[6],p[7])*TMath::Gaus(x[1],p[8],p[9]) + 
-+            p[5]*TMath::Gaus(x[0],p[6],p[7])*TMath::Gaus(x[1],p[8],p[9]) +
-             p[10]*TMath::Gaus(x[0],p[11],p[12])*TMath::Gaus(x[1],p[13],p[14]) + p[15]; },
-       -10,10,-10,10,16);
-    double xx[2]={1,2};
--   //printf(" difference = %f , value %f \n", f2.Eval(1,2) - f0.EvalPar(xx,params), f2.Eval(1,2) );
--   return fpEqual( f2.Eval(1,2) , f0.EvalPar(xx,params) );
-+   //printf(" difference = %f, value %f \n", f2.Eval(1,2) - f0.EvalPar(xx,params), f2.Eval(1,2));
-+   return fpEqual(f2.Eval(1,2), f0.EvalPar(xx,params));
- }
- 
- bool test21() {
-@@ -366,8 +353,8 @@ bool test21() {
-    TFormula f("f","pol2+gaus(3)");
-    f.SetParameters(1,2,3,1,0,1);
-    TF1 f0("f0",[](double *x, double *p){ return p[0]+x[0]*p[1]+x[0]*x[0]*p[2]+p[3]*TMath::Gaus(x[0],p[4],p[5]); },0,1,6);
--   f0.SetParameters(f.GetParameters() );
--   return fpEqual(f.Eval(2) , f0.Eval(2) );
-+   f0.SetParameters(f.GetParameters());
-+   return fpEqual(f.Eval(2), f0.Eval(2));
- }
- 
- bool test22() {
-@@ -375,36 +362,36 @@ bool test22() {
-    TF1 f("f","cheb10+[offset]");
-    double p[12] = {1,1,1,1,1,1,1,1,1,1,1,10 };
-    f.SetParameters(p);
--   return (f.Eval(0.5) == ROOT::Math::ChebyshevN(10, 0.5, p ) + f.GetParameter("offset"));
-+   return (f.Eval(0.5) == ROOT::Math::ChebyshevN(10, 0.5, p) + f.GetParameter("offset"));
- }
- 
- bool test23() {
-    // fix function compositions using pre-defined functions
--   bool ok = true; 
-+   bool ok = true;
-    TF1 f1("f1","gaus");
-    TF1 f2("f2","[0]+f1");
--   TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
-+   TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4);
-    f2.SetParameters(10,1,0,1);
--   f0.SetParameters(f2.GetParameters() );
--   ok &= fpEqual(f2.Eval(1) , f0.Eval(1) );
-+   f0.SetParameters(f2.GetParameters());
-+   ok &= fpEqual(f2.Eval(1), f0.Eval(1), 7e-16);
- 
-    TF1 f3("f3","f1+[0]");
-    // param order should be the same
--   f3.SetParameters( f2.GetParameters() );
--   ok &= fpEqual(f3.Eval(1) , f0.Eval(1) );
-+   f3.SetParameters(f2.GetParameters());
-+   ok &= fpEqual(f3.Eval(1), f0.Eval(1), 7e-16);
-    return ok;
- }
- 
- bool test24() {
-    // test I/O for parameter ordering
--   bool ok = true; 
-+   bool ok = true;
-    TF2 f("f","xygaus");
-    f.SetParameters(10,0,1,-1,2);
-    TF2 * f2 = (TF2*) f.Clone();
--   ok &= ( f.Eval(1,1) == f2->Eval(1,1) );
-+   ok &= (f.Eval(1,1) == f2->Eval(1,1));
-    // test with copy
-    TF2 f3(f);
--   ok &= ( f.Eval(1,1) == f3.Eval(1,1) );
-+   ok &= (f.Eval(1,1) == f3.Eval(1,1));
-    return ok;
- }
- 
-@@ -412,61 +399,61 @@ bool test25() {
-    // fix parsing of operator^ (ROOT-7349)
-    bool ok = true;
-    TF1 f1("f1","x^-2.5");
--   ok &= (f1.Eval(3.) == TMath::Power(3,-2.5) );
--   if (!ok)  std::cout << "Error in test25 - f != x^-2.5 " << f1.Eval(3.) << "  " <<  TMath::Power(3,-2.5) << std::endl;
-+   ok &= (f1.Eval(3.) == TMath::Power(3,-2.5));
-+   if (!ok) std::cout << "Error in test25 - f != x^-2.5 " << f1.Eval(3.) << "  " << TMath::Power(3,-2.5) << std::endl;
- 
-    TF1 f2("f2","x^+2.5");
-    //TF1 f3("f3","std::pow(x,2.5)");  // this needed to be fixed
-    TF1 f3("f3","TMath::Power(x,2.5)");
--   bool ret =  (f2.Eval(3.) == f3.Eval(3) );
--   if (!ret)  std::cout << "Error in test25 - f2 != f3 " << f2.Eval(3.) << "  " <<  f3.Eval(3.) << std::endl;
--   ok &= ret; 
-+   bool ret = (f2.Eval(3.) == f3.Eval(3));
-+   if (!ret) std::cout << "Error in test25 - f2 != f3 " << f2.Eval(3.) << "  " << f3.Eval(3.) << std::endl;
-+   ok &= ret;
- 
-    //cms test
-    TF1 t1("t1","(x<190)?(-18.7813+(((2.49368+(10.3321/(x^0.881126)))*exp(-((x^-1.66603)/0.074916)))-(-17.5757*exp(-((x^-1464.26)/-7.94004e+06))))):(1.09984+(0.394544*exp(-(x/562.407))))");
-    double x = 2;
-    double y =(x<190)?(-18.7813+(((2.49368+(10.3321/(std::pow(x,0.881126))))*exp(-((std::pow(x,-1.66603))/0.074916)))-(-17.5757*exp(-((std::pow(x,-1464.26))/-7.94004e+06))))):(1.09984+(0.394544*exp(-(x/562.407))));
-    // this fails on 32 bits - put a tolerance
--   ret = TMath::AreEqualAbs(t1.Eval(2) , y , 1.E-8);
--   if (!ret)  std::cout << "Error in test25 - t1 != y " << t1.Eval(2.) << "  " <<  y << std::endl;
--   ok &= ret; 
-+   ret = fpEqual(t1.Eval(2), y, 1.E-8);
-+   if (!ret) std::cout << "Error in test25 - t1 != y " << t1.Eval(2.) << "  " << y << std::endl;
-+   ok &= ret;
- 
-    // tests with scientific notations
-    auto ff = new TFormula("ff","x+2.e-2^1.2e-1");
--   ret = ( ff->Eval(1.) == (1. + std::pow(2.e-2,1.2e-1) ) );
--   if (!ret) std::cout << "Error in test25 - ff != expr " << ff->Eval(1.) << "  " <<   (1. + std::pow(2.e-2,1.2e-1) ) << std::endl;
--   ok &= ret; 
-+   ret = (ff->Eval(1.) == (1. + std::pow(2.e-2,1.2e-1)));
-+   if (!ret) std::cout << "Error in test25 - ff != expr " << ff->Eval(1.) << "  " << (1. + std::pow(2.e-2,1.2e-1)) << std::endl;
-+   ok &= ret;
- 
-    ff = new TFormula("ff","x^-1.2e1");
--   ret = ( ff->Eval(1.5) == std::pow(1.5,-1.2e1) ) ;
--   if (!ret) std::cout << "Error in test25 - ff(1.5) != pow " <<  ff->Eval(1.5) << "  " <<  std::pow(1.5,-1.2e1) << std::endl; 
--   ok &= ret; 
-+   ret = (ff->Eval(1.5) == std::pow(1.5,-1.2e1));
-+   if (!ret) std::cout << "Error in test25 - ff(1.5) != pow " << ff->Eval(1.5) << "  " << std::pow(1.5,-1.2e1) << std::endl;
-+   ok &= ret;
- 
-    ff = new TFormula("ff","1.5e2^x");
--   ret = ( ff->Eval(2) == std::pow(1.5e2,2) );
--   if (!ret) std::cout << "Error in test25 - ff(2) != pow " << ff->Eval(2) << "  " <<  std::pow(1.5e2,2) << std::endl; 
--   ok &= ret; 
-+   ret = (ff->Eval(2) == std::pow(1.5e2,2));
-+   if (!ret) std::cout << "Error in test25 - ff(2) != pow " << ff->Eval(2) << "  " << std::pow(1.5e2,2) << std::endl;
-+   ok &= ret;
- 
-    ff = new TFormula("ff","1.5e2^x^-1.1e-2");
--   ret = ( ff->Eval(2.) == std::pow(1.5e2, std::pow(2,-1.1e-2) ) );
--   if (!ret) std::cout << "Error in test25 - ff(2) != pow^pow " << ff->Eval(2.) << "  " <<  std::pow(1.5e2, std::pow(2,-1.1e-2) ) << std::endl; 
--   ok &= ret; 
-+   ret = (ff->Eval(2.) == std::pow(1.5e2, std::pow(2,-1.1e-2)));
-+   if (!ret) std::cout << "Error in test25 - ff(2) != pow^pow " << ff->Eval(2.) << "  " << std::pow(1.5e2, std::pow(2,-1.1e-2)) << std::endl;
-+   ok &= ret;
- 
-    // test same prelacements
-    ff = new TFormula("ff","pol10(3)+pol2");
-    std::vector<double> p = {1,2,3,4,5,6,7,8,9,10,11,12,13,14};
--   ff->SetParameters(p.data() );
--   double sum = 0; for (auto &a : p) { sum+= a;} 
--   ret = ( ff->Eval(1.) == sum );
--   if (!ret) std::cout << "Error in test25 - ff(1) != sum " << ff->Eval(1.) << "  " <<  sum << std::endl; 
--   ok &= ret; 
-+   ff->SetParameters(p.data());
-+   double sum = 0; for (auto &a : p) { sum+= a;}
-+   ret = (ff->Eval(1.) == sum);
-+   if (!ret) std::cout << "Error in test25 - ff(1) != sum " << ff->Eval(1.) << "  " << sum << std::endl;
-+   ok &= ret;
- 
--   return ok;   
-+   return ok;
- }
- 
- bool test26() {
-    // test sign function
--   bool ok = true;  
-+   bool ok = true;
-    TF1 f("f","x*sign(1.,x+2.)");
-    ok &= (f.Eval(2) == 2);
-    ok &= (f.Eval(-1) == -1);
-@@ -483,104 +470,95 @@ bool test26() {
- 
- bool test27() {
-    // test ssq function
--   bool ok = true;  
-+   bool ok = true;
-    TF1 f1("f1","x+sq(x+2)+sq(x+[0])");
-    TF1 f2("f2","x+(x+2)^2+(x+[0])^2");
-    f1.SetParameter(0,3); f2.SetParameter(0,3);
--   ok &= fpEqual(f1.Eval(2) , f2.Eval(2));
--   ok &= fpEqual(f1.Eval(-4) , f2.Eval(-4));
-+   ok &= fpEqual(f1.Eval(2), f2.Eval(2));
-+   ok &= fpEqual(f1.Eval(-4), f2.Eval(-4));
-    // test nested expressions and conflict with sqrt
-    TF1 f3("f3","sqrt(1.+sq(x))");
--   ok &= fpEqual(f3.Eval(2) , sqrt(5) );
-+   ok &= fpEqual(f3.Eval(2), sqrt(5));
-    TF1 f4("f4","sq(1.+std::sqrt(x))");
--   ok &= fpEqual(f4.Eval(2) , TMath::Sq(1.+sqrt(2)) );
-+   ok &= fpEqual(f4.Eval(2), TMath::Sq(1.+sqrt(2)));
-    TF1 f5("f5","sqrt(((TMath::Sign(1,[0])*sq([0]/x))+(sq([1])*(x^([3]-1))))+sq([2]))");
-    auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
-    TF1 f6("f6",func,-10,10,4);
-    f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
--   ok &= fpEqual(f5.Eval(2) , f6.Eval(2) );
-+   ok &= fpEqual(f5.Eval(2), f6.Eval(2), 4.e-16);
-    return ok;
- }
- 
- bool test28() {
--   bool ok = true; 
-+   bool ok = true;
-    // test composition of two functions
-    TF1 fsin("fsin", "[0]*sin(x)", 0., 10.);
--   fsin.SetParNames( "sin");
--   fsin.SetParameter( 0, 2.1);
-+   fsin.SetParNames("sin");
-+   fsin.SetParameter(0, 2.1);
- 
--   TF1  fcos("fcos", "[0]*cos(x)", 0., 10.);
--   fcos.SetParNames( "cos");
--   fcos.SetParameter( 0, 1.1);
-+   TF1 fcos("fcos", "[0]*cos(x)", 0., 10.);
-+   fcos.SetParNames("cos");
-+   fcos.SetParameter(0, 1.1);
- 
-    TF1 fsincos("fsc", "fsin+fcos");
- 
-    // keep same order in evaluation
-    TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
-    f0.SetParameters(1.1,2.1);
--#ifdef R__B64
--   bool epsilon = false;
--#else
--   bool epsilon = true;
--#endif
--   ok &= fpEqual(fsincos.Eval(2) , f0.Eval(2), epsilon);
-+   ok &= fpEqual(fsincos.Eval(2), f0.Eval(2), 3e-16);
-    return ok;
--
- }
- 
- bool test29() {
--   // test hexadecimal numbers 
--   bool ok = true; 
-+   // test hexadecimal numbers
-+   bool ok = true;
-    TF1 f1("f1","x+[0]*0xaf");
-    f1.SetParameter(0,2);
--   ok &= (f1.Eval(3) == (3.+2*175.) );
-+   ok &= (f1.Eval(3) == (3.+2*175.));
- 
-    TF1 f2("f2","0x64^2+x");
--   ok &= (f2.Eval(1) == 10001 );
-+   ok &= (f2.Eval(1) == 10001);
- 
-    TF1 f3("f3","x^0x000c+1");
--   ok &= (f3.Eval(2) == 4097 );
--
--   return ok; 
-+   ok &= (f3.Eval(2) == 4097);
- 
-+   return ok;
- }
- 
- bool test30() {
- // handle -- (++ is in linear expressions)
--   bool ok = true;    
-+   bool ok = true;
-    TF1 f1("f1","x--[0]");
-    f1.SetParameter(0,2);
--   ok &= (f1.Eval(3) == 5. );
--
--   return ok; 
-+   ok &= (f1.Eval(3) == 5.);
- 
-+   return ok;
- }
- 
- bool test31() {
- // test whitespaces in par name and cloning
--   bool ok = true;    
-+   bool ok = true;
-    TF1 f1("f1","x*[0]");
-    f1.SetParameter(0,2);
-    f1.SetParName(0,"First Param");
-    auto f2 = (TF1*) f1.Clone();
--   
--   ok &= (f1.Eval(3) == f2->Eval(3) );
--   ok &= (TString(f1.GetParName(0) ) == TString(f2->GetParName(0) ) );
- 
--   return ok; 
-+   ok &= (f1.Eval(3) == f2->Eval(3));
-+   ok &= (TString(f1.GetParName(0)) == TString(f2->GetParName(0)));
- 
-+   return ok;
- }
- 
--bool test32() { 
-+bool test32() {
- // test polynomial are linear and have right number
--   bool ok = true; 
--   TF1 f1("f1","pol2"); 
--   ok &= (f1.GetNumber() == 302); 
--   ok &= (f1.IsLinear() ); 
--
--   TF1 f2("f2","gaus(0)+pol1(3)"); 
--   ok &= (f2.GetNumber() == 0); 
--   ok &= (!f2.IsLinear()); 
-+   bool ok = true;
-+   TF1 f1("f1","pol2");
-+   ok &= (f1.GetNumber() == 302);
-+   ok &= (f1.IsLinear());
-+
-+   TF1 f2("f2","gaus(0)+pol1(3)");
-+   ok &= (f2.GetNumber() == 0);
-+   ok &= (!f2.IsLinear());
-    return ok;
- }
- 
-@@ -593,69 +571,69 @@ bool test33() {
-    f1.SetParameters(1,0,1,1,2,0.);
-    TF2 f2("f2","xygaus",-10,10,-10,10);
-    f2.SetParameters(1,0,1,1,2);
--   ok &= TMath::AreEqualAbs( f1.Eval(0), f2.Eval(0)/(f2.Integral(-10,10,-20,20) ), 1.E-4 );
-+   ok &= fpEqual(f1.Eval(0), f2.Eval(0)/(f2.Integral(-10,10,-20,20)), 1.E-4);
-    if (!ok) std::cout << "Error in test33 - " << f1.Eval(0) << "  " << f2.Eval(0)/f2.Integral(-10,10,-10,10) << std::endl;
--   return ok;          
-+   return ok;
- }
- 
- bool test34() {
-    // test for bug 8105
--   bool ok  = true;
-+   bool ok = true;
-    TF1 f1("f1","(1.- gaus)*[3]",-10,10);
--   f1.SetParameters(1,0,1,3); 
--   ok &=  TMath::AreEqualAbs( f1.Eval(1), (1.- TMath::Gaus(1,0,1) )*3., 1.E-10);
--   return ok; 
--   
-+   f1.SetParameters(1,0,1,3);
-+   ok &= fpEqual(f1.Eval(1), (1.- TMath::Gaus(1,0,1))*3., 1.E-10);
-+   return ok;
- }
--bool test35() { 
-+
-+bool test35() {
-    // test for similar pre-defined functions
-    bool ok = true;
-    TF1 f1("f1","cheb1(0)+cheb10(2)",-1,1);
-    std::vector<double> par(13);
-    par.assign(13,1.); par[1] = 2; par[2] = 3;
--   TF1 g1("g1",[](double *x, double *p){ return ROOT::Math::ChebyshevN(1, x[0], p ) + ROOT::Math::ChebyshevN(10,x[0],p+2 ); }, -1, 1, 13);
--   f1.SetParameters(par.data()); 
--   g1.SetParameters(par.data()); 
-+   TF1 g1("g1",[](double *x, double *p){ return ROOT::Math::ChebyshevN(1, x[0], p) + ROOT::Math::ChebyshevN(10,x[0],p+2); }, -1, 1, 13);
-+   f1.SetParameters(par.data());
-+   g1.SetParameters(par.data());
- 
--   ok &=  TMath::AreEqualRel( f1.Eval(2), g1.Eval(2), 1.E-6);
-+   ok &= TMath::AreEqualRel(f1.Eval(2), g1.Eval(2), 1.E-6);
-    if (!ok) std::cout << "Error in test35 - f1 != g1 " << f1.Eval(2) << "  " << g1.Eval(2) << std::endl;
--   
-+
-    TF1 f2("f2","cheb10(0)+cheb1(11)",-1,1);
--   TF1 g2("g2",[](double *x, double *p){ return ROOT::Math::ChebyshevN(10, x[0], p ) + ROOT::Math::ChebyshevN(1,x[0],p+11 ); }, -1, 1, 13);
--   f2.SetParameters(par.data()); 
--   g2.SetParameters(par.data()); 
-+   TF1 g2("g2",[](double *x, double *p){ return ROOT::Math::ChebyshevN(10, x[0], p) + ROOT::Math::ChebyshevN(1,x[0],p+11); }, -1, 1, 13);
-+   f2.SetParameters(par.data());
-+   g2.SetParameters(par.data());
- 
--   ok &=  TMath::AreEqualRel( f2.Eval(2), g2.Eval(2), 1.E-6);
-+   ok &= TMath::AreEqualRel(f2.Eval(2), g2.Eval(2), 1.E-6);
-    if (!ok) std::cout << "Error in test35 - f2 != g2 " << f2.Eval(2.) << "  " << g2.Eval(2.) << std::endl;
--   
--   return ok; 
-+
-+   return ok;
- }
--bool test36() { 
-+
-+bool test36() {
-    // test for mixed dim functions
-    bool ok = true;
-    TF2 f1("f1","xygaus(0) + gaus(5)");
-    f1.SetParameters(1,0,1,1,2,2,-1,1);
-    auto g1 = [](double x, double y){ return TMath::Gaus(x,0,1)*TMath::Gaus(y,1,2)+2.*TMath::Gaus(x,-1,1); };
--   ok &=  TMath::AreEqualAbs( f1.Eval(1,1), g1(1,1), 1.E-10);
-+   ok &= fpEqual(f1.Eval(1,1), g1(1,1), 1.E-10);
- 
-    TF2 f2("f2","xygaus(0) + gaus[y](5)");
-    f2.SetParameters(1,0,1,1,2,2,-1,1);
-    auto g2 = [](double x, double y){ return TMath::Gaus(x,0,1)*TMath::Gaus(y,1,2)+2.*TMath::Gaus(y,-1,1); };
--   ok &=  TMath::AreEqualAbs( f2.Eval(1,1), g2(1,1), 1.E-10);
-+   ok &= fpEqual(f2.Eval(1,1), g2(1,1), 1.E-10);
- 
--   
--   return ok; 
-+   return ok;
- }
- 
- bool test37() {
-   // test for inserting correcting polynomials (bug ROOT-8496)
-   bool ok = true;
-   TF1 f1("f1","[0]*pol1(1) + pol2(3)*[6]",0,1);
--  f1.SetParameters(2,1,2,1,2,3,4); 
-+  f1.SetParameters(2,1,2,1,2,3,4);
-   auto ref = [](double x) { return 2 * (1 + 2*x ) +  (1 + 2*x + 3*x*x) * 4 ; };
- 
--  ok &= TMath::AreEqualAbs( f1.Eval(0.5), ref(0.5), 1.E-10);
--  return ok; 
-+  ok &= fpEqual(f1.Eval(0.5), ref(0.5), 1.E-10);
-+  return ok;
- }
- 
- bool test38() {
-@@ -666,81 +644,80 @@ bool test38() {
-   ok &= (f1.Eval(0) == 2.);
-   TF1 f2("f2","[A]+[1]*x",0,1);
-   f2.SetParameters(999,2,3);
--  ok &= (f2.Eval(2) == 7.);  
--  return ok; 
-+  ok &= (f2.Eval(2) == 7.);
-+  return ok;
- }
-- 
--void PrintError(int itest)  { 
-+
-+void PrintError(int itest) {
-    Error("TFormula test","test%d FAILED ",itest);
-    failedTests.push_back(itest);
- }
-+
- void IncrTest(int & itest) {
-    if (itest > 0) std::cout << ".\n";
-    itest++;
-    std::cout << "Test " << itest << " :        ";
--} 
-+}
- 
- int runTests(bool debug = false) {
- 
-    verbose = debug;
--         
-+
-    int itest = 0;
- 
--   
--   IncrTest(itest); if (!test1() ) { PrintError(itest); } 
--   IncrTest(itest); if (!test2() ) { PrintError(itest); }
--   IncrTest(itest); if (!test3() ) { PrintError(itest); }
--   IncrTest(itest); if (!test4() ) { PrintError(itest); }
--   IncrTest(itest); if (!test5() ) { PrintError(itest); }
--   IncrTest(itest); if (!test6() ) { PrintError(itest); }
--   IncrTest(itest); if (!test7() ) { PrintError(itest); }
--   IncrTest(itest); if (!test8() ) { PrintError(itest); }
--   IncrTest(itest); if (!test9() ) { PrintError(itest); }
--   IncrTest(itest); if (!test10() ) { PrintError(itest); }
--   IncrTest(itest); if (!test11() ) { PrintError(itest); }
--   IncrTest(itest); if (!test12() ) { PrintError(itest); }
--   IncrTest(itest); if (!test13() ) { PrintError(itest); }
--   IncrTest(itest); if (!test14() ) { PrintError(itest); }
--   IncrTest(itest); if (!test15() ) { PrintError(itest); }
--   IncrTest(itest); if (!test16() ) { PrintError(itest); }
--   IncrTest(itest); if (!test17() ) { PrintError(itest); }
--   IncrTest(itest); if (!test18() ) { PrintError(itest); }
--   IncrTest(itest); if (!test19() ) { PrintError(itest); }
--   IncrTest(itest); if (!test20() ) { PrintError(itest); }
--   IncrTest(itest); if (!test21() ) { PrintError(itest); }
--   IncrTest(itest); if (!test22() ) { PrintError(itest); }
--   IncrTest(itest); if (!test23() ) { PrintError(itest); }
--   IncrTest(itest); if (!test24() ) { PrintError(itest); }
--   IncrTest(itest); if (!test25() ) { PrintError(itest); }
--   IncrTest(itest); if (!test26() ) { PrintError(itest); }
--   IncrTest(itest); if (!test27() ) { PrintError(itest); }
--   IncrTest(itest); if (!test28() ) { PrintError(itest); }
--   IncrTest(itest); if (!test29() ) { PrintError(itest); }
--   IncrTest(itest); if (!test30() ) { PrintError(itest); }
--   IncrTest(itest); if (!test31() ) { PrintError(itest); }
--   IncrTest(itest); if (!test32() ) { PrintError(itest); }
--   IncrTest(itest); if (!test33() ) { PrintError(itest); }
--   IncrTest(itest); if (!test34() ) { PrintError(itest); }
--   IncrTest(itest); if (!test35() ) { PrintError(itest); }
--   IncrTest(itest); if (!test36() ) { PrintError(itest); }
--   IncrTest(itest); if (!test37() ) { PrintError(itest); }
--   IncrTest(itest); if (!test38() ) { PrintError(itest); }
-+   IncrTest(itest); if (!test1()) { PrintError(itest); }
-+   IncrTest(itest); if (!test2()) { PrintError(itest); }
-+   IncrTest(itest); if (!test3()) { PrintError(itest); }
-+   IncrTest(itest); if (!test4()) { PrintError(itest); }
-+   IncrTest(itest); if (!test5()) { PrintError(itest); }
-+   IncrTest(itest); if (!test6()) { PrintError(itest); }
-+   IncrTest(itest); if (!test7()) { PrintError(itest); }
-+   IncrTest(itest); if (!test8()) { PrintError(itest); }
-+   IncrTest(itest); if (!test9()) { PrintError(itest); }
-+   IncrTest(itest); if (!test10()) { PrintError(itest); }
-+   IncrTest(itest); if (!test11()) { PrintError(itest); }
-+   IncrTest(itest); if (!test12()) { PrintError(itest); }
-+   IncrTest(itest); if (!test13()) { PrintError(itest); }
-+   IncrTest(itest); if (!test14()) { PrintError(itest); }
-+   IncrTest(itest); if (!test15()) { PrintError(itest); }
-+   IncrTest(itest); if (!test16()) { PrintError(itest); }
-+   IncrTest(itest); if (!test17()) { PrintError(itest); }
-+   IncrTest(itest); if (!test18()) { PrintError(itest); }
-+   IncrTest(itest); if (!test19()) { PrintError(itest); }
-+   IncrTest(itest); if (!test20()) { PrintError(itest); }
-+   IncrTest(itest); if (!test21()) { PrintError(itest); }
-+   IncrTest(itest); if (!test22()) { PrintError(itest); }
-+   IncrTest(itest); if (!test23()) { PrintError(itest); }
-+   IncrTest(itest); if (!test24()) { PrintError(itest); }
-+   IncrTest(itest); if (!test25()) { PrintError(itest); }
-+   IncrTest(itest); if (!test26()) { PrintError(itest); }
-+   IncrTest(itest); if (!test27()) { PrintError(itest); }
-+   IncrTest(itest); if (!test28()) { PrintError(itest); }
-+   IncrTest(itest); if (!test29()) { PrintError(itest); }
-+   IncrTest(itest); if (!test30()) { PrintError(itest); }
-+   IncrTest(itest); if (!test31()) { PrintError(itest); }
-+   IncrTest(itest); if (!test32()) { PrintError(itest); }
-+   IncrTest(itest); if (!test33()) { PrintError(itest); }
-+   IncrTest(itest); if (!test34()) { PrintError(itest); }
-+   IncrTest(itest); if (!test35()) { PrintError(itest); }
-+   IncrTest(itest); if (!test36()) { PrintError(itest); }
-+   IncrTest(itest); if (!test37()) { PrintError(itest); }
-+   IncrTest(itest); if (!test38()) { PrintError(itest); }
- 
-    std::cout << ".\n";
--    
--   if (failedTests.size() == 0)  
-+
-+   if (failedTests.size() == 0)
-       std::cout << "All TFormula Parsing tests PASSED !" << std::endl;
-    else {
--      Error("TFORMULA Tests","%d tests failed ",int(failedTests.size()) );
-+      Error("TFORMULA Tests","%d tests failed ",int(failedTests.size()));
-       std::cout << "failed tests are : ";
--      for (auto & ittest : failedTests) { 
-+      for (auto & ittest : failedTests) {
-          std::cout << ittest << "   ";
-       }
-       std::cout << std::endl;
-    }
--   
--   return failedTests.size(); 
--   
-+
-+   return failedTests.size();
- }
- 
- };
diff --git a/root.spec b/root.spec
index 0fd4a8d..acbfd13 100644
--- a/root.spec
+++ b/root.spec
@@ -21,9 +21,9 @@
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
-Version:	6.08.04
+Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -42,7 +42,7 @@ Source2:	%{name}-testfiles.sh
 Source3:	rootd.service
 Source4:	proofd.service
 #		Allow running tests
-#		https://github.com/root-mirror/root/pull/130
+#		https://github.com/root-project/root/pull/130
 Patch0:		%{name}-test-install.patch
 #		Use system fonts
 Patch1:		%{name}-fontconfig.patch
@@ -52,63 +52,58 @@ Patch2:		%{name}-dont-link-jvm.patch
 Patch3:		%{name}-doc-no-notebooks.patch
 #		Don't run gui macros
 Patch4:		%{name}-avoid-gui-crash.patch
-
-#		Test fixes
-#		https://github.com/root-mirror/root/pull/155
-
 #		Use files in source tree during tests
+#		https://github.com/root-project/root/pull/403
 Patch5:		%{name}-template-files.patch
 #		Use cache read option
+#		https://github.com/root-project/root/pull/404
 Patch6:		%{name}-cache-test.patch
 #		Fixes for tests on ix86
+#		https://github.com/root-project/root/pull/400
+#		https://github.com/root-project/root/pull/401
 Patch7:		%{name}-32bit.patch
-#		Clean up TFormulaParsingTests
-Patch8:		%{name}-tformulaparsingtests.patch
+#		Fix root-config for s390/s390x
+#		https://github.com/root-project/root/pull/406
+Patch8:		%{name}-s390x.patch
 #		Typo in TFormulaTests
+#		https://github.com/root-project/root/pull/405
 Patch9:		%{name}-tformulatests-typo.patch
 #		Don't download testdata
+#		https://github.com/root-project/root/pull/402
 Patch10:	%{name}-no-testdata.patch
-
-#		Miscellaneous
-
 #		Missing includes
-#		https://github.com/root-mirror/root/pull/269
+#		https://github.com/root-project/root/pull/269
 Patch11:	%{name}-missing-includes.patch
 #		Old FSF address
-#		https://github.com/root-mirror/root/pull/270
+#		https://github.com/root-project/root/pull/270
 Patch12:	%{name}-fsf-addr.patch
 #		Name clash HZ
-#		https://github.com/root-mirror/root/pull/309
+#		https://github.com/root-project/root/pull/309
 Patch13:	%{name}-hz.patch
 #		Fix errors when building documentation
-#		https://github.com/root-mirror/root/pull/310
+#		https://github.com/root-project/root/pull/310
 Patch14:	%{name}-global-name-not-defined.patch
 #		Fix paths in image tutorial
-#		https://github.com/root-mirror/root/pull/311
+#		https://github.com/root-project/root/pull/311
 Patch15:	%{name}-rose-image.patch
 #		Fix stressGraphics.ref
-#		https://github.com/root-mirror/root/pull/312
+#		https://github.com/root-project/root/pull/312
 Patch16:	%{name}-stressgraphics.patch
 #		Fix broken TPad::WaitPrimitive (backport from git)
 Patch17:	%{name}-TPad-WaitPrimitive.patch
-#		Don't wait for user interaction in batch mode
-#		https://github.com/root-mirror/root/pull/322
-Patch18:	%{name}-spectrum-batch.patch
-#		Add missing header (gcc 7)
-#		https://github.com/root-mirror/root/pull/353
-Patch19:	%{name}-missing-header-gcc7.patch
 #		Fix for test suite on Fedora 26 i686
-#		https://github.com/root-mirror/root/pull/359
-Patch20:	%{name}-Quantiles.patch
+#		https://github.com/root-project/root/pull/359
+Patch18:	%{name}-Quantiles.patch
 #		Fix format warnings/errors
-#		https://github.com/root-mirror/root/pull/376
-Patch21:	%{name}-format.patch
+#		https://github.com/root-project/root/pull/376
+Patch19:	%{name}-format.patch
 #		Allow both absolute and relative python install paths
-#		https://github.com/root-mirror/root/pull/382
-Patch22:	%{name}-python-install-path.patch
+#		https://github.com/root-project/root/pull/382
+Patch20:	%{name}-python-install-path.patch
 
 #		The build on aarch64 used to work, but is now broken again
 #		https://pagure.io/releng/issue/6653
+#		https://sft.its.cern.ch/jira/browse/ROOT-8702
 ExcludeArch:	aarch64
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -1583,8 +1578,6 @@ ROOT as a Jupyter Notebook.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2093,18 +2086,35 @@ popd
 # - tutorial-multicore-imt101_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
-# - tutorial-r-*
-#   occasionally causes random crashes
-#
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
 # - test-stressHistFactory-interpreted
 # - tutorial-histfactory-example
+# - tutorial-r-*
 #   currently fails on 32 bit arm - reported upstream:
 #   https://sft.its.cern.ch/jira/browse/ROOT-8500
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing|tutorial-r-.*"
+#
+# - test-stresshistogram
+# - test-stresshistogram-interpreted
+# - test-stressroostats
+# - test-stressroostats-interpreted
+# - test-stresshistofit
+# - test-stresshistofit-interpreted
+# - tutorial-roofit-rf511_wsfactory_basic
+# - tutorial-roostats-HybridInstructional
+# - tutorial-roostats-rs701_BayesianCalculator
+# - tutorial-pyroot-benchmarks
+# - tutorial-pyroot-ratioplot
+# - tutorial-pyroot-shapes
+#   currently fails on s390x - reported upstream
+#   https://sft.its.cern.ch/jira/browse/ROOT-8703
+
+excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing"
 %ifarch %{arm}
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|test-stressHistFactory-interpreted|tutorial-histfactory-example"
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|test-stressHistFactory-interpreted|tutorial-histfactory-example|tutorial-r-.*"
+%endif
+%ifarch s390x
+excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-HybridInstructional|tutorial-roostats-rs701_BayesianCalculator|tutorial-pyroot-benchmarks|tutorial-pyroot-ratioplot|tutorial-pyroot-shapes"
 %endif
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
@@ -3126,6 +3136,13 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu Mar 02 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-1
+- Update to 6.08.06
+- Drop obsolete patch: root-tformulaparsingtests.patch
+- Drop patches accepted upstream: root-spectrum-batch.patch and
+  root-missing-header-gcc7.patch
+- Disable failing tests on s390x
+
 * Wed Mar 01 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.04-3
 - Disable building on aarch64 (it is now broken again)
 - Add missing header (gcc 7)
diff --git a/sources b/sources
index 8e66c44..2144ec1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.08.04.tar.xz) = db3480e6de919cf09ac32b9e3ce9901a0772313024786f053786b3df400a660683aca65e4d91c7f76d8c62ebf4a36deda6d556df1196d76277ccb060445531ce
+SHA512 (root-6.08.06.tar.xz) = f9604055bee65b9dba69ad64f69749f6cfd8e7b84b487a0552f5a54806447f97f3372c35610f43045bd9ef3304be87095c6a595bc5b0985d6822d8cf6c22c8b1
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From fa467511f17610392d5a72c774b009a5d83c0502 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 16 Mar 2017 06:12:37 +0100
Subject: [PATCH 105/344] Fix relocation problems on aarch64 - using patch from
 the llvm package Re-enable building on aarch64 - works again with the above
 patch

---
 root-aarch64.patch | 196 +++++++++++++++++++++++++++++++++++++++++++++
 root.spec          |  16 +++-
 2 files changed, 208 insertions(+), 4 deletions(-)
 create mode 100644 root-aarch64.patch

diff --git a/root-aarch64.patch b/root-aarch64.patch
new file mode 100644
index 0000000..268f37b
--- /dev/null
+++ b/root-aarch64.patch
@@ -0,0 +1,196 @@
+diff --git a/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h b/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
+index 6dcd2d4..bafbd36 100644
+--- a/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
++++ b/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
+@@ -905,7 +905,7 @@ unsigned ELFObjectFile<ELFT>::getArch() const {
+   case ELF::EM_X86_64:
+     return Triple::x86_64;
+   case ELF::EM_AARCH64:
+-    return Triple::aarch64;
++    return IsLittleEndian ? Triple::aarch64 : Triple::aarch64_be;
+   case ELF::EM_ARM:
+     return Triple::arm;
+   case ELF::EM_AVR:
+diff --git a/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h b/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
+index 5e0df98..b59e8ec 100644
+--- a/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
++++ b/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
+@@ -86,6 +86,7 @@ private:
+           return RelocToApply();
+         }
+       case Triple::aarch64:
++      case Triple::aarch64_be:
+         switch (RelocType) {
+         case llvm::ELF::R_AARCH64_ABS32:
+           return visitELF_AARCH64_ABS32(R, Value);
+diff --git a/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+index f2a46b8..9e306bb 100644
+--- a/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
++++ b/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+@@ -309,6 +309,8 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
+   uint32_t *TargetPtr =
+       reinterpret_cast<uint32_t *>(Section.getAddressWithOffset(Offset));
+   uint64_t FinalAddress = Section.getLoadAddressWithOffset(Offset);
++  // Data should use target endian. Code should always use little endian.
++  bool isBE = Arch == Triple::aarch64_be;
+ 
+   DEBUG(dbgs() << "resolveAArch64Relocation, LocalAddress: 0x"
+                << format("%llx", Section.getAddressWithOffset(Offset))
+@@ -324,14 +326,22 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
+   case ELF::R_AARCH64_ABS64: {
+     uint64_t *TargetPtr =
+         reinterpret_cast<uint64_t *>(Section.getAddressWithOffset(Offset));
+-    *TargetPtr = Value + Addend;
++    if (isBE)
++      support::ubig64_t::ref{TargetPtr} = Value + Addend;
++    else
++      support::ulittle64_t::ref{TargetPtr} = Value + Addend;
+     break;
+   }
+   case ELF::R_AARCH64_PREL32: {
+     uint64_t Result = Value + Addend - FinalAddress;
+     assert(static_cast<int64_t>(Result) >= INT32_MIN &&
+            static_cast<int64_t>(Result) <= UINT32_MAX);
+-    *TargetPtr = static_cast<uint32_t>(Result & 0xffffffffU);
++    if (isBE)
++      support::ubig32_t::ref{TargetPtr} =
++        static_cast<uint32_t>(Result & 0xffffffffU);
++    else
++      support::ulittle32_t::ref{TargetPtr} =
++        static_cast<uint32_t>(Result & 0xffffffffU);
+     break;
+   }
+   case ELF::R_AARCH64_CALL26: // fallthrough
+@@ -339,6 +349,7 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
+     // Operation: S+A-P. Set Call or B immediate value to bits fff_fffc of the
+     // calculation.
+     uint64_t BranchImm = Value + Addend - FinalAddress;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // "Check that -2^27 <= result < 2^27".
+     assert(isInt<28>(BranchImm));
+@@ -352,91 +363,105 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
+   }
+   case ELF::R_AARCH64_MOVW_UABS_G3: {
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffe0001fU;
++    TargetValue &= 0xffe0001fU;
+     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
+-    *TargetPtr |= Result >> (48 - 5);
++    TargetValue |= ((Result & 0xffff000000000000ULL) >> (48 - 5));
+     // Shift must be "lsl #48", in bits 22:21
+-    assert((*TargetPtr >> 21 & 0x3) == 3 && "invalid shift for relocation");
++    assert((TargetValue >> 21 & 0x3) == 3 && "invalid shift for relocation");
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_MOVW_UABS_G2_NC: {
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffe0001fU;
++    TargetValue &= 0xffe0001fU;
+     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
+-    *TargetPtr |= ((Result & 0xffff00000000ULL) >> (32 - 5));
++    TargetValue |= ((Result & 0xffff00000000ULL) >> (32 - 5));
+     // Shift must be "lsl #32", in bits 22:21
+-    assert((*TargetPtr >> 21 & 0x3) == 2 && "invalid shift for relocation");
++    assert((TargetValue >> 21 & 0x3) == 2 && "invalid shift for relocation");
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_MOVW_UABS_G1_NC: {
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffe0001fU;
++    TargetValue &= 0xffe0001fU;
+     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
+-    *TargetPtr |= ((Result & 0xffff0000U) >> (16 - 5));
++    TargetValue |= ((Result & 0xffff0000U) >> (16 - 5));
+     // Shift must be "lsl #16", in bits 22:2
+-    assert((*TargetPtr >> 21 & 0x3) == 1 && "invalid shift for relocation");
++    assert((TargetValue >> 21 & 0x3) == 1 && "invalid shift for relocation");
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_MOVW_UABS_G0_NC: {
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffe0001fU;
++    TargetValue &= 0xffe0001fU;
+     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
+-    *TargetPtr |= ((Result & 0xffffU) << 5);
++    TargetValue |= ((Result & 0xffffU) << 5);
+     // Shift must be "lsl #0", in bits 22:21.
+-    assert((*TargetPtr >> 21 & 0x3) == 0 && "invalid shift for relocation");
++    assert((TargetValue >> 21 & 0x3) == 0 && "invalid shift for relocation");
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_ADR_PREL_PG_HI21: {
+     // Operation: Page(S+A) - Page(P)
+     uint64_t Result =
+         ((Value + Addend) & ~0xfffULL) - (FinalAddress & ~0xfffULL);
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // Check that -2^32 <= X < 2^32
+     assert(isInt<33>(Result) && "overflow check failed for relocation");
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0x9f00001fU;
++    TargetValue &= 0x9f00001fU;
+     // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
+     // from bits 32:12 of X.
+-    *TargetPtr |= ((Result & 0x3000U) << (29 - 12));
+-    *TargetPtr |= ((Result & 0x1ffffc000ULL) >> (14 - 5));
++    TargetValue |= ((Result & 0x3000U) << (29 - 12));
++    TargetValue |= ((Result & 0x1ffffc000ULL) >> (14 - 5));
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_LDST32_ABS_LO12_NC: {
+     // Operation: S + A
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffc003ffU;
++    TargetValue &= 0xffc003ffU;
+     // Immediate goes in bits 21:10 of LD/ST instruction, taken
+     // from bits 11:2 of X
+-    *TargetPtr |= ((Result & 0xffc) << (10 - 2));
++    TargetValue |= ((Result & 0xffc) << (10 - 2));
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   case ELF::R_AARCH64_LDST64_ABS_LO12_NC: {
+     // Operation: S + A
+     uint64_t Result = Value + Addend;
++    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
+ 
+     // AArch64 code is emitted with .rela relocations. The data already in any
+     // bits affected by the relocation on entry is garbage.
+-    *TargetPtr &= 0xffc003ffU;
++    TargetValue &= 0xffc003ffU;
+     // Immediate goes in bits 21:10 of LD/ST instruction, taken
+     // from bits 11:3 of X
+-    *TargetPtr |= ((Result & 0xff8) << (10 - 3));
++    TargetValue |= ((Result & 0xff8) << (10 - 3));
++    support::ulittle32_t::ref{TargetPtr} = TargetValue;
+     break;
+   }
+   }
diff --git a/root.spec b/root.spec
index acbfd13..a047ab8 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -100,11 +100,14 @@ Patch19:	%{name}-format.patch
 #		Allow both absolute and relative python install paths
 #		https://github.com/root-project/root/pull/382
 Patch20:	%{name}-python-install-path.patch
-
-#		The build on aarch64 used to work, but is now broken again
+#		Fix relocation problems on aarch64
+#		Based on the patch in Fedora's llvm package
+#		https://reviews.llvm.org/D27609
 #		https://pagure.io/releng/issue/6653
 #		https://sft.its.cern.ch/jira/browse/ROOT-8702
-ExcludeArch:	aarch64
+#		https://github.com/root-project/root/pull/430
+Patch21:	%{name}-aarch64.patch
+
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
@@ -1578,6 +1581,7 @@ ROOT as a Jupyter Notebook.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3136,6 +3140,10 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Wed Mar 15 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-2
+- Fix relocation problems on aarch64 - using patch from the llvm package
+- Re-enable building on aarch64 - works again with the above patch
+
 * Thu Mar 02 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-1
 - Update to 6.08.06
 - Drop obsolete patch: root-tformulaparsingtests.patch

From f26a6cf4853d74c87ff1003c8026be5bad905ab7 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 22 Apr 2017 20:12:15 +0200
Subject: [PATCH 106/344] Python 3 compatibility fixes (backport from upstream)

---
 root-python3-support.patch | 409 +++++++++++++++++++++++++++++++++++++
 root.spec                  |   9 +-
 2 files changed, 417 insertions(+), 1 deletion(-)
 create mode 100644 root-python3-support.patch

diff --git a/root-python3-support.patch b/root-python3-support.patch
new file mode 100644
index 0000000..bd114ce
--- /dev/null
+++ b/root-python3-support.patch
@@ -0,0 +1,409 @@
+diff --git a/bindings/pyroot/JsMVA/DataLoader.py b/bindings/pyroot/JsMVA/DataLoader.py
+index 4f5d07e..fa738c0 100644
+--- a/bindings/pyroot/JsMVA/DataLoader.py
++++ b/bindings/pyroot/JsMVA/DataLoader.py
+@@ -5,7 +5,12 @@
+ 
+ 
+ from ROOT import TH1F, TMVA, TBufferJSON
+-import JPyInterface
++import sys
++if sys.version_info >= (3, 0):
++    from JsMVA import JPyInterface
++else:
++    import JPyInterface
++from JsMVA.Utils import xrange
+ import ROOT
+ 
+ 
+diff --git a/bindings/pyroot/JsMVA/Factory.py b/bindings/pyroot/JsMVA/Factory.py
+index 3afefbf..13fda56 100644
+--- a/bindings/pyroot/JsMVA/Factory.py
++++ b/bindings/pyroot/JsMVA/Factory.py
+@@ -6,7 +6,12 @@
+ 
+ import ROOT
+ from ROOT import TMVA
+-import JPyInterface
++import sys
++if sys.version_info >= (3, 0):
++    from JsMVA import JPyInterface
++else:
++    import JPyInterface
++from JsMVA.Utils import xrange
+ from xml.etree.ElementTree import ElementTree
+ import json
+ from IPython.core.display import display, HTML, clear_output
+@@ -681,7 +686,12 @@ def ChangeCallOriginal__init__(*args,  **kwargs):
+     hasColor = False
+     args = list(args)
+     for arg_idx in xrange(len(args)):
+-        if isinstance(args[arg_idx], basestring) and args[arg_idx].find(":")!=-1:
++        # basestring==(str, unicode) in Python2, which translates to str in Python3
++        if sys.version_info >= (3, 0):
++            is_string = isinstance(args[arg_idx], str)
++        else:
++            is_string = isinstance(args[arg_idx], basestring)
++        if is_string and args[arg_idx].find(":")!=-1:
+             if args[arg_idx].find("Color")!=-1:
+                 hasColor = True
+                 if args[arg_idx].find("!Color")==-1:
+@@ -825,4 +835,4 @@ def DrawDNNWeights(fac, datasetName, methodName="DNN"):
+     button = widgets.Button(description="Draw", font_weight="bold", font_size="16")
+     button.on_click(drawWrapper)
+     box = widgets.HBox([selectLayer, button])
+-    display(box)
+\ No newline at end of file
++    display(box)
+diff --git a/bindings/pyroot/JsMVA/JPyInterface.py b/bindings/pyroot/JsMVA/JPyInterface.py
+index 51b32f1..068ab45 100644
+--- a/bindings/pyroot/JsMVA/JPyInterface.py
++++ b/bindings/pyroot/JsMVA/JPyInterface.py
+@@ -8,10 +8,12 @@
+ from IPython.core.display import display, HTML
+ from string import Template
+ import ROOT
+-import DataLoader
+-import Factory
+-import types
+-import OutputTransformer
++import sys
++if sys.version_info >= (3, 0):
++    from JsMVA import DataLoader, Factory
++else:
++    import DataLoader, Factory
++from JsMVA import OutputTransformer
+ 
+ 
+ ## Function inserter class
+@@ -94,15 +96,15 @@ class functions:
+         else:
+             opt = ""
+         for key in kwargs:
+-            if type(kwargs[key]) == types.BooleanType:
++            if isinstance(kwargs[key], bool):
+                 if kwargs[key] == True:
+                     opt += key + ":"
+                 else:
+                     opt += "!" + key + ":"
+-            elif type(kwargs[key]) == types.ListType:
++            elif isinstance(kwargs[key], list):
+                 ss = ""
+                 for o in kwargs[key]:
+-                    if type(o) == types.DictType:
++                    if isinstance(o, dict):
+                         sst = ""
+                         for kk in o:
+                             sst += kk + "=" + str(o[kk]) + ","
+diff --git a/bindings/pyroot/JsMVA/JsMVAMagic.py b/bindings/pyroot/JsMVA/JsMVAMagic.py
+index 436ea41..b2b1edf 100644
+--- a/bindings/pyroot/JsMVA/JsMVAMagic.py
++++ b/bindings/pyroot/JsMVA/JsMVAMagic.py
+@@ -23,7 +23,7 @@ class JsMVAMagic(Magics):
+     @magic_arguments()
+     @argument('arg', nargs="?", default="on", help='Enable/Disable JavaScript visualisation for TMVA')
+     def jsmva(self, line):
+-        from JPyInterface import functions
++        from JsMVA.JPyInterface import functions
+         args = parse_argstring(self.jsmva, line)
+         if args.arg == 'on':
+            functions.register()
+@@ -35,4 +35,4 @@ class JsMVAMagic(Magics):
+ 
+ ## Function for registering the magic class
+ def load_ipython_extension(ipython):
+-    ipython.register_magics(JsMVAMagic)
+\ No newline at end of file
++    ipython.register_magics(JsMVAMagic)
+diff --git a/bindings/pyroot/JsMVA/OutputTransformer.py b/bindings/pyroot/JsMVA/OutputTransformer.py
+index 81393a4..7cc10a5 100644
+--- a/bindings/pyroot/JsMVA/OutputTransformer.py
++++ b/bindings/pyroot/JsMVA/OutputTransformer.py
+@@ -3,7 +3,8 @@
+ #  @author Attila Bagoly <battila93@gmail.com>
+ # This class will transform the TMVA original output to HTML formated output.
+ 
+-import DataLoader
++from JsMVA import DataLoader
++from JsMVA.Utils import xrange
+ import cgi
+ import re
+ 
+diff --git a/bindings/pyroot/JsMVA/Utils.py b/bindings/pyroot/JsMVA/Utils.py
+new file mode 100644
+index 0000000..0abba09
+--- /dev/null
++++ b/bindings/pyroot/JsMVA/Utils.py
+@@ -0,0 +1,10 @@
++# -*- coding: utf-8 -*-
++#  @package JsMVA.Utils
++#  @author Enric Tejedor <etejedor@cern.ch>
++#  Utilities module.
++
++import sys
++if sys.version_info >= (3, 0):
++    xrange = range
++else:
++    xrange = xrange
+diff --git a/bindings/pyroot/JupyROOT/__init__.py b/bindings/pyroot/JupyROOT/__init__.py
+index 33e81da..e65acba 100644
+--- a/bindings/pyroot/JupyROOT/__init__.py
++++ b/bindings/pyroot/JupyROOT/__init__.py
+@@ -1,4 +1,5 @@
+-import JupyROOT.utils
++from JupyROOT import cppcompleter, utils
+ 
+ if '__IPYTHON__' in __builtins__ and __IPYTHON__:
++    cppcompleter.load_ipython_extension(get_ipython())
+     utils.iPythonize()
+diff --git a/bindings/pyroot/JupyROOT/cppcompleter.py b/bindings/pyroot/JupyROOT/cppcompleter.py
+index d76fef8..d451409 100644
+--- a/bindings/pyroot/JupyROOT/cppcompleter.py
++++ b/bindings/pyroot/JupyROOT/cppcompleter.py
+@@ -5,7 +5,7 @@
+ #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
+ #-----------------------------------------------------------------------------
+ 
+-import utils
++from JupyROOT import utils
+ import ROOT
+ 
+ # Jit a wrapper for the ttabcom
+@@ -35,7 +35,7 @@ class CppCompleter(object):
+     >>> comp = CppCompleter()
+     >>> comp.activate()
+     >>> for suggestion in comp._completeImpl("TH1"):
+-    ...     print suggestion
++    ...     print(suggestion)
+     TH1
+     TH1C
+     TH1D
+@@ -45,7 +45,7 @@ class CppCompleter(object):
+     TH1K
+     TH1S
+     >>> for suggestion in comp._completeImpl("TH2"):
+-    ...     print suggestion
++    ...     print(suggestion)
+     TH2
+     TH2C
+     TH2D
+@@ -58,20 +58,20 @@ class CppCompleter(object):
+     TH2S
+     >>> garbage = ROOT.gInterpreter.ProcessLine("TH1F* h")
+     >>> for suggestion in comp._completeImpl("h->GetA"):
+-    ...     print suggestion
++    ...     print(suggestion)
+     h->GetArray
+     h->GetAsymmetry
+     h->GetAt
+     h->GetAxisColor
+     >>> garbage = ROOT.gInterpreter.ProcessLine("TH1F aa")
+     >>> for suggestion in comp._completeImpl("aa.Add("):
+-    ...     print suggestion.replace("\\t"," ")
++    ...     print(suggestion.replace("\\t"," "))
+     <BLANKLINE>
+     Bool_t Add(TF1* h1, Double_t c1 = 1, Option_t* option = "")
+     Bool_t Add(const TH1* h, const TH1* h2, Double_t c1 = 1, Double_t c2 = 1)  // *MENU*
+     Bool_t Add(const TH1* h1, Double_t c1 = 1)
+     >>> for suggestion in comp._completeImpl("TROOT::Is"):
+-    ...     print suggestion
++    ...     print(suggestion)
+     IsA
+     IsBatch
+     IsEqual
+@@ -89,7 +89,7 @@ class CppCompleter(object):
+     IsZombie
+     >>> comp.deactivate()
+     >>> for suggestion in comp._completeImpl("TG"):
+-    ...     print suggestion
++    ...     print(suggestion)
+     '''
+ 
+     def __init__(self):
+diff --git a/bindings/pyroot/JupyROOT/handlers.py b/bindings/pyroot/JupyROOT/handlers.py
+index a46c404..2181ad3 100644
+--- a/bindings/pyroot/JupyROOT/handlers.py
++++ b/bindings/pyroot/JupyROOT/handlers.py
+@@ -48,11 +48,18 @@ class IOHandler(object):
+     def EndCapture(self):
+         _lib.JupyROOTExecutorHandler_EndCapture()
+ 
++    def Decode(self, obj):
++        import sys
++        if sys.version_info >= (3, 0):
++            return obj.decode('utf-8')
++        else:
++            return obj
++
+     def GetStdout(self):
+-       return _lib.JupyROOTExecutorHandler_GetStdout()
++       return self.Decode(_lib.JupyROOTExecutorHandler_GetStdout())
+ 
+     def GetStderr(self):
+-       return _lib.JupyROOTExecutorHandler_GetStderr()
++       return self.Decode(_lib.JupyROOTExecutorHandler_GetStderr())
+ 
+     def GetStreamsDicts(self):
+        out = self.GetStdout()
+@@ -65,7 +72,7 @@ class Runner(object):
+     ''' Asynchrously run functions
+     >>> import time
+     >>> def f(code):
+-    ...    print code
++    ...    print(code)
+     >>> r= Runner(f)
+     >>> r.Run("ss")
+     ss
+@@ -73,16 +80,16 @@ class Runner(object):
+     ss
+     >>> def g(msg):
+     ...    time.sleep(.5)
+-    ...    print msg
++    ...    print(msg)
+     >>> r= Runner(g)
+-    >>> r.AsyncRun("Asynchronous");print "Synchronous";time.sleep(1)
++    >>> r.AsyncRun("Asynchronous");print("Synchronous");time.sleep(1)
+     Synchronous
+     Asynchronous
+-    >>> r.AsyncRun("Asynchronous"); print r.HasFinished()
++    >>> r.AsyncRun("Asynchronous"); print(r.HasFinished())
+     False
+     >>> time.sleep(1)
+     Asynchronous
+-    >>> print r.HasFinished()
++    >>> print(r.HasFinished())
+     True
+     '''
+     def __init__(self, function):
+@@ -118,7 +125,7 @@ class JupyROOTDeclarer(Runner):
+     ''' Asynchrously execute declarations
+     >>> import ROOT
+     >>> d = JupyROOTDeclarer()
+-    >>> d.Run("int f(){return 3;}")
++    >>> d.Run("int f(){return 3;}".encode("utf-8"))
+     1
+     >>> ROOT.f()
+     3
+@@ -130,7 +137,7 @@ class JupyROOTExecutor(Runner):
+     r''' Asynchrously execute process lines
+     >>> import ROOT
+     >>> d = JupyROOTExecutor()
+-    >>> d.Run('cout << "Here am I" << endl;')
++    >>> d.Run('cout << "Here am I" << endl;'.encode("utf-8"))
+     1
+     '''
+     def __init__(self):
+diff --git a/bindings/pyroot/JupyROOT/kernel/utils.py b/bindings/pyroot/JupyROOT/kernel/utils.py
+index 300570c..db34847 100644
+--- a/bindings/pyroot/JupyROOT/kernel/utils.py
++++ b/bindings/pyroot/JupyROOT/kernel/utils.py
+@@ -12,12 +12,12 @@
+ import os
+ from glob import glob
+ 
++import importlib
++
+ from JupyROOT.handlers import IOHandler, JupyROOTDeclarer, JupyROOTExecutor
+ 
+ import ROOT
+ 
+-import __builtin__
+-
+ _ioHandler = None
+ _Executor  = None
+ _Declarer  = None
+@@ -48,7 +48,7 @@ class MagicLoader(object):
+               if file != magics_path.replace("*.py","__init__.py"):
+                   module_path="JupyROOT.kernel.magics."+file.split("/")[-1].replace(".py","")
+                   try:
+-                      module= __builtin__.__import__(module_path, globals(), locals(), ['register_magics'], -1)
++                      module = importlib.import_module(module_path)
+                       module.register_magics(kernel)
+                   except ImportError:
+                       raise Exception("Error importing Magic: %s"%module_path)
+diff --git a/bindings/pyroot/JupyROOT/utils.py b/bindings/pyroot/JupyROOT/utils.py
+index 6c41980..0a17e85 100644
+--- a/bindings/pyroot/JupyROOT/utils.py
++++ b/bindings/pyroot/JupyROOT/utils.py
+@@ -14,7 +14,6 @@ import pty
+ import itertools
+ import re
+ import fnmatch
+-import handlers
+ import time
+ from hashlib import sha1
+ from contextlib import contextmanager
+@@ -24,7 +23,7 @@ from IPython.display import HTML
+ from IPython.core.extensions import ExtensionManager
+ import IPython.display
+ import ROOT
+-import cppcompleter
++from JupyROOT import handlers
+ 
+ # We want iPython to take over the graphics
+ ROOT.gROOT.SetBatch()
+@@ -200,7 +199,7 @@ def _codeToFilename(code):
+     >>> _codeToFilename("int f(i){return i*i;}")
+     'dbf7e731.C'
+     '''
+-    fileNameBase = sha1(code).hexdigest()[0:8]
++    fileNameBase = sha1(code.encode('utf-8')).hexdigest()[0:8]
+     return fileNameBase + ".C"
+ 
+ def _dumpToUniqueFile(code):
+@@ -250,6 +249,9 @@ class StreamCapture(object):
+ 
+         self.asyncCapturer = handlers.Runner(self.syncCapture)
+ 
++        self.isFirstPreExecute = True
++        self.isFirstPostExecute = True
++
+     def syncCapture(self, defout = ''):
+         self.outString = defout
+         self.errString = defout
+@@ -264,6 +266,9 @@ class StreamCapture(object):
+             time.sleep(waitTime)
+ 
+     def pre_execute(self):
++        if self.isFirstPreExecute:
++            self.isFirstPreExecute = False
++            return 0
+         # Unify C++ and Python outputs
+         self.nbOutStream = sys.stdout
+         sys.stdout = sys.__stdout__
+@@ -276,6 +281,10 @@ class StreamCapture(object):
+         self.asyncCapturer.AsyncRun('')
+ 
+     def post_execute(self):
++        if self.isFirstPostExecute:
++            self.isFirstPostExecute = False
++            self.isFirstPreExecute = False
++            return 0
+         self.flag = False
+         self.asyncCapturer.Wait()
+         self.ioHandler.Poll()
+@@ -472,14 +481,13 @@ def setStyle():
+ 
+ captures = []
+ 
+-def loadExtensionsAndCapturers():
++def loadMagicsAndCapturers():
+     global captures
+     extNames = ["JupyROOT.magics." + name for name in ["cppmagic","jsrootmagic"]]
+     ip = get_ipython()
+     extMgr = ExtensionManager(ip)
+     for extName in extNames:
+         extMgr.load_extension(extName)
+-    cppcompleter.load_ipython_extension(ip)
+     captures.append(StreamCapture())
+     captures.append(CaptureDrawnPrimitives())
+ 
+@@ -498,7 +506,7 @@ def enableCppHighlighting():
+ 
+ def iPythonize():
+     setStyle()
+-    loadExtensionsAndCapturers()
++    loadMagicsAndCapturers()
+     enableCppHighlighting()
+     enhanceROOTModule()
+     welcomeMsg()
diff --git a/root.spec b/root.spec
index a047ab8..992d59b 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -107,6 +107,9 @@ Patch20:	%{name}-python-install-path.patch
 #		https://sft.its.cern.ch/jira/browse/ROOT-8702
 #		https://github.com/root-project/root/pull/430
 Patch21:	%{name}-aarch64.patch
+#		Python 3 compatibility fixes
+#		Backported from upstream git (6.08 branch)
+Patch22:	%{name}-python3-support.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -1582,6 +1585,7 @@ ROOT as a Jupyter Notebook.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3140,6 +3144,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Apr 21 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-3
+- Python 3 compatibility fixes (backport from upstream)
+
 * Wed Mar 15 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-2
 - Fix relocation problems on aarch64 - using patch from the llvm package
 - Re-enable building on aarch64 - works again with the above patch

From b95e1e7279f9078a709eea79ab508abe3d1d7aca Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Thu, 11 May 2017 09:22:43 -0500
Subject: [PATCH 107/344] Rebuild for OCE 0.18.1.

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 992d59b..b8a3a46 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3144,6 +3144,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu May 11 2017 Richard Shaw <hobbes1069@gmail.com> - 6.08.06-4
+- Rebuild for OCE 0.18.1.
+
 * Fri Apr 21 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-3
 - Python 3 compatibility fixes (backport from upstream)
 

From 1a1a0b32c205a4cbd9771e58362c5ae45aedf188 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 14 May 2017 07:09:45 +0200
Subject: [PATCH 108/344] Fix for macro scope issue (backport from upstream)
 Fix a problem loading the libJupyROOT CDLL module (use absolute path) Add
 ipython dependencies to the jupyroot packages Exclude s390x - endian issues
 Re-enable two tests on 32 bit arm - no longer failing Add BuildRequires on
 blas-devel (for TMVA)

---
 root-jupyroot-path.patch   |  15 +++
 root-macro-scope.patch     |  35 +++++++
 root-python3-support.patch |  45 +++++++++
 root-tmva-test.patch       | 195 +++++++++++++++++++++++++++++++++++++
 root.spec                  |  91 +++++++++++------
 5 files changed, 351 insertions(+), 30 deletions(-)
 create mode 100644 root-jupyroot-path.patch
 create mode 100644 root-macro-scope.patch
 create mode 100644 root-tmva-test.patch

diff --git a/root-jupyroot-path.patch b/root-jupyroot-path.patch
new file mode 100644
index 0000000..e2f679a
--- /dev/null
+++ b/root-jupyroot-path.patch
@@ -0,0 +1,15 @@
+diff --git a/bindings/pyroot/JupyROOT/handlers.py b/bindings/pyroot/JupyROOT/handlers.py
+index 2181ad3..32c38eb 100644
+--- a/bindings/pyroot/JupyROOT/handlers.py
++++ b/bindings/pyroot/JupyROOT/handlers.py
+@@ -12,8 +12,9 @@ from threading import Thread
+ from time import sleep as timeSleep
+ from resource import setrlimit, RLIMIT_STACK, RLIM_INFINITY
+ from sys import platform
++from os import path
+ 
+-_lib = CDLL("libJupyROOT.so")
++_lib = CDLL(path.join(path.dirname(path.dirname(__file__)), 'libJupyROOT.so'))
+ 
+ class IOHandler(object):
+     r'''Class used to capture output from C/C++ libraries.
diff --git a/root-macro-scope.patch b/root-macro-scope.patch
new file mode 100644
index 0000000..21bcb72
--- /dev/null
+++ b/root-macro-scope.patch
@@ -0,0 +1,35 @@
+diff --git a/core/meta/src/TClingCallbacks.cxx b/core/meta/src/TClingCallbacks.cxx
+index 85f39dd..2650f96 100644
+--- a/core/meta/src/TClingCallbacks.cxx
++++ b/core/meta/src/TClingCallbacks.cxx
+@@ -552,16 +552,22 @@ bool TClingCallbacks::tryResolveAtRuntimeInternal(LookupResult &R, Scope *S) {
+    assert(TU && "Must not be null.");
+ 
+    // DynamicLookup only happens inside wrapper functions:
+-   clang::DeclContext* WrapperDC = S->getEntity();
+    clang::FunctionDecl* Wrapper = nullptr;
+-   while (true) {
+-      if (!WrapperDC || WrapperDC == TU)
++   Scope* Cursor = S;
++   do {
++      DeclContext* DCCursor = Cursor->getEntity();
++      if (DCCursor == TU)
+          return false;
+-      Wrapper = dyn_cast<FunctionDecl>(WrapperDC);
+-      if (Wrapper && utils::Analyze::IsWrapper(Wrapper))
+-          break;
+-      WrapperDC = WrapperDC->getParent();
+-   }
++      Wrapper = dyn_cast_or_null<FunctionDecl>(DCCursor);
++      if (Wrapper) {
++         if (utils::Analyze::IsWrapper(Wrapper)) {
++            break;
++         } else {
++            // Can't have a function inside the wrapper:
++            return false;
++         }
++      }
++   } while ((Cursor = Cursor->getParent()));
+ 
+    VarDecl* Result = VarDecl::Create(C, TU, Loc, Loc, II, C.DependentTy,
+                                      /*TypeSourceInfo*/0, SC_None);
diff --git a/root-python3-support.patch b/root-python3-support.patch
index bd114ce..3472599 100644
--- a/root-python3-support.patch
+++ b/root-python3-support.patch
@@ -407,3 +407,48 @@ index 6c41980..0a17e85 100644
      enableCppHighlighting()
      enhanceROOTModule()
      welcomeMsg()
+diff --git a/bindings/pyroot/src/Converters.cxx b/bindings/pyroot/src/Converters.cxx
+index 0926256..01f5526 100644
+--- a/bindings/pyroot/src/Converters.cxx
++++ b/bindings/pyroot/src/Converters.cxx
+@@ -1537,6 +1537,7 @@ namespace {
+ // converter factories for ROOT types
+    typedef std::pair< const char*, ConverterFactory_t > NFp_t;
+ 
++   // clang-format off
+    NFp_t factories_[] = {
+    // factories for built-ins
+       NFp_t( "bool",                      &CreateBoolConverter               ),
+@@ -1617,8 +1618,14 @@ namespace {
+       NFp_t( "void**",                    &CreateVoidPtrPtrConverter         ),
+       NFp_t( "PyObject*",                 &CreatePyObjectConverter           ),
+       NFp_t( "_object*",                  &CreatePyObjectConverter           ),
+-      NFp_t( "FILE*",                     &CreateVoidArrayConverter          )
++      NFp_t( "FILE*",                     &CreateVoidArrayConverter          ),
++      NFp_t( "Float16_t",                 &CreateFloatConverter              ),
++      NFp_t( "const Float16_t&",          &CreateConstFloatRefConverter      ),
++      NFp_t( "Double32_t",                &CreateDoubleConverter             ),
++      NFp_t( "Double32_t&",               &CreateDoubleRefConverter          ),
++      NFp_t( "const Double32_t&",         &CreateConstDoubleRefConverter     )
+    };
++   // clang-format on
+ 
+    struct InitConvFactories_t {
+    public:
+diff --git a/bindings/pyroot/src/Executors.cxx b/bindings/pyroot/src/Executors.cxx
+index 4056322..842e9f9 100644
+--- a/bindings/pyroot/src/Executors.cxx
++++ b/bindings/pyroot/src/Executors.cxx
+@@ -840,8 +840,12 @@ namespace {
+ 
+       NFp_t( "float",              &CreateFloatExecutor               ),
+       NFp_t( "float&",             &CreateFloatRefExecutor            ),
++      NFp_t( "Float16_t",          &CreateFloatExecutor               ),
++      NFp_t( "Float16_t&",         &CreateFloatRefExecutor            ),
+       NFp_t( "double",             &CreateDoubleExecutor              ),
+       NFp_t( "double&",            &CreateDoubleRefExecutor           ),
++      NFp_t( "Double32_t",         &CreateDoubleExecutor              ),
++      NFp_t( "Double32_t&",        &CreateDoubleRefExecutor           ),
+       NFp_t( "long double",        &CreateLongDoubleExecutor          ),   // TODO: lost precision
+       NFp_t( "long double&",       &CreateLongDoubleRefExecutor       ),
+       NFp_t( "void",               &CreateVoidExecutor                ),
diff --git a/root-tmva-test.patch b/root-tmva-test.patch
new file mode 100644
index 0000000..d8dec2c
--- /dev/null
+++ b/root-tmva-test.patch
@@ -0,0 +1,195 @@
+diff --git a/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx b/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
+index c44405b..ba796d1 100644
+--- a/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
++++ b/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
+@@ -26,22 +26,23 @@ int main()
+    std::cout << "Testing Backpropagation:" << std::endl;
+ 
+    double error;
++   int iret = 0;
+ 
+    error = testBackpropagationWeightsLinear<TCpu<Scalar_t>>(1.0);
+    if (error > 1e-3)
+-       return 1;
++       iret++;
+ 
+    error = testBackpropagationL1Regularization<TCpu<Scalar_t>>(1e-2);
+    if (error > 1e-3)
+-       return 1;
++       iret++;
+ 
+    error = testBackpropagationL2Regularization<TCpu<Scalar_t>>(1.0);
+    if (error > 1e-3)
+-       return 1;
++       iret++;
+ 
+    error = testBackpropagationBiasesLinear<TCpu<Scalar_t>>(1.0);
+    if (error > 1e-3)
+-       return 1;
++       iret++;
+ 
+-   return 0;
++   return iret;
+ }
+diff --git a/tmva/tmva/test/DNN/TestDerivatives.h b/tmva/tmva/test/DNN/TestDerivatives.h
+index 1acf46f..956bdde 100644
+--- a/tmva/tmva/test/DNN/TestDerivatives.h
++++ b/tmva/tmva/test/DNN/TestDerivatives.h
+@@ -104,7 +104,7 @@ auto testActivationFunctionDerivatives()
+       {
+          evaluateDerivative<Architecture>(X, af, Y);
+       };
+-      error = testDerivatives<Architecture>(f, df, 5e-3);
++      error = testDerivatives<Architecture>(f, df, 1.0e-04);
+ 
+       std::cout << "Testing " << static_cast<int>(af) << ": ";
+       std::cout << "Maximum Relative Error = " << error << std::endl;
+diff --git a/tmva/tmva/test/DNN/TestMatrixArithmetic.h b/tmva/tmva/test/DNN/TestMatrixArithmetic.h
+index 10aed0e..330cf49 100644
+--- a/tmva/tmva/test/DNN/TestMatrixArithmetic.h
++++ b/tmva/tmva/test/DNN/TestMatrixArithmetic.h
+@@ -38,8 +38,7 @@ auto testMultiplication(size_t ntests)
+       n = rand() % 100 + 1;
+       k = rand() % 100 + 1;
+ 
+-      TMatrixT<Double_t> ARef(m,k), A2Ref(m,k), ATRef(k,m) , BRef(k,n),
+-          BTRef(n,k), CRef(m,n);
++      TMatrixT<Scalar_t> ARef(m,k), A2Ref(m,k), ATRef(k,m) , BRef(k,n), BTRef(n,k), CRef(m,n);
+       TMVA::DNN::randomMatrix(ARef);
+       TMVA::DNN::randomMatrix(A2Ref);
+       TMVA::DNN::randomMatrix(ATRef);
+@@ -50,19 +49,19 @@ auto testMultiplication(size_t ntests)
+       // A * B
+       CRef.Mult(ARef,BRef);
+       Architecture_t::Multiply(C, A, B);
+-      Scalar_t error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
++      Scalar_t error = TMVA::DNN::maximumRelativeError(C, CRef);
+       maximumError   = std::max(error, maximumError);
+ 
+       // A^T * B
+       CRef.TMult(ATRef,BRef);
+       Architecture_t::TransposeMultiply(C, AT, B);
+-      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
++      error = TMVA::DNN::maximumRelativeError(C, CRef);
+       maximumError   = std::max(error, maximumError);
+ 
+       // A * B^T
+       CRef.MultT(ARef,BTRef);
+       Architecture_t::MultiplyTranspose(C, A, BT);
+-      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
++      error = TMVA::DNN::maximumRelativeError(C, CRef);
+       maximumError   = std::max(error, maximumError);
+ 
+       // A .* B
+@@ -72,7 +71,7 @@ auto testMultiplication(size_t ntests)
+          }
+       }
+       Architecture_t::Hadamard(A, A2);
+-      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) A, ARef);
++      error = TMVA::DNN::maximumRelativeError(A, ARef);
+       maximumError   = std::max(error, maximumError);
+    }
+ 
+diff --git a/tmva/tmva/test/DNN/Utility.h b/tmva/tmva/test/DNN/Utility.h
+index 46077fc..a0c29b5 100644
+--- a/tmva/tmva/test/DNN/Utility.h
++++ b/tmva/tmva/test/DNN/Utility.h
+@@ -1,6 +1,7 @@
+ #ifndef TMVA_TEST_DNN_UTILITY
+ #define TMVA_TEST_DNN_UTILITY
+ 
++#include <cassert>
+ #include <iostream>
+ #include <sstream>
+ #include <type_traits>
+@@ -172,64 +173,48 @@ AFloat reduceMean(F f, AFloat start, const AMatrix &X)
+     return result / (AFloat) (m * n);
+ }
+ 
+-/** Compute the relative error of x and y normalized by y. Specialized for
+- *  float and double to make sure both arguments are above expected machine
+- *  precision (1e-5 and 1e-10). */
++/** Compute the relative error of x and y */
+ //______________________________________________________________________________
+-template <typename AFloat>
+-inline AFloat relativeError(const AFloat &x,
+-                            const AFloat &y);
++template <typename T>
++inline T relativeError(const T &x, const T &y)
++{
++  using std::abs;
+ 
++  if (x == y)
++    return T(0.0);
+ 
+-//______________________________________________________________________________
+-template <>
+-inline Double_t relativeError(const Double_t &x,
+-                              const Double_t &y)
+-{
+-    if ((std::abs(x) > 1e-10) && (std::abs(y) > 1e-10)) {
+-        return std::fabs((x - y) / y);
+-    } else {
+-        return std::fabs(x - y);
+-    }
+-}
++  T diff = abs(x - y);
+ 
+-//______________________________________________________________________________
+-template <>
+-inline Real_t relativeError(const Real_t &x,
+-                            const Real_t &y)
+-{
+-    if ((std::abs(x) > 1e-5) && (std::abs(y) > 1e-5)) {
+-        return std::fabs((x - y) / y);
+-    } else {
+-        return std::fabs(x - y);
+-    }
++  if (x * y == T(0.0) ||
++      diff < std::numeric_limits<T>::epsilon())
++    return diff;
++
++  return diff / (abs(x) + abs(y));
+ }
+ 
+ /*! Compute the maximum, element-wise relative error of the matrices
+ *  X and Y normalized by the element of Y. Protected against division
+ *  by zero. */
+ //______________________________________________________________________________
+-template <typename AMatrix>
+-auto maximumRelativeError(const AMatrix &X,
+-                          const AMatrix &Y)
+--> decltype(X(0,0))
++template <typename Matrix1, typename Matrix2>
++auto maximumRelativeError(const Matrix1 &X, const Matrix2 &Y) -> decltype(X(0,0))
+ {
++    decltype(X(0,0)) curError, maxError = 0.0;
+ 
+-    using AFloat = decltype(X(0,0));
++    Int_t m = X.GetNrows();
++    Int_t n = X.GetNcols();
+ 
+-    size_t m,n;
+-    m = X.GetNrows();
+-    n = X.GetNcols();
++    assert(m == Y.GetNrows());
++    assert(n == Y.GetNcols());
+ 
+-    AFloat maximumError = 0.0;
+-
+-    for (size_t i = 0; i < m; i++) {
+-        for (size_t j = 0; j < n; j++) {
+-        AFloat error = relativeError(X(i,j), Y(i,j));
+-        maximumError = std::max(error, maximumError);
++    for (Int_t i = 0; i < m; i++) {
++        for (Int_t j = 0; j < n; j++) {
++            curError = relativeError(X(i,j), Y(i,j));
++            maxError = std::max(curError, maxError);
+         }
+     }
+-    return maximumError;
++
++    return maxError;
+ }
+ 
+ /*! Numerically compute the derivative of the functional f using finite
diff --git a/root.spec b/root.spec
index b8a3a46..ebe17f0 100644
--- a/root.spec
+++ b/root.spec
@@ -15,15 +15,13 @@
 %global hadoop 0
 %endif
 
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -110,10 +108,23 @@ Patch21:	%{name}-aarch64.patch
 #		Python 3 compatibility fixes
 #		Backported from upstream git (6.08 branch)
 Patch22:	%{name}-python3-support.patch
+#		Fix for macro scope issue
+#		Backported from upstream git (6.08 branch)
+Patch23:	%{name}-macro-scope.patch
+#		Use absolute path when loading libJupyROOT.so
+#		https://github.com/root-project/root/pull/569
+Patch24:	%{name}-jupyroot-path.patch
+#		Fix for TMVA tests
+#		Backported from upstream git (master)
+Patch25:	%{name}-tmva-test.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
 ExcludeArch:	s390
+#		s390x suffers from endian issues resulting in failing tests
+#		and broken documentation generation
+#		https://sft.its.cern.ch/jira/browse/ROOT-8703
+ExcludeArch:	s390x
 #		ppc/ppc64/ppc64le does not yet work
 #		https://sft.its.cern.ch/jira/browse/ROOT-6434
 #		https://sft.its.cern.ch/jira/browse/ROOT-7314
@@ -205,6 +216,7 @@ BuildRequires:	expat-devel
 %if %{pythia8}
 BuildRequires:	pythia8-devel >= 8.1.80
 %endif
+BuildRequires:	blas-devel
 BuildRequires:	numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
@@ -344,9 +356,6 @@ Requires:	font(droidsansfallback)
 %if %{ruby} == 0
 Obsoletes:	%{name}-ruby < 6.00.00
 %endif
-%if %{hadoop} == 0
-Obsoletes:	%{name}-io-hdfs < 6.06.04-2
-%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -418,6 +427,9 @@ transparent interface.
 
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
+%{?py2_dist:
+Provides:	%{py2_dist %{name}} = %{version}
+}
 Provides:	root-python = %{version}-%{release}
 Obsoletes:	root-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -430,6 +442,9 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n %{python3pkg}-%{name}
 Summary:	Python extension for ROOT
+%{?py3_dist:
+Provides:	%{py3_dist %{name}} = %{version}
+}
 Provides:	root-%{python3pkg} = %{version}-%{release}
 Obsoletes:	root-%{python3pkg} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -442,7 +457,15 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
+%{?py2_dist:
+Provides:	%{py2_dist jupyroot} = %{version}
+}
 Requires:	python2-%{name} = %{version}-%{release}
+%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+Requires:	python2-ipython
+%else
+Requires:	python-ipython-console
+%endif
 Obsoletes:	%{name}-rootaas < 6.08.00
 
 %description -n python2-jupyroot
@@ -450,7 +473,18 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n %{python3pkg}-jupyroot
 Summary:	ROOT Jupyter kernel
+%{?py3_dist:
+Provides:	%{py3_dist jupyroot} = %{version}
+}
 Requires:	%{python3pkg}-%{name} = %{version}-%{release}
+%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+Requires:	%{python3pkg}-ipython
+%else
+%if %{?fedora}%{!?fedora:0}
+#		ipython for python3 not available in RHEL/EPEL
+Requires:	%{python3pkg}-ipython-console
+%endif
+%endif
 
 %description -n %{python3pkg}-jupyroot
 The Jupyter kernel for the ROOT notebook.
@@ -458,6 +492,9 @@ The Jupyter kernel for the ROOT notebook.
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
+%{?py2_dist:
+Provides:	%{py2_dist jsmva} = %{version}
+}
 Requires:	%{name}-tmva = %{version}-%{release}
 Requires:	python2-jupyroot = %{version}-%{release}
 
@@ -467,6 +504,9 @@ TMVA interface used by JupyROOT.
 %package -n %{python3pkg}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
+%{?py3_dist:
+Provides:	%{py3_dist jsmva} = %{version}
+}
 Requires:	%{name}-tmva = %{version}-%{release}
 Requires:	%{python3pkg}-jupyroot = %{version}-%{release}
 
@@ -1586,6 +1626,9 @@ ROOT as a Jupyter Notebook.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1688,6 +1731,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dchirp:BOOL=OFF \
        -Dcling:BOOL=ON \
        -Dcocoa:BOOL=OFF \
+       -Dcuda:BOOL=OFF \
 %if %{?fedora}%{!?fedora:0} >= 24
        -Dcxx14:BOOL=ON \
        -Droot7:BOOL=ON \
@@ -1696,7 +1740,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Droot7:BOOL=OFF \
 %endif
        -Dcxxmodules:BOOL=OFF \
-       -Dcuda:BOOL=OFF \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Dexceptions:BOOL=ON \
@@ -1888,7 +1931,7 @@ mkdir -p %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
 mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libJupyROOT%{py3soabi}.so
+   %{buildroot}%{python3_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
 rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
@@ -2096,33 +2139,13 @@ popd
 #
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
-# - test-stressHistFactory-interpreted
-# - tutorial-histfactory-example
 # - tutorial-r-*
 #   currently fails on 32 bit arm - reported upstream:
 #   https://sft.its.cern.ch/jira/browse/ROOT-8500
-#
-# - test-stresshistogram
-# - test-stresshistogram-interpreted
-# - test-stressroostats
-# - test-stressroostats-interpreted
-# - test-stresshistofit
-# - test-stresshistofit-interpreted
-# - tutorial-roofit-rf511_wsfactory_basic
-# - tutorial-roostats-HybridInstructional
-# - tutorial-roostats-rs701_BayesianCalculator
-# - tutorial-pyroot-benchmarks
-# - tutorial-pyroot-ratioplot
-# - tutorial-pyroot-shapes
-#   currently fails on s390x - reported upstream
-#   https://sft.its.cern.ch/jira/browse/ROOT-8703
 
 excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing"
 %ifarch %{arm}
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|test-stressHistFactory-interpreted|tutorial-histfactory-example|tutorial-r-.*"
-%endif
-%ifarch s390x
-excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-HybridInstructional|tutorial-roostats-rs701_BayesianCalculator|tutorial-pyroot-benchmarks|tutorial-pyroot-ratioplot|tutorial-pyroot-shapes"
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
 %endif
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
@@ -2576,7 +2599,7 @@ fi
 
 %files -n %{python3pkg}-jupyroot
 %{python3_sitearch}/JupyROOT
-%{python3_sitearch}/libJupyROOT%{py3soabi}.so
+%{python3_sitearch}/libJupyROOT.so
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python2-jsmva
@@ -3144,6 +3167,14 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri May 12 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-5
+- Fix for macro scope issue (backport from upstream)
+- Fix a problem loading the libJupyROOT CDLL module (use absolute path)
+- Add ipython dependencies to the jupyroot packages
+- Exclude s390x - endian issues
+- Re-enable two tests on 32 bit arm - no longer failing
+- Add BuildRequires on blas-devel (for TMVA)
+
 * Thu May 11 2017 Richard Shaw <hobbes1069@gmail.com> - 6.08.06-4
 - Rebuild for OCE 0.18.1.
 

From 06adf65fe9f9bf45eb17edbb4f61efcd543354ab Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 15 May 2017 19:49:58 +0000
Subject: [PATCH 109/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index ebe17f0..c2ee907 100644
--- a/root.spec
+++ b/root.spec
@@ -21,7 +21,7 @@
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3167,6 +3167,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.08.06-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
 * Fri May 12 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-5
 - Fix for macro scope issue (backport from upstream)
 - Fix a problem loading the libJupyROOT CDLL module (use absolute path)

From 53ab37dbf1b5d923b665a3b9f63b7312e843612e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 16 May 2017 23:34:42 +0200
Subject: [PATCH 110/344] Remove JupyROOT references from cmake files Do not
 generate autoprovides for libJupyROOT.so

---
 root.spec | 57 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/root.spec b/root.spec
index c2ee907..60cb0bf 100644
--- a/root.spec
+++ b/root.spec
@@ -18,10 +18,14 @@
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
+# Do not generate autoprovides for libJupyROOT.so
+# Note: the ones from libPyROOT.so we do want though
+%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
+
 Name:		root
 Version:	6.08.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -1905,19 +1909,20 @@ mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
 
 # Move the python modules to sitearch/sitelib
-mkdir -p %{buildroot}%{python_sitearch}
+mkdir -p %{buildroot}%{python2_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python_sitearch}/libPyROOT.so
+   %{buildroot}%{python2_sitearch}/libPyROOT.so
 mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python_sitearch}/libJupyROOT.so
-mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python_sitearch}
+   %{buildroot}%{python2_sitearch}/libJupyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
 rm %{buildroot}%{_libdir}/%{name}/JupyROOT/README.md
-mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python_sitearch}
+rm -rf %{buildroot}%{_libdir}/%{name}/JupyROOT/src
+mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
 rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
 rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
 
-mkdir -p %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python2_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
 tmpdir=`mktemp -d`
 
@@ -1935,6 +1940,7 @@ mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
 rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
+rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
 mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
 rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
 rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
@@ -1970,7 +1976,10 @@ sed -e 's!/usr/bin/env python!/usr/bin/python!' \
        %{buildroot}%{_bindir}/rootmv \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm
-sed '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
+sed -e '/^\#!/d' \
+    -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \
+       %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \
+       %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
 sed 's!/usr/bin/env python!/usr/bin/python!' \
     -i %{buildroot}%{_bindir}/rootdrawtree \
        %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
@@ -2009,12 +2018,14 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
-# Remove mathtext and minicern references from cmake files
+# Remove mathtext, minicern and JupyROOT references from cmake files
 sed -e 's/ mathtext / /' -e /mathtext/d \
     -e 's/ minicern / /' -e /minicern/d \
+    -e 's/ JupyROOT / /' -e /JupyROOT/d \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
 sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
     -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
+    -e '/Import target "JupyROOT"/,/FILES_FOR_JupyROOT/d' -e 's/;JupyROOT//' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
 
 # Only used on Windows
@@ -2199,20 +2210,20 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
 	-i /var/lib/alternatives/libPyROOT.so
     for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python_sitearch}/libPyROOT.so" ] ; then
+	if [ "$alt" != "%{python2_sitearch}/libPyROOT.so" ] ; then
 	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
 	fi
     done
 fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
+    libPyROOT.so %{python2_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
 %preun -n python2-%{name}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python_sitearch}/libPyROOT.so
+	libPyROOT.so %{python2_sitearch}/libPyROOT.so
 fi
 
 %postun -n python2-%{name} -p /sbin/ldconfig
@@ -2222,7 +2233,7 @@ fi
 # for python2-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python_sitearch}/libPyROOT.so 20
+    libPyROOT.so %{python2_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
 %post -n %{python3pkg}-%{name}
@@ -2575,10 +2586,10 @@ fi
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python_sitearch}/libPyROOT.so
-%{python_sitearch}/ROOT.py*
-%{python_sitearch}/cppyy.py*
-%{python_sitearch}/_pythonization.py*
+%{python2_sitearch}/libPyROOT.so
+%{python2_sitearch}/ROOT.py*
+%{python2_sitearch}/cppyy.py*
+%{python2_sitearch}/_pythonization.py*
 
 %files -n %{python3pkg}-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
@@ -2593,8 +2604,8 @@ fi
 %{python3_sitearch}/__pycache__
 
 %files -n python2-jupyroot
-%{python_sitearch}/JupyROOT
-%{python_sitearch}/libJupyROOT.so
+%{python2_sitearch}/JupyROOT
+%{python2_sitearch}/libJupyROOT.so
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n %{python3pkg}-jupyroot
@@ -2603,7 +2614,7 @@ fi
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python2-jsmva
-%{python_sitelib}/JsMVA
+%{python2_sitelib}/JsMVA
 
 %files -n %{python3pkg}-jsmva
 %{python3_sitelib}/JsMVA
@@ -3167,6 +3178,10 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Tue May 16 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-7
+- Remove JupyROOT references from cmake files
+- Do not generate autoprovides for libJupyROOT.so
+
 * Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.08.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
 

From 7236b9af3ce2af0763375f1f93dac43731e5dad1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 16 Jun 2017 10:45:49 +0200
Subject: [PATCH 111/344] Update to 6.10.00 Drop patches accepted upstream Drop
 previously backported patches New sub-package: root-unfold Dropped
 sub-package: root-vdt

---
 root-32bit.patch                   |   26 -
 root-Quantiles.patch               |   15 -
 root-TPad-WaitPrimitive.patch      |   22 -
 root-aarch64.patch                 |  196 --
 root-cache-test.patch              |  321 ---
 root-fontconfig.patch              |  150 +-
 root-format.patch                  |   94 -
 root-fsf-addr.patch                |   15 -
 root-global-name-not-defined.patch |   32 -
 root-hz.patch                      |   15 -
 root-jupyroot-path.patch           |   15 -
 root-macro-scope.patch             |   35 -
 root-missing-includes.patch        |   12 -
 root-no-testdata.patch             |   20 -
 root-python-install-path.patch     |   39 -
 root-python3-support.patch         |  454 ----
 root-rose-image.patch              |   27 -
 root-s390x.patch                   |   23 -
 root-stressgraphics.patch          |   20 +-
 root-template-files.patch          |   35 -
 root-test-install.patch            | 3828 ----------------------------
 root-tformulatests-typo.patch      |   13 -
 root-tmva-test.patch               |  195 --
 root-unbundle-gtest.patch          |   78 +
 root.spec                          |  212 +-
 sources                            |    2 +-
 26 files changed, 243 insertions(+), 5651 deletions(-)
 delete mode 100644 root-32bit.patch
 delete mode 100644 root-Quantiles.patch
 delete mode 100644 root-TPad-WaitPrimitive.patch
 delete mode 100644 root-aarch64.patch
 delete mode 100644 root-cache-test.patch
 delete mode 100644 root-format.patch
 delete mode 100644 root-fsf-addr.patch
 delete mode 100644 root-global-name-not-defined.patch
 delete mode 100644 root-hz.patch
 delete mode 100644 root-jupyroot-path.patch
 delete mode 100644 root-macro-scope.patch
 delete mode 100644 root-missing-includes.patch
 delete mode 100644 root-no-testdata.patch
 delete mode 100644 root-python-install-path.patch
 delete mode 100644 root-python3-support.patch
 delete mode 100644 root-rose-image.patch
 delete mode 100644 root-s390x.patch
 delete mode 100644 root-template-files.patch
 delete mode 100644 root-test-install.patch
 delete mode 100644 root-tformulatests-typo.patch
 delete mode 100644 root-tmva-test.patch
 create mode 100644 root-unbundle-gtest.patch

diff --git a/root-32bit.patch b/root-32bit.patch
deleted file mode 100644
index 75a9eae..0000000
--- a/root-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/math/mathmore/test/testSpecFunc.cxx b/math/mathmore/test/testSpecFunc.cxx
-index d768160..8c223ee 100644
---- a/math/mathmore/test/testSpecFunc.cxx
-+++ b/math/mathmore/test/testSpecFunc.cxx
-@@ -186,7 +186,7 @@ int testSpecFunc() {
- 
-    iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
- 
--   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
-+   iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
- 
-    iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
- 
-diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
-index 1006dd1..b862f36 100644
---- a/test/stressMathCore.cxx
-+++ b/test/stressMathCore.cxx
-@@ -1117,7 +1117,7 @@ int testVector(int ngen, bool testio=false) {
- 
-    s1 = a.testOperations(v1);  a.print(VecType<V1>::name()+" operations");
-    scale = Dim*20;
--   if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 10; // for problem with RhoEtaPhi
-+   if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
-    if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
- #if defined (R__LINUX) && !defined(R__B64)
-    // problem of precision on linux 32
diff --git a/root-Quantiles.patch b/root-Quantiles.patch
deleted file mode 100644
index 580314a..0000000
--- a/root-Quantiles.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/math/mathcore/src/TMath.cxx b/math/mathcore/src/TMath.cxx
-index 942bb55..72618fc 100644
---- a/math/mathcore/src/TMath.cxx
-+++ b/math/mathcore/src/TMath.cxx
-@@ -1210,7 +1210,9 @@ void TMath::Quantiles(Int_t n, Int_t nprob, Double_t *x, Double_t *quantiles, Do
-          else
-             nppm = n*prob[i]; // use m = 0
- 
--         j = TMath::FloorNint(nppm);
-+         // be careful with machine precision
-+         double eps = 4 * TMath::Limits<Double_t>::Epsilon();
-+         j = TMath::FloorNint(nppm + eps);
- 
-          // LM : fix for numerical problems if nppm is actually equal to j, but results different for numerical error
-          // g in the paper is nppm -j
diff --git a/root-TPad-WaitPrimitive.patch b/root-TPad-WaitPrimitive.patch
deleted file mode 100644
index ca329e3..0000000
--- a/root-TPad-WaitPrimitive.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
-index 2b2b5b8..6efeec5 100644
---- a/graf2d/gpad/src/TPad.cxx
-+++ b/graf2d/gpad/src/TPad.cxx
-@@ -6312,6 +6312,8 @@ void TPad::UseCurrentStyle()
- 
- TObject *TPad::WaitPrimitive(const char *pname, const char *emode)
- {
-+   if (!gPad) return 0;
-+
-    if (strlen(emode)) gROOT->SetEditorMode(emode);
-    if (gROOT->GetEditorMode() == 0 && strlen(pname) > 2) gROOT->SetEditorMode(&pname[1]);
- 
-@@ -6323,7 +6325,7 @@ TObject *TPad::WaitPrimitive(const char *pname, const char *emode)
-    Bool_t hasname = strlen(pname) > 0;
-    if (!pname[0] && !emode[0]) testlast = kTRUE;
-    if (testlast) gROOT->SetEditorMode();
--   while (!gSystem->ProcessEvents()) {
-+   while (!gSystem->ProcessEvents() && gPad) {
-       if (gROOT->GetEditorMode() == 0) {
-          if (hasname) {
-             obj = FindObject(pname);
diff --git a/root-aarch64.patch b/root-aarch64.patch
deleted file mode 100644
index 268f37b..0000000
--- a/root-aarch64.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h b/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
-index 6dcd2d4..bafbd36 100644
---- a/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
-+++ b/interpreter/llvm/src/include/llvm/Object/ELFObjectFile.h
-@@ -905,7 +905,7 @@ unsigned ELFObjectFile<ELFT>::getArch() const {
-   case ELF::EM_X86_64:
-     return Triple::x86_64;
-   case ELF::EM_AARCH64:
--    return Triple::aarch64;
-+    return IsLittleEndian ? Triple::aarch64 : Triple::aarch64_be;
-   case ELF::EM_ARM:
-     return Triple::arm;
-   case ELF::EM_AVR:
-diff --git a/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h b/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
-index 5e0df98..b59e8ec 100644
---- a/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
-+++ b/interpreter/llvm/src/include/llvm/Object/RelocVisitor.h
-@@ -86,6 +86,7 @@ private:
-           return RelocToApply();
-         }
-       case Triple::aarch64:
-+      case Triple::aarch64_be:
-         switch (RelocType) {
-         case llvm::ELF::R_AARCH64_ABS32:
-           return visitELF_AARCH64_ABS32(R, Value);
-diff --git a/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
-index f2a46b8..9e306bb 100644
---- a/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
-+++ b/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
-@@ -309,6 +309,8 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
-   uint32_t *TargetPtr =
-       reinterpret_cast<uint32_t *>(Section.getAddressWithOffset(Offset));
-   uint64_t FinalAddress = Section.getLoadAddressWithOffset(Offset);
-+  // Data should use target endian. Code should always use little endian.
-+  bool isBE = Arch == Triple::aarch64_be;
- 
-   DEBUG(dbgs() << "resolveAArch64Relocation, LocalAddress: 0x"
-                << format("%llx", Section.getAddressWithOffset(Offset))
-@@ -324,14 +326,22 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
-   case ELF::R_AARCH64_ABS64: {
-     uint64_t *TargetPtr =
-         reinterpret_cast<uint64_t *>(Section.getAddressWithOffset(Offset));
--    *TargetPtr = Value + Addend;
-+    if (isBE)
-+      support::ubig64_t::ref{TargetPtr} = Value + Addend;
-+    else
-+      support::ulittle64_t::ref{TargetPtr} = Value + Addend;
-     break;
-   }
-   case ELF::R_AARCH64_PREL32: {
-     uint64_t Result = Value + Addend - FinalAddress;
-     assert(static_cast<int64_t>(Result) >= INT32_MIN &&
-            static_cast<int64_t>(Result) <= UINT32_MAX);
--    *TargetPtr = static_cast<uint32_t>(Result & 0xffffffffU);
-+    if (isBE)
-+      support::ubig32_t::ref{TargetPtr} =
-+        static_cast<uint32_t>(Result & 0xffffffffU);
-+    else
-+      support::ulittle32_t::ref{TargetPtr} =
-+        static_cast<uint32_t>(Result & 0xffffffffU);
-     break;
-   }
-   case ELF::R_AARCH64_CALL26: // fallthrough
-@@ -339,6 +349,7 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
-     // Operation: S+A-P. Set Call or B immediate value to bits fff_fffc of the
-     // calculation.
-     uint64_t BranchImm = Value + Addend - FinalAddress;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // "Check that -2^27 <= result < 2^27".
-     assert(isInt<28>(BranchImm));
-@@ -352,91 +363,105 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
-   }
-   case ELF::R_AARCH64_MOVW_UABS_G3: {
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffe0001fU;
-+    TargetValue &= 0xffe0001fU;
-     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
--    *TargetPtr |= Result >> (48 - 5);
-+    TargetValue |= ((Result & 0xffff000000000000ULL) >> (48 - 5));
-     // Shift must be "lsl #48", in bits 22:21
--    assert((*TargetPtr >> 21 & 0x3) == 3 && "invalid shift for relocation");
-+    assert((TargetValue >> 21 & 0x3) == 3 && "invalid shift for relocation");
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_MOVW_UABS_G2_NC: {
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffe0001fU;
-+    TargetValue &= 0xffe0001fU;
-     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
--    *TargetPtr |= ((Result & 0xffff00000000ULL) >> (32 - 5));
-+    TargetValue |= ((Result & 0xffff00000000ULL) >> (32 - 5));
-     // Shift must be "lsl #32", in bits 22:21
--    assert((*TargetPtr >> 21 & 0x3) == 2 && "invalid shift for relocation");
-+    assert((TargetValue >> 21 & 0x3) == 2 && "invalid shift for relocation");
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_MOVW_UABS_G1_NC: {
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffe0001fU;
-+    TargetValue &= 0xffe0001fU;
-     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
--    *TargetPtr |= ((Result & 0xffff0000U) >> (16 - 5));
-+    TargetValue |= ((Result & 0xffff0000U) >> (16 - 5));
-     // Shift must be "lsl #16", in bits 22:2
--    assert((*TargetPtr >> 21 & 0x3) == 1 && "invalid shift for relocation");
-+    assert((TargetValue >> 21 & 0x3) == 1 && "invalid shift for relocation");
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_MOVW_UABS_G0_NC: {
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffe0001fU;
-+    TargetValue &= 0xffe0001fU;
-     // Immediate goes in bits 20:5 of MOVZ/MOVK instruction
--    *TargetPtr |= ((Result & 0xffffU) << 5);
-+    TargetValue |= ((Result & 0xffffU) << 5);
-     // Shift must be "lsl #0", in bits 22:21.
--    assert((*TargetPtr >> 21 & 0x3) == 0 && "invalid shift for relocation");
-+    assert((TargetValue >> 21 & 0x3) == 0 && "invalid shift for relocation");
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_ADR_PREL_PG_HI21: {
-     // Operation: Page(S+A) - Page(P)
-     uint64_t Result =
-         ((Value + Addend) & ~0xfffULL) - (FinalAddress & ~0xfffULL);
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // Check that -2^32 <= X < 2^32
-     assert(isInt<33>(Result) && "overflow check failed for relocation");
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0x9f00001fU;
-+    TargetValue &= 0x9f00001fU;
-     // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
-     // from bits 32:12 of X.
--    *TargetPtr |= ((Result & 0x3000U) << (29 - 12));
--    *TargetPtr |= ((Result & 0x1ffffc000ULL) >> (14 - 5));
-+    TargetValue |= ((Result & 0x3000U) << (29 - 12));
-+    TargetValue |= ((Result & 0x1ffffc000ULL) >> (14 - 5));
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_LDST32_ABS_LO12_NC: {
-     // Operation: S + A
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffc003ffU;
-+    TargetValue &= 0xffc003ffU;
-     // Immediate goes in bits 21:10 of LD/ST instruction, taken
-     // from bits 11:2 of X
--    *TargetPtr |= ((Result & 0xffc) << (10 - 2));
-+    TargetValue |= ((Result & 0xffc) << (10 - 2));
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   case ELF::R_AARCH64_LDST64_ABS_LO12_NC: {
-     // Operation: S + A
-     uint64_t Result = Value + Addend;
-+    uint32_t TargetValue = support::ulittle32_t::ref{TargetPtr};
- 
-     // AArch64 code is emitted with .rela relocations. The data already in any
-     // bits affected by the relocation on entry is garbage.
--    *TargetPtr &= 0xffc003ffU;
-+    TargetValue &= 0xffc003ffU;
-     // Immediate goes in bits 21:10 of LD/ST instruction, taken
-     // from bits 11:3 of X
--    *TargetPtr |= ((Result & 0xff8) << (10 - 3));
-+    TargetValue |= ((Result & 0xff8) << (10 - 3));
-+    support::ulittle32_t::ref{TargetPtr} = TargetValue;
-     break;
-   }
-   }
diff --git a/root-cache-test.patch b/root-cache-test.patch
deleted file mode 100644
index 3af6575..0000000
--- a/root-cache-test.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
-index 778381a..e9701c6 100644
---- a/hist/histpainter/src/THistPainter.cxx
-+++ b/hist/histpainter/src/THistPainter.cxx
-@@ -2264,8 +2264,8 @@ Begin_Macro(source)
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    TMultiGraph *mg;
-    TKey *key;
-diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
-index c734bf6..a95b226 100644
---- a/test/stressGraphics.cxx
-+++ b/test/stressGraphics.cxx
-@@ -1984,7 +1984,8 @@ void th2poly()
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff --git a/test/stressHistogram.cxx b/test/stressHistogram.cxx
-index 25f2c59..f6a3c67 100644
---- a/test/stressHistogram.cxx
-+++ b/test/stressHistogram.cxx
-@@ -10167,7 +10167,8 @@ int stressHistogram()
-       refFile = TFile::Open(refFileName, "RECREATE");
-    }
-    else {
--      refFile = TFile::Open(refFileName);
-+      TFile::SetCacheFileDir(".");
-+      refFile = TFile::Open(refFileName, "CACHEREAD");
-    }
- 
-    if ( refFile != 0 ) {
-diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
-index 8256069..fe2a3e1 100644
---- a/test/stressRooFit.cxx
-+++ b/test/stressRooFit.cxx
-@@ -78,10 +78,11 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
-          cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
-          return 1;
-       }
--      fref = new TWebFile(refFile) ;
-+      TFile::SetCacheFileDir(".");
-+      fref = TFile::Open(refFile,"CACHEREAD") ;
-       //std::cout << "using WEB file " << refFile << std::endl;
-     } else {
--      fref = new TFile(refFile,writeRef?"RECREATE":"") ;
-+      fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
-       //std::cout << "using file " << refFile << std::endl;
-     }
-     if (fref->IsZombie()) {
-diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
-index 23f522c..128024a 100644
---- a/test/stressTMVA.cxx
-+++ b/test/stressTMVA.cxx
-@@ -2020,21 +2020,15 @@ void MethodUnitTestWithROCLimits::run()
-   dataloader->AddVariable( _VariableNames->at(3),                "Variable 4", "units", 'F' );
- 
-   TFile* input(0);
--
-   FileStat_t stat;
- 
--  TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
--  const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
-+  TString fname = "./tmva_class_example.root";
-   if(!gSystem->GetPathInfo(fname,stat)) {
-      input = TFile::Open( fname );
--  } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--     input = TFile::Open( "../"+fname );
--  } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
--     input = TFile::Open( fcname );
-   } else {
--     input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
-+     TFile::SetCacheFileDir(".");
-+     input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-   }
--  delete [] fcname;
-   if (input == NULL) {
-      cerr << "broken/inaccessible input file" << endl;
-   }
-@@ -2451,14 +2445,12 @@ void RegressionUnitTestWithDeviation::run()
-    TFile* input(0);
-    FileStat_t stat;
- 
--   // FIXME:: give the filename of the sample somewhere else?
--   TString fname = "../tmva/test/tmva_reg_example.root";
-+   TString fname = "./tmva_reg_example.root";
-    if(!gSystem->GetPathInfo(fname,stat)) {
-       input = TFile::Open( fname );
--   } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
--      input = TFile::Open( "../"+fname );
-    } else {
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
-    }
-    if (input == NULL) {
-       cerr << "broken/inaccessible input file" << endl;
-diff --git a/tmva/pymva/test/Classification.C b/tmva/pymva/test/Classification.C
-index 71987a7..d5c8c6e 100644
---- a/tmva/pymva/test/Classification.C
-+++ b/tmva/pymva/test/Classification.C
-@@ -27,23 +27,26 @@ void Classification()
-    TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
-          "!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
- 
--
-    factory->AddVariable("myvar1 := var1+var2", 'F');
-    factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
-    factory->AddVariable("var3",                "Variable 3", "units", 'F');
-    factory->AddVariable("var4",                "Variable 4", "units", 'F');
--
--
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
--
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff --git a/tmva/rmva/test/Classification.C b/tmva/rmva/test/Classification.C
-index 5a2668f..fba8505 100644
---- a/tmva/rmva/test/Classification.C
-+++ b/tmva/rmva/test/Classification.C
-@@ -36,12 +36,19 @@ void Classification()
-    factory->AddSpectator("spec1 := var1*2",  "Spectator 1", "units", 'F');
-    factory->AddSpectator("spec2 := var1*3",  "Spectator 2", "units", 'F');
- 
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName(fname))    // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-diff --git a/tutorials/hist/th2polyUSA.C b/tutorials/hist/th2polyUSA.C
-index 5dc69fe..f7adef0 100644
---- a/tutorials/hist/th2polyUSA.C
-+++ b/tutorials/hist/th2polyUSA.C
-@@ -49,8 +49,8 @@ void th2polyUSA()
-    Double_t lat2 = 50;
-    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- 
--   TFile *f;
--   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   TFile::SetCacheFileDir(".");
-+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
- 
-    if (!f) {
-       printf("Cannot access usa.root. Is internet working ?\n");
-diff --git a/tutorials/tmva/TMVAClassification.C b/tutorials/tmva/TMVAClassification.C
-index ee2056f..1602cab 100644
---- a/tutorials/tmva/TMVAClassification.C
-+++ b/tutorials/tmva/TMVAClassification.C
-@@ -164,13 +164,19 @@ int TMVAClassification( TString myMethodList = "" )
- 
-    // Read training and test data
-    // (it is also possible to use ASCII format as input -> see TMVA Users Guide)
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--
--   if (gSystem->AccessPathName( fname ))  // file does not exist in local directory
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--
--   TFile *input = TFile::Open( fname );
--
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
-    std::cout << "--- TMVAClassification       : Using input file: " << input->GetName() << std::endl;
- 
-    // Register the training and test trees
-diff --git a/tutorials/tmva/TMVAClassificationApplication.C b/tutorials/tmva/TMVAClassificationApplication.C
-index 255e187..b03b472 100644
---- a/tutorials/tmva/TMVAClassificationApplication.C
-+++ b/tutorials/tmva/TMVAClassificationApplication.C
-@@ -232,12 +232,14 @@ void TMVAClassificationApplication( TString myMethodList = "" )
-    // we'll later on use only the "signal" events for the test in this example.
-    //
-    TFile *input(0);
--   TString fname = "./tmva_example.root";
--   if (!gSystem->AccessPathName( fname ))
-+   TString fname = "./tmva_class_example.root";
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else
--      input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
--
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff --git a/tutorials/tmva/TMVACrossValidation.C b/tutorials/tmva/TMVACrossValidation.C
-index 1b85b98..b46004e 100644
---- a/tutorials/tmva/TMVACrossValidation.C
-+++ b/tutorials/tmva/TMVACrossValidation.C
-@@ -26,10 +26,19 @@ void TMVACrossValidation()
-    TMVA::Tools::Instance();
- 
-    // Load data
-+   TFile *input(0);
-    TString fname = "./tmva_class_example.root";
--   if (gSystem->AccessPathName(fname))
--      gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
--   TFile *input = TFile::Open(fname);
-+   if (!gSystem->AccessPathName( fname )) {
-+      input = TFile::Open( fname ); // check if file in local directory exists
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
-+   }
-+   if (!input) {
-+      std::cout << "ERROR: could not open data file" << std::endl;
-+      exit(1);
-+   }
- 
-    TTree* signalTree = (TTree*)input->Get("TreeS");
-    TTree* background = (TTree*)input->Get("TreeB");
-diff --git a/tutorials/tmva/TMVARegression.C b/tutorials/tmva/TMVARegression.C
-index 850ff84..c94ce13 100644
---- a/tutorials/tmva/TMVARegression.C
-+++ b/tutorials/tmva/TMVARegression.C
-@@ -166,11 +166,13 @@ void TMVARegression( TString myMethodList = "" )
-    // load the signal and background event samples from ROOT trees
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
--   if (!gSystem->AccessPathName( fname ))
-+   if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   else
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
--
-+   }
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
-diff --git a/tutorials/tmva/TMVARegressionApplication.C b/tutorials/tmva/TMVARegressionApplication.C
-index 9ceefdf..8a8e62f 100644
---- a/tutorials/tmva/TMVARegressionApplication.C
-+++ b/tutorials/tmva/TMVARegressionApplication.C
-@@ -128,16 +128,16 @@ void TMVARegressionApplication( TString myMethodList = "" )
-    // Prepare input tree (this must be replaced by your data source)
-    // in this example, there is a toy tree with signal and one with background events
-    // we'll later on use only the "signal" events for the test in this example.
--   //   
-+   //
-    TFile *input(0);
-    TString fname = "./tmva_reg_example.root";
-    if (!gSystem->AccessPathName( fname )) {
-       input = TFile::Open( fname ); // check if file in local directory exists
--   } 
--   else { 
--      input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
-    }
--   
-+   else {
-+      TFile::SetCacheFileDir(".");
-+      input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
-+   }
-    if (!input) {
-       std::cout << "ERROR: could not open data file" << std::endl;
-       exit(1);
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index ffa412c..56aa2bc 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.08.02.orig/core/base/src/TApplication.cxx root-6.08.02/core/base/src/TApplication.cxx
---- root-6.08.02.orig/core/base/src/TApplication.cxx	2016-12-06 12:46:10.308969599 +0100
-+++ root-6.08.02/core/base/src/TApplication.cxx	2016-12-06 12:54:51.662058443 +0100
+diff -ur root-6.10.00.orig/core/base/src/TApplication.cxx root-6.10.00/core/base/src/TApplication.cxx
+--- root-6.10.00.orig/core/base/src/TApplication.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/core/base/src/TApplication.cxx	2017-06-14 22:22:40.348551723 +0200
 @@ -273,18 +273,11 @@
     LoadGraphicsLibs();
  
@@ -30,22 +30,22 @@ diff -ur root-6.08.02.orig/core/base/src/TApplication.cxx root-6.08.02/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.08.02.orig/graf2d/asimage/CMakeLists.txt root-6.08.02/graf2d/asimage/CMakeLists.txt
---- root-6.08.02.orig/graf2d/asimage/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/asimage/CMakeLists.txt	2016-12-06 12:54:51.691058115 +0100
+diff -ur root-6.10.00.orig/graf2d/asimage/CMakeLists.txt root-6.10.00/graf2d/asimage/CMakeLists.txt
+--- root-6.10.00.orig/graf2d/asimage/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/asimage/CMakeLists.txt	2017-06-14 22:22:40.367551513 +0200
 @@ -13,7 +13,7 @@
  ROOT_GENERATE_DICTIONARY(G__ASImage TASImage.h TASImagePlugin.h TASPluginGS.h MODULE ASImage LINKDEF LinkDef.h  OPTIONS "-writeEmptyRootPCM")
  
  ROOT_LINKER_LIBRARY(ASImage TASImage.cxx TASPluginGS.cxx  G__ASImage.cxx
 -                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
 +                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
-                     ${ZLIB_LIBRARIES} DEPENDENCIES Graf)
- if(builtin_afterimage)
-   ROOT_ADD_BUILTIN_DEPENDENCIES(ASImage AFTERIMAGE)
-diff -ur root-6.08.02.orig/graf2d/asimage/Module.mk root-6.08.02/graf2d/asimage/Module.mk
---- root-6.08.02.orig/graf2d/asimage/Module.mk	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/asimage/Module.mk	2016-12-06 12:54:51.692058104 +0100
-@@ -226,7 +226,7 @@
+                     ${ZLIB_LIBRARIES} DEPENDENCIES Graf BUILTINS AFTERIMAGE)
+ 
+ ROOT_GENERATE_DICTIONARY(G__ASImageGui TASPaletteEditor.h MODULE ASImageGui LINKDEF LinkDefGui.h OPTIONS "-writeEmptyRootPCM")
+diff -ur root-6.10.00.orig/graf2d/asimage/Module.mk root-6.10.00/graf2d/asimage/Module.mk
+--- root-6.10.00.orig/graf2d/asimage/Module.mk	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/asimage/Module.mk	2017-06-14 22:22:40.367551513 +0200
+@@ -236,7 +236,7 @@
  		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
  		   "$(ASIMAGEO) $(ASIMAGEDO)" \
  		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \
@@ -54,9 +54,9 @@ diff -ur root-6.08.02.orig/graf2d/asimage/Module.mk root-6.08.02/graf2d/asimage/
  		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(ASNEEDX11LIBS)"
  
  $(call pcmrule,ASIMAGE)
-diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/asimage/src/TASImage.cxx
---- root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:46:10.320969463 +0100
-+++ root-6.08.02/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:54:51.693058093 +0100
+diff -ur root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx root-6.10.00/graf2d/asimage/src/TASImage.cxx
+--- root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/asimage/src/TASImage.cxx	2017-06-14 22:22:40.368551502 +0200
 @@ -110,6 +110,8 @@
  #   include <draw.h>
  }
@@ -66,7 +66,7 @@ diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2593,14 +2595,120 @@
+@@ -2596,14 +2598,120 @@
     TString fn = font_name;
     fn.Strip();
  
@@ -194,7 +194,7 @@ diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/a
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2624,14 +2732,11 @@
+@@ -2627,14 +2735,11 @@
        return;
     }
  
@@ -212,22 +212,21 @@ diff -ur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.08.02.orig/graf2d/graf/CMakeLists.txt root-6.08.02/graf2d/graf/CMakeLists.txt
---- root-6.08.02.orig/graf2d/graf/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/graf/CMakeLists.txt	2016-12-06 12:54:51.693058093 +0100
-@@ -10,7 +10,7 @@
+diff -ur root-6.10.00.orig/graf2d/graf/CMakeLists.txt root-6.10.00/graf2d/graf/CMakeLists.txt
+--- root-6.10.00.orig/graf2d/graf/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/graf/CMakeLists.txt	2017-06-14 22:22:40.369551491 +0200
+@@ -8,6 +8,6 @@
  
  include_directories(${FREETYPE_INCLUDE_DIRS})
  
--ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Hist Matrix MathCore RIO)
-+ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO)
+-ROOT_LINKER_LIBRARY(Graf *.cxx G__Graf.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
++ROOT_LINKER_LIBRARY(Graf *.cxx G__Graf.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
  
- if(builtin_freetype)
-   ROOT_ADD_BUILTIN_DEPENDENCIES(${libname} FREETYPE)
-diff -ur root-6.08.02.orig/graf2d/graf/inc/TTF.h root-6.08.02/graf2d/graf/inc/TTF.h
---- root-6.08.02.orig/graf2d/graf/inc/TTF.h	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/graf/inc/TTF.h	2016-12-06 12:54:51.693058093 +0100
-@@ -78,9 +78,8 @@
+ ROOT_INSTALL_HEADERS()
+diff -ur root-6.10.00.orig/graf2d/graf/inc/TTF.h root-6.10.00/graf2d/graf/inc/TTF.h
+--- root-6.10.00.orig/graf2d/graf/inc/TTF.h	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/graf/inc/TTF.h	2017-06-14 22:22:40.369551491 +0200
+@@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
     static Int_t          fgCurFontIdx;            ///< current font index
@@ -238,10 +237,10 @@ diff -ur root-6.08.02.orig/graf2d/graf/inc/TTF.h root-6.08.02/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.08.02.orig/graf2d/graf/Module.mk root-6.08.02/graf2d/graf/Module.mk
---- root-6.08.02.orig/graf2d/graf/Module.mk	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/graf/Module.mk	2016-12-06 12:54:51.693058093 +0100
-@@ -46,7 +46,7 @@
+diff -ur root-6.10.00.orig/graf2d/graf/Module.mk root-6.10.00/graf2d/graf/Module.mk
+--- root-6.10.00.orig/graf2d/graf/Module.mk	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/graf/Module.mk	2017-06-14 22:22:40.369551491 +0200
+@@ -58,7 +58,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
  		   "$(GRAFO) $(GRAFDO)" \
@@ -250,9 +249,9 @@ diff -ur root-6.08.02.orig/graf2d/graf/Module.mk root-6.08.02/graf2d/graf/Module
  
  $(call pcmrule,GRAF)
  	$(noop)
-diff -ur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/TTF.cxx
---- root-6.08.02.orig/graf2d/graf/src/TTF.cxx	2016-12-06 12:46:10.322969441 +0100
-+++ root-6.08.02/graf2d/graf/src/TTF.cxx	2016-12-06 12:54:51.700058013 +0100
+diff -ur root-6.10.00.orig/graf2d/graf/src/TTF.cxx root-6.10.00/graf2d/graf/src/TTF.cxx
+--- root-6.10.00.orig/graf2d/graf/src/TTF.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/graf/src/TTF.cxx	2017-06-14 22:22:40.370551479 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -729,7 +728,7 @@ diff -ur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/
 -/// |---------|---------------------------|------------------|
 -/// |      1  | times-medium-i-normal     | timesi.ttf       |
 -/// |      2  | times-bold-r-normal       | timesbd.ttf      |
--/// |      3  | times-bold-i-normal       | timesi.ttf       |
+-/// |      3  | times-bold-i-normal       | timesbi.ttf      |
 -/// |      4  | helvetica-medium-r-normal | arial.ttf        |
 -/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
 -/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
@@ -813,9 +812,9 @@ diff -ur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.08.02.orig/graf2d/postscript/CMakeLists.txt root-6.08.02/graf2d/postscript/CMakeLists.txt
---- root-6.08.02.orig/graf2d/postscript/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/postscript/CMakeLists.txt	2016-12-06 12:54:51.700058013 +0100
+diff -ur root-6.10.00.orig/graf2d/postscript/CMakeLists.txt root-6.10.00/graf2d/postscript/CMakeLists.txt
+--- root-6.10.00.orig/graf2d/postscript/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/postscript/CMakeLists.txt	2017-06-14 22:22:40.370551479 +0200
 @@ -5,5 +5,5 @@
  
  ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
@@ -823,10 +822,10 @@ diff -ur root-6.08.02.orig/graf2d/postscript/CMakeLists.txt root-6.08.02/graf2d/
 -ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Graf)
 +ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Graf)
  ROOT_INSTALL_HEADERS()
-diff -ur root-6.08.02.orig/graf2d/postscript/Module.mk root-6.08.02/graf2d/postscript/Module.mk
---- root-6.08.02.orig/graf2d/postscript/Module.mk	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/postscript/Module.mk	2016-12-06 12:54:51.700058013 +0100
-@@ -50,7 +50,7 @@
+diff -ur root-6.10.00.orig/graf2d/postscript/Module.mk root-6.10.00/graf2d/postscript/Module.mk
+--- root-6.10.00.orig/graf2d/postscript/Module.mk	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/postscript/Module.mk	2017-06-14 22:22:40.370551479 +0200
+@@ -59,7 +59,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
  		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
@@ -835,9 +834,9 @@ diff -ur root-6.08.02.orig/graf2d/postscript/Module.mk root-6.08.02/graf2d/posts
  
  $(call pcmrule,POSTSCRIPT)
  	$(noop)
-diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:46:10.322969441 +0100
-+++ root-6.08.02/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:54:51.701058002 +0100
+diff -ur root-6.10.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.10.00/graf2d/postscript/src/TPostScript.cxx
+--- root-6.10.00.orig/graf2d/postscript/src/TPostScript.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf2d/postscript/src/TPostScript.cxx	2017-06-14 22:22:40.371551468 +0200
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -846,7 +845,7 @@ diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1529,56 +1530,179 @@
+@@ -1575,56 +1576,179 @@
  
  void TPostScript::FontEmbed(void)
  {
@@ -1071,7 +1070,7 @@ diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1587,9 +1711,8 @@
+@@ -1633,9 +1757,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -1083,22 +1082,7 @@ diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/gr
              }
              delete [] ttfont;
           }
-@@ -2548,10 +2671,10 @@
-       { "Root.PSFont.5",             "/Helvetica-Oblique" },
-       { "Root.PSFont.6",             "/Helvetica-Bold" },
-       { "Root.PSFont.7",             "/Helvetica-BoldOblique" },
--      { "Root.PSFont.8",             "/Courrier" },
--      { "Root.PSFont.9",             "/Courrier-Oblique" },
--      { "Root.PSFont.10",            "/Courrier-Bold" },
--      { "Root.PSFont.11",            "/Courrier-BoldOblique" },
-+      { "Root.PSFont.8",             "/Courier" },
-+      { "Root.PSFont.9",             "/Courier-Oblique" },
-+      { "Root.PSFont.10",            "/Courier-Bold" },
-+      { "Root.PSFont.11",            "/Courier-BoldOblique" },
-       { "Root.PSFont.12",            "/Symbol" },
-       { "Root.PSFont.13",            "/Times-Roman" },
-       { "Root.PSFont.14",            "/ZapfDingbats" },
-@@ -2757,10 +2880,10 @@
+@@ -2803,10 +2926,10 @@
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -1112,10 +1096,10 @@ diff -ur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.08.02.orig/graf3d/gl/CMakeLists.txt root-6.08.02/graf3d/gl/CMakeLists.txt
---- root-6.08.02.orig/graf3d/gl/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf3d/gl/CMakeLists.txt	2016-12-06 12:54:51.701058002 +0100
-@@ -43,6 +43,6 @@
+diff -ur root-6.10.00.orig/graf3d/gl/CMakeLists.txt root-6.10.00/graf3d/gl/CMakeLists.txt
+--- root-6.10.00.orig/graf3d/gl/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf3d/gl/CMakeLists.txt	2017-06-14 22:22:40.371551468 +0200
+@@ -39,6 +39,6 @@
  
  ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
  
@@ -1123,10 +1107,10 @@ diff -ur root-6.08.02.orig/graf3d/gl/CMakeLists.txt root-6.08.02/graf3d/gl/CMake
 +ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
  
  ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.08.02.orig/graf3d/gl/Module.mk root-6.08.02/graf3d/gl/Module.mk
---- root-6.08.02.orig/graf3d/gl/Module.mk	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf3d/gl/Module.mk	2016-12-06 12:54:51.702057991 +0100
-@@ -86,7 +86,7 @@
+diff -ur root-6.10.00.orig/graf3d/gl/Module.mk root-6.10.00/graf3d/gl/Module.mk
+--- root-6.10.00.orig/graf3d/gl/Module.mk	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf3d/gl/Module.mk	2017-06-14 22:22:40.371551468 +0200
+@@ -95,7 +95,7 @@
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
  		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
  		    $(GL2PSLIBDIR) $(GL2PSLIB) \
@@ -1135,9 +1119,9 @@ diff -ur root-6.08.02.orig/graf3d/gl/Module.mk root-6.08.02/graf3d/gl/Module.mk
  
  $(call pcmrule,GL)
  	$(noop)
-diff -ur root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.08.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:46:10.323969430 +0100
-+++ root-6.08.02/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:54:51.702057991 +0100
+diff -ur root-6.10.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.10.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.10.00.orig/graf3d/gl/src/TGLFontManager.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf3d/gl/src/TGLFontManager.cxx	2017-06-14 22:22:40.371551468 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1393,9 +1377,9 @@ diff -ur root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.08.02/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.08.02.orig/graf3d/gl/src/TGLText.cxx root-6.08.02/graf3d/gl/src/TGLText.cxx
---- root-6.08.02.orig/graf3d/gl/src/TGLText.cxx	2016-12-06 12:46:10.323969430 +0100
-+++ root-6.08.02/graf3d/gl/src/TGLText.cxx	2016-12-06 12:54:51.702057991 +0100
+diff -ur root-6.10.00.orig/graf3d/gl/src/TGLText.cxx root-6.10.00/graf3d/gl/src/TGLText.cxx
+--- root-6.10.00.orig/graf3d/gl/src/TGLText.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/graf3d/gl/src/TGLText.cxx	2017-06-14 22:22:40.372551457 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1530,9 +1514,9 @@ diff -ur root-6.08.02.orig/graf3d/gl/src/TGLText.cxx root-6.08.02/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.08.02.orig/gui/gui/src/TGApplication.cxx root-6.08.02/gui/gui/src/TGApplication.cxx
---- root-6.08.02.orig/gui/gui/src/TGApplication.cxx	2016-12-06 12:46:10.324969418 +0100
-+++ root-6.08.02/gui/gui/src/TGApplication.cxx	2016-12-06 12:54:51.703057979 +0100
+diff -ur root-6.10.00.orig/gui/gui/src/TGApplication.cxx root-6.10.00/gui/gui/src/TGApplication.cxx
+--- root-6.10.00.orig/gui/gui/src/TGApplication.cxx	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/gui/gui/src/TGApplication.cxx	2017-06-14 22:22:40.372551457 +0200
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-format.patch b/root-format.patch
deleted file mode 100644
index 789afd4..0000000
--- a/root-format.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/net/globusauth/src/GlobusAuth.cxx b/net/globusauth/src/GlobusAuth.cxx
-index 6e0a00a..0b778bf 100644
---- a/net/globusauth/src/GlobusAuth.cxx
-+++ b/net/globusauth/src/GlobusAuth.cxx
-@@ -139,7 +139,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
-       return -1;
-    }
-    if (gDebug > 3)
--      Info("GlobusAuthenticate", " Credential Handle is 0x%x",
-+      Info("GlobusAuthenticate", " Credential Handle is %p",
-            gGlbCredHandle);
- 
-    // Inquire credentials for subject name and convert it in human readable form ...
-@@ -193,7 +193,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
-          if (gDebug > 0)
-             Error("GlobusAuthenticate",
-                   "Length of Issuer name not send correctly: bytes sent: %d (tot len: %d)",
--                  bsnd - 1, strlen(buf));
-+                  bsnd - 1, (int) strlen(buf));
-          return 0;
-       }
-       // Now we send it to the server daemon
-@@ -240,7 +240,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
-                   "recv host subj: did not receive all the bytes"
-                   " (recv: %d, due >%d)", brcv, retval);
-                Error("GlobusAuthenticate", "recv host subj: (%d) %s",
--                  strlen(host_subj), host_subj);
-+                  (int) strlen(host_subj), host_subj);
-             }
-             if (host_subj) delete[] host_subj;
-             return 0;
-@@ -262,7 +262,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
-        0 ? (GSS_C_DELEG_FLAG | GSS_C_MUTUAL_FLAG) : GSS_C_MUTUAL_FLAG;
-    if (gDebug > 3)
-       Info("GlobusAuthenticate",
--           " gssReqFlags: %p, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
-+           " gssReqFlags: 0x%x, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
- 
-    // Now we are ready to start negotiating with the Server
-    if ((majStat =
-@@ -417,7 +417,7 @@ int GlobusGetDelCred()
-       return 1;
-    } else if (gDebug > 3)
-       Info("GlobusGetDelCred:",
--           "Globus Credentials successfully imported (0x%x)",
-+           "Globus Credentials successfully imported (%p)",
-            gGlbDelCredHandle);
- 
-    if (credential) delete[] credential;
-@@ -494,7 +494,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
-             Info("GlobusGetLocalEnv",
-                  "PROOF environment, called by the MASTER/SLAVE");
-             Info("GlobusGetLocalEnv",
--                 "string with pointer to del cred is 0x%x",
-+                 "string with pointer to del cred is %p",
-                  gGlbDelCredHandle);
-          }
-          *localEnv = 2;
-@@ -542,7 +542,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
- Int_t GlobusNameFromCred(gss_cred_id_t cred, TString &subjName)
- {
-    if (gDebug > 2)
--      Info("GlobusNamesFromCred", "Enter: Handle: 0x%p", cred);
-+      Info("GlobusNamesFromCred", "Enter: Handle: %p", cred);
- 
-    // Inquire credentials for Subject name and convert it in human readable form ...
-    OM_uint32 majStat = 0;
-@@ -662,7 +662,7 @@ void GlobusCleanupShm()
-             if ((rc == EINVAL) || (rc == EIDRM)) {
-                if (gDebug > 3)
-                   Info("GlobusCleanupShm:",
--                       "credentials shared memory segment %s"
-+                       "credentials shared memory segment "
-                        "already marked as destroyed");
-             } else {
-                Warning("GlobusCleanupShm:",
-@@ -730,7 +730,7 @@ Int_t GlobusCheckSecContext(const char *subjName, gss_ctx_id_t ctx)
-             theName[nameBuffer.length]= '\0';
-             if (gDebug > 2)
-                Info("GlobusCheckSecContext","with subject name: %s (%d)",
--                                             theName, nameBuffer.length);
-+                                             theName, (int) nameBuffer.length);
-             if (!strcmp(theName, subjName)) {
-                if (gDebug > 2)
-                   Info("GlobusCheckSecContext",
-@@ -1010,7 +1010,7 @@ Int_t GlobusIssuerName(TString &issuerName)
-          fn = Form("%s/.globus/usercert.pem",gSystem->HomeDirectory());
-       if (gSystem->AccessPathName(fn, kReadPermission)) {
-          emsg += fn;
--         Error("GlobusIssuerName", emsg.Data());
-+         Error("GlobusIssuerName", "%s", emsg.Data());
-          return 1;
-       }
-    }
diff --git a/root-fsf-addr.patch b/root-fsf-addr.patch
deleted file mode 100644
index b06480d..0000000
--- a/root-fsf-addr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/config/root-help.el.in b/config/root-help.el.in
-index eab32de..8e6f8f9 100644
---- a/config/root-help.el.in
-+++ b/config/root-help.el.in
-@@ -18,8 +18,8 @@
- ;;
- ;;  You should have received a copy of the GNU General Public License
- ;;  along with this program; if not, write to the Free Software
--;;  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--;;  02111-1307 USA
-+;;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+;;  02110-1301, USA
- ;;
- ;; Author: Christian Holm Christensen <cholm@nbi.dk>
- ;; Maintainer: Christian Holm Christensen <cholm@nbi.dk>
diff --git a/root-global-name-not-defined.patch b/root-global-name-not-defined.patch
deleted file mode 100644
index f682748..0000000
--- a/root-global-name-not-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/tutorials/pyroot/zdemo.py b/tutorials/pyroot/zdemo.py
-index 28db48f..603c7cb 100644
---- a/tutorials/pyroot/zdemo.py
-+++ b/tutorials/pyroot/zdemo.py
-@@ -18,7 +18,6 @@
- 
- import ROOT
- from array import array
--from math import *
- 
- NMAX = 20
- Z      = array( 'f', [0.]*NMAX )
-@@ -31,6 +30,7 @@ saves = {}
- 
- #_______________________________________________________________________________
- def hz_calc( ENERG, DENS, TGRAD, PTMIN, PTMAX, DELP ):
-+   from math import sin, cos, sqrt
-    global NLOOP
-    global Z, HZ, PT, INVSIG
- 
-@@ -104,9 +104,11 @@ def hz_calc( ENERG, DENS, TGRAD, PTMIN, PTMAX, DELP ):
- 
- #_______________________________________________________________________________
- def zdemo():
-+    from array import array
-     global NLOOP
-     global Z, HZ, PT, INVSIG
-     global saves
-+    global hz_calc
- 
-     # Create a new canvas.
-     c1 = ROOT.TCanvas( 'zdemo', 'Monte Carlo Study of Z scaling', 10, 40, 800, 600 )
diff --git a/root-hz.patch b/root-hz.patch
deleted file mode 100644
index d9ea509..0000000
--- a/root-hz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tutorials/graphs/zdemo.C b/tutorials/graphs/zdemo.C
-index 15257ce..0364123 100644
---- a/tutorials/graphs/zdemo.C
-+++ b/tutorials/graphs/zdemo.C
-@@ -25,6 +25,10 @@
- #include "TGraph.h"
- #include "TFrame.h"
- 
-+#ifdef HZ
-+#undef HZ
-+#endif
-+
- const Int_t NMAX = 20;
- Int_t NLOOP;
- Float_t Z[NMAX], HZ[NMAX], PT[NMAX], INVSIG[NMAX];
diff --git a/root-jupyroot-path.patch b/root-jupyroot-path.patch
deleted file mode 100644
index e2f679a..0000000
--- a/root-jupyroot-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/bindings/pyroot/JupyROOT/handlers.py b/bindings/pyroot/JupyROOT/handlers.py
-index 2181ad3..32c38eb 100644
---- a/bindings/pyroot/JupyROOT/handlers.py
-+++ b/bindings/pyroot/JupyROOT/handlers.py
-@@ -12,8 +12,9 @@ from threading import Thread
- from time import sleep as timeSleep
- from resource import setrlimit, RLIMIT_STACK, RLIM_INFINITY
- from sys import platform
-+from os import path
- 
--_lib = CDLL("libJupyROOT.so")
-+_lib = CDLL(path.join(path.dirname(path.dirname(__file__)), 'libJupyROOT.so'))
- 
- class IOHandler(object):
-     r'''Class used to capture output from C/C++ libraries.
diff --git a/root-macro-scope.patch b/root-macro-scope.patch
deleted file mode 100644
index 21bcb72..0000000
--- a/root-macro-scope.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/core/meta/src/TClingCallbacks.cxx b/core/meta/src/TClingCallbacks.cxx
-index 85f39dd..2650f96 100644
---- a/core/meta/src/TClingCallbacks.cxx
-+++ b/core/meta/src/TClingCallbacks.cxx
-@@ -552,16 +552,22 @@ bool TClingCallbacks::tryResolveAtRuntimeInternal(LookupResult &R, Scope *S) {
-    assert(TU && "Must not be null.");
- 
-    // DynamicLookup only happens inside wrapper functions:
--   clang::DeclContext* WrapperDC = S->getEntity();
-    clang::FunctionDecl* Wrapper = nullptr;
--   while (true) {
--      if (!WrapperDC || WrapperDC == TU)
-+   Scope* Cursor = S;
-+   do {
-+      DeclContext* DCCursor = Cursor->getEntity();
-+      if (DCCursor == TU)
-          return false;
--      Wrapper = dyn_cast<FunctionDecl>(WrapperDC);
--      if (Wrapper && utils::Analyze::IsWrapper(Wrapper))
--          break;
--      WrapperDC = WrapperDC->getParent();
--   }
-+      Wrapper = dyn_cast_or_null<FunctionDecl>(DCCursor);
-+      if (Wrapper) {
-+         if (utils::Analyze::IsWrapper(Wrapper)) {
-+            break;
-+         } else {
-+            // Can't have a function inside the wrapper:
-+            return false;
-+         }
-+      }
-+   } while ((Cursor = Cursor->getParent()));
- 
-    VarDecl* Result = VarDecl::Create(C, TU, Loc, Loc, II, C.DependentTy,
-                                      /*TypeSourceInfo*/0, SC_None);
diff --git a/root-missing-includes.patch b/root-missing-includes.patch
deleted file mode 100644
index b798c6a..0000000
--- a/root-missing-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tmva/tmva/inc/TMVA/DNN/DataLoader.h b/tmva/tmva/inc/TMVA/DNN/DataLoader.h
-index a3a960f..bf4a922 100644
---- a/tmva/tmva/inc/TMVA/DNN/DataLoader.h
-+++ b/tmva/tmva/inc/TMVA/DNN/DataLoader.h
-@@ -21,6 +21,7 @@
- #include "TMatrix.h"
- #include <vector>
- #include <iostream>
-+#include <algorithm>
- 
- #include "TMVA/Event.h"
- 
diff --git a/root-no-testdata.patch b/root-no-testdata.patch
deleted file mode 100644
index 1157d56..0000000
--- a/root-no-testdata.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
---- root-6.06.02.orig/test/CMakeLists.txt	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/test/CMakeLists.txt	2016-04-02 17:06:39.536489046 +0200
-@@ -239,13 +239,14 @@
- 
- #--stressProof-------------------------------------------------------------------------------
- if(NOT WIN32)
--  add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-+  add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
-   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
-   ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
-                                          -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
-                                          -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
-                                          ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
--                                         FAILREGEX "FAILED|Error in")
-+                                         FAILREGEX "FAILED|Error in"
-+                                         DEPENDS TestData)
- endif()
- 
- #--testbits----------------------------------------------------------------------------------
diff --git a/root-python-install-path.patch b/root-python-install-path.patch
deleted file mode 100644
index e0a02a2..0000000
--- a/root-python-install-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
-index c537bae..3a2118e 100644
---- a/bindings/pyroot/CMakeLists.txt
-+++ b/bindings/pyroot/CMakeLists.txt
-@@ -36,8 +36,13 @@ endif()
- file(GLOB pyfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
- foreach(pyfile ${pyfiles})
-   install(FILES ${pyfile} DESTINATION ${runtimedir})
--  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
--  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
-+  if(IS_ABSOLUTE ${runtimedir})
-+    set(absruntimedir ${runtimedir})
-+  else()
-+    set(absruntimedir ${CMAKE_INSTALL_PREFIX}/${runtimedir})
-+  endif()
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${absruntimedir}/${pyfile})")
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${absruntimedir}/${pyfile})")
-   file(COPY ${pyfile} DESTINATION ${localruntimedir})
- endforeach()
- 
-diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
-index 0f430c9..a431a2b 100644
---- a/main/CMakeLists.txt
-+++ b/main/CMakeLists.txt
-@@ -43,7 +43,12 @@ if(python)
-   endforeach()
- 
-   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
--  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
--  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
-+  if(IS_ABSOLUTE ${runtimedir})
-+    set(absruntimedir ${runtimedir})
-+  else()
-+    set(absruntimedir ${CMAKE_INSTALL_PREFIX}/${runtimedir})
-+  endif()
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${absruntimedir}/cmdLineUtils.py)")
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${absruntimedir}/cmdLineUtils.py)")
-   configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
- endif()
diff --git a/root-python3-support.patch b/root-python3-support.patch
deleted file mode 100644
index 3472599..0000000
--- a/root-python3-support.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff --git a/bindings/pyroot/JsMVA/DataLoader.py b/bindings/pyroot/JsMVA/DataLoader.py
-index 4f5d07e..fa738c0 100644
---- a/bindings/pyroot/JsMVA/DataLoader.py
-+++ b/bindings/pyroot/JsMVA/DataLoader.py
-@@ -5,7 +5,12 @@
- 
- 
- from ROOT import TH1F, TMVA, TBufferJSON
--import JPyInterface
-+import sys
-+if sys.version_info >= (3, 0):
-+    from JsMVA import JPyInterface
-+else:
-+    import JPyInterface
-+from JsMVA.Utils import xrange
- import ROOT
- 
- 
-diff --git a/bindings/pyroot/JsMVA/Factory.py b/bindings/pyroot/JsMVA/Factory.py
-index 3afefbf..13fda56 100644
---- a/bindings/pyroot/JsMVA/Factory.py
-+++ b/bindings/pyroot/JsMVA/Factory.py
-@@ -6,7 +6,12 @@
- 
- import ROOT
- from ROOT import TMVA
--import JPyInterface
-+import sys
-+if sys.version_info >= (3, 0):
-+    from JsMVA import JPyInterface
-+else:
-+    import JPyInterface
-+from JsMVA.Utils import xrange
- from xml.etree.ElementTree import ElementTree
- import json
- from IPython.core.display import display, HTML, clear_output
-@@ -681,7 +686,12 @@ def ChangeCallOriginal__init__(*args,  **kwargs):
-     hasColor = False
-     args = list(args)
-     for arg_idx in xrange(len(args)):
--        if isinstance(args[arg_idx], basestring) and args[arg_idx].find(":")!=-1:
-+        # basestring==(str, unicode) in Python2, which translates to str in Python3
-+        if sys.version_info >= (3, 0):
-+            is_string = isinstance(args[arg_idx], str)
-+        else:
-+            is_string = isinstance(args[arg_idx], basestring)
-+        if is_string and args[arg_idx].find(":")!=-1:
-             if args[arg_idx].find("Color")!=-1:
-                 hasColor = True
-                 if args[arg_idx].find("!Color")==-1:
-@@ -825,4 +835,4 @@ def DrawDNNWeights(fac, datasetName, methodName="DNN"):
-     button = widgets.Button(description="Draw", font_weight="bold", font_size="16")
-     button.on_click(drawWrapper)
-     box = widgets.HBox([selectLayer, button])
--    display(box)
-\ No newline at end of file
-+    display(box)
-diff --git a/bindings/pyroot/JsMVA/JPyInterface.py b/bindings/pyroot/JsMVA/JPyInterface.py
-index 51b32f1..068ab45 100644
---- a/bindings/pyroot/JsMVA/JPyInterface.py
-+++ b/bindings/pyroot/JsMVA/JPyInterface.py
-@@ -8,10 +8,12 @@
- from IPython.core.display import display, HTML
- from string import Template
- import ROOT
--import DataLoader
--import Factory
--import types
--import OutputTransformer
-+import sys
-+if sys.version_info >= (3, 0):
-+    from JsMVA import DataLoader, Factory
-+else:
-+    import DataLoader, Factory
-+from JsMVA import OutputTransformer
- 
- 
- ## Function inserter class
-@@ -94,15 +96,15 @@ class functions:
-         else:
-             opt = ""
-         for key in kwargs:
--            if type(kwargs[key]) == types.BooleanType:
-+            if isinstance(kwargs[key], bool):
-                 if kwargs[key] == True:
-                     opt += key + ":"
-                 else:
-                     opt += "!" + key + ":"
--            elif type(kwargs[key]) == types.ListType:
-+            elif isinstance(kwargs[key], list):
-                 ss = ""
-                 for o in kwargs[key]:
--                    if type(o) == types.DictType:
-+                    if isinstance(o, dict):
-                         sst = ""
-                         for kk in o:
-                             sst += kk + "=" + str(o[kk]) + ","
-diff --git a/bindings/pyroot/JsMVA/JsMVAMagic.py b/bindings/pyroot/JsMVA/JsMVAMagic.py
-index 436ea41..b2b1edf 100644
---- a/bindings/pyroot/JsMVA/JsMVAMagic.py
-+++ b/bindings/pyroot/JsMVA/JsMVAMagic.py
-@@ -23,7 +23,7 @@ class JsMVAMagic(Magics):
-     @magic_arguments()
-     @argument('arg', nargs="?", default="on", help='Enable/Disable JavaScript visualisation for TMVA')
-     def jsmva(self, line):
--        from JPyInterface import functions
-+        from JsMVA.JPyInterface import functions
-         args = parse_argstring(self.jsmva, line)
-         if args.arg == 'on':
-            functions.register()
-@@ -35,4 +35,4 @@ class JsMVAMagic(Magics):
- 
- ## Function for registering the magic class
- def load_ipython_extension(ipython):
--    ipython.register_magics(JsMVAMagic)
-\ No newline at end of file
-+    ipython.register_magics(JsMVAMagic)
-diff --git a/bindings/pyroot/JsMVA/OutputTransformer.py b/bindings/pyroot/JsMVA/OutputTransformer.py
-index 81393a4..7cc10a5 100644
---- a/bindings/pyroot/JsMVA/OutputTransformer.py
-+++ b/bindings/pyroot/JsMVA/OutputTransformer.py
-@@ -3,7 +3,8 @@
- #  @author Attila Bagoly <battila93@gmail.com>
- # This class will transform the TMVA original output to HTML formated output.
- 
--import DataLoader
-+from JsMVA import DataLoader
-+from JsMVA.Utils import xrange
- import cgi
- import re
- 
-diff --git a/bindings/pyroot/JsMVA/Utils.py b/bindings/pyroot/JsMVA/Utils.py
-new file mode 100644
-index 0000000..0abba09
---- /dev/null
-+++ b/bindings/pyroot/JsMVA/Utils.py
-@@ -0,0 +1,10 @@
-+# -*- coding: utf-8 -*-
-+#  @package JsMVA.Utils
-+#  @author Enric Tejedor <etejedor@cern.ch>
-+#  Utilities module.
-+
-+import sys
-+if sys.version_info >= (3, 0):
-+    xrange = range
-+else:
-+    xrange = xrange
-diff --git a/bindings/pyroot/JupyROOT/__init__.py b/bindings/pyroot/JupyROOT/__init__.py
-index 33e81da..e65acba 100644
---- a/bindings/pyroot/JupyROOT/__init__.py
-+++ b/bindings/pyroot/JupyROOT/__init__.py
-@@ -1,4 +1,5 @@
--import JupyROOT.utils
-+from JupyROOT import cppcompleter, utils
- 
- if '__IPYTHON__' in __builtins__ and __IPYTHON__:
-+    cppcompleter.load_ipython_extension(get_ipython())
-     utils.iPythonize()
-diff --git a/bindings/pyroot/JupyROOT/cppcompleter.py b/bindings/pyroot/JupyROOT/cppcompleter.py
-index d76fef8..d451409 100644
---- a/bindings/pyroot/JupyROOT/cppcompleter.py
-+++ b/bindings/pyroot/JupyROOT/cppcompleter.py
-@@ -5,7 +5,7 @@
- #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
- #-----------------------------------------------------------------------------
- 
--import utils
-+from JupyROOT import utils
- import ROOT
- 
- # Jit a wrapper for the ttabcom
-@@ -35,7 +35,7 @@ class CppCompleter(object):
-     >>> comp = CppCompleter()
-     >>> comp.activate()
-     >>> for suggestion in comp._completeImpl("TH1"):
--    ...     print suggestion
-+    ...     print(suggestion)
-     TH1
-     TH1C
-     TH1D
-@@ -45,7 +45,7 @@ class CppCompleter(object):
-     TH1K
-     TH1S
-     >>> for suggestion in comp._completeImpl("TH2"):
--    ...     print suggestion
-+    ...     print(suggestion)
-     TH2
-     TH2C
-     TH2D
-@@ -58,20 +58,20 @@ class CppCompleter(object):
-     TH2S
-     >>> garbage = ROOT.gInterpreter.ProcessLine("TH1F* h")
-     >>> for suggestion in comp._completeImpl("h->GetA"):
--    ...     print suggestion
-+    ...     print(suggestion)
-     h->GetArray
-     h->GetAsymmetry
-     h->GetAt
-     h->GetAxisColor
-     >>> garbage = ROOT.gInterpreter.ProcessLine("TH1F aa")
-     >>> for suggestion in comp._completeImpl("aa.Add("):
--    ...     print suggestion.replace("\\t"," ")
-+    ...     print(suggestion.replace("\\t"," "))
-     <BLANKLINE>
-     Bool_t Add(TF1* h1, Double_t c1 = 1, Option_t* option = "")
-     Bool_t Add(const TH1* h, const TH1* h2, Double_t c1 = 1, Double_t c2 = 1)  // *MENU*
-     Bool_t Add(const TH1* h1, Double_t c1 = 1)
-     >>> for suggestion in comp._completeImpl("TROOT::Is"):
--    ...     print suggestion
-+    ...     print(suggestion)
-     IsA
-     IsBatch
-     IsEqual
-@@ -89,7 +89,7 @@ class CppCompleter(object):
-     IsZombie
-     >>> comp.deactivate()
-     >>> for suggestion in comp._completeImpl("TG"):
--    ...     print suggestion
-+    ...     print(suggestion)
-     '''
- 
-     def __init__(self):
-diff --git a/bindings/pyroot/JupyROOT/handlers.py b/bindings/pyroot/JupyROOT/handlers.py
-index a46c404..2181ad3 100644
---- a/bindings/pyroot/JupyROOT/handlers.py
-+++ b/bindings/pyroot/JupyROOT/handlers.py
-@@ -48,11 +48,18 @@ class IOHandler(object):
-     def EndCapture(self):
-         _lib.JupyROOTExecutorHandler_EndCapture()
- 
-+    def Decode(self, obj):
-+        import sys
-+        if sys.version_info >= (3, 0):
-+            return obj.decode('utf-8')
-+        else:
-+            return obj
-+
-     def GetStdout(self):
--       return _lib.JupyROOTExecutorHandler_GetStdout()
-+       return self.Decode(_lib.JupyROOTExecutorHandler_GetStdout())
- 
-     def GetStderr(self):
--       return _lib.JupyROOTExecutorHandler_GetStderr()
-+       return self.Decode(_lib.JupyROOTExecutorHandler_GetStderr())
- 
-     def GetStreamsDicts(self):
-        out = self.GetStdout()
-@@ -65,7 +72,7 @@ class Runner(object):
-     ''' Asynchrously run functions
-     >>> import time
-     >>> def f(code):
--    ...    print code
-+    ...    print(code)
-     >>> r= Runner(f)
-     >>> r.Run("ss")
-     ss
-@@ -73,16 +80,16 @@ class Runner(object):
-     ss
-     >>> def g(msg):
-     ...    time.sleep(.5)
--    ...    print msg
-+    ...    print(msg)
-     >>> r= Runner(g)
--    >>> r.AsyncRun("Asynchronous");print "Synchronous";time.sleep(1)
-+    >>> r.AsyncRun("Asynchronous");print("Synchronous");time.sleep(1)
-     Synchronous
-     Asynchronous
--    >>> r.AsyncRun("Asynchronous"); print r.HasFinished()
-+    >>> r.AsyncRun("Asynchronous"); print(r.HasFinished())
-     False
-     >>> time.sleep(1)
-     Asynchronous
--    >>> print r.HasFinished()
-+    >>> print(r.HasFinished())
-     True
-     '''
-     def __init__(self, function):
-@@ -118,7 +125,7 @@ class JupyROOTDeclarer(Runner):
-     ''' Asynchrously execute declarations
-     >>> import ROOT
-     >>> d = JupyROOTDeclarer()
--    >>> d.Run("int f(){return 3;}")
-+    >>> d.Run("int f(){return 3;}".encode("utf-8"))
-     1
-     >>> ROOT.f()
-     3
-@@ -130,7 +137,7 @@ class JupyROOTExecutor(Runner):
-     r''' Asynchrously execute process lines
-     >>> import ROOT
-     >>> d = JupyROOTExecutor()
--    >>> d.Run('cout << "Here am I" << endl;')
-+    >>> d.Run('cout << "Here am I" << endl;'.encode("utf-8"))
-     1
-     '''
-     def __init__(self):
-diff --git a/bindings/pyroot/JupyROOT/kernel/utils.py b/bindings/pyroot/JupyROOT/kernel/utils.py
-index 300570c..db34847 100644
---- a/bindings/pyroot/JupyROOT/kernel/utils.py
-+++ b/bindings/pyroot/JupyROOT/kernel/utils.py
-@@ -12,12 +12,12 @@
- import os
- from glob import glob
- 
-+import importlib
-+
- from JupyROOT.handlers import IOHandler, JupyROOTDeclarer, JupyROOTExecutor
- 
- import ROOT
- 
--import __builtin__
--
- _ioHandler = None
- _Executor  = None
- _Declarer  = None
-@@ -48,7 +48,7 @@ class MagicLoader(object):
-               if file != magics_path.replace("*.py","__init__.py"):
-                   module_path="JupyROOT.kernel.magics."+file.split("/")[-1].replace(".py","")
-                   try:
--                      module= __builtin__.__import__(module_path, globals(), locals(), ['register_magics'], -1)
-+                      module = importlib.import_module(module_path)
-                       module.register_magics(kernel)
-                   except ImportError:
-                       raise Exception("Error importing Magic: %s"%module_path)
-diff --git a/bindings/pyroot/JupyROOT/utils.py b/bindings/pyroot/JupyROOT/utils.py
-index 6c41980..0a17e85 100644
---- a/bindings/pyroot/JupyROOT/utils.py
-+++ b/bindings/pyroot/JupyROOT/utils.py
-@@ -14,7 +14,6 @@ import pty
- import itertools
- import re
- import fnmatch
--import handlers
- import time
- from hashlib import sha1
- from contextlib import contextmanager
-@@ -24,7 +23,7 @@ from IPython.display import HTML
- from IPython.core.extensions import ExtensionManager
- import IPython.display
- import ROOT
--import cppcompleter
-+from JupyROOT import handlers
- 
- # We want iPython to take over the graphics
- ROOT.gROOT.SetBatch()
-@@ -200,7 +199,7 @@ def _codeToFilename(code):
-     >>> _codeToFilename("int f(i){return i*i;}")
-     'dbf7e731.C'
-     '''
--    fileNameBase = sha1(code).hexdigest()[0:8]
-+    fileNameBase = sha1(code.encode('utf-8')).hexdigest()[0:8]
-     return fileNameBase + ".C"
- 
- def _dumpToUniqueFile(code):
-@@ -250,6 +249,9 @@ class StreamCapture(object):
- 
-         self.asyncCapturer = handlers.Runner(self.syncCapture)
- 
-+        self.isFirstPreExecute = True
-+        self.isFirstPostExecute = True
-+
-     def syncCapture(self, defout = ''):
-         self.outString = defout
-         self.errString = defout
-@@ -264,6 +266,9 @@ class StreamCapture(object):
-             time.sleep(waitTime)
- 
-     def pre_execute(self):
-+        if self.isFirstPreExecute:
-+            self.isFirstPreExecute = False
-+            return 0
-         # Unify C++ and Python outputs
-         self.nbOutStream = sys.stdout
-         sys.stdout = sys.__stdout__
-@@ -276,6 +281,10 @@ class StreamCapture(object):
-         self.asyncCapturer.AsyncRun('')
- 
-     def post_execute(self):
-+        if self.isFirstPostExecute:
-+            self.isFirstPostExecute = False
-+            self.isFirstPreExecute = False
-+            return 0
-         self.flag = False
-         self.asyncCapturer.Wait()
-         self.ioHandler.Poll()
-@@ -472,14 +481,13 @@ def setStyle():
- 
- captures = []
- 
--def loadExtensionsAndCapturers():
-+def loadMagicsAndCapturers():
-     global captures
-     extNames = ["JupyROOT.magics." + name for name in ["cppmagic","jsrootmagic"]]
-     ip = get_ipython()
-     extMgr = ExtensionManager(ip)
-     for extName in extNames:
-         extMgr.load_extension(extName)
--    cppcompleter.load_ipython_extension(ip)
-     captures.append(StreamCapture())
-     captures.append(CaptureDrawnPrimitives())
- 
-@@ -498,7 +506,7 @@ def enableCppHighlighting():
- 
- def iPythonize():
-     setStyle()
--    loadExtensionsAndCapturers()
-+    loadMagicsAndCapturers()
-     enableCppHighlighting()
-     enhanceROOTModule()
-     welcomeMsg()
-diff --git a/bindings/pyroot/src/Converters.cxx b/bindings/pyroot/src/Converters.cxx
-index 0926256..01f5526 100644
---- a/bindings/pyroot/src/Converters.cxx
-+++ b/bindings/pyroot/src/Converters.cxx
-@@ -1537,6 +1537,7 @@ namespace {
- // converter factories for ROOT types
-    typedef std::pair< const char*, ConverterFactory_t > NFp_t;
- 
-+   // clang-format off
-    NFp_t factories_[] = {
-    // factories for built-ins
-       NFp_t( "bool",                      &CreateBoolConverter               ),
-@@ -1617,8 +1618,14 @@ namespace {
-       NFp_t( "void**",                    &CreateVoidPtrPtrConverter         ),
-       NFp_t( "PyObject*",                 &CreatePyObjectConverter           ),
-       NFp_t( "_object*",                  &CreatePyObjectConverter           ),
--      NFp_t( "FILE*",                     &CreateVoidArrayConverter          )
-+      NFp_t( "FILE*",                     &CreateVoidArrayConverter          ),
-+      NFp_t( "Float16_t",                 &CreateFloatConverter              ),
-+      NFp_t( "const Float16_t&",          &CreateConstFloatRefConverter      ),
-+      NFp_t( "Double32_t",                &CreateDoubleConverter             ),
-+      NFp_t( "Double32_t&",               &CreateDoubleRefConverter          ),
-+      NFp_t( "const Double32_t&",         &CreateConstDoubleRefConverter     )
-    };
-+   // clang-format on
- 
-    struct InitConvFactories_t {
-    public:
-diff --git a/bindings/pyroot/src/Executors.cxx b/bindings/pyroot/src/Executors.cxx
-index 4056322..842e9f9 100644
---- a/bindings/pyroot/src/Executors.cxx
-+++ b/bindings/pyroot/src/Executors.cxx
-@@ -840,8 +840,12 @@ namespace {
- 
-       NFp_t( "float",              &CreateFloatExecutor               ),
-       NFp_t( "float&",             &CreateFloatRefExecutor            ),
-+      NFp_t( "Float16_t",          &CreateFloatExecutor               ),
-+      NFp_t( "Float16_t&",         &CreateFloatRefExecutor            ),
-       NFp_t( "double",             &CreateDoubleExecutor              ),
-       NFp_t( "double&",            &CreateDoubleRefExecutor           ),
-+      NFp_t( "Double32_t",         &CreateDoubleExecutor              ),
-+      NFp_t( "Double32_t&",        &CreateDoubleRefExecutor           ),
-       NFp_t( "long double",        &CreateLongDoubleExecutor          ),   // TODO: lost precision
-       NFp_t( "long double&",       &CreateLongDoubleRefExecutor       ),
-       NFp_t( "void",               &CreateVoidExecutor                ),
diff --git a/root-rose-image.patch b/root-rose-image.patch
deleted file mode 100644
index 0f13693..0000000
--- a/root-rose-image.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/tutorials/image/rose_image.C b/tutorials/image/rose_image.C
-index 0614406..4e1b905 100644
---- a/tutorials/image/rose_image.C
-+++ b/tutorials/image/rose_image.C
-@@ -20,7 +20,9 @@ TCanvas *c1;
- 
- void rose_image()
- {
--   TImage *img = TImage::Open("$ROOTSYS/tutorials/image/rose512.jpg");
-+   TString dir = TROOT::GetTutorialDir();
-+
-+   TImage *img = TImage::Open(dir + "/image/rose512.jpg");
- 
-    if (!img) {
-       printf("Could not create an image... exit\n");
-@@ -41,9 +43,9 @@ void rose_image()
- 
-    // draw text over image with foreground specified by pixmap
-    img->DrawText(250, 350, "goodbye cruel world ...", 24, 0,
--                 ar, TImage::kPlain, "fore.xpm");
-+                 ar, TImage::kPlain, dir + "/image/fore.xpm");
- 
--   TImage *img2 = TImage::Open("mditestbg.xpm");
-+   TImage *img2 = TImage::Open(dir + "/image/mditestbg.xpm");
- 
-    // tile image
-    img2->Tile(img->GetWidth(), img->GetHeight());
diff --git a/root-s390x.patch b/root-s390x.patch
deleted file mode 100644
index 733061e..0000000
--- a/root-s390x.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/config/root-config.in b/config/root-config.in
-index bdb90ad..1b4cdba 100755
---- a/config/root-config.in
-+++ b/config/root-config.in
-@@ -247,6 +247,18 @@ linuxarm64)
-    auxcflags="${cxxversionflag} -fsigned-char"
-    auxlibs="-lm -ldl -rdynamic"
-    ;;
-+linuxs390gcc)
-+   # s390 (31 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -m31 -fsigned-char"
-+   auxldflags="-m31"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
-+linuxs390xgcc)
-+   # s390x (64 bit mode) Linux with gcc
-+   auxcflags="${cxxversionflag} -m64 -fsigned-char"
-+   auxldflags="-m64"
-+   auxlibs="-lm -ldl -rdynamic"
-+   ;;
- freebsd)
-    # FreeBSD with libc5
-    auxcflags="${cxxversionflag}"
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
index eff695d..a36fead 100644
--- a/root-stressgraphics.patch
+++ b/root-stressgraphics.patch
@@ -1,13 +1,13 @@
 diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 7a58dc2..14560ce 100644
+index 0dbfe8c..4341c21 100644
 --- a/test/stressGraphics.ref
 +++ b/test/stressGraphics.ref
-@@ -36,7 +36,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-    35    310239      6500    120909       500     38898     10400     62719     34100     45592     14000    317918      6500
-    36    344170      5000    153264       750     43638      6300     65828     31800     53934      6500    348704      5000
-    37   2128608     35000    794584       200     79412      3400     60580      9900    123159      3500   2156042     35000
--   38   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7000
-+   38   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7500
-    39     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
-    40     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    41    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
+@@ -8,7 +8,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
+     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
+     8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
+     9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
+-   10      8863        70     13539       100     14622      1100     24343      1100     23278      1700      8894        70
++   10      8863        70     13539       100     14622      1200     24343      1100     23278      1700      8894        70
+    11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
+    12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
+    13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
diff --git a/root-template-files.patch b/root-template-files.patch
deleted file mode 100644
index fcf91e6..0000000
--- a/root-template-files.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/tutorials/mlp/mlpHiggs.C b/tutorials/mlp/mlpHiggs.C
-index 8c5743f..49d3ca2 100644
---- a/tutorials/mlp/mlpHiggs.C
-+++ b/tutorials/mlp/mlpHiggs.C
-@@ -18,6 +18,8 @@ void mlpHiggs(Int_t ntrain=100) {
-    TFile *input = 0;
-    if (!gSystem->AccessPathName(fname)) {
-       input = TFile::Open(fname);
-+   } else if (!gSystem->AccessPathName(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
-+      input = TFile::Open(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
-    } else {
-       printf("accessing %s file from http://root.cern.ch/files\n",fname);
-       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-diff --git a/tutorials/quadp/portfolio.C b/tutorials/quadp/portfolio.C
-index 9f8bb8a..6c39446 100644
---- a/tutorials/quadp/portfolio.C
-+++ b/tutorials/quadp/portfolio.C
-@@ -291,6 +291,8 @@ void portfolio()
-    TFile *f = 0;
-    if (!gSystem->AccessPathName(fname)) {
-       f = TFile::Open(fname);
-+   } else if (!gSystem->AccessPathName(Form("%s/quadp/%s", TROOT::GetTutorialDir().Data(), fname))) {
-+      f = TFile::Open(Form("%s/quadp/%s", TROOT::GetTutorialDir().Data(), fname));
-    } else {
-       printf("accessing %s file from http://root.cern.ch/files\n",fname);
-       f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
-@@ -314,7 +316,7 @@ void portfolio()
-       for (Int_t j = 0; j <= i; j++) {
-          Double_t sum = 0.;
-          for (Int_t k = 0; k < nrData; k++)
--         sum += (data[i][k]-r[i])*(data[j][k]-r[j]);
-+            sum += (data[i][k]-r[i])*(data[j][k]-r[j]);
-          Covar(i,j) = Covar(j,i) = sum/nrData;
-       }
-    }
diff --git a/root-test-install.patch b/root-test-install.patch
deleted file mode 100644
index 84f782b..0000000
--- a/root-test-install.patch
+++ /dev/null
@@ -1,3828 +0,0 @@
-diff -Nur root-6.08.02.orig/bindings/pyroot/CMakeLists.txt root-6.08.02/bindings/pyroot/CMakeLists.txt
---- root-6.08.02.orig/bindings/pyroot/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/bindings/pyroot/CMakeLists.txt	2016-12-06 12:46:10.280969916 +0100
-@@ -36,18 +36,18 @@
- file(GLOB pyfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
- foreach(pyfile ${pyfiles})
-   install(FILES ${pyfile} DESTINATION ${runtimedir})
--  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
--  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
--  file(COPY ${pyfile} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
-+  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}${runtimedir}/${pyfile})")
-+  file(COPY ${pyfile} DESTINATION ${localruntimedir})
- endforeach()
- 
--set( JupyROOTDirName "JupyROOT")
-+set(JupyROOTDirName "JupyROOT")
- install (DIRECTORY ${JupyROOTDirName} DESTINATION ${runtimedir})
--file(COPY ${JupyROOTDirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+file(COPY ${JupyROOTDirName} DESTINATION ${localruntimedir})
- 
- set( JsMVADirName "JsMVA")
- install (DIRECTORY ${JsMVADirName} DESTINATION ${runtimedir})
--file(COPY ${JsMVADirName} DESTINATION ${CMAKE_BINARY_DIR}/${runtimedir})
-+file(COPY ${JsMVADirName} DESTINATION ${localruntimedir})
- 
- #---Install headers----------------------------------------------------------
- ROOT_INSTALL_HEADERS()
-diff -Nur root-6.08.02.orig/bindings/pyroot/ROOT.py root-6.08.02/bindings/pyroot/ROOT.py
---- root-6.08.02.orig/bindings/pyroot/ROOT.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/bindings/pyroot/ROOT.py	2016-12-06 12:46:10.281969905 +0100
-@@ -516,7 +516,7 @@
- 
-           # system logon, user logon, and local logon (skip Rint.Logon)
-             name = '.rootlogon.C'
--            logons = [ os.path.join( str(self.gRootDir), 'etc', 'system' + name ),
-+            logons = [ os.path.join( str(self.TROOT.GetEtcDir()), 'system' + name ),
-                        os.path.expanduser( os.path.join( '~', name ) ) ]
-             if logons[-1] != os.path.join( os.getcwd(), name ):
-                logons.append( name )
-diff -Nur root-6.08.02.orig/cmake/modules/RootBuildOptions.cmake root-6.08.02/cmake/modules/RootBuildOptions.cmake
---- root-6.08.02.orig/cmake/modules/RootBuildOptions.cmake	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/cmake/modules/RootBuildOptions.cmake	2016-12-06 12:46:10.281969905 +0100
-@@ -234,7 +234,7 @@
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
- 
- # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
--if(rpath OR gnuinstall)
-+if(rpath)
-   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
-   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
- elseif(APPLE)
-diff -Nur root-6.08.02.orig/cmake/modules/RootNewMacros.cmake root-6.08.02/cmake/modules/RootNewMacros.cmake
---- root-6.08.02.orig/cmake/modules/RootNewMacros.cmake	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/cmake/modules/RootNewMacros.cmake	2016-12-06 12:46:10.281969905 +0100
-@@ -19,6 +19,7 @@
-   set(libprefix lib)
-   set(ld_library_path PATH)
-   set(libsuffix .dll)
-+  set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_BINDIR})
- elseif(APPLE)
-   set(ld_library_path DYLD_LIBRARY_PATH)
-@@ -26,6 +27,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- else()
-   set(ld_library_path LD_LIBRARY_PATH)
-@@ -33,6 +35,7 @@
-   set(scomment \#)
-   set(libprefix lib)
-   set(libsuffix .so)
-+  set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   set(runtimedir ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
-@@ -325,7 +328,15 @@
-     set(pcm_name)
-   else()
-     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
--      set(command rootcling -rootbuild)
-+      if(gnuinstall)
-+        if(WIN32)
-+          set(command set ROOTIGNOREPREFIX=1 && $<TARGET_FILE:rootcling> -rootbuild)
-+        else()
-+          set(command ROOTIGNOREPREFIX=1 $<TARGET_FILE:rootcling> -rootbuild)
-+        endif()
-+      else()
-+        set(command rootcling -rootbuild)
-+      endif()
-       set(ROOTCINTDEP rootcling)
-     else()
-       set(command rootcling)
-@@ -441,9 +452,6 @@
-   if(TARGET G__${library})
-     add_dependencies(${library} G__${library})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
-   set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
-   set_target_properties(${library} PROPERTIES LINK_INTERFACE_LIBRARIES "${ARG_DEPENDENCIES}")
-@@ -484,9 +492,6 @@
-   if(lib_srcs MATCHES "(^|/)(G__[^.]*)[.]cxx.*")
-      add_dependencies(${library} ${CMAKE_MATCH_2})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
- 
-   #--- Only for building shared libraries
-   set_property(TARGET ${library} PROPERTY POSITION_INDEPENDENT_CODE 1)
-@@ -532,9 +537,6 @@
-   ROOT_GET_SOURCES(lib_srcs src ${ARG_UNPARSED_ARGUMENTS})
-   include_directories(${CMAKE_BINARY_DIR}/include)
-   add_library( ${library} SHARED ${lib_srcs})
--  if(TARGET move_headers)
--    add_dependencies(${library} move_headers)
--  endif()
-   set_target_properties(${library}  PROPERTIES ${ROOT_LIBRARY_PROPERTIES})
-   # Do not add -Dname_EXPORTS to the command-line when building files in this
-   # target. Doing so is actively harmful for the modules build because it
-@@ -617,6 +619,10 @@
-                            PATTERN ".svn" EXCLUDE
-                            REGEX "LinkDef" EXCLUDE
-                            ${ARG_OPTIONS})
-+    file(COPY ${d} DESTINATION ${CMAKE_BINARY_DIR}/include
-+                   PATTERN ".svn" EXCLUDE
-+                   REGEX "LinkDef" EXCLUDE
-+                   ${ARG_OPTIONS})
-     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
-   endforeach()
- endfunction()
-@@ -656,9 +662,6 @@
-   if (ARG_ADDITIONAL_COMPILE_FLAGS)
-     set_target_properties(${executable} PROPERTIES COMPILE_FLAGS ${ARG_ADDITIONAL_COMPILE_FLAGS})
-   endif()
--  if(TARGET move_headers)
--    add_dependencies(${executable} move_headers)
--  endif()
- 
-   #----Installation details------------------------------------------------------
-   if(NOT ARG_NOINSTALL AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-@@ -878,6 +881,9 @@
-     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
-   else()
-     add_test(NAME ${test} COMMAND ${_command})
-+    if (gnuinstall)
-+      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
-+    endif()
-   endif()
- 
-   #- Handle TIMOUT and DEPENDS arguments
-diff -Nur root-6.08.02.orig/cmake/scripts/local_install.cmake root-6.08.02/cmake/scripts/local_install.cmake
---- root-6.08.02.orig/cmake/scripts/local_install.cmake	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/cmake/scripts/local_install.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,20 +0,0 @@
--# Arguments:
--#  PREFIX    - Installation prefix
--#  COMPONENTS - Installation component
--
--set(COMPONENTS ${COMPONENTS})
--set(ENV{DESTDIR} "")
--foreach(component ${COMPONENTS})
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX}
--                             -DCMAKE_INSTALL_COMPONENT=${component}
--                             -P cmake_install.cmake
--    RESULT_VARIABLE result
--    OUTPUT_QUIET
--  )
--
--  if(result)
--    set(msg "Local installation of ${component} failed: ${result}\n")
--    message(FATAL_ERROR "${msg}")
--  endif()
--endforeach()
-diff -Nur root-6.08.02.orig/CMakeLists.txt root-6.08.02/CMakeLists.txt
---- root-6.08.02.orig/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/CMakeLists.txt	2016-12-06 12:46:10.290969803 +0100
-@@ -91,7 +91,7 @@
-   endif()
- endforeach()
- 
--#---Move (copy) the headers and other directories to binary tree---------------------------------
-+#---Move (copy) directories to binary tree------------------------------------------------------
- set(stamp_file ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/move_artifacts.stamp)
- add_custom_command(OUTPUT ${stamp_file}
-                    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/etc ${CMAKE_BINARY_DIR}/etc
-@@ -119,11 +119,7 @@
-   endif()
- endforeach()
- 
--add_custom_target(move_headers DEPENDS ${stamp_file} ${tutorial_files_builddir}
--                               COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY_DIR}
--                                                        -DCOMPONENTS="headers"
--                                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/local_install.cmake)
--include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
-+add_custom_target(move_artifacts DEPENDS ${stamp_file} ${tutorial_files_builddir})
- 
- 
- #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
-@@ -179,13 +175,23 @@
-                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${CMAKE_SOURCE_DIR} . ${__clingetcpch} -- ${CMAKE_CXX_FLAGS_SEPARATE}
-                    DEPENDS ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py ${__allFiles})
- 
--add_custom_command(OUTPUT etc/allDict.cxx.pch
--                   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
--                   DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
--                           etc/dictpch/allLinkDefs.h
--                           etc/dictpch/allHeaders.h
--                           etc/dictpch/allCppflags.txt
--                           rootcling)
-+if (WIN32)
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND set ROOTIGNOREPREFIX=1 && ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+else()
-+  add_custom_command(OUTPUT etc/allDict.cxx.pch
-+                     COMMAND ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch -I${CMAKE_BINARY_DIR}/include
-+                     DEPENDS ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
-+                             etc/dictpch/allLinkDefs.h
-+                             etc/dictpch/allHeaders.h
-+                             etc/dictpch/allCppflags.txt
-+                             rootcling)
-+endif()
- add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
- set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
- add_dependencies(onepcm ${__allTargets})
-@@ -198,26 +204,27 @@
-                     DEPENDS build/unix/module.modulemap
-                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/unix/module.modulemap ${CMAKE_BINARY_DIR}/include/module.modulemap
-                     )
--  add_dependencies(copymodulemap move_headers)
- endif(cxxmodules)
- 
- #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
--if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
--  add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
--  add_dependencies(hsimple onepcm)
--  if(WIN32)
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && 
--                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
--                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
--  else()
--    add_custom_command(OUTPUT tutorials/hsimple.root
--                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} 
--                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
--                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
--  endif()
--  install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-+add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
-+add_dependencies(hsimple onepcm)
-+if(WIN32)
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
-+                             set ROOTIGNOREPREFIX=1 &&
-+                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
-+else()
-+  add_custom_command(OUTPUT tutorials/hsimple.root
-+                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
-+                             ROOTIGNOREPREFIX=1
-+                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-+                     WORKING_DIRECTORY tutorials
-+                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
- endif()
-+install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
- 
- #---version--------------------------------------------------------------------------------------
- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
-@@ -262,9 +269,6 @@
- #---Configure Testing using CTest----------------------------------------------------------------
- configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
- if(testing)
--  if(gnuinstall)
--    message(FATAL_ERROR "You cannot enable to run the tests in the build directory (testing=ON) and at the same time select a GNU style installation (gnuinstall=ON). This is because the code is built with the final installation location (CMAKE_INSTALL_PREFIX) for many ancillary files (tutorials, etc, icons, macros, etc.) and these are not available before installation. Tests can be run against the installation once is completed. See the instructions in the web")
--  endif()
-   include(RootCTest)
-   if(roottest)
-     find_package(Git REQUIRED)
-diff -Nur root-6.08.02.orig/config/RConfigure.in root-6.08.02/config/RConfigure.in
---- root-6.08.02.orig/config/RConfigure.in	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/config/RConfigure.in	2016-12-06 12:46:10.290969803 +0100
-@@ -14,10 +14,11 @@
- #define ROOTTUTDIR    "@tutdir@"
- #define ROOTSRCDIR    "@srcdir@"
- #define ROOTICONPATH  "@iconpath@"
--#define EXTRAICONPATH "@extraiconpath@"
- #define TTFFONTDIR    "@ttffontdir@"
- #endif
- 
-+#define EXTRAICONPATH "@extraiconpath@"
-+
- #@setresuid@ R__HAS_SETRESUID   /**/
- #@hasmathmore@ R__HAS_MATHMORE   /**/
- #@haspthread@ R__HAS_PTHREAD    /**/
-diff -Nur root-6.08.02.orig/config/rootrc.in root-6.08.02/config/rootrc.in
---- root-6.08.02.orig/config/rootrc.in	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/config/rootrc.in	2016-12-06 12:46:10.291969792 +0100
-@@ -9,24 +9,24 @@
- # and to PATH on Windows.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.DynamicPath:    .:@libdir@:
--WinNT.*.Root.DynamicPath:   .;@bindir@;
-+#Unix.*.Root.DynamicPath:    .:@libdir@
-+#WinNT.*.Root.DynamicPath:   .;@bindir@
- 
- # Path used to find macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.MacroPath:      .:@macrodir@:
--WinNT.*.Root.MacroPath:     .;@macrodir@;
-+#Unix.*.Root.MacroPath:      .:@macrodir@
-+#WinNT.*.Root.MacroPath:     .;@macrodir@
- 
- # Path used to find plugin macros.
- # Paths are different for Unix and Windows. The example shows the defaults
- # for all ROOT applications for either Unix or Windows.
--Unix.*.Root.PluginPath:      :@plugindir@:
--WinNT.*.Root.PluginPath:     ;@plugindir@;
-+#Unix.*.Root.PluginPath:     @plugindir@
-+#WinNT.*.Root.PluginPath:    @plugindir@
- 
- # Path where to look for TrueType fonts.
- Unix.*.Root.UseTTFonts:     true
--*.*.Root.TTFontPath:        @ttffontdir@
-+#*.*.Root.TTFontPath:        @ttffontdir@
- 
- # Use Net* API functions.
- WinNT.UseNetAPI:         true
-@@ -222,7 +222,8 @@
- Gui.DocumentForegroundColor: black
- Gui.TooltipBackgroundColor:  LightYellow
- Gui.TooltipForegroundColor:  black
--Gui.IconPath:                $(HOME)/icons:@iconpath@:.
-+#Unix.*.Gui.IconPath:         .:$(HOME)/icons:@iconpath@:@extraiconpath@
-+#WinNT.*.Gui.IconPath:        .;$(HOME)/icons;@iconpath@;@extraiconpath@
- Gui.MimeTypeFile:            $(HOME)/.root.mimes
- # If above does not exists defaults to this:
- #Gui.MimeTypeFile:            @etcdir@/root.mimes
-diff -Nur root-6.08.02.orig/configure root-6.08.02/configure
---- root-6.08.02.orig/configure	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/configure	2016-12-06 12:46:10.307969611 +0100
-@@ -8229,6 +8229,7 @@
-     -e "s|@bindir@|$bindir|"               \
-     -e "s|@etcdir@|$etcdir|"               \
-     -e "s|@ttffontdir@|$fontdir|"          \
-+    -e "s|@extraiconpath@|$extraiconpath|" \
-     -e "s|@iconpath@|$iconpath|"           \
-     -e "s|@hasxrd@|$hasxrd|"               \
-     -e "s|@hasnotxrd@|$hasnotxrd|"         \
-diff -Nur root-6.08.02.orig/core/base/inc/TROOT.h root-6.08.02/core/base/inc/TROOT.h
---- root-6.08.02.orig/core/base/inc/TROOT.h	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/inc/TROOT.h	2016-12-06 12:46:10.307969611 +0100
-@@ -349,6 +349,21 @@
-    static Int_t       ConvertVersionInt2Code(Int_t v);
-    static Int_t       RootVersionCode();
-    static const char**&GetExtraInterpreterArgs();
-+
-+   static const TString& GetRootSys();
-+   static const TString& GetBinDir();
-+   static const TString& GetLibDir();
-+   static const TString& GetIncludeDir();
-+   static const TString& GetEtcDir();
-+   static const TString& GetDataDir();
-+   static const TString& GetDocDir();
-+   static const TString& GetMacroDir();
-+   static const TString& GetTutorialDir();
-+   static const TString& GetSourceDir();
-+   static const TString& GetIconPath();
-+   static const TString& GetTTFFontDir();
-+
-+   // Backward compatibility function - do not use for new code
-    static const char *GetTutorialsDir();
- 
-    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
-diff -Nur root-6.08.02.orig/core/base/src/TApplication.cxx root-6.08.02/core/base/src/TApplication.cxx
---- root-6.08.02.orig/core/base/src/TApplication.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/src/TApplication.cxx	2016-12-06 12:46:10.308969599 +0100
-@@ -276,11 +276,7 @@
-    // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR);
--#else
--                                       "$(ROOTSYS)/fonts");
--#endif
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-    // Check for use of DFSG - fonts
-    if (!ttfont)
-@@ -888,29 +884,19 @@
-          Error("ProcessLine", "Cannot show demos in batch mode!");
-          return 1;
-       }
--#ifdef ROOTTUTDIR
--      ProcessLine(".x " ROOTTUTDIR "/demos.C");
--#else
--      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
--#endif
-+      ProcessLine(".x " + TROOT::GetTutorialDir() + "/demos.C");
-       return 0;
-    }
- 
-    if (!strncmp(line, ".license", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/LICENSE");
--#else
--      return PrintFile("$(ROOTSYS)/LICENSE");
--#endif
-+      return PrintFile(TROOT::GetDocDir() + "/LICENSE");
-    }
- 
-    if (!strncmp(line, ".credits", 8)) {
--#ifdef ROOTDOCDIR
--      return PrintFile(ROOTDOCDIR "/CREDITS");
--#else
--      return PrintFile("$(ROOTSYS)/README/CREDITS");
--#endif
--
-+      TString credits = TROOT::GetDocDir() + "/CREDITS";
-+      if (gSystem->AccessPathName(credits, kReadPermission))
-+         credits = TROOT::GetDocDir() + "/README/CREDITS";
-+      return PrintFile(credits);
-    }
- 
-    if (!strncmp(line, ".pwd", 4)) {
-diff -Nur root-6.08.02.orig/core/base/src/TEnv.cxx root-6.08.02/core/base/src/TEnv.cxx
---- root-6.08.02.orig/core/base/src/TEnv.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/src/TEnv.cxx	2016-12-06 12:46:10.308969599 +0100
-@@ -401,21 +401,7 @@
- 
-       TString sname = "system";
-       sname += name;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--      // on iOS etc does not exist and system<name> resides in $ROOTSYS
--      etc = gRootDir;
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       ReadFile(s, kEnvGlobal);
-       delete [] s;
-       if (!gSystem->Getenv("ROOTENV_NO_HOME")) {
-@@ -685,17 +671,7 @@
- 
-       TString sname = "system";
-       sname += fRcName;
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-       rootrcdir = s;
-       delete [] s;
-    } else if (level == kEnvUser) {
-diff -Nur root-6.08.02.orig/core/base/src/TPluginManager.cxx root-6.08.02/core/base/src/TPluginManager.cxx
---- root-6.08.02.orig/core/base/src/TPluginManager.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/src/TPluginManager.cxx	2016-12-06 12:46:10.308969599 +0100
-@@ -470,6 +470,10 @@
-       TPH__IsReadingDirs() = kTRUE;
- 
-       TString plugindirs = gEnv->GetValue("Root.PluginPath", (char*)0);
-+      if (plugindirs.Length() == 0) {
-+         plugindirs = "plugins";
-+         gSystem->PrependPathName(TROOT::GetEtcDir(), plugindirs);
-+      }
- #ifdef WIN32
-       dirs = plugindirs.Tokenize(";");
- #else
-diff -Nur root-6.08.02.orig/core/base/src/TROOT.cxx root-6.08.02/core/base/src/TROOT.cxx
---- root-6.08.02.orig/core/base/src/TROOT.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/src/TROOT.cxx	2016-12-06 12:46:10.309969588 +0100
-@@ -643,6 +643,22 @@
-    // Initialize Operating System interface
-    InitSystem();
- 
-+   // Initialize static directory functions
-+   GetRootSys();
-+   GetBinDir();
-+   GetLibDir();
-+   GetIncludeDir();
-+   GetEtcDir();
-+   GetDataDir();
-+   GetDocDir();
-+   GetMacroDir();
-+   GetTutorialDir();
-+   GetSourceDir();
-+   GetIconPath();
-+   GetTTFFontDir();
-+
-+   gRootDir = GetRootSys().Data();
-+
-    TDirectory::Build();
- 
-    // Initialize interface to CINT C++ interpreter
-@@ -1876,21 +1892,9 @@
-                "after the call to TROOT::InitInterpreter()!");
-       }
- 
--      const char *libcling = 0;
--      char *libclingStorage = 0;
--#ifdef ROOTLIBDIR
--      libcling = ROOTLIBDIR "/libCling."
--# ifdef R__WIN32
--      "dll";
--# else
--      "so";
--# endif
--#else
--      libclingStorage = gSystem->DynamicPathName("libCling");
--      libcling = libclingStorage;
--#endif
-+      char *libcling = gSystem->DynamicPathName("libCling");
-       gInterpreterLib = dlopen(libcling, RTLD_LAZY|RTLD_LOCAL);
--      delete [] libclingStorage;
-+      delete [] libcling;
- 
-       if (!gInterpreterLib) {
-          TString err = dlerror();
-@@ -2237,22 +2241,7 @@
- #endif
- 
-    TString gitinfo = "gitinfo.txt";
--   char *filename = 0;
--#ifdef ROOTETCDIR
--   filename = gSystem->ConcatFileName(ROOTETCDIR, gitinfo);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and gitinfo resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   filename = gSystem->ConcatFileName(etc, gitinfo);
--#endif
-+   char *filename = gSystem->ConcatFileName(TROOT::GetEtcDir(), gitinfo);
- 
-    FILE *fp = fopen(filename, "r");
-    if (fp) {
-@@ -2570,17 +2559,9 @@
- #endif
-       if (macroPath.Length() == 0)
- #if !defined(R__WIN32)
--   #ifdef ROOTMACRODIR
--         macroPath = ".:" ROOTMACRODIR;
--   #else
--         macroPath = TString(".:") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".:" + TROOT::GetMacroDir();
- #else
--   #ifdef ROOTMACRODIR
--         macroPath = ".;" ROOTMACRODIR;
--   #else
--         macroPath = TString(".;") + gRootDir + "/macros";
--   #endif
-+         macroPath = ".;" + TROOT::GetMacroDir();
- #endif
-    }
- 
-@@ -2676,14 +2657,260 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-+
-+#ifdef ROOTPREFIX
-+static Bool_t IgnorePrefix() {
-+   static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX");
-+   return ignorePrefix;
-+}
-+#endif
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the rootsys directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetRootSys() {
-+#ifdef ROOTPREFIX
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsys;
-+      if (rootsys.IsNull())
-+         rootsys = gSystem->Getenv("ROOTSYS");
-+      if (rootsys.IsNull())
-+         rootsys = gRootDir;
-+      return rootsys;
-+#ifdef ROOTPREFIX
-+   } else {
-+      const static TString rootsys = ROOTPREFIX;
-+      return rootsys;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the binary directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetBinDir() {
-+#ifdef ROOTBINDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootbindir;
-+      if (rootbindir.IsNull()) {
-+         rootbindir = "bin";
-+         gSystem->PrependPathName(GetRootSys(), rootbindir);
-+      }
-+      return rootbindir;
-+#ifdef ROOTBINDIR
-+   } else {
-+      const static TString rootbindir = ROOTBINDIR;
-+      return rootbindir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the library directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetLibDir() {
-+#ifdef ROOTLIBDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootlibdir;
-+      if (rootlibdir.IsNull()) {
-+         rootlibdir = "lib";
-+         gSystem->PrependPathName(GetRootSys(), rootlibdir);
-+      }
-+      return rootlibdir;
-+#ifdef ROOTLIBDIR
-+   } else {
-+      const static TString rootlibdir = ROOTLIBDIR;
-+      return rootlibdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the include directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetIncludeDir() {
-+#ifdef ROOTINCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootincdir;
-+      if (rootincdir.IsNull()) {
-+         rootincdir = "include";
-+         gSystem->PrependPathName(GetRootSys(), rootincdir);
-+      }
-+      return rootincdir;
-+#ifdef ROOTINCDIR
-+   } else {
-+      const static TString rootincdir = ROOTINCDIR;
-+      return rootincdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the sysconfig directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetEtcDir() {
-+#ifdef ROOTETCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootetcdir;
-+      if (rootetcdir.IsNull()) {
-+         rootetcdir = "etc";
-+         gSystem->PrependPathName(GetRootSys(), rootetcdir);
-+      }
-+      return rootetcdir;
-+#ifdef ROOTETCDIR
-+   } else {
-+      const static TString rootetcdir = ROOTETCDIR;
-+      return rootetcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the data directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDataDir() {
-+#ifdef ROOTDATADIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDATADIR
-+   } else {
-+      const static TString rootdatadir = ROOTDATADIR;
-+      return rootdatadir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the documentation directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetDocDir() {
-+#ifdef ROOTDOCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      return GetRootSys();
-+#ifdef ROOTDOCDIR
-+   } else {
-+      const static TString rootdocdir = ROOTDOCDIR;
-+      return rootdocdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the macro directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetMacroDir() {
-+#ifdef ROOTMACRODIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootmacrodir;
-+      if (rootmacrodir.IsNull()) {
-+         rootmacrodir = "macros";
-+         gSystem->PrependPathName(GetRootSys(), rootmacrodir);
-+      }
-+      return rootmacrodir;
-+#ifdef ROOTMACRODIR
-+   } else {
-+      const static TString rootmacrodir = ROOTMACRODIR;
-+      return rootmacrodir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
- /// Get the tutorials directory in the installation. Static utility function.
- 
--const char *TROOT::GetTutorialsDir()
--{
-+const TString& TROOT::GetTutorialDir() {
- #ifdef ROOTTUTDIR
--   return ROOTTUTDIR;
--#else
--   static TString tutdir = TString(gRootDir) + "/tutorials";
--   return tutdir;
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString roottutdir;
-+      if (roottutdir.IsNull()) {
-+         roottutdir = "tutorials";
-+         gSystem->PrependPathName(GetRootSys(), roottutdir);
-+      }
-+      return roottutdir;
-+#ifdef ROOTTUTDIR
-+   } else {
-+      const static TString roottutdir = ROOTTUTDIR;
-+      return roottutdir;
-+   }
- #endif
- }
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the source directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetSourceDir() {
-+#ifdef ROOTSRCDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rootsrcdir;
-+      if (rootsrcdir.IsNull()) {
-+         rootsrcdir = "src";
-+         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
-+      }
-+      return rootsrcdir;
-+#ifdef ROOTSRCDIR
-+   } else {
-+      const static TString rootsrcdir = ROOTSRCDIR;
-+      return rootsrcdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the icon path in the installation. Static utility function.
-+
-+const TString& TROOT::GetIconPath() {
-+#ifdef ROOTICONPATH
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString rooticonpath;
-+      if (rooticonpath.IsNull()) {
-+         rooticonpath = "icons";
-+         gSystem->PrependPathName(GetRootSys(), rooticonpath);
-+      }
-+      return rooticonpath;
-+#ifdef ROOTICONPATH
-+   } else {
-+      const static TString rooticonpath = ROOTICONPATH;
-+      return rooticonpath;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the fonts directory in the installation. Static utility function.
-+
-+const TString& TROOT::GetTTFFontDir() {
-+#ifdef TTFFONTDIR
-+   if (IgnorePrefix()) {
-+#endif
-+      static TString ttffontdir;
-+      if (ttffontdir.IsNull()) {
-+         ttffontdir = "fonts";
-+         gSystem->PrependPathName(GetRootSys(), ttffontdir);
-+      }
-+      return ttffontdir;
-+#ifdef TTFFONTDIR
-+   } else {
-+      const static TString ttffontdir = TTFFONTDIR;
-+      return ttffontdir;
-+   }
-+#endif
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+/// Get the tutorials directory in the installation. Static utility function.
-+/// Backward compatibility function - do not use for new code
-+
-+const char *TROOT::GetTutorialsDir() {
-+   return GetTutorialDir();
-+}
-diff -Nur root-6.08.02.orig/core/base/src/TSystem.cxx root-6.08.02/core/base/src/TSystem.cxx
---- root-6.08.02.orig/core/base/src/TSystem.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/base/src/TSystem.cxx	2016-12-06 12:46:10.310969577 +0100
-@@ -1904,22 +1904,10 @@
-       if (!system) {
-          // Mark the library in $ROOTSYS/lib as system.
-          const char *dirname = DirName(path);
--#ifdef ROOTLIBDIR
--         TString rootlibdir = ROOTLIBDIR;
--#else
--         TString rootlibdir = "lib";
--         PrependPathName(gRootDir, rootlibdir);
--#endif
--         system = R__MatchFilename(rootlibdir,dirname);
-+         system = R__MatchFilename(TROOT::GetLibDir(), dirname);
- 
-          if (!system) {
--#ifdef ROOTBINDIR
--            TString rootbindir = ROOTBINDIR;
--#else
--            TString rootbindir = "bin";
--            PrependPathName(gRootDir, rootbindir);
--#endif
--            system = R__MatchFilename(rootbindir,dirname);
-+            system = R__MatchFilename(TROOT::GetBinDir(), dirname);
-          }
-       }
- 
-@@ -2571,12 +2559,9 @@
- #else
-    TString touch = "echo > "; touch += "\"" + depfilename + "\"";
- #endif
--#ifdef ROOTBINDIR
--   TString builddep = ROOTBINDIR;
--#else
--   TString builddep = TString(gRootDir) + "/bin";
--#endif
--   builddep += "/rmkdepend \"-f";
-+   TString builddep = "rmkdepend";
-+   gSystem->PrependPathName(TROOT::GetBinDir(), builddep);
-+   builddep += " \"-f";
-    builddep += depfilename;
-    builddep += "\" -o_" + extension + "." + gSystem->GetSoExt() + " ";
-    if (build_loc.BeginsWith(gSystem->WorkingDirectory())) {
-@@ -2598,12 +2583,7 @@
-       builddep += "/\" ";
-    }
-    builddep += " -Y -- ";
--#ifndef ROOTINCDIR
--   TString rootsysInclude = gSystem->Getenv("ROOTSYS");
--   rootsysInclude += "/include";
--#else
--   TString rootsysInclude = ROOTINCDIR;
--#endif
-+   TString rootsysInclude = TROOT::GetIncludeDir();
-    builddep += " \"-I"+rootsysInclude+"\" "; // cflags
-    builddep += includes;
-    builddep += defines;
-@@ -3434,27 +3414,17 @@
-       TString name = ".rootmap";
-       TString sname = "system.rootmap";
-       TString file;
--#ifdef ROOTETCDIR
--      AssignAndDelete(file, ConcatFileName(ROOTETCDIR, sname) );
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      AssignAndDelete(file, ConcatFileName(etc, sname));
-+      AssignAndDelete(file, ConcatFileName(TROOT::GetEtcDir(), sname) );
-       if (gSystem->AccessPathName(file)) {
-          // for backward compatibility check also $ROOTSYS/system<name> if
-          // $ROOTSYS/etc/system<name> does not exist
--         AssignAndDelete(file, ConcatFileName(gRootDir, sname));
-+         AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), sname));
-          if (gSystem->AccessPathName(file)) {
-             // for backward compatibility check also $ROOTSYS/<name> if
-             // $ROOTSYS/system<name> does not exist
--            AssignAndDelete(file, ConcatFileName(gRootDir, name));
-+            AssignAndDelete(file, ConcatFileName(TROOT::GetRootSys(), name));
-          }
-       }
--#endif
-       mapfileStream << file << std::endl;
-       AssignAndDelete(file, ConcatFileName(gSystem->HomeDirectory(), name) );
-       mapfileStream << file << std::endl;
-@@ -3468,23 +3438,9 @@
-    mapfileStream.close();
- 
-    // ======= Generate the rootcling command line
--   TString rcling;
--#ifndef ROOTBINDIR
--   rcling = gSystem->Getenv("ROOTSYS");
--#ifndef R__WIN32
--   rcling += "/bin/";
--#else
--   rcling += "\\bin\\";
--#endif
--#else
--   rcling = ROOTBINDIR;
--#ifndef R__WIN32
--   rcling += "/";
--#else
--   rcling += "\\";
--#endif
--#endif
--   rcling += "rootcling -v0 \"--lib-list-prefix=";
-+   TString rcling = "rootcling";
-+   PrependPathName(TROOT::GetBinDir(), rcling);
-+   rcling += " -v0 \"--lib-list-prefix=";
-    rcling += mapfile;
-    rcling += "\" -f \"";
-    rcling.Append(dict).Append("\" -c -p ");
-diff -Nur root-6.08.02.orig/core/CMakeLists.txt root-6.08.02/core/CMakeLists.txt
---- root-6.08.02.orig/core/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/CMakeLists.txt	2016-12-06 12:46:10.310969577 +0100
-@@ -63,14 +63,14 @@
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/gitinfo.bat ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/win/githeader.bat RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- else()
-   add_custom_command(OUTPUT  ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/gitinfo.sh ${CMAKE_SOURCE_DIR}
-                      COMMAND ${CMAKE_SOURCE_DIR}/build/unix/githeader.sh RGitCommit.h.tmp
-                      COMMENT "Recording the git revision now"
--                     DEPENDS ${dep_objects}
-+                     DEPENDS ${dep_objects} move_artifacts
-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- endif()
- add_custom_target(gitcommit ALL DEPENDS ${CMAKE_BINARY_DIR}/RGitCommit.h.tmp)
-diff -Nur root-6.08.02.orig/core/meta/src/TClass.cxx root-6.08.02/core/meta/src/TClass.cxx
---- root-6.08.02.orig/core/meta/src/TClass.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/meta/src/TClass.cxx	2016-12-06 12:46:10.311969565 +0100
-@@ -1722,17 +1722,7 @@
- {
-    static const char *suffix = "class.rules";
-    TString sname = suffix;
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   gSystem->PrependPathName(etc, sname);
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), sname);
- 
-    Int_t res = -1;
- 
-diff -Nur root-6.08.02.orig/core/meta/src/TCling.cxx root-6.08.02/core/meta/src/TCling.cxx
---- root-6.08.02.orig/core/meta/src/TCling.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/meta/src/TCling.cxx	2016-12-06 12:46:10.313969543 +0100
-@@ -1056,27 +1056,26 @@
-    std::vector<std::string> clingArgsStorage;
-    clingArgsStorage.push_back("cling4root");
- 
--   std::string interpInclude;
-    // rootcling sets its arguments through TROOT::GetExtraInterpreterArgs().
-    if (!fromRootCling) {
-       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
- 
-       // Add -I early so ASTReader can find the headers.
--      std::string interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
--      clingArgsStorage.push_back(interpInclude);
-+      std::string interpInclude(TROOT::GetEtcDir());
-+      clingArgsStorage.push_back("-I" + interpInclude);
- 
-       // Add include path to etc/cling. FIXME: This is a short term solution. The
-       // llvm/clang header files shouldn't be there at all. We have to get rid of
-       // that dependency and avoid copying the header files.
--      clingArgsStorage.push_back(interpInclude + "/cling");
-+      clingArgsStorage.push_back("-I" + interpInclude + "/cling");
- 
-       // Add the root include directory and etc/ to list searched by default.
--      clingArgsStorage.push_back(std::string("-I") + ROOT::TMetaUtils::GetROOTIncludeDir(false));
-+      clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir()));
- 
-       // Add the current path to the include path
-       // TCling::AddIncludePath(".");
- 
--      std::string pchFilename = interpInclude.substr(2) + "/allDict.cxx.pch";
-+      std::string pchFilename = interpInclude + "/allDict.cxx.pch";
-       if (gSystem->Getenv("ROOT_PCH")) {
-          pchFilename = gSystem->Getenv("ROOT_PCH");
-       }
-@@ -1095,7 +1094,11 @@
-            eArg = clingArgsStorage.end(); iArg != eArg; ++iArg)
-       interpArgs.push_back(iArg->c_str());
- 
--   std::string llvmResourceDir = ROOT::TMetaUtils::GetLLVMResourceDir(false);
-+#ifdef R__EXTERN_LLVMDIR
-+   TString llvmResourceDir = R__EXTERN_LLVMDIR;
-+#else
-+   TString llvmResourceDir = TROOT::GetEtcDir() + "/cling";
-+#endif
-    // Add statically injected extra arguments, usually coming from rootcling.
-    for (const char** extraArgs = TROOT::GetExtraInterpreterArgs();
-         extraArgs && *extraArgs; ++extraArgs) {
-@@ -1109,7 +1112,7 @@
- 
-    fInterpreter = new cling::Interpreter(interpArgs.size(),
-                                          &(interpArgs[0]),
--                                         llvmResourceDir.c_str());
-+                                         llvmResourceDir);
- 
-    if (!fromRootCling) {
-       fInterpreter->installLazyFunctionCreator(llvmLazyFunctionCreator);
-@@ -4722,21 +4725,7 @@
- 
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--#if defined(R__MACOSX) && (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
--   // on iOS etc does not exist and system<name> resides in $ROOTSYS
--   etc = gRootDir;
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
- 
-    Int_t ret = ReadRootmapFile(s);
-    if (ret == -3) // old format
-diff -Nur root-6.08.02.orig/core/metautils/inc/TMetaUtils.h root-6.08.02/core/metautils/inc/TMetaUtils.h
---- root-6.08.02.orig/core/metautils/inc/TMetaUtils.h	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/metautils/inc/TMetaUtils.h	2016-12-06 12:46:10.313969543 +0100
-@@ -334,10 +334,6 @@
- //______________________________________________________________________________
- llvm::StringRef DataMemberInfo__ValidArrayIndex(const clang::DeclaratorDecl &m, int *errnum = 0, llvm::StringRef  *errstr = 0);
- 
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
- enum class EIOCtorCategory : short {kAbsent, kDefault, kIOPtrType, kIORefType};
- 
- //______________________________________________________________________________
-@@ -544,18 +540,6 @@
-                                  const char* headers[]);
- 
- //______________________________________________________________________________
--// Return the -I needed to find RuntimeUniverse.h
--std::string GetInterpreterExtraIncludePath(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the LLVM / clang resource directory
--std::string GetLLVMResourceDir(bool rootbuild);
--
--//______________________________________________________________________________
--// Return the ROOT include directory
--std::string GetROOTIncludeDir(bool rootbuild);
--
--//______________________________________________________________________________
- // Return (in the argument 'output') a mangled version of the C++ symbol/type (pass as 'input')
- // that can be used in C++ as a variable name.
- void GetCppName(std::string &output, const char *input);
-diff -Nur root-6.08.02.orig/core/metautils/src/TMetaUtils.cxx root-6.08.02/core/metautils/src/TMetaUtils.cxx
---- root-6.08.02.orig/core/metautils/src/TMetaUtils.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/metautils/src/TMetaUtils.cxx	2016-12-06 12:46:10.314969531 +0100
-@@ -3303,40 +3303,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Return the -I needed to find RuntimeUniverse.h
--
--std::string ROOT::TMetaUtils::GetInterpreterExtraIncludePath(bool rootbuild)
--{
--#ifdef ROOTETCDIR
--   if (rootbuild) {
--      // Building ROOT, ignore ROOTETCDIR!
--#endif
--      const char* rootsys = getenv("ROOTSYS");
--      if (!rootsys) {
--         Error(0, "Environment variable ROOTSYS not set!");
--         return "-Ietc";
--      }
--      return std::string("-I") + rootsys + "/etc";
--#ifdef ROOTETCDIR
--   }
--   return std::string("-I") + ROOTETCDIR;
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Return the LLVM / clang resource directory
--
--std::string ROOT::TMetaUtils::GetLLVMResourceDir(bool rootbuild)
--{
--#ifdef R__EXTERN_LLVMDIR
--   return R__EXTERN_LLVMDIR;
--#else
--   return GetInterpreterExtraIncludePath(rootbuild)
--      .substr(2, std::string::npos) + "/cling";
--#endif
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Get the template specialisation decl and template decl behind the qualtype
- /// Returns true if successfully found, false otherwise
- 
-@@ -3967,29 +3933,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--
--std::string ROOT::TMetaUtils::GetROOTIncludeDir(bool rootbuild)
--{
--   const std::string defaultInclude ("include");
--   if (!rootbuild) {
--#ifndef ROOTINCDIR
--      const char* rootSysContent = getenv("ROOTSYS");
--      if (rootSysContent) {
--         std::string incl_rootsys (rootSysContent);
--         return incl_rootsys + "/" + defaultInclude;
--      } else {
--         Error(0,"Environment variable ROOTSYS not set");
--         return defaultInclude;
--      }
--#else
--      return ROOTINCDIR;
--#endif
--   }
--
--   return defaultInclude;
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Return the dictionary file name for a module
- 
- std::string ROOT::TMetaUtils::GetModuleFileName(const char* moduleName)
-diff -Nur root-6.08.02.orig/core/rint/src/TRint.cxx root-6.08.02/core/rint/src/TRint.cxx
---- root-6.08.02.orig/core/rint/src/TRint.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/rint/src/TRint.cxx	2016-12-06 12:46:10.314969531 +0100
-@@ -305,17 +305,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.08.02.orig/core/rint/src/TTabCom.cxx root-6.08.02/core/rint/src/TTabCom.cxx
---- root-6.08.02.orig/core/rint/src/TTabCom.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/rint/src/TTabCom.cxx	2016-12-06 12:46:10.315969520 +0100
-@@ -1671,8 +1671,7 @@
-    case kROOT_Load:
-       {
-          const TString fileName = s3("[^\"]*$");
--//             const TString  dynamicPath  = DeterminePath( fileName, TROOT::GetDynamicPath() ); /* should use this one */
--         const TString dynamicPath = DeterminePath(fileName,gEnv->GetValue("Root.DynamicPath",(char *) 0));
-+         const TString dynamicPath = DeterminePath(fileName, gSystem->GetDynamicPath());
-          const TSeqCollection *pListOfFiles = GetListOfFilesInPath(dynamicPath);
- 
- //             pos = Complete( "[^\"/]*$", pListOfFiles, "\");", out);
-diff -Nur root-6.08.02.orig/core/unix/src/TUnixSystem.cxx root-6.08.02/core/unix/src/TUnixSystem.cxx
---- root-6.08.02.orig/core/unix/src/TUnixSystem.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/unix/src/TUnixSystem.cxx	2016-12-06 12:46:10.316969509 +0100
-@@ -458,7 +458,9 @@
- 
- static void SetRootSys()
- {
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    void *addr = (void *)SetRootSys;
-    Dl_info info;
-    if (dladdr(addr, &info) && info.dli_fname && info.dli_fname[0]) {
-@@ -471,8 +473,8 @@
-          gSystem->Setenv("ROOTSYS", gSystem->DirName(rs));
-       }
-    }
--#else
--   return;
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- #endif
-@@ -500,7 +502,9 @@
-    TRegexp sovers = "libCore\\.[0-9]+\\.*[0-9]*\\.so";
-    TRegexp dyvers = "libCore\\.[0-9]+\\.*[0-9]*\\.dylib";
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX")) {
-+#endif
- #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-    // first loaded is the app so set ROOTSYS to app bundle
-    if (i == 1) {
-@@ -526,6 +530,8 @@
-       }
-    }
- #endif
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // when libSystem.B.dylib is loaded we have finished loading all dylibs
-@@ -613,13 +619,8 @@
-    SetRootSys();
- #endif
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0)
--      gRootDir= "/usr/local/root";
--#else
--   gRootDir = ROOTPREFIX;
--#endif
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   gRootDir = "/usr/local/root";
- 
-    return kFALSE;
- }
-@@ -2240,22 +2241,17 @@
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Root.StacktraceScript %s does not exist\n", gdbscript.Data());
-          gdbscript = "";
--      } else {
--         gdbscript += " ";
-       }
-    }
-    if (gdbscript == "") {
--#ifdef ROOTETCDIR
--      gdbscript.Form("%s/gdb-backtrace.sh", ROOTETCDIR);
--#else
--      gdbscript.Form("%s/etc/gdb-backtrace.sh", Getenv("ROOTSYS"));
--#endif
-+      gdbscript = "gdb-backtrace.sh";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), gdbscript);
-       if (AccessPathName(gdbscript, kReadPermission)) {
-          fprintf(stderr, "Error in <TUnixSystem::StackTrace> script %s is missing\n", gdbscript.Data());
-          return;
-       }
--      gdbscript += " ";
-    }
-+   gdbscript += " ";
- 
-    TString gdbmess = gEnv->GetValue("Root.StacktraceMessage", "");
-    gdbmess = gdbmess.Strip();
-@@ -4602,11 +4598,7 @@
-       TString rdynpath = gEnv->GetValue("Root.DynamicPath", (char*)0);
-       rdynpath.ReplaceAll(": ", ":");  // in case DynamicPath was extended
-       if (rdynpath.IsNull()) {
--#ifdef ROOTLIBDIR
--         rdynpath = ".:"; rdynpath += ROOTLIBDIR;
--#else
--         rdynpath = ".:"; rdynpath += gRootDir; rdynpath += "/lib";
--#endif
-+         rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
-       }
-       TString ldpath;
- #if defined (R__AIX)
-@@ -4627,16 +4619,9 @@
-       else {
-          dynpath = ldpath; dynpath += ":"; dynpath += rdynpath;
-       }
--
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ":"; dynpath += ROOTLIBDIR;
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ":"; dynpath += TROOT::GetLibDir();
-       }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ":"; dynpath += gRootDir; dynpath += "/lib";
--      }
--#endif
-       if (gCling) {
-          dynpath += ":"; dynpath += gCling->GetSTLIncludePath();
-       } else
-diff -Nur root-6.08.02.orig/core/utils/CMakeLists.txt root-6.08.02/core/utils/CMakeLists.txt
---- root-6.08.02.orig/core/utils/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/utils/CMakeLists.txt	2016-12-06 12:46:10.316969509 +0100
-@@ -66,27 +66,27 @@
-                     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
- endif()
- 
--set(R__LLVMRESOURCEDIR ${CMAKE_BINARY_DIR}/etc/cling)
--configure_file(src/rootcling.cxx rootcling_tmp.cxx @ONLY)
-+configure_file(src/rootcling.cxx src/rootcling_tmp.cxx @ONLY)
- 
- if(WIN32)
--  set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+  set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-D_WIN32 -DNOMINMAX -DROOT_STAGE1_BUILD")
- else()
-   if(CXX_HAS_fno_rtti)
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR -fno-rtti")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -fno-rtti")
-   else()
--    set_source_files_properties(rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD -DR__LLVMRESOURCEDIR")
-+    set_source_files_properties(src/rootcling_tmp.cxx PROPERTIES COMPILE_FLAGS "-DROOT_STAGE1_BUILD")
-   endif()
- endif()
- 
- ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
--                              src/TModuleGenerator.cxx ${CMAKE_CURRENT_BINARY_DIR}/rootcling_tmp.cxx
-+                              src/TModuleGenerator.cxx src/rootcling_tmp.cxx
-                               ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
-                               $<TARGET_OBJECTS:Clib>
-                               $<TARGET_OBJECTS:MetaUtils>
-                               $<TARGET_OBJECTS:MetaUtilsLLVM>
-                               LIBRARIES ${CLING_LIBRARIES}  ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-                               NOINSTALL)
-+set_target_properties(rootcling_tmp PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
- add_dependencies(rootcling_tmp CLING LLVMRES)
- set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
- set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
-diff -Nur root-6.08.02.orig/core/utils/ModuleVars.mk root-6.08.02/core/utils/ModuleVars.mk
---- root-6.08.02.orig/core/utils/ModuleVars.mk	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/utils/ModuleVars.mk	2016-12-06 12:46:10.316969509 +0100
-@@ -48,7 +48,7 @@
- ROOTCINTEXE     := bin/rootcint$(EXEEXT)
- GENREFLEXEXE    := bin/genreflex$(EXEEXT)
- ROOTCLINGSTAGE1 := $(ROOTCLINGTMPEXE)
--ROOTCLINGSTAGE2 := $(ROOTCLINGEXE) -rootbuild
-+ROOTCLINGSTAGE2 := ROOTIGNOREPREFIX=1 $(ROOTCLINGEXE) -rootbuild
- 
- ##### Dependencies for all dictionaries
- ROOTCLINGSTAGE1DEP := $(ROOTCLINGTMPEXE)
-diff -Nur root-6.08.02.orig/core/utils/src/rootcling.cxx root-6.08.02/core/utils/src/rootcling.cxx
---- root-6.08.02.orig/core/utils/src/rootcling.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/utils/src/rootcling.cxx	2016-12-06 12:46:10.317969497 +0100
-@@ -270,12 +270,6 @@
- bool buildingROOT = false;
- #endif
- 
--#ifdef R__EXTERN_LLVMDIR
--# define R__LLVMDIR R__EXTERN_LLVMDIR
--#else
--# define R__LLVMDIR "./interpreter/llvm/inst" // only works for rootbuild for now!
--#endif
--
- namespace {
-    // Copy-pasted from TClass.h We cannot #include TClass.h because we are compiling in -fno-rtti mode
-    template <typename T> struct IsPointerTClassCopy {
-@@ -3909,11 +3903,6 @@
-       clingArgs.push_back("-DG__VECTOR_HAS_CLASS_ITERATOR");
-    }
- 
--#if defined(ROOTINCDIR)
--   if (!buildingROOT)
--      SetRootSys();
--#endif
--
-    if (ic < argc && !strcmp(argv[ic], "-c")) {
-       // Simply ignore the -c options.
-       ic++;
-@@ -4069,7 +4058,11 @@
-    }
- 
-    ic = nextStart;
--   clingArgs.push_back(std::string("-I") + TMetaUtils::GetROOTIncludeDir(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/include");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetIncludeDir());
-+#endif
- 
-    std::vector<std::string> pcmArgs;
-    for (size_t parg = 0, n = clingArgs.size(); parg < n; ++parg) {
-@@ -4093,7 +4086,11 @@
-    }
- 
-    // cling-only arguments
--   clingArgs.push_back(TMetaUtils::GetInterpreterExtraIncludePath(buildingROOT));
-+#ifdef ROOT_STAGE1_BUILD
-+   clingArgs.push_back(std::string("-I") + getenv("ROOTSYS") + "/etc");
-+#else
-+   clingArgs.push_back(std::string("-I") + TROOT__GetEtcDir());
-+#endif
-    // We do not want __ROOTCLING__ in the pch!
-    if (!onepcm) {
-       clingArgs.push_back("-D__ROOTCLING__");
-@@ -4118,10 +4115,14 @@
-    }
- 
-    std::string resourceDir;
--#ifdef R__LLVMRESOURCEDIR
--   resourceDir = "@R__LLVMRESOURCEDIR@";
-+#ifdef R__EXTERN_LLVMDIR
-+   resourceDir = R__EXTERN_LLVMDIR;
- #else
--   resourceDir = TMetaUtils::GetLLVMResourceDir(buildingROOT);
-+#ifdef ROOT_STAGE1_BUILD
-+   resourceDir = std::string(getenv("ROOTSYS")) + "/etc/cling";
-+#else
-+   resourceDir = std::string(TROOT__GetEtcDir()) + "/cling";
-+#endif
- #endif
- 
- #ifndef ROOT_STAGE1_BUILD
-@@ -4162,11 +4163,6 @@
- 
-    interp.getOptions().ErrorOut = true;
-    interp.enableRawInput(true);
--#ifdef ROOTINCDIR
--   const bool useROOTINCDIR = !buildingROOT;
--#else
--   const bool useROOTINCDIR = false;
--#endif
-    if (isGenreflex) {
-       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess) {
-          // There was an error.
-@@ -4182,17 +4178,10 @@
-                               "#include <stddef.h>\n"
-                               "#include <string.h>\n"
-                              ) != cling::Interpreter::kSuccess
--            || (!useROOTINCDIR
--                && interp.declare("#include \"Rtypes.h\"\n"
--                                  "#include \"TClingRuntime.h\"\n"
--                                  "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
--#ifdef ROOTINCDIR
--            || (useROOTINCDIR
--                && interp.declare("#include \"" ROOTINCDIR "/Rtypes.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TClingRuntime.h\"\n"
--                                  "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
--               )
--#endif
-+            || interp.declare("#include \"Rtypes.h\"\n"
-+                              "#include \"TClingRuntime.h\"\n"
-+                              "#include \"TObject.h\""
-+                             ) != cling::Interpreter::kSuccess
-          ) {
-          // There was an error.
-          ROOT::TMetaUtils::Error(0, "Error loading the default header files.\n");
-diff -Nur root-6.08.02.orig/core/utils/src/rootclingTCling.cxx root-6.08.02/core/utils/src/rootclingTCling.cxx
---- root-6.08.02.orig/core/utils/src/rootclingTCling.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/utils/src/rootclingTCling.cxx	2016-12-06 12:46:10.317969497 +0100
-@@ -40,6 +40,18 @@
- }
- 
- extern "C"
-+const char *TROOT__GetIncludeDir()
-+{
-+   return TROOT::GetIncludeDir().Data();
-+}
-+
-+extern "C"
-+const char *TROOT__GetEtcDir()
-+{
-+   return TROOT::GetEtcDir().Data();
-+}
-+
-+extern "C"
- cling::Interpreter *TCling__GetInterpreter()
- {
-    static bool isInitialized = false;
-diff -Nur root-6.08.02.orig/core/utils/src/rootclingTCling.h root-6.08.02/core/utils/src/rootclingTCling.h
---- root-6.08.02.orig/core/utils/src/rootclingTCling.h	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/utils/src/rootclingTCling.h	2016-12-06 12:46:10.318969486 +0100
-@@ -21,6 +21,8 @@
- 
- extern "C" {
-    const char ** *TROOT__GetExtraInterpreterArgs();
-+   const char *TROOT__GetIncludeDir();
-+   const char *TROOT__GetEtcDir();
-    cling::Interpreter *TCling__GetInterpreter();
-    void InitializeStreamerInfoROOTFile(const char *filename);
-    void AddStreamerInfoToROOTFile(const char *normName);
-diff -Nur root-6.08.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.08.02/core/winnt/src/TWinNTSystem.cxx
---- root-6.08.02.orig/core/winnt/src/TWinNTSystem.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/winnt/src/TWinNTSystem.cxx	2016-12-06 12:46:10.318969486 +0100
-@@ -362,11 +362,7 @@
-          TString rdynpath = gEnv ? gEnv->GetValue("Root.DynamicPath", (char*)0) : "";
-          rdynpath.ReplaceAll("; ", ";");  // in case DynamicPath was extended
-          if (rdynpath == "") {
--#ifdef ROOTBINDIR
--            rdynpath = ".;"; rdynpath += ROOTBINDIR;
--#else
--            rdynpath = ".;"; rdynpath += gRootDir; rdynpath += "/bin";
--#endif
-+            rdynpath = ".;"; rdynpath += TROOT::GetBinDir();
-          }
-          TString path = gSystem->Getenv("PATH");
-          if (path == "")
-@@ -376,15 +372,10 @@
-          }
- 
-       }
--#ifdef ROOTLIBDIR
--      if (!dynpath.Contains(ROOTLIBDIR)) {
--         dynpath += ";"; dynpath += ROOTLIBDIR;
--      }
--#else
--      if (!dynpath.Contains(TString::Format("%s/lib", gRootDir))) {
--         dynpath += ";"; dynpath += gRootDir; dynpath += "/lib";
-+
-+      if (!dynpath.Contains(TROOT::GetLibDir())) {
-+         dynpath += ";"; dynpath += TROOT::GetLibDir();
-       }
--#endif
- 
-       return dynpath;
-    }
-@@ -823,16 +814,8 @@
-       }
- 
-       // determine the fileopen.C file path:
--      TString fileopen;
--#ifndef ROOT_PREFIX
--      fileopen += sys->TWinNTSystem::DriveName(buf);
--      fileopen += ":";
--      fileopen += sys->TWinNTSystem::DirName(sys->TWinNTSystem::DirName(buf));
--      fileopen += "\\macros";
--#else
--      fileopen += ROOTMACRODIR;
--#endif
--      fileopen += "\\fileopen.C";
-+      TString fileopen = "fileopen.C";
-+      gSystem->PrependPathName(TROOT::GetMacroDir(), fileopen);
- 
-       if (regROOTwrite) {
-          // only write to registry if fileopen.C is readable
-@@ -1007,7 +990,9 @@
- 
-    char *buf = new char[MAX_MODULE_NAME32 + 1];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (gSystem->Getenv("ROOTIGNOREPREFIX") {
-+#endif
-    // set ROOTSYS
-    HMODULE hModCore = ::GetModuleHandle("libCore.dll");
-    if (hModCore) {
-@@ -1035,6 +1020,8 @@
-          }
-       }
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    UpdateRegistry(this, buf);
-@@ -1112,23 +1099,17 @@
- 
-    fSigcnt = 0;
- 
--#ifndef ROOTPREFIX
--   gRootDir = Getenv("ROOTSYS");
--   if (gRootDir == 0) {
--      static char lpFilename[MAX_PATH];
--      if (::GetModuleFileName(NULL,               // handle to module to find filename for
--                            lpFilename,           // pointer to buffer to receive module path
--                            sizeof(lpFilename)))  // size of buffer, in characters
--      {
--         const char *dirName = DirName(DirName(lpFilename));
--         gRootDir = StrDup(dirName);
--      } else {
--         gRootDir = 0;
--      }
-+   // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS
-+   static char lpFilename[MAX_PATH];
-+   if (::GetModuleFileName(
-+          NULL,                   // handle to module to find filename for
-+          lpFilename,             // pointer to buffer to receive module path
-+          sizeof(lpFilename))) {  // size of buffer, in characters
-+      const char *dirName = DirName(DirName(lpFilename));
-+      gRootDir = StrDup(dirName);
-+   } else {
-+      gRootDir = 0;
-    }
--#else
--   gRootDir= ROOTPREFIX;
--#endif
- 
-    // Increase the accuracy of Sleep() without needing to link to winmm.lib
-    typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod );
-diff -Nur root-6.08.02.orig/core/zip/CMakeLists.txt root-6.08.02/core/zip/CMakeLists.txt
---- root-6.08.02.orig/core/zip/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/core/zip/CMakeLists.txt	2016-12-06 12:46:10.319969475 +0100
-@@ -22,6 +22,7 @@
- # Define all the header files which should be installed when
- # doing a "make install"
- install(FILES ${ZLIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)
-+file(COPY ${ZLIB_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
- set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
- 
- ROOT_OBJECT_LIBRARY(Zip ${ZLIB_SRCS})
-diff -Nur root-6.08.02.orig/documentation/doxygen/converttonotebook.py root-6.08.02/documentation/doxygen/converttonotebook.py
---- root-6.08.02.orig/documentation/doxygen/converttonotebook.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/documentation/doxygen/converttonotebook.py	2016-12-06 12:46:10.319969475 +0100
-@@ -601,7 +601,7 @@
- def rs401dGetFiles(code):
-     if tutName == "rs401d_FeldmanCousins":
-         code = code.replace(
--         """#if !defined(__CINT__) || defined(__MAKECINT__)\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n#endif""" , """std::string tutDir = gROOT->GetTutorialsDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.c_str());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.c_str());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
-+         """#if !defined(__CINT__) || defined(__MAKECINT__)\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n#endif""" , """TString tutDir = gROOT->GetTutorialDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.Data());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.Data());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
-     return code
- 
- 
-diff -Nur root-6.08.02.orig/geom/geom/src/TGeoElement.cxx root-6.08.02/geom/geom/src/TGeoElement.cxx
---- root-6.08.02.orig/geom/geom/src/TGeoElement.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/geom/geom/src/TGeoElement.cxx	2016-12-06 12:46:10.319969475 +0100
-@@ -39,6 +39,7 @@
- #include "Riostream.h"
- 
- #include "TSystem.h"
-+#include "TROOT.h"
- #include "TObjArray.h"
- #include "TVirtualGeoPainter.h"
- #include "TGeoManager.h"
-@@ -1128,12 +1129,8 @@
- {
-    if (HasRNElements()) return;
-    TGeoElementRN *elem;
--   TString rnf;
--#ifdef ROOTETCDIR
--   rnf.Form("%s/RadioNuclides.txt", ROOTETCDIR);
--#else
--   rnf.Form("%s/etc/RadioNuclides.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+   TString rnf = "RadioNuclides.txt";
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), rnf);
-    FILE *fp = fopen(rnf, "r");
-    if (!fp) {
-       Error("ImportElementsRN","File RadioNuclides.txt not found");
-diff -Nur root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx root-6.08.02/graf2d/asimage/src/TASImage.cxx
---- root-6.08.02.orig/graf2d/asimage/src/TASImage.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/asimage/src/TASImage.cxx	2016-12-06 12:46:10.320969463 +0100
-@@ -357,33 +357,33 @@
- 
- static void init_icon_paths()
- {
--   const char *icons = "/icons";
--#ifdef R__WIN32
--      icons = "\\icons";
--#endif
--
--   TString homeIcons = gSystem->HomeDirectory();
--   homeIcons += icons;
--
--   TString rootIcons = gSystem->Getenv("ROOTSYS");
--   rootIcons += icons;
--
--   TString guiIcons = gEnv->GetValue("Gui.IconPath", "");
--
--   gIconPaths[0] = StrDup(".");
--   gIconPaths[1] = StrDup(homeIcons.Data());
--   gIconPaths[2] = StrDup(rootIcons.Data());
--   gIconPaths[3] = StrDup(guiIcons.Data());
--
--#ifdef ROOTICONPATH
--   gIconPaths[4] = StrDup(ROOTICONPATH);
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
-+#ifndef R__WIN32
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
- #endif
-+   }
- 
--#ifdef EXTRAICONPATH
--   gIconPaths[5] = StrDup(EXTRAICONPATH);
-+   Int_t cnt = 0;
-+   Ssiz_t from = 0;
-+   TString token;
-+#ifndef R__WIN32
-+   const char *delim = ":";
-+#else
-+   const char *delim = ";";
- #endif
--
--   gIconPaths[6] = 0;
-+   while (icon_path.Tokenize(token, from, delim) && cnt < 6) {
-+      char *path = gSystem->ExpandPathName(token.Data());
-+      if (path) {
-+         gIconPaths[cnt] = path;
-+         cnt++;
-+      }
-+   }
-+   gIconPaths[cnt] = 0;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -2592,14 +2592,19 @@
- 
-    TString fn = font_name;
-    fn.Strip();
--   char *tmpstr = 0;
-+
-+   // This is for backward compatibility...
-+   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
-+
-+   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
-+                                       TROOT::GetTTFFontDir());
-+   char *tmpstr = gSystem->Which(ttpath, fn, kReadPermission);
-+   fn = tmpstr;
-+   delete [] tmpstr;
- 
-    if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
--      tmpstr = gSystem->ExpandPathName(fn.Data());
--      fn = tmpstr;
-       ttfont = kTRUE;
-    }
--   delete [] tmpstr;
- 
-    if (color) {
-       parse_argb_color(color, &text_color);
-diff -Nur root-6.08.02.orig/graf2d/cocoa/src/QuartzWindow.mm root-6.08.02/graf2d/cocoa/src/QuartzWindow.mm
---- root-6.08.02.orig/graf2d/cocoa/src/QuartzWindow.mm	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/cocoa/src/QuartzWindow.mm	2016-12-06 12:46:10.321969452 +0100
-@@ -814,11 +814,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-@@ -3083,11 +3079,7 @@
-    }
- 
-    if (pngFileName) {
--#ifdef ROOTICONPATH
--      const char * const path = gSystem->Which(ROOTICONPATH, pngFileName, kReadPermission);
--#else
--      const char * const path = gSystem->Which("$ROOTSYS/icons", pngFileName, kReadPermission);
--#endif
-+      const char * const path = gSystem->Which(TROOT::GetIconPath(), pngFileName, kReadPermission);
-       const Util::ScopedArray<const char> arrayGuard(path);
- 
-       if (!path || path[0] == 0) {
-diff -Nur root-6.08.02.orig/graf2d/gpad/src/TClassTree.cxx root-6.08.02/graf2d/gpad/src/TClassTree.cxx
---- root-6.08.02.orig/graf2d/gpad/src/TClassTree.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/gpad/src/TClassTree.cxx	2016-12-06 12:46:10.321969452 +0100
-@@ -195,11 +195,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -225,11 +221,7 @@
-    fNdata    = 0;
-    SetLabelDx();
-    SetYoffset(0);
--#ifdef ROOTSRCDIR
--   SetSourceDir(".:src:" ROOTSRCDIR);
--#else
--   SetSourceDir(".:src:$ROOTSYS/src");
--#endif
-+   SetSourceDir(".:src:" + TROOT::GetSourceDir());
- 
-    // draw list of classes (if specified)
-    if (classes && strlen(classes)) {
-diff -Nur root-6.08.02.orig/graf2d/graf/src/TTF.cxx root-6.08.02/graf2d/graf/src/TTF.cxx
---- root-6.08.02.orig/graf2d/graf/src/TTF.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/graf/src/TTF.cxx	2016-12-06 12:46:10.322969441 +0100
-@@ -15,12 +15,10 @@
- Interface to the freetype 2 library.
- */
- 
--// RConfigure.h is needed for TTFFONTDIR
--#include "RConfigure.h"
--
- #  include <ft2build.h>
- #  include FT_FREETYPE_H
- #  include FT_GLYPH_H
-+#include "TROOT.h"
- #include "TTF.h"
- #include "TSystem.h"
- #include "TEnv.h"
-@@ -415,13 +413,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                       TTFFONTDIR
--# else
--                                       "$(ROOTSYS)/fonts"
--# endif
--                                      );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (!ttfont) {
-@@ -543,12 +535,7 @@
-       // try to load font (font must be in Root.TTFontPath resource)
-       // to see which fontset we have available
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR
--#else
--                                          "$(ROOTSYS)/fonts"
--#endif
--                                         );
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, gEnv->GetValue(fonttable[fontid][0], fonttable[fontid][1]), kReadPermission);
-       if (ttfont) {
-          delete [] ttfont;
-diff -Nur root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.08.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.08.02.orig/graf2d/postscript/src/TPostScript.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/postscript/src/TPostScript.cxx	2016-12-06 12:46:10.322969441 +0100
-@@ -1568,12 +1568,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                       TTFFONTDIR
--#else // TTFFONTDIR
--                                       "$(ROOTSYS)/fonts"
--#endif // TTFFONTDIR
--                                       );
-+                                       TROOT::GetTTFFontDir());
- 
-    for (Int_t fontid = 1; fontid < 30; fontid++) {
-       if (fontid != 15 && MustEmbed[fontid-1]) {
-diff -Nur root-6.08.02.orig/graf2d/qt/src/TGQt.cxx root-6.08.02/graf2d/qt/src/TGQt.cxx
---- root-6.08.02.orig/graf2d/qt/src/TGQt.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf2d/qt/src/TGQt.cxx	2016-12-06 12:46:10.323969430 +0100
-@@ -707,13 +707,6 @@
-                           GetSystemMetrics(SM_CYSMICON));
-    HDC dc = tempIcon->handle();
-    DrawIcon (dc, 0, 0, icon);
--#else
--# ifdef ROOTICONPATH
--   gSystem->ExpandPathName(ROOTICONPATH);
--# else
--   gSystem->ExpandPathName("$ROOTSYS/icons/");
--//   tempIcon =new QPixmap (16,16),
--# endif
- #endif
-    return tempIcon;
- }
-@@ -803,13 +796,7 @@
-    static TQtApplication *app = 0;
-    if (!app) {
-       //    app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
--      static TString argvString (
--#ifdef ROOTBINDIR
--             ROOTBINDIR "/root.exe"
--#else
--             "$ROOTSYS/bin/root.exe"
--#endif
--             );
-+      static TString argvString (TROOT::GetBinDir() + "/root.exe");
-       gSystem->ExpandPathName(argvString);
-       static char *argv[] = {(char *)argvString.Data()};
-       static int nArg = 1;
-@@ -997,14 +984,8 @@
-     }
- 
-     if (isXdfSupport && !symbolFontFound) {
--// Load the local ROOT font
--       QString fontdir =
--#ifdef TTFFONTDIR
--         TTFFONTDIR
--#else
--         "$ROOTSYS/fonts"
--#endif
--        ;
-+        // Load the local ROOT font
-+        QString fontdir = TROOT::GetTTFFontDir().Data();
-         QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
-         symbolFontFound = QFontDatabase::addApplicationFont(symbolFontFile);
-     }
-@@ -1014,12 +995,7 @@
-         fontFamily = fSymbolFontFamily = "Arial";
-         qDebug() << " Substitute it with \""<<fontFamily <<"\"";
-         qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
--                 <<
--#ifdef TTFFONTDIR
--               TTFFONTDIR
--#else
--               "$ROOTSYS/fonts"
--#endif
-+                 << TROOT::GetTTFFontDir()
-                  << "\" directory to get the proper support for ROOT TLatex class";
-         // create a custom codec
-         new QSymbolCodec();
-diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.08.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.08.02.orig/graf3d/gl/src/TGLFontManager.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf3d/gl/src/TGLFontManager.cxx	2016-12-06 12:46:10.323969430 +0100
-@@ -14,6 +14,7 @@
- #include "TGLFontManager.h"
- 
- 
-+#include "TROOT.h"
- #include "TVirtualX.h"
- #include "TMath.h"
- #include "TSystem.h"
-@@ -451,11 +452,7 @@
-    if (it == fFontMap.end())
-    {
-       TString ttpath, file;
--# ifdef TTFFONTDIR
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", TTFFONTDIR );
--# else
--      ttpath = gEnv->GetValue("Root.TTGLFontPath", "$(ROOTSYS)/fonts");
--# endif
-+      ttpath = gEnv->GetValue("Root.TTGLFontPath", TROOT::GetTTFFontDir());
-       {
-          //For extenede we have both ttf and otf.
-          char *fp = gSystem->Which(ttpath, fileID < fgExtendedFontStart ?
-diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLSAViewer.cxx root-6.08.02/graf3d/gl/src/TGLSAViewer.cxx
---- root-6.08.02.orig/graf3d/gl/src/TGLSAViewer.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf3d/gl/src/TGLSAViewer.cxx	2016-12-06 12:46:10.323969430 +0100
-@@ -669,14 +669,7 @@
-          switch (parm1) {
-          case kGLHelpAbout: {
- #ifdef R__UNIX
--            TString rootx;
--#ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--#else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--#endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/graf3d/gl/src/TGLText.cxx root-6.08.02/graf3d/gl/src/TGLText.cxx
---- root-6.08.02.orig/graf3d/gl/src/TGLText.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/graf3d/gl/src/TGLText.cxx	2016-12-06 12:46:10.323969430 +0100
-@@ -197,13 +197,7 @@
- 
-    // try to load font (font must be in Root.TTFontPath resource)
-    const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--# ifdef TTFFONTDIR
--                                        TTFFONTDIR
--# else
--                                        "$(ROOTSYS)/fonts"
--# endif
--                                        );
--
-+                                       TROOT::GetTTFFontDir());
-    char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
- 
-    if (fGLTextFont) delete fGLTextFont;
-diff -Nur root-6.08.02.orig/gui/gui/src/TGApplication.cxx root-6.08.02/gui/gui/src/TGApplication.cxx
---- root-6.08.02.orig/gui/gui/src/TGApplication.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TGApplication.cxx	2016-12-06 12:46:10.324969418 +0100
-@@ -84,12 +84,7 @@
- 
-    if (strcmp(appClassName, "proofserv")) {
-       const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--#ifdef TTFFONTDIR
--                                          TTFFONTDIR);
--#else
--                                          "$(ROOTSYS)/fonts");
--#endif
--
-+                                          TROOT::GetTTFFontDir());
-       char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
-       // Added by cholm for use of DFSG - fonts - based on fix by Kevin
-       if (!ttfont)
-diff -Nur root-6.08.02.orig/gui/gui/src/TGResourcePool.cxx root-6.08.02/gui/gui/src/TGResourcePool.cxx
---- root-6.08.02.orig/gui/gui/src/TGResourcePool.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TGResourcePool.cxx	2016-12-06 12:46:10.324969418 +0100
-@@ -83,46 +83,29 @@
-    TString framebgpixmap  = gEnv->GetValue("Gui.FrameBackgroundPixmap", "");
-    TString docbgpixmap    = gEnv->GetValue("Gui.DocumentBackgroundPixmap", "");
- 
--   TString icon_path;
--   TString mime_file;
--   TString line;
--
-+   TString icon_path = gEnv->GetValue("Gui.IconPath", "");
-+   if (icon_path.IsNull()) {
-+      icon_path = "icons";
-+      gSystem->PrependPathName(gSystem->HomeDirectory(), icon_path);
- #ifndef R__WIN32
--# ifdef ROOTICONPATH
--   icon_path = TString::Format("%s/icons:%s:.:", gSystem->HomeDirectory(),
--                               ROOTICONPATH);
--#  ifdef EXTRAICONPATH
--   icon_path += gEnv->GetValue("Gui.IconPath", EXTRAICONPATH);
--#  else
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--#  endif
--# else
--   icon_path = TString::Format("%s/icons:%s/icons:.:", gSystem->HomeDirectory(),
--                                                       gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--# endif
--   line = TString::Format("%s/.root.mimes", gSystem->HomeDirectory());
-+      icon_path = ".:" + icon_path + ":" + TROOT::GetIconPath() + ":" + EXTRAICONPATH;
-+#else
-+      icon_path = ".;" + icon_path + ";" + TROOT::GetIconPath() + ";" + EXTRAICONPATH;
-+#endif
-+   }
- 
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
-+   TString mime_file = ".root.mimes";
-+   gSystem->PrependPathName(gSystem->HomeDirectory(), mime_file);
-+   mime_file = gEnv->GetValue("Gui.MimeTypeFile", mime_file.Data());
-    char *mf = gSystem->ExpandPathName(mime_file.Data());
-    if (mf) {
-       mime_file = mf;
-       delete [] mf;
-    }
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--#ifdef ROOTETCDIR
--      mime_file = TString::Format("%s/root.mimes", ROOTETCDIR);
--#else
--      mime_file = TString::Format("%s/etc/root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
--#else // R__WIN32
--   icon_path = TString::Format("%s\\icons:.:\\", gSystem->Getenv("ROOTSYS"));
--   icon_path += gEnv->GetValue("Gui.IconPath", "");
--   line = TString::Format("%s\\root.mimes", gSystem->HomeDirectory());
--   mime_file = gEnv->GetValue("Gui.MimeTypeFile", line.Data());
--   if (gSystem->AccessPathName(mime_file, kReadPermission))
--      mime_file = TString::Format("%s\\etc\\root.mimes", gSystem->Getenv("ROOTSYS"));
--#endif
-+   if (gSystem->AccessPathName(mime_file, kReadPermission)) {
-+      mime_file = "root.mimes";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), mime_file);
-+   }
- 
-    // Setup colors...
-    fClient->GetColorByName("white", fWhite);  // white and black always exist
-diff -Nur root-6.08.02.orig/gui/gui/src/TGSpeedo.cxx root-6.08.02/gui/gui/src/TGSpeedo.cxx
---- root-6.08.02.orig/gui/gui/src/TGSpeedo.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TGSpeedo.cxx	2016-12-06 12:46:10.324969418 +0100
-@@ -119,8 +119,7 @@
- {
-    TString sc;
-    Float_t step, mark[5];
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arialbd.ttf";
-+   TString ar = "arialbd.ttf";
-    Int_t i, nexe, offset;
- 
-    const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -528,8 +527,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-@@ -609,8 +607,7 @@
-          delete fImage2;
-       fImage2 = (TImage*)fImage->Clone("fImage2");
-       if (!fImage2 || !fImage2->IsValid()) return;
--      TString fp = gEnv->GetValue("Root.TTFontPath", "");
--      TString ar = fp + "/arialbd.ttf";
-+      TString ar = "arialbd.ttf";
-       // format counter value
-       Int_t nexe = 0;
-       Int_t ww = fCounter;
-diff -Nur root-6.08.02.orig/gui/gui/src/TGTextEditor.cxx root-6.08.02/gui/gui/src/TGTextEditor.cxx
---- root-6.08.02.orig/gui/gui/src/TGTextEditor.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TGTextEditor.cxx	2016-12-06 12:46:10.324969418 +0100
-@@ -842,14 +842,7 @@
- void TGTextEditor::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/gui/gui/src/TRootBrowser.cxx root-6.08.02/gui/gui/src/TRootBrowser.cxx
---- root-6.08.02.orig/gui/gui/src/TRootBrowser.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TRootBrowser.cxx	2016-12-06 12:46:10.325969407 +0100
-@@ -702,14 +702,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/gui/gui/src/TRootBrowserLite.cxx root-6.08.02/gui/gui/src/TRootBrowserLite.cxx
---- root-6.08.02.orig/gui/gui/src/TRootBrowserLite.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TRootBrowserLite.cxx	2016-12-06 12:46:10.325969407 +0100
-@@ -1962,14 +1962,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/gui/gui/src/TRootCanvas.cxx root-6.08.02/gui/gui/src/TRootCanvas.cxx
---- root-6.08.02.orig/gui/gui/src/TRootCanvas.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/gui/src/TRootCanvas.cxx	2016-12-06 12:46:10.326969396 +0100
-@@ -1192,14 +1192,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx root-6.08.02/gui/guihtml/src/TGHtmlBrowser.cxx
---- root-6.08.02.orig/gui/guihtml/src/TGHtmlBrowser.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/guihtml/src/TGHtmlBrowser.cxx	2016-12-06 12:46:10.326969396 +0100
-@@ -629,14 +629,7 @@
-                   case kM_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/gui/sessionviewer/src/TSessionViewer.cxx root-6.08.02/gui/sessionviewer/src/TSessionViewer.cxx
---- root-6.08.02.orig/gui/sessionviewer/src/TSessionViewer.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/gui/sessionviewer/src/TSessionViewer.cxx	2016-12-06 12:46:10.327969384 +0100
-@@ -5812,14 +5812,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+		         TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/html/src/THtml.cxx root-6.08.02/html/src/THtml.cxx
---- root-6.08.02.orig/html/src/THtml.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/html/src/THtml.cxx	2016-12-06 12:46:10.328969373 +0100
-@@ -1349,18 +1349,7 @@
-    R__LOCKGUARD(GetMakeClassMutex());
- 
-    fPathInfo.fEtcDir = "html";
--
--#ifdef ROOTETCDIR
--   gSystem->PrependPathName(ROOTETCDIR, fPathInfo.fEtcDir);
--#else
--   gSystem->PrependPathName("etc", fPathInfo.fEtcDir);
--# ifdef ROOTPREFIX
--   gSystem->PrependPathName(ROOTPREFIX, fPathInfo.fEtcDir);
--# else
--   if (getenv("ROOTSYS"))
--      gSystem->PrependPathName(getenv("ROOTSYS"), fPathInfo.fEtcDir);
--# endif
--#endif
-+   gSystem->PrependPathName(TROOT::GetEtcDir(), fPathInfo.fEtcDir);
- 
-    return fPathInfo.fEtcDir;
- }
-@@ -1669,12 +1658,7 @@
-                   if (posSpace != std::string::npos)
-                      lib.erase(posSpace);
-                   if (rootLibs.find(lib) == rootLibs.end()) {
--#ifdef ROOTLIBDIR
--                     TString rootlibdir = ROOTLIBDIR;
--#else
--                     TString rootlibdir = "lib";
--                     gSystem->PrependPathName(gRootDir, rootlibdir);
--#endif
-+                     TString rootlibdir = TROOT::GetLibDir();
-                      TString sLib(lib);
-                      if (sLib.Index('.') == -1) {
-                         sLib += ".";
-diff -Nur root-6.08.02.orig/io/io/src/TFile.cxx root-6.08.02/io/io/src/TFile.cxx
---- root-6.08.02.orig/io/io/src/TFile.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/io/io/src/TFile.cxx	2016-12-06 12:46:10.328969373 +0100
-@@ -3098,11 +3098,7 @@
-          return;
-       }
-       // Get Makefile.arch
--#ifdef ROOTETCDIR
--      TString mkarchsrc = TString::Format("%s/Makefile.arch", ROOTETCDIR);
--#else
--      TString mkarchsrc("$(ROOTSYS)/etc/Makefile.arch");
--#endif
-+      TString mkarchsrc = TString::Format("%s/Makefile.arch", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(mkarchsrc))
-          Warning("MakeProject", "problems expanding '%s'", mkarchsrc.Data());
-       TString mkarchdst = TString::Format("%s/Makefile.arch", clean_dirname.Data());
-diff -Nur root-6.08.02.orig/main/CMakeLists.txt root-6.08.02/main/CMakeLists.txt
---- root-6.08.02.orig/main/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/main/CMakeLists.txt	2016-12-06 12:46:10.329969362 +0100
-@@ -40,7 +40,7 @@
-   endforeach()
- 
-   install(FILES python/cmdLineUtils.py DESTINATION ${runtimedir})
--  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
--  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${runtimedir}/cmdLineUtils.py )")
--  configure_file(python/cmdLineUtils.py ${CMAKE_BINARY_DIR}/${runtimedir}/cmdLineUtils.py @ONLY)
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
-+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile \$ENV{DESTDIR}${runtimedir}/cmdLineUtils.py)")
-+  configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
- endif()
-diff -Nur root-6.08.02.orig/main/src/nbmain.cxx root-6.08.02/main/src/nbmain.cxx
---- root-6.08.02.orig/main/src/nbmain.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/main/src/nbmain.cxx	2016-12-06 12:46:10.329969362 +0100
-@@ -173,15 +173,9 @@
- 
- int main()
- {
--#ifdef ROOTPREFIX
--   string rootbin(ROOTBINDIR);
--   string rootlib(ROOTLIBDIR);
--   string rootetc(ROOTETCDIR);
--#else
--   string rootbin(getenv("ROOTSYS") + pathsep + "bin");
--   string rootlib(getenv("ROOTSYS") + pathsep + "lib");
--   string rootetc(getenv("ROOTSYS") + pathsep + "etc");
--#endif
-+   string rootbin(TROOT::GetBinDir());
-+   string rootlib(TROOT::GetLibDir());
-+   string rootetc(TROOT::GetEtcDir());
- 
-    // If needed, install ROOT notebook files in the user's home directory
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/Makefile root-6.08.02/Makefile
---- root-6.08.02.orig/Makefile	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/Makefile	2016-12-06 12:46:10.336969282 +0100
-@@ -708,11 +708,9 @@
- .NOTPARALLEL:
- endif
- 
--ifeq ($(USECONFIG),FALSE)
- all: tutorials/hsimple.root
- tutorials/hsimple.root: rootexecs postbin
--	@(cd tutorials; ! ../bin/root -l -q -b -n -x hsimple.C)
--endif
-+	@(cd tutorials; ! ROOTIGNOREPREFIX=1 ../bin/root -l -q -b -n -x hsimple.C)
- 
- all:            rootexecs postbin
- 	@echo " "
-@@ -1152,7 +1150,7 @@
- 
- $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
- 	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(ROOTCLING_CXXFLAGS)
--	@$(MAKEPCH) $@
-+	@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@
- 
- $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
- 	@mkdir -p $(dir $@)
-@@ -1257,8 +1255,6 @@
- 	   $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \
- 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
- 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
--	   (cd $(DESTDIR)$(TUTDIR); \
--	      ! LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
- 	fi
- 
- uninstall:
-@@ -1385,7 +1381,6 @@
- 		--exclude proofd.xinetd \
- 		--exclude rootd.rc.d \
- 		--exclude rootd.xinetd \
--		--exclude gitinfo.txt \
- 		$(ROOT_SRCDIR)/etc . ; \
- 	echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \
- 	$(RSYNC) \
-diff -Nur root-6.08.02.orig/math/mathcore/src/Integrator.cxx root-6.08.02/math/mathcore/src/Integrator.cxx
---- root-6.08.02.orig/math/mathcore/src/Integrator.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/math/mathcore/src/Integrator.cxx	2016-12-06 12:46:10.336969282 +0100
-@@ -22,9 +22,6 @@
- 
- 
- #include "RConfigure.h"
--// #ifndef ROOTINCDIR
--// #define MATH_NO_PLUGIN_MANAGER
--// #endif
- 
- #include <algorithm>
- #include <functional>
-diff -Nur root-6.08.02.orig/montecarlo/eg/src/TDatabasePDG.cxx root-6.08.02/montecarlo/eg/src/TDatabasePDG.cxx
---- root-6.08.02.orig/montecarlo/eg/src/TDatabasePDG.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/montecarlo/eg/src/TDatabasePDG.cxx	2016-12-06 12:46:10.336969282 +0100
-@@ -564,11 +564,8 @@
-    const char *fn;
- 
-    if (!FileName[0]) {
--#ifdef ROOTETCDIR
--      default_name.Form("%s/pdg_table.txt", ROOTETCDIR);
--#else
--      default_name.Form("%s/etc/pdg_table.txt", gSystem->Getenv("ROOTSYS"));
--#endif
-+      default_name = "pdg_table.txt";
-+      gSystem->PrependPathName(TROOT::GetEtcDir(), default_name);
-       fn = gEnv->GetValue("Root.DatabasePDG", default_name.Data());
-    } else {
-       fn = FileName;
-diff -Nur root-6.08.02.orig/net/auth/CMakeLists.txt root-6.08.02/net/auth/CMakeLists.txt
---- root-6.08.02.orig/net/auth/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/auth/CMakeLists.txt	2016-12-06 12:46:10.336969282 +0100
-@@ -23,7 +23,6 @@
- add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsalib.cxx
-                        ${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
--add_dependencies(rsa move_headers)
- 
- if(ssl)
-   include_directories(${OPENSSL_INCLUDE_DIR})
-diff -Nur root-6.08.02.orig/net/auth/src/DaemonUtils.cxx root-6.08.02/net/auth/src/DaemonUtils.cxx
---- root-6.08.02.orig/net/auth/src/DaemonUtils.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/auth/src/DaemonUtils.cxx	2016-12-06 12:46:10.337969271 +0100
-@@ -95,18 +95,8 @@
- {
-    // Executables and conf dirs
- 
--   string execdir, etcdir;
--#ifdef ROOTBINDIR
--   execdir = string(ROOTBINDIR);
--#endif
--#ifdef ROOTETCDIR
--   etcdir = string(ROOTETCDIR);
--#endif
--
--   // Define rootbindir if not done already
--   if (!execdir.length())
--      execdir = string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-+   string execdir = TROOT::GetBinDir().Data();
-    if (execdir.length()) {
-       int len = 15 + execdir.length();
-       char *tmp = new char[len+1];
-@@ -117,10 +107,8 @@
-          return -1;
-    }
- 
--   // Define rootetcdir if not done already
--   if (!etcdir.length())
--      etcdir = string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-+   string etcdir = TROOT::GetEtcDir().Data();
-    if (etcdir.length()) {
-       int len = 15 + etcdir.length();
-       char *tmp = new char[len+1];
-diff -Nur root-6.08.02.orig/net/auth/src/TAuthenticate.cxx root-6.08.02/net/auth/src/TAuthenticate.cxx
---- root-6.08.02.orig/net/auth/src/TAuthenticate.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/auth/src/TAuthenticate.cxx	2016-12-06 12:46:10.338969260 +0100
-@@ -4107,19 +4107,9 @@
-          ::Info("TAuthenticate::ReadRootAuthrc",
-                 "file %s cannot be read (errno: %d)", authrc, errno);
-       delete [] authrc;
--#ifdef ROOTETCDIR
--      authrc = gSystem->ConcatFileName(ROOTETCDIR,"system.rootauthrc");
--#else
--      char etc[1024];
--#ifdef WIN32
--      snprintf(etc, 1024, "%s\\etc", gRootDir);
--#else
--      snprintf(etc, 1024, "%s/etc", gRootDir);
--#endif
--      authrc = gSystem->ConcatFileName(etc,"system.rootauthrc");
--#endif
-+      authrc = gSystem->ConcatFileName(TROOT::GetEtcDir(), "system.rootauthrc");
-       if (gDebug > 2)
--         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file:%s",authrc);
-+         ::Info("TAuthenticate::ReadRootAuthrc", "Checking system file: %s", authrc);
-       if (gSystem->AccessPathName(authrc, kReadPermission)) {
-          if (gDebug > 1)
-             ::Info("TAuthenticate::ReadRootAuthrc",
-diff -Nur root-6.08.02.orig/net/http/src/THttpServer.cxx root-6.08.02/net/http/src/THttpServer.cxx
---- root-6.08.02.orig/net/http/src/THttpServer.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/http/src/THttpServer.cxx	2016-12-06 12:46:10.338969260 +0100
-@@ -148,11 +148,7 @@
-    if (jsrootsys != 0) fJSROOTSYS = jsrootsys;
- 
-    if (fJSROOTSYS.Length() == 0) {
--#ifdef ROOTETCDIR
--      TString jsdir = TString::Format("%s/http", ROOTETCDIR);
--#else
--      TString jsdir("$(ROOTSYS)/etc/http");
--#endif
-+      TString jsdir = TString::Format("%s/http", TROOT::GetEtcDir().Data());
-       if (gSystem->ExpandPathName(jsdir)) {
-          Warning("THttpServer", "problems resolving '%s', use JSROOTSYS to specify $ROOTSYS/etc/http location", jsdir.Data());
-          fJSROOTSYS = ".";
-@@ -163,18 +159,7 @@
- 
-    AddLocation("currentdir/", ".");
-    AddLocation("jsrootsys/", fJSROOTSYS);
--
--   const char *rootsys = gSystem->Getenv("ROOTSYS");
--   if (rootsys != 0) {
--      AddLocation("rootsys/", rootsys);
--   } else {
--#ifdef ROOTPREFIX
--      TString sysdir = ROOTPREFIX;
--#else
--      TString sysdir = "$(ROOTSYS)";
--#endif
--      if (!gSystem->ExpandPathName(sysdir)) AddLocation("rootsys/", sysdir);
--   }
-+   AddLocation("rootsys/", TROOT::GetRootSys());
- 
-    fDefaultPage = fJSROOTSYS + "/files/online.htm";
-    fDrawPage = fJSROOTSYS + "/files/draw.htm";
-diff -Nur root-6.08.02.orig/net/net/src/TApplicationServer.cxx root-6.08.02/net/net/src/TApplicationServer.cxx
---- root-6.08.02.orig/net/net/src/TApplicationServer.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/net/src/TApplicationServer.cxx	2016-12-06 12:46:10.338969260 +0100
-@@ -1275,17 +1275,7 @@
-    TString name = ".rootlogon.C";
-    TString sname = "system";
-    sname += name;
--#ifdef ROOTETCDIR
--   char *s = gSystem->ConcatFileName(ROOTETCDIR, sname);
--#else
--   TString etc = gRootDir;
--#ifdef WIN32
--   etc += "\\etc";
--#else
--   etc += "/etc";
--#endif
--   char *s = gSystem->ConcatFileName(etc, sname);
--#endif
-+   char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sname);
-    if (!gSystem->AccessPathName(s, kReadPermission)) {
-       ProcessFile(s);
-    }
-diff -Nur root-6.08.02.orig/net/net/src/TServerSocket.cxx root-6.08.02/net/net/src/TServerSocket.cxx
---- root-6.08.02.orig/net/net/src/TServerSocket.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/net/src/TServerSocket.cxx	2016-12-06 12:46:10.338969260 +0100
-@@ -335,22 +335,7 @@
-       }
-    }
- 
--   TString confdir;
--#ifndef ROOTPREFIX
--   // try to guess the config directory...
--   if (gSystem->Getenv("ROOTSYS")) {
--      confdir = TString(gSystem->Getenv("ROOTSYS"));
--   } else {
--      // Try to guess it from 'root.exe' path
--      char *rootexe = gSystem->Which(gSystem->Getenv("PATH"),
--                                     "root.exe", kExecutePermission);
--      confdir = rootexe;
--      confdir.Resize(confdir.Last('/'));
--      delete [] rootexe;
--   }
--#else
--   confdir = TString(ROOTPREFIX);
--#endif
-+   TString confdir = TROOT::GetRootSys();
-    if (!confdir.Length()) {
-       Error("Authenticate", "config dir undefined");
-       return kFALSE;
-diff -Nur root-6.08.02.orig/net/rootd/src/rootd.cxx root-6.08.02/net/rootd/src/rootd.cxx
---- root-6.08.02.orig/net/rootd/src/rootd.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/rootd/src/rootd.cxx	2016-12-06 12:46:10.339969248 +0100
-@@ -2523,10 +2523,13 @@
- 
-    if (argc > 0) {
-       confdir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTPREFIX
-+   }
-+
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-       if (!confdir.length()) {
-+         // try to guess the config directory...
-          if (getenv("ROOTSYS")) {
-             confdir = getenv("ROOTSYS");
-             if (gDebug > 0)
-@@ -2537,31 +2540,26 @@
-                ErrorInfo("main: no config directory specified");
-          }
-       }
--#else
--      confdir = ROOTPREFIX;
--#endif
-+      rootbindir = std::string(confdir).append("/bin");
-+      rootetcdir = std::string(confdir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else {
-+      if (!confdir.length())
-+         confdir = ROOTPREFIX;
-+      rootbindir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-    }
--#ifdef ROOTBINDIR
--   rootbindir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
- #endif
- 
--   // Define rootbindir if not done already
--   if (!rootbindir.length())
--      rootbindir = std::string(confdir).append("/bin");
--   // Make it available to all the session via env
-+   // Make rootbindir available to all the session via env
-    if (rootbindir.length()) {
-       char *tmp1 = new char[15 + rootbindir.length()];
-       sprintf(tmp1, "ROOTBINDIR=%s", rootbindir.c_str());
-       putenv(tmp1);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(confdir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp1 = new char[15 + rootetcdir.length()];
-       sprintf(tmp1, "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.08.02.orig/net/rpdutils/CMakeLists.txt root-6.08.02/net/rpdutils/CMakeLists.txt
---- root-6.08.02.orig/net/rpdutils/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/net/rpdutils/CMakeLists.txt	2016-12-06 12:46:10.339969248 +0100
-@@ -31,7 +31,6 @@
- 
- #---static library needed for rootd and proofd --------------------------------------------
- add_library(rpdutil STATIC ${rpdutilsrcs})
--add_dependencies(rpdutil move_headers)
- 
- ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx LIBRARIES rpdutil rsa ${CRYPTLIBS} ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} DEPENDENCIES Net)
- 
-diff -Nur root-6.08.02.orig/proof/proof/src/TProofLite.cxx root-6.08.02/proof/proof/src/TProofLite.cxx
---- root-6.08.02.orig/proof/proof/src/TProofLite.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proof/src/TProofLite.cxx	2016-12-06 12:46:10.340969237 +0100
-@@ -409,17 +409,7 @@
-    if (fgWrksMax == -2) {
-       // Find the max number of workers, if any
-       TString sysname = "system.rootrc";
--#ifdef ROOTETCDIR
--      char *s = gSystem->ConcatFileName(ROOTETCDIR, sysname);
--#else
--      TString etc = gRootDir;
--#ifdef WIN32
--      etc += "\\etc";
--#else
--      etc += "/etc";
--#endif
--      char *s = gSystem->ConcatFileName(etc, sysname);
--#endif
-+      char *s = gSystem->ConcatFileName(TROOT::GetEtcDir(), sysname);
-       TEnv sysenv(0);
-       sysenv.ReadFile(s, kEnvGlobal);
-       fgWrksMax = sysenv.GetValue("ProofLite.MaxWorkers", -1);
-@@ -765,17 +755,9 @@
-       return -1;
-    }
-    // ROOTSYS
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTSYS=%s\n", ROOTPREFIX);
--#else
--   fprintf(fenv, "export ROOTSYS=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTSYS=%s\n", TROOT::GetRootSys().Data());
-    // Conf dir
--#ifdef R__HAVE_CONFIG
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", ROOTETCDIR);
--#else
--   fprintf(fenv, "export ROOTCONFDIR=%s\n", gSystem->Getenv("ROOTSYS"));
--#endif
-+   fprintf(fenv, "export ROOTCONFDIR=%s\n", TROOT::GetRootSys().Data());
-    // TMPDIR
-    fprintf(fenv, "export TMPDIR=%s\n", gSystem->TempDirectory());
-    // Log file in the log dir
-diff -Nur root-6.08.02.orig/proof/proof/src/TProofServ.cxx root-6.08.02/proof/proof/src/TProofServ.cxx
---- root-6.08.02.orig/proof/proof/src/TProofServ.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proof/src/TProofServ.cxx	2016-12-06 12:46:10.341969226 +0100
-@@ -2964,13 +2964,7 @@
- #ifdef R__UNIX
-    // Add bindir to PATH
-    TString path(gSystem->Getenv("PATH"));
--   TString bindir;
--# ifdef ROOTBINDIR
--   bindir = ROOTBINDIR;
--# else
--   bindir = gSystem->Getenv("ROOTSYS");
--   if (!bindir.IsNull()) bindir += "/bin";
--# endif
-+   TString bindir(TROOT::GetBinDir());
-    // Augment PATH, if required
-    // ^<compiler>, <compiler>, ^<sysbin>, <sysbin>
-    TString paths = gEnv->GetValue("ProofServ.BinPaths", "");
-diff -Nur root-6.08.02.orig/proof/proof/src/TSlaveLite.cxx root-6.08.02/proof/proof/src/TSlaveLite.cxx
---- root-6.08.02.orig/proof/proof/src/TSlaveLite.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proof/src/TSlaveLite.cxx	2016-12-06 12:46:10.341969226 +0100
-@@ -88,13 +88,8 @@
- {
-    // Command to be executed
-    TString cmd;
--#ifdef R__HAVE_CONFIG
-    cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s\"; %s/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), ROOTBINDIR, ROOTBINDIR,
--#else
--   cmd.Form(". %s/worker-%s.env; export ROOTBINDIR=\"%s/bin\"; %s/bin/proofserv proofslave lite %d %d 0&",
--            fWorkDir.Data(), fOrdinal.Data(), gSystem->Getenv("ROOTSYS"), gSystem->Getenv("ROOTSYS"),
--#endif
-+            fWorkDir.Data(), fOrdinal.Data(), TROOT::GetBinDir().Data(), TROOT::GetBinDir().Data(),
-             gSystem->GetPid(), gDebug);
-    // Execute
-    if (gSystem->Exec(cmd) != 0) {
-diff -Nur root-6.08.02.orig/proof/proofbench/CMakeLists.txt root-6.08.02/proof/proofbench/CMakeLists.txt
---- root-6.08.02.orig/proof/proofbench/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofbench/CMakeLists.txt	2016-12-06 12:46:10.341969226 +0100
-@@ -14,7 +14,7 @@
- # Generation and installation of the PAR files required by the benchmark 
- add_custom_target(ProofBenchPARFiles ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                                                  ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par)
--add_dependencies(ProofBenchPARFiles move_headers) # The /etc directory from sources is copied when moving the headers
-+add_dependencies(ProofBenchPARFiles move_artifacts)
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchCPUSel.par
-                           ${CMAKE_BINARY_DIR}/etc/proof/proofbench/ProofBenchDataSel.par
-     COMMAND etc/proof/utils/makepbenchpars.sh ARGS ProofBenchCPUSel ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
-diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBench.cxx root-6.08.02/proof/proofbench/src/TProofBench.cxx
---- root-6.08.02.orig/proof/proofbench/src/TProofBench.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofbench/src/TProofBench.cxx	2016-12-06 12:46:10.342969214 +0100
-@@ -1338,11 +1338,7 @@
-       // Is it the default selector?
-       if (fDataGenSel == kPROOF_BenchSelDataGenDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("MakeDataSet", "uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("MakeDataSet", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx root-6.08.02/proof/proofbench/src/TProofBenchDataSet.cxx
---- root-6.08.02.orig/proof/proofbench/src/TProofBenchDataSet.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofbench/src/TProofBenchDataSet.cxx	2016-12-06 12:46:10.342969214 +0100
-@@ -25,6 +25,7 @@
- #include "TMap.h"
- #include "TProof.h"
- #include "TProofBenchTypes.h"
-+#include "TROOT.h"
- 
- 
- ClassImp(TProofBenchDataSet)
-@@ -144,11 +145,7 @@
-    TString selName("TSelHandleDataSet");
-    if (!TClass::GetClass(selName)) {
-       // Load the parfile
--#ifdef R__HAVE_CONFIG
--      TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--      TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+      TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-       Info("Handle", "Uploading '%s' ...", par.Data());
-       if (fProof->UploadPackage(par) != 0) {
-          Error("Handle", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx root-6.08.02/proof/proofbench/src/TProofBenchRunCPU.cxx
---- root-6.08.02.orig/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofbench/src/TProofBenchRunCPU.cxx	2016-12-06 12:46:10.342969214 +0100
-@@ -274,11 +274,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelCPUDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchCPUSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.08.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx root-6.08.02/proof/proofbench/src/TProofBenchRunDataRead.cxx
---- root-6.08.02.orig/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofbench/src/TProofBenchRunDataRead.cxx	2016-12-06 12:46:10.342969214 +0100
-@@ -162,11 +162,7 @@
-       // Is it the default selector?
-       if (fSelName == kPROOF_BenchSelDataDef) {
-          // Load the parfile
--#ifdef R__HAVE_CONFIG
--         TString par = TString::Format("%s/%s%s.par", ROOTETCDIR, kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#else
--         TString par = TString::Format("$ROOTSYS/etc/%s%s.par", kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
--#endif
-+         TString par = TString::Format("%s/%s%s.par", TROOT::GetEtcDir().Data(), kPROOF_BenchParDir, kPROOF_BenchDataSelPar);
-          Info("Run", "Uploading '%s' ...", par.Data());
-          if (fProof->UploadPackage(par) != 0) {
-             Error("Run", "problems uploading '%s' - cannot continue", par.Data());
-diff -Nur root-6.08.02.orig/proof/proofd/src/proofd.cxx root-6.08.02/proof/proofd/src/proofd.cxx
---- root-6.08.02.orig/proof/proofd/src/proofd.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofd/src/proofd.cxx	2016-12-06 12:46:10.343969203 +0100
-@@ -1001,49 +1001,48 @@
- 
-    if (argc > 0) {
-       gConfDir = std::string(*argv);
--   } else {
--      // try to guess the config directory...
--#ifndef ROOTDATADIR
--      if (getenv("ROOTSYS")) {
--         gConfDir = getenv("ROOTSYS");
--         if (gDebug > 0)
--            ErrorInfo("main: no config directory specified using ROOTSYS (%s)",
--                      gConfDir.c_str());
--      } else {
--         Error(ErrFatal, -1, "main: no config directory specified");
--      }
--#else
--      gConfDir = ROOTDATADIR;
--#endif
-    }
--#ifdef ROOTBINDIR
--   gRootBinDir= ROOTBINDIR;
--#endif
--#ifdef ROOTETCDIR
--   rootetcdir= ROOTETCDIR;
--#endif
- 
--   // Define gRootBinDir if not done already
--   if (!gRootBinDir.length())
-+#ifdef ROOTPREFIX
-+   if (getenv("IGNOREROOTPREFIX")) {
-+#endif
-+      if (!gConfDir.length()) {
-+         // try to guess the config directory...
-+         if (getenv("ROOTSYS")) {
-+            gConfDir = getenv("ROOTSYS");
-+            if (gDebug > 0)
-+               ErrorInfo("main: no config directory specified using"
-+                         " ROOTSYS (%s)", gConfDir.c_str());
-+         } else {
-+            Error(ErrFatal, -1, "main: no config directory specified");
-+         }
-+      }
-       gRootBinDir = std::string(gConfDir).append("/bin");
-+      rootetcdir = std::string(gConfDir).append("/etc");
-+#ifdef ROOTPREFIX
-+   }
-+   else  {
-+      if (!gConfDir.length())
-+         gConfDir = ROOTPREFIX;
-+      gRootBinDir = ROOTBINDIR;
-+      rootetcdir = ROOTETCDIR;
-+   }
-+#endif
- 
--   // make sure it contains the executable we want to run
-+   // make sure gRootBinDir contains the executable we want to run
-    std::string arg0 = std::string(gRootBinDir).append("/proofserv");
-    if (access(arg0.c_str(), X_OK) == -1) {
-       Error(ErrFatal,-1,"main: incorrect config directory specified (%s)",
-                         gConfDir.c_str());
-    }
--   // Make it available to all the session via env
-+   // Make gRootBinDir available to all the session via env
-    if (gRootBinDir.length()) {
-       char *tmp = new char[15 + gRootBinDir.length()];
-       snprintf(tmp, 15 + gRootBinDir.length(), "ROOTBINDIR=%s", gRootBinDir.c_str());
-       putenv(tmp);
-    }
- 
--   // Define rootetcdir if not done already
--   if (!rootetcdir.length())
--      rootetcdir = std::string(gConfDir).append("/etc");
--   // Make it available to all the session via env
-+   // Make rootetcdir available to all the session via env
-    if (rootetcdir.length()) {
-       char *tmp = new char[15 + rootetcdir.length()];
-       snprintf(tmp, 15 + rootetcdir.length(), "ROOTETCDIR=%s", rootetcdir.c_str());
-diff -Nur root-6.08.02.orig/proof/proofd/src/XrdROOT.cxx root-6.08.02/proof/proofd/src/XrdROOT.cxx
---- root-6.08.02.orig/proof/proofd/src/XrdROOT.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/proof/proofd/src/XrdROOT.cxx	2016-12-06 12:46:10.343969203 +0100
-@@ -384,11 +384,19 @@
-    } else {
-       // Check the ROOT dirs
-       if (fROOT.size() <= 0) {
-+         XrdOucString dir, bd, ld, id, dd;
- #ifdef R__HAVE_CONFIG
--         XrdOucString dir(ROOTPREFIX), bd(ROOTBINDIR), ld(ROOTLIBDIR),
--                      id(ROOTINCDIR), dd(ROOTDATADIR);
--#else
--         XrdOucString dir(getenv("ROOTSYS")), bd, ld, id, dd;
-+         if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+            dir = getenv("ROOTSYS");
-+#ifdef R__HAVE_CONFIG
-+         else {
-+            dir = ROOTPREFIX;
-+            bd = ROOTBINDIR;
-+            ld = ROOTLIBDIR;
-+            id = ROOTINCDIR;
-+            dd = ROOTDATADIR;
-+         }
- #endif
-          // None defined: use ROOTSYS as default, if any; otherwise we fail
-          if (dir.length() > 0) {
-diff -Nur root-6.08.02.orig/roofit/histfactory/CMakeLists.txt root-6.08.02/roofit/histfactory/CMakeLists.txt
---- root-6.08.02.orig/roofit/histfactory/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/roofit/histfactory/CMakeLists.txt	2016-12-06 12:46:10.343969203 +0100
-@@ -25,10 +25,4 @@
-                             WORLD_EXECUTE WORLD_READ
-                 DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/HistFactory/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats/HistFactory 
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.08.02.orig/roofit/histfactory/config/prepareHistFactory root-6.08.02/roofit/histfactory/config/prepareHistFactory
---- root-6.08.02.orig/roofit/histfactory/config/prepareHistFactory	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/roofit/histfactory/config/prepareHistFactory	2016-12-06 12:46:10.343969203 +0100
-@@ -2,16 +2,10 @@
- 
- # HistFactory workplace setup script
- 
--ROOTPREFDIR=`root-config --prefix`
--ROOTETCDIR=`root-config --etcdir`
-+ROOTETCDIR=`root -b -q -l -n -e "std::cout << TROOT::GetEtcDir() << std::endl;" | tail -1`
- echo "Using etcdir "$ROOTETCDIR
--ROOTTUTDIR=$ROOTPREFDIR/tutorials
--if test -e $ROOTTUTDIR; then
--    echo "Using tutorials dir" $ROOTTUTDIR 
--else     
--    ROOTTUTDIR=${ROOTPREFDIR}/share/doc/root/tutorials
--    echo "Using tutorials dir" $ROOTTUTDIR 
--fi
-+ROOTTUTDIR=`root -b -q -l -n -e "std::cout << TROOT::GetTutorialDir() << std::endl;" | tail -1`
-+echo "Using tutorials dir" $ROOTTUTDIR 
- 
- if [ $# -eq 1 ]
- then
-diff -Nur root-6.08.02.orig/roofit/roostats/CMakeLists.txt root-6.08.02/roofit/roostats/CMakeLists.txt
---- root-6.08.02.orig/roofit/roostats/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/roofit/roostats/CMakeLists.txt	2016-12-06 12:46:10.344969192 +0100
-@@ -8,9 +8,4 @@
- ROOT_LINKER_LIBRARY(RooStats  *.cxx G__RooStats.cxx LIBRARIES Core 
-                                DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
- 
--#ROOT_INSTALL_HEADERS()
--install(DIRECTORY inc/RooStats/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/RooStats
--                       COMPONENT headers
--                       PATTERN ".svn" EXCLUDE
--                       REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
-diff -Nur root-6.08.02.orig/rootx/src/rootx.cxx root-6.08.02/rootx/src/rootx.cxx
---- root-6.08.02.orig/rootx/src/rootx.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/rootx/src/rootx.cxx	2016-12-06 12:46:10.344969192 +0100
-@@ -218,7 +218,6 @@
-    return 0;
- }
- 
--#ifndef ROOTPREFIX
- static const char *GetExePath()
- {
-    static std::string exepath;
-@@ -265,7 +264,6 @@
-       delete [] ep;
-    }
- }
--#endif
- 
- static void SetDisplay()
- {
-@@ -314,7 +312,9 @@
- 
- static void SetLibraryPath()
- {
--#ifndef ROOTLIBDIR
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Set library path for the different platforms.
- 
-    char *msg;
-@@ -361,6 +361,8 @@
-    }
- #  endif
-    putenv(msg);
-+#ifdef ROOTPREFIX
-+   }
- #endif
- }
- 
-@@ -458,7 +460,9 @@
-    char **argvv;
-    char  arg0[kMAXPATHLEN];
- 
--#ifndef ROOTPREFIX
-+#ifdef ROOTPREFIX
-+   if (getenv("ROOTIGNOREPREFIX")) {
-+#endif
-    // Try to set ROOTSYS depending on pathname of the executable
-    SetRootSys();
- 
-@@ -467,6 +471,8 @@
-               argv[0], argv[0]);
-       return 1;
-    }
-+#ifdef ROOTPREFIX
-+   }
- #endif
- 
-    // In batch mode don't show splash screen, idem for no logo mode,
-@@ -491,23 +497,20 @@
-    if (notebook) {
-       // Build command
- #ifdef ROOTBINDIR
--      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
--#else
--      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+      if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+         snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTNBBINARY);
-+#ifdef ROOTBINDIR
-+      else
-+         snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTNBBINARY);
- #endif
- 
-       // Execute ROOT notebook binary
-       execl(arg0, arg0, NULL);
--  
-+
-       // Exec failed
--#ifndef ROOTBINDIR
--      fprintf(stderr,
--              "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/bin/%s exists\n",
--              argv[0], getenv("ROOTSYS"), ROOTNBBINARY);
--#else
--      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s/%s exists\n",
--              argv[0], ROOTBINDIR, ROOTNBBINARY);
--#endif
-+      fprintf(stderr, "%s: can't start ROOT notebook -- this option is only available when building with CMake, please check that %s exists\n",
-+              argv[0], arg0);
- 
-       return 1;
-    }
-@@ -604,9 +607,12 @@
-    // Build argv vector
-    argvv = new char* [argc+2];
- #ifdef ROOTBINDIR
--   snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
--#else
--   snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+   if (getenv("ROOTIGNOREPREFIX"))
-+#endif
-+      snprintf(arg0, sizeof(arg0), "%s/bin/%s", getenv("ROOTSYS"), ROOTBINARY);
-+#ifdef ROOTBINDIR
-+   else
-+      snprintf(arg0, sizeof(arg0), "%s/%s", ROOTBINDIR, ROOTBINARY);
- #endif
-    argvv[0] = arg0;
-    argvv[1] = (char *) "-splash";
-@@ -622,14 +628,8 @@
-    execv(arg0, argvv);
- 
-    // Exec failed
--#ifndef ROOTBINDIR
--   fprintf(stderr,
--           "%s: can't start ROOT -- check that %s/bin/%s exists!\n",
--           argv[0], getenv("ROOTSYS"), ROOTBINARY);
--#else
--   fprintf(stderr, "%s: can't start ROOT -- check that %s/%s exists!\n",
--           argv[0], ROOTBINDIR, ROOTBINARY);
--#endif
-+   fprintf(stderr, "%s: can't start ROOT -- check that %s exists!\n",
-+           argv[0], arg0);
- 
-    return 1;
- }
-diff -Nur root-6.08.02.orig/test/rhtml/rhtml.cxx root-6.08.02/test/rhtml/rhtml.cxx
---- root-6.08.02.orig/test/rhtml/rhtml.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/test/rhtml/rhtml.cxx	2016-12-06 12:46:10.344969192 +0100
-@@ -475,14 +475,7 @@
-                   case M_HELP_ABOUT:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/test/RootIDE/TGRootIDE.cxx root-6.08.02/test/RootIDE/TGRootIDE.cxx
---- root-6.08.02.orig/test/RootIDE/TGRootIDE.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/test/RootIDE/TGRootIDE.cxx	2016-12-06 12:46:10.344969192 +0100
-@@ -1270,14 +1270,7 @@
- void TGRootIDE::About()
- {
- #ifdef R__UNIX
--   TString rootx;
--# ifdef ROOTBINDIR
--   rootx = ROOTBINDIR;
--# else
--   rootx = gSystem->Getenv("ROOTSYS");
--   if (!rootx.IsNull()) rootx += "/bin";
--# endif
--   rootx += "/root -a &";
-+   TString rootx = TROOT::GetBinDir() + "/root -a &";
-    gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/tmva/tmva/CMakeLists.txt root-6.08.02/tmva/tmva/CMakeLists.txt
---- root-6.08.02.orig/tmva/tmva/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tmva/tmva/CMakeLists.txt	2016-12-06 12:46:10.345969180 +0100
-@@ -79,11 +79,7 @@
-                     LIBRARIES Core ${DNN_CUDA_LIBRARIES} ${DNN_CPU_LIBRARIES}
-                     DEPENDENCIES RIO Hist Tree TreePlayer MLP Minuit XMLIO)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.08.02.orig/tmva/tmvagui/CMakeLists.txt root-6.08.02/tmva/tmvagui/CMakeLists.txt
---- root-6.08.02.orig/tmva/tmvagui/CMakeLists.txt	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tmva/tmvagui/CMakeLists.txt	2016-12-06 12:46:10.345969180 +0100
-@@ -31,11 +31,7 @@
- ROOT_LINKER_LIBRARY(TMVAGui *.cxx G__TMVAGui.cxx LIBRARIES Core
-                     DEPENDENCIES RIO Hist Tree TreeViewer  MLP Minuit XMLIO TMVA Gui)
- 
--install(DIRECTORY inc/TMVA/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TMVA
--                            COMPONENT headers
--                            PATTERN ".svn" EXCLUDE
--                            REGEX "LinkDef" EXCLUDE )
--set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-+ROOT_INSTALL_HEADERS()
- 
- if(NOT gnuinstall)
-   install(DIRECTORY test DESTINATION tmva 
-diff -Nur root-6.08.02.orig/tree/treeviewer/src/TTreeViewer.cxx root-6.08.02/tree/treeviewer/src/TTreeViewer.cxx
---- root-6.08.02.orig/tree/treeviewer/src/TTreeViewer.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tree/treeviewer/src/TTreeViewer.cxx	2016-12-06 12:46:10.345969180 +0100
-@@ -2048,14 +2048,7 @@
-                   case kHelpAbout:
-                      {
- #ifdef R__UNIX
--                        TString rootx;
--# ifdef ROOTBINDIR
--                        rootx = ROOTBINDIR;
--# else
--                        rootx = gSystem->Getenv("ROOTSYS");
--                        if (!rootx.IsNull()) rootx += "/bin";
--# endif
--                        rootx += "/root -a &";
-+                        TString rootx = TROOT::GetBinDir() + "/root -a &";
-                         gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/tutorials/eve/SplitGLView.C root-6.08.02/tutorials/eve/SplitGLView.C
---- root-6.08.02.orig/tutorials/eve/SplitGLView.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/eve/SplitGLView.C	2016-12-06 12:46:10.346969169 +0100
-@@ -291,8 +291,7 @@
-    const char *str = fText.Data();
-    char *string = strdup(str);
-    Int_t nlines = 0, size = fTextH;
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString ar = fp + "/arial.ttf";
-+   TString ar = "arial.ttf";
-    char *s = strtok((char *)string, "\n");
-    TImage *img = (TImage*)fImage->Clone("img");
-    img->DrawText(fTextX, fTextY+(nlines*size), s, size, fTextCol, ar);
-@@ -1020,14 +1019,7 @@
-       case kHelpAbout:
-          {
- #ifdef R__UNIX
--            TString rootx;
--# ifdef ROOTBINDIR
--            rootx = ROOTBINDIR;
--# else
--            rootx = gSystem->Getenv("ROOTSYS");
--            if (!rootx.IsNull()) rootx += "/bin";
--# endif
--            rootx += "/root -a &";
-+            TString rootx = TROOT::GetBinDir() + "/root -a &";
-             gSystem->Exec(rootx);
- #else
- #ifdef WIN32
-diff -Nur root-6.08.02.orig/tutorials/fit/fit1.C root-6.08.02/tutorials/fit/fit1.C
---- root-6.08.02.orig/tutorials/fit/fit1.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/fit/fit1.C	2016-12-06 12:46:10.346969169 +0100
-@@ -35,7 +35,7 @@
-    // We connect the ROOT file generated in a previous tutorial
-    // (see <a href="fillrandom.C.nbconvert.ipynb">Filling histograms with random numbers from a function</a>) 
-    //
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/fit/");
-    TFile *file = TFile::Open("fillrandom.root");
-    if (!file) {
-diff -Nur root-6.08.02.orig/tutorials/fit/fitslicesy.C root-6.08.02/tutorials/fit/fitslicesy.C
---- root-6.08.02.orig/tutorials/fit/fitslicesy.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/fit/fitslicesy.C	2016-12-06 12:46:10.346969169 +0100
-@@ -23,7 +23,7 @@
-    gStyle->SetTitleH(0.1);
- 
- // Connect the input file and get the 2-d histogram in memory
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/hsimple.C");
-    dir.ReplaceAll("/./","/");
-    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
-diff -Nur root-6.08.02.orig/tutorials/fit/myfit.C root-6.08.02/tutorials/fit/myfit.C
---- root-6.08.02.orig/tutorials/fit/myfit.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/fit/myfit.C	2016-12-06 12:46:10.346969169 +0100
-@@ -25,7 +25,7 @@
- }
- void myfit()
- {
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/hsimple.C");
-    dir.ReplaceAll("/./","/");
-    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
-diff -Nur root-6.08.02.orig/tutorials/foam/foam_demopers.C root-6.08.02/tutorials/foam/foam_demopers.C
---- root-6.08.02.orig/tutorials/foam/foam_demopers.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/foam/foam_demopers.C	2016-12-06 12:46:10.347969158 +0100
-@@ -24,7 +24,7 @@
-    gSystem->Load("libFoam");
- 
-    // need to load the foam_demo tutorial for the definition of the function
--   TString macroName = gROOT->GetTutorialsDir();
-+   TString macroName = gROOT->GetTutorialDir();
-    macroName.Append("/foam/foam_demo.C");
-    gROOT->ProcessLine(TString::Format(".L %s+",macroName.Data()));
- 
-diff -Nur root-6.08.02.orig/tutorials/geom/runplugin.C root-6.08.02/tutorials/geom/runplugin.C
---- root-6.08.02.orig/tutorials/geom/runplugin.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/geom/runplugin.C	2016-12-06 12:46:10.347969158 +0100
-@@ -27,7 +27,7 @@
- {
- 
- 
--   TString tutdir = gROOT->GetTutorialsDir();
-+   TString tutdir = gROOT->GetTutorialDir();
-    gROOT->ProcessLine(".x " + tutdir + "/geom/rootgeom.C");
-    plugin = new iterplugin();
-    gGeoManager->GetGeomPainter()->SetIteratorPlugin(plugin);
-diff -Nur root-6.08.02.orig/tutorials/graphics/earth.C root-6.08.02/tutorials/graphics/earth.C
---- root-6.08.02.orig/tutorials/graphics/earth.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/graphics/earth.C	2016-12-06 12:46:10.347969158 +0100
-@@ -26,7 +26,7 @@
-    TH2F *hs = new TH2F("hs","Sinusoidal",180, -180, 180, 181, -90.5, 90.5);
-    TH2F *hp = new TH2F("hp","Parabolic", 180, -180, 180, 181, -90.5, 90.5);
- 
--   TString dat = gROOT->GetTutorialsDir();
-+   TString dat = gROOT->GetTutorialDir();
-    dat.Append("/graphics/earth.dat");
-    dat.ReplaceAll("/./","/");
- 
-diff -Nur root-6.08.02.orig/tutorials/graphics/psview.C root-6.08.02/tutorials/graphics/psview.C
---- root-6.08.02.orig/tutorials/graphics/psview.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/graphics/psview.C	2016-12-06 12:46:10.347969158 +0100
-@@ -32,7 +32,7 @@
-    gROOT->SetBatch(1);
- 
-    // create a PostScript file
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/graphics/feynman.C");
-    gROOT->Macro(dir);
-    gPad->Print("feynman.eps");
-diff -Nur root-6.08.02.orig/tutorials/graphs/motorcycle.C root-6.08.02/tutorials/graphs/motorcycle.C
---- root-6.08.02.orig/tutorials/graphs/motorcycle.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/graphs/motorcycle.C	2016-12-06 12:46:10.347969158 +0100
-@@ -43,7 +43,7 @@
- void motorcycle()
- {
- // data taken from R library MASS: mcycle.txt
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/graphs/");
-    dir.ReplaceAll("/./","/");
- 
-diff -Nur root-6.08.02.orig/tutorials/hist/FirstContour.C root-6.08.02/tutorials/hist/FirstContour.C
---- root-6.08.02.orig/tutorials/hist/FirstContour.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/hist/FirstContour.C	2016-12-06 12:46:10.347969158 +0100
-@@ -13,7 +13,7 @@
- 
- void FirstContour()
- {
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/hsimple.C");
-    dir.ReplaceAll("/./","/");
-    if (!gInterpreter->IsLoaded(dir.Data())) gInterpreter->LoadMacro(dir.Data());
-diff -Nur root-6.08.02.orig/tutorials/hist/h1draw.C root-6.08.02/tutorials/hist/h1draw.C
---- root-6.08.02.orig/tutorials/hist/h1draw.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/hist/h1draw.C	2016-12-06 12:46:10.348969146 +0100
-@@ -25,7 +25,7 @@
- 
- void h1draw()
- {
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/hsimple.C");
-    dir.ReplaceAll("/./","/");
-    if (gBenchmark->GetBench("hsimple") < 0) gInterpreter->LoadMacro(dir.Data());
-diff -Nur root-6.08.02.orig/tutorials/hist/hbars.C root-6.08.02/tutorials/hist/hbars.C
---- root-6.08.02.orig/tutorials/hist/hbars.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/hist/hbars.C	2016-12-06 12:46:10.348969146 +0100
-@@ -10,7 +10,7 @@
- 
- TCanvas *hbars() {
-      // Try to open first the file cernstaff.root in tutorials/tree directory
--   TString filedir = gROOT->GetTutorialsDir();
-+   TString filedir = gROOT->GetTutorialDir();
-    filedir += TString("/tree/");
-    TString filename = "cernstaff.root";
-    bool fileNotFound = gSystem->AccessPathName(filename); // note opposite return code
-diff -Nur root-6.08.02.orig/tutorials/hsimple.C root-6.08.02/tutorials/hsimple.C
---- root-6.08.02.orig/tutorials/hsimple.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/hsimple.C	2016-12-06 12:46:10.348969146 +0100
-@@ -34,7 +34,7 @@
- TFile *hsimple(Int_t getFile=0)
- {
-    TString filename = "hsimple.root";
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.ReplaceAll("/./","/");
-    TFile *hfile = 0;
-    if (getFile) {
-diff -Nur root-6.08.02.orig/tutorials/image/rose_image.C root-6.08.02/tutorials/image/rose_image.C
---- root-6.08.02.orig/tutorials/image/rose_image.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/image/rose_image.C	2016-12-06 12:46:10.348969146 +0100
-@@ -30,9 +30,8 @@
-    img->SetConstRatio(0);
-    img->SetImageQuality(TAttImage::kImgBest);
- 
--   TString fp = gEnv->GetValue("Root.TTFontPath", "");
--   TString bc = fp + "/BlackChancery.ttf";
--   TString ar = fp + "/arial.ttf";
-+   TString bc = "BlackChancery.ttf";
-+   TString ar = "arial.ttf";
- 
-    // draw text over image with funny font
-    img->DrawText(120, 160, "Hello World!", 32,
-diff -Nur root-6.08.02.orig/tutorials/io/importCode.C root-6.08.02/tutorials/io/importCode.C
---- root-6.08.02.orig/tutorials/io/importCode.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/io/importCode.C	2016-12-06 12:46:10.348969146 +0100
-@@ -54,7 +54,7 @@
- }
- void importCode() {
-    TFile *f = new TFile("code.root","recreate");
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    importdir(dir); //change the directory as you like
-    delete f;
- }
-diff -Nur root-6.08.02.orig/tutorials/io/mergeSelective.C root-6.08.02/tutorials/io/mergeSelective.C
---- root-6.08.02.orig/tutorials/io/mergeSelective.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/io/mergeSelective.C	2016-12-06 12:46:10.348969146 +0100
-@@ -49,7 +49,7 @@
-    // Create the files to be merged
-    TStopwatch timer;
-    timer.Start();
--   TString tutdir = gROOT->GetTutorialsDir();
-+   TString tutdir = gROOT->GetTutorialDir();
-    if (gROOT->LoadMacro(tutdir + "/hsimple.C")) return;
-    Int_t i;
-    for (i=0; i<nfiles; i++) CreateFile(Form("tomerge%03d.root",i));
-diff -Nur root-6.08.02.orig/tutorials/io/testMergeCont.C root-6.08.02/tutorials/io/testMergeCont.C
---- root-6.08.02.orig/tutorials/io/testMergeCont.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/io/testMergeCont.C	2016-12-06 12:46:10.349969135 +0100
-@@ -39,7 +39,7 @@
- 
- void testMergeCont()
- {
--   TString tutdir = gROOT->GetTutorialsDir();
-+   TString tutdir = gROOT->GetTutorialDir();
-    gROOT->LoadMacro(tutdir+"/hsimple.C");
-    TList *list1 = (TList *)GetCollection();
-    TList *inputs = new TList();
-diff -Nur root-6.08.02.orig/tutorials/multicore/mp103_processSelector.C root-6.08.02/tutorials/multicore/mp103_processSelector.C
---- root-6.08.02.orig/tutorials/multicore/mp103_processSelector.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/multicore/mp103_processSelector.C	2016-12-06 12:46:10.349969135 +0100
-@@ -26,7 +26,7 @@
-   // MacOSX may generate connection to WindowServer errors
-   gROOT->SetBatch(kTRUE);
- 
--  TString selectorPath = gROOT->GetTutorialsDir();
-+  TString selectorPath = gROOT->GetTutorialDir();
-   selectorPath += "/tree/h1analysis.C+";
-   std::cout << "selector used is: "<< selectorPath<<"\n";
-   TSelector *sel = TSelector::GetSelector(selectorPath);
-diff -Nur root-6.08.02.orig/tutorials/pyroot/benchmarks.py root-6.08.02/tutorials/pyroot/benchmarks.py
---- root-6.08.02.orig/tutorials/pyroot/benchmarks.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/pyroot/benchmarks.py	2016-12-06 12:46:10.349969135 +0100
-@@ -45,7 +45,7 @@
- ## --------------------------------------------------------------------------
- if __name__ == '__main__':
- 
--   macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
-+   macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
- 
-  # window for keeping track of bench marks that are run
-    bench = ROOT.TCanvas( 'bench','Benchmarks Summary', -1000, 50, 200, 500 )
-diff -Nur root-6.08.02.orig/tutorials/pyroot/fit1.py root-6.08.02/tutorials/pyroot/fit1.py
---- root-6.08.02.orig/tutorials/pyroot/fit1.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/pyroot/fit1.py	2016-12-06 12:46:10.349969135 +0100
-@@ -51,7 +51,7 @@
- fitlabel = TPaveText( 0.6, 0.3, 0.9, 0.80, 'NDC' )
- fitlabel.SetTextAlign( 12 )
- fitlabel.SetFillColor( 42 )
--fitlabel.ReadFile(path.join(gROOT.GetTutorialsDir(), 'pyroot', 'fit1_py.py'))
-+fitlabel.ReadFile(path.join(str(gROOT.GetTutorialDir()), 'pyroot', 'fit1_py.py'))
- fitlabel.Draw()
- c1.Update()
- gBenchmark.Show( 'fit1' )
-diff -Nur root-6.08.02.orig/tutorials/pyroot/geometry.py root-6.08.02/tutorials/pyroot/geometry.py
---- root-6.08.02.orig/tutorials/pyroot/geometry.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/pyroot/geometry.py	2016-12-06 12:46:10.349969135 +0100
-@@ -10,7 +10,7 @@
- import os
- import ROOT
- 
--macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
-+macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
- 
- # the na49.C file was generated, so no python conversion is provided
- ROOT.gROOT.Macro( ROOT.gSystem.UnixPathName( os.path.join( macrodir, os.pardir, 'geom', 'na49.C' ) ) )
-diff -Nur root-6.08.02.orig/tutorials/pyroot/rootmarks.py root-6.08.02/tutorials/pyroot/rootmarks.py
---- root-6.08.02.orig/tutorials/pyroot/rootmarks.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/pyroot/rootmarks.py	2016-12-06 12:46:10.349969135 +0100
-@@ -13,7 +13,7 @@
- import os
- import ROOT
- 
--macrodir = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'pyroot')
-+macrodir = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'pyroot')
- 
- # use ROOT macro to make sure that bench numbers get updated in one place
- ROOT.gROOT.Macro( ROOT.gSystem.UnixPathName( os.path.join( macrodir, os.pardir, 'rootmarks.C' ) ) )
-diff -Nur root-6.08.02.orig/tutorials/pyroot/staff.py root-6.08.02/tutorials/pyroot/staff.py
---- root-6.08.02.orig/tutorials/pyroot/staff.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/pyroot/staff.py	2016-12-06 12:46:10.350969124 +0100
-@@ -47,7 +47,7 @@
-     tree.Branch( 'Nation', AddressOf( staff, 'Nation' ), 'Nation/C' )
- 
-     # note that the branches Division and Nation cannot be on the first branch
--    fname = os.path.join(ROOT.gROOT.GetTutorialsDir(), 'tree', 'cernstaff.dat')
-+    fname = os.path.join(str(ROOT.gROOT.GetTutorialDir()), 'tree', 'cernstaff.dat')
-     for line in open(fname).readlines():
-         t = list(filter( lambda x: x, re.split( '\s+', line ) ) )
-         staff.Category = int(t[0])             # assign as integers
-diff -Nur root-6.08.02.orig/tutorials/roofit/rf505_asciicfg.C root-6.08.02/tutorials/roofit/rf505_asciicfg.C
---- root-6.08.02.orig/tutorials/roofit/rf505_asciicfg.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/roofit/rf505_asciicfg.C	2016-12-06 12:46:10.350969124 +0100
-@@ -60,9 +60,9 @@
-    params->writeToFile("rf505_asciicfg_example.txt") ;
- 
- 
--   TString dir1 = gROOT->GetTutorialsDir() ;
-+   TString dir1 = gROOT->GetTutorialDir() ;
-    dir1.Append("/roofit/rf505_asciicfg.txt") ;
--   TString dir2 = gROOT->GetTutorialsDir() ;
-+   TString dir2 = gROOT->GetTutorialDir() ;
-    dir2.Append("/roofit/rf505_asciicfg_example.txt") ;
-    // R e a d    p a r a m e t e r s   f r o m    a s c i i   f i l e 
-    // ----------------------------------------------------------------
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_compton.C root-6.08.02/tutorials/spectrum/Background_compton.C
---- root-6.08.02.orig/tutorials/spectrum/Background_compton.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_compton.C	2016-12-06 12:46:10.350969124 +0100
-@@ -19,7 +19,7 @@
- 
-    TH1F *d1 = new TH1F("d1","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back3");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_decr.C root-6.08.02/tutorials/spectrum/Background_decr.C
---- root-6.08.02.orig/tutorials/spectrum/Background_decr.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_decr.C	2016-12-06 12:46:10.350969124 +0100
-@@ -18,7 +18,7 @@
- 
-    TH1F *d    = new TH1F("d","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back1");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_incr.C root-6.08.02/tutorials/spectrum/Background_incr.C
---- root-6.08.02.orig/tutorials/spectrum/Background_incr.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_incr.C	2016-12-06 12:46:10.350969124 +0100
-@@ -18,7 +18,7 @@
- 
-    TH1F *d    = new TH1F("d","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back1");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_order.C root-6.08.02/tutorials/spectrum/Background_order.C
---- root-6.08.02.orig/tutorials/spectrum/Background_order.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_order.C	2016-12-06 12:46:10.350969124 +0100
-@@ -22,7 +22,7 @@
-    TH1F *d3 = new TH1F("d3","",nbins,xmin,xmax);
-    TH1F *d4 = new TH1F("d4","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back2");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_smooth.C root-6.08.02/tutorials/spectrum/Background_smooth.C
---- root-6.08.02.orig/tutorials/spectrum/Background_smooth.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_smooth.C	2016-12-06 12:46:10.351969112 +0100
-@@ -20,7 +20,7 @@
-    TH1F *d1 = new TH1F("d1","",nbins,xmin,xmax);
-    TH1F *d2 = new TH1F("d2","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back1");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_width2.C root-6.08.02/tutorials/spectrum/Background_width2.C
---- root-6.08.02.orig/tutorials/spectrum/Background_width2.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_width2.C	2016-12-06 12:46:10.351969112 +0100
-@@ -22,7 +22,7 @@
-    TH1F *d3 = new TH1F("d3","",nbins,xmin,xmax);
-    TH1F *d4 = new TH1F("d4","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back2");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Background_width.C root-6.08.02/tutorials/spectrum/Background_width.C
---- root-6.08.02.orig/tutorials/spectrum/Background_width.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Background_width.C	2016-12-06 12:46:10.352969101 +0100
-@@ -17,7 +17,7 @@
-    Double_t source[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *back = (TH1F*) f->Get("back1");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution.C root-6.08.02/tutorials/spectrum/Deconvolution.C
---- root-6.08.02.orig/tutorials/spectrum/Deconvolution.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Deconvolution.C	2016-12-06 12:46:10.352969101 +0100
-@@ -17,7 +17,7 @@
-    Double_t response[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *h = (TH1F*) f->Get("decon1");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide_boost.C root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide_boost.C
---- root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide_boost.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide_boost.C	2016-12-06 12:46:10.353969090 +0100
-@@ -17,7 +17,7 @@
-    Double_t response[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    h = (TH1F*) f->Get("decon3");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide.C root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide.C
---- root-6.08.02.orig/tutorials/spectrum/DeconvolutionRL_wide.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/DeconvolutionRL_wide.C	2016-12-06 12:46:10.353969090 +0100
-@@ -17,7 +17,7 @@
-    Double_t response[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    h = (TH1F*) f->Get("decon3");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide_boost.C root-6.08.02/tutorials/spectrum/Deconvolution_wide_boost.C
---- root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide_boost.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Deconvolution_wide_boost.C	2016-12-06 12:46:10.353969090 +0100
-@@ -20,7 +20,7 @@
-    TH1F *h = new TH1F("h","Deconvolution",nbins,xmin,xmax);
-    TH1F *d = new TH1F("d","",nbins,xmin,xmax);
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    h = (TH1F*) f->Get("decon3");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide.C root-6.08.02/tutorials/spectrum/Deconvolution_wide.C
---- root-6.08.02.orig/tutorials/spectrum/Deconvolution_wide.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Deconvolution_wide.C	2016-12-06 12:46:10.353969090 +0100
-@@ -17,7 +17,7 @@
-    Double_t response[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *h = (TH1F*) f->Get("decon3");
-diff -Nur root-6.08.02.orig/tutorials/spectrum/Smoothing.C root-6.08.02/tutorials/spectrum/Smoothing.C
---- root-6.08.02.orig/tutorials/spectrum/Smoothing.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/spectrum/Smoothing.C	2016-12-06 12:46:10.353969090 +0100
-@@ -16,7 +16,7 @@
-    Double_t source[nbins];
-    gROOT->ForceStyle();
- 
--   TString dir  = gROOT->GetTutorialsDir();
-+   TString dir  = gROOT->GetTutorialDir();
-    TString file = dir+"/spectrum/TSpectrum.root";
-    TFile *f     = new TFile(file.Data());
-    TH1F *h = (TH1F*) f->Get("back1");
-diff -Nur root-6.08.02.orig/tutorials/tmva/keras/MulticlassKeras.py root-6.08.02/tutorials/tmva/keras/MulticlassKeras.py
---- root-6.08.02.orig/tutorials/tmva/keras/MulticlassKeras.py	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tmva/keras/MulticlassKeras.py	2016-12-06 12:46:10.354969079 +0100
-@@ -19,7 +19,7 @@
- 
- # Load data
- if not isfile('tmva_example_multiple_background.root'):
--    createDataMacro = gROOT.GetTutorialsDir() + '/tmva/createData.C'
-+    createDataMacro = str(gROOT.GetTutorialDir()) + '/tmva/createData.C'
-     print(createDataMacro)
-     gROOT.ProcessLine('.L {}'.format(createDataMacro))
-     gROOT.ProcessLine('create_MultipleBackground(4000)')
-diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategoryApplication.C root-6.08.02/tutorials/tmva/TMVAClassificationCategoryApplication.C
---- root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategoryApplication.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tmva/TMVAClassificationCategoryApplication.C	2016-12-06 12:46:10.354969079 +0100
-@@ -85,7 +85,7 @@
-    TString fname = TString(gSystem->DirName(__FILE__) ) + "/data/";
-    // if directory data not found try using tutorials dir
-    if (gSystem->AccessPathName( fname + "toy_sigbkg_categ_offset.root"  )) {
--      fname = TString(gROOT->GetTutorialsDir()) + "/tmva/data/";
-+      fname = gROOT->GetTutorialDir() + "/tmva/data/";
-    }
-    if (UseOffsetMethod) fname += "toy_sigbkg_categ_offset.root";
-    else                 fname += "toy_sigbkg_categ_varoff.root";
-diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategory.C root-6.08.02/tutorials/tmva/TMVAClassificationCategory.C
---- root-6.08.02.orig/tutorials/tmva/TMVAClassificationCategory.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tmva/TMVAClassificationCategory.C	2016-12-06 12:46:10.354969079 +0100
-@@ -89,7 +89,7 @@
-    TString fname = TString(gSystem->DirName(__FILE__) ) + "/data/";
-    if (gSystem->AccessPathName( fname + "toy_sigbkg_categ_offset.root")) {
-       // if directory data not found try using tutorials dir
--      fname = TString(gROOT->GetTutorialsDir()) + "/tmva/data/";
-+      fname = gROOT->GetTutorialDir() + "/tmva/data/";
-    }
-    if (UseOffsetMethod) fname += "toy_sigbkg_categ_offset.root";
-    else                 fname += "toy_sigbkg_categ_varoff.root";
-diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAMulticlass.C root-6.08.02/tutorials/tmva/TMVAMulticlass.C
---- root-6.08.02.orig/tutorials/tmva/TMVAMulticlass.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tmva/TMVAMulticlass.C	2016-12-06 12:46:10.354969079 +0100
-@@ -98,7 +98,7 @@
-    }
-    else {
-       std::cout << "Creating testdata...." << std::endl;
--      TString createDataMacro = TString(gROOT->GetTutorialsDir()) + "/tmva/createData.C";
-+      TString createDataMacro = gROOT->GetTutorialDir() + "/tmva/createData.C";
-       gROOT->ProcessLine(TString::Format(".L %s",createDataMacro.Data()));
-       gROOT->ProcessLine("create_MultipleBackground(2000)");
-       std::cout << " created tmva_example_multiple_background.root for tests of the multiclass features"<<std::endl;
-diff -Nur root-6.08.02.orig/tutorials/tmva/TMVAMultipleBackgroundExample.C root-6.08.02/tutorials/tmva/TMVAMultipleBackgroundExample.C
---- root-6.08.02.orig/tutorials/tmva/TMVAMultipleBackgroundExample.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tmva/TMVAMultipleBackgroundExample.C	2016-12-06 12:46:10.354969079 +0100
-@@ -476,7 +476,7 @@
-         << "========================" << endl
-         << endl;
- 
--   TString createDataMacro = TString(gROOT->GetTutorialsDir()) + "/tmva/createData.C";
-+   TString createDataMacro = gROOT->GetTutorialDir() + "/tmva/createData.C";
-    gROOT->ProcessLine(TString::Format(".L %s",createDataMacro.Data()));
-    gROOT->ProcessLine("create_MultipleBackground(2000)");
- 
-diff -Nur root-6.08.02.orig/tutorials/tree/basic2.C root-6.08.02/tutorials/tree/basic2.C
---- root-6.08.02.orig/tutorials/tree/basic2.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/basic2.C	2016-12-06 12:46:10.354969079 +0100
-@@ -10,7 +10,7 @@
- /// \author Rene Brun
- 
- void basic2() {
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/tree/");
-    dir.ReplaceAll("/./","/");
- 
-diff -Nur root-6.08.02.orig/tutorials/tree/basic.C root-6.08.02/tutorials/tree/basic.C
---- root-6.08.02.orig/tutorials/tree/basic.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/basic.C	2016-12-06 12:46:10.355969067 +0100
-@@ -12,7 +12,7 @@
- void basic() {
- // read file $ROOTSYS/tutorials/tree/basic.dat
- // this file has 3 columns of float data
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/tree/");
-    dir.ReplaceAll("/./","/");
-    ifstream in;
-diff -Nur root-6.08.02.orig/tutorials/tree/cernbuild.C root-6.08.02/tutorials/tree/cernbuild.C
---- root-6.08.02.orig/tutorials/tree/cernbuild.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/cernbuild.C	2016-12-06 12:46:10.355969067 +0100
-@@ -25,7 +25,7 @@
-    //The input file cern.dat is a copy of the CERN staff data base
-    //from 1988
-    TString filename = "cernstaff.root";
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/tree/");
-    dir.ReplaceAll("/./","/");
-    FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
-diff -Nur root-6.08.02.orig/tutorials/tree/cernstaff.C root-6.08.02/tutorials/tree/cernstaff.C
---- root-6.08.02.orig/tutorials/tree/cernstaff.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/cernstaff.C	2016-12-06 12:46:10.355969067 +0100
-@@ -9,7 +9,7 @@
- /// \author Rene Brun
- 
- void cernstaff () {
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/tree/cernstaff.C");
-    if (gSystem->AccessPathName("cernstaff.root")) {
-       gROOT->SetMacroPath(dir);
-diff -Nur root-6.08.02.orig/tutorials/tree/jets.C root-6.08.02/tutorials/tree/jets.C
---- root-6.08.02.orig/tutorials/tree/jets.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/jets.C	2016-12-06 12:46:10.355969067 +0100
-@@ -99,7 +99,7 @@
- //void jets(Int_t nev=100, Int_t npileup=200, Bool_t secondrun);
- void jets(Int_t nev=100, Int_t npileup=200) {
-    gSystem->Load("libPhysics");
--   TString tutdir = gROOT->GetTutorialsDir();
-+   TString tutdir = gROOT->GetTutorialDir();
-    gROOT->ProcessLine(".L " + tutdir + "/tree/JetEvent.cxx+");
-    gROOT->ProcessLine("#define JETS_SECOND_RUN yes");
-    gROOT->ProcessLine("#include \"" __FILE__ "\"");
-diff -Nur root-6.08.02.orig/tutorials/tree/ntuple1.C root-6.08.02/tutorials/tree/ntuple1.C
---- root-6.08.02.orig/tutorials/tree/ntuple1.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/tree/ntuple1.C	2016-12-06 12:46:10.355969067 +0100
-@@ -31,7 +31,7 @@
-    //
-    // Connect ROOT histogram/ntuple demonstration file
-    // generated by example $ROOTSYS/tutorials/hsimple.C.
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    dir.Append("/hsimple.C");
-    dir.ReplaceAll("/./","/");
-    if (gBenchmark->GetBench("hsimple") < 0) gInterpreter->LoadMacro(dir.Data());
-diff -Nur root-6.08.02.orig/tutorials/xml/DOMParsePerson.C root-6.08.02/tutorials/xml/DOMParsePerson.C
---- root-6.08.02.orig/tutorials/xml/DOMParsePerson.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/xml/DOMParsePerson.C	2016-12-06 12:46:10.356969056 +0100
-@@ -234,7 +234,7 @@
- {
-    PersonList personlist;
-    gROOT->ProcessLine(".O 0");
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    if (personlist.ParseFile(dir+"/xml/person.xml") == 0)
-       cout << personlist << endl;
- }
-diff -Nur root-6.08.02.orig/tutorials/xml/DOMRecursive.C root-6.08.02/tutorials/xml/DOMRecursive.C
---- root-6.08.02.orig/tutorials/xml/DOMRecursive.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/xml/DOMRecursive.C	2016-12-06 12:46:10.356969056 +0100
-@@ -54,7 +54,7 @@
- void DOMRecursive()
- {
-   TDOMParser *domParser = new TDOMParser();
--  TString dir = gROOT->GetTutorialsDir();
-+  TString dir = gROOT->GetTutorialDir();
-   domParser->SetValidate(false); // do not validate with DTD
-   domParser->ParseFile(dir+"/xml/person.xml");
- 
-diff -Nur root-6.08.02.orig/tutorials/xml/SAXHandler.C root-6.08.02/tutorials/xml/SAXHandler.C
---- root-6.08.02.orig/tutorials/xml/SAXHandler.C	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/tutorials/xml/SAXHandler.C	2016-12-06 12:46:10.356969056 +0100
-@@ -104,6 +104,6 @@
-    SaxHandler *saxHandler = new SaxHandler();
- 
-    saxParser->ConnectToHandler("SaxHandler", saxHandler);
--   TString dir = gROOT->GetTutorialsDir();
-+   TString dir = gROOT->GetTutorialDir();
-    saxParser->ParseFile(dir+"/xml/saxexample.xml");
- }
diff --git a/root-tformulatests-typo.patch b/root-tformulatests-typo.patch
deleted file mode 100644
index c1fd12f..0000000
--- a/root-tformulatests-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/TFormulaTests.cxx b/test/TFormulaTests.cxx
-index fd24825..ca4fd1d 100644
---- a/test/TFormulaTests.cxx
-+++ b/test/TFormulaTests.cxx
-@@ -500,7 +500,7 @@ bool TFormulaTests::Parser() {
- 
- int main(int argc, char **argv)
- {
--   printf("strting .....\n");
-+   printf("starting .....\n");
- 
-    TApplication theApp("App", &argc, argv);
-    gBenchmark = new TBenchmark();
diff --git a/root-tmva-test.patch b/root-tmva-test.patch
deleted file mode 100644
index d8dec2c..0000000
--- a/root-tmva-test.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx b/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
-index c44405b..ba796d1 100644
---- a/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
-+++ b/tmva/tmva/test/DNN/TestBackpropagationCpu.cxx
-@@ -26,22 +26,23 @@ int main()
-    std::cout << "Testing Backpropagation:" << std::endl;
- 
-    double error;
-+   int iret = 0;
- 
-    error = testBackpropagationWeightsLinear<TCpu<Scalar_t>>(1.0);
-    if (error > 1e-3)
--       return 1;
-+       iret++;
- 
-    error = testBackpropagationL1Regularization<TCpu<Scalar_t>>(1e-2);
-    if (error > 1e-3)
--       return 1;
-+       iret++;
- 
-    error = testBackpropagationL2Regularization<TCpu<Scalar_t>>(1.0);
-    if (error > 1e-3)
--       return 1;
-+       iret++;
- 
-    error = testBackpropagationBiasesLinear<TCpu<Scalar_t>>(1.0);
-    if (error > 1e-3)
--       return 1;
-+       iret++;
- 
--   return 0;
-+   return iret;
- }
-diff --git a/tmva/tmva/test/DNN/TestDerivatives.h b/tmva/tmva/test/DNN/TestDerivatives.h
-index 1acf46f..956bdde 100644
---- a/tmva/tmva/test/DNN/TestDerivatives.h
-+++ b/tmva/tmva/test/DNN/TestDerivatives.h
-@@ -104,7 +104,7 @@ auto testActivationFunctionDerivatives()
-       {
-          evaluateDerivative<Architecture>(X, af, Y);
-       };
--      error = testDerivatives<Architecture>(f, df, 5e-3);
-+      error = testDerivatives<Architecture>(f, df, 1.0e-04);
- 
-       std::cout << "Testing " << static_cast<int>(af) << ": ";
-       std::cout << "Maximum Relative Error = " << error << std::endl;
-diff --git a/tmva/tmva/test/DNN/TestMatrixArithmetic.h b/tmva/tmva/test/DNN/TestMatrixArithmetic.h
-index 10aed0e..330cf49 100644
---- a/tmva/tmva/test/DNN/TestMatrixArithmetic.h
-+++ b/tmva/tmva/test/DNN/TestMatrixArithmetic.h
-@@ -38,8 +38,7 @@ auto testMultiplication(size_t ntests)
-       n = rand() % 100 + 1;
-       k = rand() % 100 + 1;
- 
--      TMatrixT<Double_t> ARef(m,k), A2Ref(m,k), ATRef(k,m) , BRef(k,n),
--          BTRef(n,k), CRef(m,n);
-+      TMatrixT<Scalar_t> ARef(m,k), A2Ref(m,k), ATRef(k,m) , BRef(k,n), BTRef(n,k), CRef(m,n);
-       TMVA::DNN::randomMatrix(ARef);
-       TMVA::DNN::randomMatrix(A2Ref);
-       TMVA::DNN::randomMatrix(ATRef);
-@@ -50,19 +49,19 @@ auto testMultiplication(size_t ntests)
-       // A * B
-       CRef.Mult(ARef,BRef);
-       Architecture_t::Multiply(C, A, B);
--      Scalar_t error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
-+      Scalar_t error = TMVA::DNN::maximumRelativeError(C, CRef);
-       maximumError   = std::max(error, maximumError);
- 
-       // A^T * B
-       CRef.TMult(ATRef,BRef);
-       Architecture_t::TransposeMultiply(C, AT, B);
--      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
-+      error = TMVA::DNN::maximumRelativeError(C, CRef);
-       maximumError   = std::max(error, maximumError);
- 
-       // A * B^T
-       CRef.MultT(ARef,BTRef);
-       Architecture_t::MultiplyTranspose(C, A, BT);
--      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) C, CRef);
-+      error = TMVA::DNN::maximumRelativeError(C, CRef);
-       maximumError   = std::max(error, maximumError);
- 
-       // A .* B
-@@ -72,7 +71,7 @@ auto testMultiplication(size_t ntests)
-          }
-       }
-       Architecture_t::Hadamard(A, A2);
--      error = TMVA::DNN::maximumRelativeError((TMatrixT<Double_t>) A, ARef);
-+      error = TMVA::DNN::maximumRelativeError(A, ARef);
-       maximumError   = std::max(error, maximumError);
-    }
- 
-diff --git a/tmva/tmva/test/DNN/Utility.h b/tmva/tmva/test/DNN/Utility.h
-index 46077fc..a0c29b5 100644
---- a/tmva/tmva/test/DNN/Utility.h
-+++ b/tmva/tmva/test/DNN/Utility.h
-@@ -1,6 +1,7 @@
- #ifndef TMVA_TEST_DNN_UTILITY
- #define TMVA_TEST_DNN_UTILITY
- 
-+#include <cassert>
- #include <iostream>
- #include <sstream>
- #include <type_traits>
-@@ -172,64 +173,48 @@ AFloat reduceMean(F f, AFloat start, const AMatrix &X)
-     return result / (AFloat) (m * n);
- }
- 
--/** Compute the relative error of x and y normalized by y. Specialized for
-- *  float and double to make sure both arguments are above expected machine
-- *  precision (1e-5 and 1e-10). */
-+/** Compute the relative error of x and y */
- //______________________________________________________________________________
--template <typename AFloat>
--inline AFloat relativeError(const AFloat &x,
--                            const AFloat &y);
-+template <typename T>
-+inline T relativeError(const T &x, const T &y)
-+{
-+  using std::abs;
- 
-+  if (x == y)
-+    return T(0.0);
- 
--//______________________________________________________________________________
--template <>
--inline Double_t relativeError(const Double_t &x,
--                              const Double_t &y)
--{
--    if ((std::abs(x) > 1e-10) && (std::abs(y) > 1e-10)) {
--        return std::fabs((x - y) / y);
--    } else {
--        return std::fabs(x - y);
--    }
--}
-+  T diff = abs(x - y);
- 
--//______________________________________________________________________________
--template <>
--inline Real_t relativeError(const Real_t &x,
--                            const Real_t &y)
--{
--    if ((std::abs(x) > 1e-5) && (std::abs(y) > 1e-5)) {
--        return std::fabs((x - y) / y);
--    } else {
--        return std::fabs(x - y);
--    }
-+  if (x * y == T(0.0) ||
-+      diff < std::numeric_limits<T>::epsilon())
-+    return diff;
-+
-+  return diff / (abs(x) + abs(y));
- }
- 
- /*! Compute the maximum, element-wise relative error of the matrices
- *  X and Y normalized by the element of Y. Protected against division
- *  by zero. */
- //______________________________________________________________________________
--template <typename AMatrix>
--auto maximumRelativeError(const AMatrix &X,
--                          const AMatrix &Y)
---> decltype(X(0,0))
-+template <typename Matrix1, typename Matrix2>
-+auto maximumRelativeError(const Matrix1 &X, const Matrix2 &Y) -> decltype(X(0,0))
- {
-+    decltype(X(0,0)) curError, maxError = 0.0;
- 
--    using AFloat = decltype(X(0,0));
-+    Int_t m = X.GetNrows();
-+    Int_t n = X.GetNcols();
- 
--    size_t m,n;
--    m = X.GetNrows();
--    n = X.GetNcols();
-+    assert(m == Y.GetNrows());
-+    assert(n == Y.GetNcols());
- 
--    AFloat maximumError = 0.0;
--
--    for (size_t i = 0; i < m; i++) {
--        for (size_t j = 0; j < n; j++) {
--        AFloat error = relativeError(X(i,j), Y(i,j));
--        maximumError = std::max(error, maximumError);
-+    for (Int_t i = 0; i < m; i++) {
-+        for (Int_t j = 0; j < n; j++) {
-+            curError = relativeError(X(i,j), Y(i,j));
-+            maxError = std::max(curError, maxError);
-         }
-     }
--    return maximumError;
-+
-+    return maxError;
- }
- 
- /*! Numerically compute the derivative of the functional f using finite
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
new file mode 100644
index 0000000..29cf011
--- /dev/null
+++ b/root-unbundle-gtest.patch
@@ -0,0 +1,78 @@
+diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-06-13 09:14:04.000000000 +0200
++++ root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake	2017-06-15 14:21:08.367446162 +0200
+@@ -1471,73 +1471,15 @@
+ 
+ #---Download googletest--------------------------------------------------------------
+ if (testing)
+-  # FIXME: Remove our version of gtest in roottest. We can reuse this one.
+-  # Add gtest
+-  # http://stackoverflow.com/questions/9689183/cmake-googletest
+-
+-  set(_byproduct_binary_dir
+-    ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build/googlemock/)
+-  set(_byproducts
+-    ${_byproduct_binary_dir}/gtest/libgtest.a
+-    ${_byproduct_binary_dir}/gtest/libgtest_main.a
+-    ${_byproduct_binary_dir}/libgmock.a
+-    ${_byproduct_binary_dir}/libgmock_main.a
+-    )
+-
+-  ExternalProject_Add(
+-    googletest
+-    GIT_REPOSITORY https://github.com/google/googletest.git
+-    GIT_TAG release-1.8.0
+-    UPDATE_COMMAND ""
+-    # TIMEOUT 10
+-    # # Force separate output paths for debug and release builds to allow easy
+-    # # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
+-    # CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
+-    #            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
+-    #            -Dgtest_force_shared_crt=ON
+-    CMAKE_ARGS -G ${CMAKE_GENERATOR}
+-                  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+-                  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+-                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+-                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+-                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+-    # Disable install step
+-    INSTALL_COMMAND ""
+-    BUILD_BYPRODUCTS ${_byproducts}
+-    # Wrap download, configure and build steps in a script to log output
+-    LOG_DOWNLOAD ON
+-    LOG_CONFIGURE ON
+-    LOG_BUILD ON)
+-
+-  # Specify include dirs for gtest and gmock
+-  ExternalProject_Get_Property(googletest source_dir)
+-  set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
+-  set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include)
+-
+-  # Libraries
+-  ExternalProject_Get_Property(googletest binary_dir)
+-  set(_G_LIBRARY_PATH ${binary_dir}/googlemock/)
+-
+-  # gtest
+-  add_library(gtest IMPORTED STATIC GLOBAL)
+-  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest.a)
+-  add_dependencies(gtest googletest)
+-
+-  # gtest_main
+-  add_library(gtest_main IMPORTED STATIC GLOBAL)
+-  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest_main.a)
+-  add_dependencies(gtest_main googletest)
++  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
+ 
+   # gmock
+   add_library(gmock IMPORTED STATIC GLOBAL)
+   set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock.a)
+-  add_dependencies(gmock googletest)
+ 
+   # gmock_main
+   add_library(gmock_main IMPORTED STATIC GLOBAL)
+   set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock_main.a)
+-  add_dependencies(gmock_main googletest)
+ 
+ endif()
+ 
diff --git a/root.spec b/root.spec
index 60cb0bf..af1b6b6 100644
--- a/root.spec
+++ b/root.spec
@@ -23,9 +23,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.08.06
+Version:	6.10.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -43,84 +43,19 @@ Source2:	%{name}-testfiles.sh
 #		systemd unit files
 Source3:	rootd.service
 Source4:	proofd.service
-#		Allow running tests
-#		https://github.com/root-project/root/pull/130
-Patch0:		%{name}-test-install.patch
 #		Use system fonts
-Patch1:		%{name}-fontconfig.patch
+Patch0:		%{name}-fontconfig.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
-Patch2:		%{name}-dont-link-jvm.patch
+Patch1:		%{name}-dont-link-jvm.patch
 #		Don't create documentation notebooks
-Patch3:		%{name}-doc-no-notebooks.patch
+Patch2:		%{name}-doc-no-notebooks.patch
 #		Don't run gui macros
-Patch4:		%{name}-avoid-gui-crash.patch
-#		Use files in source tree during tests
-#		https://github.com/root-project/root/pull/403
-Patch5:		%{name}-template-files.patch
-#		Use cache read option
-#		https://github.com/root-project/root/pull/404
-Patch6:		%{name}-cache-test.patch
-#		Fixes for tests on ix86
-#		https://github.com/root-project/root/pull/400
-#		https://github.com/root-project/root/pull/401
-Patch7:		%{name}-32bit.patch
-#		Fix root-config for s390/s390x
-#		https://github.com/root-project/root/pull/406
-Patch8:		%{name}-s390x.patch
-#		Typo in TFormulaTests
-#		https://github.com/root-project/root/pull/405
-Patch9:		%{name}-tformulatests-typo.patch
-#		Don't download testdata
-#		https://github.com/root-project/root/pull/402
-Patch10:	%{name}-no-testdata.patch
-#		Missing includes
-#		https://github.com/root-project/root/pull/269
-Patch11:	%{name}-missing-includes.patch
-#		Old FSF address
-#		https://github.com/root-project/root/pull/270
-Patch12:	%{name}-fsf-addr.patch
-#		Name clash HZ
-#		https://github.com/root-project/root/pull/309
-Patch13:	%{name}-hz.patch
-#		Fix errors when building documentation
-#		https://github.com/root-project/root/pull/310
-Patch14:	%{name}-global-name-not-defined.patch
-#		Fix paths in image tutorial
-#		https://github.com/root-project/root/pull/311
-Patch15:	%{name}-rose-image.patch
+Patch3:		%{name}-avoid-gui-crash.patch
+#		Unbundle gtest
+Patch4:		%{name}-unbundle-gtest.patch
 #		Fix stressGraphics.ref
-#		https://github.com/root-project/root/pull/312
-Patch16:	%{name}-stressgraphics.patch
-#		Fix broken TPad::WaitPrimitive (backport from git)
-Patch17:	%{name}-TPad-WaitPrimitive.patch
-#		Fix for test suite on Fedora 26 i686
-#		https://github.com/root-project/root/pull/359
-Patch18:	%{name}-Quantiles.patch
-#		Fix format warnings/errors
-#		https://github.com/root-project/root/pull/376
-Patch19:	%{name}-format.patch
-#		Allow both absolute and relative python install paths
-#		https://github.com/root-project/root/pull/382
-Patch20:	%{name}-python-install-path.patch
-#		Fix relocation problems on aarch64
-#		Based on the patch in Fedora's llvm package
-#		https://reviews.llvm.org/D27609
-#		https://pagure.io/releng/issue/6653
-#		https://sft.its.cern.ch/jira/browse/ROOT-8702
-#		https://github.com/root-project/root/pull/430
-Patch21:	%{name}-aarch64.patch
-#		Python 3 compatibility fixes
-#		Backported from upstream git (6.08 branch)
-Patch22:	%{name}-python3-support.patch
-#		Fix for macro scope issue
-#		Backported from upstream git (6.08 branch)
-Patch23:	%{name}-macro-scope.patch
-#		Use absolute path when loading libJupyROOT.so
-#		https://github.com/root-project/root/pull/569
-Patch24:	%{name}-jupyroot-path.patch
-#		Fix for TMVA tests
-#		Backported from upstream git (master)
-Patch25:	%{name}-tmva-test.patch
+#		https://github.com/root-project/root/pull/659
+Patch5:		%{name}-stressgraphics.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -226,6 +161,8 @@ BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	perl-generators
 BuildRequires:	systemd-units
+BuildRequires:	gtest-devel
+BuildRequires:	gmock-devel
 #		Some of the tests call lsb_release
 BuildRequires:	redhat-lsb-core
 #		Fonts
@@ -255,7 +192,7 @@ the functionality needed to handle and analyze large amounts of data
 in a very efficient way. Having the data defined as a set of objects,
 specialized storage methods are used to get direct access to the
 separate attributes of the selected objects, without having to touch
-the bulk of the data. Included are histograming methods in an
+the bulk of the data. Included are histogramming methods in an
 arbitrary number of dimensions, curve fitting, function evaluation,
 minimization, graphics and visualization classes to allow the easy
 setup of an analysis system that can query and process the data
@@ -360,6 +297,7 @@ Requires:	font(droidsansfallback)
 %if %{ruby} == 0
 Obsoletes:	%{name}-ruby < 6.00.00
 %endif
+Obsoletes:	%{name}-vdt < 6.10.00
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -467,8 +405,11 @@ Provides:	%{py2_dist jupyroot} = %{version}
 Requires:	python2-%{name} = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
 Requires:	python2-ipython
+Requires:	python2-metakernel
 %else
 Requires:	python-ipython-console
+#		python-metakernel for python2 not available in
+#		Fedora <= 25 or RHEL/EPEL - some functionality missing
 %endif
 Obsoletes:	%{name}-rootaas < 6.08.00
 
@@ -483,11 +424,14 @@ Provides:	%{py3_dist jupyroot} = %{version}
 Requires:	%{python3pkg}-%{name} = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
 Requires:	%{python3pkg}-ipython
+Requires:	%{python3pkg}-metakernel
 %else
 %if %{?fedora}%{!?fedora:0}
 #		ipython for python3 not available in RHEL/EPEL
 Requires:	%{python3pkg}-ipython-console
 %endif
+#		python-metakernel for python3 not available in
+#		Fedora <= 25 or RHEL/EPEL - some functionality missing
 %endif
 
 %description -n %{python3pkg}-jupyroot
@@ -1163,15 +1107,6 @@ init-program computes all tables and constants necessary for the
 random variate generation. The sample program can then generate
 variates from the desired distribution.
 
-%package vdt
-Summary:	VDT mathematical library
-BuildArch:	noarch
-
-%description vdt
-VDT is a library of mathematical functions implemented in double and
-single precision. The implementation is fast and with the aid of
-modern compilers (e.g. gcc 4.7) vectorizable.
-
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1582,6 +1517,16 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description tree-viewer
 This package contains a plugin for browsing a ROOT tree in ROOT.
 
+%package unfold
+Summary:	Distribution unfolding
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+
+%description unfold
+An algorithm to unfold distributions from detector to truth level.
+
 %package cli
 Summary:	ROOT command line utilities
 BuildArch:	noarch
@@ -1613,26 +1558,6 @@ ROOT as a Jupyter Notebook.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1664,8 +1589,8 @@ sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
     -i documentation/doxygen/Doxyfile
 %if %{?fedora}%{!?fedora:0} >= 24
 #  * string_view
-rm core/metautils/inc/libcpp_string_view.h \
-   core/metautils/inc/RWrap_libcpp_string_view.h
+rm core/foundation/inc/libcpp_string_view.h \
+   core/foundation/inc/RWrap_libcpp_string_view.h
 %endif
 
 # Remove bundled fonts provided by the OS distributions
@@ -1679,6 +1604,15 @@ sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 # Build PyROOT for python 3
 cp -pr bindings/pyroot bindings/python
 
+# Work around missing libraries in Fedora's gmock packaging
+mkdir googlemock
+pushd googlemock
+g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock-all.o /usr/src/gmock/gmock-all.cc
+ar rv libgmock.a gmock-all.o
+g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock_main.o /usr/src/gmock/gmock_main.cc
+ar rv libgmock_main.a gmock_main.o
+popd
+
 %build
 unset QTDIR
 unset QTLIB
@@ -1722,6 +1656,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_tbb:BOOL=OFF \
        -Dbuiltin_unuran:BOOL=OFF \
        -Dbuiltin_vc:BOOL=OFF \
+       -Dbuiltin_vdt:BOOL=OFF \
+       -Dbuiltin_veccore:BOOL=OFF \
        -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dafdsmgrd:BOOL=OFF \
@@ -1820,7 +1756,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva:BOOL=ON \
        -Dunuran:BOOL=ON \
        -Dvc:BOOL=OFF \
-       -Dvdt:BOOL=ON \
+       -Dvdt:BOOL=OFF \
+       -Dveccore:BOOL=OFF \
        -Dvecgeom:BOOL=OFF \
        -Dx11:BOOL=ON \
        -Dxft:BOOL=ON \
@@ -1832,6 +1769,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %endif
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
+       -Dclingtest:BOOL=OFF \
+       -Dcoverage:BOOL=OFF \
+       -Droottest:BOOL=OFF \
        ..
 
 # Build PyROOT for python 3 (prep)
@@ -1963,7 +1903,7 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
 mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
-sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
+sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
 sed -e 's!/usr/bin/env python!/usr/bin/python!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
@@ -1975,17 +1915,23 @@ sed -e 's!/usr/bin/env python!/usr/bin/python!' \
        %{buildroot}%{_bindir}/rootmkdir \
        %{buildroot}%{_bindir}/rootmv \
        %{buildroot}%{_bindir}/rootprint \
-       %{buildroot}%{_bindir}/rootrm
+       %{buildroot}%{_bindir}/rootrm \
+       %{buildroot}%{_bindir}/rootslimtree
 sed -e '/^\#!/d' \
     -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \
        %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \
        %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
-sed 's!/usr/bin/env python!/usr/bin/python!' \
+sed -e 's!/usr/bin/env python!/usr/bin/python!' \
     -i %{buildroot}%{_bindir}/rootdrawtree \
        %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/pyroot/parse_CSV_file_with_TTree_ReadStream.py
+       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationClassificationKeras.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationRegressionKeras.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ClassificationKeras.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/GenerateModel.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/MulticlassKeras.py \
+       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
 
 # Remove some junk
 rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
@@ -1999,9 +1945,14 @@ rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
 rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
 rm %{buildroot}%{_libdir}/%{name}/libminicern.a
+rm %{buildroot}%{_bindir}/corebasetestUnit
+rm %{buildroot}%{_bindir}/coreconttestUnit
 rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
+rm %{buildroot}%{_bindir}/testTBufferMerger
+rm %{buildroot}%{_bindir}/testTProfile2Poly
+rm %{buildroot}%{_bindir}/treetreeplayertestUnit
 rm %{buildroot}%{_mandir}/man1/g2rootold.1
 rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
@@ -2012,8 +1963,6 @@ rm %{buildroot}%{_mandir}/man1/xproofd.1
 %endif
 rm %{buildroot}%{_includedir}/%{name}/*.cw
 rm %{buildroot}%{_includedir}/%{name}/*.pri
-rm %{buildroot}%{_includedir}/%{name}/proofdp.h
-rm %{buildroot}%{_includedir}/%{name}/rootdp.h
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
@@ -2140,9 +2089,12 @@ popd
 # - test-stressIOPlugins-*
 #   requires network access (by design since they test the remote file IO)
 #
+# - tutorial-dataframe-tdf101_h1Analysis
 # - tutorial-tree-run_h1analysis
 # - tutorial-multicore-imt001_parBranchProcessing
 # - tutorial-multicore-mp103_processSelector
+# - tutorial-multicore-mp104_processH1
+# - tutorial-multicore-mp105_processEntryList
 #   requires network access: http://root.cern.ch/files/h1/
 #
 # - tutorial-multicore-imt101_parTreeProcessing
@@ -2154,7 +2106,7 @@ popd
 #   currently fails on 32 bit arm - reported upstream:
 #   https://sft.its.cern.ch/jira/browse/ROOT-8500
 
-excluded="test-stressIOPlugins-.*|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-imt101_parTreeProcessing"
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing"
 %ifarch %{arm}
 excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
 %endif
@@ -2457,6 +2409,8 @@ fi
 %postun tree-player -p /sbin/ldconfig
 %post tree-viewer -p /sbin/ldconfig
 %postun tree-viewer -p /sbin/ldconfig
+%post unfold -p /sbin/ldconfig
+%postun unfold -p /sbin/ldconfig
 
 %files
 %{_bindir}/hadd
@@ -2488,7 +2442,6 @@ fi
 
 %files core -f includelist-core
 %{_bindir}/memprobe
-%{_bindir}/rlibmap
 %{_bindir}/rmkdepend
 %{_bindir}/root-config
 %{_mandir}/man1/memprobe.1*
@@ -2496,6 +2449,7 @@ fi
 %{_mandir}/man1/root-config.1*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libCore.*
+%{_libdir}/%{name}/libImt.*
 %{_libdir}/%{name}/libNew.*
 %{_libdir}/%{name}/libRint.*
 %{_libdir}/%{name}/libThread.*
@@ -2953,12 +2907,6 @@ fi
 %{_libdir}/%{name}/libUnuran_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
 
-%files vdt -f includelist-math-vdt
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/vdt
-%doc math/vdt/ReadMe.md math/vdt/ReleaseNotes.txt
-%license math/vdt/Licence.md
-
 %files memstat -f includelist-misc-memstat
 %{_libdir}/%{name}/libMemStat.*
 %{_libdir}/%{name}/libMemStat_rdict.pcm
@@ -2997,7 +2945,7 @@ fi
 %{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
 %{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
 
-%files net-rpdutils -f includelist-net-rpdutils
+%files net-rpdutils
 %{_libdir}/%{name}/libSrvAuth.*
 
 %files net-bonjour -f includelist-net-bonjour
@@ -3074,7 +3022,7 @@ fi
 %{_libdir}/%{name}/libProofBench_rdict.pcm
 %{_datadir}/%{name}/proof
 
-%files proof-pq2 -f includelist-proof-pq2
+%files proof-pq2
 %{_bindir}/pq2*
 %{_mandir}/man1/pq2*.1*
 
@@ -3153,6 +3101,8 @@ fi
 %files tree-player -f includelist-tree-treeplayer
 %{_libdir}/%{name}/libTreePlayer.*
 %{_libdir}/%{name}/libTreePlayer_rdict.pcm
+%{_libdir}/%{name}/libDataFrame.rootmap
+%{_libdir}/%{name}/libTreePlayer_G__DataFrame_rdict.pcm
 %{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
 %{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
 
@@ -3161,6 +3111,10 @@ fi
 %{_libdir}/%{name}/libTreeViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
+%files unfold -f includelist-hist-unfold
+%{_libdir}/%{name}/libUnfold.*
+%{_libdir}/%{name}/libUnfold_rdict.pcm
+
 %files cli
 %{_bindir}/rootbrowse
 %{_bindir}/rootcp
@@ -3171,6 +3125,7 @@ fi
 %{_bindir}/rootmv
 %{_bindir}/rootprint
 %{_bindir}/rootrm
+%{_bindir}/rootslimtree
 %{_datadir}/%{name}/cli
 
 %files notebook
@@ -3178,6 +3133,13 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Wed Jun 14 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.00-1
+- Update to 6.10.00
+- Drop patches accepted upstream
+- Drop previously backported patches
+- New sub-package: root-unfold
+- Dropped sub-package: root-vdt
+
 * Tue May 16 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.08.06-7
 - Remove JupyROOT references from cmake files
 - Do not generate autoprovides for libJupyROOT.so
diff --git a/sources b/sources
index 2144ec1..8442d04 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.08.06.tar.xz) = f9604055bee65b9dba69ad64f69749f6cfd8e7b84b487a0552f5a54806447f97f3372c35610f43045bd9ef3304be87095c6a595bc5b0985d6822d8cf6c22c8b1
+SHA512 (root-6.10.00.tar.xz) = f0483ac129d9f0ae48cd755db269fa14f5bb7b54055a31e47588bafc6f84f1bc14d0b2d5b9e3dcd991d1ec81741a69fcdec4e7480546c9eec031fe44fb266e72
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From aa51a9979358a6bc8ce4b1b46edf1f179c8176e6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 8 Jul 2017 20:53:59 +0200
Subject: [PATCH 112/344] Update to 6.10.02

---
 root.spec | 7 ++++---
 sources   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/root.spec b/root.spec
index af1b6b6..ec54120 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.00
+Version:	6.10.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -3101,8 +3101,6 @@ fi
 %files tree-player -f includelist-tree-treeplayer
 %{_libdir}/%{name}/libTreePlayer.*
 %{_libdir}/%{name}/libTreePlayer_rdict.pcm
-%{_libdir}/%{name}/libDataFrame.rootmap
-%{_libdir}/%{name}/libTreePlayer_G__DataFrame_rdict.pcm
 %{_datadir}/%{name}/plugins/TFileDrawMap/P010_TFileDrawMap.C
 %{_datadir}/%{name}/plugins/TVirtualTreePlayer/P010_TTreePlayer.C
 
@@ -3133,6 +3131,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Jul 07 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-1
+- Update to 6.10.02
+
 * Wed Jun 14 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.00-1
 - Update to 6.10.00
 - Drop patches accepted upstream
diff --git a/sources b/sources
index 8442d04..9e9a1d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.00.tar.xz) = f0483ac129d9f0ae48cd755db269fa14f5bb7b54055a31e47588bafc6f84f1bc14d0b2d5b9e3dcd991d1ec81741a69fcdec4e7480546c9eec031fe44fb266e72
+SHA512 (root-6.10.02.tar.xz) = c69fe783ab6cfa1f5ce632dfa8a1d7c2fa82fef5018363eb939a738384ce197f8cc8afba2d12fe396dd1f432f828bc98f8fb9d932a61d3df1176f344629a0d5f
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From 24aa3c55c26cf500459768d62be600661a86c1cc Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 10 Jul 2017 23:14:42 +0200
Subject: [PATCH 113/344] Fix removal of mathtext, minicern and JupyROOT
 references from cmake files

---
 root.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index ec54120..d1ba146 100644
--- a/root.spec
+++ b/root.spec
@@ -25,7 +25,7 @@
 Name:		root
 Version:	6.10.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -1968,13 +1968,16 @@ rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
 # Remove mathtext, minicern and JupyROOT references from cmake files
-sed -e 's/ mathtext / /' -e /mathtext/d \
-    -e 's/ minicern / /' -e /minicern/d \
-    -e 's/ JupyROOT / /' -e /JupyROOT/d \
+sed -e 's/ ROOT::mathtext / /' -e /ROOT::mathtext/d \
+    -e 's/ ROOT::minicern / /' -e /ROOT::minicern/d \
+    -e 's/ ROOT::JupyROOT / /' -e /ROOT::JupyROOT/d \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
-    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
-    -e '/Import target "JupyROOT"/,/FILES_FOR_JupyROOT/d' -e 's/;JupyROOT//' \
+sed -e '/Import target "ROOT::mathtext"/,/FILES_FOR_ROOT::mathtext/d' \
+    -e 's/;ROOT::mathtext//' \
+    -e '/Import target "ROOT::minicern"/,/FILES_FOR_ROOT::minicern/d' \
+    -e 's/;ROOT::minicern//' \
+    -e '/Import target "ROOT::JupyROOT"/,/FILES_FOR_ROOT::JupyROOT/d' \
+    -e 's/;ROOT::JupyROOT//' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
 
 # Only used on Windows
@@ -3131,6 +3134,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Mon Jul 10 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-2
+- Fix removal of mathtext, minicern and JupyROOT references from cmake files
+
 * Fri Jul 07 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-1
 - Update to 6.10.02
 

From 292a238ca188827175da532633d91666b12fe7a2 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 12 Jul 2017 21:00:11 +0200
Subject: [PATCH 114/344] Remove additional references in cmake files

---
 root.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/root.spec b/root.spec
index d1ba146..e7eb7d5 100644
--- a/root.spec
+++ b/root.spec
@@ -25,7 +25,7 @@
 Name:		root
 Version:	6.10.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -1967,17 +1967,15 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
-# Remove mathtext, minicern and JupyROOT references from cmake files
-sed -e 's/ ROOT::mathtext / /' -e /ROOT::mathtext/d \
-    -e 's/ ROOT::minicern / /' -e /ROOT::minicern/d \
-    -e 's/ ROOT::JupyROOT / /' -e /ROOT::JupyROOT/d \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-sed -e '/Import target "ROOT::mathtext"/,/FILES_FOR_ROOT::mathtext/d' \
-    -e 's/;ROOT::mathtext//' \
-    -e '/Import target "ROOT::minicern"/,/FILES_FOR_ROOT::minicern/d' \
-    -e 's/;ROOT::minicern//' \
-    -e '/Import target "ROOT::JupyROOT"/,/FILES_FOR_ROOT::JupyROOT/d' \
-    -e 's/;ROOT::JupyROOT//' \
+# Remove references to deleted (or moved) files from cmake files
+for target in mathtext minicern JupyROOT coreconttestUnit corebasetestUnit \
+	      testTProfile2Poly treetreeplayertestUnit testTBufferMerger ; do
+    sed -e "s/ ROOT::${target} / /" -e "/ROOT::${target}/d" \
+	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+    sed -e "/Import target \"ROOT::${target}\"/,/FILES_FOR_ROOT::${target}/d" \
+	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
+done
+sed -e 's/;ROOT::minicern//' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
 
 # Only used on Windows
@@ -3134,6 +3132,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Wed Jul 12 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-3
+- Remove additional references in cmake files
+
 * Mon Jul 10 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-2
 - Fix removal of mathtext, minicern and JupyROOT references from cmake files
 

From d40b20f402b02a248613f191bc62be278762b094 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 14 Jul 2017 06:55:56 +0200
Subject: [PATCH 115/344] Backport fixes

---
 root-rootcling-tmpfile.patch | 40 ++++++++++++++++++++++++++++++++++++
 root-stressEntryList.patch   | 35 +++++++++++++++++++++++++++++++
 root.spec                    |  8 ++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 root-rootcling-tmpfile.patch
 create mode 100644 root-stressEntryList.patch

diff --git a/root-rootcling-tmpfile.patch b/root-rootcling-tmpfile.patch
new file mode 100644
index 0000000..c0c21cc
--- /dev/null
+++ b/root-rootcling-tmpfile.patch
@@ -0,0 +1,40 @@
+From b74835ec7ca9e42c160702f9690cdf2ee43b55dd Mon Sep 17 00:00:00 2001
+From: Raphael Isemann <teemperor@gmail.com>
+Date: Tue, 11 Jul 2017 08:10:51 +0200
+Subject: [PATCH] Use pid in temp. file names to mitigate race conditions.
+
+In case CMake spawns multiple instances of a rootcling invocation
+(which can happen as CMake doesn't have a good mechanism for ensuring
+that we only spawn one when using the make build system), we now
+choose process-unique file names for the temporaries to prevent the
+build errors when multiple rootcling invocations try to work
+on the same temporary file.
+
+This isn't a real fix, but as renaming files from temporary to the
+real name is usually FS atomic, this will mitigate any future race
+conditions we have in this problematic part of the building process
+on obscure build systems. Those systems possible don't strictly follow the
+order in which they are supposed to build those targets, so this hopefully
+makes the consequences of any race conditions less intrusive  (e.g. Visual
+Studio also seems to suffer from this problem according to the mailing
+list).
+---
+ core/dictgen/src/rootcling_impl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
+index bcfaa50631..01f0ff7128 100644
+--- a/core/dictgen/src/rootcling_impl.cxx
++++ b/core/dictgen/src/rootcling_impl.cxx
+@@ -3218,7 +3218,7 @@ public:
+    tempFileNamesCatalog(): m_size(0), m_emptyString("") {};
+ 
+    std::string getTmpFileName(const std::string &filename) {
+-      return filename + "_tmp";
++      return filename + "_tmp_" + std::to_string(getpid());
+    }
+    /////////////////////////////////////////////////////////////////////////////
+    /// Adds the name and the associated temp name to the catalog.
+-- 
+2.13.0
+
diff --git a/root-stressEntryList.patch b/root-stressEntryList.patch
new file mode 100644
index 0000000..e1f36ae
--- /dev/null
+++ b/root-stressEntryList.patch
@@ -0,0 +1,35 @@
+From 70eeecccca163cc9ae0a6d7f99baf8520552b27a Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Wed, 12 Jul 2017 17:33:16 +0200
+Subject: [PATCH] Make stressEntryList Test2() more robust against rounding
+ errors
+
+---
+ test/stressEntryList.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
+index ee6303bb01..0d3a623af1 100644
+--- a/test/stressEntryList.cxx
++++ b/test/stressEntryList.cxx
+@@ -253,7 +253,7 @@ Bool_t Test2()
+    elistsum->Subtract(elist2);
+    n = elistsum->GetN();
+    TEntryList *elistcheck2 = new TEntryList("elistcheck2","elistcheck2");
+-   chain->Draw(">>elistcheck2", "x>0 && (y>0.1 || y<-0.1)", "entrylist");
++   chain->Draw(">>elistcheck2", cut1 && !cut2, "entrylist");
+ 
+    wrongentries4 = 0;
+    for (Int_t i=0; i<n; i++){
+@@ -270,7 +270,7 @@ Bool_t Test2()
+    //subtract the first list
+    elistsum2->Subtract(elist1);
+    elistcheck2->Reset();
+-   chain->Draw(">>elistcheck2", "x<0 && y<0.1 && y>-0.1", "entrylist");
++   chain->Draw(">>elistcheck2", !cut1 && cut2, "entrylist");
+    wrongentries5 = 0;
+    n = elistcheck2->GetN();
+    for (Int_t i=0; i<n; i++){
+-- 
+2.13.0
+
diff --git a/root.spec b/root.spec
index e7eb7d5..8a974f1 100644
--- a/root.spec
+++ b/root.spec
@@ -56,6 +56,12 @@ Patch4:		%{name}-unbundle-gtest.patch
 #		Fix stressGraphics.ref
 #		https://github.com/root-project/root/pull/659
 Patch5:		%{name}-stressgraphics.patch
+#		Avoid build failures due to temporary file name clashes
+#		Backported from upstream git (master)
+Patch6:		%{name}-rootcling-tmpfile.patch
+#		Avoid test failures due to rounding errors
+#		Backported from upstream git (6.10 branch)
+Patch7:		%{name}-stressEntryList.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -1558,6 +1564,8 @@ ROOT as a Jupyter Notebook.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage

From f73fd21176dbda5633dcff80d1c6cf5b963f563c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 13:14:03 +0000
Subject: [PATCH 116/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8a974f1..741dda8 100644
--- a/root.spec
+++ b/root.spec
@@ -25,7 +25,7 @@
 Name:		root
 Version:	6.10.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3140,6 +3140,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.02-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed Jul 12 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.02-3
 - Remove additional references in cmake files
 

From 3b30fb5268102fd3e9acd9f69969298fcbfd0abd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 07:45:40 +0000
Subject: [PATCH 117/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 741dda8..e28edcd 100644
--- a/root.spec
+++ b/root.spec
@@ -25,7 +25,7 @@
 Name:		root
 Version:	6.10.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3140,6 +3140,9 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.02-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From ebb867176fc51e621c29d3a061a7632837effafa Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 7 Aug 2017 22:19:09 +0200
Subject: [PATCH 118/344] Update to 6.10.04 Add temporary workaround for broken
 mariadb headers in Fedora 27

---
 root-mysql-workaround.patch | 21 +++++++++++++++++++++
 root-stressEntryList.patch  | 35 -----------------------------------
 root.spec                   | 23 ++++++++++++++++-------
 sources                     |  2 +-
 4 files changed, 38 insertions(+), 43 deletions(-)
 create mode 100644 root-mysql-workaround.patch
 delete mode 100644 root-stressEntryList.patch

diff --git a/root-mysql-workaround.patch b/root-mysql-workaround.patch
new file mode 100644
index 0000000..be2ad62
--- /dev/null
+++ b/root-mysql-workaround.patch
@@ -0,0 +1,21 @@
+diff -ur root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx root-6.10.04/sql/mysql/src/TMySQLServer.cxx
+--- root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx	2017-07-28 15:15:40.000000000 +0200
++++ root-6.10.04/sql/mysql/src/TMySQLServer.cxx	2017-08-07 07:48:59.759498319 +0200
+@@ -41,6 +41,8 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
++#include <my_global.h>
++
+ #include "TMySQLServer.h"
+ #include "TMySQLResult.h"
+ #include "TMySQLStatement.h"
+@@ -52,8 +54,6 @@
+ #include "TObjString.h"
+ #include "TObjArray.h"
+ 
+-#include <my_global.h>
+-
+ 
+ ClassImp(TMySQLServer)
+ 
diff --git a/root-stressEntryList.patch b/root-stressEntryList.patch
deleted file mode 100644
index e1f36ae..0000000
--- a/root-stressEntryList.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 70eeecccca163cc9ae0a6d7f99baf8520552b27a Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 12 Jul 2017 17:33:16 +0200
-Subject: [PATCH] Make stressEntryList Test2() more robust against rounding
- errors
-
----
- test/stressEntryList.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
-index ee6303bb01..0d3a623af1 100644
---- a/test/stressEntryList.cxx
-+++ b/test/stressEntryList.cxx
-@@ -253,7 +253,7 @@ Bool_t Test2()
-    elistsum->Subtract(elist2);
-    n = elistsum->GetN();
-    TEntryList *elistcheck2 = new TEntryList("elistcheck2","elistcheck2");
--   chain->Draw(">>elistcheck2", "x>0 && (y>0.1 || y<-0.1)", "entrylist");
-+   chain->Draw(">>elistcheck2", cut1 && !cut2, "entrylist");
- 
-    wrongentries4 = 0;
-    for (Int_t i=0; i<n; i++){
-@@ -270,7 +270,7 @@ Bool_t Test2()
-    //subtract the first list
-    elistsum2->Subtract(elist1);
-    elistcheck2->Reset();
--   chain->Draw(">>elistcheck2", "x<0 && y<0.1 && y>-0.1", "entrylist");
-+   chain->Draw(">>elistcheck2", !cut1 && cut2, "entrylist");
-    wrongentries5 = 0;
-    n = elistcheck2->GetN();
-    for (Int_t i=0; i<n; i++){
--- 
-2.13.0
-
diff --git a/root.spec b/root.spec
index e28edcd..105dab4 100644
--- a/root.spec
+++ b/root.spec
@@ -23,9 +23,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.02
+Version:	6.10.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -59,9 +59,9 @@ Patch5:		%{name}-stressgraphics.patch
 #		Avoid build failures due to temporary file name clashes
 #		Backported from upstream git (master)
 Patch6:		%{name}-rootcling-tmpfile.patch
-#		Avoid test failures due to rounding errors
-#		Backported from upstream git (6.10 branch)
-Patch7:		%{name}-stressEntryList.patch
+#		Temporary workaround for broken mariadb headers in Fedora 27
+#		https://bugzilla.redhat.com/show_bug.cgi?id=1478739
+Patch7:		%{name}-mysql-workaround.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -1565,7 +1565,9 @@ ROOT as a Jupyter Notebook.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%if %{?fedora}%{!?fedora:0} >= 27
 %patch7 -p1
+%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1978,9 +1980,12 @@ rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 # Remove references to deleted (or moved) files from cmake files
 for target in mathtext minicern JupyROOT coreconttestUnit corebasetestUnit \
 	      testTProfile2Poly treetreeplayertestUnit testTBufferMerger ; do
-    sed -e "s/ ROOT::${target} / /" -e "/ROOT::${target}/d" \
+    sed -e "s/ ROOT::${target} / /" \
+	-e "/Create imported target ROOT::${target}/,/^$/d" \
+	-e "/set_target_properties(ROOT::${target}/,/^$/d" \
 	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-    sed -e "/Import target \"ROOT::${target}\"/,/FILES_FOR_ROOT::${target}/d" \
+    sed -e "/Import target \"ROOT::${target}\"/,/^$/d" \
+	-e "/APPEND _IMPORT_CHECK_TARGETS ROOT::${target}/,/^$/d" \
 	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
 done
 sed -e 's/;ROOT::minicern//' \
@@ -3140,6 +3145,10 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Aug 05 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.04-1
+- Update to 6.10.04
+- Add temporary workaround for broken mariadb headers in Fedora 27
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 9e9a1d4..fdc2b72 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.02.tar.xz) = c69fe783ab6cfa1f5ce632dfa8a1d7c2fa82fef5018363eb939a738384ce197f8cc8afba2d12fe396dd1f432f828bc98f8fb9d932a61d3df1176f344629a0d5f
+SHA512 (root-6.10.04.tar.xz) = 37f5462b22d0ce8aefaa7de375715f5ae1bf64b8b7bdb2110b1bb8f3b99744354014b1cb7bbf926cd046dd695f6c364504ea6512857da086dd963d449cbba5da
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From 3dbbb6f535941785e000aac83fac296b640a5aa3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 29 Sep 2017 05:39:45 +0200
Subject: [PATCH 119/344] Update to 6.10.06 Fixes for new mysql_config

---
 root-mysql-config.patch     | 50 +++++++++++++++++++++++++++++++++++++
 root-mysql-workaround.patch | 35 +++++++++++++++-----------
 root.spec                   | 25 +++++++++++++------
 sources                     |  2 +-
 4 files changed, 90 insertions(+), 22 deletions(-)
 create mode 100644 root-mysql-config.patch

diff --git a/root-mysql-config.patch b/root-mysql-config.patch
new file mode 100644
index 0000000..58db421
--- /dev/null
+++ b/root-mysql-config.patch
@@ -0,0 +1,50 @@
+From 6991169440211dd29c4608541b8740337c1891fa Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 27 Sep 2017 21:06:41 +0200
+Subject: [PATCH] Fix for new mysql_config
+
+---
+ cmake/modules/FindMySQL.cmake | 9 +++------
+ configure                     | 4 +++-
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 123505a393..c818f5a1ab 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -20,12 +20,9 @@ endif()
+ if(MYSQL_CONFIG_EXECUTABLE)
+   execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE MYSQL_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+   separate_arguments(MYSQL_CFLAGS)
+-  string( REGEX MATCH "-I[^;]+" MYSQL_INCLUDE_DIR "${MYSQL_CFLAGS}" )
+-  string( REPLACE "-I" "" MYSQL_INCLUDE_DIR "${MYSQL_INCLUDE_DIR}")
+-  if(NOT EXISTS ${MYSQL_INCLUDE_DIR})
+-    set(MYSQL_INCLUDE_DIR MYSQL_INCLUDE_DIR-NOTFOUND)
+-  endif()
+-  string( REGEX REPLACE "-I[^;]+;" "" MYSQL_CFLAGS "${MYSQL_CFLAGS}" )
++  string( REGEX MATCHALL "-I[^;]+" MYSQL_INCLUDE_DIRS "${MYSQL_CFLAGS}" )
++  string( REPLACE "-I" "" MYSQL_INCLUDE_DIRS "${MYSQL_INCLUDE_DIRS}")
++  find_path(MYSQL_INCLUDE_DIR mysql.h PATHS ${MYSQL_INCLUDE_DIRS} NO_DEFAULT_PATH)
+   execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE MYSQL_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ else()
+   find_path(MYSQL_INCLUDE_DIR mysql.h
+diff --git a/configure b/configure
+index 26fe09ab31..6bdf5b29c4 100755
+--- a/configure
++++ b/configure
+@@ -3738,9 +3738,11 @@ if test ! "x$enable_mysql" = "xno"; then
+           else
+              result "ok"
+              mysqllib=`$mysql_config --libs | sed -e s/\'//g`
+-             mysqlincdir=`$mysql_config --cflags | sed -e 's,^.*-I\([^ ]*\).*$,\1,' -e s/\'//g`
+              mysqllibdir=""
++             mysqlincdir=`$mysql_config --cflags | sed -e s/\'//g | tr ' ' '\n' | grep ^-I | sed -e 's,^-I,,' | tr '\n' ' '`
+              check_header "mysql.h" "" $mysqlincdir
++             mysqlinc=$found_hdr
++             mysqlincdir=$found_dir
+              if test "x$found_hdr" = "x"; then
+                 enable_mysql="no"
+              fi
+-- 
+2.13.5
+
diff --git a/root-mysql-workaround.patch b/root-mysql-workaround.patch
index be2ad62..ad7773d 100644
--- a/root-mysql-workaround.patch
+++ b/root-mysql-workaround.patch
@@ -1,21 +1,28 @@
-diff -ur root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx root-6.10.04/sql/mysql/src/TMySQLServer.cxx
---- root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx	2017-07-28 15:15:40.000000000 +0200
-+++ root-6.10.04/sql/mysql/src/TMySQLServer.cxx	2017-08-07 07:48:59.759498319 +0200
-@@ -41,6 +41,8 @@
- //                                                                      //
- //////////////////////////////////////////////////////////////////////////
- 
-+#include <my_global.h>
-+
- #include "TMySQLServer.h"
- #include "TMySQLResult.h"
- #include "TMySQLStatement.h"
-@@ -52,8 +54,6 @@
+From 511ae175e21c6b5fa32201de23b379f80ed37981 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 5 Sep 2017 14:57:40 +0200
+Subject: [PATCH] Do not include internal MySQL header
+
+This breaks the build with -Dmysql=ON since the internal header will
+not be found.
+---
+ sql/mysql/src/TMySQLServer.cxx | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/sql/mysql/src/TMySQLServer.cxx b/sql/mysql/src/TMySQLServer.cxx
+index ee9d912e0f..40eebf55e9 100644
+--- a/sql/mysql/src/TMySQLServer.cxx
++++ b/sql/mysql/src/TMySQLServer.cxx
+@@ -52,9 +52,6 @@
  #include "TObjString.h"
  #include "TObjArray.h"
  
 -#include <my_global.h>
 -
- 
+-
  ClassImp(TMySQLServer)
  
+ ////////////////////////////////////////////////////////////////////////////////
+-- 
+2.13.5
+
diff --git a/root.spec b/root.spec
index 105dab4..2ed797d 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.04
+Version:	6.10.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -59,9 +59,12 @@ Patch5:		%{name}-stressgraphics.patch
 #		Avoid build failures due to temporary file name clashes
 #		Backported from upstream git (master)
 Patch6:		%{name}-rootcling-tmpfile.patch
-#		Temporary workaround for broken mariadb headers in Fedora 27
-#		https://bugzilla.redhat.com/show_bug.cgi?id=1478739
+#		Do not include internal MySQL header
+#		Backported from upstream git (master)
 Patch7:		%{name}-mysql-workaround.patch
+#		Adapt to new mysql_config version
+#		https://github.com/root-project/root/pull/1067
+Patch8:		%{name}-mysql-config.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -104,7 +107,11 @@ BuildRequires:	unuran-devel
 BuildRequires:	krb5-devel
 BuildRequires:	krb5-workstation
 BuildRequires:	openldap-devel
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	mariadb-connector-c-devel
+%else
 BuildRequires:	mysql-devel
+%endif
 BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	mesa-libGL-devel
@@ -175,7 +182,7 @@ BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
-#		Provides "symbol" and "dingbats"
+#		Provides "symbol", "dingbats" and "chancery"
 BuildRequires:	urw-fonts
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
@@ -289,12 +296,13 @@ Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 #		Fonts
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
 Requires:	font(freeserif)
 Requires:	font(freemono)
-#		Provides "symbol" and "dingbats"
+#		Provides "symbol", "dingbats" and "chancery"
 Requires:	urw-fonts
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
@@ -1565,9 +1573,8 @@ ROOT as a Jupyter Notebook.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%if %{?fedora}%{!?fedora:0} >= 27
 %patch7 -p1
-%endif
+%patch8 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3145,6 +3152,10 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Wed Sep 27 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.06-1
+- Update to 6.10.06
+- Fixes for new mysql_config
+
 * Sat Aug 05 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.04-1
 - Update to 6.10.04
 - Add temporary workaround for broken mariadb headers in Fedora 27
diff --git a/sources b/sources
index fdc2b72..dfae873 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.04.tar.xz) = 37f5462b22d0ce8aefaa7de375715f5ae1bf64b8b7bdb2110b1bb8f3b99744354014b1cb7bbf926cd046dd695f6c364504ea6512857da086dd963d449cbba5da
+SHA512 (root-6.10.06.tar.xz) = 4e35c1e014c5346e4457dc71766cce8f6f57dd77ec94f62597f82d6baedaf68bfb5ee1d80b0bc8aab22dc09de1f0a7013a4ce81eaf608aeca06a8b8cf8f22ea3
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From 055702ad137cef3ba0193dfa17e666cc0eedcbde Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 20 Oct 2017 19:32:45 +0200
Subject: [PATCH 120/344] Update to 6.10.08 Add BuildRequires on lz4-devel and
 xxhash-devel Workaround for missing gmock libraries only needed for gmock <
 0.1.8 Address some warnings during documentation generation

---
 root-dox-filter.patch     | 86 +++++++++++++++++++++++++++++++++++++++
 root-unbundle-gtest.patch | 12 ++++--
 root.spec                 | 19 ++++++++-
 3 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 root-dox-filter.patch

diff --git a/root-dox-filter.patch b/root-dox-filter.patch
new file mode 100644
index 0000000..0cb43bc
--- /dev/null
+++ b/root-dox-filter.patch
@@ -0,0 +1,86 @@
+From 44ca9d32d47782597e58e75575fdffba135ab8e7 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 18 Oct 2017 13:34:34 +0200
+Subject: [PATCH] Fix \cond without \endcond warnings
+
+---
+ documentation/doxygen/filter.cxx | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
+index 85309dd6f7..de8acb4bc9 100644
+--- a/documentation/doxygen/filter.cxx
++++ b/documentation/doxygen/filter.cxx
+@@ -107,7 +107,6 @@ bool   gImageSource;   // True the source of the current macro should be shown
+ int    gInMacro;       // >0 if parsing a macro in a class documentation.
+ int    gImageID;       // Image Identifier.
+ int    gMacroID;       // Macro identifier in class documentation.
+-int    gShowTutSource; // >0 if the tutorial source code should be shown
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -126,7 +125,6 @@ int main(int argc, char *argv[])
+    gMacroID       = 0;
+    gOutputName    = "stdout.dat";
+    gImageType     = "png";
+-   gShowTutSource = 0;
+    if (EndsWith(gFileName,".cxx")) gSource = true;
+    if (EndsWith(gFileName,".h"))   gHeader = true;
+    if (EndsWith(gFileName,".py"))  gPython = true;
+@@ -273,6 +271,9 @@ void FilterTutorial()
+    // File for inline macros.
+    FILE *m = 0;
+ 
++   int showTutSource = 0;
++   int incond = 0;
++
+    // Extract the macro name
+    int i1      = gFileName.rfind('/')+1;
+    int i2      = gFileName.rfind('C');
+@@ -311,7 +312,7 @@ void FilterTutorial()
+ 
+       // \macro_code found
+       if (gLineString.find("\\macro_code") != string::npos) {
+-         gShowTutSource = 1;
++         showTutSource = 1;
+          m = fopen(StringFormat("%s/macros/%s",gOutDir.c_str(),gMacroName.c_str()).c_str(), "w");
+          ReplaceAll(gLineString, "\\macro_code", StringFormat("\\include %s",gMacroName.c_str()));
+       }
+@@ -339,19 +340,23 @@ void FilterTutorial()
+       }
+ 
+       // \author is the last comment line.
+-      if (gLineString.find("\\author")  != string::npos) {
++      if (gLineString.find("\\author") != string::npos) {
+          if (gPython) printf("%s",StringFormat("%s \n## \\cond \n",gLineString.c_str()).c_str());
+          else         printf("%s",StringFormat("%s \n/// \\cond \n",gLineString.c_str()).c_str());
+-         if (gShowTutSource == 1) gShowTutSource = 2;
++         if (showTutSource == 1) showTutSource = 2;
++         incond = 1;
+       } else {
+          printf("%s",gLineString.c_str());
+-         if (m && gShowTutSource == 2) fprintf(m,"%s",gLineString.c_str());
++         if (m && showTutSource == 2) fprintf(m,"%s",gLineString.c_str());
+       }
+    }
+ 
+-   if (m) {
++   if (incond) {
+       if (gPython) printf("## \\endcond \n");
+       else         printf("/// \\endcond \n");
++   }
++
++   if (m) {
+       fclose(m);
+    }
+ }
+@@ -511,4 +516,4 @@ bool EndsWith(string const &fullString, string const &ending) {
+ 
+ bool BeginsWith(const string& haystack, const string& needle) {
+    return needle.length() <= haystack.length() && equal(needle.begin(), needle.end(), haystack.begin());
+-}
+\ No newline at end of file
++}
+-- 
+2.13.6
+
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index 29cf011..c40ce0a 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake	2017-06-15 14:21:08.367446162 +0200
-@@ -1471,73 +1471,15 @@
+diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-10-16 18:28:58.000000000 +0200
++++ root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake	2017-10-19 21:18:23.053801458 +0200
+@@ -1511,74 +1511,19 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -62,6 +62,8 @@ diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10
 -  add_library(gtest_main IMPORTED STATIC GLOBAL)
 -  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest_main.a)
 -  add_dependencies(gtest_main googletest)
++ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0
++ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock)
 +  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
  
    # gmock
@@ -74,5 +76,7 @@ diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10
    set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock_main.a)
 -  add_dependencies(gmock_main googletest)
  
++ endif()
  endif()
  
+ #---Report non implemented options---------------------------------------------------
diff --git a/root.spec b/root.spec
index 2ed797d..3bb58da 100644
--- a/root.spec
+++ b/root.spec
@@ -23,7 +23,7 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.06
+Version:	6.10.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -65,6 +65,9 @@ Patch7:		%{name}-mysql-workaround.patch
 #		Adapt to new mysql_config version
 #		https://github.com/root-project/root/pull/1067
 Patch8:		%{name}-mysql-config.patch
+#		Address some warnings during documentation generation
+#		https://github.com/root-project/root/pull/1212
+Patch9:		%{name}-dox-filter.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -96,6 +99,8 @@ BuildRequires:	gl2ps-devel
 BuildRequires:	pcre-devel
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
+BuildRequires:	lz4-devel
+BuildRequires:	xxhash-devel
 BuildRequires:	libAfterImage-devel >= 1.20
 BuildRequires:	ncurses-devel
 BuildRequires:	avahi-compat-libdns_sd-devel
@@ -1575,6 +1580,7 @@ ROOT as a Jupyter Notebook.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1621,7 +1627,8 @@ sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 # Build PyROOT for python 3
 cp -pr bindings/pyroot bindings/python
 
-# Work around missing libraries in Fedora's gmock packaging
+# Work around missing libraries in Fedora's gmock packaging < 1.8.0
+if [ ! -r %{_libdir}/libgmock.so ] ; then
 mkdir googlemock
 pushd googlemock
 g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock-all.o /usr/src/gmock/gmock-all.cc
@@ -1629,6 +1636,7 @@ ar rv libgmock.a gmock-all.o
 g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock_main.o /usr/src/gmock/gmock_main.cc
 ar rv libgmock_main.a gmock_main.o
 popd
+fi
 
 %build
 unset QTDIR
@@ -1667,6 +1675,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_glew:BOOL=OFF \
        -Dbuiltin_gsl:BOOL=OFF \
        -Dbuiltin_llvm:BOOL=ON \
+       -Dbuiltin_lz4:BOOL=OFF \
        -Dbuiltin_lzma:BOOL=OFF \
        -Dbuiltin_openssl:BOOL=OFF \
        -Dbuiltin_pcre:BOOL=OFF \
@@ -3152,6 +3161,12 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Oct 20 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.08-1
+- Update to 6.10.08
+- Add BuildRequires on lz4-devel and xxhash-devel
+- Workaround for missing gmock libraries only needed for gmock < 0.1.8
+- Address some warnings during documentation generation
+
 * Wed Sep 27 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.06-1
 - Update to 6.10.06
 - Fixes for new mysql_config

From 7a138eca567411f20608424331d912e2b719a42b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 20 Oct 2017 19:42:39 +0200
Subject: [PATCH 121/344] Update sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index dfae873..5fcd7a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.06.tar.xz) = 4e35c1e014c5346e4457dc71766cce8f6f57dd77ec94f62597f82d6baedaf68bfb5ee1d80b0bc8aab22dc09de1f0a7013a4ce81eaf608aeca06a8b8cf8f22ea3
+SHA512 (root-6.10.08.tar.xz) = 84d712fe6fe260d22202187f0edf6ae36647f8de44533f791939f2ae382782270bf1efced69e6b6f08d9ca512fc4a3991d2439129fb4ca413a283bdeef7b3221
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b

From ea40f6d9b5099b98bc849929b9f581af5d7a7835 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 17 Jan 2018 07:13:04 +0100
Subject: [PATCH 122/344] Update to 6.12.04 Drop patches accepted upstream Drop
 previously backported patches Unbundle jsroot in root-net-http Add hack to
 work around broken charmaps in StandardSymbolsPS.otf Use local static script
 and style files for JupyROOT Fix some javascript errors Fix build rules for
 test binaries so that they are not installed Address memory usage issue for
 ARM build Drop pre-minified javascript and style files (Fedora packaging
 guidelines) Enable builds on ppc/ppc64/ppc64le (do not pass all tests, but
 the list   of failing tests is much shorter with this release) Add dependency
 on python[23]-jsmva to python[23]-jupyroot New sub-packages:
 root-gui-canvaspainter, root-gui-webdisplay and   root-hist-draw (not for
 EPEL 7 since they are root7 specific and   require c++-14)

---
 ...x-constructing-the-GSL-MC-Integrator.patch |  35 ++
 ...owerPC-Don-t-use-xscvdpspn-on-the-P7.patch |  27 ++
 root-dox-filter.patch                         |  86 ----
 root-doxygen-makefile.patch                   |  28 ++
 root-fontconfig.patch                         | 156 +++----
 root-js-syntax.patch                          | 114 +++++
 root-jupyroot-static.patch                    |  36 ++
 root-memory-arm.patch                         |  15 +
 root-memory-usage.patch                       |  59 +++
 root-mysql-config.patch                       |  50 ---
 root-mysql-workaround.patch                   |  28 --
 root-ppc64-doc.patch                          |  24 ++
 root-rootcling-tmpfile.patch                  |  40 --
 root-stressgraphics.patch                     |  13 -
 root-system-pythia.patch                      |  42 ++
 root-test-subdirs.patch                       | 244 +++++++++++
 root-testfiles.sh                             |  13 +-
 root-unbundle-gtest.patch                     |  69 ++--
 root-urw-otf-hack.patch                       |  15 +
 root.spec                                     | 390 ++++++++++++++----
 sources                                       |   4 +-
 21 files changed, 1073 insertions(+), 415 deletions(-)
 create mode 100644 root-Fix-constructing-the-GSL-MC-Integrator.patch
 create mode 100644 root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
 delete mode 100644 root-dox-filter.patch
 create mode 100644 root-doxygen-makefile.patch
 create mode 100644 root-js-syntax.patch
 create mode 100644 root-jupyroot-static.patch
 create mode 100644 root-memory-arm.patch
 create mode 100644 root-memory-usage.patch
 delete mode 100644 root-mysql-config.patch
 delete mode 100644 root-mysql-workaround.patch
 create mode 100644 root-ppc64-doc.patch
 delete mode 100644 root-rootcling-tmpfile.patch
 delete mode 100644 root-stressgraphics.patch
 create mode 100644 root-system-pythia.patch
 create mode 100644 root-test-subdirs.patch
 create mode 100644 root-urw-otf-hack.patch

diff --git a/root-Fix-constructing-the-GSL-MC-Integrator.patch b/root-Fix-constructing-the-GSL-MC-Integrator.patch
new file mode 100644
index 0000000..8615550
--- /dev/null
+++ b/root-Fix-constructing-the-GSL-MC-Integrator.patch
@@ -0,0 +1,35 @@
+From 0bed472bc529c6fa515793984808a4f6c24fc715 Mon Sep 17 00:00:00 2001
+From: moneta <lorenzo.moneta@cern.ch>
+Date: Mon, 15 Jan 2018 15:00:44 +0100
+Subject: [PATCH] Fix constructing the GSL MC Integrator. This fix the failure
+ observed sometimes in  math core-testIntegration. (Fix ROOT-9178)
+
+---
+ math/mathmore/src/GSLMCIntegrator.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/math/mathmore/src/GSLMCIntegrator.cxx b/math/mathmore/src/GSLMCIntegrator.cxx
+index 25ad7b4eac..1c00146630 100644
+--- a/math/mathmore/src/GSLMCIntegrator.cxx
++++ b/math/mathmore/src/GSLMCIntegrator.cxx
+@@ -100,6 +100,7 @@ GSLMCIntegrator::GSLMCIntegrator(MCIntegration::Type type, double absTol, double
+ }
+ 
+ GSLMCIntegrator::GSLMCIntegrator(const char * type, double absTol, double relTol, unsigned int calls):
++   fType(MCIntegration::kDEFAULT),
+    fDim(0),
+    fCalls(calls),
+    fAbsTol(absTol),
+@@ -316,7 +317,8 @@ void GSLMCIntegrator::SetTypeName(const char * type)
+    }
+ 
+    // create the fWorkspace object
+-   if (integType != fType) SetType(integType);
++   // if it exists already with the same type it will not be re-created
++   SetType(integType);
+ }
+ 
+ 
+-- 
+2.14.3
+
diff --git a/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch b/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
new file mode 100644
index 0000000..3448ac8
--- /dev/null
+++ b/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
@@ -0,0 +1,27 @@
+diff -ur root-6.12.04.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp root-6.12.04/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
+--- root-6.12.04.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-01-11 12:40:14.956914822 +0100
+@@ -7448,9 +7448,11 @@
+ /// - The node is a "load-and-splat"
+ /// In all other cases, we will choose to keep the BUILD_VECTOR.
+ static bool haveEfficientBuildVectorPattern(BuildVectorSDNode *V,
+-                                            bool HasDirectMove) {
++                                            bool HasDirectMove,
++                                            bool HasP8Vector) {
+   EVT VecVT = V->getValueType(0);
+-  bool RightType = VecVT == MVT::v2f64 || VecVT == MVT::v4f32 ||
++  bool RightType = VecVT == MVT::v2f64 ||
++    (HasP8Vector && VecVT == MVT::v4f32) ||
+     (HasDirectMove && (VecVT == MVT::v2i64 || VecVT == MVT::v4i32));
+   if (!RightType)
+     return false;
+@@ -7612,7 +7614,8 @@
+     // lowered to VSX instructions under certain conditions.
+     // Without VSX, there is no pattern more efficient than expanding the node.
+     if (Subtarget.hasVSX() &&
+-        haveEfficientBuildVectorPattern(BVN, Subtarget.hasDirectMove()))
++        haveEfficientBuildVectorPattern(BVN, Subtarget.hasDirectMove(),
++                                        Subtarget.hasP8Vector()))
+       return Op;
+     return SDValue();
+   }
diff --git a/root-dox-filter.patch b/root-dox-filter.patch
deleted file mode 100644
index 0cb43bc..0000000
--- a/root-dox-filter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 44ca9d32d47782597e58e75575fdffba135ab8e7 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 18 Oct 2017 13:34:34 +0200
-Subject: [PATCH] Fix \cond without \endcond warnings
-
----
- documentation/doxygen/filter.cxx | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
-index 85309dd6f7..de8acb4bc9 100644
---- a/documentation/doxygen/filter.cxx
-+++ b/documentation/doxygen/filter.cxx
-@@ -107,7 +107,6 @@ bool   gImageSource;   // True the source of the current macro should be shown
- int    gInMacro;       // >0 if parsing a macro in a class documentation.
- int    gImageID;       // Image Identifier.
- int    gMacroID;       // Macro identifier in class documentation.
--int    gShowTutSource; // >0 if the tutorial source code should be shown
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -126,7 +125,6 @@ int main(int argc, char *argv[])
-    gMacroID       = 0;
-    gOutputName    = "stdout.dat";
-    gImageType     = "png";
--   gShowTutSource = 0;
-    if (EndsWith(gFileName,".cxx")) gSource = true;
-    if (EndsWith(gFileName,".h"))   gHeader = true;
-    if (EndsWith(gFileName,".py"))  gPython = true;
-@@ -273,6 +271,9 @@ void FilterTutorial()
-    // File for inline macros.
-    FILE *m = 0;
- 
-+   int showTutSource = 0;
-+   int incond = 0;
-+
-    // Extract the macro name
-    int i1      = gFileName.rfind('/')+1;
-    int i2      = gFileName.rfind('C');
-@@ -311,7 +312,7 @@ void FilterTutorial()
- 
-       // \macro_code found
-       if (gLineString.find("\\macro_code") != string::npos) {
--         gShowTutSource = 1;
-+         showTutSource = 1;
-          m = fopen(StringFormat("%s/macros/%s",gOutDir.c_str(),gMacroName.c_str()).c_str(), "w");
-          ReplaceAll(gLineString, "\\macro_code", StringFormat("\\include %s",gMacroName.c_str()));
-       }
-@@ -339,19 +340,23 @@ void FilterTutorial()
-       }
- 
-       // \author is the last comment line.
--      if (gLineString.find("\\author")  != string::npos) {
-+      if (gLineString.find("\\author") != string::npos) {
-          if (gPython) printf("%s",StringFormat("%s \n## \\cond \n",gLineString.c_str()).c_str());
-          else         printf("%s",StringFormat("%s \n/// \\cond \n",gLineString.c_str()).c_str());
--         if (gShowTutSource == 1) gShowTutSource = 2;
-+         if (showTutSource == 1) showTutSource = 2;
-+         incond = 1;
-       } else {
-          printf("%s",gLineString.c_str());
--         if (m && gShowTutSource == 2) fprintf(m,"%s",gLineString.c_str());
-+         if (m && showTutSource == 2) fprintf(m,"%s",gLineString.c_str());
-       }
-    }
- 
--   if (m) {
-+   if (incond) {
-       if (gPython) printf("## \\endcond \n");
-       else         printf("/// \\endcond \n");
-+   }
-+
-+   if (m) {
-       fclose(m);
-    }
- }
-@@ -511,4 +516,4 @@ bool EndsWith(string const &fullString, string const &ending) {
- 
- bool BeginsWith(const string& haystack, const string& needle) {
-    return needle.length() <= haystack.length() && equal(needle.begin(), needle.end(), haystack.begin());
--}
-\ No newline at end of file
-+}
--- 
-2.13.6
-
diff --git a/root-doxygen-makefile.patch b/root-doxygen-makefile.patch
new file mode 100644
index 0000000..1468981
--- /dev/null
+++ b/root-doxygen-makefile.patch
@@ -0,0 +1,28 @@
+diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
+index 4e6b47728d..a886c1b729 100644
+--- a/documentation/doxygen/Makefile
++++ b/documentation/doxygen/Makefile
+@@ -8,7 +8,6 @@ export DOXYGEN_ROOT_VERSION := $(shell root -l -b -q -e 'printf("%s\n", gROOT->G
+ export DOXYGEN_EXAMPLE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/macros
+ export DOXYGEN_IMAGE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/html
+ export DOXYGEN_NOTEBOOK_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/notebooks
+-export DOXYGEN_NOTEBOOK_PATH_PARALLEL := $(DOXYGEN_NOTEBOOK_PATH)/parallel
+ export DOXYGEN_STRIP_PATH := $(shell cd $(PWD)/../..; pwd)
+ export DOXYGEN_INCLUDE_PATH := $(shell find $(DOXYGEN_STRIP_PATH) -type d -name dictpch -prune -o -type d -name inc)
+ 
+@@ -33,14 +32,11 @@ doxygen: filter
+ 	$(call MkDir,$(DOXYGEN_OUTPUT_DIRECTORY))
+ 	$(call MkDir,$(DOXYGEN_EXAMPLE_PATH))
+ 	$(call MkDir,$(DOXYGEN_NOTEBOOK_PATH))
+-	$(call MkDir,$(DOXYGEN_NOTEBOOK_PATH_PARALLEL))
+-	time python ./parallelNotebooks.py
+ 	./makehtmlfooter.sh > htmlfooter.html
+ 	doxygen
+ 	./listlibs.sh
+ 	rm -rf files c1* *.ps *.png *.svg *.pdf *.root *.xpm *.out *.dat *.dtd *.dot *.txt listofclass.sh
+-	rm $(DOXYGEN_NOTEBOOK_PATH)/*.root
+-	rm $(DOXYGEN_NOTEBOOK_PATH_PARALLEL)/*.root
++	rm -f $(DOXYGEN_NOTEBOOK_PATH)/*.root
+ 
+ clean:
+ 	rm -r $(DOXYGEN_OUTPUT_DIRECTORY) filter htmlfooter.html dataset*
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 56aa2bc..22284c2 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.10.00.orig/core/base/src/TApplication.cxx root-6.10.00/core/base/src/TApplication.cxx
---- root-6.10.00.orig/core/base/src/TApplication.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/core/base/src/TApplication.cxx	2017-06-14 22:22:40.348551723 +0200
-@@ -273,18 +273,11 @@
+diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base/src/TApplication.cxx
+--- root-6.12.04.orig/core/base/src/TApplication.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/core/base/src/TApplication.cxx	2018-01-07 22:17:25.173658049 +0100
+@@ -275,18 +275,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.10.00.orig/core/base/src/TApplication.cxx root-6.10.00/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -298,7 +291,6 @@
+@@ -300,7 +293,6 @@
        }
     }
  #endif
@@ -30,21 +30,21 @@ diff -ur root-6.10.00.orig/core/base/src/TApplication.cxx root-6.10.00/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.10.00.orig/graf2d/asimage/CMakeLists.txt root-6.10.00/graf2d/asimage/CMakeLists.txt
---- root-6.10.00.orig/graf2d/asimage/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/asimage/CMakeLists.txt	2017-06-14 22:22:40.367551513 +0200
-@@ -13,7 +13,7 @@
- ROOT_GENERATE_DICTIONARY(G__ASImage TASImage.h TASImagePlugin.h TASPluginGS.h MODULE ASImage LINKDEF LinkDef.h  OPTIONS "-writeEmptyRootPCM")
+diff -ur root-6.12.04.orig/graf2d/asimage/CMakeLists.txt root-6.12.04/graf2d/asimage/CMakeLists.txt
+--- root-6.12.04.orig/graf2d/asimage/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/asimage/CMakeLists.txt	2018-01-07 22:20:58.769272293 +0100
+@@ -15,7 +15,7 @@
+                               HEADERS TASImage.h TASImagePlugin.h TASPluginGS.h
+                               SOURCES TASImage.cxx TASPluginGS.cxx
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+-                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES}
++                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES}
+                               DEPENDENCIES Graf BUILTINS AFTERIMAGE)
  
- ROOT_LINKER_LIBRARY(ASImage TASImage.cxx TASPluginGS.cxx  G__ASImage.cxx
--                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
-+                    LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
-                     ${ZLIB_LIBRARIES} DEPENDENCIES Graf BUILTINS AFTERIMAGE)
  
- ROOT_GENERATE_DICTIONARY(G__ASImageGui TASPaletteEditor.h MODULE ASImageGui LINKDEF LinkDefGui.h OPTIONS "-writeEmptyRootPCM")
-diff -ur root-6.10.00.orig/graf2d/asimage/Module.mk root-6.10.00/graf2d/asimage/Module.mk
---- root-6.10.00.orig/graf2d/asimage/Module.mk	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/asimage/Module.mk	2017-06-14 22:22:40.367551513 +0200
+diff -ur root-6.12.04.orig/graf2d/asimage/Module.mk root-6.12.04/graf2d/asimage/Module.mk
+--- root-6.12.04.orig/graf2d/asimage/Module.mk	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/asimage/Module.mk	2018-01-07 22:17:25.174658038 +0100
 @@ -236,7 +236,7 @@
  		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
  		   "$(ASIMAGEO) $(ASIMAGEDO)" \
@@ -54,9 +54,9 @@ diff -ur root-6.10.00.orig/graf2d/asimage/Module.mk root-6.10.00/graf2d/asimage/
  		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(ASNEEDX11LIBS)"
  
  $(call pcmrule,ASIMAGE)
-diff -ur root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx root-6.10.00/graf2d/asimage/src/TASImage.cxx
---- root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/asimage/src/TASImage.cxx	2017-06-14 22:22:40.368551502 +0200
+diff -ur root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx root-6.12.04/graf2d/asimage/src/TASImage.cxx
+--- root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/asimage/src/TASImage.cxx	2018-01-07 22:17:25.176658016 +0100
 @@ -110,6 +110,8 @@
  #   include <draw.h>
  }
@@ -66,7 +66,7 @@ diff -ur root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx root-6.10.00/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2596,14 +2598,120 @@
+@@ -2593,14 +2595,120 @@
     TString fn = font_name;
     fn.Strip();
  
@@ -194,7 +194,7 @@ diff -ur root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx root-6.10.00/graf2d/a
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2627,14 +2735,11 @@
+@@ -2624,14 +2732,11 @@
        return;
     }
  
@@ -212,20 +212,20 @@ diff -ur root-6.10.00.orig/graf2d/asimage/src/TASImage.cxx root-6.10.00/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.10.00.orig/graf2d/graf/CMakeLists.txt root-6.10.00/graf2d/graf/CMakeLists.txt
---- root-6.10.00.orig/graf2d/graf/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/graf/CMakeLists.txt	2017-06-14 22:22:40.369551491 +0200
-@@ -8,6 +8,6 @@
+diff -ur root-6.12.04.orig/graf2d/graf/CMakeLists.txt root-6.12.04/graf2d/graf/CMakeLists.txt
+--- root-6.12.04.orig/graf2d/graf/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/graf/CMakeLists.txt	2018-01-07 22:23:16.766731136 +0100
+@@ -7,6 +7,6 @@
  
- include_directories(${FREETYPE_INCLUDE_DIRS})
+ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+-                              LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext
++                              LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig
+                               DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
  
--ROOT_LINKER_LIBRARY(Graf *.cxx G__Graf.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
-+ROOT_LINKER_LIBRARY(Graf *.cxx G__Graf.cxx LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
- 
- ROOT_INSTALL_HEADERS()
-diff -ur root-6.10.00.orig/graf2d/graf/inc/TTF.h root-6.10.00/graf2d/graf/inc/TTF.h
---- root-6.10.00.orig/graf2d/graf/inc/TTF.h	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/graf/inc/TTF.h	2017-06-14 22:22:40.369551491 +0200
+diff -ur root-6.12.04.orig/graf2d/graf/inc/TTF.h root-6.12.04/graf2d/graf/inc/TTF.h
+--- root-6.12.04.orig/graf2d/graf/inc/TTF.h	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/graf/inc/TTF.h	2018-01-07 22:17:25.177658004 +0100
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -237,9 +237,9 @@ diff -ur root-6.10.00.orig/graf2d/graf/inc/TTF.h root-6.10.00/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.10.00.orig/graf2d/graf/Module.mk root-6.10.00/graf2d/graf/Module.mk
---- root-6.10.00.orig/graf2d/graf/Module.mk	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/graf/Module.mk	2017-06-14 22:22:40.369551491 +0200
+diff -ur root-6.12.04.orig/graf2d/graf/Module.mk root-6.12.04/graf2d/graf/Module.mk
+--- root-6.12.04.orig/graf2d/graf/Module.mk	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/graf/Module.mk	2018-01-07 22:17:25.177658004 +0100
 @@ -58,7 +58,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -249,9 +249,9 @@ diff -ur root-6.10.00.orig/graf2d/graf/Module.mk root-6.10.00/graf2d/graf/Module
  
  $(call pcmrule,GRAF)
  	$(noop)
-diff -ur root-6.10.00.orig/graf2d/graf/src/TTF.cxx root-6.10.00/graf2d/graf/src/TTF.cxx
---- root-6.10.00.orig/graf2d/graf/src/TTF.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/graf/src/TTF.cxx	2017-06-14 22:22:40.370551479 +0200
+diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/TTF.cxx
+--- root-6.12.04.orig/graf2d/graf/src/TTF.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/graf/src/TTF.cxx	2018-01-07 22:17:25.177658004 +0100
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -812,19 +812,19 @@ diff -ur root-6.10.00.orig/graf2d/graf/src/TTF.cxx root-6.10.00/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.10.00.orig/graf2d/postscript/CMakeLists.txt root-6.10.00/graf2d/postscript/CMakeLists.txt
---- root-6.10.00.orig/graf2d/postscript/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/postscript/CMakeLists.txt	2017-06-14 22:22:40.370551479 +0200
+diff -ur root-6.12.04.orig/graf2d/postscript/CMakeLists.txt root-6.12.04/graf2d/postscript/CMakeLists.txt
+--- root-6.12.04.orig/graf2d/postscript/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/postscript/CMakeLists.txt	2018-01-07 22:22:12.902444262 +0100
 @@ -5,5 +5,5 @@
  
- ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext DEPENDENCIES Graf)
-+ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARIES} mathtext fontconfig DEPENDENCIES Graf)
- ROOT_INSTALL_HEADERS()
-diff -ur root-6.10.00.orig/graf2d/postscript/Module.mk root-6.10.00/graf2d/postscript/Module.mk
---- root-6.10.00.orig/graf2d/postscript/Module.mk	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/postscript/Module.mk	2017-06-14 22:22:40.370551479 +0200
+ ROOT_STANDARD_LIBRARY_PACKAGE(Postscript
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+-                              LIBRARIES  ${ZLIB_LIBRARIES} mathtext
++                              LIBRARIES  ${ZLIB_LIBRARIES} mathtext fontconfig
+                               DEPENDENCIES Graf)
+diff -ur root-6.12.04.orig/graf2d/postscript/Module.mk root-6.12.04/graf2d/postscript/Module.mk
+--- root-6.12.04.orig/graf2d/postscript/Module.mk	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/postscript/Module.mk	2018-01-07 22:17:25.178657993 +0100
 @@ -59,7 +59,7 @@
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
@@ -834,9 +834,9 @@ diff -ur root-6.10.00.orig/graf2d/postscript/Module.mk root-6.10.00/graf2d/posts
  
  $(call pcmrule,POSTSCRIPT)
  	$(noop)
-diff -ur root-6.10.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.10.00/graf2d/postscript/src/TPostScript.cxx
---- root-6.10.00.orig/graf2d/postscript/src/TPostScript.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf2d/postscript/src/TPostScript.cxx	2017-06-14 22:22:40.371551468 +0200
+diff -ur root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx root-6.12.04/graf2d/postscript/src/TPostScript.cxx
+--- root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf2d/postscript/src/TPostScript.cxx	2018-01-07 22:17:25.179657982 +0100
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -1096,20 +1096,20 @@ diff -ur root-6.10.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.10.00/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.10.00.orig/graf3d/gl/CMakeLists.txt root-6.10.00/graf3d/gl/CMakeLists.txt
---- root-6.10.00.orig/graf3d/gl/CMakeLists.txt	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf3d/gl/CMakeLists.txt	2017-06-14 22:22:40.371551468 +0200
-@@ -39,6 +39,6 @@
- 
- ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
- 
--ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
-+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx  LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
- 
- ROOT_INSTALL_HEADERS(${installoptions})
-diff -ur root-6.10.00.orig/graf3d/gl/Module.mk root-6.10.00/graf3d/gl/Module.mk
---- root-6.10.00.orig/graf3d/gl/Module.mk	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf3d/gl/Module.mk	2017-06-14 22:22:40.371551468 +0200
+diff -ur root-6.12.04.orig/graf3d/gl/CMakeLists.txt root-6.12.04/graf3d/gl/CMakeLists.txt
+--- root-6.12.04.orig/graf3d/gl/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf3d/gl/CMakeLists.txt	2018-01-07 22:19:37.820176454 +0100
+@@ -41,6 +41,6 @@
+                               HEADERS ${headers}
+                               SOURCES ${sources}
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+-                              LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES}
++                              LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig
+                               DEPENDENCIES Hist Gui Ged
+                               INSTALL_OPTIONS ${installoptions})
+diff -ur root-6.12.04.orig/graf3d/gl/Module.mk root-6.12.04/graf3d/gl/Module.mk
+--- root-6.12.04.orig/graf3d/gl/Module.mk	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf3d/gl/Module.mk	2018-01-07 22:17:25.180657971 +0100
 @@ -95,7 +95,7 @@
  		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
  		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
@@ -1119,9 +1119,9 @@ diff -ur root-6.10.00.orig/graf3d/gl/Module.mk root-6.10.00/graf3d/gl/Module.mk
  
  $(call pcmrule,GL)
  	$(noop)
-diff -ur root-6.10.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.10.00/graf3d/gl/src/TGLFontManager.cxx
---- root-6.10.00.orig/graf3d/gl/src/TGLFontManager.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf3d/gl/src/TGLFontManager.cxx	2017-06-14 22:22:40.371551468 +0200
+diff -ur root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx root-6.12.04/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf3d/gl/src/TGLFontManager.cxx	2018-01-07 22:17:25.180657971 +0100
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1377,9 +1377,9 @@ diff -ur root-6.10.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.10.00/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.10.00.orig/graf3d/gl/src/TGLText.cxx root-6.10.00/graf3d/gl/src/TGLText.cxx
---- root-6.10.00.orig/graf3d/gl/src/TGLText.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/graf3d/gl/src/TGLText.cxx	2017-06-14 22:22:40.372551457 +0200
+diff -ur root-6.12.04.orig/graf3d/gl/src/TGLText.cxx root-6.12.04/graf3d/gl/src/TGLText.cxx
+--- root-6.12.04.orig/graf3d/gl/src/TGLText.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/graf3d/gl/src/TGLText.cxx	2018-01-07 22:17:25.181657960 +0100
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1514,9 +1514,9 @@ diff -ur root-6.10.00.orig/graf3d/gl/src/TGLText.cxx root-6.10.00/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.10.00.orig/gui/gui/src/TGApplication.cxx root-6.10.00/gui/gui/src/TGApplication.cxx
---- root-6.10.00.orig/gui/gui/src/TGApplication.cxx	2017-06-13 09:14:04.000000000 +0200
-+++ root-6.10.00/gui/gui/src/TGApplication.cxx	2017-06-14 22:22:40.372551457 +0200
+diff -ur root-6.12.04.orig/gui/gui/src/TGApplication.cxx root-6.12.04/gui/gui/src/TGApplication.cxx
+--- root-6.12.04.orig/gui/gui/src/TGApplication.cxx	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/gui/gui/src/TGApplication.cxx	2018-01-07 22:17:25.181657960 +0100
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-js-syntax.patch b/root-js-syntax.patch
new file mode 100644
index 0000000..1d8a6c8
--- /dev/null
+++ b/root-js-syntax.patch
@@ -0,0 +1,114 @@
+From 575c6e2851939afc6d80395c5e4cae9d2e10b433 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 16 Jan 2018 06:40:07 +0100
+Subject: [PATCH 1/3] Quote word default
+
+---
+ etc/notebook/JsMVA/js/DecisionTree.js     | 6 +++---
+ etc/notebook/JsMVA/js/DecisionTree.min.js | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/notebook/JsMVA/js/DecisionTree.js b/etc/notebook/JsMVA/js/DecisionTree.js
+index 5311974202..18eb8eb200 100644
+--- a/etc/notebook/JsMVA/js/DecisionTree.js
++++ b/etc/notebook/JsMVA/js/DecisionTree.js
+@@ -54,7 +54,7 @@
+         },
+         link: {
+             colors:{
+-                default: "#ccc",
++                "default": "#CCC",
+                 focus: "#033A00"
+             },
+             width: "4px",
+@@ -235,7 +235,7 @@
+         linkSelector.transition().duration(style.aduration)
+             .attr("d", d3path)
+             .style("fill", "none")
+-            .style("stroke", style.link.colors.default)
++            .style("stroke", style.link.colors["default"])
+             .style("stroke-width", style.link.width)
+             .attr("id", function(d){return "link"+d.target.id;});
+ 
+@@ -251,7 +251,7 @@
+     var path = function(node, i, clear){
+         svg.selectAll("path.link").filter(function(d){return d.target.id==node.id;})
+             .style("stroke-width", (clear) ? style.link.width : style.link.focus_width)
+-            .style("stroke", (clear) ? style.link.colors.default : style.link.colors.focus);
++            .style("stroke", (clear) ? style.link.colors["default"] : style.link.colors.focus);
+ 
+         svg.selectAll("g.nodes rect").filter(function(d){return d.id==node.id;})
+             .style("stroke-width", style.node.swidth)
+-- 
+2.14.3
+
+From 21d4b8c311a07fa32dc29e76f2a116e7ed429ec0 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 16 Jan 2018 06:44:31 +0100
+Subject: [PATCH 2/3] Avoid new syntax for default arguments
+
+---
+ etc/notebook/JsMVA/js/NeuralNetwork.js     | 5 ++++-
+ etc/notebook/JsMVA/js/NeuralNetwork.min.js | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/etc/notebook/JsMVA/js/NeuralNetwork.js b/etc/notebook/JsMVA/js/NeuralNetwork.js
+index 8e52252be3..25ba32c6ec 100644
+--- a/etc/notebook/JsMVA/js/NeuralNetwork.js
++++ b/etc/notebook/JsMVA/js/NeuralNetwork.js
+@@ -506,7 +506,10 @@
+     };
+ 
+ 
+-    NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure=false) {
++    NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure) {
++        if (oldStructure===undefined) {
++            oldStructure = false;
++        }
+         var div = d3.select("#"+divid);
+         canvas = {
+             width:  Number(div.property("style")["width"].replace("px","")),
+-- 
+2.14.3
+
+From 501e9d62367de6c1d4e487dd413277e4d74a5ce1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 16 Jan 2018 06:48:16 +0100
+Subject: [PATCH 3/3] Adapt to filename change in jsroot
+
+---
+ etc/notebook/JsMVA/js/JsMVA.js               | 2 +-
+ etc/notebook/JsMVA/js/JsMVA.min.js           | 2 +-
+ etc/notebook/JsMVA/js/NetworkDesigner.js     | 2 +-
+ etc/notebook/JsMVA/js/NetworkDesigner.min.js | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/notebook/JsMVA/js/JsMVA.js b/etc/notebook/JsMVA/js/JsMVA.js
+index c8e4522e27..9e474d080e 100644
+--- a/etc/notebook/JsMVA/js/JsMVA.js
++++ b/etc/notebook/JsMVA/js/JsMVA.js
+@@ -32,7 +32,7 @@
+ 
+     require.config({
+         paths: {
+-            'd3': JSROOT_source_dir+'d3.v3.min',
++            'd3': JSROOT_source_dir+'d3.min',
+             'JsRootCore': JSROOT_source_dir+'JSRootCore.min',
+             'nn': url+'NeuralNetwork.min',
+             'dtree': url+'DecisionTree.min',
+diff --git a/etc/notebook/JsMVA/js/NetworkDesigner.js b/etc/notebook/JsMVA/js/NetworkDesigner.js
+index ed771fbf81..a744b2371e 100644
+--- a/etc/notebook/JsMVA/js/NetworkDesigner.js
++++ b/etc/notebook/JsMVA/js/NetworkDesigner.js
+@@ -19,7 +19,7 @@
+         paths: {
+             "jquery-connections": baseURL + "jquery.connections.min",
+             "jquery-timing": baseURL + "jquery-timing.min",
+-            "d3": "https://root.cern.ch/js/notebook/scripts/d3.v3.min"
++            "d3": "https://root.cern.ch/js/notebook/scripts/d3.min"
+         },
+         shim: {
+             "jquery-ui": {
+-- 
+2.14.3
+
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
new file mode 100644
index 0000000..67c8ff4
--- /dev/null
+++ b/root-jupyroot-static.patch
@@ -0,0 +1,36 @@
+diff -ur root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.12.04/bindings/pyroot/JsMVA/JPyInterface.py
+--- root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/bindings/pyroot/JsMVA/JPyInterface.py	2018-01-08 13:07:08.088711528 +0100
+@@ -188,7 +188,7 @@
+ ## Class for creating the output scripts and inserting them to cell output
+ class JsDraw:
+     ## Base repository
+-    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
++    __jsMVARepo = "/static/JsMVA"
+  
+     ## String containing the link to JavaScript files
+     __jsMVASourceDir = __jsMVARepo + "/js"
+diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py root-6.12.04/bindings/pyroot/JupyROOT/utils.py
+--- root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/bindings/pyroot/JupyROOT/utils.py	2018-01-08 13:13:40.857391851 +0100
+@@ -39,7 +39,7 @@
+ _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
+ 
+ 
+-_jsROOTSourceDir = "https://root.cern.ch/js/notebook/"
++_jsROOTSourceDir = "/static/jsroot/"
+ _jsCanvasWidth = 800
+ _jsCanvasHeight = 600
+ 
+diff -ur root-6.12.04.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.12.04/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.12.04.orig/etc/notebook/JsMVA/js/JsMVA.js	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/etc/notebook/JsMVA/js/JsMVA.js	2018-01-08 13:20:04.248138322 +0100
+@@ -16,7 +16,7 @@
+ 
+ (function(factory){
+ 
+-    var JSROOT_source_dir = "https://root.cern.ch/js/notebook/scripts/";
++    var JSROOT_source_dir = "/static/jsroot/scripts/";
+ 
+     var url = "";
+     if (requirejs.s.contexts.hasOwnProperty("_")) {
diff --git a/root-memory-arm.patch b/root-memory-arm.patch
new file mode 100644
index 0000000..b281dea
--- /dev/null
+++ b/root-memory-arm.patch
@@ -0,0 +1,15 @@
+--- root-6.12.04.orig/interpreter/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/interpreter/CMakeLists.txt	2018-01-11 16:33:13.034850962 +0100
+@@ -75,6 +75,12 @@
+   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /ignore:4049,4206,4217,4221")
+ endif()
+ 
++# Reduce memory usage during linking on ARM by generating minimal debuginfo
++if(ROOT_CLING_TARGET STREQUAL "ARM")
++  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")  
++  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")  
++endif()
++
+ set(LLVM_TARGETS_TO_BUILD ${ROOT_CLING_TARGET} CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+ 
+ if(clingtest)
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
new file mode 100644
index 0000000..777603c
--- /dev/null
+++ b/root-memory-usage.patch
@@ -0,0 +1,59 @@
+From 3617dd1d911bb5e8fa17a6139dbb887c44dae0fe Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 16 Jan 2018 10:25:50 +0100
+Subject: [PATCH] Reduce the needed memory for compilation
+
+The linking of rootcling_stage1 and libCling requires a lot of memory.
+Since these are linked from mostly the same objects, the build is ready
+to link them at the same time. If you make a parallel build this means
+that the two targets that require the most amount of memory are being
+linked in parallel. This exhausts the available memory, and the
+computer starts swapping.
+
+This adds a dependency of one of the targets to the other. The dependency is
+not really there since it is not needed for building, but it prevents the
+two memory consuming targets to be built in parallel.
+
+A similar dependency existed before the code latest code changes
+(see commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
+rootcling and libCling.
+---
+ core/metacling/Module.mk          | 6 +++++-
+ core/metacling/src/CMakeLists.txt | 4 ++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/core/metacling/Module.mk b/core/metacling/Module.mk
+index 4788eca393..7f520e41b6 100644
+--- a/core/metacling/Module.mk
++++ b/core/metacling/Module.mk
+@@ -46,7 +46,11 @@ endif
+ CLINGLIB     := $(LPATH)/libCling.$(SOEXT)
+ CLINGMAP     := $(CLINGLIB:.$(SOEXT)=.rootmap)
+ 
+-$(CLINGLIB):    $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO)
++# The dependency on $(ROOTCLING1EXE) was added to prevent $(CLINGLIB) and
++# $(ROOTCLING1EXE) from being linked in parallel.
++# This avoids doing two memory consuming operations in parallel.
++$(CLINGLIB):    $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
++		$(ROOTCLING1EXE)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS) $(LIBCLINGLDFLAGS)" \
+ 		   "$(SOFLAGS)" libCling.$(SOEXT) $@ \
+ 		   "$(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
+diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
+index e820d144eb..3a1f1ca446 100644
+--- a/core/metacling/src/CMakeLists.txt
++++ b/core/metacling/src/CMakeLists.txt
+@@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling
+         $<TARGET_OBJECTS:Dictgen>
+         $<TARGET_OBJECTS:MetaCling>
+         LIBRARIES ${CLING_LIBRARIES})
++# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
++# rootcling_stage1 from being linked in parallel.
++# This avoids doing two memory consuming operations in parallel.
++add_dependencies(Cling rootcling_stage1)
+ 
+ if(MSVC)
+   set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+-- 
+2.14.3
+
diff --git a/root-mysql-config.patch b/root-mysql-config.patch
deleted file mode 100644
index 58db421..0000000
--- a/root-mysql-config.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6991169440211dd29c4608541b8740337c1891fa Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 27 Sep 2017 21:06:41 +0200
-Subject: [PATCH] Fix for new mysql_config
-
----
- cmake/modules/FindMySQL.cmake | 9 +++------
- configure                     | 4 +++-
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
-index 123505a393..c818f5a1ab 100644
---- a/cmake/modules/FindMySQL.cmake
-+++ b/cmake/modules/FindMySQL.cmake
-@@ -20,12 +20,9 @@ endif()
- if(MYSQL_CONFIG_EXECUTABLE)
-   execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE MYSQL_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-   separate_arguments(MYSQL_CFLAGS)
--  string( REGEX MATCH "-I[^;]+" MYSQL_INCLUDE_DIR "${MYSQL_CFLAGS}" )
--  string( REPLACE "-I" "" MYSQL_INCLUDE_DIR "${MYSQL_INCLUDE_DIR}")
--  if(NOT EXISTS ${MYSQL_INCLUDE_DIR})
--    set(MYSQL_INCLUDE_DIR MYSQL_INCLUDE_DIR-NOTFOUND)
--  endif()
--  string( REGEX REPLACE "-I[^;]+;" "" MYSQL_CFLAGS "${MYSQL_CFLAGS}" )
-+  string( REGEX MATCHALL "-I[^;]+" MYSQL_INCLUDE_DIRS "${MYSQL_CFLAGS}" )
-+  string( REPLACE "-I" "" MYSQL_INCLUDE_DIRS "${MYSQL_INCLUDE_DIRS}")
-+  find_path(MYSQL_INCLUDE_DIR mysql.h PATHS ${MYSQL_INCLUDE_DIRS} NO_DEFAULT_PATH)
-   execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE MYSQL_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
- else()
-   find_path(MYSQL_INCLUDE_DIR mysql.h
-diff --git a/configure b/configure
-index 26fe09ab31..6bdf5b29c4 100755
---- a/configure
-+++ b/configure
-@@ -3738,9 +3738,11 @@ if test ! "x$enable_mysql" = "xno"; then
-           else
-              result "ok"
-              mysqllib=`$mysql_config --libs | sed -e s/\'//g`
--             mysqlincdir=`$mysql_config --cflags | sed -e 's,^.*-I\([^ ]*\).*$,\1,' -e s/\'//g`
-              mysqllibdir=""
-+             mysqlincdir=`$mysql_config --cflags | sed -e s/\'//g | tr ' ' '\n' | grep ^-I | sed -e 's,^-I,,' | tr '\n' ' '`
-              check_header "mysql.h" "" $mysqlincdir
-+             mysqlinc=$found_hdr
-+             mysqlincdir=$found_dir
-              if test "x$found_hdr" = "x"; then
-                 enable_mysql="no"
-              fi
--- 
-2.13.5
-
diff --git a/root-mysql-workaround.patch b/root-mysql-workaround.patch
deleted file mode 100644
index ad7773d..0000000
--- a/root-mysql-workaround.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 511ae175e21c6b5fa32201de23b379f80ed37981 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Tue, 5 Sep 2017 14:57:40 +0200
-Subject: [PATCH] Do not include internal MySQL header
-
-This breaks the build with -Dmysql=ON since the internal header will
-not be found.
----
- sql/mysql/src/TMySQLServer.cxx | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/sql/mysql/src/TMySQLServer.cxx b/sql/mysql/src/TMySQLServer.cxx
-index ee9d912e0f..40eebf55e9 100644
---- a/sql/mysql/src/TMySQLServer.cxx
-+++ b/sql/mysql/src/TMySQLServer.cxx
-@@ -52,9 +52,6 @@
- #include "TObjString.h"
- #include "TObjArray.h"
- 
--#include <my_global.h>
--
--
- ClassImp(TMySQLServer)
- 
- ////////////////////////////////////////////////////////////////////////////////
--- 
-2.13.5
-
diff --git a/root-ppc64-doc.patch b/root-ppc64-doc.patch
new file mode 100644
index 0000000..6ab5ab1
--- /dev/null
+++ b/root-ppc64-doc.patch
@@ -0,0 +1,24 @@
+diff -ur root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C
+--- root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C	2018-01-15 21:30:10.608693441 +0100
+@@ -13,8 +13,6 @@
+ /// In this example, shape uncertainties are not taken into account, but
+ /// normalization uncertainties are.
+ ///
+-/// \macro_image
+-/// \macro_output
+ /// \macro_code
+ ///
+ /// \author Kyle Cranmer
+diff -ur root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C
+--- root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C	2018-01-15 21:30:39.405371047 +0100
+@@ -5,8 +5,6 @@
+ ///
+ /// This tutorial shows an example of using the BayesianCalculator class
+ ///
+-/// \macro_image
+-/// \macro_output
+ /// \macro_code
+ ///
+ /// \author Gregory Schott
diff --git a/root-rootcling-tmpfile.patch b/root-rootcling-tmpfile.patch
deleted file mode 100644
index c0c21cc..0000000
--- a/root-rootcling-tmpfile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b74835ec7ca9e42c160702f9690cdf2ee43b55dd Mon Sep 17 00:00:00 2001
-From: Raphael Isemann <teemperor@gmail.com>
-Date: Tue, 11 Jul 2017 08:10:51 +0200
-Subject: [PATCH] Use pid in temp. file names to mitigate race conditions.
-
-In case CMake spawns multiple instances of a rootcling invocation
-(which can happen as CMake doesn't have a good mechanism for ensuring
-that we only spawn one when using the make build system), we now
-choose process-unique file names for the temporaries to prevent the
-build errors when multiple rootcling invocations try to work
-on the same temporary file.
-
-This isn't a real fix, but as renaming files from temporary to the
-real name is usually FS atomic, this will mitigate any future race
-conditions we have in this problematic part of the building process
-on obscure build systems. Those systems possible don't strictly follow the
-order in which they are supposed to build those targets, so this hopefully
-makes the consequences of any race conditions less intrusive  (e.g. Visual
-Studio also seems to suffer from this problem according to the mailing
-list).
----
- core/dictgen/src/rootcling_impl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
-index bcfaa50631..01f0ff7128 100644
---- a/core/dictgen/src/rootcling_impl.cxx
-+++ b/core/dictgen/src/rootcling_impl.cxx
-@@ -3218,7 +3218,7 @@ public:
-    tempFileNamesCatalog(): m_size(0), m_emptyString("") {};
- 
-    std::string getTmpFileName(const std::string &filename) {
--      return filename + "_tmp";
-+      return filename + "_tmp_" + std::to_string(getpid());
-    }
-    /////////////////////////////////////////////////////////////////////////////
-    /// Adds the name and the associated temp name to the catalog.
--- 
-2.13.0
-
diff --git a/root-stressgraphics.patch b/root-stressgraphics.patch
deleted file mode 100644
index a36fead..0000000
--- a/root-stressgraphics.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 0dbfe8c..4341c21 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -8,7 +8,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-     7      4980        50     13821        50      8215       310     16143      1300     12230       500      5011        70
-     8      5442        80     13415        50      9599       150     18430       700     12398       300      5469        80
-     9      9253       100     14310        50      9664       600     19851      2400     12199       900      9449       100
--   10      8863        70     13539       100     14622      1100     24343      1100     23278      1700      8894        70
-+   10      8863        70     13539       100     14622      1200     24343      1100     23278      1700      8894        70
-    11     12971       100     14377        50     20508      1300     34063      2000     32033      1200     12864       150
-    12      7674       100     13482        50     27519      2500     83557      3000     38505      4000      7720       150
-    13      5600       400     13242       300      9805       400     16881       400     15063       800      5638       400
diff --git a/root-system-pythia.patch b/root-system-pythia.patch
new file mode 100644
index 0000000..60e1382
--- /dev/null
+++ b/root-system-pythia.patch
@@ -0,0 +1,42 @@
+diff -ur root-6.12.04.orig/tutorials/pythia/pythia8.C root-6.12.04/tutorials/pythia/pythia8.C
+--- root-6.12.04.orig/tutorials/pythia/pythia8.C	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/tutorials/pythia/pythia8.C	2018-01-10 07:01:23.215029332 +0100
+@@ -8,11 +8,6 @@
+ ///  root > .x pythia8.C
+ /// ~~~
+ ///
+-/// Note that before executing this script,
+-///
+-///  - the env variable PYTHIA8 must point to the pythia8100 (or newer) directory
+-///  - the env variable PYTHIA8DATA must be defined and it must point to $PYTHIA8/xmldoc
+-///
+ /// \macro_code
+ ///
+ /// \author Andreas Morsch
+@@ -27,26 +22,6 @@
+ 
+ void pythia8(Int_t nev  = 100, Int_t ndeb = 1)
+ {
+-   const char *p8dataenv = gSystem->Getenv("PYTHIA8DATA");
+-   if (!p8dataenv) {
+-      const char *p8env = gSystem->Getenv("PYTHIA8");
+-      if (!p8env) {
+-         Error("pythia8.C",
+-               "Environment variable PYTHIA8 must contain path to pythia directory!");
+-         return;
+-      }
+-      TString p8d = p8env;
+-      p8d += "/xmldoc";
+-      gSystem->Setenv("PYTHIA8DATA", p8d);
+-   }
+-
+-   const char* path = gSystem->ExpandPathName("$PYTHIA8DATA");
+-   if (gSystem->AccessPathName(path)) {
+-         Error("pythia8.C",
+-               "Environment variable PYTHIA8DATA must contain path to $PYTHIA8/xmldoc directory !");
+-      return;
+-   }
+-
+ // Load libraries
+    gSystem->Load("libEG");
+    gSystem->Load("libEGPythia8");
diff --git a/root-test-subdirs.patch b/root-test-subdirs.patch
new file mode 100644
index 0000000..af59a8b
--- /dev/null
+++ b/root-test-subdirs.patch
@@ -0,0 +1,244 @@
+From eb7d389e582fd11cf00879a3daf161fa7e1b0f40 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 16 Jan 2018 06:11:30 +0100
+Subject: [PATCH] Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test
+ directories
+
+---
+ cmake/modules/RootNewMacros.cmake | 1 -
+ core/base/CMakeLists.txt          | 4 +---
+ core/cont/CMakeLists.txt          | 4 +---
+ core/foundation/CMakeLists.txt    | 5 +----
+ core/imt/CMakeLists.txt           | 4 ++--
+ core/meta/CMakeLists.txt          | 4 +---
+ core/metacling/CMakeLists.txt     | 4 +---
+ core/thread/CMakeLists.txt        | 4 +---
+ graf2d/gpad/CMakeLists.txt        | 8 +++-----
+ hist/hist/CMakeLists.txt          | 6 ++----
+ hist/histdraw/CMakeLists.txt      | 4 +---
+ io/io/CMakeLists.txt              | 4 +---
+ tmva/CMakeLists.txt               | 3 ---
+ tmva/tmva/test/CMakeLists.txt     | 9 ---------
+ tree/tree/CMakeLists.txt          | 4 +---
+ tree/treeplayer/CMakeLists.txt    | 4 +---
+ 16 files changed, 17 insertions(+), 55 deletions(-)
+ delete mode 100644 tmva/tmva/test/CMakeLists.txt
+
+diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
+index 340d5c9951..77b784e4ea 100644
+--- a/cmake/modules/RootNewMacros.cmake
++++ b/cmake/modules/RootNewMacros.cmake
+@@ -1304,7 +1304,6 @@ function(ROOT_ADD_GTEST test_suite)
+   # against. For example, tests in Core should link only against libCore. This could be tricky
+   # to implement because some ROOT components create more than one library.
+   ROOT_EXECUTABLE(${test_suite} ${source_files} LIBRARIES ${ARG_LIBRARIES})
+-  set_property(TARGET ${test_suite} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+   target_link_libraries(${test_suite} gtest gtest_main gmock gmock_main)
+ 
+   ROOT_PATH_TO_STRING(mangled_name ${test_suite} PATH_SEPARATOR_REPLACEMENT "-")
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index f3738e76a8..0fabc03e4e 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -2,9 +2,7 @@
+ # CMakeLists.txt file for building ROOT core/base package
+ ############################################################################
+ 
+-if(testing)
+-    add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
+ 
+diff --git a/core/cont/CMakeLists.txt b/core/cont/CMakeLists.txt
+index 2d5363d3d8..bb5a82e133 100644
+--- a/core/cont/CMakeLists.txt
++++ b/core/cont/CMakeLists.txt
+@@ -2,9 +2,7 @@
+ # CMakeLists.txt file for building ROOT core/cont package
+ ############################################################################
+ 
+-if(testing)
+-  add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
+ 
+diff --git a/core/foundation/CMakeLists.txt b/core/foundation/CMakeLists.txt
+index 9cc29d871e..af594ba98f 100644
+--- a/core/foundation/CMakeLists.txt
++++ b/core/foundation/CMakeLists.txt
+@@ -21,7 +21,4 @@ set_target_properties(Foundation_Stage1 PROPERTIES COMPILE_FLAGS "${COMPILE_FLAG
+ 
+ ROOT_INSTALL_HEADERS()
+ 
+-if(testing)
+-  add_subdirectory(test)
+-endif()
+-
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+diff --git a/core/imt/CMakeLists.txt b/core/imt/CMakeLists.txt
+index 6ef45c7fc2..4b86f58ee2 100644
+--- a/core/imt/CMakeLists.txt
++++ b/core/imt/CMakeLists.txt
+@@ -21,6 +21,6 @@ ROOT_LINKER_LIBRARY(Imt ${sources}
+ 
+ ROOT_INSTALL_HEADERS(${installoptions})
+ 
+-if(imt AND testing)
+-    add_subdirectory(test)
++if(imt)
++    ROOT_ADD_TEST_SUBDIRECTORY(test)
+ endif()
+diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt
+index df84a83948..4843b06cf0 100644
+--- a/core/meta/CMakeLists.txt
++++ b/core/meta/CMakeLists.txt
+@@ -12,6 +12,4 @@ ROOT_OBJECT_LIBRARY(Meta ${sources})
+ 
+ ROOT_INSTALL_HEADERS()
+ 
+-if(testing)
+-  add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+diff --git a/core/metacling/CMakeLists.txt b/core/metacling/CMakeLists.txt
+index 0fec8de3e8..5468064771 100644
+--- a/core/metacling/CMakeLists.txt
++++ b/core/metacling/CMakeLists.txt
+@@ -4,6 +4,4 @@
+ 
+ add_subdirectory(src)
+ 
+-if(testing)
+-    add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt
+index 0ec5857e50..2149ff5d47 100644
+--- a/core/thread/CMakeLists.txt
++++ b/core/thread/CMakeLists.txt
+@@ -36,6 +36,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Thread
+                               LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
+                               INSTALL_OPTIONS ${installoptions})
+ 
+-if(testing)
+-    add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+diff --git a/graf2d/gpad/CMakeLists.txt b/graf2d/gpad/CMakeLists.txt
+index 51da1c2320..06e508981f 100644
+--- a/graf2d/gpad/CMakeLists.txt
++++ b/graf2d/gpad/CMakeLists.txt
+@@ -14,8 +14,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gpad
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+                               DEPENDENCIES Graf Hist)
+ 
+-if(testing)
+-    if(root7)
+-        add_subdirectory(v7/test)
+-    endif()
+-endif()
+\ No newline at end of file
++if(root7)
++    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
++endif()
+diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt
+index 88396c4924..3ac1898ccd 100644
+--- a/hist/hist/CMakeLists.txt
++++ b/hist/hist/CMakeLists.txt
+@@ -15,10 +15,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+                               DEPENDENCIES Matrix MathCore RIO)
+ 
+-if(testing)
+-  add_subdirectory(test)
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+ 
+ if(root7)
+-    add_subdirectory(v7/test)
+-  endif()
++    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
+ endif()
+diff --git a/hist/histdraw/CMakeLists.txt b/hist/histdraw/CMakeLists.txt
+index 51721f2d0e..9f3232ae5f 100644
+--- a/hist/histdraw/CMakeLists.txt
++++ b/hist/histdraw/CMakeLists.txt
+@@ -12,7 +12,5 @@ if(root7)
+          DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+          DEPENDENCIES Gpad Hist)
+ 
+-    if(testing)
+-        add_subdirectory(v7/test)
+-    endif()
++    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
+ endif()
+diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt
+index 7ca1104287..78e94786da 100644
+--- a/io/io/CMakeLists.txt
++++ b/io/io/CMakeLists.txt
+@@ -18,8 +18,6 @@ ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:RIOObjs> $<TARGET_OBJECTS:RootPc
+                                DEPENDENCIES Core Thread)
+ ROOT_INSTALL_HEADERS()
+ 
+-if(testing)
+-  add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+ 
+ #--- Extra rules ----------------------------------------------------------
+diff --git a/tmva/CMakeLists.txt b/tmva/CMakeLists.txt
+index 5648511bfe..d29bfb5061 100644
+--- a/tmva/CMakeLists.txt
++++ b/tmva/CMakeLists.txt
+@@ -8,6 +8,3 @@ endif()
+ if(r)
+ add_subdirectory(rmva)
+ endif()
+-#if(testing)
+-# add_subdirectory(test)
+-#endif()
+diff --git a/tmva/tmva/test/CMakeLists.txt b/tmva/tmva/test/CMakeLists.txt
+deleted file mode 100644
+index fc2a3e633d..0000000000
+--- a/tmva/tmva/test/CMakeLists.txt
++++ /dev/null
+@@ -1,9 +0,0 @@
+-############################################################################
+-# CMakeLists.txt file for building ROOT TMVA tests.
+-# @author Simon Pfreundschuh
+-############################################################################
+-
+-project(tmva-tests)
+-find_package(ROOT REQUIRED)
+-
+-ROOT_ADD_TEST_SUBDIRECTORY(DNN)
+diff --git a/tree/tree/CMakeLists.txt b/tree/tree/CMakeLists.txt
+index e60675553f..82626b1c04 100644
+--- a/tree/tree/CMakeLists.txt
++++ b/tree/tree/CMakeLists.txt
+@@ -8,6 +8,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Tree
+                               LIBRARIES ${TBB_LIBRARIES}
+                               DEPENDENCIES Net RIO Thread Imt)
+ 
+-if(testing)
+-   add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt
+index 688a08fd03..a72a02e18a 100644
+--- a/tree/treeplayer/CMakeLists.txt
++++ b/tree/treeplayer/CMakeLists.txt
+@@ -45,6 +45,4 @@ if(APPLE)
+   endif()
+ endif()
+ 
+-if(testing)
+-  add_subdirectory(test)
+-endif()
++ROOT_ADD_TEST_SUBDIRECTORY(test)
+-- 
+2.14.3
+
diff --git a/root-testfiles.sh b/root-testfiles.sh
index f84635f..ec56fc1 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -7,9 +7,9 @@ pushd files
 
 wget -N ${SITE}/aleph_ref_5.root
 wget -N ${SITE}/aleph.root
-wget -N ${SITE}/alice3_ref_5.root
+wget -N ${SITE}/alice3_ref_6.root
 wget -N ${SITE}/alice3.root
-wget -N ${SITE}/ams_ref_3.root
+wget -N ${SITE}/ams_ref_4.root
 wget -N ${SITE}/ams.root
 wget -N ${SITE}/atlas_ref_5.root
 wget -N ${SITE}/atlas.root
@@ -25,7 +25,7 @@ wget -N ${SITE}/brahms_ref_3.root
 wget -N ${SITE}/brahms.root
 wget -N ${SITE}/btev_ref_3.root
 wget -N ${SITE}/btev.root
-wget -N ${SITE}/cdf_ref_5.root
+wget -N ${SITE}/cdf_ref_6.root
 wget -N ${SITE}/cdf.root
 wget -N ${SITE}/chambers_ref_3.root
 wget -N ${SITE}/chambers.root
@@ -39,7 +39,7 @@ wget -N ${SITE}/felix_ref_3.root
 wget -N ${SITE}/felix.root
 wget -N ${SITE}/ganil_ref_3.root
 wget -N ${SITE}/ganil.root
-wget -N ${SITE}/gem_ref_4.root
+wget -N ${SITE}/gem_ref_5.root
 wget -N ${SITE}/gem.root
 wget -N ${SITE}/hades2_ref_4.root
 wget -N ${SITE}/hades2.root
@@ -81,6 +81,11 @@ wget -N ${SITE}/usa.root
 
 for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
 
+mkdir tutorials
+pushd tutorials
+wget -N ${SITE}/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
+popd
+
 popd
 
 tar -J -c --group root --owner root -f root-testfiles.tar.xz files
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index c40ce0a..f3b343d 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,23 +1,32 @@
-diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-10-16 18:28:58.000000000 +0200
-+++ root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake	2017-10-19 21:18:23.053801458 +0200
-@@ -1511,74 +1511,19 @@
+diff -ur root-6.12.04.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.12.04/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.12.04.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/cmake/modules/SearchInstalledSoftware.cmake	2018-01-07 22:45:45.537658993 +0100
+@@ -1580,71 +1580,18 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
 -  # FIXME: Remove our version of gtest in roottest. We can reuse this one.
--  # Add gtest
+-  # Add googletest
 -  # http://stackoverflow.com/questions/9689183/cmake-googletest
--
--  set(_byproduct_binary_dir
++ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0
++ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock)
++  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
+ 
+-  set(_gtest_byproduct_binary_dir
 -    ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build/googlemock/)
--  set(_byproducts
--    ${_byproduct_binary_dir}/gtest/libgtest.a
--    ${_byproduct_binary_dir}/gtest/libgtest_main.a
--    ${_byproduct_binary_dir}/libgmock.a
--    ${_byproduct_binary_dir}/libgmock_main.a
+-  set(_gtest_byproducts
+-    ${_gtest_byproduct_binary_dir}/gtest/libgtest.a
+-    ${_gtest_byproduct_binary_dir}/gtest/libgtest_main.a
+-    ${_gtest_byproduct_binary_dir}/libgmock.a
+-    ${_gtest_byproduct_binary_dir}/libgmock_main.a
 -    )
 -
+-  if(MSVC)
+-    set(EXTRA_GTEST_OPTS
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=\\\"\\\"
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=\\\"\\\")
+-  endif()
+-
 -  ExternalProject_Add(
 -    googletest
 -    GIT_REPOSITORY https://github.com/google/googletest.git
@@ -36,9 +45,10 @@ diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10
 -                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 -                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 -                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+-                  ${EXTRA_GTEST_OPTS}
 -    # Disable install step
 -    INSTALL_COMMAND ""
--    BUILD_BYPRODUCTS ${_byproducts}
+-    BUILD_BYPRODUCTS ${_gtest_byproducts}
 -    # Wrap download, configure and build steps in a script to log output
 -    LOG_DOWNLOAD ON
 -    LOG_CONFIGURE ON
@@ -53,28 +63,17 @@ diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10
 -  ExternalProject_Get_Property(googletest binary_dir)
 -  set(_G_LIBRARY_PATH ${binary_dir}/googlemock/)
 -
--  # gtest
--  add_library(gtest IMPORTED STATIC GLOBAL)
--  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest.a)
--  add_dependencies(gtest googletest)
--
--  # gtest_main
--  add_library(gtest_main IMPORTED STATIC GLOBAL)
--  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest_main.a)
--  add_dependencies(gtest_main googletest)
-+ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0
-+ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock)
-+  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
- 
-   # gmock
-   add_library(gmock IMPORTED STATIC GLOBAL)
-   set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock.a)
--  add_dependencies(gmock googletest)
- 
-   # gmock_main
-   add_library(gmock_main IMPORTED STATIC GLOBAL)
-   set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock_main.a)
--  add_dependencies(gmock_main googletest)
+-  # Register gtest, gtest_main, gmock, gmock_main
+-  foreach (lib gtest gtest_main gmock gmock_main)
++  # Register gmock, gmock_main
++  foreach (lib gmock gmock_main)
+     add_library(${lib} IMPORTED STATIC GLOBAL)
+-    add_dependencies(${lib} googletest)
+   endforeach()
+-  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX})
  
 + endif()
  endif()
diff --git a/root-urw-otf-hack.patch b/root-urw-otf-hack.patch
new file mode 100644
index 0000000..f13a881
--- /dev/null
+++ b/root-urw-otf-hack.patch
@@ -0,0 +1,15 @@
+diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/TTF.cxx
+--- root-6.12.04.orig/graf2d/graf/src/TTF.cxx	2018-01-15 10:57:07.314073647 +0100
++++ root-6.12.04/graf2d/graf/src/TTF.cxx	2018-01-15 11:02:00.210880469 +0100
+@@ -126,6 +126,11 @@
+              (platform == 1 && encoding == 0 &&
+               (fgFontID[fgCurFontIdx] == 12 ||
+                fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)) ||
++             // Horrible hack for broken charmaps in StandardSymbolsPS.otf
++             // Hopefully temporary...
++             (platform == 0 && encoding == 3 &&
++              (fgFontID[fgCurFontIdx] == 12 ||
+                fgFontID[fgCurFontIdx] == 15)))
+          {
+             fgCharMap[fgCurFontIdx] = charmap;
diff --git a/root.spec b/root.spec
index 3bb58da..b784230 100644
--- a/root.spec
+++ b/root.spec
@@ -15,6 +15,14 @@
 %global hadoop 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
+# Building the experimental ROOT 7 classes requires c++-14.
+# This is the default for gcc 6.1 and later.
+%global root7 1
+%else
+%global root7 0
+%endif
+
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
@@ -23,7 +31,7 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.08
+Version:	6.12.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -53,33 +61,45 @@ Patch2:		%{name}-doc-no-notebooks.patch
 Patch3:		%{name}-avoid-gui-crash.patch
 #		Unbundle gtest
 Patch4:		%{name}-unbundle-gtest.patch
-#		Fix stressGraphics.ref
-#		https://github.com/root-project/root/pull/659
-Patch5:		%{name}-stressgraphics.patch
-#		Avoid build failures due to temporary file name clashes
-#		Backported from upstream git (master)
-Patch6:		%{name}-rootcling-tmpfile.patch
-#		Do not include internal MySQL header
-#		Backported from upstream git (master)
-Patch7:		%{name}-mysql-workaround.patch
-#		Adapt to new mysql_config version
-#		https://github.com/root-project/root/pull/1067
-Patch8:		%{name}-mysql-config.patch
-#		Address some warnings during documentation generation
-#		https://github.com/root-project/root/pull/1212
-Patch9:		%{name}-dox-filter.patch
+#		Horrible hack for broken charmaps in StandardSymbolsPS.otf
+#		Hopefully temporary...
+#		https://bugzilla.redhat.com/show_bug.cgi?id=1534206
+Patch5:		%{name}-urw-otf-hack.patch
+#		Use local static script and style files for JupyROOT
+Patch6:		%{name}-jupyroot-static.patch
+#		Fix some javascript syntax choking yuicompressor
+#		Adapt d3 path to updated jsroot
+#		https://github.com/root-project/root/pull/1520
+Patch7:		%{name}-js-syntax.patch
+#		Fix missing -f flag to rm in Makefile
+#		Backport from upstream git
+Patch8:		%{name}-doxygen-makefile.patch
+#		Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test dirs
+#		https://github.com/root-project/root/pull/1515
+Patch9:		%{name}-test-subdirs.patch
+#		No need to use environment variables for system pythia
+Patch10:	%{name}-system-pythia.patch
+#		Reduce memory usage of build
+#		https://github.com/root-project/root/pull/1516
+Patch11:	%{name}-memory-usage.patch
+#		Fedora's llvm patch
+Patch12:	%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
+#		Reduce memory usage during linking on ARM by generating
+#		smaller debuginfo for the llmv libraries.
+#		Fedora builders run out of memory with the default setting.
+Patch13:	%{name}-memory-arm.patch
+#		Don't run tutorials that crash on ppc64 during doc generation.
+#		Ensures content of doc package is the same on all architecture
+#		so that koji accepts it as a noarch package.
+Patch14:	%{name}-ppc64-doc.patch
+#		Fix constructing the GSL MC Integrator
+#		Backport from upstream git
+Patch15:	%{name}-Fix-constructing-the-GSL-MC-Integrator.patch
 
-#		s390 is not supported by cling: "error: unknown target
-#		triple 's390-ibm-linux', please use -triple or -arch"
-ExcludeArch:	s390
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
-#		ppc/ppc64/ppc64le does not yet work
-#		https://sft.its.cern.ch/jira/browse/ROOT-6434
-#		https://sft.its.cern.ch/jira/browse/ROOT-7314
-ExcludeArch:	ppc %{power64}
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	cmake >= 3.4.3
@@ -125,11 +145,9 @@ BuildRequires:	postgresql-devel
 BuildRequires:	python-devel
 %if %{?fedora}%{!?fedora:0} >= 15
 BuildRequires:	python3-devel
-%global python3pkg python3
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	python34-devel
-%global python3pkg python34
 %endif
 BuildRequires:	qt4-devel
 %if %{ruby}
@@ -177,6 +195,7 @@ BuildRequires:	blas-devel
 BuildRequires:	numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
+BuildRequires:	yuicompressor
 BuildRequires:	perl-generators
 BuildRequires:	systemd-units
 BuildRequires:	gtest-devel
@@ -197,6 +216,10 @@ BuildRequires:	font(droidsansfallback)
 BuildRequires:	gdb
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
 Requires:	emacs-filesystem >= %{_emacs_version}
 Provides:	emacs-%{name} = %{version}-%{release}
@@ -401,18 +424,18 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
-%package -n %{python3pkg}-%{name}
+%package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
 %{?py3_dist:
 Provides:	%{py3_dist %{name}} = %{version}
 }
-Provides:	root-%{python3pkg} = %{version}-%{release}
-Obsoletes:	root-%{python3pkg} < 6.08.00
+Provides:	root-python%{python3_pkgversion} = %{version}-%{release}
+Obsoletes:	root-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
-%description -n %{python3pkg}-%{name}
+%description -n python%{python3_pkgversion}-%{name}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
@@ -421,7 +444,10 @@ Summary:	ROOT Jupyter kernel
 %{?py2_dist:
 Provides:	%{py2_dist jupyroot} = %{version}
 }
-Requires:	python2-%{name} = %{version}-%{release}
+Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
+Requires:	python2-jsmva = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-notebook = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
 Requires:	python2-ipython
 Requires:	python2-metakernel
@@ -435,25 +461,28 @@ Obsoletes:	%{name}-rootaas < 6.08.00
 %description -n python2-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
-%package -n %{python3pkg}-jupyroot
+%package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
 %{?py3_dist:
 Provides:	%{py3_dist jupyroot} = %{version}
 }
-Requires:	%{python3pkg}-%{name} = %{version}-%{release}
+Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
+Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-notebook = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
-Requires:	%{python3pkg}-ipython
-Requires:	%{python3pkg}-metakernel
+Requires:	python%{python3_pkgversion}-ipython
+Requires:	python%{python3_pkgversion}-metakernel
 %else
 %if %{?fedora}%{!?fedora:0}
 #		ipython for python3 not available in RHEL/EPEL
-Requires:	%{python3pkg}-ipython-console
+Requires:	python%{python3_pkgversion}-ipython-console
 %endif
 #		python-metakernel for python3 not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
 %endif
 
-%description -n %{python3pkg}-jupyroot
+%description -n python%{python3_pkgversion}-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
 %package -n python2-jsmva
@@ -463,21 +492,19 @@ BuildArch:	noarch
 Provides:	%{py2_dist jsmva} = %{version}
 }
 Requires:	%{name}-tmva = %{version}-%{release}
-Requires:	python2-jupyroot = %{version}-%{release}
 
 %description -n python2-jsmva
 TMVA interface used by JupyROOT.
 
-%package -n %{python3pkg}-jsmva
+%package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
 %{?py3_dist:
 Provides:	%{py3_dist jsmva} = %{version}
 }
 Requires:	%{name}-tmva = %{version}-%{release}
-Requires:	%{python3pkg}-jupyroot = %{version}-%{release}
 
-%description -n %{python3pkg}-jsmva
+%description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
 %if %{ruby}
@@ -604,6 +631,8 @@ Summary:	Canvas and pad library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
 
@@ -742,6 +771,11 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+%if %{root7}
+Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+%endif
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
@@ -800,6 +834,28 @@ Recorded events are:
 All the recorded events from one session are stored in one TFile
 and can be replayed again anytime.
 
+%if %{root7}
+%package gui-canvaspainter
+Summary:	Canvas painter (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+
+%description gui-canvaspainter
+This package contains a canvas painter extension for ROOT 7
+
+%package gui-webdisplay
+Summary:	Web display (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-webdisplay
+This package contains a web display extension for ROOT 7
+%endif
+
 %package hbook
 Summary:	Hbook library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -814,6 +870,7 @@ access legacy Hbook files (NTuples and Histograms from PAW).
 %package hist
 Summary:	Histogram library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
@@ -822,12 +879,26 @@ Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
 %description hist
 This package contains a library for histogramming in ROOT.
 
+%if %{root7}
+%package hist-draw
+Summary:	Histogram drawing (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+
+%description hist-draw
+This package contains an histogram drawing extension for ROOT 7.
+%endif
+
 %package hist-painter
 Summary:	Histogram painter plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+%if %{root7}
+Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
+%endif
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
@@ -1264,6 +1335,7 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	js-jsroot
 
 %description net-http
 This package contains the HTTP server extension for ROOT. It provides
@@ -1430,6 +1502,7 @@ ROOT environment.
 Summary:	Toolkit for multivariate data analysis
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
@@ -1437,6 +1510,8 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mlp%{?_isa} = %{version}-%{release}
+Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
@@ -1515,6 +1590,8 @@ Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description tree-player
@@ -1556,17 +1633,13 @@ The ROOT command line utilities is a set of scripts for common tasks
 written in python.
 
 %package notebook
-Summary:	ROOT as a Jupyter Notebook
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 23
-#		Jupyter is not available in RHEL/EPEL
-Requires:	/usr/bin/jupyter
-%endif
-Requires:	python2-jupyroot = %{version}-%{release}
-Requires:	python2-jsmva = %{version}-%{release}
+Summary:	Static files for the Jupyter ROOT Notebook
+BuildArch:	noarch
+Requires:	%{name}-core = %{version}-%{release}
+Requires:	js-jsroot
 
 %description notebook
-ROOT as a Jupyter Notebook.
+Javascript and style files for the Jupyter ROOT Notebook.
 
 %prep
 %setup -q -a 1
@@ -1581,6 +1654,12 @@ ROOT as a Jupyter Notebook.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1610,11 +1689,13 @@ rm -rf documentation/doxygen/mathjax.tar.gz
 sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
 sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
     -i documentation/doxygen/Doxyfile
-%if %{?fedora}%{!?fedora:0} >= 24
-#  * string_view
+%if %{root7}
+#  * string_view (<experimental/string_view> requires c++-14)
 rm core/foundation/inc/libcpp_string_view.h \
    core/foundation/inc/RWrap_libcpp_string_view.h
 %endif
+#  * jsroot
+rm -rf etc/http/*
 
 # Remove bundled fonts provided by the OS distributions
 %if %{?fedora}%{!?fedora:0} >= 11
@@ -1638,22 +1719,29 @@ ar rv libgmock_main.a gmock_main.o
 popd
 fi
 
+# Remove pre-minified script and style files
+rm etc/notebook/JsMVA/js/*.min.js
+rm etc/notebook/JsMVA/css/*.min.css
+
 %build
 unset QTDIR
 unset QTLIB
 unset QTINC
 
+# Minify script and style files
+for s in etc/notebook/JsMVA/js/*.js ; do
+    yuicompressor ${s} -o ${s%.js}.min.js
+done
+for s in etc/notebook/JsMVA/css/*.css ; do
+    yuicompressor ${s} -o ${s%.css}.min.css
+done
+
 mkdir builddir
 pushd builddir
 
 # Avoid overlinking (this used to be the default with the old configure script)
 LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 
-%ifarch s390 s390x
-# llvm/clang does not support -march=z900, z990, z9-109, z9-ec
-%global optflags %(sed 's/-march=z9\\S* /-march=z10 /g' <<< '%{optflags}')
-%endif
-
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 %cmake \
 %else
@@ -1698,13 +1786,14 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcling:BOOL=ON \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{root7}
        -Dcxx14:BOOL=ON \
        -Droot7:BOOL=ON \
 %else
        -Dcxx14:BOOL=OFF \
        -Droot7:BOOL=OFF \
 %endif
+       -Dcxx17:BOOL=OFF \
        -Dcxxmodules:BOOL=OFF \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
@@ -1741,6 +1830,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dldap:BOOL=ON \
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
+       -Dmemory_termination:BOOL=OFF \
        -Dmemstat:BOOL=ON \
        -Dminuit2:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
@@ -1769,6 +1859,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %else
        -Druby:BOOL=OFF \
 %endif
+       -Druntime_cxxmodules:BOOL=OFF \
        -Dsapdb:BOOL=OFF \
        -Dshadowpw:BOOL=ON \
        -Dshared:BOOL=ON \
@@ -1798,6 +1889,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dclingtest:BOOL=OFF \
        -Dcoverage:BOOL=OFF \
        -Droottest:BOOL=OFF \
+       -Drootbench:BOOL=OFF \
        ..
 
 # Build PyROOT for python 3 (prep)
@@ -1925,6 +2017,40 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
    %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
 %endif
 
+# Put jupyter stuff in the right places
+mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
+
+cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
+   %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
+sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!/usr/bin/python2!' \
+    -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json
+
+cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
+   %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
+sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!/usr/bin/python3!' \
+    -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
+
+rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
+rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
+rm -rf %{buildroot}%{_datadir}/%{name}/notebook/kernels
+
+ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/notebook
+
+# Replace the rootnb.exe wrapper with a simpler one
+cat > %{buildroot}%{_bindir}/rootnb.exe << EOF
+#! /bin/sh
+if [ -z "\$(type jupyter 2>/dev/null)" ] ; then
+   echo jupyter not found in path. Exiting.
+   exit 1
+fi
+if [ -z "\$(type jupyter-notebook 2>/dev/null)" ] ; then
+   echo jupyter-notebook not found in path. Exiting.
+   exit 1
+fi
+rm -rf ~/.rootnb
+jupyter notebook
+EOF
+
 # These should be in PATH
 mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
@@ -1971,14 +2097,9 @@ rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
 rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
 rm %{buildroot}%{_libdir}/%{name}/libminicern.a
-rm %{buildroot}%{_bindir}/corebasetestUnit
-rm %{buildroot}%{_bindir}/coreconttestUnit
 rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
-rm %{buildroot}%{_bindir}/testTBufferMerger
-rm %{buildroot}%{_bindir}/testTProfile2Poly
-rm %{buildroot}%{_bindir}/treetreeplayertestUnit
 rm %{buildroot}%{_mandir}/man1/g2rootold.1
 rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
@@ -1994,8 +2115,7 @@ rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
 # Remove references to deleted (or moved) files from cmake files
-for target in mathtext minicern JupyROOT coreconttestUnit corebasetestUnit \
-	      testTProfile2Poly treetreeplayertestUnit testTBufferMerger ; do
+for target in mathtext minicern JupyROOT; do
     sed -e "s/ ROOT::${target} / /" \
 	-e "/Create imported target ROOT::${target}/,/^$/d" \
 	-e "/set_target_properties(ROOT::${target}/,/^$/d" \
@@ -2053,6 +2173,10 @@ rmdir TImagePlugin
 rmdir TVirtualGeoConverter
 popd
 
+# Replace bundled jsroot with symlink to system version
+rm -rf %{buildroot}%{_datadir}/%{name}/http
+ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/http
+
 # Create ldconfig configuration
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo %{_libdir}/%{name} > \
@@ -2113,6 +2237,7 @@ ln -s ../../files files
 popd
 pushd runtutorials
 ln -s ../../files files
+ln -sf ../../files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
 popd
 # Exclude some tests that can not be run
 #
@@ -2130,19 +2255,49 @@ popd
 # - tutorial-multicore-imt101_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
+# - tutorial-pythia-pythia8
+#   sometimes times out
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8"
+
+%ifarch %{arm}
+# Tests failing on arm
+# https://sft.its.cern.ch/jira/browse/ROOT-8500
+# - mathcore-testMinim
+# - minuit2-testMinimizer
+# - test-minexam
+# - test-stressfit
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
+# - tutorial-multicore-mt303_AsyncSimple
+# - tutorial-multicore-mt304_AsyncNested
+# - tutorial-multicore-mt305_TFuture
 # - tutorial-r-*
-#   currently fails on 32 bit arm - reported upstream:
-#   https://sft.its.cern.ch/jira/browse/ROOT-8500
-
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing"
-%ifarch %{arm}
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
+excluded="${excluded}|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*"
 %endif
+
+%ifarch ppc64
+# Tests failing on ppc64
+# https://sft.its.cern.ch/jira/browse/ROOT-6434
+# - test-stresshistogram[-interpreted]
+# - test-stressroostats[-interpreted]
+# - test-stresshistofit[-interpreted]
+# - tutorial-roofit-rf511_wsfactory_basic
+# - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7)
+# - tutorial-roostats-rs701_BayesianCalculator
+# - tutorial-dataframe-tdf006_ranges-py
+excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-tdf006_ranges-py"
+%endif
+
+%ifarch ppc64le
+# Tests failing on ppc64le
+# - test-stresshistogram[-interpreted]
+excluded="${excluded}|test-stresshistogram"
+%endif
+
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
+%if %{?rhel}%{!?rhel:0} == 7
 %post
 touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 update-desktop-database >/dev/null 2>&1 || :
@@ -2158,6 +2313,7 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+%endif
 
 %pre rootd
 # Remove old init config when systemd is used
@@ -2218,7 +2374,7 @@ fi
     libPyROOT.so %{python2_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
-%post -n %{python3pkg}-%{name}
+%post -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
 	/var/lib/alternatives/libPyROOT.so || \
@@ -2235,22 +2391,44 @@ fi
     libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
 /sbin/ldconfig
 
-%preun -n %{python3pkg}-%{name}
+%preun -n python%{python3_pkgversion}-%{name}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
 fi
 
-%postun -n %{python3pkg}-%{name} -p /sbin/ldconfig
+%postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig
 
-%triggerpostun -n %{python3pkg}-%{name} -- %{name}-%{python3pkg}
-# Uninstalling the old %{name}-%{python3pkg} will remove the alternatives
-# for %{python3pkg}-%{name} - put them back in this triggerpostun script
+%triggerpostun -n python%{python3_pkgversion}-%{name} -- %{name}-python%{python3_pkgversion}
+# Uninstalling the old %{name}-python%{python3_pkgversion} will remove the alternatives
+# for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
 /sbin/ldconfig
 
+%post notebook
+mkdir -p /etc/jupyter
+if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
+    sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
+fi
+cat << EOF >> /etc/jupyter/jupyter_notebook_config.py
+# Extra static path for JupyROOT - start - do not remove this line
+c.NotebookApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
+# Extra static path for JupyROOT - end - do not remove this line
+EOF
+
+%postun notebook
+if [ $1 -eq 0 ] ; then
+    if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
+	sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
+	if [ ! -s /etc/jupyter/jupyter_notebook_config.py ] ; then
+	    rm /etc/jupyter/jupyter_notebook_config.py
+	    rmdir /etc/jupyter 2>/dev/null || :
+	fi
+    fi
+fi
+
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
 %post multiproc -p /sbin/ldconfig
@@ -2313,10 +2491,20 @@ fi
 %postun gui-qt -p /sbin/ldconfig
 %post gui-recorder -p /sbin/ldconfig
 %postun gui-recorder -p /sbin/ldconfig
+%if %{root7}
+%post gui-canvaspainter -p /sbin/ldconfig
+%postun gui-canvaspainter -p /sbin/ldconfig
+%post gui-webdisplay -p /sbin/ldconfig
+%postun gui-webdisplay -p /sbin/ldconfig
+%endif
 %post hbook -p /sbin/ldconfig
 %postun hbook -p /sbin/ldconfig
 %post hist -p /sbin/ldconfig
 %postun hist -p /sbin/ldconfig
+%if %{root7}
+%post hist-draw -p /sbin/ldconfig
+%postun hist-draw -p /sbin/ldconfig
+%endif
 %post hist-painter -p /sbin/ldconfig
 %postun hist-painter -p /sbin/ldconfig
 %post spectrum -p /sbin/ldconfig
@@ -2403,6 +2591,14 @@ fi
 %postun net-ldap -p /sbin/ldconfig
 %post net-http -p /sbin/ldconfig
 %postun net-http -p /sbin/ldconfig
+
+%pretrans net-http -p <lua>
+path = "%{_datadir}/%{name}/http"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  os.execute("rm -rf " .. path)
+end
+
 %if %{xrootd}
 %post netx -p /sbin/ldconfig
 %postun netx -p /sbin/ldconfig
@@ -2511,6 +2707,7 @@ fi
 %{_includedir}/%{name}/RConfigure.h
 %{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
+%{_includedir}/%{name}/module.modulemap
 %dir %{_includedir}/%{name}/Math
 %dir %{_includedir}/%{name}/ROOT
 %{_datadir}/aclocal/root.m4
@@ -2575,7 +2772,7 @@ fi
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
 
-%files -n %{python3pkg}-%{name} -f includelist-bindings-pyroot
+%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
@@ -2590,17 +2787,19 @@ fi
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
 %{python2_sitearch}/libJupyROOT.so
+%{_datadir}/jupyter/kernels/python2-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
-%files -n %{python3pkg}-jupyroot
+%files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
 %{python3_sitearch}/libJupyROOT.so
+%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
 
-%files -n %{python3pkg}-jsmva
+%files -n python%{python3_pkgversion}-jsmva
 %{python3_sitelib}/JsMVA
 
 %if %{ruby}
@@ -2760,6 +2959,15 @@ fi
 %{_libdir}/%{name}/libRecorder.*
 %{_libdir}/%{name}/libRecorder_rdict.pcm
 
+%if %{root7}
+%files gui-canvaspainter
+%{_libdir}/%{name}/libROOTCanvasPainter.*
+
+%files gui-webdisplay -f includelist-gui-webdisplay
+%{_libdir}/%{name}/libROOTWebDisplay.*
+%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+%endif
+
 %files hbook -f includelist-hist-hbook
 %{_bindir}/g2root
 %{_bindir}/h2root
@@ -2773,6 +2981,12 @@ fi
 %{_libdir}/%{name}/libHist_rdict.pcm
 %dir %{_includedir}/%{name}/v5
 
+%if %{root7}
+%files hist-draw -f includelist-hist-histdraw
+%{_libdir}/%{name}/libROOTHistDraw.*
+%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
+%endif
+
 %files hist-painter -f includelist-hist-histpainter
 %{_libdir}/%{name}/libHistPainter.*
 %{_libdir}/%{name}/libHistPainter_rdict.pcm
@@ -3161,6 +3375,24 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Tue Dec 19 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.04-1
+- Update to 6.12.04
+- Drop patches accepted upstream
+- Drop previously backported patches
+- Unbundle jsroot in root-net-http
+- Add hack to work around broken charmaps in StandardSymbolsPS.otf
+- Use local static script and style files for JupyROOT
+- Fix some javascript errors
+- Fix build rules for test binaries so that they are not installed
+- Address memory usage issue for ARM build
+- Drop pre-minified javascript and style files (Fedora packaging guidelines)
+- Enable builds on ppc/ppc64/ppc64le (do not pass all tests, but the list
+  of failing tests is much shorter with this release)
+- Add dependency on python[23]-jsmva to python[23]-jupyroot
+- New sub-packages: root-gui-canvaspainter, root-gui-webdisplay and
+  root-hist-draw (not for EPEL 7 since they are root7 specific and
+  require c++-14)
+
 * Fri Oct 20 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.08-1
 - Update to 6.10.08
 - Add BuildRequires on lz4-devel and xxhash-devel
diff --git a/sources b/sources
index 5fcd7a6..498a567 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.08.tar.xz) = 84d712fe6fe260d22202187f0edf6ae36647f8de44533f791939f2ae382782270bf1efced69e6b6f08d9ca512fc4a3991d2439129fb4ca413a283bdeef7b3221
-SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b
+SHA512 (root-6.12.04.tar.xz) = 271cc151073f0b147f4e4f5030f71e3782723be1e5c36c431b85086e8280dbdab1fde22c4f5c26e5f8d821ed309d4b7db5e846ec383db84d64714d0c627c8c7a
+SHA512 (root-testfiles.tar.xz) = f697afb666c1081f98cfe66fe21998c4eab86c25a3671ff71a4ac98610d70f70081d70b40029a0b788b39d87c542b5aa4e31d71f7be494f4774323ed20e9bccb

From 44fa7637ff4f7e91abf050953d7efc15f67eb219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 20 Jan 2018 23:07:48 +0100
Subject: [PATCH 123/344] Rebuilt for switch to libxcrypt

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b784230..80e6882 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3375,6 +3375,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 6.12.04-2
+- Rebuilt for switch to libxcrypt
+
 * Tue Dec 19 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.04-1
 - Update to 6.12.04
 - Drop patches accepted upstream

From 00ff963ffce40493dbbb04bddfe97cc71629df71 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 13:14:41 +0000
Subject: [PATCH 124/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 80e6882..fd25d06 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3375,6 +3375,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 6.12.04-2
 - Rebuilt for switch to libxcrypt
 

From 18df0711fa8d1a276a3953d88810fd9b2ebe5f99 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 17 Feb 2018 16:27:57 +0100
Subject: [PATCH 125/344] Fix test failures found with new default compiler
 flags in Fedora 28

---
 root-crash-fix.patch         |  26 +++
 root-doxygen-tilde.patch     |  36 ++++
 root-noinst.patch            |  55 ++++++
 root-out-of-bounds.patch     |  25 +++
 root-test-fixes.patch        | 337 +++++++++++++++++++++++++++++++++++
 root-test-stress-32bit.patch |  13 ++
 root.spec                    |  52 ++++--
 7 files changed, 526 insertions(+), 18 deletions(-)
 create mode 100644 root-crash-fix.patch
 create mode 100644 root-doxygen-tilde.patch
 create mode 100644 root-noinst.patch
 create mode 100644 root-out-of-bounds.patch
 create mode 100644 root-test-fixes.patch
 create mode 100644 root-test-stress-32bit.patch

diff --git a/root-crash-fix.patch b/root-crash-fix.patch
new file mode 100644
index 0000000..ed64701
--- /dev/null
+++ b/root-crash-fix.patch
@@ -0,0 +1,26 @@
+From d055981def808c9c2175a8ca3f362b6ea006ebf3 Mon Sep 17 00:00:00 2001
+From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
+Date: Thu, 8 Feb 2018 10:43:59 +0100
+Subject: [PATCH] Fix another potential crash on Windows
+
+On Windows, (as the standard says) calling front() on an empty std::vector causes an undefined behaviour. One must check that the container contains something using empty() before calling front()
+---
+ core/foundation/src/TClassEdit.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/foundation/src/TClassEdit.cxx b/core/foundation/src/TClassEdit.cxx
+index 38c8b1a5a2..954e40fcc5 100644
+--- a/core/foundation/src/TClassEdit.cxx
++++ b/core/foundation/src/TClassEdit.cxx
+@@ -1900,7 +1900,7 @@ public:
+       auto argsEnd = v.end();
+       auto argsBeginPlusOne = ++v.begin();
+       auto argPos = std::find_if(argsBeginPlusOne, argsEnd,
+-                              [](std::string& arg){return arg.front() == ':';});
++           [](std::string& arg){return (!arg.empty() && arg.front() == ':');});
+       if (argPos != argsEnd) {
+          const int lenght = clName.size();
+          int wedgeBalance = 0;
+-- 
+2.14.3
+
diff --git a/root-doxygen-tilde.patch b/root-doxygen-tilde.patch
new file mode 100644
index 0000000..bbae6d8
--- /dev/null
+++ b/root-doxygen-tilde.patch
@@ -0,0 +1,36 @@
+From 533f64b053c9fa72b456a7e351e17e354b94dcdc Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:30:44 +0100
+Subject: [PATCH] Fix doxygen ~ alignment
+
+---
+ core/meta/src/TStatusBitsChecker.cxx | 2 +-
+ tree/treeplayer/src/TTreeReader.cxx  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/meta/src/TStatusBitsChecker.cxx b/core/meta/src/TStatusBitsChecker.cxx
+index 360d85d0c74..1661bd3646b 100644
+--- a/core/meta/src/TStatusBitsChecker.cxx
++++ b/core/meta/src/TStatusBitsChecker.cxx
+@@ -42,7 +42,7 @@
+       // used in TStreamerElement
+       kHasRange = TStreamerElement::kHasRange
+    };
+-  ~~~ {.cpp}
++   ~~~ {.cpp}
+ 
+   Without the EStatusBitsDupExceptions enum you would see
+ 
+diff --git a/tree/treeplayer/src/TTreeReader.cxx b/tree/treeplayer/src/TTreeReader.cxx
+index d411fbdd967..e823797e523 100644
+--- a/tree/treeplayer/src/TTreeReader.cxx
++++ b/tree/treeplayer/src/TTreeReader.cxx
+@@ -235,7 +235,7 @@ void TTreeReader::Initialize()
+ /// If end <= begin, `end` is ignored (set to `-1`) and only `begin` is used.
+ /// Example:
+ ///
+-///  ~~~ {.cpp}
++/// ~~~ {.cpp}
+ /// reader.SetEntriesRange(3, 5);
+ /// while (reader.Next()) {
+ ///   // Will load entries 3 and 4.
diff --git a/root-noinst.patch b/root-noinst.patch
new file mode 100644
index 0000000..4f3212f
--- /dev/null
+++ b/root-noinst.patch
@@ -0,0 +1,55 @@
+From 778e01575f6b75bed9843023baeb50b23aea5355 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 16 Feb 2018 19:06:14 +0100
+Subject: [PATCH 1/2] Don't install intermediate static libs (mathtext and
+ minicern)
+
+---
+ graf2d/mathtext/CMakeLists.txt | 2 +-
+ misc/minicern/CMakeLists.txt   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/graf2d/mathtext/CMakeLists.txt b/graf2d/mathtext/CMakeLists.txt
+index 5af6a282a34..e6cba7bcd35 100644
+--- a/graf2d/mathtext/CMakeLists.txt
++++ b/graf2d/mathtext/CMakeLists.txt
+@@ -1,2 +1,2 @@
+-ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC)
++ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC NOINSTALL)
+ 
+diff --git a/misc/minicern/CMakeLists.txt b/misc/minicern/CMakeLists.txt
+index 2758edb08e1..d98ac3b6331 100644
+--- a/misc/minicern/CMakeLists.txt
++++ b/misc/minicern/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ ############################################################################
+ 
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
+-ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC)
++ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL)
+ target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
+ 
+ # Disable optimization since it some cases was causing crashes
+
+From 9bd8d4e52fae5467867cbcf1810bc58a63b55a62 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 16 Feb 2018 19:07:04 +0100
+Subject: [PATCH 2/2] Don't add JupyROOT python extension to cmake exports
+
+---
+ bindings/pyroot/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
+index 4dab1dfd2ab..5f621af9a2d 100644
+--- a/bindings/pyroot/CMakeLists.txt
++++ b/bindings/pyroot/CMakeLists.txt
+@@ -18,7 +18,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(PyROOT
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+                               LIBRARIES Core Net Tree MathCore Rint ${PYTHON_LIBRARIES}
+                               DEPENDENCIES Core MathCore Net Tree Rint)
+-ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core)
++ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core CMAKENOEXPORT)
+ 
+ if(MSVC)
+   add_custom_command(TARGET PyROOT POST_BUILD
diff --git a/root-out-of-bounds.patch b/root-out-of-bounds.patch
new file mode 100644
index 0000000..094139f
--- /dev/null
+++ b/root-out-of-bounds.patch
@@ -0,0 +1,25 @@
+From a770f03056e374fa7c1dbdc06aaff22107fc27a0 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:29:00 +0100
+Subject: [PATCH] Protect against out-of-bounds access
+
+---
+ graf2d/gpad/src/TRatioPlot.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/graf2d/gpad/src/TRatioPlot.cxx b/graf2d/gpad/src/TRatioPlot.cxx
+index 107c0c90806..bf3415d7927 100644
+--- a/graf2d/gpad/src/TRatioPlot.cxx
++++ b/graf2d/gpad/src/TRatioPlot.cxx
+@@ -1074,9 +1074,9 @@ Int_t TRatioPlot::BuildLowerPlot()
+             ((TGraphAsymmErrors*)fRatioGraph)->SetPointError(ipoint,  fH1->GetBinWidth(i)/2., fH1->GetBinWidth(i)/2., 0.5, 0.5);
+ 
+             fConfidenceInterval1->SetPoint(ipoint, x, 0);
+-            fConfidenceInterval1->SetPointError(ipoint, x, ci1[i] / error);
++            fConfidenceInterval1->SetPointError(ipoint, x, i < ci1.size() ? ci1[i] / error : 0);
+             fConfidenceInterval2->SetPoint(ipoint, x, 0);
+-            fConfidenceInterval2->SetPointError(ipoint, x, ci2[i] / error);
++            fConfidenceInterval2->SetPointError(ipoint, x, i < ci2.size() ? ci2[i] / error : 0);
+ 
+             ++ipoint;
+ 
diff --git a/root-test-fixes.patch b/root-test-fixes.patch
new file mode 100644
index 0000000..f351525
--- /dev/null
+++ b/root-test-fixes.patch
@@ -0,0 +1,337 @@
+From 092d06fd403331bf082dd0d2d56718a9ee31efec Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:12:41 +0100
+Subject: [PATCH 1/4] Don't call front() on empty containers
+
+---
+ math/mathcore/inc/Fit/FitData.h               |  4 ++--
+ math/mathcore/inc/Math/WrappedParamFunction.h | 10 +++++-----
+ math/mathcore/src/BinData.cxx                 | 24 ++++++++++++------------
+ math/mathcore/src/FitData.cxx                 |  2 +-
+ 4 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/math/mathcore/inc/Fit/FitData.h b/math/mathcore/inc/Fit/FitData.h
+index cb8fa2f0be3..9579bde92bf 100644
+--- a/math/mathcore/inc/Fit/FitData.h
++++ b/math/mathcore/inc/Fit/FitData.h
+@@ -185,7 +185,7 @@ namespace ROOT {
+ 
+             for (unsigned int i = 0; i < fDim; i++) {
+                fCoords[i].resize(fMaxPoints + VectorPadding(fMaxPoints));
+-               fCoordsPtr[i] = &fCoords[i].front();
++               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
+             }
+ 
+             if (fpTmpCoordVector) {
+@@ -354,7 +354,7 @@ namespace ROOT {
+                unsigned padding = VectorPadding(fNPoints);
+                fCoords[i].resize(fNPoints + padding);
+                std::copy(fCoordsPtr[i], fCoordsPtr[i] + fNPoints + padding, fCoords[i].begin());
+-               fCoordsPtr[i] = &fCoords[i].front();
++               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
+             }
+ 
+             fWrapped = false;
+diff --git a/math/mathcore/inc/Math/WrappedParamFunction.h b/math/mathcore/inc/Math/WrappedParamFunction.h
+index 38b9af7639f..0c860672f9e 100644
+--- a/math/mathcore/inc/Math/WrappedParamFunction.h
++++ b/math/mathcore/inc/Math/WrappedParamFunction.h
+@@ -95,7 +95,7 @@ class WrappedParamFunction : public IParamMultiFunction {
+    }
+ 
+    const double * Parameters() const {
+-      return  &(fParams.front());
++      return fParams.empty() ? NULL : &fParams.front();
+    }
+ 
+    void SetParameters(const double * p)  {
+@@ -172,7 +172,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
+ 
+    /// clone the function
+    IMultiGenFunction * Clone() const {
+-      return new WrappedParamFunctionGen(fFunc, fDim, fParams.size() , &fParams.front(), &fParIndices.front());
++      return new WrappedParamFunctionGen(fFunc, fDim, fParams.size(), fParams.empty() ? NULL : &fParams.front(), fParIndices.empty() ? NULL : &fParIndices.front());
+    }
+ 
+ private:
+@@ -183,7 +183,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
+ public:
+ 
+    const double * Parameters() const {
+-      return  &(fParams.front());
++      return fParams.empty() ? NULL : &fParams.front();
+    }
+ 
+    void SetParameters(const double * p)  {
+@@ -227,7 +227,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
+ //       std::copy(fX.begin(), fX.end(), oi);
+ //       std::cout << std::endl;
+ 
+-      return (*fFunc)( &fX.front() );
++      return (*fFunc)( fX.empty() ? NULL : &fX.front() );
+    }
+ 
+ 
+@@ -264,7 +264,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
+ //       std::cout << this << std::endl;
+ 
+       // set parameter values in fX
+-      SetParValues(npar, &fParams.front() );
++      SetParValues(npar, fParams.empty() ? NULL : &fParams.front());
+       for (unsigned int i = 0; i < npar; ++i) {
+          unsigned int j = fParIndices[i];
+          assert ( j  < npar + fDim);
+diff --git a/math/mathcore/src/BinData.cxx b/math/mathcore/src/BinData.cxx
+index 16c9e375634..50a47169272 100644
+--- a/math/mathcore/src/BinData.cxx
++++ b/math/mathcore/src/BinData.cxx
+@@ -284,7 +284,7 @@ namespace ROOT {
+ 
+           for ( unsigned int i=0; i<fDim; i++ )
+           {
+-            fCoordErrorsPtr[i] = &fCoordErrors[i].front();
++            fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
+           }
+         }
+ 
+@@ -371,7 +371,7 @@ namespace ROOT {
+       if ( kNoError == fErrorType )
+       {
+          fDataError.resize(fNPoints + FitData::VectorPadding(fNPoints));
+-         fDataErrorPtr = &fDataError.front();
++         fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
+       }
+ 
+       for ( unsigned int i=0; i < fNPoints; i++ )
+@@ -659,7 +659,7 @@ namespace ROOT {
+     void BinData::InitDataVector ()
+     {
+        fData.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
+-       fDataPtr = &fData.front();
++       fDataPtr = fData.empty() ? NULL : &fData.front();
+     }
+ 
+     void BinData::InitializeErrors()
+@@ -698,7 +698,7 @@ namespace ROOT {
+         {
+            fCoordErrors[i].resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
+ 
+-           fCoordErrorsPtr[i] = &fCoordErrors[i].front();
++           fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
+         }
+ 
+         fpTmpCoordErrorVector = new double[fDim];
+@@ -712,7 +712,7 @@ namespace ROOT {
+       if ( kValueError == fErrorType || kCoordError == fErrorType )
+       {
+          fDataError.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
+-         fDataErrorPtr = &fDataError.front();
++         fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
+ 
+          fDataErrorHigh.clear();
+          fDataErrorHighPtr = NULL;
+@@ -722,10 +722,10 @@ namespace ROOT {
+       else if ( fErrorType == kAsymError )
+       {
+          fDataErrorHigh.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
+-         fDataErrorHighPtr = &fDataErrorHigh.front();
++         fDataErrorHighPtr = fDataErrorHigh.empty() ? NULL : &fDataErrorHigh.front();
+ 
+          fDataErrorLow.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
+-         fDataErrorLowPtr = &fDataErrorLow.front();
++         fDataErrorLowPtr = fDataErrorLow.empty() ? NULL : &fDataErrorLow.front();
+ 
+          fDataError.clear();
+          fDataErrorPtr = NULL;
+@@ -770,7 +770,7 @@ namespace ROOT {
+       unsigned vectorPadding = FitData::VectorPadding(fNPoints);
+       fData.resize(fNPoints + vectorPadding);
+       std::copy( fDataPtr, fDataPtr + fNPoints, fData.begin() );
+-      fDataPtr = &fData.front();
++      fDataPtr = fData.empty() ? NULL : &fData.front();
+ 
+       for ( unsigned int i=0; i < fDim; i++ )
+       {
+@@ -785,7 +785,7 @@ namespace ROOT {
+ 
+         fDataError.resize(fNPoints + vectorPadding);
+         std::copy(fDataErrorPtr, fDataErrorPtr + fNPoints + vectorPadding, fDataError.begin());
+-        fDataErrorPtr = &fDataError.front();
++        fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
+       }
+ 
+       if ( kValueError == fErrorType )
+@@ -804,7 +804,7 @@ namespace ROOT {
+           assert( fCoordErrorsPtr[i] );
+           fCoordErrors[i].resize(fNPoints + vectorPadding);
+           std::copy(fCoordErrorsPtr[i], fCoordErrorsPtr[i] + fNPoints + vectorPadding, fCoordErrors[i].begin());
+-          fCoordErrorsPtr[i] = &fCoordErrors[i].front();
++          fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
+         }
+ 
+         if( kAsymError == fErrorType )
+@@ -817,8 +817,8 @@ namespace ROOT {
+           fDataErrorLow.resize(fNPoints + vectorPadding);
+           std::copy(fDataErrorHighPtr, fDataErrorHighPtr + fNPoints + vectorPadding, fDataErrorHigh.begin());
+           std::copy(fDataErrorLowPtr, fDataErrorLowPtr + fNPoints + vectorPadding, fDataErrorLow.begin());
+-          fDataErrorHighPtr = &fDataErrorHigh.front();
+-          fDataErrorLowPtr = &fDataErrorLow.front();
++          fDataErrorHighPtr = fDataErrorHigh.empty() ? NULL : &fDataErrorHigh.front();
++          fDataErrorLowPtr = fDataErrorLow.empty() ? NULL : &fDataErrorLow.front();
+         }
+       }
+ 
+diff --git a/math/mathcore/src/FitData.cxx b/math/mathcore/src/FitData.cxx
+index 76c792dbe66..0b62e607534 100644
+--- a/math/mathcore/src/FitData.cxx
++++ b/math/mathcore/src/FitData.cxx
+@@ -231,7 +231,7 @@ namespace ROOT {
+             fCoordsPtr.resize(fDim);
+ 
+             for (unsigned int i = 0; i < fDim; i++) {
+-               fCoordsPtr[i] = &fCoords[i].front();
++               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
+             }
+          }
+ 
+
+From 711cb8598110b774ae7c206c0730b907e7650e2e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:18:35 +0100
+Subject: [PATCH 2/4] Call resize() when the size should be changed, reserve()
+ does not change the size
+
+---
+ math/mathcore/src/TKDTreeBinning.cxx | 2 +-
+ tree/tree/test/TBasket.cxx           | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/math/mathcore/src/TKDTreeBinning.cxx b/math/mathcore/src/TKDTreeBinning.cxx
+index 09647958dc7..d0b06e1a99f 100644
+--- a/math/mathcore/src/TKDTreeBinning.cxx
++++ b/math/mathcore/src/TKDTreeBinning.cxx
+@@ -241,7 +241,7 @@ void TKDTreeBinning::SetTreeData() {
+ 
+ void TKDTreeBinning::SetBinsContent() {
+    // Sets the bins' content
+-   fBinsContent.reserve(fNBins);
++   fBinsContent.resize(fNBins);
+    for (UInt_t i = 0; i < fNBins; ++i)
+       fBinsContent[i] = fDataBins->GetBucketSize();
+    if ( fDataSize % fNBins != 0 )
+diff --git a/tree/tree/test/TBasket.cxx b/tree/tree/test/TBasket.cxx
+index fba69bd68d0..90eb330f7ee 100644
+--- a/tree/tree/test/TBasket.cxx
++++ b/tree/tree/test/TBasket.cxx
+@@ -102,7 +102,7 @@ TEST(TBasket, CreateAndDestroy)
+    f->Close();
+ 
+    Long64_t maxsize = f->GetSize();
+-   memBuffer.reserve(maxsize);
++   memBuffer.resize(maxsize);
+    f->CopyTo(&memBuffer[0], maxsize);
+ 
+    delete f;
+@@ -182,7 +182,7 @@ TEST(TBasket, TestUnsupportedIO)
+ 
+    std::vector<char> memBuffer;
+    Long64_t maxsize = f->GetSize();
+-   memBuffer.reserve(maxsize);
++   memBuffer.resize(maxsize);
+    f->CopyTo(&memBuffer[0], maxsize);
+ 
+    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
+@@ -230,7 +230,7 @@ TEST(TBasket, TestVarLengthArrays)
+    f->Close();
+    std::vector<char> memBuffer;
+    Long64_t maxsize = f->GetSize();
+-   memBuffer.reserve(maxsize);
++   memBuffer.resize(maxsize);
+    f->CopyTo(&memBuffer[0], maxsize);
+ 
+    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
+@@ -334,7 +334,7 @@ TEST(TBasket, TestSettingIOBits)
+    f->Close();
+    std::vector<char> memBuffer;
+    Long64_t maxsize = f->GetSize();
+-   memBuffer.reserve(maxsize);
++   memBuffer.resize(maxsize);
+    f->CopyTo(&memBuffer[0], maxsize);
+ 
+    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
+
+From 8dfcb54ca0457c2e8ae6102bb4a60ac60bd49004 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:25:39 +0100
+Subject: [PATCH 3/4] operator[] with an argument that is out of range causes
+ undefined behavior
+
+---
+ math/mathcore/test/binarySearchTime.cxx | 5 ++---
+ math/mathmore/test/testPermute.cxx      | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/math/mathcore/test/binarySearchTime.cxx b/math/mathcore/test/binarySearchTime.cxx
+index c98017a0c55..0a611486489 100644
+--- a/math/mathcore/test/binarySearchTime.cxx
++++ b/math/mathcore/test/binarySearchTime.cxx
+@@ -58,9 +58,8 @@ template <typename T> bool testBinarySearch(const int n, double* tTMath, double*
+    t.Start();
+    for (int j = 0; j < npass; ++j) {
+       for ( T elem = 0; elem < maxint; ++elem ) {
+-         T* pind;
+-         pind = std::lower_bound(&k[0], &k[n], elem);
+-         Long_t index2 = (((pind != &(k[n])) && (*pind == elem)) ? (pind - &k[0]): ( pind - &k[0] - 1));
++         auto pind = std::lower_bound(k.begin(), k.end(), elem);
++         Long_t index2 = (((pind != k.end()) && (*pind == elem)) ? (pind - k.begin()) : (pind - k.begin() - 1));
+          s2+= index2;
+       }
+    }
+diff --git a/math/mathmore/test/testPermute.cxx b/math/mathmore/test/testPermute.cxx
+index b75609b9958..f2a49da2e4d 100644
+--- a/math/mathmore/test/testPermute.cxx
++++ b/math/mathmore/test/testPermute.cxx
+@@ -64,7 +64,7 @@ bool checkPermute()
+    //cout << original << vM << vS << endl;
+ 
+    while ( TMath::Permute(n, &vM[0]) ) {
+-      std::next_permutation(&vS[0], &vS[n]);
++      std::next_permutation(vS.begin(), vS.end());
+       //cout << vM << vS << endl;
+       equals &= equal(vM.begin(), vM.end(), vS.begin());
+    }
+@@ -99,7 +99,7 @@ void permuteTime(const int n, double* tTMath, double* tStd)
+    t.Start();
+    for (int j = 0; j < npass; ++j) {
+       copy(original.begin(), original.end(), v.begin());
+-      while ( std::next_permutation(&v[0], &v[n]) ) {}
++      while ( std::next_permutation(v.begin(), v.end()) ) {}
+    }
+    t.Stop();
+    *tStd = t.RealTime();
+
+From 80ba399340167f62368685e0bf03f9cb9a595954 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 15 Feb 2018 18:27:23 +0100
+Subject: [PATCH 4/4] cut-and-paste errors, I guess...
+
+---
+ math/mathcore/test/testkdTreeBinning.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/math/mathcore/test/testkdTreeBinning.cxx b/math/mathcore/test/testkdTreeBinning.cxx
+index 233b083ee5f..193ff1bb3e2 100644
+--- a/math/mathcore/test/testkdTreeBinning.cxx
++++ b/math/mathcore/test/testkdTreeBinning.cxx
+@@ -82,9 +82,9 @@ void testkdTreeBinning() {
+    int ibinMax = kdBins->GetBinMaxDensity();
+ 
+    std::cout << "Bin with minimum density: " << ibinMin << " density = " <<  kdBins->GetBinDensity(ibinMin) << " content = " << kdBins->GetBinContent(ibinMin)  << std::endl;
+-   std::cout << "Bin with maximum density: " << ibinMax << " density = " <<  kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMin) << std::endl;
++   std::cout << "Bin with maximum density: " << ibinMax << " density = " <<  kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMax) << std::endl;
+ 
+-   if (kdBins->GetBinDensity(ibinMax) != DATASZ/NBINS) 
++   if (kdBins->GetBinContent(ibinMax) != DATASZ/NBINS)
+       Error("testkdTreeBinning","Wrong bin content");
+ 
+    // order bins by density
diff --git a/root-test-stress-32bit.patch b/root-test-stress-32bit.patch
new file mode 100644
index 0000000..ce2d370
--- /dev/null
+++ b/root-test-stress-32bit.patch
@@ -0,0 +1,13 @@
+diff --git a/test/stress.cxx b/test/stress.cxx
+index 0f759ad7c2..7c3c9e1b04 100644
+--- a/test/stress.cxx
++++ b/test/stress.cxx
+@@ -385,7 +385,7 @@ void stress3()
+    Long64_t last = f.GetEND();
+    Float_t comp = f.GetCompressionFactor();
+    Bool_t OK = kTRUE;
+-   constexpr Long64_t lastgood  = 51651;
++   constexpr Long64_t lastgood  = 51851;
+    constexpr Long64_t tolerance = 150;
+    if (last <lastgood-tolerance || last > lastgood+tolerance || comp <1.8 || comp > 2.4) OK = kFALSE;
+    if (OK) printf("OK\n");
diff --git a/root.spec b/root.spec
index fd25d06..577c43d 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -95,6 +95,24 @@ Patch14:	%{name}-ppc64-doc.patch
 #		Fix constructing the GSL MC Integrator
 #		Backport from upstream git
 Patch15:	%{name}-Fix-constructing-the-GSL-MC-Integrator.patch
+#		Check string is not empty before calling front()
+#		Backport from upstream git
+Patch16:	%{name}-crash-fix.patch
+#		Adjust expected file size for ix32
+#		Backport from upstream git
+Patch17:	%{name}-test-stress-32bit.patch
+#		Fixes for failing tests due to new compiler flags
+#		https://github.com/root-project/root/pull/1638
+Patch18:	%{name}-test-fixes.patch
+#		https://github.com/root-project/root/pull/1639
+Patch19:	%{name}-out-of-bounds.patch
+#		Fix ~ alignment in doxygen markup
+#		https://github.com/root-project/root/pull/1640
+Patch20:	%{name}-doxygen-tilde.patch
+#		Don't install intermediate static libs (mathtext and minicern)
+#		Don't add JupyROOT python extension to cmake exports
+#		https://github.com/root-project/root/pull/1643
+Patch21:	%{name}-noinst.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1660,6 +1678,12 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2095,8 +2119,6 @@ rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
 rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
-rm %{buildroot}%{_libdir}/%{name}/libmathtext.a
-rm %{buildroot}%{_libdir}/%{name}/libminicern.a
 rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
@@ -2114,19 +2136,6 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
-# Remove references to deleted (or moved) files from cmake files
-for target in mathtext minicern JupyROOT; do
-    sed -e "s/ ROOT::${target} / /" \
-	-e "/Create imported target ROOT::${target}/,/^$/d" \
-	-e "/set_target_properties(ROOT::${target}/,/^$/d" \
-	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-    sed -e "/Import target \"ROOT::${target}\"/,/^$/d" \
-	-e "/APPEND _IMPORT_CHECK_TARGETS ROOT::${target}/,/^$/d" \
-	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
-done
-sed -e 's/;ROOT::minicern//' \
-    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
-
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
@@ -2265,14 +2274,18 @@ excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-
 # - mathcore-testMinim
 # - minuit2-testMinimizer
 # - test-minexam
-# - test-stressfit
+# - test-stressfit (but -interpreted works)
+# Tests failing on arm on Fedora <= 27
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
 # - tutorial-multicore-mt303_AsyncSimple
 # - tutorial-multicore-mt304_AsyncNested
 # - tutorial-multicore-mt305_TFuture
 # - tutorial-r-*
-excluded="${excluded}|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*"
+excluded="${excluded}|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit"
+%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*"
+%endif
 %endif
 
 %ifarch ppc64
@@ -3375,6 +3388,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Feb 16 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.04-4
+- Fix test failures found with new default compiler flags in Fedora 28
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 50233814adafdb08adf09448357d94abd3882b92 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 19 Feb 2018 13:48:39 +0100
Subject: [PATCH 126/344] Update to 6.12.06 Drop patch
 root-Fix-constructing-the-GSL-MC-Integrator.patch (previously   backported)

---
 ...x-constructing-the-GSL-MC-Integrator.patch | 35 ---------------
 root-noinst.patch                             |  2 +-
 root.spec                                     | 43 +++++++++++++------
 sources                                       |  2 +-
 4 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 root-Fix-constructing-the-GSL-MC-Integrator.patch

diff --git a/root-Fix-constructing-the-GSL-MC-Integrator.patch b/root-Fix-constructing-the-GSL-MC-Integrator.patch
deleted file mode 100644
index 8615550..0000000
--- a/root-Fix-constructing-the-GSL-MC-Integrator.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0bed472bc529c6fa515793984808a4f6c24fc715 Mon Sep 17 00:00:00 2001
-From: moneta <lorenzo.moneta@cern.ch>
-Date: Mon, 15 Jan 2018 15:00:44 +0100
-Subject: [PATCH] Fix constructing the GSL MC Integrator. This fix the failure
- observed sometimes in  math core-testIntegration. (Fix ROOT-9178)
-
----
- math/mathmore/src/GSLMCIntegrator.cxx | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/math/mathmore/src/GSLMCIntegrator.cxx b/math/mathmore/src/GSLMCIntegrator.cxx
-index 25ad7b4eac..1c00146630 100644
---- a/math/mathmore/src/GSLMCIntegrator.cxx
-+++ b/math/mathmore/src/GSLMCIntegrator.cxx
-@@ -100,6 +100,7 @@ GSLMCIntegrator::GSLMCIntegrator(MCIntegration::Type type, double absTol, double
- }
- 
- GSLMCIntegrator::GSLMCIntegrator(const char * type, double absTol, double relTol, unsigned int calls):
-+   fType(MCIntegration::kDEFAULT),
-    fDim(0),
-    fCalls(calls),
-    fAbsTol(absTol),
-@@ -316,7 +317,8 @@ void GSLMCIntegrator::SetTypeName(const char * type)
-    }
- 
-    // create the fWorkspace object
--   if (integType != fType) SetType(integType);
-+   // if it exists already with the same type it will not be re-created
-+   SetType(integType);
- }
- 
- 
--- 
-2.14.3
-
diff --git a/root-noinst.patch b/root-noinst.patch
index 4f3212f..88bdb67 100644
--- a/root-noinst.patch
+++ b/root-noinst.patch
@@ -29,7 +29,7 @@ index 2758edb08e1..d98ac3b6331 100644
 +ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL)
  target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
  
- # Disable optimization since it some cases was causing crashes
+ # Disable optimization since it some cases was causing crashes.
 
 From 9bd8d4e52fae5467867cbcf1810bc58a63b55a62 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
diff --git a/root.spec b/root.spec
index 577c43d..ddafd9f 100644
--- a/root.spec
+++ b/root.spec
@@ -31,9 +31,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.12.04
+Version:	6.12.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -92,27 +92,24 @@ Patch13:	%{name}-memory-arm.patch
 #		Ensures content of doc package is the same on all architecture
 #		so that koji accepts it as a noarch package.
 Patch14:	%{name}-ppc64-doc.patch
-#		Fix constructing the GSL MC Integrator
-#		Backport from upstream git
-Patch15:	%{name}-Fix-constructing-the-GSL-MC-Integrator.patch
 #		Check string is not empty before calling front()
 #		Backport from upstream git
-Patch16:	%{name}-crash-fix.patch
+Patch15:	%{name}-crash-fix.patch
 #		Adjust expected file size for ix32
 #		Backport from upstream git
-Patch17:	%{name}-test-stress-32bit.patch
+Patch16:	%{name}-test-stress-32bit.patch
 #		Fixes for failing tests due to new compiler flags
 #		https://github.com/root-project/root/pull/1638
-Patch18:	%{name}-test-fixes.patch
+Patch17:	%{name}-test-fixes.patch
 #		https://github.com/root-project/root/pull/1639
-Patch19:	%{name}-out-of-bounds.patch
+Patch18:	%{name}-out-of-bounds.patch
 #		Fix ~ alignment in doxygen markup
 #		https://github.com/root-project/root/pull/1640
-Patch20:	%{name}-doxygen-tilde.patch
+Patch19:	%{name}-doxygen-tilde.patch
 #		Don't install intermediate static libs (mathtext and minicern)
 #		Don't add JupyROOT python extension to cmake exports
 #		https://github.com/root-project/root/pull/1643
-Patch21:	%{name}-noinst.patch
+Patch20:	%{name}-noinst.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -225,7 +222,11 @@ BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
 #		Provides "symbol", "dingbats" and "chancery"
+%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	urw-base35-fonts
+%else
 BuildRequires:	urw-fonts
+%endif
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
 BuildRequires:	font(droidsansfallback)
@@ -349,7 +350,11 @@ Requires:	font(freesans)
 Requires:	font(freeserif)
 Requires:	font(freemono)
 #		Provides "symbol", "dingbats" and "chancery"
+%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
+Requires:	urw-base35-fonts
+%else
 Requires:	urw-fonts
+%endif
 #		The root-fonts package provides Droid Sans Fallback for EPEL
 %if %{?fedora}%{!?fedora:0} >= 11
 Requires:	font(droidsansfallback)
@@ -1683,7 +1688,6 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2307,6 +2311,16 @@ excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof
 excluded="${excluded}|test-stresshistogram"
 %endif
 
+# Test failing on 32 bit on Fedora <= 27
+# https://sft.its.cern.ch/jira/browse/ROOT-9236
+# https://sft.its.cern.ch/jira/browse/ROOT-9265
+# - gtest-tree-treeplayer-test-dataframe-snapshot
+%ifarch %{ix86} %{arm}
+%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
+excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot"
+%endif
+%endif
+
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -3388,6 +3402,11 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Feb 17 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-1
+- Update to 6.12.06
+- Drop patch root-Fix-constructing-the-GSL-MC-Integrator.patch (previously
+  backported)
+
 * Fri Feb 16 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.04-4
 - Fix test failures found with new default compiler flags in Fedora 28
 
diff --git a/sources b/sources
index 498a567..da8883b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.12.04.tar.xz) = 271cc151073f0b147f4e4f5030f71e3782723be1e5c36c431b85086e8280dbdab1fde22c4f5c26e5f8d821ed309d4b7db5e846ec383db84d64714d0c627c8c7a
+SHA512 (root-6.12.06.tar.xz) = 607644b5cd06fdab5e0899172156cbed92911de9d1eef2695cc79c5f41621a2d1167a6d14791c5b97c8d15dcb7d4d45952b3dcf4ffb096dc51bdeb3233b5467f
 SHA512 (root-testfiles.tar.xz) = f697afb666c1081f98cfe66fe21998c4eab86c25a3671ff71a4ac98610d70f70081d70b40029a0b788b39d87c542b5aa4e31d71f7be494f4774323ed20e9bccb

From 2249adc221383d2bc8eff6bf41ab4a6fcb36055e Mon Sep 17 00:00:00 2001
From: Christian Dersch <lupinix@mailbox.org>
Date: Fri, 23 Feb 2018 20:34:04 +0100
Subject: [PATCH 127/344] rebuilt for cfitsio 3.420 (so version bump)

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index ddafd9f..3c42a57 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3402,6 +3402,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-2
+- rebuilt for cfitsio 3.420 (so version bump)
+
 * Sat Feb 17 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-1
 - Update to 6.12.06
 - Drop patch root-Fix-constructing-the-GSL-MC-Integrator.patch (previously

From 81b256c066137328a9e31350e9eb30f0d9548b5e Mon Sep 17 00:00:00 2001
From: Christian Dersch <lupinix@mailbox.org>
Date: Sat, 24 Feb 2018 11:41:57 +0100
Subject: [PATCH 128/344] rebuilt for cfitsio 3.420 (so version bump)

---
 root-memory-arm.patch => root-memory-arm-x86.patch | 4 ++--
 root.spec                                          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename root-memory-arm.patch => root-memory-arm-x86.patch (78%)

diff --git a/root-memory-arm.patch b/root-memory-arm-x86.patch
similarity index 78%
rename from root-memory-arm.patch
rename to root-memory-arm-x86.patch
index b281dea..894a728 100644
--- a/root-memory-arm.patch
+++ b/root-memory-arm-x86.patch
@@ -4,8 +4,8 @@
    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /ignore:4049,4206,4217,4221")
  endif()
  
-+# Reduce memory usage during linking on ARM by generating minimal debuginfo
-+if(ROOT_CLING_TARGET STREQUAL "ARM")
++# Reduce memory usage during linking on ARM and x86 by generating minimal debuginfo
++if(ROOT_CLING_TARGET STREQUAL "ARM" OR ROOT_CLING_TARGET STREQUAL "X86")
 +  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")  
 +  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")  
 +endif()
diff --git a/root.spec b/root.spec
index 3c42a57..3391b36 100644
--- a/root.spec
+++ b/root.spec
@@ -84,10 +84,10 @@ Patch10:	%{name}-system-pythia.patch
 Patch11:	%{name}-memory-usage.patch
 #		Fedora's llvm patch
 Patch12:	%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
-#		Reduce memory usage during linking on ARM by generating
+#		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
 #		Fedora builders run out of memory with the default setting.
-Patch13:	%{name}-memory-arm.patch
+Patch13:	%{name}-memory-arm-x86.patch
 #		Don't run tutorials that crash on ppc64 during doc generation.
 #		Ensures content of doc package is the same on all architecture
 #		so that koji accepts it as a noarch package.
@@ -3404,6 +3404,7 @@ end
 %changelog
 * Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-2
 - rebuilt for cfitsio 3.420 (so version bump)
+- modified patch 13 to also produce smaller debuginfo on x86 (ld out of memory)
 
 * Sat Feb 17 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-1
 - Update to 6.12.06

From 288358c2627789ddc4c818abd89e0b51aea3d9c2 Mon Sep 17 00:00:00 2001
From: Christian Dersch <lupinix@mailbox.org>
Date: Sat, 24 Feb 2018 22:38:38 +0100
Subject: [PATCH 129/344] disabled test
 gtest-tree-treeplayer-test-dataframe-snapshot on ARM

---
 root.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 3391b36..d49ee7f 100644
--- a/root.spec
+++ b/root.spec
@@ -2275,6 +2275,7 @@ excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-
 %ifarch %{arm}
 # Tests failing on arm
 # https://sft.its.cern.ch/jira/browse/ROOT-8500
+# - gtest-tree-treeplayer-test-dataframe-snapshot
 # - mathcore-testMinim
 # - minuit2-testMinimizer
 # - test-minexam
@@ -2286,7 +2287,7 @@ excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-
 # - tutorial-multicore-mt304_AsyncNested
 # - tutorial-multicore-mt305_TFuture
 # - tutorial-r-*
-excluded="${excluded}|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit"
+excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit"
 %if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
 excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*"
 %endif
@@ -3405,6 +3406,7 @@ end
 * Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-2
 - rebuilt for cfitsio 3.420 (so version bump)
 - modified patch 13 to also produce smaller debuginfo on x86 (ld out of memory)
+- disabled test gtest-tree-treeplayer-test-dataframe-snapshot on ARM
 
 * Sat Feb 17 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-1
 - Update to 6.12.06

From 8f829ba002f325b2dfdceeb6f98213362c7af2d2 Mon Sep 17 00:00:00 2001
From: Christian Dersch <lupinix@mailbox.org>
Date: Sat, 26 May 2018 12:14:18 +0200
Subject: [PATCH 130/344] rebuilt for cfitsio 3.450

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index d49ee7f..edcb2a1 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3403,6 +3403,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-3
+- rebuilt for cfitsio 3.450
+
 * Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-2
 - rebuilt for cfitsio 3.420 (so version bump)
 - modified patch 13 to also produce smaller debuginfo on x86 (ld out of memory)

From 5914088cb68165d88530ca27bb1f267b287c3969 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 29 May 2018 20:23:53 +0200
Subject: [PATCH 131/344] Adjust allowed deviation for PDF file sizes in
 stressGraphics test (aarch64)

---
 root-memory-arm-x86.patch     |  2 +-
 root-stressgraphics-ref.patch | 26 ++++++++++++++++++++++++++
 root.spec                     |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 root-stressgraphics-ref.patch

diff --git a/root-memory-arm-x86.patch b/root-memory-arm-x86.patch
index 894a728..54c4149 100644
--- a/root-memory-arm-x86.patch
+++ b/root-memory-arm-x86.patch
@@ -5,7 +5,7 @@
  endif()
  
 +# Reduce memory usage during linking on ARM and x86 by generating minimal debuginfo
-+if(ROOT_CLING_TARGET STREQUAL "ARM" OR ROOT_CLING_TARGET STREQUAL "X86")
++if(ROOT_ARCHITECTURE STREQUAL "linuxarm" OR ROOT_ARCHITECTURE STREQUAL "linux")
 +  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")  
 +  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")  
 +endif()
diff --git a/root-stressgraphics-ref.patch b/root-stressgraphics-ref.patch
new file mode 100644
index 0000000..ad91815
--- /dev/null
+++ b/root-stressgraphics-ref.patch
@@ -0,0 +1,26 @@
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 4341c21c79..0089951936 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -29,16 +29,16 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
+    28      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
+    29      7419       500     15112       200      8113      4200     18872     21600      7928      7000      7296       500
+    30     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
+-   31     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
+-   32   3304592       100    712308       100    155478     32000     62688     19000    123056      7000         0         0
+-   33    321963      5500    434394      1000     34942      8300     65532     27800     37314     12000    331505      5500
++   31     30615      8200     27494       150     29010      5900     50520     18200     35724      5400     36690      8200
++   32   3304592       100    712308       500    155478     32000     62688     19000    123056      7000         0         0
++   33    321963      5500    434394      1100     34942      8300     65532     27800     37314     12000    331505      5500
+    34     36514       300     16815       200     25333      2200     47408     12700     33739      3700     36399       300
+    35    207729       750     87126       100     41853      6200     76094     38000     54717     11000    210497       800
+    36    401670      6500    156361       500     38898     10400     62719     34100     45592     14000    410114      6500
+    37    566142      5000    225206       750     43638      6300     65828     31800     53934      6500    573396      5000
+-   38   3738751     35000   1292739       500     84139      3400     60580      9900    133547      3500   3783013     35000
++   38   3738751     35000   1292739      8000     84139      3400     60580      9900    133547      3500   3783013     35000
+    39   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7500
+-   40     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
++   40     38312       200     56877       250     47205      3900     36524     11800    119641      8000     38121       200
+    41     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    42    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
+    43      4846       150     14075       100     24281       200     33239       600     25303       300      4877       150
diff --git a/root.spec b/root.spec
index edcb2a1..441f5f8 100644
--- a/root.spec
+++ b/root.spec
@@ -110,6 +110,8 @@ Patch19:	%{name}-doxygen-tilde.patch
 #		Don't add JupyROOT python extension to cmake exports
 #		https://github.com/root-project/root/pull/1643
 Patch20:	%{name}-noinst.patch
+#		Adjust allowed deviation for PDF file sizes (aarch64)
+Patch21:	%{name}-stressgraphics-ref.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1688,6 +1690,7 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3405,6 +3408,7 @@ end
 %changelog
 * Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-3
 - rebuilt for cfitsio 3.450
+- Adjust allowed deviation for PDF file sizes in stressGraphics test (aarch64)
 
 * Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-2
 - rebuilt for cfitsio 3.420 (so version bump)

From 11b92eb69643bb82bdd66dd9aaf70521d10b7c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 19 Jun 2018 11:26:55 +0200
Subject: [PATCH 132/344] Rebuilt for Python 3.7

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 441f5f8..08b0f78 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3406,6 +3406,9 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 6.12.06-4
+- Rebuilt for Python 3.7
+
 * Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 6.12.06-3
 - rebuilt for cfitsio 3.450
 - Adjust allowed deviation for PDF file sizes in stressGraphics test (aarch64)

From 9af52db6016cf39df919ec0f198b2606e1ac33e4 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 30 Jun 2018 22:12:56 +0200
Subject: [PATCH 133/344] Adjust Vavilov test for Fedora 29 ix86 Adapt to
 python 3.7

---
 ...owed-test-difference-for-32-bit-ix86.patch | 22 ++++++++
 root-python-3.7.patch                         | 52 +++++++++++++++++++
 root.spec                                     | 15 +++++-
 3 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 root-adjust-allowed-test-difference-for-32-bit-ix86.patch
 create mode 100644 root-python-3.7.patch

diff --git a/root-adjust-allowed-test-difference-for-32-bit-ix86.patch b/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
new file mode 100644
index 0000000..b7aa84d
--- /dev/null
+++ b/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
@@ -0,0 +1,22 @@
+From e363a175b96bbd1d24f5b4030192b8fb4b525681 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 29 Jun 2018 09:43:01 +0200
+Subject: [PATCH] Adjust allowed test difference for 32-bit ix86
+
+---
+ math/mathmore/test/VavilovTest.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/math/mathmore/test/VavilovTest.cxx b/math/mathmore/test/VavilovTest.cxx
+index f99e8291046..d5020f8a386 100644
+--- a/math/mathmore/test/VavilovTest.cxx
++++ b/math/mathmore/test/VavilovTest.cxx
+@@ -886,7 +886,7 @@ void VavilovTest::GetCdfTestParams (const Vavilov& v, double& maxabsdiff, double
+    }
+    else {
+       maxabsdiff = 1E-5;
+-      maxcdfdiff = 5E-15;
++      maxcdfdiff = 7E-15;
+    }
+ }
+ 
diff --git a/root-python-3.7.patch b/root-python-3.7.patch
new file mode 100644
index 0000000..873cade
--- /dev/null
+++ b/root-python-3.7.patch
@@ -0,0 +1,52 @@
+From 3de0685b5da3c8d2025be06d4397a24feaaced2e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 30 Jun 2018 21:27:57 +0200
+Subject: [PATCH] Fixes for Python 3.7
+
+---
+ bindings/pyroot/src/PyRootType.cxx         | 2 +-
+ bindings/pyroot/src/Pythonize.cxx          | 4 +---
+ bindings/pyroot/src/TPyROOTApplication.cxx | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/pyroot/src/PyRootType.cxx b/bindings/pyroot/src/PyRootType.cxx
+index 3c2719cb2f8..0edc2e8773e 100644
+--- a/bindings/pyroot/src/PyRootType.cxx
++++ b/bindings/pyroot/src/PyRootType.cxx
+@@ -100,7 +100,7 @@ namespace {
+             if ( ! attr && ! PyRootType_CheckExact( pyclass ) && PyType_Check( pyclass ) ) {
+                PyErr_Clear();
+                PyObject* pycppname = PyObject_GetAttr( pyclass, PyStrings::gCppName );
+-               char* cppname = PyROOT_PyUnicode_AsString(pycppname);
++               const char* cppname = PyROOT_PyUnicode_AsString(pycppname);
+                Py_DECREF(pycppname);
+                Cppyy::TCppScope_t scope = Cppyy::GetScope( cppname );
+                TClass* klass = TClass::GetClass( cppname );
+diff --git a/bindings/pyroot/src/Pythonize.cxx b/bindings/pyroot/src/Pythonize.cxx
+index 0c4817217f1..9386730517a 100644
+--- a/bindings/pyroot/src/Pythonize.cxx
++++ b/bindings/pyroot/src/Pythonize.cxx
+@@ -976,9 +976,7 @@ namespace {
+       vi->vi_len = vi->vi_pos = 0;
+       vi->vi_len = PySequence_Size( v );
+ 
+-#ifndef R__WIN32 // prevent error LNK2001: unresolved external symbol __PyGC_generation0
+-      _PyObject_GC_TRACK( vi );
+-#endif
++      PyObject_GC_Track( vi );
+       return (PyObject*)vi;
+    }
+ 
+diff --git a/bindings/pyroot/src/TPyROOTApplication.cxx b/bindings/pyroot/src/TPyROOTApplication.cxx
+index 4f624a762f3..c47596e3830 100644
+--- a/bindings/pyroot/src/TPyROOTApplication.cxx
++++ b/bindings/pyroot/src/TPyROOTApplication.cxx
+@@ -98,7 +98,7 @@ Bool_t PyROOT::TPyROOTApplication::CreatePyROOTApplication( Bool_t bLoadLibs )
+       if ( argl && 0 < PyList_Size( argl ) ) argc = (int)PyList_GET_SIZE( argl );
+       char** argv = new char*[ argc ];
+       for ( int i = 1; i < argc; ++i ) {
+-         char* argi = PyROOT_PyUnicode_AsString( PyList_GET_ITEM( argl, i ) );
++         char* argi = const_cast< char* >( PyROOT_PyUnicode_AsString( PyList_GET_ITEM( argl, i ) ) );
+          if ( strcmp( argi, "-" ) == 0 || strcmp( argi, "--" ) == 0 ) {
+          // stop collecting options, the remaining are for the python script
+             argc = i;    // includes program name
diff --git a/root.spec b/root.spec
index 08b0f78..bc40569 100644
--- a/root.spec
+++ b/root.spec
@@ -33,7 +33,7 @@
 Name:		root
 Version:	6.12.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -111,7 +111,14 @@ Patch19:	%{name}-doxygen-tilde.patch
 #		https://github.com/root-project/root/pull/1643
 Patch20:	%{name}-noinst.patch
 #		Adjust allowed deviation for PDF file sizes (aarch64)
+#		https://github.com/root-project/root/pull/2120
 Patch21:	%{name}-stressgraphics-ref.patch
+#		Adjust Vavilov test for Fedora 29 ix86
+#		https://github.com/root-project/root/pull/2273
+Patch22:	%{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
+#		Adapt to python 3.7
+#		https://github.com/root-project/root/pull/2276
+Patch23:	%{name}-python-3.7.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1691,6 +1698,8 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3406,6 +3415,10 @@ end
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Jun 30 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-5
+- Adjust Vavilov test for Fedora 29 ix86
+- Adapt to python 3.7
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 6.12.06-4
 - Rebuilt for Python 3.7
 

From 88f740ba6c602cca3595f178b2bdeff14a597945 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 8 Jul 2018 14:11:30 +0200
Subject: [PATCH 134/344] Update to 6.14.00 Drop patches previously backported:
   root-doxygen-makefile.patch   root-crash-fix.patch  
 root-test-stress-32bit.patch Drop patches accepted upstream:  
 root-test-subdirs.patch   root-test-fixes.patch   root-out-of-bounds.patch  
 root-doxygen-tilde.patch   root-noinst.patch Drop patches for issues fixed
 upstream:   root-dont-link-jvm.patch   root-system-pythia.patch Drop patch
 root-urw-otf-hack.patch - broken font file no longer present Drop Google
 Droid Sans Fallback font from EPEL 7 root-fonts package   (the font is now
 available in EPEL 7) Use two more patches from Fedora's llvm5.0 package New
 root-test-subdirs.patch patch for more instances of the same issue Fix a test
 not setting cache file directory so that it works offline Fix a compatibility
 issue with the EPEL 7 gtest version Fix a missing include Workaround
 optimization problems in the Geom library New subpackages due to library
 splits   root-tree-dataframe and root-vecops from root-tree-player  
 root-net-httpsniff from root-net-http New subpackages due to package splits  
 root-gui-html from root-gui   root-gui-qtgsi from root-gui-qt  
 root-io-xmlparser from root-io-xml   root-proof-player from root-proof New
 ROOT 7 subpackages   graf-gpadv7   graf-primitives   gui-fitpanelv7  
 gui-qt5webdisplay Rename root-guibuilder package to root-gui-builder

---
 ...type-in-ORC-readMem-client-interface.patch |  14 +
 ...non-simple-MVT-in-STBRX-optimization.patch |  24 +
 root-crash-fix.patch                          |  26 -
 root-dont-link-jvm.patch                      | 123 ---
 root-doxygen-makefile.patch                   |  28 -
 root-doxygen-tilde.patch                      |  36 -
 root-fontconfig.patch                         | 136 +--
 root-ix32-geom-opt.patch                      |  14 +
 root-memory-usage.patch                       |  19 +-
 root-missing-header.patch                     |  21 +
 root-noinst.patch                             |  55 --
 root-out-of-bounds.patch                      |  25 -
 root-set-cache-file-dir.patch                 |  38 +
 root-stressgraphics-ref.patch                 |  17 +-
 root-system-pythia.patch                      |  42 -
 root-test-compilatiom-epel7.patch             |  27 +
 root-test-fixes.patch                         | 337 --------
 root-test-stress-32bit.patch                  |  13 -
 root-test-subdirs.patch                       | 256 +-----
 root-testfiles.sh                             |   5 +-
 root-urw-otf-hack.patch                       |  15 -
 root.spec                                     | 813 ++++++++++--------
 sources                                       |   4 +-
 23 files changed, 678 insertions(+), 1410 deletions(-)
 create mode 100644 root-Fix-return-type-in-ORC-readMem-client-interface.patch
 create mode 100644 root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 delete mode 100644 root-crash-fix.patch
 delete mode 100644 root-dont-link-jvm.patch
 delete mode 100644 root-doxygen-makefile.patch
 delete mode 100644 root-doxygen-tilde.patch
 create mode 100644 root-ix32-geom-opt.patch
 create mode 100644 root-missing-header.patch
 delete mode 100644 root-noinst.patch
 delete mode 100644 root-out-of-bounds.patch
 create mode 100644 root-set-cache-file-dir.patch
 delete mode 100644 root-system-pythia.patch
 create mode 100644 root-test-compilatiom-epel7.patch
 delete mode 100644 root-test-fixes.patch
 delete mode 100644 root-test-stress-32bit.patch
 delete mode 100644 root-urw-otf-hack.patch

diff --git a/root-Fix-return-type-in-ORC-readMem-client-interface.patch b/root-Fix-return-type-in-ORC-readMem-client-interface.patch
new file mode 100644
index 0000000..2fd426d
--- /dev/null
+++ b/root-Fix-return-type-in-ORC-readMem-client-interface.patch
@@ -0,0 +1,14 @@
+diff -ur root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+--- root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h	2018-06-27 17:05:07.750663216 +0200
+@@ -713,8 +713,8 @@
+ 
+   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
+ 
+-  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
+-                                      uint64_t Size) {
++  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
++                                         uint64_t Size) {
+     // Check for an 'out-of-band' error, e.g. from an MM destructor.
+     if (ExistingError)
+       return std::move(ExistingError);
diff --git a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
new file mode 100644
index 0000000..c5d0b59
--- /dev/null
+++ b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
@@ -0,0 +1,24 @@
+diff -ur root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
+--- root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-06-27 17:06:55.739506085 +0200
+@@ -11861,6 +11861,11 @@
+          N->getOperand(1).getValueType() == MVT::i16 ||
+          (Subtarget.hasLDBRX() && Subtarget.isPPC64() &&
+           N->getOperand(1).getValueType() == MVT::i64))) {
++      // STBRX can only handle simple types.
++      EVT mVT = cast<StoreSDNode>(N)->getMemoryVT();
++      if (mVT.isExtended())
++        break;
++
+       SDValue BSwapOp = N->getOperand(1).getOperand(0);
+       // Do an any-extend to 32-bits if this is a half-word input.
+       if (BSwapOp.getValueType() == MVT::i16)
+@@ -11868,7 +11873,6 @@
+ 
+       // If the type of BSWAP operand is wider than stored memory width
+       // it need to be shifted to the right side before STBRX.
+-      EVT mVT = cast<StoreSDNode>(N)->getMemoryVT();
+       if (Op1VT.bitsGT(mVT)) {
+         int Shift = Op1VT.getSizeInBits() - mVT.getSizeInBits();
+         BSwapOp = DAG.getNode(ISD::SRL, dl, Op1VT, BSwapOp,
+Endast i root-6.14.00/interpreter/llvm/src: test
diff --git a/root-crash-fix.patch b/root-crash-fix.patch
deleted file mode 100644
index ed64701..0000000
--- a/root-crash-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d055981def808c9c2175a8ca3f362b6ea006ebf3 Mon Sep 17 00:00:00 2001
-From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
-Date: Thu, 8 Feb 2018 10:43:59 +0100
-Subject: [PATCH] Fix another potential crash on Windows
-
-On Windows, (as the standard says) calling front() on an empty std::vector causes an undefined behaviour. One must check that the container contains something using empty() before calling front()
----
- core/foundation/src/TClassEdit.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/foundation/src/TClassEdit.cxx b/core/foundation/src/TClassEdit.cxx
-index 38c8b1a5a2..954e40fcc5 100644
---- a/core/foundation/src/TClassEdit.cxx
-+++ b/core/foundation/src/TClassEdit.cxx
-@@ -1900,7 +1900,7 @@ public:
-       auto argsEnd = v.end();
-       auto argsBeginPlusOne = ++v.begin();
-       auto argPos = std::find_if(argsBeginPlusOne, argsEnd,
--                              [](std::string& arg){return arg.front() == ':';});
-+           [](std::string& arg){return (!arg.empty() && arg.front() == ':');});
-       if (argPos != argsEnd) {
-          const int lenght = clName.size();
-          int wedgeBalance = 0;
--- 
-2.14.3
-
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
deleted file mode 100644
index fdc0091..0000000
--- a/root-dont-link-jvm.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake
---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/cmake/modules/RootConfiguration.cmake	2016-03-20 15:54:25.926191321 +0100
-@@ -263,10 +263,6 @@
- set(hdfslib ${HDFS_LIBRARY})
- set(hdfsincdir ${HDFS_INCLUDE_DIR})
- 
--set(jniincdir ${Java_INCLUDE_DIRS})
--set(jvmlib ${Java_LIBRARIES})
--set(jvmlibdir ${Java_LIBRARY_DIR})
--
- set(buildalien ${value${alien}})
- set(alienlibdir ${ALIEN_LIBRARY_DIR})
- set(alienlib ${ALIEN_LIBRARY})
-diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in
---- root-6.06.02.orig/config/Makefile.in	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/config/Makefile.in	2016-03-20 15:54:25.999192031 +0100
-@@ -251,9 +251,6 @@
- HDFSLIBDIR     := @hdfslibdir@
- HDFSCLILIB     := @hdfslib@
- HDFSINCDIR     := $(filter-out /usr/include, @hdfsincdir@)
--JNIINCDIR      := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
--JVMCLILIB      := @jvmlib@
--JVMLIBDIR      := @jvmlibdir@
- 
- BUILDALIEN     := @buildalien@
- ALIENLIBDIR    := @alienlibdir@
-diff -ur root-6.06.02.orig/configure root-6.06.02/configure
---- root-6.06.02.orig/configure	2016-03-20 14:37:23.733597759 +0100
-+++ root-6.06.02/configure	2016-03-20 15:54:26.038192410 +0100
-@@ -1822,8 +1822,6 @@
-   hdfs-incdir        HDFS support, location of hdfs.h
-   hdfs-libdir        HDFS support, location of libhdfs
-   iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
--  jni-incdir         HDFS support, location of JNI headers
--  jvm-libdir         HDFS support, location of JVM library
-   krb5               Kerberos5 support, location of Kerberos distribution
-   krb5-incdir        Kerberos5 support, location of krb5.h
-   krb5-libdir        Kerberos5 support, location of libkrb5
-@@ -2214,8 +2212,6 @@
-       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
-       --with-iosvers=*)        iosvers=$optarg       ;;
--      --with-jni-incdir=*)     jniincdir=$optarg     ;;
--      --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
-       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
-       --with-krb5-incdir=*)    krb5incdir=$optarg    ; enable_krb5="yes"    ;;
-       --with-krb5-libdir=*)    krb5libdir=$optarg    ; enable_krb5="yes"    ;;
-@@ -4535,17 +4531,6 @@
-     hdfsinc=$found_hdr
-     hdfsincdir=$found_dir
- 
--    if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
--       JAVA_HOME=`/usr/libexec/java_home`
--    fi
--
--    keepincdir=$jniincdir
--    check_header "jni.h" "$jniincdir" \
--        ${JAVA_HOME:+$JAVA_HOME/include} \
--        /usr/java/default/include /usr/include /usr/local/include
--    jniinc=$found_hdr
--    jniincdir=$found_dir
--
-     check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
-         $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
-         $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
-@@ -4553,26 +4538,12 @@
-     hdfslib=$found_lib
-     hdfslibdir=$found_dir
- 
--    check_library "libjvm" "$enable_shared" "$jvmlibdir" \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
--        ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
--        ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
--        /usr/java/default/jre/lib/amd64/server \
--        /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
--    jvmlib=$found_lib
--    jvmlibdir=$found_dir
--
--    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
-+    if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
-         enable_hdfs="no"
-     else
-         case $platform in
-             linux)
--                check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
--                if test $link_result -eq 0 ; then
--                    enable_hdfs="no"
--                fi
--
--                check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
-+                check_link "$hdfslib" "$hdfslibdir" hdfsConnect
-                 if test $link_result -eq 0 ; then
-                     enable_hdfs="no"
-                 fi
-@@ -7641,9 +7612,6 @@
-     -e "s|@iosvers@|$iosvers|"                  \
-     -e "s|@iconpath@|$iconpath|"                \
-     -e "s|@incdir@|$incdir|"                    \
--    -e "s|@jniincdir@|$jniincdir|g"             \
--    -e "s|@jvmlibdir@|$jvmlibdir|g"             \
--    -e "s|@jvmlib@|$jvmlib|g"                   \
-     -e "s|@krb5incdir@|$krb5incdir|"            \
-     -e "s|@krb5lib@|$krb5lib|"                  \
-     -e "s|@krb5libdir@|$krb5libdir|"            \
-diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk
---- root-6.06.02.orig/io/hdfs/Module.mk	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/io/hdfs/Module.mk	2016-03-20 15:54:26.038192410 +0100
-@@ -44,7 +44,7 @@
- $(HDFSLIB):     $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
--		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
-+		   "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
- 
- $(call pcmrule,HDFS)
- 	$(noop)
-@@ -72,4 +72,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
-+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-doxygen-makefile.patch b/root-doxygen-makefile.patch
deleted file mode 100644
index 1468981..0000000
--- a/root-doxygen-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
-index 4e6b47728d..a886c1b729 100644
---- a/documentation/doxygen/Makefile
-+++ b/documentation/doxygen/Makefile
-@@ -8,7 +8,6 @@ export DOXYGEN_ROOT_VERSION := $(shell root -l -b -q -e 'printf("%s\n", gROOT->G
- export DOXYGEN_EXAMPLE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/macros
- export DOXYGEN_IMAGE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/html
- export DOXYGEN_NOTEBOOK_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/notebooks
--export DOXYGEN_NOTEBOOK_PATH_PARALLEL := $(DOXYGEN_NOTEBOOK_PATH)/parallel
- export DOXYGEN_STRIP_PATH := $(shell cd $(PWD)/../..; pwd)
- export DOXYGEN_INCLUDE_PATH := $(shell find $(DOXYGEN_STRIP_PATH) -type d -name dictpch -prune -o -type d -name inc)
- 
-@@ -33,14 +32,11 @@ doxygen: filter
- 	$(call MkDir,$(DOXYGEN_OUTPUT_DIRECTORY))
- 	$(call MkDir,$(DOXYGEN_EXAMPLE_PATH))
- 	$(call MkDir,$(DOXYGEN_NOTEBOOK_PATH))
--	$(call MkDir,$(DOXYGEN_NOTEBOOK_PATH_PARALLEL))
--	time python ./parallelNotebooks.py
- 	./makehtmlfooter.sh > htmlfooter.html
- 	doxygen
- 	./listlibs.sh
- 	rm -rf files c1* *.ps *.png *.svg *.pdf *.root *.xpm *.out *.dat *.dtd *.dot *.txt listofclass.sh
--	rm $(DOXYGEN_NOTEBOOK_PATH)/*.root
--	rm $(DOXYGEN_NOTEBOOK_PATH_PARALLEL)/*.root
-+	rm -f $(DOXYGEN_NOTEBOOK_PATH)/*.root
- 
- clean:
- 	rm -r $(DOXYGEN_OUTPUT_DIRECTORY) filter htmlfooter.html dataset*
diff --git a/root-doxygen-tilde.patch b/root-doxygen-tilde.patch
deleted file mode 100644
index bbae6d8..0000000
--- a/root-doxygen-tilde.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 533f64b053c9fa72b456a7e351e17e354b94dcdc Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:30:44 +0100
-Subject: [PATCH] Fix doxygen ~ alignment
-
----
- core/meta/src/TStatusBitsChecker.cxx | 2 +-
- tree/treeplayer/src/TTreeReader.cxx  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/meta/src/TStatusBitsChecker.cxx b/core/meta/src/TStatusBitsChecker.cxx
-index 360d85d0c74..1661bd3646b 100644
---- a/core/meta/src/TStatusBitsChecker.cxx
-+++ b/core/meta/src/TStatusBitsChecker.cxx
-@@ -42,7 +42,7 @@
-       // used in TStreamerElement
-       kHasRange = TStreamerElement::kHasRange
-    };
--  ~~~ {.cpp}
-+   ~~~ {.cpp}
- 
-   Without the EStatusBitsDupExceptions enum you would see
- 
-diff --git a/tree/treeplayer/src/TTreeReader.cxx b/tree/treeplayer/src/TTreeReader.cxx
-index d411fbdd967..e823797e523 100644
---- a/tree/treeplayer/src/TTreeReader.cxx
-+++ b/tree/treeplayer/src/TTreeReader.cxx
-@@ -235,7 +235,7 @@ void TTreeReader::Initialize()
- /// If end <= begin, `end` is ignored (set to `-1`) and only `begin` is used.
- /// Example:
- ///
--///  ~~~ {.cpp}
-+/// ~~~ {.cpp}
- /// reader.SetEntriesRange(3, 5);
- /// while (reader.Next()) {
- ///   // Will load entries 3 and 4.
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 22284c2..4016fbc 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base/src/TApplication.cxx
---- root-6.12.04.orig/core/base/src/TApplication.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/core/base/src/TApplication.cxx	2018-01-07 22:17:25.173658049 +0100
-@@ -275,18 +275,11 @@
+diff -ur root-6.14.00.orig/core/base/src/TApplication.cxx root-6.14.00/core/base/src/TApplication.cxx
+--- root-6.14.00.orig/core/base/src/TApplication.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/core/base/src/TApplication.cxx	2018-06-14 10:28:26.052618314 +0200
+@@ -277,18 +277,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -300,7 +293,6 @@
+@@ -302,7 +295,6 @@
        }
     }
  #endif
@@ -30,33 +30,21 @@ diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.12.04.orig/graf2d/asimage/CMakeLists.txt root-6.12.04/graf2d/asimage/CMakeLists.txt
---- root-6.12.04.orig/graf2d/asimage/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/asimage/CMakeLists.txt	2018-01-07 22:20:58.769272293 +0100
+diff -ur root-6.14.00.orig/graf2d/asimage/CMakeLists.txt root-6.14.00/graf2d/asimage/CMakeLists.txt
+--- root-6.14.00.orig/graf2d/asimage/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/asimage/CMakeLists.txt	2018-06-14 10:32:01.365570910 +0200
 @@ -15,7 +15,7 @@
                                HEADERS TASImage.h TASImagePlugin.h TASPluginGS.h
                                SOURCES TASImage.cxx TASPluginGS.cxx
                                DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES}
-+                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES}
+-                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB
++                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB
                                DEPENDENCIES Graf BUILTINS AFTERIMAGE)
  
  
-diff -ur root-6.12.04.orig/graf2d/asimage/Module.mk root-6.12.04/graf2d/asimage/Module.mk
---- root-6.12.04.orig/graf2d/asimage/Module.mk	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/asimage/Module.mk	2018-01-07 22:17:25.174658038 +0100
-@@ -236,7 +236,7 @@
- 		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
- 		   "$(ASIMAGEO) $(ASIMAGEDO)" \
- 		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \
--                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
-+                    $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig \
- 		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(ASNEEDX11LIBS)"
- 
- $(call pcmrule,ASIMAGE)
-diff -ur root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx root-6.12.04/graf2d/asimage/src/TASImage.cxx
---- root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/asimage/src/TASImage.cxx	2018-01-07 22:17:25.176658016 +0100
+diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx root-6.14.00/graf2d/asimage/src/TASImage.cxx
+--- root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/asimage/src/TASImage.cxx	2018-06-14 10:28:26.054618292 +0200
 @@ -110,6 +110,8 @@
  #   include <draw.h>
  }
@@ -212,20 +200,20 @@ diff -ur root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx root-6.12.04/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.12.04.orig/graf2d/graf/CMakeLists.txt root-6.12.04/graf2d/graf/CMakeLists.txt
---- root-6.12.04.orig/graf2d/graf/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/graf/CMakeLists.txt	2018-01-07 22:23:16.766731136 +0100
+diff -ur root-6.14.00.orig/graf2d/graf/CMakeLists.txt root-6.14.00/graf2d/graf/CMakeLists.txt
+--- root-6.14.00.orig/graf2d/graf/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/graf/CMakeLists.txt	2018-06-14 10:36:18.869871880 +0200
 @@ -7,6 +7,6 @@
  
  ROOT_STANDARD_LIBRARY_PACKAGE(Graf
                                DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext
-+                              LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig
+-                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext
++                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext fontconfig
                                DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
  
-diff -ur root-6.12.04.orig/graf2d/graf/inc/TTF.h root-6.12.04/graf2d/graf/inc/TTF.h
---- root-6.12.04.orig/graf2d/graf/inc/TTF.h	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/graf/inc/TTF.h	2018-01-07 22:17:25.177658004 +0100
+diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TTF.h
+--- root-6.14.00.orig/graf2d/graf/inc/TTF.h	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/graf/inc/TTF.h	2018-06-14 10:28:26.055618281 +0200
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -237,21 +225,9 @@ diff -ur root-6.12.04.orig/graf2d/graf/inc/TTF.h root-6.12.04/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.12.04.orig/graf2d/graf/Module.mk root-6.12.04/graf2d/graf/Module.mk
---- root-6.12.04.orig/graf2d/graf/Module.mk	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/graf/Module.mk	2018-01-07 22:17:25.177658004 +0100
-@@ -58,7 +58,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libGraf.$(SOEXT) $@ \
- 		   "$(GRAFO) $(GRAFDO)" \
--		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,GRAF)
- 	$(noop)
-diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/TTF.cxx
---- root-6.12.04.orig/graf2d/graf/src/TTF.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/graf/src/TTF.cxx	2018-01-07 22:17:25.177658004 +0100
+diff -ur root-6.14.00.orig/graf2d/graf/src/TTF.cxx root-6.14.00/graf2d/graf/src/TTF.cxx
+--- root-6.14.00.orig/graf2d/graf/src/TTF.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/graf/src/TTF.cxx	2018-06-14 10:28:26.055618281 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -812,31 +788,19 @@ diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.12.04.orig/graf2d/postscript/CMakeLists.txt root-6.12.04/graf2d/postscript/CMakeLists.txt
---- root-6.12.04.orig/graf2d/postscript/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/postscript/CMakeLists.txt	2018-01-07 22:22:12.902444262 +0100
+diff -ur root-6.14.00.orig/graf2d/postscript/CMakeLists.txt root-6.14.00/graf2d/postscript/CMakeLists.txt
+--- root-6.14.00.orig/graf2d/postscript/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/postscript/CMakeLists.txt	2018-06-14 10:35:47.829194226 +0200
 @@ -5,5 +5,5 @@
  
  ROOT_STANDARD_LIBRARY_PACKAGE(Postscript
                                DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES  ${ZLIB_LIBRARIES} mathtext
-+                              LIBRARIES  ${ZLIB_LIBRARIES} mathtext fontconfig
+-                              LIBRARIES  ZLIB::ZLIB mathtext
++                              LIBRARIES  ZLIB::ZLIB mathtext fontconfig
                                DEPENDENCIES Graf)
-diff -ur root-6.12.04.orig/graf2d/postscript/Module.mk root-6.12.04/graf2d/postscript/Module.mk
---- root-6.12.04.orig/graf2d/postscript/Module.mk	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/postscript/Module.mk	2018-01-07 22:17:25.178657993 +0100
-@@ -59,7 +59,7 @@
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		   "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \
- 		   "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
--		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
-+		   "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig"
- 
- $(call pcmrule,POSTSCRIPT)
- 	$(noop)
-diff -ur root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx root-6.12.04/graf2d/postscript/src/TPostScript.cxx
---- root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf2d/postscript/src/TPostScript.cxx	2018-01-07 22:17:25.179657982 +0100
+diff -ur root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.14.00/graf2d/postscript/src/TPostScript.cxx
+--- root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf2d/postscript/src/TPostScript.cxx	2018-06-14 10:28:26.057618259 +0200
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -1096,9 +1060,9 @@ diff -ur root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx root-6.12.04/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.12.04.orig/graf3d/gl/CMakeLists.txt root-6.12.04/graf3d/gl/CMakeLists.txt
---- root-6.12.04.orig/graf3d/gl/CMakeLists.txt	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf3d/gl/CMakeLists.txt	2018-01-07 22:19:37.820176454 +0100
+diff -ur root-6.14.00.orig/graf3d/gl/CMakeLists.txt root-6.14.00/graf3d/gl/CMakeLists.txt
+--- root-6.14.00.orig/graf3d/gl/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf3d/gl/CMakeLists.txt	2018-06-14 10:28:26.057618259 +0200
 @@ -41,6 +41,6 @@
                                HEADERS ${headers}
                                SOURCES ${sources}
@@ -1107,21 +1071,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/CMakeLists.txt root-6.12.04/graf3d/gl/CMake
 +                              LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig
                                DEPENDENCIES Hist Gui Ged
                                INSTALL_OPTIONS ${installoptions})
-diff -ur root-6.12.04.orig/graf3d/gl/Module.mk root-6.12.04/graf3d/gl/Module.mk
---- root-6.12.04.orig/graf3d/gl/Module.mk	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf3d/gl/Module.mk	2018-01-07 22:17:25.180657971 +0100
-@@ -95,7 +95,7 @@
- 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
- 		   "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
- 		    $(GL2PSLIBDIR) $(GL2PSLIB) \
--		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
-+		    $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
- 
- $(call pcmrule,GL)
- 	$(noop)
-diff -ur root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx root-6.12.04/graf3d/gl/src/TGLFontManager.cxx
---- root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf3d/gl/src/TGLFontManager.cxx	2018-01-07 22:17:25.180657971 +0100
+diff -ur root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.14.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf3d/gl/src/TGLFontManager.cxx	2018-06-14 10:28:26.058618248 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1377,9 +1329,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx root-6.12.04/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.12.04.orig/graf3d/gl/src/TGLText.cxx root-6.12.04/graf3d/gl/src/TGLText.cxx
---- root-6.12.04.orig/graf3d/gl/src/TGLText.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/graf3d/gl/src/TGLText.cxx	2018-01-07 22:17:25.181657960 +0100
+diff -ur root-6.14.00.orig/graf3d/gl/src/TGLText.cxx root-6.14.00/graf3d/gl/src/TGLText.cxx
+--- root-6.14.00.orig/graf3d/gl/src/TGLText.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/graf3d/gl/src/TGLText.cxx	2018-06-14 10:28:26.058618248 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1514,9 +1466,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/src/TGLText.cxx root-6.12.04/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.12.04.orig/gui/gui/src/TGApplication.cxx root-6.12.04/gui/gui/src/TGApplication.cxx
---- root-6.12.04.orig/gui/gui/src/TGApplication.cxx	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/gui/gui/src/TGApplication.cxx	2018-01-07 22:17:25.181657960 +0100
+diff -ur root-6.14.00.orig/gui/gui/src/TGApplication.cxx root-6.14.00/gui/gui/src/TGApplication.cxx
+--- root-6.14.00.orig/gui/gui/src/TGApplication.cxx	2018-06-13 12:10:40.000000000 +0200
++++ root-6.14.00/gui/gui/src/TGApplication.cxx	2018-06-14 10:28:26.058618248 +0200
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-ix32-geom-opt.patch b/root-ix32-geom-opt.patch
new file mode 100644
index 0000000..153629b
--- /dev/null
+++ b/root-ix32-geom-opt.patch
@@ -0,0 +1,14 @@
+diff --git a/geom/geom/CMakeLists.txt b/geom/geom/CMakeLists.txt
+index 520be8b5d5..d197cc3db3 100644
+--- a/geom/geom/CMakeLists.txt
++++ b/geom/geom/CMakeLists.txt
+@@ -24,7 +24,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Geom
+                               HEADERS ${headers1} ${headers2}
+                               DEPENDENCIES Thread RIO MathCore)
+ 
+-# GCC 4.x has bugs with -O3 or -Ofast that break Geom
+-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
++# 32 bit ix86 has bugs with -O3 or -Ofast that break Geom
++if(CMAKE_COMPILER_IS_GNUCXX AND ROOT_ARCHITECTURE STREQUAL "linux")
+   target_compile_options(Geom PRIVATE -O2)
+ endif()
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index 777603c..193a9bf 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -22,23 +22,6 @@ rootcling and libCling.
  core/metacling/src/CMakeLists.txt | 4 ++++
  2 files changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/core/metacling/Module.mk b/core/metacling/Module.mk
-index 4788eca393..7f520e41b6 100644
---- a/core/metacling/Module.mk
-+++ b/core/metacling/Module.mk
-@@ -46,7 +46,11 @@ endif
- CLINGLIB     := $(LPATH)/libCling.$(SOEXT)
- CLINGMAP     := $(CLINGLIB:.$(SOEXT)=.rootmap)
- 
--$(CLINGLIB):    $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO)
-+# The dependency on $(ROOTCLING1EXE) was added to prevent $(CLINGLIB) and
-+# $(ROOTCLING1EXE) from being linked in parallel.
-+# This avoids doing two memory consuming operations in parallel.
-+$(CLINGLIB):    $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
-+		$(ROOTCLING1EXE)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS) $(LIBCLINGLDFLAGS)" \
- 		   "$(SOFLAGS)" libCling.$(SOEXT) $@ \
- 		   "$(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
 diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
 index e820d144eb..3a1f1ca446 100644
 --- a/core/metacling/src/CMakeLists.txt
@@ -46,7 +29,7 @@ index e820d144eb..3a1f1ca446 100644
 @@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling
          $<TARGET_OBJECTS:Dictgen>
          $<TARGET_OBJECTS:MetaCling>
-         LIBRARIES ${CLING_LIBRARIES})
+         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS})
 +# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
 +# rootcling_stage1 from being linked in parallel.
 +# This avoids doing two memory consuming operations in parallel.
diff --git a/root-missing-header.patch b/root-missing-header.patch
new file mode 100644
index 0000000..c98116d
--- /dev/null
+++ b/root-missing-header.patch
@@ -0,0 +1,21 @@
+From f33ac48317fc1a144d6a7f0a7028e898b664e3a2 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 28 Jun 2018 23:02:46 +0200
+Subject: [PATCH] Add missing include for std::shuffle
+
+---
+ tmva/tmva/test/TestRandomGenerator.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tmva/tmva/test/TestRandomGenerator.cxx b/tmva/tmva/test/TestRandomGenerator.cxx
+index c8f0f50ee5f..02f941d7f26 100644
+--- a/tmva/tmva/test/TestRandomGenerator.cxx
++++ b/tmva/tmva/test/TestRandomGenerator.cxx
+@@ -10,6 +10,7 @@
+ #include "TMVA/Tools.h"
+ 
+ // Stdlib
++#include <algorithm>
+ #include <iostream>
+ 
+ // External
diff --git a/root-noinst.patch b/root-noinst.patch
deleted file mode 100644
index 88bdb67..0000000
--- a/root-noinst.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 778e01575f6b75bed9843023baeb50b23aea5355 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 16 Feb 2018 19:06:14 +0100
-Subject: [PATCH 1/2] Don't install intermediate static libs (mathtext and
- minicern)
-
----
- graf2d/mathtext/CMakeLists.txt | 2 +-
- misc/minicern/CMakeLists.txt   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/graf2d/mathtext/CMakeLists.txt b/graf2d/mathtext/CMakeLists.txt
-index 5af6a282a34..e6cba7bcd35 100644
---- a/graf2d/mathtext/CMakeLists.txt
-+++ b/graf2d/mathtext/CMakeLists.txt
-@@ -1,2 +1,2 @@
--ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC)
-+ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC NOINSTALL)
- 
-diff --git a/misc/minicern/CMakeLists.txt b/misc/minicern/CMakeLists.txt
-index 2758edb08e1..d98ac3b6331 100644
---- a/misc/minicern/CMakeLists.txt
-+++ b/misc/minicern/CMakeLists.txt
-@@ -3,7 +3,7 @@
- ############################################################################
- 
- set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
--ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC)
-+ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL)
- target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
- 
- # Disable optimization since it some cases was causing crashes.
-
-From 9bd8d4e52fae5467867cbcf1810bc58a63b55a62 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 16 Feb 2018 19:07:04 +0100
-Subject: [PATCH 2/2] Don't add JupyROOT python extension to cmake exports
-
----
- bindings/pyroot/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
-index 4dab1dfd2ab..5f621af9a2d 100644
---- a/bindings/pyroot/CMakeLists.txt
-+++ b/bindings/pyroot/CMakeLists.txt
-@@ -18,7 +18,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(PyROOT
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-                               LIBRARIES Core Net Tree MathCore Rint ${PYTHON_LIBRARIES}
-                               DEPENDENCIES Core MathCore Net Tree Rint)
--ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core)
-+ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core CMAKENOEXPORT)
- 
- if(MSVC)
-   add_custom_command(TARGET PyROOT POST_BUILD
diff --git a/root-out-of-bounds.patch b/root-out-of-bounds.patch
deleted file mode 100644
index 094139f..0000000
--- a/root-out-of-bounds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a770f03056e374fa7c1dbdc06aaff22107fc27a0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:29:00 +0100
-Subject: [PATCH] Protect against out-of-bounds access
-
----
- graf2d/gpad/src/TRatioPlot.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/graf2d/gpad/src/TRatioPlot.cxx b/graf2d/gpad/src/TRatioPlot.cxx
-index 107c0c90806..bf3415d7927 100644
---- a/graf2d/gpad/src/TRatioPlot.cxx
-+++ b/graf2d/gpad/src/TRatioPlot.cxx
-@@ -1074,9 +1074,9 @@ Int_t TRatioPlot::BuildLowerPlot()
-             ((TGraphAsymmErrors*)fRatioGraph)->SetPointError(ipoint,  fH1->GetBinWidth(i)/2., fH1->GetBinWidth(i)/2., 0.5, 0.5);
- 
-             fConfidenceInterval1->SetPoint(ipoint, x, 0);
--            fConfidenceInterval1->SetPointError(ipoint, x, ci1[i] / error);
-+            fConfidenceInterval1->SetPointError(ipoint, x, i < ci1.size() ? ci1[i] / error : 0);
-             fConfidenceInterval2->SetPoint(ipoint, x, 0);
--            fConfidenceInterval2->SetPointError(ipoint, x, ci2[i] / error);
-+            fConfidenceInterval2->SetPointError(ipoint, x, i < ci2.size() ? ci2[i] / error : 0);
- 
-             ++ipoint;
- 
diff --git a/root-set-cache-file-dir.patch b/root-set-cache-file-dir.patch
new file mode 100644
index 0000000..5ea37d7
--- /dev/null
+++ b/root-set-cache-file-dir.patch
@@ -0,0 +1,38 @@
+From e8778178329efc8e04ea35643259cfc6ec2f9b51 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 26 Jun 2018 11:11:48 +0200
+Subject: [PATCH] Set cache file dir when using CACHEREAD option Remove
+ unnecessary CACHEREAD for local file
+
+---
+ tmva/tmva/test/DNN/CNN/TestMethodDL.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tmva/tmva/test/DNN/CNN/TestMethodDL.h b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
+index 1cac008458e..904fb54cd97 100644
+--- a/tmva/tmva/test/DNN/CNN/TestMethodDL.h
++++ b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
+@@ -49,14 +49,12 @@ void testMethodDL_CNN(TString architectureStr)
+    // Load the input data
+ 
+    TString fname = "imagesData.root";
+-   TString fopt = "CACHEREAD";
+-   //auto input = TFile::Open(fname,fopt);
+ 
+    // generate the files
+    // 1000 for testing 1000 for training
+    makeImages(2000);
+ 
+-   auto input = TFile::Open(fname,fopt);
++   auto input = TFile::Open(fname);
+ 
+    R__ASSERT(input);
+    
+@@ -174,6 +172,7 @@ void testMethodDL_DNN(TString architectureStr)
+    // TString fname = "/Users/vladimirilievski/Desktop/Vladimir/GSoC/ROOT-CI/common-version/root/tmva/tmva/test/DNN/CNN/"
+    //                 "dataset/tmva_class_example.root";
+    TString fname = "http://root.cern.ch/files/tmva_class_example.root";
++   TFile::SetCacheFileDir(".");
+    TString fopt = "CACHEREAD";
+    input = TFile::Open(fname,fopt);
+ 
diff --git a/root-stressgraphics-ref.patch b/root-stressgraphics-ref.patch
index ad91815..4ba858c 100644
--- a/root-stressgraphics-ref.patch
+++ b/root-stressgraphics-ref.patch
@@ -1,15 +1,22 @@
+From 034dd2ec5ab656551b84bcec7cc1e7f7e23b663c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 31 May 2018 10:18:58 +0200
+Subject: [PATCH] Adjust reference for Aarch64
+
+---
+ test/stressGraphics.ref | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 4341c21c79..0089951936 100644
+index 00e034737b8..00899519366 100644
 --- a/test/stressGraphics.ref
 +++ b/test/stressGraphics.ref
-@@ -29,16 +29,16 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-    28      9110       500     16737       200      9738      4200     21346     21600     10645      7000      8869       500
+@@ -30,15 +30,15 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
     29      7419       500     15112       200      8113      4200     18872     21600      7928      7000      7296       500
     30     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
--   31     30615      8200     27494       100     29010      5900     50520     18200     35724      5400     36690      8200
+    31     30615      8200     27494       150     29010      5900     50520     18200     35724      5400     36690      8200
 -   32   3304592       100    712308       100    155478     32000     62688     19000    123056      7000         0         0
 -   33    321963      5500    434394      1000     34942      8300     65532     27800     37314     12000    331505      5500
-+   31     30615      8200     27494       150     29010      5900     50520     18200     35724      5400     36690      8200
 +   32   3304592       100    712308       500    155478     32000     62688     19000    123056      7000         0         0
 +   33    321963      5500    434394      1100     34942      8300     65532     27800     37314     12000    331505      5500
     34     36514       300     16815       200     25333      2200     47408     12700     33739      3700     36399       300
diff --git a/root-system-pythia.patch b/root-system-pythia.patch
deleted file mode 100644
index 60e1382..0000000
--- a/root-system-pythia.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur root-6.12.04.orig/tutorials/pythia/pythia8.C root-6.12.04/tutorials/pythia/pythia8.C
---- root-6.12.04.orig/tutorials/pythia/pythia8.C	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/tutorials/pythia/pythia8.C	2018-01-10 07:01:23.215029332 +0100
-@@ -8,11 +8,6 @@
- ///  root > .x pythia8.C
- /// ~~~
- ///
--/// Note that before executing this script,
--///
--///  - the env variable PYTHIA8 must point to the pythia8100 (or newer) directory
--///  - the env variable PYTHIA8DATA must be defined and it must point to $PYTHIA8/xmldoc
--///
- /// \macro_code
- ///
- /// \author Andreas Morsch
-@@ -27,26 +22,6 @@
- 
- void pythia8(Int_t nev  = 100, Int_t ndeb = 1)
- {
--   const char *p8dataenv = gSystem->Getenv("PYTHIA8DATA");
--   if (!p8dataenv) {
--      const char *p8env = gSystem->Getenv("PYTHIA8");
--      if (!p8env) {
--         Error("pythia8.C",
--               "Environment variable PYTHIA8 must contain path to pythia directory!");
--         return;
--      }
--      TString p8d = p8env;
--      p8d += "/xmldoc";
--      gSystem->Setenv("PYTHIA8DATA", p8d);
--   }
--
--   const char* path = gSystem->ExpandPathName("$PYTHIA8DATA");
--   if (gSystem->AccessPathName(path)) {
--         Error("pythia8.C",
--               "Environment variable PYTHIA8DATA must contain path to $PYTHIA8/xmldoc directory !");
--      return;
--   }
--
- // Load libraries
-    gSystem->Load("libEG");
-    gSystem->Load("libEGPythia8");
diff --git a/root-test-compilatiom-epel7.patch b/root-test-compilatiom-epel7.patch
new file mode 100644
index 0000000..97e31ff
--- /dev/null
+++ b/root-test-compilatiom-epel7.patch
@@ -0,0 +1,27 @@
+From cefdf878609deb650b1e548d84efab2ab5c775ce Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 28 Jun 2018 07:38:07 +0200
+Subject: [PATCH] Fix test compilation on RHEL 7
+
+---
+ tree/dataframe/test/dataframe_resptr.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tree/dataframe/test/dataframe_resptr.cxx b/tree/dataframe/test/dataframe_resptr.cxx
+index 9fef6e54fcf..7c45f016d0c 100644
+--- a/tree/dataframe/test/dataframe_resptr.cxx
++++ b/tree/dataframe/test/dataframe_resptr.cxx
+@@ -45,11 +45,11 @@ TEST(RResultPtr, ImplConv)
+                 return (int)1;
+              }).Histo1D<int>("i");
+ 
+-   EXPECT_TRUE(m);
++   EXPECT_TRUE(m != nullptr);
+    EXPECT_FALSE(hasRun);
+ 
+    *m;
+ 
+-   EXPECT_TRUE(m);
++   EXPECT_TRUE(m != nullptr);
+    EXPECT_TRUE(hasRun);
+ }
diff --git a/root-test-fixes.patch b/root-test-fixes.patch
deleted file mode 100644
index f351525..0000000
--- a/root-test-fixes.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-From 092d06fd403331bf082dd0d2d56718a9ee31efec Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:12:41 +0100
-Subject: [PATCH 1/4] Don't call front() on empty containers
-
----
- math/mathcore/inc/Fit/FitData.h               |  4 ++--
- math/mathcore/inc/Math/WrappedParamFunction.h | 10 +++++-----
- math/mathcore/src/BinData.cxx                 | 24 ++++++++++++------------
- math/mathcore/src/FitData.cxx                 |  2 +-
- 4 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/math/mathcore/inc/Fit/FitData.h b/math/mathcore/inc/Fit/FitData.h
-index cb8fa2f0be3..9579bde92bf 100644
---- a/math/mathcore/inc/Fit/FitData.h
-+++ b/math/mathcore/inc/Fit/FitData.h
-@@ -185,7 +185,7 @@ namespace ROOT {
- 
-             for (unsigned int i = 0; i < fDim; i++) {
-                fCoords[i].resize(fMaxPoints + VectorPadding(fMaxPoints));
--               fCoordsPtr[i] = &fCoords[i].front();
-+               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
-             }
- 
-             if (fpTmpCoordVector) {
-@@ -354,7 +354,7 @@ namespace ROOT {
-                unsigned padding = VectorPadding(fNPoints);
-                fCoords[i].resize(fNPoints + padding);
-                std::copy(fCoordsPtr[i], fCoordsPtr[i] + fNPoints + padding, fCoords[i].begin());
--               fCoordsPtr[i] = &fCoords[i].front();
-+               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
-             }
- 
-             fWrapped = false;
-diff --git a/math/mathcore/inc/Math/WrappedParamFunction.h b/math/mathcore/inc/Math/WrappedParamFunction.h
-index 38b9af7639f..0c860672f9e 100644
---- a/math/mathcore/inc/Math/WrappedParamFunction.h
-+++ b/math/mathcore/inc/Math/WrappedParamFunction.h
-@@ -95,7 +95,7 @@ class WrappedParamFunction : public IParamMultiFunction {
-    }
- 
-    const double * Parameters() const {
--      return  &(fParams.front());
-+      return fParams.empty() ? NULL : &fParams.front();
-    }
- 
-    void SetParameters(const double * p)  {
-@@ -172,7 +172,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
- 
-    /// clone the function
-    IMultiGenFunction * Clone() const {
--      return new WrappedParamFunctionGen(fFunc, fDim, fParams.size() , &fParams.front(), &fParIndices.front());
-+      return new WrappedParamFunctionGen(fFunc, fDim, fParams.size(), fParams.empty() ? NULL : &fParams.front(), fParIndices.empty() ? NULL : &fParIndices.front());
-    }
- 
- private:
-@@ -183,7 +183,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
- public:
- 
-    const double * Parameters() const {
--      return  &(fParams.front());
-+      return fParams.empty() ? NULL : &fParams.front();
-    }
- 
-    void SetParameters(const double * p)  {
-@@ -227,7 +227,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
- //       std::copy(fX.begin(), fX.end(), oi);
- //       std::cout << std::endl;
- 
--      return (*fFunc)( &fX.front() );
-+      return (*fFunc)( fX.empty() ? NULL : &fX.front() );
-    }
- 
- 
-@@ -264,7 +264,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction {
- //       std::cout << this << std::endl;
- 
-       // set parameter values in fX
--      SetParValues(npar, &fParams.front() );
-+      SetParValues(npar, fParams.empty() ? NULL : &fParams.front());
-       for (unsigned int i = 0; i < npar; ++i) {
-          unsigned int j = fParIndices[i];
-          assert ( j  < npar + fDim);
-diff --git a/math/mathcore/src/BinData.cxx b/math/mathcore/src/BinData.cxx
-index 16c9e375634..50a47169272 100644
---- a/math/mathcore/src/BinData.cxx
-+++ b/math/mathcore/src/BinData.cxx
-@@ -284,7 +284,7 @@ namespace ROOT {
- 
-           for ( unsigned int i=0; i<fDim; i++ )
-           {
--            fCoordErrorsPtr[i] = &fCoordErrors[i].front();
-+            fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
-           }
-         }
- 
-@@ -371,7 +371,7 @@ namespace ROOT {
-       if ( kNoError == fErrorType )
-       {
-          fDataError.resize(fNPoints + FitData::VectorPadding(fNPoints));
--         fDataErrorPtr = &fDataError.front();
-+         fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
-       }
- 
-       for ( unsigned int i=0; i < fNPoints; i++ )
-@@ -659,7 +659,7 @@ namespace ROOT {
-     void BinData::InitDataVector ()
-     {
-        fData.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
--       fDataPtr = &fData.front();
-+       fDataPtr = fData.empty() ? NULL : &fData.front();
-     }
- 
-     void BinData::InitializeErrors()
-@@ -698,7 +698,7 @@ namespace ROOT {
-         {
-            fCoordErrors[i].resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
- 
--           fCoordErrorsPtr[i] = &fCoordErrors[i].front();
-+           fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
-         }
- 
-         fpTmpCoordErrorVector = new double[fDim];
-@@ -712,7 +712,7 @@ namespace ROOT {
-       if ( kValueError == fErrorType || kCoordError == fErrorType )
-       {
-          fDataError.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
--         fDataErrorPtr = &fDataError.front();
-+         fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
- 
-          fDataErrorHigh.clear();
-          fDataErrorHighPtr = NULL;
-@@ -722,10 +722,10 @@ namespace ROOT {
-       else if ( fErrorType == kAsymError )
-       {
-          fDataErrorHigh.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
--         fDataErrorHighPtr = &fDataErrorHigh.front();
-+         fDataErrorHighPtr = fDataErrorHigh.empty() ? NULL : &fDataErrorHigh.front();
- 
-          fDataErrorLow.resize(fMaxPoints + FitData::VectorPadding(fMaxPoints));
--         fDataErrorLowPtr = &fDataErrorLow.front();
-+         fDataErrorLowPtr = fDataErrorLow.empty() ? NULL : &fDataErrorLow.front();
- 
-          fDataError.clear();
-          fDataErrorPtr = NULL;
-@@ -770,7 +770,7 @@ namespace ROOT {
-       unsigned vectorPadding = FitData::VectorPadding(fNPoints);
-       fData.resize(fNPoints + vectorPadding);
-       std::copy( fDataPtr, fDataPtr + fNPoints, fData.begin() );
--      fDataPtr = &fData.front();
-+      fDataPtr = fData.empty() ? NULL : &fData.front();
- 
-       for ( unsigned int i=0; i < fDim; i++ )
-       {
-@@ -785,7 +785,7 @@ namespace ROOT {
- 
-         fDataError.resize(fNPoints + vectorPadding);
-         std::copy(fDataErrorPtr, fDataErrorPtr + fNPoints + vectorPadding, fDataError.begin());
--        fDataErrorPtr = &fDataError.front();
-+        fDataErrorPtr = fDataError.empty() ? NULL : &fDataError.front();
-       }
- 
-       if ( kValueError == fErrorType )
-@@ -804,7 +804,7 @@ namespace ROOT {
-           assert( fCoordErrorsPtr[i] );
-           fCoordErrors[i].resize(fNPoints + vectorPadding);
-           std::copy(fCoordErrorsPtr[i], fCoordErrorsPtr[i] + fNPoints + vectorPadding, fCoordErrors[i].begin());
--          fCoordErrorsPtr[i] = &fCoordErrors[i].front();
-+          fCoordErrorsPtr[i] = fCoordErrors[i].empty() ? NULL : &fCoordErrors[i].front();
-         }
- 
-         if( kAsymError == fErrorType )
-@@ -817,8 +817,8 @@ namespace ROOT {
-           fDataErrorLow.resize(fNPoints + vectorPadding);
-           std::copy(fDataErrorHighPtr, fDataErrorHighPtr + fNPoints + vectorPadding, fDataErrorHigh.begin());
-           std::copy(fDataErrorLowPtr, fDataErrorLowPtr + fNPoints + vectorPadding, fDataErrorLow.begin());
--          fDataErrorHighPtr = &fDataErrorHigh.front();
--          fDataErrorLowPtr = &fDataErrorLow.front();
-+          fDataErrorHighPtr = fDataErrorHigh.empty() ? NULL : &fDataErrorHigh.front();
-+          fDataErrorLowPtr = fDataErrorLow.empty() ? NULL : &fDataErrorLow.front();
-         }
-       }
- 
-diff --git a/math/mathcore/src/FitData.cxx b/math/mathcore/src/FitData.cxx
-index 76c792dbe66..0b62e607534 100644
---- a/math/mathcore/src/FitData.cxx
-+++ b/math/mathcore/src/FitData.cxx
-@@ -231,7 +231,7 @@ namespace ROOT {
-             fCoordsPtr.resize(fDim);
- 
-             for (unsigned int i = 0; i < fDim; i++) {
--               fCoordsPtr[i] = &fCoords[i].front();
-+               fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front();
-             }
-          }
- 
-
-From 711cb8598110b774ae7c206c0730b907e7650e2e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:18:35 +0100
-Subject: [PATCH 2/4] Call resize() when the size should be changed, reserve()
- does not change the size
-
----
- math/mathcore/src/TKDTreeBinning.cxx | 2 +-
- tree/tree/test/TBasket.cxx           | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/math/mathcore/src/TKDTreeBinning.cxx b/math/mathcore/src/TKDTreeBinning.cxx
-index 09647958dc7..d0b06e1a99f 100644
---- a/math/mathcore/src/TKDTreeBinning.cxx
-+++ b/math/mathcore/src/TKDTreeBinning.cxx
-@@ -241,7 +241,7 @@ void TKDTreeBinning::SetTreeData() {
- 
- void TKDTreeBinning::SetBinsContent() {
-    // Sets the bins' content
--   fBinsContent.reserve(fNBins);
-+   fBinsContent.resize(fNBins);
-    for (UInt_t i = 0; i < fNBins; ++i)
-       fBinsContent[i] = fDataBins->GetBucketSize();
-    if ( fDataSize % fNBins != 0 )
-diff --git a/tree/tree/test/TBasket.cxx b/tree/tree/test/TBasket.cxx
-index fba69bd68d0..90eb330f7ee 100644
---- a/tree/tree/test/TBasket.cxx
-+++ b/tree/tree/test/TBasket.cxx
-@@ -102,7 +102,7 @@ TEST(TBasket, CreateAndDestroy)
-    f->Close();
- 
-    Long64_t maxsize = f->GetSize();
--   memBuffer.reserve(maxsize);
-+   memBuffer.resize(maxsize);
-    f->CopyTo(&memBuffer[0], maxsize);
- 
-    delete f;
-@@ -182,7 +182,7 @@ TEST(TBasket, TestUnsupportedIO)
- 
-    std::vector<char> memBuffer;
-    Long64_t maxsize = f->GetSize();
--   memBuffer.reserve(maxsize);
-+   memBuffer.resize(maxsize);
-    f->CopyTo(&memBuffer[0], maxsize);
- 
-    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
-@@ -230,7 +230,7 @@ TEST(TBasket, TestVarLengthArrays)
-    f->Close();
-    std::vector<char> memBuffer;
-    Long64_t maxsize = f->GetSize();
--   memBuffer.reserve(maxsize);
-+   memBuffer.resize(maxsize);
-    f->CopyTo(&memBuffer[0], maxsize);
- 
-    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
-@@ -334,7 +334,7 @@ TEST(TBasket, TestSettingIOBits)
-    f->Close();
-    std::vector<char> memBuffer;
-    Long64_t maxsize = f->GetSize();
--   memBuffer.reserve(maxsize);
-+   memBuffer.resize(maxsize);
-    f->CopyTo(&memBuffer[0], maxsize);
- 
-    TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ");
-
-From 8dfcb54ca0457c2e8ae6102bb4a60ac60bd49004 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:25:39 +0100
-Subject: [PATCH 3/4] operator[] with an argument that is out of range causes
- undefined behavior
-
----
- math/mathcore/test/binarySearchTime.cxx | 5 ++---
- math/mathmore/test/testPermute.cxx      | 4 ++--
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/math/mathcore/test/binarySearchTime.cxx b/math/mathcore/test/binarySearchTime.cxx
-index c98017a0c55..0a611486489 100644
---- a/math/mathcore/test/binarySearchTime.cxx
-+++ b/math/mathcore/test/binarySearchTime.cxx
-@@ -58,9 +58,8 @@ template <typename T> bool testBinarySearch(const int n, double* tTMath, double*
-    t.Start();
-    for (int j = 0; j < npass; ++j) {
-       for ( T elem = 0; elem < maxint; ++elem ) {
--         T* pind;
--         pind = std::lower_bound(&k[0], &k[n], elem);
--         Long_t index2 = (((pind != &(k[n])) && (*pind == elem)) ? (pind - &k[0]): ( pind - &k[0] - 1));
-+         auto pind = std::lower_bound(k.begin(), k.end(), elem);
-+         Long_t index2 = (((pind != k.end()) && (*pind == elem)) ? (pind - k.begin()) : (pind - k.begin() - 1));
-          s2+= index2;
-       }
-    }
-diff --git a/math/mathmore/test/testPermute.cxx b/math/mathmore/test/testPermute.cxx
-index b75609b9958..f2a49da2e4d 100644
---- a/math/mathmore/test/testPermute.cxx
-+++ b/math/mathmore/test/testPermute.cxx
-@@ -64,7 +64,7 @@ bool checkPermute()
-    //cout << original << vM << vS << endl;
- 
-    while ( TMath::Permute(n, &vM[0]) ) {
--      std::next_permutation(&vS[0], &vS[n]);
-+      std::next_permutation(vS.begin(), vS.end());
-       //cout << vM << vS << endl;
-       equals &= equal(vM.begin(), vM.end(), vS.begin());
-    }
-@@ -99,7 +99,7 @@ void permuteTime(const int n, double* tTMath, double* tStd)
-    t.Start();
-    for (int j = 0; j < npass; ++j) {
-       copy(original.begin(), original.end(), v.begin());
--      while ( std::next_permutation(&v[0], &v[n]) ) {}
-+      while ( std::next_permutation(v.begin(), v.end()) ) {}
-    }
-    t.Stop();
-    *tStd = t.RealTime();
-
-From 80ba399340167f62368685e0bf03f9cb9a595954 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 15 Feb 2018 18:27:23 +0100
-Subject: [PATCH 4/4] cut-and-paste errors, I guess...
-
----
- math/mathcore/test/testkdTreeBinning.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/math/mathcore/test/testkdTreeBinning.cxx b/math/mathcore/test/testkdTreeBinning.cxx
-index 233b083ee5f..193ff1bb3e2 100644
---- a/math/mathcore/test/testkdTreeBinning.cxx
-+++ b/math/mathcore/test/testkdTreeBinning.cxx
-@@ -82,9 +82,9 @@ void testkdTreeBinning() {
-    int ibinMax = kdBins->GetBinMaxDensity();
- 
-    std::cout << "Bin with minimum density: " << ibinMin << " density = " <<  kdBins->GetBinDensity(ibinMin) << " content = " << kdBins->GetBinContent(ibinMin)  << std::endl;
--   std::cout << "Bin with maximum density: " << ibinMax << " density = " <<  kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMin) << std::endl;
-+   std::cout << "Bin with maximum density: " << ibinMax << " density = " <<  kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMax) << std::endl;
- 
--   if (kdBins->GetBinDensity(ibinMax) != DATASZ/NBINS) 
-+   if (kdBins->GetBinContent(ibinMax) != DATASZ/NBINS)
-       Error("testkdTreeBinning","Wrong bin content");
- 
-    // order bins by density
diff --git a/root-test-stress-32bit.patch b/root-test-stress-32bit.patch
deleted file mode 100644
index ce2d370..0000000
--- a/root-test-stress-32bit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/stress.cxx b/test/stress.cxx
-index 0f759ad7c2..7c3c9e1b04 100644
---- a/test/stress.cxx
-+++ b/test/stress.cxx
-@@ -385,7 +385,7 @@ void stress3()
-    Long64_t last = f.GetEND();
-    Float_t comp = f.GetCompressionFactor();
-    Bool_t OK = kTRUE;
--   constexpr Long64_t lastgood  = 51651;
-+   constexpr Long64_t lastgood  = 51851;
-    constexpr Long64_t tolerance = 150;
-    if (last <lastgood-tolerance || last > lastgood+tolerance || comp <1.8 || comp > 2.4) OK = kFALSE;
-    if (OK) printf("OK\n");
diff --git a/root-test-subdirs.patch b/root-test-subdirs.patch
index af59a8b..67a22c2 100644
--- a/root-test-subdirs.patch
+++ b/root-test-subdirs.patch
@@ -1,244 +1,36 @@
-From eb7d389e582fd11cf00879a3daf161fa7e1b0f40 Mon Sep 17 00:00:00 2001
+From 41e33db9d17e4d295bf12958398fc3758d3e3a5b Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 16 Jan 2018 06:11:30 +0100
-Subject: [PATCH] Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test
- directories
+Date: Tue, 19 Jun 2018 09:20:21 +0200
+Subject: [PATCH] Include test directory using ROOT_ADD_TEST_SUBDIRECTORY
 
 ---
- cmake/modules/RootNewMacros.cmake | 1 -
- core/base/CMakeLists.txt          | 4 +---
- core/cont/CMakeLists.txt          | 4 +---
- core/foundation/CMakeLists.txt    | 5 +----
- core/imt/CMakeLists.txt           | 4 ++--
- core/meta/CMakeLists.txt          | 4 +---
- core/metacling/CMakeLists.txt     | 4 +---
- core/thread/CMakeLists.txt        | 4 +---
- graf2d/gpad/CMakeLists.txt        | 8 +++-----
- hist/hist/CMakeLists.txt          | 6 ++----
- hist/histdraw/CMakeLists.txt      | 4 +---
- io/io/CMakeLists.txt              | 4 +---
- tmva/CMakeLists.txt               | 3 ---
- tmva/tmva/test/CMakeLists.txt     | 9 ---------
- tree/tree/CMakeLists.txt          | 4 +---
- tree/treeplayer/CMakeLists.txt    | 4 +---
- 16 files changed, 17 insertions(+), 55 deletions(-)
- delete mode 100644 tmva/tmva/test/CMakeLists.txt
+ graf2d/gpadv7/CMakeLists.txt     | 5 +----
+ graf2d/primitives/CMakeLists.txt | 5 ++---
+ 2 files changed, 3 insertions(+), 7 deletions(-)
 
-diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
-index 340d5c9951..77b784e4ea 100644
---- a/cmake/modules/RootNewMacros.cmake
-+++ b/cmake/modules/RootNewMacros.cmake
-@@ -1304,7 +1304,6 @@ function(ROOT_ADD_GTEST test_suite)
-   # against. For example, tests in Core should link only against libCore. This could be tricky
-   # to implement because some ROOT components create more than one library.
-   ROOT_EXECUTABLE(${test_suite} ${source_files} LIBRARIES ${ARG_LIBRARIES})
--  set_property(TARGET ${test_suite} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-   target_link_libraries(${test_suite} gtest gtest_main gmock gmock_main)
+diff --git a/graf2d/gpadv7/CMakeLists.txt b/graf2d/gpadv7/CMakeLists.txt
+index 525ce415451..9d6870231f3 100644
+--- a/graf2d/gpadv7/CMakeLists.txt
++++ b/graf2d/gpadv7/CMakeLists.txt
+@@ -11,7 +11,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
+                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
+                               DEPENDENCIES ROOTGraphicsPrimitives)
  
-   ROOT_PATH_TO_STRING(mangled_name ${test_suite} PATH_SEPARATOR_REPLACEMENT "-")
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index f3738e76a8..0fabc03e4e 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -2,9 +2,7 @@
- # CMakeLists.txt file for building ROOT core/base package
- ############################################################################
- 
--if(testing)
--    add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
- 
-diff --git a/core/cont/CMakeLists.txt b/core/cont/CMakeLists.txt
-index 2d5363d3d8..bb5a82e133 100644
---- a/core/cont/CMakeLists.txt
-+++ b/core/cont/CMakeLists.txt
-@@ -2,9 +2,7 @@
- # CMakeLists.txt file for building ROOT core/cont package
- ############################################################################
- 
--if(testing)
--  add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
- 
-diff --git a/core/foundation/CMakeLists.txt b/core/foundation/CMakeLists.txt
-index 9cc29d871e..af594ba98f 100644
---- a/core/foundation/CMakeLists.txt
-+++ b/core/foundation/CMakeLists.txt
-@@ -21,7 +21,4 @@ set_target_properties(Foundation_Stage1 PROPERTIES COMPILE_FLAGS "${COMPILE_FLAG
- 
- ROOT_INSTALL_HEADERS()
- 
--if(testing)
--  add_subdirectory(test)
--endif()
 -
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
-diff --git a/core/imt/CMakeLists.txt b/core/imt/CMakeLists.txt
-index 6ef45c7fc2..4b86f58ee2 100644
---- a/core/imt/CMakeLists.txt
-+++ b/core/imt/CMakeLists.txt
-@@ -21,6 +21,6 @@ ROOT_LINKER_LIBRARY(Imt ${sources}
- 
- ROOT_INSTALL_HEADERS(${installoptions})
- 
--if(imt AND testing)
--    add_subdirectory(test)
-+if(imt)
-+    ROOT_ADD_TEST_SUBDIRECTORY(test)
- endif()
-diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt
-index df84a83948..4843b06cf0 100644
---- a/core/meta/CMakeLists.txt
-+++ b/core/meta/CMakeLists.txt
-@@ -12,6 +12,4 @@ ROOT_OBJECT_LIBRARY(Meta ${sources})
- 
- ROOT_INSTALL_HEADERS()
- 
 -if(testing)
--  add_subdirectory(test)
+-   ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
 -endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
-diff --git a/core/metacling/CMakeLists.txt b/core/metacling/CMakeLists.txt
-index 0fec8de3e8..5468064771 100644
---- a/core/metacling/CMakeLists.txt
-+++ b/core/metacling/CMakeLists.txt
-@@ -4,6 +4,4 @@
- 
- add_subdirectory(src)
- 
--if(testing)
--    add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
-diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt
-index 0ec5857e50..2149ff5d47 100644
---- a/core/thread/CMakeLists.txt
-+++ b/core/thread/CMakeLists.txt
-@@ -36,6 +36,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Thread
-                               LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
-                               INSTALL_OPTIONS ${installoptions})
- 
--if(testing)
--    add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
-diff --git a/graf2d/gpad/CMakeLists.txt b/graf2d/gpad/CMakeLists.txt
-index 51da1c2320..06e508981f 100644
---- a/graf2d/gpad/CMakeLists.txt
-+++ b/graf2d/gpad/CMakeLists.txt
-@@ -14,8 +14,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gpad
++ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
+diff --git a/graf2d/primitives/CMakeLists.txt b/graf2d/primitives/CMakeLists.txt
+index f491eb70a90..d33597805d8 100644
+--- a/graf2d/primitives/CMakeLists.txt
++++ b/graf2d/primitives/CMakeLists.txt
+@@ -11,6 +11,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGraphicsPrimitives
+                               SOURCES ${src}
                                DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-                               DEPENDENCIES Graf Hist)
- 
+                               DEPENDENCIES RIO Core)
 -if(testing)
--    if(root7)
--        add_subdirectory(v7/test)
--    endif()
--endif()
-\ No newline at end of file
-+if(root7)
-+    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
-+endif()
-diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt
-index 88396c4924..3ac1898ccd 100644
---- a/hist/hist/CMakeLists.txt
-+++ b/hist/hist/CMakeLists.txt
-@@ -15,10 +15,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-                               DEPENDENCIES Matrix MathCore RIO)
- 
--if(testing)
--  add_subdirectory(test)
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
- 
- if(root7)
 -    add_subdirectory(v7/test)
--  endif()
-+    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
- endif()
-diff --git a/hist/histdraw/CMakeLists.txt b/hist/histdraw/CMakeLists.txt
-index 51721f2d0e..9f3232ae5f 100644
---- a/hist/histdraw/CMakeLists.txt
-+++ b/hist/histdraw/CMakeLists.txt
-@@ -12,7 +12,5 @@ if(root7)
-          DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-          DEPENDENCIES Gpad Hist)
- 
--    if(testing)
--        add_subdirectory(v7/test)
--    endif()
-+    ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
- endif()
-diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt
-index 7ca1104287..78e94786da 100644
---- a/io/io/CMakeLists.txt
-+++ b/io/io/CMakeLists.txt
-@@ -18,8 +18,6 @@ ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:RIOObjs> $<TARGET_OBJECTS:RootPc
-                                DEPENDENCIES Core Thread)
- ROOT_INSTALL_HEADERS()
- 
--if(testing)
--  add_subdirectory(test)
 -endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
- 
- #--- Extra rules ----------------------------------------------------------
-diff --git a/tmva/CMakeLists.txt b/tmva/CMakeLists.txt
-index 5648511bfe..d29bfb5061 100644
---- a/tmva/CMakeLists.txt
-+++ b/tmva/CMakeLists.txt
-@@ -8,6 +8,3 @@ endif()
- if(r)
- add_subdirectory(rmva)
- endif()
--#if(testing)
--# add_subdirectory(test)
--#endif()
-diff --git a/tmva/tmva/test/CMakeLists.txt b/tmva/tmva/test/CMakeLists.txt
-deleted file mode 100644
-index fc2a3e633d..0000000000
---- a/tmva/tmva/test/CMakeLists.txt
-+++ /dev/null
-@@ -1,9 +0,0 @@
--############################################################################
--# CMakeLists.txt file for building ROOT TMVA tests.
--# @author Simon Pfreundschuh
--############################################################################
--
--project(tmva-tests)
--find_package(ROOT REQUIRED)
--
--ROOT_ADD_TEST_SUBDIRECTORY(DNN)
-diff --git a/tree/tree/CMakeLists.txt b/tree/tree/CMakeLists.txt
-index e60675553f..82626b1c04 100644
---- a/tree/tree/CMakeLists.txt
-+++ b/tree/tree/CMakeLists.txt
-@@ -8,6 +8,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Tree
-                               LIBRARIES ${TBB_LIBRARIES}
-                               DEPENDENCIES Net RIO Thread Imt)
- 
--if(testing)
--   add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
-diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt
-index 688a08fd03..a72a02e18a 100644
---- a/tree/treeplayer/CMakeLists.txt
-+++ b/tree/treeplayer/CMakeLists.txt
-@@ -45,6 +45,4 @@ if(APPLE)
-   endif()
- endif()
- 
--if(testing)
--  add_subdirectory(test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(test)
--- 
-2.14.3
-
++
++ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
diff --git a/root-testfiles.sh b/root-testfiles.sh
index ec56fc1..c3f1d40 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SITE="http://root.cern.ch/files"
+SITE="https://root.cern/files"
 
 mkdir files
 pushd files
@@ -72,6 +72,7 @@ wget -N ${SITE}/tesla.root
 wget -N ${SITE}/wa91_ref_3.root
 wget -N ${SITE}/wa91.root
 
+wget -N ${SITE}/AtlasGraphs.root
 wget -N ${SITE}/europe.root
 wget -N ${SITE}/linearIO.root
 wget -N ${SITE}/stressHistogram.5.18.00.root
@@ -83,7 +84,7 @@ for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
 
 mkdir tutorials
 pushd tutorials
-wget -N ${SITE}/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
+wget -N ${SITE}/tutorials/df014_CsvDataSource_MuRun2010B.csv
 popd
 
 popd
diff --git a/root-urw-otf-hack.patch b/root-urw-otf-hack.patch
deleted file mode 100644
index f13a881..0000000
--- a/root-urw-otf-hack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/TTF.cxx
---- root-6.12.04.orig/graf2d/graf/src/TTF.cxx	2018-01-15 10:57:07.314073647 +0100
-+++ root-6.12.04/graf2d/graf/src/TTF.cxx	2018-01-15 11:02:00.210880469 +0100
-@@ -126,6 +126,11 @@
-              (platform == 1 && encoding == 0 &&
-               (fgFontID[fgCurFontIdx] == 12 ||
-                fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)) ||
-+             // Horrible hack for broken charmaps in StandardSymbolsPS.otf
-+             // Hopefully temporary...
-+             (platform == 0 && encoding == 3 &&
-+              (fgFontID[fgCurFontIdx] == 12 ||
-                fgFontID[fgCurFontIdx] == 15)))
-          {
-             fgCharMap[fgCurFontIdx] = charmap;
diff --git a/root.spec b/root.spec
index bc40569..8805bfa 100644
--- a/root.spec
+++ b/root.spec
@@ -1,11 +1,4 @@
-%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
-
-# Ruby support not yet ported to root version 6
-%global ruby 0
-
-%global oce 1
-%global pythia8 1
-%global xrootd 1
+%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
 %if %{?fedora}%{!?fedora:0} >= 24
 # libhdfs is available for all architectures for Fedora 24 and later.
@@ -23,6 +16,13 @@
 %global root7 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
+# Multi-threading support requires TBB version >= 4.3.
+%global tbb 1
+%else
+%global tbb 0
+%endif
+
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
@@ -31,18 +31,18 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.12.06
+Version:	6.14.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
-URL:		https://root.cern.ch/
+URL:		https://root.cern/
 #		The upstream source is modified to exclude proprietary fonts:
-#		wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz
-#		tar -z -x -f root_v%{version}.source.tar.gz
-#		find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';'
-#		tar -J -c --group root --owner root -f root-%{version}.tar.xz root-%{version}
+#		wget -N https://root.cern/download/root_v%%{version}.source.tar.gz
+#		tar -z -x -f root_v%%{version}.source.tar.gz
+#		find root-%%{version}/fonts -type f -a '!' -name 'STIX*' -exec rm {} ';'
+#		tar -J -c --group root --owner root -f root-%%{version}.tar.xz root-%%{version}
 Source0:	%{name}-%{version}.tar.xz
 #		Input data for the tests
 Source1:	%{name}-testfiles.tar.xz
@@ -53,72 +53,56 @@ Source3:	rootd.service
 Source4:	proofd.service
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
-#		Don't link to libjvm (handled properly inside libhdfs)
-Patch1:		%{name}-dont-link-jvm.patch
 #		Don't create documentation notebooks
-Patch2:		%{name}-doc-no-notebooks.patch
+Patch1:		%{name}-doc-no-notebooks.patch
 #		Don't run gui macros
-Patch3:		%{name}-avoid-gui-crash.patch
+Patch2:		%{name}-avoid-gui-crash.patch
 #		Unbundle gtest
-Patch4:		%{name}-unbundle-gtest.patch
-#		Horrible hack for broken charmaps in StandardSymbolsPS.otf
-#		Hopefully temporary...
-#		https://bugzilla.redhat.com/show_bug.cgi?id=1534206
-Patch5:		%{name}-urw-otf-hack.patch
+Patch3:		%{name}-unbundle-gtest.patch
 #		Use local static script and style files for JupyROOT
-Patch6:		%{name}-jupyroot-static.patch
+Patch4:		%{name}-jupyroot-static.patch
+#		Fedora's llvm patches
+Patch5:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
+Patch6:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
+Patch7:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 #		Fix some javascript syntax choking yuicompressor
 #		Adapt d3 path to updated jsroot
 #		https://github.com/root-project/root/pull/1520
-Patch7:		%{name}-js-syntax.patch
-#		Fix missing -f flag to rm in Makefile
-#		Backport from upstream git
-Patch8:		%{name}-doxygen-makefile.patch
+Patch8:		%{name}-js-syntax.patch
 #		Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test dirs
-#		https://github.com/root-project/root/pull/1515
+#		https://github.com/root-project/root/pull/2247
 Patch9:		%{name}-test-subdirs.patch
-#		No need to use environment variables for system pythia
-Patch10:	%{name}-system-pythia.patch
 #		Reduce memory usage of build
 #		https://github.com/root-project/root/pull/1516
-Patch11:	%{name}-memory-usage.patch
-#		Fedora's llvm patch
-Patch12:	%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
+Patch10:	%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
 #		Fedora builders run out of memory with the default setting.
-Patch13:	%{name}-memory-arm-x86.patch
+Patch11:	%{name}-memory-arm-x86.patch
 #		Don't run tutorials that crash on ppc64 during doc generation.
 #		Ensures content of doc package is the same on all architecture
 #		so that koji accepts it as a noarch package.
-Patch14:	%{name}-ppc64-doc.patch
-#		Check string is not empty before calling front()
-#		Backport from upstream git
-Patch15:	%{name}-crash-fix.patch
-#		Adjust expected file size for ix32
-#		Backport from upstream git
-Patch16:	%{name}-test-stress-32bit.patch
-#		Fixes for failing tests due to new compiler flags
-#		https://github.com/root-project/root/pull/1638
-Patch17:	%{name}-test-fixes.patch
-#		https://github.com/root-project/root/pull/1639
-Patch18:	%{name}-out-of-bounds.patch
-#		Fix ~ alignment in doxygen markup
-#		https://github.com/root-project/root/pull/1640
-Patch19:	%{name}-doxygen-tilde.patch
-#		Don't install intermediate static libs (mathtext and minicern)
-#		Don't add JupyROOT python extension to cmake exports
-#		https://github.com/root-project/root/pull/1643
-Patch20:	%{name}-noinst.patch
+Patch12:	%{name}-ppc64-doc.patch
 #		Adjust allowed deviation for PDF file sizes (aarch64)
 #		https://github.com/root-project/root/pull/2120
-Patch21:	%{name}-stressgraphics-ref.patch
+Patch13:	%{name}-stressgraphics-ref.patch
 #		Adjust Vavilov test for Fedora 29 ix86
 #		https://github.com/root-project/root/pull/2273
-Patch22:	%{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
+Patch14:	%{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
 #		Adapt to python 3.7
 #		https://github.com/root-project/root/pull/2276
-Patch23:	%{name}-python-3.7.patch
+Patch15:	%{name}-python-3.7.patch
+#		Set Cache File Dir
+#		https://github.com/root-project/root/pull/2246
+Patch16:	%{name}-set-cache-file-dir.patch
+#		Fix test compilation on EPEL 7
+#		https://github.com/root-project/root/pull/2263
+Patch17:	%{name}-test-compilatiom-epel7.patch
+#		Missing include for std::shuffle
+#		https://github.com/root-project/root/pull/2267
+Patch18:	%{name}-missing-header.patch
+#		Optimization issue in Geom library
+Patch19:	%{name}-ix32-geom-opt.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -167,16 +151,18 @@ BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	python-devel
-%if %{?fedora}%{!?fedora:0} >= 15
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	python3-devel
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	python34-devel
 %endif
 BuildRequires:	qt4-devel
-%if %{ruby}
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
+%if %{root7}
+%ifarch %{qt5_qtwebengine_arches}
+BuildRequires:	qt5-devel
+BuildRequires:	qt5-qtwebengine-devel
+%endif
 %endif
 BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
@@ -186,10 +172,8 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
-%if %{xrootd}
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
-%endif
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
@@ -197,13 +181,11 @@ BuildRequires:	srm-ifce-devel
 %if %{hadoop}
 BuildRequires:	hadoop-devel
 %endif
-%if %{oce}
 BuildRequires:	OCE-devel
-%endif
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
-%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
+%if %{tbb}
 BuildRequires:	tbb-devel >= 4.3
 %endif
 BuildRequires:	emacs
@@ -212,9 +194,7 @@ BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
-%if %{pythia8}
 BuildRequires:	pythia8-devel >= 8.1.80
-%endif
 BuildRequires:	blas-devel
 BuildRequires:	numpy
 BuildRequires:	doxygen
@@ -230,16 +210,14 @@ BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
-#		Provides "symbol", "dingbats" and "chancery"
 %if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires:	urw-base35-fonts
+BuildRequires:	font(standardsymbolsps)
+BuildRequires:	font(d050000l)
+BuildRequires:	font(z003)
 %else
 BuildRequires:	urw-fonts
 %endif
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
 BuildRequires:	font(droidsansfallback)
-%endif
 #		With gdb installed test failures will show backtraces
 BuildRequires:	gdb
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -306,9 +284,6 @@ Requires:	%{name}-core = %{version}-%{release}
 %description fonts
 This package contains fonts used by ROOT that are not available in Fedora.
 In particular it contains STIX version 0.9 that is used by TMathText.
-%if %{?rhel}%{!?rhel:0}
-For EPEL it also provides the Google Droid Sans Fallback font.
-%endif
 
 %package doc
 Summary:	Documentation for the ROOT system
@@ -358,19 +333,15 @@ Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
 Requires:	font(freeserif)
 Requires:	font(freemono)
-#		Provides "symbol", "dingbats" and "chancery"
 %if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
-Requires:	urw-base35-fonts
+Requires:	font(standardsymbolsps)
+Requires:	font(d050000l)
+Requires:	font(z003)
 %else
 Requires:	urw-fonts
 %endif
-#		The root-fonts package provides Droid Sans Fallback for EPEL
-%if %{?fedora}%{!?fedora:0} >= 11
 Requires:	font(droidsansfallback)
-%endif
-%if %{ruby} == 0
 Obsoletes:	%{name}-ruby < 6.00.00
-%endif
 Obsoletes:	%{name}-vdt < 6.10.00
 
 %description core
@@ -443,9 +414,6 @@ transparent interface.
 
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
-%{?py2_dist:
-Provides:	%{py2_dist %{name}} = %{version}
-}
 Provides:	root-python = %{version}-%{release}
 Obsoletes:	root-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -458,9 +426,6 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
-%{?py3_dist:
-Provides:	%{py3_dist %{name}} = %{version}
-}
 Provides:	root-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	root-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -473,20 +438,18 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
-%{?py2_dist:
-Provides:	%{py2_dist jupyroot} = %{version}
-}
 Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python2-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-notebook = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
-Requires:	python2-ipython
-Requires:	python2-metakernel
-%else
-Requires:	python-ipython-console
 #		python-metakernel for python2 not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
+Requires:	python2-ipython
+Requires:	python2-metakernel
+%endif
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+Requires:	python-jupyter-filesystem
 %endif
 Obsoletes:	%{name}-rootaas < 6.08.00
 
@@ -495,23 +458,18 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
-%{?py3_dist:
-Provides:	%{py3_dist jupyroot} = %{version}
-}
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-notebook = %{version}-%{release}
 %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
-Requires:	python%{python3_pkgversion}-ipython
-Requires:	python%{python3_pkgversion}-metakernel
-%else
-%if %{?fedora}%{!?fedora:0}
-#		ipython for python3 not available in RHEL/EPEL
-Requires:	python%{python3_pkgversion}-ipython-console
-%endif
 #		python-metakernel for python3 not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
+Requires:	python%{python3_pkgversion}-ipython
+Requires:	python%{python3_pkgversion}-metakernel
+%endif
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+Requires:	python-jupyter-filesystem
 %endif
 
 %description -n python%{python3_pkgversion}-jupyroot
@@ -520,9 +478,6 @@ The Jupyter kernel for the ROOT notebook.
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
-%{?py2_dist:
-Provides:	%{py2_dist jsmva} = %{version}
-}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
@@ -531,28 +486,11 @@ TMVA interface used by JupyROOT.
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
-%{?py3_dist:
-Provides:	%{py3_dist jsmva} = %{version}
-}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
-%if %{ruby}
-%package ruby
-Summary:	Ruby extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Provides:	ruby(libRuby) = %{version}
-
-%description ruby
-This package contains the Ruby extension for ROOT. The interface
-goes both ways - that is, you can call ROOT functions from Ruby, and
-invoke the Ruby interpreter from ROOT.
-%endif
-
 %package r
 Summary:	R interface for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -612,7 +550,6 @@ Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
 %description gdml
 This package contains an import/export module for ROOT geometries.
 
-%if %{oce}
 %package geocad
 Summary:	OpenCascade import/export for ROOT geometries
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -620,7 +557,6 @@ Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 
 %description geocad
 This package contains an import/export module for ROOT geometries.
-%endif
 
 %package graf
 Summary:	2D graphics library for ROOT
@@ -663,7 +599,6 @@ Summary:	Canvas and pad library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
@@ -789,25 +724,33 @@ Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+#		Package split (gui-html from gui)
+Obsoletes:	%{name}-gui < 6.14.00
 
 %description gui
 This package contains a library for defining graphical user interfaces.
 
+%package gui-html
+Summary:	HTML GUI library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+#		Package split (gui-html from gui)
+Obsoletes:	%{name}-gui < 6.14.00
+
+%description gui-html
+This package contains a library for defining HTML graphical user interfaces.
+
 %package gui-fitpanel
 Summary:	GUI element for fits in ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-%if %{root7}
-Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-%endif
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
@@ -830,26 +773,42 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 This package contains a library to show a pop-up window for editing
 various ROOT objects.
 
-%package guibuilder
+%package gui-builder
 Summary:	GUI editor library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+#		Package renamed
+Provides:	%{name}-guibuilder = %{version}-%{release}
+Provides:	%{name}-guibuilder%{?_isa} = %{version}-%{release}
+Obsoletes:	%{name}-guibuilder < 6.14.00
 
-%description guibuilder
+%description gui-builder
 This package contains a library for editing graphical user interfaces
 in ROOT.
 
 %package gui-qt
-Summary:	Qt GUI for ROOT
+Summary:	Qt GUI for ROOT (BNL)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+#		Package split (gui-qtgsi from gui-qt)
+Obsoletes:	%{name}-qt < 6.14.00
 
 %description gui-qt
-This package contains the Qt GUI for ROOT.
+This package contains the BNL Qt GUI for ROOT.
+
+%package gui-qtgsi
+Summary:	Qt GUI for ROOT (GSI)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+#		Package split (gui-qtgsi from gui-qt)
+Obsoletes:	%{name}-qt < 6.14.00
+
+%description gui-qtgsi
+This package contains the GSI Qt GUI for ROOT.
 
 %package gui-recorder
 Summary:	Interface for recording and replaying events in ROOT
@@ -866,28 +825,6 @@ Recorded events are:
 All the recorded events from one session are stored in one TFile
 and can be replayed again anytime.
 
-%if %{root7}
-%package gui-canvaspainter
-Summary:	Canvas painter (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-
-%description gui-canvaspainter
-This package contains a canvas painter extension for ROOT 7
-
-%package gui-webdisplay
-Summary:	Web display (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
-
-%description gui-webdisplay
-This package contains a web display extension for ROOT 7
-%endif
-
 %package hbook
 Summary:	Hbook library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -911,17 +848,6 @@ Requires:	%{name}-hist-painter%{?_isa} = %{version}-%{release}
 %description hist
 This package contains a library for histogramming in ROOT.
 
-%if %{root7}
-%package hist-draw
-Summary:	Histogram drawing (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-
-%description hist-draw
-This package contains an histogram drawing extension for ROOT 7.
-%endif
-
 %package hist-painter
 Summary:	Histogram painter plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -961,7 +887,7 @@ Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -1035,10 +961,21 @@ TFile interface.
 Summary:	XML reader library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+#		Package split (io-xmlparser from io-xml)
+Obsoletes:	%{name}-io-xml < 6.14.00
 
 %description io-xml
 This package contains the XML reader library for ROOT.
 
+%package io-xmlparser
+Summary:	XML parser library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+#		Package split (io-xmlparser from io-xml)
+Obsoletes:	%{name}-io-xml < 6.14.00
+
+%description io-xmlparser
+This package contains the XML parser library for ROOT.
+
 %package foam
 Summary:	A Compact Version of the Cellular Event Generator
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1229,6 +1166,15 @@ init-program computes all tables and constants necessary for the
 random variate generation. The sample program can then generate
 variates from the desired distribution.
 
+%package vecops
+Summary:	Vector operation extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+#		Library split (tree-dataframe and vecops from tree-player)
+Obsoletes:	%{name}-tree-player < 6.14.00
+
+%description vecops
+This package contains a vector operation extension for ROOT.
+
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1264,7 +1210,6 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 %description montecarlo-eg
 This package contains an event generator library for ROOT.
 
-%if %{pythia8}
 %package montecarlo-pythia8
 Summary:	Pythia version 8 plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1275,7 +1220,6 @@ This package contains the Pythia version 8 plug-in for ROOT. This
 package provide the ROOT user with transparent interface to the Pythia
 (version 8) event generators for hadronic interactions. If the term
 "hadronic" does not ring any bells, this package is not for you.
-%endif
 
 %package montecarlo-vmc
 Summary:	Virtual Monte-Carlo (simulation) library for ROOT
@@ -1361,19 +1305,31 @@ access to LDAP directories via ROOT.
 %package net-http
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	js-jsroot
+#		Library split (net-httpsniff from net-http)
+Obsoletes:	%{name}-net-http < 6.14.00
 
 %description net-http
 This package contains the HTTP server extension for ROOT. It provides
 an http interface to arbitrary ROOT applications.
 
-%if %{xrootd}
+%package net-httpsniff
+Summary:	HTTP sniffer extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Library split (net-httpsniff from net-http)
+Obsoletes:	%{name}-net-http < 6.14.00
+
+%description net-httpsniff
+This package contains the HTTP sniffer extension for ROOT.
+
 %package netx
 Summary:	NetX extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1384,21 +1340,18 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 This package contains the NetX extension for ROOT, i.e. a client for
 the xrootd server. Both the old (NetX) and the new (NetXNG) version are
 provided.
-%endif
 
 %package proof
 Summary:	PROOF extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name}-clarens < 5.34.01
 Obsoletes:	%{name}-peac < 5.34.01
+#		Package split (proof-player from proof)
+Obsoletes:	%{name}-proof < 6.14.00
 
 %description proof
 This package contains the proof extension for ROOT. This provides a
@@ -1412,11 +1365,29 @@ Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description proof-bench
 This package contains the steering class for PROOF benchmarks.
 
+%package proof-player
+Summary:	PROOF player extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+#		Package split (proof-player from proof)
+Obsoletes:	%{name}-proof < 6.14.00
+
+%description proof-player
+This package contains the proof player extension for ROOT.
+
 %package proof-pq2
 Summary:	PROOF Quick Query (pq2)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1443,7 +1414,6 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains a library for browsing an interactive PROOF
 session in ROOT.
 
-%if %{xrootd}
 %package xproof
 Summary:	XPROOF extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1457,7 +1427,6 @@ Requires:	xrootd-server%{?_isa}
 %description xproof
 This package contains the xproof extension for ROOT. This provides a
 client to be used in a PROOF environment.
-%endif
 
 %package roofit
 Summary:	ROOT extension for modeling expected distributions
@@ -1613,6 +1582,18 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 %description tree
 This package contains the Tree library for ROOT.
 
+%package tree-dataframe
+Summary:	A high level interfae to ROOT trees
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+#		Library split (tree-dataframe and vecops from tree-player)
+Obsoletes:	%{name}-tree-player < 6.14.00
+
+%description tree-dataframe
+This package contains a high level interfae to ROOT trees.
+
 %package tree-player
 Summary:	Library to loop over a ROOT tree
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1625,6 +1606,8 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Library split (tree-dataframe and vecops from tree-player)
+Obsoletes:	%{name}-tree-player < 6.14.00
 
 %description tree-player
 This package contains a plugin to loop over a ROOT tree.
@@ -1649,7 +1632,7 @@ This package contains a plugin for browsing a ROOT tree in ROOT.
 Summary:	Distribution unfolding
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
 %description unfold
@@ -1673,6 +1656,74 @@ Requires:	js-jsroot
 %description notebook
 Javascript and style files for the Jupyter ROOT Notebook.
 
+%if %{root7}
+%package graf-gpadv7
+Summary:	Canvas and pad library for ROOT (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description graf-gpadv7
+This package contains a library for canvas and pad manipulations.
+
+%package graf-primitives
+Summary:	Graphics primitives (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description graf-primitives
+This package contains graphics primitives for ROOT 7
+
+%package gui-canvaspainter
+Summary:	Canvas painter (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-canvaspainter
+This package contains a canvas painter extension for ROOT 7
+
+%package gui-fitpanelv7
+Summary:	GUI element for fits in ROOT (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-fitpanelv7
+This package contains a library to show a pop-up dialog when fitting
+various kinds of data.
+
+%ifarch %{qt5_qtwebengine_arches}
+%package gui-qt5webdisplay
+Summary:	Qt5 Web display (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-qt5webdisplay
+This package contains a Qt5 web display extension for ROOT 7
+%endif
+
+%package gui-webdisplay
+Summary:	Web display (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-webdisplay
+This package contains a web display extension for ROOT 7
+
+%package hist-draw
+Summary:	Histogram drawing (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
+
+%description hist-draw
+This package contains an histogram drawing extension for ROOT 7.
+%endif
+
 %prep
 %setup -q -a 1
 
@@ -1696,10 +1747,6 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1709,11 +1756,11 @@ rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 #  * freetype
 rm -rf graf2d/freetype/src
 #  * glew
-rm -rf graf3d/glew/src graf3d/glew/inc
+rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem
 #  * pcre
 rm -rf core/pcre/src
-#  * zlib
-rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
+#  * zlib, lz4, xxhash
+rm -rf builtins
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
 #  * gl2ps
@@ -1731,16 +1778,14 @@ sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
     -i documentation/doxygen/Doxyfile
 %if %{root7}
 #  * string_view (<experimental/string_view> requires c++-14)
-rm core/foundation/inc/libcpp_string_view.h \
-   core/foundation/inc/RWrap_libcpp_string_view.h
+rm core/foundation/inc/ROOT/libcpp_string_view.h \
+   core/foundation/inc/ROOT/RWrap_libcpp_string_view.h
 %endif
 #  * jsroot
 rm -rf etc/http/*
 
-# Remove bundled fonts provided by the OS distributions
-%if %{?fedora}%{!?fedora:0} >= 11
-rm fonts/DroidSansFallback.ttf
-%endif
+# Fix file permissions
+chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
@@ -1795,6 +1840,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_afterimage:BOOL=OFF \
        -Dbuiltin_cfitsio:BOOL=OFF \
+       -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_davix:BOOL=OFF \
        -Dbuiltin_fftw3:BOOL=OFF \
        -Dbuiltin_freetype:BOOL=OFF \
@@ -1813,15 +1859,18 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_vdt:BOOL=OFF \
        -Dbuiltin_veccore:BOOL=OFF \
        -Dbuiltin_xrootd:BOOL=OFF \
+       -Dbuiltin_xxhash:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dafdsmgrd:BOOL=OFF \
        -Dafs:BOOL=OFF \
        -Dalien:BOOL=OFF \
+       -Darrow:BOOL=OFF \
        -Dasimage:BOOL=ON \
        -Dastiff:BOOL=ON \
        -Dbonjour:BOOL=ON \
        -Dcastor:BOOL=OFF \
        -Dccache:BOOL=OFF \
+       -Dcefweb:BOOL=OFF \
        -Dchirp:BOOL=OFF \
        -Dcling:BOOL=ON \
        -Dcocoa:BOOL=OFF \
@@ -1844,11 +1893,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
        -Dgenvector:BOOL=ON \
-%if %{oce}
        -Dgeocad:BOOL=ON \
-%else
-       -Dgeocad:BOOL=OFF \
-%endif
        -Dgfal:BOOL=ON \
        -Dglite:BOOL=OFF \
        -Dglobus:BOOL=ON \
@@ -1860,7 +1905,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dhdfs:BOOL=OFF \
 %endif
        -Dhttp:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
+%if %{tbb}
        -Dimt:BOOL=ON \
 %else
        -Dimt:BOOL=OFF \
@@ -1881,24 +1926,21 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dpch:BOOL=ON \
        -Dpgsql:BOOL=ON \
        -Dpythia6:BOOL=OFF \
-%if %{pythia8}
        -Dpythia8:BOOL=ON \
-%else
-       -Dpythia8:BOOL=OFF \
-%endif
        -Dpython:BOOL=ON \
-       -Dpython3:BOOL=OFF \
+       -DPYTHON_EXECUTABLE:PATH=%{__python2} \
        -Dqt:BOOL=ON \
        -Dqtgsi:BOOL=ON \
+%ifarch %{qt5_qtwebengine_arches}
+       -Dqt5web:BOOL=ON \
+%else
+       -Dqt5web:BOOL=OFF \
+%endif
        -Dr:BOOL=ON \
        -Drfio:BOOL=ON \
        -Droofit:BOOL=ON \
        -Drpath:BOOL=OFF \
-%if %{ruby}
-       -Druby:BOOL=ON \
-%else
        -Druby:BOOL=OFF \
-%endif
        -Druntime_cxxmodules:BOOL=OFF \
        -Dsapdb:BOOL=OFF \
        -Dshadowpw:BOOL=ON \
@@ -1911,6 +1953,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtcmalloc:BOOL=OFF \
        -Dthread:BOOL=ON \
        -Dtmva:BOOL=ON \
+%if %{tbb}
+       -Dtmva-cpu:BOOL=ON \
+%else
+       -Dtmva-cpu:BOOL=OFF \
+%endif
+       -Dtmva-gpu:BOOL=OFF \
        -Dunuran:BOOL=ON \
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=OFF \
@@ -1919,11 +1967,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dx11:BOOL=ON \
        -Dxft:BOOL=ON \
        -Dxml:BOOL=ON \
-%if %{xrootd}
        -Dxrootd:BOOL=ON \
-%else
-       -Dxrootd:BOOL=OFF \
-%endif
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
        -Dclingtest:BOOL=OFF \
@@ -1947,7 +1991,7 @@ py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
 py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
 py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python},%{__python3},g' \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3},g' \
     -e 's,lib/libPyROOT,python/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
@@ -2032,7 +2076,7 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python/cmake_install.cmake
 
 mkdir -p %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3soabi}.so
 mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
@@ -2048,26 +2092,26 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
 
 rm -rf $tmpdir
 
-%if %{ruby}
-# The Ruby interface library must be in two places
-mkdir -p %{buildroot}%{ruby_vendorarchdir}
-mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \
-   %{buildroot}%{ruby_vendorarchdir}/libRuby.so
-ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \
-   %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version}
-%endif
+# Create empty .dist-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
+
+touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
 
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
-sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!/usr/bin/python2!' \
+sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!%{__python2}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json
 
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
-sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!/usr/bin/python3!' \
+sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
 
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
@@ -2087,7 +2131,6 @@ if [ -z "\$(type jupyter-notebook 2>/dev/null)" ] ; then
    echo jupyter-notebook not found in path. Exiting.
    exit 1
 fi
-rm -rf ~/.rootnb
 jupyter notebook
 EOF
 
@@ -2096,7 +2139,7 @@ mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed -e 's!/usr/bin/env python!/usr/bin/python!' \
+sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2109,13 +2152,14 @@ sed -e 's!/usr/bin/env python!/usr/bin/python!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
+sed -e 's!/usr/bin/env python2!%{__python2}!' \
+    -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e '/^\#!/d' \
     -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \
        %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \
        %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
-sed -e 's!/usr/bin/env python!/usr/bin/python!' \
-    -i %{buildroot}%{_bindir}/rootdrawtree \
-       %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
+sed -e 's!/usr/bin/env python!%{__python2}!' \
+    -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationClassificationKeras.py \
@@ -2143,9 +2187,6 @@ rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
 rm %{buildroot}%{_mandir}/man1/roota.1
 rm %{buildroot}%{_mandir}/man1/setup-pq2.1
-%if %{xrootd} == 0
-rm %{buildroot}%{_mandir}/man1/xproofd.1
-%endif
 rm %{buildroot}%{_includedir}/%{name}/*.cw
 rm %{buildroot}%{_includedir}/%{name}/*.pri
 rm %{buildroot}%{_pkgdocdir}/INSTALL
@@ -2183,14 +2224,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
-%if %{xrootd} == 0
-rm TFile/P100_TXNetFile.C
-rm TFileStager/P010_TXNetFileStager.C
-rm TProofMgr/P010_TXProofMgr.C
-rm TProofServ/P010_TXProofServ.C
-rm TSlave/P010_TXSlave.C
-rm TSystem/P040_TXNetSystem.C
-%endif
 rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
@@ -2220,7 +2253,7 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
     LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
     PYTHONPATH=${PWD}/../../builddir/lib \
-    python ../../tutorials/pyroot/hsimple.py
+    %{__python2} ../../tutorials/pyroot/hsimple.py
 ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
     LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
@@ -2248,11 +2281,7 @@ done
 cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
 cat includelist-roofit-roo* > includelist-roofit
-cat includelist-gui-qt* > includelist-gui-qt
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
-cat includelist-gui-guihtml >> includelist-gui-gui
-cat includelist-io-xmlparser >> includelist-io-xml
-cat includelist-proof-proofplayer >> includelist-proof-proof
 cat includelist-net-netx* > includelist-netx
 
 %check
@@ -2262,14 +2291,20 @@ ln -s ../../files files
 popd
 pushd runtutorials
 ln -s ../../files files
-ln -sf ../../files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
+ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
+popd
+pushd tmva/tmva/test/DNN/CNN
+ln -s ../../../../../../files files
+popd
+pushd tmva/tmva/test/envelope
+ln -s ../../../../../files files
 popd
 # Exclude some tests that can not be run
 #
 # - test-stressIOPlugins-*
 #   requires network access (by design since they test the remote file IO)
 #
-# - tutorial-dataframe-tdf101_h1Analysis
+# - tutorial-dataframe-df101_h1Analysis
 # - tutorial-tree-run_h1analysis
 # - tutorial-multicore-imt001_parBranchProcessing
 # - tutorial-multicore-mp103_processSelector
@@ -2282,26 +2317,16 @@ popd
 #
 # - tutorial-pythia-pythia8
 #   sometimes times out
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8"
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8"
 
 %ifarch %{arm}
-# Tests failing on arm
-# https://sft.its.cern.ch/jira/browse/ROOT-8500
-# - gtest-tree-treeplayer-test-dataframe-snapshot
-# - mathcore-testMinim
-# - minuit2-testMinimizer
-# - test-minexam
-# - test-stressfit (but -interpreted works)
 # Tests failing on arm on Fedora <= 27
+# https://sft.its.cern.ch/jira/browse/ROOT-8500
 # - test-stressiterators-interpreted
 # - tutorial-hist-sparsehist
-# - tutorial-multicore-mt303_AsyncSimple
-# - tutorial-multicore-mt304_AsyncNested
-# - tutorial-multicore-mt305_TFuture
 # - tutorial-r-*
-excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit"
 %if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*"
+excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
 %endif
 %endif
 
@@ -2314,24 +2339,8 @@ excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|
 # - tutorial-roofit-rf511_wsfactory_basic
 # - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7)
 # - tutorial-roostats-rs701_BayesianCalculator
-# - tutorial-dataframe-tdf006_ranges-py
-excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-tdf006_ranges-py"
-%endif
-
-%ifarch ppc64le
-# Tests failing on ppc64le
-# - test-stresshistogram[-interpreted]
-excluded="${excluded}|test-stresshistogram"
-%endif
-
-# Test failing on 32 bit on Fedora <= 27
-# https://sft.its.cern.ch/jira/browse/ROOT-9236
-# https://sft.its.cern.ch/jira/browse/ROOT-9265
-# - gtest-tree-treeplayer-test-dataframe-snapshot
-%ifarch %{ix86} %{arm}
-%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
-excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot"
-%endif
+# - tutorial-dataframe-df006_ranges-py
+excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-df006_ranges-py"
 %endif
 
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
@@ -2421,20 +2430,20 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
 	-i /var/lib/alternatives/libPyROOT.so
     for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3soabi}.so" ] ; then
 	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
 	fi
     done
 fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10
 /sbin/ldconfig
 
 %preun -n python%{python3_pkgversion}-%{name}
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
+	libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so
 fi
 
 %postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig
@@ -2444,7 +2453,7 @@ fi
 # for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10
 /sbin/ldconfig
 
 %post notebook
@@ -2475,10 +2484,6 @@ fi
 %postun multiproc -p /sbin/ldconfig
 %post cling -p /sbin/ldconfig
 %postun cling -p /sbin/ldconfig
-%if %{ruby}
-%post ruby -p /sbin/ldconfig
-%postun ruby -p /sbin/ldconfig
-%endif
 %post r -p /sbin/ldconfig
 %postun r -p /sbin/ldconfig
 %post r-tools -p /sbin/ldconfig
@@ -2489,10 +2494,8 @@ fi
 %postun geom -p /sbin/ldconfig
 %post gdml -p /sbin/ldconfig
 %postun gdml -p /sbin/ldconfig
-%if %{oce}
 %post geocad -p /sbin/ldconfig
 %postun geocad -p /sbin/ldconfig
-%endif
 %post graf -p /sbin/ldconfig
 %postun graf -p /sbin/ldconfig
 %post graf-asimage -p /sbin/ldconfig
@@ -2521,30 +2524,24 @@ fi
 %postun graf3d-x3d -p /sbin/ldconfig
 %post gui -p /sbin/ldconfig
 %postun gui -p /sbin/ldconfig
+%post gui-html -p /sbin/ldconfig
+%postun gui-html -p /sbin/ldconfig
 %post gui-fitpanel -p /sbin/ldconfig
 %postun gui-fitpanel -p /sbin/ldconfig
 %post gui-ged -p /sbin/ldconfig
 %postun gui-ged -p /sbin/ldconfig
-%post guibuilder -p /sbin/ldconfig
-%postun guibuilder -p /sbin/ldconfig
+%post gui-builder -p /sbin/ldconfig
+%postun gui-builder -p /sbin/ldconfig
 %post gui-qt -p /sbin/ldconfig
 %postun gui-qt -p /sbin/ldconfig
+%post gui-qtgsi -p /sbin/ldconfig
+%postun gui-qtgsi -p /sbin/ldconfig
 %post gui-recorder -p /sbin/ldconfig
 %postun gui-recorder -p /sbin/ldconfig
-%if %{root7}
-%post gui-canvaspainter -p /sbin/ldconfig
-%postun gui-canvaspainter -p /sbin/ldconfig
-%post gui-webdisplay -p /sbin/ldconfig
-%postun gui-webdisplay -p /sbin/ldconfig
-%endif
 %post hbook -p /sbin/ldconfig
 %postun hbook -p /sbin/ldconfig
 %post hist -p /sbin/ldconfig
 %postun hist -p /sbin/ldconfig
-%if %{root7}
-%post hist-draw -p /sbin/ldconfig
-%postun hist-draw -p /sbin/ldconfig
-%endif
 %post hist-painter -p /sbin/ldconfig
 %postun hist-painter -p /sbin/ldconfig
 %post spectrum -p /sbin/ldconfig
@@ -2571,6 +2568,8 @@ fi
 %postun io-sql -p /sbin/ldconfig
 %post io-xml -p /sbin/ldconfig
 %postun io-xml -p /sbin/ldconfig
+%post io-xmlparser -p /sbin/ldconfig
+%postun io-xmlparser -p /sbin/ldconfig
 %post foam -p /sbin/ldconfig
 %postun foam -p /sbin/ldconfig
 %post fftw -p /sbin/ldconfig
@@ -2601,16 +2600,16 @@ fi
 %postun splot -p /sbin/ldconfig
 %post unuran -p /sbin/ldconfig
 %postun unuran -p /sbin/ldconfig
+%post vecops -p /sbin/ldconfig
+%postun vecops -p /sbin/ldconfig
 %post memstat -p /sbin/ldconfig
 %postun memstat -p /sbin/ldconfig
 %post table -p /sbin/ldconfig
 %postun table -p /sbin/ldconfig
 %post montecarlo-eg -p /sbin/ldconfig
 %postun montecarlo-eg -p /sbin/ldconfig
-%if %{pythia8}
 %post montecarlo-pythia8 -p /sbin/ldconfig
 %postun montecarlo-pythia8 -p /sbin/ldconfig
-%endif
 %post montecarlo-vmc -p /sbin/ldconfig
 %postun montecarlo-vmc -p /sbin/ldconfig
 %post net -p /sbin/ldconfig
@@ -2639,18 +2638,20 @@ if st and st.type == "directory" then
   os.execute("rm -rf " .. path)
 end
 
-%if %{xrootd}
+%post net-httpsniff -p /sbin/ldconfig
+%postun net-httpsniff -p /sbin/ldconfig
 %post netx -p /sbin/ldconfig
 %postun netx -p /sbin/ldconfig
-%endif
 %post proof -p /sbin/ldconfig
 %postun proof -p /sbin/ldconfig
+%post proof-bench -p /sbin/ldconfig
+%postun proof-bench -p /sbin/ldconfig
+%post proof-player -p /sbin/ldconfig
+%postun proof-player -p /sbin/ldconfig
 %post proof-sessionviewer -p /sbin/ldconfig
 %postun proof-sessionviewer -p /sbin/ldconfig
-%if %{xrootd}
 %post xproof -p /sbin/ldconfig
 %postun xproof -p /sbin/ldconfig
-%endif
 %post roofit -p /sbin/ldconfig
 %postun roofit -p /sbin/ldconfig
 %post sql-mysql -p /sbin/ldconfig
@@ -2671,12 +2672,32 @@ end
 %postun tmva-gui -p /sbin/ldconfig
 %post tree -p /sbin/ldconfig
 %postun tree -p /sbin/ldconfig
+%post tree-dataframe -p /sbin/ldconfig
+%postun tree-dataframe -p /sbin/ldconfig
 %post tree-player -p /sbin/ldconfig
 %postun tree-player -p /sbin/ldconfig
 %post tree-viewer -p /sbin/ldconfig
 %postun tree-viewer -p /sbin/ldconfig
 %post unfold -p /sbin/ldconfig
 %postun unfold -p /sbin/ldconfig
+%if %{root7}
+%post graf-gpadv7 -p /sbin/ldconfig
+%postun graf-gpadv7 -p /sbin/ldconfig
+%post graf-primitives -p /sbin/ldconfig
+%postun graf-primitives -p /sbin/ldconfig
+%post gui-canvaspainter -p /sbin/ldconfig
+%postun gui-canvaspainter -p /sbin/ldconfig
+%post gui-fitpanelv7 -p /sbin/ldconfig
+%postun gui-fitpanelv7 -p /sbin/ldconfig
+%ifarch %{qt5_qtwebengine_arches}
+%post gui-qt5webdisplay -p /sbin/ldconfig
+%postun gui-qt5webdisplay -p /sbin/ldconfig
+%endif
+%post gui-webdisplay -p /sbin/ldconfig
+%postun gui-webdisplay -p /sbin/ldconfig
+%post hist-draw -p /sbin/ldconfig
+%postun hist-draw -p /sbin/ldconfig
+%endif
 
 %files
 %{_bindir}/hadd
@@ -2747,7 +2768,10 @@ end
 %{_includedir}/%{name}/RConfigure.h
 %{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
+%{_includedir}/%{name}/libc.modulemap
 %{_includedir}/%{name}/module.modulemap
+%{_includedir}/%{name}/stl.modulemap
+%{_includedir}/%{name}/modulemap.overlay.yaml
 %dir %{_includedir}/%{name}/Math
 %dir %{_includedir}/%{name}/ROOT
 %{_datadir}/aclocal/root.m4
@@ -2809,6 +2833,7 @@ end
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python2_sitearch}/libPyROOT.so
 %{python2_sitearch}/ROOT.py*
+%{python2_sitearch}/ROOT-*.dist-info
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
 
@@ -2818,36 +2843,34 @@ end
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_sitearch}/libPyROOT%{py3soabi}.so
+%{python3_sitearch}/libPyROOT.%{py3soabi}.so
 %{python3_sitearch}/ROOT.py
+%{python3_sitearch}/ROOT-*.dist-info
 %{python3_sitearch}/cppyy.py
 %{python3_sitearch}/_pythonization.py
 %{python3_sitearch}/__pycache__
 
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
+%{python2_sitearch}/JupyROOT-*.dist-info
 %{python2_sitearch}/libJupyROOT.so
 %{_datadir}/jupyter/kernels/python2-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
+%{python3_sitearch}/JupyROOT-*.dist-info
 %{python3_sitearch}/libJupyROOT.so
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
+%{python2_sitelib}/JsMVA-*.dist-info
 
 %files -n python%{python3_pkgversion}-jsmva
 %{python3_sitelib}/JsMVA
-
-%if %{ruby}
-%files ruby -f includelist-bindings-ruby
-%{_libdir}/%{name}/libRuby.*
-%{_libdir}/%{name}/libRuby_rdict.pcm
-%{ruby_vendorarchdir}/libRuby.*
-%endif
+%{python3_sitelib}/JsMVA-*.dist-info
 
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
@@ -2879,11 +2902,9 @@ end
 %{_libdir}/%{name}/libGdml.*
 %{_libdir}/%{name}/libGdml_rdict.pcm
 
-%if %{oce}
 %files geocad -f includelist-geom-geocad
 %{_libdir}/%{name}/libGeoCad.*
 %{_libdir}/%{name}/libGeoCad_rdict.pcm
-%endif
 
 %files graf -f includelist-graf2d-graf
 %{_libdir}/%{name}/libGraf.*
@@ -2965,13 +2986,15 @@ end
 %files gui -f includelist-gui-gui
 %{_libdir}/%{name}/libGui.*
 %{_libdir}/%{name}/libGui_rdict.pcm
-%{_libdir}/%{name}/libGuiHtml.*
-%{_libdir}/%{name}/libGuiHtml_rdict.pcm
 %{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C
 %{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C
 %{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C
 %{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C
 
+%files gui-html -f includelist-gui-guihtml
+%{_libdir}/%{name}/libGuiHtml.*
+%{_libdir}/%{name}/libGuiHtml_rdict.pcm
+
 %files gui-fitpanel -f includelist-gui-fitpanel
 %{_libdir}/%{name}/libFitPanel.*
 %{_libdir}/%{name}/libFitPanel_rdict.pcm
@@ -2982,32 +3005,25 @@ end
 %{_libdir}/%{name}/libGed_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C
 
-%files guibuilder -f includelist-gui-guibuilder
+%files gui-builder -f includelist-gui-guibuilder
 %{_libdir}/%{name}/libGuiBld.*
 %{_libdir}/%{name}/libGuiBld_rdict.pcm
 %{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
 %{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
 
-%files gui-qt -f includelist-gui-qt
+%files gui-qt -f includelist-gui-qtroot
 %{_libdir}/%{name}/libQtRoot.*
 %{_libdir}/%{name}/libQtRoot_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
+
+%files gui-qtgsi -f includelist-gui-qtgsi
 %{_libdir}/%{name}/libQtGSI.*
 %{_libdir}/%{name}/libQtGSI_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
 
 %files gui-recorder -f includelist-gui-recorder
 %{_libdir}/%{name}/libRecorder.*
 %{_libdir}/%{name}/libRecorder_rdict.pcm
 
-%if %{root7}
-%files gui-canvaspainter
-%{_libdir}/%{name}/libROOTCanvasPainter.*
-
-%files gui-webdisplay -f includelist-gui-webdisplay
-%{_libdir}/%{name}/libROOTWebDisplay.*
-%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
-%endif
-
 %files hbook -f includelist-hist-hbook
 %{_bindir}/g2root
 %{_bindir}/h2root
@@ -3021,12 +3037,6 @@ end
 %{_libdir}/%{name}/libHist_rdict.pcm
 %dir %{_includedir}/%{name}/v5
 
-%if %{root7}
-%files hist-draw -f includelist-hist-histdraw
-%{_libdir}/%{name}/libROOTHistDraw.*
-%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
-%endif
-
 %files hist-painter -f includelist-hist-histpainter
 %{_libdir}/%{name}/libHistPainter.*
 %{_libdir}/%{name}/libHistPainter_rdict.pcm
@@ -3095,9 +3105,11 @@ end
 %files io-xml -f includelist-io-xml
 %{_libdir}/%{name}/libXMLIO.*
 %{_libdir}/%{name}/libXMLIO_rdict.pcm
+%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
+
+%files io-xmlparser -f includelist-io-xmlparser
 %{_libdir}/%{name}/libXMLParser.*
 %{_libdir}/%{name}/libXMLParser_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C
 
 %files foam -f includelist-math-foam
 %{_libdir}/%{name}/libFoam.*
@@ -3191,6 +3203,10 @@ end
 %{_libdir}/%{name}/libUnuran_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C
 
+%files vecops -f includelist-math-vecops
+%{_libdir}/%{name}/libROOTVecOps.*
+%{_libdir}/%{name}/libROOTVecOps_rdict.pcm
+
 %files memstat -f includelist-misc-memstat
 %{_libdir}/%{name}/libMemStat.*
 %{_libdir}/%{name}/libMemStat_rdict.pcm
@@ -3205,11 +3221,9 @@ end
 %{_datadir}/%{name}/pdg_table.txt
 %doc %{_pkgdocdir}/cfortran.doc
 
-%if %{pythia8}
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
 %{_libdir}/%{name}/libEGPythia8.*
 %{_libdir}/%{name}/libEGPythia8_rdict.pcm
-%endif
 
 %files montecarlo-vmc -f includelist-montecarlo-vmc
 %{_libdir}/%{name}/libVMC.*
@@ -3266,7 +3280,10 @@ end
 %{_datadir}/%{name}/http
 %doc net/http/README.txt net/http/civetweb/*.md
 
-%if %{xrootd}
+%files net-httpsniff -f includelist-net-httpsniff
+%{_libdir}/%{name}/libRHTTPSniff.*
+%{_libdir}/%{name}/libRHTTPSniff_rdict.pcm
+
 %files netx -f includelist-netx
 %{_libdir}/%{name}/libNetx.*
 %{_libdir}/%{name}/libNetx_rdict.pcm
@@ -3275,21 +3292,24 @@ end
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
-%endif
 
 %files proof -f includelist-proof-proof
 %{_libdir}/%{name}/libProof.*
 %{_libdir}/%{name}/libProof_rdict.pcm
-%{_libdir}/%{name}/libProofDraw.*
-%{_libdir}/%{name}/libProofDraw_rdict.pcm
-%{_libdir}/%{name}/libProofPlayer.*
-%{_libdir}/%{name}/libProofPlayer_rdict.pcm
 %{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
 %{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
 %{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
 %{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
 %{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
 %{_datadir}/%{name}/plugins/TProof/P040_TProof.C
+%{_datadir}/%{name}/valgrind-root.supp
+%doc %{_pkgdocdir}/README.PROOF
+
+%files proof-player -f includelist-proof-proofplayer
+%{_libdir}/%{name}/libProofDraw.*
+%{_libdir}/%{name}/libProofDraw_rdict.pcm
+%{_libdir}/%{name}/libProofPlayer.*
+%{_libdir}/%{name}/libProofPlayer_rdict.pcm
 %{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
 %{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
@@ -3298,8 +3318,6 @@ end
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
-%{_datadir}/%{name}/valgrind-root.supp
-%doc %{_pkgdocdir}/README.PROOF
 
 %files proof-bench -f includelist-proof-proofbench
 %{_libdir}/%{name}/libProofBench.*
@@ -3317,7 +3335,6 @@ end
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
-%if %{xrootd}
 %files xproof -f includelist-proof-proofx
 %{_bindir}/proofexecv
 %{_bindir}/xproofd
@@ -3328,7 +3345,6 @@ end
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
 %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
 %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
-%endif
 
 %files roofit -f includelist-roofit
 %{_libdir}/%{name}/libRooFit.*
@@ -3363,6 +3379,12 @@ end
 %{_libdir}/%{name}/libTMVA.*
 %{_libdir}/%{name}/libTMVA_rdict.pcm
 %dir %{_includedir}/%{name}/TMVA
+%dir %{_includedir}/%{name}/TMVA/DNN
+%dir %{_includedir}/%{name}/TMVA/DNN/Architectures
+%if %{tbb}
+%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
+%endif
+%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
 %license tmva/doc/LICENSE
 
 %files tmva-python -f includelist-tmva-pymva
@@ -3382,6 +3404,10 @@ end
 %{_libdir}/%{name}/libTree_rdict.pcm
 %doc %{_pkgdocdir}/README.SELECTOR
 
+%files tree-dataframe -f includelist-tree-dataframe
+%{_libdir}/%{name}/libROOTDataFrame.*
+%{_libdir}/%{name}/libROOTDataFrame_rdict.pcm
+
 %files tree-player -f includelist-tree-treeplayer
 %{_libdir}/%{name}/libTreePlayer.*
 %{_libdir}/%{name}/libTreePlayer_rdict.pcm
@@ -3414,7 +3440,76 @@ end
 %{_bindir}/rootnb.exe
 %{_datadir}/%{name}/notebook
 
+%if %{root7}
+%files graf-gpadv7 -f includelist-graf2d-gpadv7
+%{_libdir}/%{name}/libROOTGpadv7.*
+%{_libdir}/%{name}/libROOTGpadv7_rdict.pcm
+
+%files graf-primitives -f includelist-graf2d-primitives
+%{_libdir}/%{name}/libROOTGraphicsPrimitives.*
+%{_libdir}/%{name}/libROOTGraphicsPrimitives_rdict.pcm
+
+%files gui-canvaspainter
+%{_libdir}/%{name}/libROOTCanvasPainter.*
+
+%files gui-fitpanelv7 -f includelist-gui-fitpanelv7
+%{_libdir}/%{name}/libROOTFitPanelv7.*
+%{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm
+
+%ifarch %{qt5_qtwebengine_arches}
+%files gui-qt5webdisplay
+%{_libdir}/%{name}/libROOTQt5WebDisplay.*
+%endif
+
+%files gui-webdisplay -f includelist-gui-webdisplay
+%{_libdir}/%{name}/libROOTWebDisplay.*
+%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+
+%files hist-draw -f includelist-hist-histdraw
+%{_libdir}/%{name}/libROOTHistDraw.*
+%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
+%endif
+
 %changelog
+* Sun Jul 01 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.00-1
+- Update to 6.14.00
+- Drop patches previously backported:
+  - root-doxygen-makefile.patch
+  - root-crash-fix.patch
+  - root-test-stress-32bit.patch
+- Drop patches accepted upstream:
+  - root-test-subdirs.patch
+  - root-test-fixes.patch
+  - root-out-of-bounds.patch
+  - root-doxygen-tilde.patch
+  - root-noinst.patch
+- Drop patches for issues fixed upstream:
+  - root-dont-link-jvm.patch
+  - root-system-pythia.patch
+- Drop patch root-urw-otf-hack.patch - broken font file no longer present
+- Drop Google Droid Sans Fallback font from EPEL 7 root-fonts package
+  (the font is now available in EPEL 7)
+- Use two more patches from Fedora's llvm5.0 package
+- New root-test-subdirs.patch patch for more instances of the same issue
+- Fix a test not setting cache file directory so that it works offline
+- Fix a compatibility issue with the EPEL 7 gtest version
+- Fix a missing include
+- Workaround optimization problems in the Geom library
+- New subpackages due to library splits
+  - root-tree-dataframe and root-vecops from root-tree-player
+  - root-net-httpsniff from root-net-http
+- New subpackages due to package splits
+  - root-gui-html from root-gui
+  - root-gui-qtgsi from root-gui-qt
+  - root-io-xmlparser from root-io-xml
+  - root-proof-player from root-proof
+- New ROOT 7 subpackages
+  - graf-gpadv7
+  - graf-primitives
+  - gui-fitpanelv7
+  - gui-qt5webdisplay
+- Rename root-guibuilder package to root-gui-builder
+
 * Sat Jun 30 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-5
 - Adjust Vavilov test for Fedora 29 ix86
 - Adapt to python 3.7
diff --git a/sources b/sources
index da8883b..54bccd9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.12.06.tar.xz) = 607644b5cd06fdab5e0899172156cbed92911de9d1eef2695cc79c5f41621a2d1167a6d14791c5b97c8d15dcb7d4d45952b3dcf4ffb096dc51bdeb3233b5467f
-SHA512 (root-testfiles.tar.xz) = f697afb666c1081f98cfe66fe21998c4eab86c25a3671ff71a4ac98610d70f70081d70b40029a0b788b39d87c542b5aa4e31d71f7be494f4774323ed20e9bccb
+SHA512 (root-6.14.00.tar.xz) = 0e4ed5a2a2e4c9455ffc8e44cdb1ca29876a223e8119d29cbd82abdc4b923d55b82285a941f78b82b9d0a89d972e5d56ceb3b7d61fd2efd8308c64c3e2bfd5d9
+SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2

From f7f5ed19f4a2bbe283162445994ee66ed6c88b3e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 13 Jul 2018 08:37:26 +0200
Subject: [PATCH 135/344] Add Python 3.6 packages for EPEL 7

---
 root.spec | 278 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 218 insertions(+), 60 deletions(-)

diff --git a/root.spec b/root.spec
index 8805bfa..b6dd416 100644
--- a/root.spec
+++ b/root.spec
@@ -1,4 +1,5 @@
-%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
+%global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
+%global py3_other_soabi %([ -x %{__python3_other} ] && %{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
 %if %{?fedora}%{!?fedora:0} >= 24
 # libhdfs is available for all architectures for Fedora 24 and later.
@@ -28,12 +29,12 @@
 
 # Do not generate autoprovides for libJupyROOT.so
 # Note: the ones from libPyROOT.so we do want though
-%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
+%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}|%{python3_other_sitearch})/libJupyROOT\\.so$
 
 Name:		root
 Version:	6.14.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -150,12 +151,13 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	postgresql-devel
-BuildRequires:	python-devel
+BuildRequires:	python2-devel
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	python3-devel
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	python34-devel
+BuildRequires:	python36-devel
 %endif
 BuildRequires:	qt4-devel
 %if %{root7}
@@ -321,13 +323,15 @@ Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		Fonts
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
@@ -414,8 +418,8 @@ transparent interface.
 
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
-Provides:	root-python = %{version}-%{release}
-Obsoletes:	root-python < 6.08.00
+Provides:	%{name}-python = %{version}-%{release}
+Obsoletes:	%{name}-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -424,18 +428,6 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
-%package -n python%{python3_pkgversion}-%{name}
-Summary:	Python extension for ROOT
-Provides:	root-python%{python3_pkgversion} = %{version}-%{release}
-Obsoletes:	root-python%{python3_pkgversion} < 6.08.00
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description -n python%{python3_pkgversion}-%{name}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
 Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
@@ -456,6 +448,26 @@ Obsoletes:	%{name}-rootaas < 6.08.00
 %description -n python2-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
+%package -n python2-jsmva
+Summary:	TMVA interface used by JupyROOT
+BuildArch:	noarch
+Requires:	%{name}-tmva = %{version}-%{release}
+
+%description -n python2-jsmva
+TMVA interface used by JupyROOT.
+
+%package -n python%{python3_pkgversion}-%{name}
+Summary:	Python extension for ROOT
+Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
+Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description -n python%{python3_pkgversion}-%{name}
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
@@ -475,14 +487,6 @@ Requires:	python-jupyter-filesystem
 %description -n python%{python3_pkgversion}-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
-%package -n python2-jsmva
-Summary:	TMVA interface used by JupyROOT
-BuildArch:	noarch
-Requires:	%{name}-tmva = %{version}-%{release}
-
-%description -n python2-jsmva
-TMVA interface used by JupyROOT.
-
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
@@ -491,6 +495,37 @@ Requires:	%{name}-tmva = %{version}-%{release}
 %description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
+%if %{?rhel}%{!?rhel:0} == 7
+%package -n python%{python3_other_pkgversion}-%{name}
+Summary:	Python extension for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description -n python%{python3_other_pkgversion}-%{name}
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+
+%package -n python%{python3_other_pkgversion}-jupyroot
+Summary:	ROOT Jupyter kernel
+Requires:	python%{python3_other_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
+Requires:	python%{python3_other_pkgversion}-jsmva = %{version}-%{release}
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-notebook = %{version}-%{release}
+#		python-metakernel not available - some functionality missing
+
+%description -n python%{python3_other_pkgversion}-jupyroot
+The Jupyter kernel for the ROOT notebook.
+
+%package -n python%{python3_other_pkgversion}-jsmva
+Summary:	TMVA interface used by JupyROOT
+BuildArch:	noarch
+Requires:	%{name}-tmva = %{version}-%{release}
+
+%description -n python%{python3_other_pkgversion}-jsmva
+TMVA interface used by JupyROOT.
+%endif
+
 %package r
 Summary:	R interface for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1792,6 +1827,9 @@ sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
 # Build PyROOT for python 3
 cp -pr bindings/pyroot bindings/python
+%if %{?rhel}%{!?rhel:0} == 7
+cp -pr bindings/pyroot bindings/python3oth
+%endif
 
 # Work around missing libraries in Fedora's gmock packaging < 1.8.0
 if [ ! -r %{_libdir}/libgmock.so ] ; then
@@ -1978,6 +2016,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 
 # Build PyROOT for python 3 (prep)
 cp -pr bindings/pyroot bindings/python
+%if %{?rhel}%{!?rhel:0} == 7
+cp -pr bindings/pyroot bindings/python3oth
+%endif
 
 make %{?_smp_mflags}
 
@@ -1998,6 +2039,24 @@ sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
 make %{?_smp_mflags} -f bindings/python/Makefile PyROOT JupyROOT
 mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
 
+%if %{?rhel}%{!?rhel:0} == 7
+mkdir python3oth
+mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
+sed 's!bindings/pyroot!bindings/python3oth!g' CMakeFiles/Makefile2.save \
+    > CMakeFiles/Makefile2
+py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
+py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
+py3i=`pkg-config --cflags-only-I python-%{python3_other_version} | sed -e 's/-I//' -e 's/\s*$//'`
+py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
+sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3_other},g' \
+    -e 's,lib/libPyROOT,python3oth/libPyROOT,g' \
+    -e 's,lib/libJupyROOT,python3oth/libJupyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python3oth!g' -i `find bindings/python3oth -type f`
+make %{?_smp_mflags} -f bindings/python3oth/Makefile PyROOT JupyROOT
+mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+%endif
+
 popd
 
 %install
@@ -2066,6 +2125,11 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
 mkdir -p %{buildroot}%{python2_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
+# Create empty .dist-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
+
 tmpdir=`mktemp -d`
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
@@ -2076,7 +2140,7 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python/cmake_install.cmake
 
 mkdir -p %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3soabi}.so
+   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
 mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
@@ -2093,14 +2157,39 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
 rm -rf $tmpdir
 
 # Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
-
 touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
 touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
 touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
 
+%if %{?rhel}%{!?rhel:0} == 7
+tmpdir=`mktemp -d`
+
+DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3oth/cmake_install.cmake
+
+mkdir -p %{buildroot}%{python3_other_sitearch}
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
+   %{buildroot}%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
+mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
+   %{buildroot}%{python3_other_sitearch}/libJupyROOT.so
+mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_other_sitearch}
+mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_other_sitearch}
+rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
+rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
+mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_other_sitearch}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
+
+mkdir -p %{buildroot}%{python3_other_sitelib}
+mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_other_sitelib}
+
+rm -rf $tmpdir
+
+# Create empty .dist-info files so that rpm auto-generates provides
+touch %{buildroot}%{python3_other_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python3_other_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.dist-info
+%endif
+
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
@@ -2114,6 +2203,13 @@ cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
 sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
 
+%if %{?rhel}%{!?rhel:0} == 7
+cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
+   %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
+sed -e 's/ROOT C++/& (Python %{python3_other_version})/' -e 's!python!%{__python3_other}!' \
+    -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot/kernel.json
+%endif
+
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/kernels
@@ -2408,7 +2504,7 @@ fi
 /sbin/ldconfig
 
 %preun -n python2-%{name}
-if [ $1 = 0 ]; then
+if [ $1 = 0 ] ; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python2_sitearch}/libPyROOT.so
 fi
@@ -2430,20 +2526,25 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
 	-i /var/lib/alternatives/libPyROOT.so
     for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3soabi}.so" ] ; then
+%if %{?rhel}%{!?rhel:0} == 7
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] && \
+	   [ "$alt" != "%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so" ] ; then
+%else
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] ; then
+%endif
 	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
 	fi
     done
 fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so 10
 /sbin/ldconfig
 
 %preun -n python%{python3_pkgversion}-%{name}
-if [ $1 = 0 ]; then
+if [ $1 = 0 ] ; then
     %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so
+	libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
 fi
 
 %postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig
@@ -2453,9 +2554,37 @@ fi
 # for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so 10
 /sbin/ldconfig
 
+%if %{?rhel}%{!?rhel:0} == 7
+%post -n python%{python3_other_pkgversion}-%{name}
+if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
+	/var/lib/alternatives/libPyROOT.so || \
+    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
+	-i /var/lib/alternatives/libPyROOT.so
+    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
+	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] && \
+	   [ "$alt" != "%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so" ] ; then
+	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
+	fi
+    done
+fi
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{version} \
+    libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5
+/sbin/ldconfig
+
+%preun -n python%{python3_other_pkgversion}-%{name}
+if [ $1 = 0 ] ; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
+fi
+
+%postun -n python%{python3_other_pkgversion}-%{name} -p /sbin/ldconfig
+%endif
+
 %post notebook
 mkdir -p /etc/jupyter
 if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
@@ -2837,19 +2966,6 @@ end
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
 
-%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_sitearch}/libPyROOT.%{py3soabi}.so
-%{python3_sitearch}/ROOT.py
-%{python3_sitearch}/ROOT-*.dist-info
-%{python3_sitearch}/cppyy.py
-%{python3_sitearch}/_pythonization.py
-%{python3_sitearch}/__pycache__
-
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
 %{python2_sitearch}/JupyROOT-*.dist-info
@@ -2857,6 +2973,23 @@ end
 %{_datadir}/jupyter/kernels/python2-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
+%files -n python2-jsmva
+%{python2_sitelib}/JsMVA
+%{python2_sitelib}/JsMVA-*.dist-info
+
+%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
+%{python3_sitearch}/ROOT.py
+%{python3_sitearch}/ROOT-*.dist-info
+%{python3_sitearch}/cppyy.py
+%{python3_sitearch}/_pythonization.py
+%{python3_sitearch}/__pycache__
+
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
 %{python3_sitearch}/JupyROOT-*.dist-info
@@ -2864,14 +2997,36 @@ end
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
-%files -n python2-jsmva
-%{python2_sitelib}/JsMVA
-%{python2_sitelib}/JsMVA-*.dist-info
-
 %files -n python%{python3_pkgversion}-jsmva
 %{python3_sitelib}/JsMVA
 %{python3_sitelib}/JsMVA-*.dist-info
 
+%if %{?rhel}%{!?rhel:0} == 7
+%files -n python%{python3_other_pkgversion}-%{name} -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
+%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
+%{python3_other_sitearch}/ROOT.py
+%{python3_other_sitearch}/ROOT-*.dist-info
+%{python3_other_sitearch}/cppyy.py
+%{python3_other_sitearch}/_pythonization.py
+%{python3_other_sitearch}/__pycache__
+
+%files -n python%{python3_other_pkgversion}-jupyroot
+%{python3_other_sitearch}/JupyROOT
+%{python3_other_sitearch}/JupyROOT-*.dist-info
+%{python3_other_sitearch}/libJupyROOT.so
+%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
+%doc bindings/pyroot/JupyROOT/README.md
+
+%files -n python%{python3_other_pkgversion}-jsmva
+%{python3_other_sitelib}/JsMVA
+%{python3_other_sitelib}/JsMVA-*.dist-info
+%endif
+
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
 %{_libdir}/%{name}/libRInterface_rdict.pcm
@@ -3305,6 +3460,11 @@ end
 %{_datadir}/%{name}/valgrind-root.supp
 %doc %{_pkgdocdir}/README.PROOF
 
+%files proof-bench -f includelist-proof-proofbench
+%{_libdir}/%{name}/libProofBench.*
+%{_libdir}/%{name}/libProofBench_rdict.pcm
+%{_datadir}/%{name}/proof
+
 %files proof-player -f includelist-proof-proofplayer
 %{_libdir}/%{name}/libProofDraw.*
 %{_libdir}/%{name}/libProofDraw_rdict.pcm
@@ -3319,11 +3479,6 @@ end
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
 
-%files proof-bench -f includelist-proof-proofbench
-%{_libdir}/%{name}/libProofBench.*
-%{_libdir}/%{name}/libProofBench_rdict.pcm
-%{_datadir}/%{name}/proof
-
 %files proof-pq2
 %{_bindir}/pq2*
 %{_mandir}/man1/pq2*.1*
@@ -3471,6 +3626,9 @@ end
 %endif
 
 %changelog
+* Thu Jul 12 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.00-2
+- Add Python 3.6 packages for EPEL 7
+
 * Sun Jul 01 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.00-1
 - Update to 6.14.00
 - Drop patches previously backported:

From 5fdda1fe15a31940c7d59782a277b7ac9713d002 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 03:40:58 +0000
Subject: [PATCH 136/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b6dd416..d10cb2c 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.14.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3626,6 +3626,9 @@ end
 %endif
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.00-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Jul 12 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.00-2
 - Add Python 3.6 packages for EPEL 7
 

From a085075a005ab51b2325a8d65e1a104faf11dda3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 7 Aug 2018 06:08:54 +0200
Subject: [PATCH 137/344] Update to 6.14.02 Make python3 the preferred python
 for Fedora 29+:   Give python3 libPyROOT higher priority than python2
 libPyROOT   The python scripts in root-cli use python3-root   Let
 root-tmva-python use python3-numpy Fix build issue with undefined symbols in
 libSrvAuth Make ROOTConfig-targets.cmake not error on missing files to work
 better with   subpackages

---
 root-crypto.patch |  36 ++++++++
 root.spec         | 211 ++++++++++++++++++++++++++++++++++++++++------
 sources           |   2 +-
 3 files changed, 223 insertions(+), 26 deletions(-)
 create mode 100644 root-crypto.patch

diff --git a/root-crypto.patch b/root-crypto.patch
new file mode 100644
index 0000000..82462c8
--- /dev/null
+++ b/root-crypto.patch
@@ -0,0 +1,36 @@
+From 40ffee7443df59a9702be993839fe6d7c3a6c1f1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 3 Aug 2018 11:05:24 +0200
+Subject: [PATCH] Add missing libcrypto for undefined references
+
+---
+ net/rootd/CMakeLists.txt    | 3 ++-
+ net/rpdutils/CMakeLists.txt | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/net/rootd/CMakeLists.txt b/net/rootd/CMakeLists.txt
+index 67d1cd05f1b..bc49e5611f7 100644
+--- a/net/rootd/CMakeLists.txt
++++ b/net/rootd/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ ############################################################################
+ 
+ ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
+-  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES})
++  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
++  BUILTINS OPENSSL)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../rpdutils/res)
+diff --git a/net/rpdutils/CMakeLists.txt b/net/rpdutils/CMakeLists.txt
+index 6a66e4aee7f..ac427424193 100644
+--- a/net/rpdutils/CMakeLists.txt
++++ b/net/rpdutils/CMakeLists.txt
+@@ -40,5 +40,6 @@ set_property(TARGET rpdutil PROPERTY POSITION_INDEPENDENT_CODE ON)
+ add_dependencies(rpdutil move_headers)
+ 
+ ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx
+-                    LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} DEPENDENCIES Net)
+-
++  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
++  DEPENDENCIES Net
++  BUILTINS OPENSSL)
diff --git a/root.spec b/root.spec
index d10cb2c..0b95eee 100644
--- a/root.spec
+++ b/root.spec
@@ -1,3 +1,15 @@
+%if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8
+%global py3default 1
+%global py2prio 10
+%global py3prio 20
+%global __pythondef %{__python3}
+%else
+%global py3default 0
+%global py2prio 20
+%global py3prio 10
+%global __pythondef %{__python2}
+%endif
+
 %global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 %global py3_other_soabi %([ -x %{__python3_other} ] && %{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
@@ -29,12 +41,12 @@
 
 # Do not generate autoprovides for libJupyROOT.so
 # Note: the ones from libPyROOT.so we do want though
-%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}|%{python3_other_sitearch})/libJupyROOT\\.so$
+%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.14.00
+Version:	6.14.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -104,6 +116,9 @@ Patch17:	%{name}-test-compilatiom-epel7.patch
 Patch18:	%{name}-missing-header.patch
 #		Optimization issue in Geom library
 Patch19:	%{name}-ix32-geom-opt.patch
+#		Missing libcrypto dependency for libSrvAuth
+#		https://github.com/root-project/root/pull/2436
+Patch20:	%{name}-crypto.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -198,7 +213,11 @@ BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
 BuildRequires:	blas-devel
-BuildRequires:	numpy
+%if %{py3default}
+BuildRequires:	python3-numpy
+%else
+BuildRequires:	python2-numpy
+%endif
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
@@ -1576,6 +1595,11 @@ Summary:	Toolkit for multivariate data analysis (Python)
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+%if %{py3default}
+Requires:	python3-numpy
+%else
+Requires:	python2-numpy
+%endif
 
 %description tmva-python
 Python integration with TMVA.
@@ -1676,7 +1700,11 @@ An algorithm to unfold distributions from detector to truth level.
 %package cli
 Summary:	ROOT command line utilities
 BuildArch:	noarch
+%if %{py3default}
+Requires:	python3-%{name} = %{version}-%{release}
+%else
 Requires:	python2-%{name} = %{version}-%{release}
+%endif
 
 %description cli
 The ROOT command line utilities is a set of scripts for common tasks
@@ -1782,6 +1810,7 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1825,9 +1854,15 @@ chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
+%if %{py3default}
+# Build PyROOT for python 2
+cp -pr bindings/pyroot bindings/python2
+%else
 # Build PyROOT for python 3
-cp -pr bindings/pyroot bindings/python
+cp -pr bindings/pyroot bindings/python3
+%endif
 %if %{?rhel}%{!?rhel:0} == 7
+# Build PyROOT for python 3.6
 cp -pr bindings/pyroot bindings/python3oth
 %endif
 
@@ -1966,7 +2001,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dpythia6:BOOL=OFF \
        -Dpythia8:BOOL=ON \
        -Dpython:BOOL=ON \
-       -DPYTHON_EXECUTABLE:PATH=%{__python2} \
+       -DPYTHON_EXECUTABLE:PATH=%{__pythondef} \
        -Dqt:BOOL=ON \
        -Dqtgsi:BOOL=ON \
 %ifarch %{qt5_qtwebengine_arches}
@@ -2014,18 +2049,46 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Drootbench:BOOL=OFF \
        ..
 
+%if %{py3default}
+# Build PyROOT for python 2 (prep)
+cp -pr bindings/pyroot bindings/python2
+%else
 # Build PyROOT for python 3 (prep)
-cp -pr bindings/pyroot bindings/python
+cp -pr bindings/pyroot bindings/python3
+%endif
 %if %{?rhel}%{!?rhel:0} == 7
+# Build PyROOT for python 3.6 (prep)
 cp -pr bindings/pyroot bindings/python3oth
 %endif
 
 make %{?_smp_mflags}
 
-# Build PyROOT for python 3
-mkdir python
+%if %{py3default}
+
+# Build PyROOT for python 2
+mkdir python2
 mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python!g' CMakeFiles/Makefile2.save \
+sed 's!bindings/pyroot!bindings/python2!g' CMakeFiles/Makefile2.save \
+    > CMakeFiles/Makefile2
+py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
+py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
+py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+sed -e "s,${py3i},${py2i},g" -e "s,-l${py3l},-l${py2l},g" \
+    -e "s,lib${py3l},lib${py2l},g" -e 's,%{__python3},%{__python2},g' \
+    -e 's,lib/libPyROOT,python2/libPyROOT,g' \
+    -e 's,lib/libJupyROOT,python2/libJupyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python2!g' \
+    -i `find bindings/python2 -type f`
+make %{?_smp_mflags} -f bindings/python2/Makefile PyROOT JupyROOT
+mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+
+%else
+
+# Build PyROOT for python 3
+mkdir python3
+mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
+sed 's!bindings/pyroot!bindings/python3!g' CMakeFiles/Makefile2.save \
     > CMakeFiles/Makefile2
 py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
 py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
@@ -2033,13 +2096,18 @@ py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
 py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
     -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3},g' \
-    -e 's,lib/libPyROOT,python/libPyROOT,g' \
-    -e 's,lib/libJupyROOT,python/libJupyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f`
-make %{?_smp_mflags} -f bindings/python/Makefile PyROOT JupyROOT
+    -e 's,lib/libPyROOT,python3/libPyROOT,g' \
+    -e 's,lib/libJupyROOT,python3/libJupyROOT,g' \
+    -e 's!bindings/pyroot!bindings/python3!g' \
+    -i `find bindings/python3 -type f`
+make %{?_smp_mflags} -f bindings/python3/Makefile PyROOT JupyROOT
 mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
 
+%endif
+
 %if %{?rhel}%{!?rhel:0} == 7
+
+# Build PyROOT for python 3.6
 mkdir python3oth
 mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
 sed 's!bindings/pyroot!bindings/python3oth!g' CMakeFiles/Makefile2.save \
@@ -2052,9 +2120,11 @@ sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
     -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3_other},g' \
     -e 's,lib/libPyROOT,python3oth/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python3oth/libJupyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python3oth!g' -i `find bindings/python3oth -type f`
+    -e 's!bindings/pyroot!bindings/python3oth!g' \
+    -i `find bindings/python3oth -type f`
 make %{?_smp_mflags} -f bindings/python3oth/Makefile PyROOT JupyROOT
 mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
+
 %endif
 
 popd
@@ -2109,6 +2179,66 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
 
+%if %{py3default}
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
+%endif
+
+%if %{py3default}
+
+# Move the python modules to sitearch/sitelib
+mkdir -p %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
+mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libJupyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
+rm %{buildroot}%{_libdir}/%{name}/JupyROOT/README.md
+rm -rf %{buildroot}%{_libdir}/%{name}/JupyROOT/src
+mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
+
+mkdir -p %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
+
+# Create empty .dist-info files so that rpm auto-generates provides
+touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
+
+tmpdir=`mktemp -d`
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+DESTDIR=$tmpdir cmake -P builddir/bindings/python2/cmake_install.cmake
+%else
+DESTDIR=$tmpdir cmake3 -P builddir/bindings/python2/cmake_install.cmake
+%endif
+
+mkdir -p %{buildroot}%{python2_sitearch}
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libPyROOT.so
+mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libJupyROOT.so
+mv $tmpdir%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
+rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
+rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
+mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
+rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
+
+mkdir -p %{buildroot}%{python2_sitelib}
+mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
+
+rm -rf $tmpdir
+
+# Create empty .dist-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
+
+%else
+
 # Move the python modules to sitearch/sitelib
 mkdir -p %{buildroot}%{python2_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
@@ -2133,9 +2263,9 @@ touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
 tmpdir=`mktemp -d`
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-DESTDIR=$tmpdir cmake -P builddir/bindings/python/cmake_install.cmake
+DESTDIR=$tmpdir cmake -P builddir/bindings/python3/cmake_install.cmake
 %else
-DESTDIR=$tmpdir cmake3 -P builddir/bindings/python/cmake_install.cmake
+DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3/cmake_install.cmake
 %endif
 
 mkdir -p %{buildroot}%{python3_sitearch}
@@ -2161,7 +2291,10 @@ touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
 touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
 touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
 
+%endif
+
 %if %{?rhel}%{!?rhel:0} == 7
+
 tmpdir=`mktemp -d`
 
 DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3oth/cmake_install.cmake
@@ -2188,6 +2321,7 @@ rm -rf $tmpdir
 touch %{buildroot}%{python3_other_sitearch}/ROOT-%{version}.dist-info
 touch %{buildroot}%{python3_other_sitearch}/JupyROOT-%{version}.dist-info
 touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.dist-info
+
 %endif
 
 # Put jupyter stuff in the right places
@@ -2236,6 +2370,7 @@ mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
+    -e 's!/usr/bin/env python3!%{__python3}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2249,12 +2384,13 @@ sed -e 's!/usr/bin/env python2!%{__python2}!' \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
+    -e 's!/usr/bin/env python3!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e '/^\#!/d' \
     -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \
        %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \
        %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
-sed -e 's!/usr/bin/env python!%{__python2}!' \
+sed -e 's!/usr/bin/env python!%{__pythondef}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
@@ -2336,6 +2472,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo %{_libdir}/%{name} > \
      %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
+# Make ROOTConfig-targets.cmake not error on missing files to work better with
+# subpackages
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+%global pkgmgr dnf
+%else
+%global pkgmgr yum
+%endif
+sed -e '/FATAL.*import/i\      message(WARNING "The imported target \\"\${target}\\" references the file\
+   \\"\${file}\\"\
+but this file does not exist.  If this target is used you need to install the package that provides this file\
+   %{pkgmgr} install \${file}\
+If this target is not used this warning can be ignored.")' \
+    -e '/FATAL.*import/,/)/d' \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+
 # Rename to avoid name clashes
 cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
 cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
@@ -2349,7 +2500,7 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
     LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
     PYTHONPATH=${PWD}/../../builddir/lib \
-    %{__python2} ../../tutorials/pyroot/hsimple.py
+    %{__pythondef} ../../tutorials/pyroot/hsimple.py
 ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
     LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
@@ -2500,7 +2651,7 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
 fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python2_sitearch}/libPyROOT.so 20
+    libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
 /sbin/ldconfig
 
 %preun -n python2-%{name}
@@ -2516,7 +2667,7 @@ fi
 # for python2-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python2_sitearch}/libPyROOT.so 20
+    libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
 /sbin/ldconfig
 
 %post -n python%{python3_pkgversion}-%{name}
@@ -2538,7 +2689,7 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
 fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
 /sbin/ldconfig
 
 %preun -n python%{python3_pkgversion}-%{name}
@@ -2554,7 +2705,7 @@ fi
 # for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so 10
+    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
 /sbin/ldconfig
 
 %if %{?rhel}%{!?rhel:0} == 7
@@ -2988,7 +3139,7 @@ end
 %{python3_sitearch}/ROOT-*.dist-info
 %{python3_sitearch}/cppyy.py
 %{python3_sitearch}/_pythonization.py
-%{python3_sitearch}/__pycache__
+%{python3_sitearch}/__pycache__/*
 
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
@@ -3013,7 +3164,7 @@ end
 %{python3_other_sitearch}/ROOT-*.dist-info
 %{python3_other_sitearch}/cppyy.py
 %{python3_other_sitearch}/_pythonization.py
-%{python3_other_sitearch}/__pycache__
+%{python3_other_sitearch}/__pycache__/*
 
 %files -n python%{python3_other_pkgversion}-jupyroot
 %{python3_other_sitearch}/JupyROOT
@@ -3626,6 +3777,16 @@ end
 %endif
 
 %changelog
+* Mon Aug 06 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.02-1
+- Update to 6.14.02
+- Make python3 the preferred python for Fedora 29+:
+  - Give python3 libPyROOT higher priority than python2 libPyROOT
+  - The python scripts in root-cli use python3-root
+  - Let root-tmva-python use python3-numpy
+- Fix build issue with undefined symbols in libSrvAuth
+- Make ROOTConfig-targets.cmake not error on missing files to work better with
+  subpackages
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 54bccd9..244dced 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.14.00.tar.xz) = 0e4ed5a2a2e4c9455ffc8e44cdb1ca29876a223e8119d29cbd82abdc4b923d55b82285a941f78b82b9d0a89d972e5d56ceb3b7d61fd2efd8308c64c3e2bfd5d9
+SHA512 (root-6.14.02.tar.xz) = 64297c648c759162f1c6c67af7fba458018504c8f1780863f0a83160df07bfa1ec396c7bd638ac195743aa5a51525ff3393fa2933509f9654087d7970972984f
 SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2

From a82a9895cd9676f0c3d85b959d74bd23dab29729 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Thu, 23 Aug 2018 14:07:11 +0200
Subject: [PATCH 138/344] - Rebuilt for glew 2.1.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0b95eee..7dabca5 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3777,6 +3777,9 @@ end
 %endif
 
 %changelog
+* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 6.14.02-2
+- Rebuilt for glew 2.1.0
+
 * Mon Aug 06 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.02-1
 - Update to 6.14.02
 - Make python3 the preferred python for Fedora 29+:

From ffdeed00110e6a74dbb4aad492dad6b2503c7909 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 25 Aug 2018 16:41:42 +0200
Subject: [PATCH 139/344] Update to 6.14.04 Drop patch accepted upstream:
 root-python-3.7.patch

---
 root-dont-install-minicern.patch              | 13 +++++
 root-python-3.7.patch                         | 52 -------------------
 ...patch => root-test-compilation-epel7.patch |  0
 root.spec                                     | 15 +++---
 sources                                       |  2 +-
 5 files changed, 23 insertions(+), 59 deletions(-)
 create mode 100644 root-dont-install-minicern.patch
 delete mode 100644 root-python-3.7.patch
 rename root-test-compilatiom-epel7.patch => root-test-compilation-epel7.patch (100%)

diff --git a/root-dont-install-minicern.patch b/root-dont-install-minicern.patch
new file mode 100644
index 0000000..aa33081
--- /dev/null
+++ b/root-dont-install-minicern.patch
@@ -0,0 +1,13 @@
+diff --git a/misc/minicern/CMakeLists.txt b/misc/minicern/CMakeLists.txt
+index bae895f701..8d721f97ab 100644
+--- a/misc/minicern/CMakeLists.txt
++++ b/misc/minicern/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # CMakeLists.txt file for building ROOT misc/minicern package
+ ############################################################################
+ 
+-ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC)
++ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL)
+ set_property(TARGET minicern PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
+ 
diff --git a/root-python-3.7.patch b/root-python-3.7.patch
deleted file mode 100644
index 873cade..0000000
--- a/root-python-3.7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3de0685b5da3c8d2025be06d4397a24feaaced2e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 30 Jun 2018 21:27:57 +0200
-Subject: [PATCH] Fixes for Python 3.7
-
----
- bindings/pyroot/src/PyRootType.cxx         | 2 +-
- bindings/pyroot/src/Pythonize.cxx          | 4 +---
- bindings/pyroot/src/TPyROOTApplication.cxx | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/bindings/pyroot/src/PyRootType.cxx b/bindings/pyroot/src/PyRootType.cxx
-index 3c2719cb2f8..0edc2e8773e 100644
---- a/bindings/pyroot/src/PyRootType.cxx
-+++ b/bindings/pyroot/src/PyRootType.cxx
-@@ -100,7 +100,7 @@ namespace {
-             if ( ! attr && ! PyRootType_CheckExact( pyclass ) && PyType_Check( pyclass ) ) {
-                PyErr_Clear();
-                PyObject* pycppname = PyObject_GetAttr( pyclass, PyStrings::gCppName );
--               char* cppname = PyROOT_PyUnicode_AsString(pycppname);
-+               const char* cppname = PyROOT_PyUnicode_AsString(pycppname);
-                Py_DECREF(pycppname);
-                Cppyy::TCppScope_t scope = Cppyy::GetScope( cppname );
-                TClass* klass = TClass::GetClass( cppname );
-diff --git a/bindings/pyroot/src/Pythonize.cxx b/bindings/pyroot/src/Pythonize.cxx
-index 0c4817217f1..9386730517a 100644
---- a/bindings/pyroot/src/Pythonize.cxx
-+++ b/bindings/pyroot/src/Pythonize.cxx
-@@ -976,9 +976,7 @@ namespace {
-       vi->vi_len = vi->vi_pos = 0;
-       vi->vi_len = PySequence_Size( v );
- 
--#ifndef R__WIN32 // prevent error LNK2001: unresolved external symbol __PyGC_generation0
--      _PyObject_GC_TRACK( vi );
--#endif
-+      PyObject_GC_Track( vi );
-       return (PyObject*)vi;
-    }
- 
-diff --git a/bindings/pyroot/src/TPyROOTApplication.cxx b/bindings/pyroot/src/TPyROOTApplication.cxx
-index 4f624a762f3..c47596e3830 100644
---- a/bindings/pyroot/src/TPyROOTApplication.cxx
-+++ b/bindings/pyroot/src/TPyROOTApplication.cxx
-@@ -98,7 +98,7 @@ Bool_t PyROOT::TPyROOTApplication::CreatePyROOTApplication( Bool_t bLoadLibs )
-       if ( argl && 0 < PyList_Size( argl ) ) argc = (int)PyList_GET_SIZE( argl );
-       char** argv = new char*[ argc ];
-       for ( int i = 1; i < argc; ++i ) {
--         char* argi = PyROOT_PyUnicode_AsString( PyList_GET_ITEM( argl, i ) );
-+         char* argi = const_cast< char* >( PyROOT_PyUnicode_AsString( PyList_GET_ITEM( argl, i ) ) );
-          if ( strcmp( argi, "-" ) == 0 || strcmp( argi, "--" ) == 0 ) {
-          // stop collecting options, the remaining are for the python script
-             argc = i;    // includes program name
diff --git a/root-test-compilatiom-epel7.patch b/root-test-compilation-epel7.patch
similarity index 100%
rename from root-test-compilatiom-epel7.patch
rename to root-test-compilation-epel7.patch
diff --git a/root.spec b/root.spec
index 7dabca5..a7ee692 100644
--- a/root.spec
+++ b/root.spec
@@ -44,9 +44,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.14.02
+Version:	6.14.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -102,15 +102,14 @@ Patch13:	%{name}-stressgraphics-ref.patch
 #		Adjust Vavilov test for Fedora 29 ix86
 #		https://github.com/root-project/root/pull/2273
 Patch14:	%{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
-#		Adapt to python 3.7
-#		https://github.com/root-project/root/pull/2276
-Patch15:	%{name}-python-3.7.patch
+#		Don't install minicern static library
+Patch15:	%{name}-dont-install-minicern.patch
 #		Set Cache File Dir
 #		https://github.com/root-project/root/pull/2246
 Patch16:	%{name}-set-cache-file-dir.patch
 #		Fix test compilation on EPEL 7
 #		https://github.com/root-project/root/pull/2263
-Patch17:	%{name}-test-compilatiom-epel7.patch
+Patch17:	%{name}-test-compilation-epel7.patch
 #		Missing include for std::shuffle
 #		https://github.com/root-project/root/pull/2267
 Patch18:	%{name}-missing-header.patch
@@ -3777,6 +3776,10 @@ end
 %endif
 
 %changelog
+* Fri Aug 24 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.04-1
+- Update to 6.14.04
+- Drop patch accepted upstream: root-python-3.7.patch
+
 * Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 6.14.02-2
 - Rebuilt for glew 2.1.0
 
diff --git a/sources b/sources
index 244dced..b4a761b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.14.02.tar.xz) = 64297c648c759162f1c6c67af7fba458018504c8f1780863f0a83160df07bfa1ec396c7bd638ac195743aa5a51525ff3393fa2933509f9654087d7970972984f
+SHA512 (root-6.14.04.tar.xz) = 02163e1eb003613ce245b232eb11e491b91367fa61ead224fc7f4cecd3f04acaaa6e53ff526f26cfee3e4a5f0f32a9bf683e8ab648bc3e6fb5eda8d9d9756def
 SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2

From e5c18339e276ef906462dc58aa0c730e67430747 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 6 Sep 2018 10:22:35 +0200
Subject: [PATCH 140/344] BuildRequires: s/postgresql-devel/libpq-devel/

That's because we moved libpq.so.5 into libpq package.

Related: rhbz#1618698, rhbz#1623764
---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index a7ee692..3b09385 100644
--- a/root.spec
+++ b/root.spec
@@ -164,7 +164,7 @@ BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
-BuildRequires:	postgresql-devel
+BuildRequires:	libpq-devel
 BuildRequires:	python2-devel
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	python3-devel

From 6538cd10afcac2029c1a2ba1b274dbda3cbb8107 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Sat, 13 Oct 2018 13:10:23 -0600
Subject: [PATCH 141/344] Rebuild for tbb-2019_U1.

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 3b09385..f98c964 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3776,6 +3776,9 @@ end
 %endif
 
 %changelog
+* Sat Oct 13 2018 Jerry James <loganjerry@gmail.com> - 6.14.04-2
+- Rebuild for tbb 2019_U1
+
 * Fri Aug 24 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.04-1
 - Update to 6.14.04
 - Drop patch accepted upstream: root-python-3.7.patch

From 685c7a10197da39284ae207225f4cf1d107f17da Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 26 Oct 2018 09:25:24 +0200
Subject: [PATCH 142/344] Fix crash in TBrowser when root-gui-html is not
 installed Use empty .egg-info files instead of empty .dist-info files to make
   virtualenv happy Add Requires on root-mathmore to root-mathcore (for
 default integrator)

---
 root-TGHtmlBrowser-crash.patch | 63 +++++++++++++++++++++++++++
 root.spec                      | 79 +++++++++++++++++++++-------------
 2 files changed, 111 insertions(+), 31 deletions(-)
 create mode 100644 root-TGHtmlBrowser-crash.patch

diff --git a/root-TGHtmlBrowser-crash.patch b/root-TGHtmlBrowser-crash.patch
new file mode 100644
index 0000000..5cd8c6b
--- /dev/null
+++ b/root-TGHtmlBrowser-crash.patch
@@ -0,0 +1,63 @@
+From 961e9457ce3a9f6641819ceab61ce55b147d2fe5 Mon Sep 17 00:00:00 2001
+From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
+Date: Fri, 21 Sep 2018 11:10:07 +0200
+Subject: [PATCH] Fix Jira issue #ROOT-9640 Segmentation violation after
+ starting TBrowser b
+
+Only connect/disconnect TGHtmlBrowser signals when it is present
+---
+ gui/gui/src/TGFileBrowser.cxx | 8 +++++---
+ gui/gui/src/TRootBrowser.cxx  | 4 ++++
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/gui/gui/src/TGFileBrowser.cxx b/gui/gui/src/TGFileBrowser.cxx
+index 3f6ce23b60..17b13bacaf 100644
+--- a/gui/gui/src/TGFileBrowser.cxx
++++ b/gui/gui/src/TGFileBrowser.cxx
+@@ -232,8 +232,9 @@ void TGFileBrowser::CreateBrowser()
+ 
+    fDblClick = kFALSE;
+ 
+-   TQObject::Connect("TGHtmlBrowser", "Clicked(char*)",
+-                     "TGFileBrowser", this, "Selected(char*)");
++   if (TClass::GetClass("TGHtmlBrowser"))
++      TQObject::Connect("TGHtmlBrowser", "Clicked(char*)",
++                        "TGFileBrowser", this, "Selected(char*)");
+ 
+    TQObject::Connect("TPad", "Modified()",
+                      "TGFileBrowser", this, "PadModified()");
+@@ -249,7 +250,8 @@ void TGFileBrowser::CreateBrowser()
+ 
+ TGFileBrowser::~TGFileBrowser()
+ {
+-   TQObject::Disconnect("TGHtmlBrowser", "Clicked(char*)");
++   if (TClass::GetClass("TGHtmlBrowser"))
++      TQObject::Disconnect("TGHtmlBrowser", "Clicked(char*)");
+    TQObject::Disconnect("TPad", "Modified()");
+ 
+    delete fContextMenu;
+diff --git a/gui/gui/src/TRootBrowser.cxx b/gui/gui/src/TRootBrowser.cxx
+index 8105c29d09..56c39585bd 100644
+--- a/gui/gui/src/TRootBrowser.cxx
++++ b/gui/gui/src/TRootBrowser.cxx
+@@ -54,6 +54,7 @@
+ #include "TSystem.h"
+ #include "TApplication.h"
+ #include "TBrowser.h"
++#include "TClass.h"
+ #include "TGClient.h"
+ #include "TGFrame.h"
+ #include "TGTab.h"
+@@ -213,6 +214,9 @@ void TRootBrowser::CreateBrowser(const char *name)
+    fPreMenuFrame->AddFrame(fMenuBar, fLH2);
+    fTopMenuFrame->AddFrame(fPreMenuFrame, fLH0);
+ 
++   if (!TClass::GetClass("TGHtmlBrowser"))
++      fMenuFile->DisableEntry(kNewHtml);
++
+    fMenuFrame = new TGHorizontalFrame(fTopMenuFrame, 100, 20, kRaisedFrame);
+    fTopMenuFrame->AddFrame(fMenuFrame, fLH5);
+ 
+-- 
+2.17.2
+
diff --git a/root.spec b/root.spec
index f98c964..dd91288 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -118,6 +118,10 @@ Patch19:	%{name}-ix32-geom-opt.patch
 #		Missing libcrypto dependency for libSrvAuth
 #		https://github.com/root-project/root/pull/2436
 Patch20:	%{name}-crypto.patch
+#		Fix crash in TBrowser when root-gui-html is not installed
+#		https://sft.its.cern.ch/jira/browse/ROOT-9640
+#		Backported from git master
+Patch21:	%{name}-TGHtmlBrowser-crash.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -164,7 +168,11 @@ BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
+%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	libpq-devel
+%else
+BuildRequires:	postgresql-devel
+%endif
 BuildRequires:	python2-devel
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	python3-devel
@@ -1072,7 +1080,8 @@ a generalized vector library.
 %package mathcore
 Summary:	Core mathematics library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
+#		Dynamic dependencies
+Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 
 %description mathcore
@@ -1810,6 +1819,7 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2201,10 +2211,10 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
 mkdir -p %{buildroot}%{python3_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
 
-# Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 
 tmpdir=`mktemp -d`
 
@@ -2231,10 +2241,10 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
 rm -rf $tmpdir
 
-# Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 
 %else
 
@@ -2254,10 +2264,10 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
 mkdir -p %{buildroot}%{python2_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
-# Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 
 tmpdir=`mktemp -d`
 
@@ -2285,10 +2295,10 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
 
 rm -rf $tmpdir
 
-# Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 
 %endif
 
@@ -2316,10 +2326,10 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_other_sitelib}
 
 rm -rf $tmpdir
 
-# Create empty .dist-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_other_sitearch}/ROOT-%{version}.dist-info
-touch %{buildroot}%{python3_other_sitearch}/JupyROOT-%{version}.dist-info
-touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.dist-info
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python3_other_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python3_other_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.egg-info
 
 %endif
 
@@ -3112,20 +3122,20 @@ end
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python2_sitearch}/libPyROOT.so
 %{python2_sitearch}/ROOT.py*
-%{python2_sitearch}/ROOT-*.dist-info
+%{python2_sitearch}/ROOT-*.egg-info
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
 
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
-%{python2_sitearch}/JupyROOT-*.dist-info
+%{python2_sitearch}/JupyROOT-*.egg-info
 %{python2_sitearch}/libJupyROOT.so
 %{_datadir}/jupyter/kernels/python2-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
-%{python2_sitelib}/JsMVA-*.dist-info
+%{python2_sitelib}/JsMVA-*.egg-info
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
@@ -3135,21 +3145,21 @@ end
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
 %{python3_sitearch}/ROOT.py
-%{python3_sitearch}/ROOT-*.dist-info
+%{python3_sitearch}/ROOT-*.egg-info
 %{python3_sitearch}/cppyy.py
 %{python3_sitearch}/_pythonization.py
 %{python3_sitearch}/__pycache__/*
 
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
-%{python3_sitearch}/JupyROOT-*.dist-info
+%{python3_sitearch}/JupyROOT-*.egg-info
 %{python3_sitearch}/libJupyROOT.so
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python%{python3_pkgversion}-jsmva
 %{python3_sitelib}/JsMVA
-%{python3_sitelib}/JsMVA-*.dist-info
+%{python3_sitelib}/JsMVA-*.egg-info
 
 %if %{?rhel}%{!?rhel:0} == 7
 %files -n python%{python3_other_pkgversion}-%{name} -f includelist-bindings-pyroot
@@ -3160,21 +3170,21 @@ end
 %{_libdir}/%{name}/libPyROOT_rdict.pcm
 %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
 %{python3_other_sitearch}/ROOT.py
-%{python3_other_sitearch}/ROOT-*.dist-info
+%{python3_other_sitearch}/ROOT-*.egg-info
 %{python3_other_sitearch}/cppyy.py
 %{python3_other_sitearch}/_pythonization.py
 %{python3_other_sitearch}/__pycache__/*
 
 %files -n python%{python3_other_pkgversion}-jupyroot
 %{python3_other_sitearch}/JupyROOT
-%{python3_other_sitearch}/JupyROOT-*.dist-info
+%{python3_other_sitearch}/JupyROOT-*.egg-info
 %{python3_other_sitearch}/libJupyROOT.so
 %{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
 %doc bindings/pyroot/JupyROOT/README.md
 
 %files -n python%{python3_other_pkgversion}-jsmva
 %{python3_other_sitelib}/JsMVA
-%{python3_other_sitelib}/JsMVA-*.dist-info
+%{python3_other_sitelib}/JsMVA-*.egg-info
 %endif
 
 %files r -f includelist-bindings-r
@@ -3776,6 +3786,12 @@ end
 %endif
 
 %changelog
+* Thu Oct 25 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.04-3
+- Fix crash in TBrowser when root-gui-html is not installed
+- Use empty .egg-info files instead of empty .dist-info files to make
+  virtualenv happy
+- Add Requires on root-mathmore to root-mathcore (for default integrator)
+
 * Sat Oct 13 2018 Jerry James <loganjerry@gmail.com> - 6.14.04-2
 - Rebuild for tbb 2019_U1
 
@@ -3840,6 +3856,7 @@ end
   - gui-fitpanelv7
   - gui-qt5webdisplay
 - Rename root-guibuilder package to root-gui-builder
+- Create empty .dist-info files so that rpm auto-generates provides
 
 * Sat Jun 30 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.12.06-5
 - Adjust Vavilov test for Fedora 29 ix86

From 436670def3daf22c9fae9dac0a52ce1ef269bb29 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 9 Nov 2018 18:42:42 +0100
Subject: [PATCH 143/344] Update to 6.14.06 Let clang ignore some gcc options
 it hasn't implemented Don't build python2-jupyroot/jsmva packages for Fedora
 >= 29 Drop previously backported patch root-TGHtmlBrowser-crash.patch

---
 root-TGHtmlBrowser-crash.patch      | 63 ----------------------------
 root-clang-ignore-gcc-options.patch | 33 +++++++++++++++
 root-unbundle-gtest.patch           | 12 ++++--
 root.spec                           | 65 +++++++++++++++++------------
 sources                             |  3 +-
 5 files changed, 80 insertions(+), 96 deletions(-)
 delete mode 100644 root-TGHtmlBrowser-crash.patch
 create mode 100644 root-clang-ignore-gcc-options.patch

diff --git a/root-TGHtmlBrowser-crash.patch b/root-TGHtmlBrowser-crash.patch
deleted file mode 100644
index 5cd8c6b..0000000
--- a/root-TGHtmlBrowser-crash.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 961e9457ce3a9f6641819ceab61ce55b147d2fe5 Mon Sep 17 00:00:00 2001
-From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
-Date: Fri, 21 Sep 2018 11:10:07 +0200
-Subject: [PATCH] Fix Jira issue #ROOT-9640 Segmentation violation after
- starting TBrowser b
-
-Only connect/disconnect TGHtmlBrowser signals when it is present
----
- gui/gui/src/TGFileBrowser.cxx | 8 +++++---
- gui/gui/src/TRootBrowser.cxx  | 4 ++++
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/gui/gui/src/TGFileBrowser.cxx b/gui/gui/src/TGFileBrowser.cxx
-index 3f6ce23b60..17b13bacaf 100644
---- a/gui/gui/src/TGFileBrowser.cxx
-+++ b/gui/gui/src/TGFileBrowser.cxx
-@@ -232,8 +232,9 @@ void TGFileBrowser::CreateBrowser()
- 
-    fDblClick = kFALSE;
- 
--   TQObject::Connect("TGHtmlBrowser", "Clicked(char*)",
--                     "TGFileBrowser", this, "Selected(char*)");
-+   if (TClass::GetClass("TGHtmlBrowser"))
-+      TQObject::Connect("TGHtmlBrowser", "Clicked(char*)",
-+                        "TGFileBrowser", this, "Selected(char*)");
- 
-    TQObject::Connect("TPad", "Modified()",
-                      "TGFileBrowser", this, "PadModified()");
-@@ -249,7 +250,8 @@ void TGFileBrowser::CreateBrowser()
- 
- TGFileBrowser::~TGFileBrowser()
- {
--   TQObject::Disconnect("TGHtmlBrowser", "Clicked(char*)");
-+   if (TClass::GetClass("TGHtmlBrowser"))
-+      TQObject::Disconnect("TGHtmlBrowser", "Clicked(char*)");
-    TQObject::Disconnect("TPad", "Modified()");
- 
-    delete fContextMenu;
-diff --git a/gui/gui/src/TRootBrowser.cxx b/gui/gui/src/TRootBrowser.cxx
-index 8105c29d09..56c39585bd 100644
---- a/gui/gui/src/TRootBrowser.cxx
-+++ b/gui/gui/src/TRootBrowser.cxx
-@@ -54,6 +54,7 @@
- #include "TSystem.h"
- #include "TApplication.h"
- #include "TBrowser.h"
-+#include "TClass.h"
- #include "TGClient.h"
- #include "TGFrame.h"
- #include "TGTab.h"
-@@ -213,6 +214,9 @@ void TRootBrowser::CreateBrowser(const char *name)
-    fPreMenuFrame->AddFrame(fMenuBar, fLH2);
-    fTopMenuFrame->AddFrame(fPreMenuFrame, fLH0);
- 
-+   if (!TClass::GetClass("TGHtmlBrowser"))
-+      fMenuFile->DisableEntry(kNewHtml);
-+
-    fMenuFrame = new TGHorizontalFrame(fTopMenuFrame, 100, 20, kRaisedFrame);
-    fTopMenuFrame->AddFrame(fMenuFrame, fLH5);
- 
--- 
-2.17.2
-
diff --git a/root-clang-ignore-gcc-options.patch b/root-clang-ignore-gcc-options.patch
new file mode 100644
index 0000000..ebd8957
--- /dev/null
+++ b/root-clang-ignore-gcc-options.patch
@@ -0,0 +1,33 @@
+From 1303b60707614043993f9c97c79dd4fe89e6efa4 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 7 Nov 2018 12:05:30 +0100
+Subject: [PATCH] Let clang ignore some gcc options it hasn't implemented
+
+---
+ .../llvm/src/tools/clang/include/clang/Driver/Options.td       | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td b/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
+index 05dc9d7eb3..1e887ac6b1 100644
+--- a/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
++++ b/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
+@@ -2464,6 +2464,8 @@ defm align_loops : BooleanFFlag<"align-loops">, Group<clang_ignored_gcc_optimiza
+ def falign_loops_EQ : Joined<["-"], "falign-loops=">, Group<clang_ignored_gcc_optimization_f_Group>;
+ defm align_jumps : BooleanFFlag<"align-jumps">, Group<clang_ignored_gcc_optimization_f_Group>;
+ def falign_jumps_EQ : Joined<["-"], "falign-jumps=">, Group<clang_ignored_gcc_optimization_f_Group>;
++defm cf_protection : BooleanFFlag<"cf-protection">, Group<clang_ignored_f_Group>;
++def fcf_protection_EQ : Joined<["-"], "fcf-protection=">, Group<clang_ignored_f_Group>;
+ 
+ // FIXME: This option should be supported and wired up to our diognostics, but
+ // ignore it for now to avoid breaking builds that use it.
+@@ -2524,6 +2526,7 @@ defm single_precision_constant : BooleanFFlag<"single-precision-constant">,
+     Group<clang_ignored_gcc_optimization_f_Group>;
+ defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_f_Group>;
+ defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
++defm stack_clash_protection : BooleanFFlag<"stack-clash-protection">, Group<clang_ignored_f_Group>;
+ defm strength_reduce :
+     BooleanFFlag<"strength-reduce">, Group<clang_ignored_gcc_optimization_f_Group>;
+ defm tls_model : BooleanFFlag<"tls-model">, Group<clang_ignored_f_Group>;
+-- 
+2.19.1
+
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index f3b343d..b5f0531 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.12.04.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.12.04/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.12.04.orig/cmake/modules/SearchInstalledSoftware.cmake	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/cmake/modules/SearchInstalledSoftware.cmake	2018-01-07 22:45:45.537658993 +0100
-@@ -1580,71 +1580,18 @@
+diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake	2018-11-05 10:30:03.000000000 +0100
++++ root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake	2018-11-06 10:06:56.399528378 +0100
+@@ -1556,75 +1556,18 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -26,6 +26,10 @@ diff -ur root-6.12.04.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.12
 -      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=\\\"\\\"
 -      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=\\\"\\\")
 -  endif()
+-  if(APPLE)
+-    set(EXTRA_GTEST_OPTS
+-      -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
+-  endif()
 -
 -  ExternalProject_Add(
 -    googletest
diff --git a/root.spec b/root.spec
index dd91288..c9ddf65 100644
--- a/root.spec
+++ b/root.spec
@@ -44,9 +44,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.14.04
+Version:	6.14.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -118,10 +118,9 @@ Patch19:	%{name}-ix32-geom-opt.patch
 #		Missing libcrypto dependency for libSrvAuth
 #		https://github.com/root-project/root/pull/2436
 Patch20:	%{name}-crypto.patch
-#		Fix crash in TBrowser when root-gui-html is not installed
-#		https://sft.its.cern.ch/jira/browse/ROOT-9640
-#		Backported from git master
-Patch21:	%{name}-TGHtmlBrowser-crash.patch
+#		Let clang ignore some gcc options it hasn't implemented
+#		https://github.com/root-project/root/pull/2933
+Patch21:	%{name}-clang-ignore-gcc-options.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -373,6 +372,12 @@ Requires:	urw-fonts
 Requires:	font(droidsansfallback)
 Obsoletes:	%{name}-ruby < 6.00.00
 Obsoletes:	%{name}-vdt < 6.10.00
+%if %{py3default}
+#		Don't build python2-jupyroot/jsmva packages for Fedora >= 29
+Obsoletes:	python2-jupyroot < %{version}-%{release}
+Obsoletes:	python2-jsmva < %{version}-%{release}
+Obsoletes:	%{name}-rootaas < 6.08.00
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -454,6 +459,7 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 
+%if ! %{py3default}
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
 Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
@@ -481,6 +487,7 @@ Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
 TMVA interface used by JupyROOT.
+%endif
 
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
@@ -1650,7 +1657,7 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 This package contains the Tree library for ROOT.
 
 %package tree-dataframe
-Summary:	A high level interfae to ROOT trees
+Summary:	A high level interface to ROOT trees
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -1659,7 +1666,7 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name}-tree-player < 6.14.00
 
 %description tree-dataframe
-This package contains a high level interfae to ROOT trees.
+This package contains a high level interface to ROOT trees.
 
 %package tree-player
 Summary:	Library to loop over a ROOT tree
@@ -2187,6 +2194,7 @@ install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
+sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
 %if %{py3default}
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
@@ -2227,24 +2235,12 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python2/cmake_install.cmake
 mkdir -p %{buildroot}%{python2_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python2_sitearch}/libPyROOT.so
-mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
-rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
-rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
-mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
-
-mkdir -p %{buildroot}%{python2_sitelib}
-mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
 rm -rf $tmpdir
 
 # Create empty .egg-info files so that rpm auto-generates provides
 touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 
 %else
 
@@ -2336,21 +2332,32 @@ touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.egg-info
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
+%if ! %{py3default}
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
-sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!%{__python2}!' \
+sed -e 's/ROOT C++/& (Python 2)/' \
+    -e 's!python!%{__python2}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json
+sed -e '/^\#!/d' \
+    -i %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py
+%endif
 
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
-sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!%{__python3}!' \
+sed -e 's/ROOT C++/& (Python 3)/' \
+    -e 's!python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
+sed -e '/^\#!/d' \
+    -i %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
 
 %if %{?rhel}%{!?rhel:0} == 7
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
-sed -e 's/ROOT C++/& (Python %{python3_other_version})/' -e 's!python!%{__python3_other}!' \
+sed -e 's/ROOT C++/& (Python %{python3_other_version})/' \
+    -e 's!python!%{__python3_other}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot/kernel.json
+sed -e '/^\#!/d' \
+    -i %{buildroot}%{python3_other_sitearch}/JupyROOT/kernel/rootkernel.py
 %endif
 
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
@@ -2395,10 +2402,6 @@ sed -e 's!/usr/bin/env python2!%{__python2}!' \
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e 's!/usr/bin/env python3!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
-sed -e '/^\#!/d' \
-    -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \
-       %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \
-       %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
 sed -e 's!/usr/bin/env python!%{__pythondef}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
@@ -3126,6 +3129,7 @@ end
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
 
+%if ! %{py3default}
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
 %{python2_sitearch}/JupyROOT-*.egg-info
@@ -3136,6 +3140,7 @@ end
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
 %{python2_sitelib}/JsMVA-*.egg-info
+%endif
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
@@ -3786,6 +3791,12 @@ end
 %endif
 
 %changelog
+* Tue Nov 06 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.06-1
+- Update to 6.14.06
+- Let clang ignore some gcc options it hasn't implemented
+- Don't build python2-jupyroot/jsmva packages for Fedora >= 29
+- Drop previously backported patch root-TGHtmlBrowser-crash.patch
+
 * Thu Oct 25 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.04-3
 - Fix crash in TBrowser when root-gui-html is not installed
 - Use empty .egg-info files instead of empty .dist-info files to make
diff --git a/sources b/sources
index b4a761b..2031d9b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (root-6.14.04.tar.xz) = 02163e1eb003613ce245b232eb11e491b91367fa61ead224fc7f4cecd3f04acaaa6e53ff526f26cfee3e4a5f0f32a9bf683e8ab648bc3e6fb5eda8d9d9756def
-SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2
+SHA512 (root-6.14.06.tar.xz) = 6aaf3453ea20cf7c39d23100ceb0ce13c47f856eed27c5f19b144eb691cf82740d046ad7a77b097c0c9581221645294f38bb8a39941543ae74823f5e619fd639

From 4c7d7f652dcadb0e34738e802b40d27ff1557f4e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 9 Nov 2018 19:35:08 +0100
Subject: [PATCH 144/344] Restore broken sources file

---
 sources | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources b/sources
index 2031d9b..157b63f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (root-6.14.06.tar.xz) = 6aaf3453ea20cf7c39d23100ceb0ce13c47f856eed27c5f19b144eb691cf82740d046ad7a77b097c0c9581221645294f38bb8a39941543ae74823f5e619fd639
+SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2

From 6be66b5cfa7b182886e5ae133ee005f75b944873 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 24 Nov 2018 11:32:51 +0100
Subject: [PATCH 145/344] Update to 6.14.08 Make tutorial filenames unique to
 avoid overwrites

---
 root-unique-filenames.patch | 50 +++++++++++++++++++++++++++++++++++++
 root.spec                   | 22 ++++++++++------
 sources                     |  2 +-
 3 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 root-unique-filenames.patch

diff --git a/root-unique-filenames.patch b/root-unique-filenames.patch
new file mode 100644
index 0000000..4a9b5a6
--- /dev/null
+++ b/root-unique-filenames.patch
@@ -0,0 +1,50 @@
+From 430c06386ec70a40265c77047ccc1e980322091e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 22 Nov 2018 16:59:55 +0100
+Subject: [PATCH] Make tutorial filenames unique to avoid overwrites
+
+---
+ tutorials/multicore/mp001_fillHistos.C   | 2 +-
+ tutorials/multicore/mt001_fillHistos.C   | 2 +-
+ tutorials/multicore/mtbb001_fillHistos.C | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tutorials/multicore/mp001_fillHistos.C b/tutorials/multicore/mp001_fillHistos.C
+index 081d5a3645a..6fd461b4442 100644
+--- a/tutorials/multicore/mp001_fillHistos.C
++++ b/tutorials/multicore/mp001_fillHistos.C
+@@ -23,7 +23,7 @@ Int_t mp001_fillHistos()
+    auto workItem = [](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+-      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
++      TFile f(Form("myFile_mp001_%u.root", workerID), "RECREATE");
+       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
+       for (UInt_t i = 0; i < nNumbers; ++i) {
+          h.Fill(workerRndm.Gaus());
+diff --git a/tutorials/multicore/mt001_fillHistos.C b/tutorials/multicore/mt001_fillHistos.C
+index 4a4c08558c1..d293e1f2b7d 100644
+--- a/tutorials/multicore/mt001_fillHistos.C
++++ b/tutorials/multicore/mt001_fillHistos.C
+@@ -26,7 +26,7 @@ Int_t mt001_fillHistos()
+    auto workItem = [](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+-      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
++      TFile f(Form("myFile_mt001_%u.root", workerID), "RECREATE");
+       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
+       for (UInt_t i = 0; i < nNumbers; ++i) {
+          h.Fill(workerRndm.Gaus());
+diff --git a/tutorials/multicore/mtbb001_fillHistos.C b/tutorials/multicore/mtbb001_fillHistos.C
+index 9f967938017..64390b2d4cc 100644
+--- a/tutorials/multicore/mtbb001_fillHistos.C
++++ b/tutorials/multicore/mtbb001_fillHistos.C
+@@ -23,7 +23,7 @@ Int_t mtbb001_fillHistos()
+    auto workItem = [](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+-      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
++      TFile f(Form("myFile_mtbb001_%u.root", workerID), "RECREATE");
+       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
+       for (UInt_t i = 0; i < nNumbers; ++i) {
+          h.Fill(workerRndm.Gaus());
diff --git a/root.spec b/root.spec
index c9ddf65..07a1214 100644
--- a/root.spec
+++ b/root.spec
@@ -29,8 +29,8 @@
 %global root7 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
-# Multi-threading support requires TBB version >= 4.3.
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+# Multi-threading support requires TBB version >= 2018
 %global tbb 1
 %else
 %global tbb 0
@@ -44,7 +44,7 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.14.06
+Version:	6.14.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -121,6 +121,9 @@ Patch20:	%{name}-crypto.patch
 #		Let clang ignore some gcc options it hasn't implemented
 #		https://github.com/root-project/root/pull/2933
 Patch21:	%{name}-clang-ignore-gcc-options.patch
+#		Make tutorial filenames unique to avoid overwrites
+#		https://github.com/root-project/root/pull/3029
+Patch22:	%{name}-unique-filenames.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -209,7 +212,7 @@ BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
 %if %{tbb}
-BuildRequires:	tbb-devel >= 4.3
+BuildRequires:	tbb-devel >= 2018
 %endif
 BuildRequires:	emacs
 BuildRequires:	emacs-el
@@ -1827,6 +1830,7 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2336,7 +2340,7 @@ mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
 sed -e 's/ROOT C++/& (Python 2)/' \
-    -e 's!python!%{__python2}!' \
+    -e 's!python[0-9]*\.[0-9]*!%{__python2}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json
 sed -e '/^\#!/d' \
     -i %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py
@@ -2345,7 +2349,7 @@ sed -e '/^\#!/d' \
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 sed -e 's/ROOT C++/& (Python 3)/' \
-    -e 's!python!%{__python3}!' \
+    -e 's!python[0-9]*\.[0-9]*!%{__python3}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
 sed -e '/^\#!/d' \
     -i %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
@@ -2354,7 +2358,7 @@ sed -e '/^\#!/d' \
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
 sed -e 's/ROOT C++/& (Python %{python3_other_version})/' \
-    -e 's!python!%{__python3_other}!' \
+    -e 's!python[0-9]*\.[0-9]*!%{__python3_other}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot/kernel.json
 sed -e '/^\#!/d' \
     -i %{buildroot}%{python3_other_sitearch}/JupyROOT/kernel/rootkernel.py
@@ -3791,6 +3795,10 @@ end
 %endif
 
 %changelog
+* Fri Nov 23 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.08-1
+- Update to 6.14.08
+- Make tutorial filenames unique to avoid overwrites
+
 * Tue Nov 06 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.06-1
 - Update to 6.14.06
 - Let clang ignore some gcc options it hasn't implemented
diff --git a/sources b/sources
index 157b63f..24f942a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.14.06.tar.xz) = 6aaf3453ea20cf7c39d23100ceb0ce13c47f856eed27c5f19b144eb691cf82740d046ad7a77b097c0c9581221645294f38bb8a39941543ae74823f5e619fd639
+SHA512 (root-6.14.08.tar.xz) = 609139b2e148d5a10f41923f33fa288d9e3bc56f79d741b8b9df98f46556b83244ad71b9f2fd30cf6675a0cc9c46fa3d8e6bfe979c734bb10cec29e60dd8436a
 SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2

From dccdfa53974b59d18fc5146073c0d5c86452182a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 14 Jan 2019 19:15:11 +0100
Subject: [PATCH 146/344] Rebuilt for libcrypt.so.2 (#1666033)

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 07a1214..352faa6 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3795,6 +3795,9 @@ end
 %endif
 
 %changelog
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 6.14.08-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
 * Fri Nov 23 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.08-1
 - Update to 6.14.08
 - Make tutorial filenames unique to avoid overwrites

From cd31cb5a9783f05dce633b3846508b723a519631 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:40:52 +0100
Subject: [PATCH 147/344] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 root.spec | 309 ++++++++++++++++++------------------------------------
 1 file changed, 103 insertions(+), 206 deletions(-)

diff --git a/root.spec b/root.spec
index 352faa6..0899bf8 100644
--- a/root.spec
+++ b/root.spec
@@ -2774,158 +2774,83 @@ if [ $1 -eq 0 ] ; then
     fi
 fi
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
-%post multiproc -p /sbin/ldconfig
-%postun multiproc -p /sbin/ldconfig
-%post cling -p /sbin/ldconfig
-%postun cling -p /sbin/ldconfig
-%post r -p /sbin/ldconfig
-%postun r -p /sbin/ldconfig
-%post r-tools -p /sbin/ldconfig
-%postun r-tools -p /sbin/ldconfig
-%post genetic -p /sbin/ldconfig
-%postun genetic -p /sbin/ldconfig
-%post geom -p /sbin/ldconfig
-%postun geom -p /sbin/ldconfig
-%post gdml -p /sbin/ldconfig
-%postun gdml -p /sbin/ldconfig
-%post geocad -p /sbin/ldconfig
-%postun geocad -p /sbin/ldconfig
-%post graf -p /sbin/ldconfig
-%postun graf -p /sbin/ldconfig
-%post graf-asimage -p /sbin/ldconfig
-%postun graf-asimage -p /sbin/ldconfig
-%post graf-fitsio -p /sbin/ldconfig
-%postun graf-fitsio -p /sbin/ldconfig
-%post graf-gpad -p /sbin/ldconfig
-%postun graf-gpad -p /sbin/ldconfig
-%post graf-gviz -p /sbin/ldconfig
-%postun graf-gviz -p /sbin/ldconfig
-%post graf-postscript -p /sbin/ldconfig
-%postun graf-postscript -p /sbin/ldconfig
-%post graf-qt -p /sbin/ldconfig
-%postun graf-qt -p /sbin/ldconfig
-%post graf-x11 -p /sbin/ldconfig
-%postun graf-x11 -p /sbin/ldconfig
-%post graf3d -p /sbin/ldconfig
-%postun graf3d -p /sbin/ldconfig
-%post graf3d-eve -p /sbin/ldconfig
-%postun graf3d-eve -p /sbin/ldconfig
-%post graf3d-gl -p /sbin/ldconfig
-%postun graf3d-gl -p /sbin/ldconfig
-%post graf3d-gviz3d -p /sbin/ldconfig
-%postun graf3d-gviz3d -p /sbin/ldconfig
-%post graf3d-x3d -p /sbin/ldconfig
-%postun graf3d-x3d -p /sbin/ldconfig
-%post gui -p /sbin/ldconfig
-%postun gui -p /sbin/ldconfig
-%post gui-html -p /sbin/ldconfig
-%postun gui-html -p /sbin/ldconfig
-%post gui-fitpanel -p /sbin/ldconfig
-%postun gui-fitpanel -p /sbin/ldconfig
-%post gui-ged -p /sbin/ldconfig
-%postun gui-ged -p /sbin/ldconfig
-%post gui-builder -p /sbin/ldconfig
-%postun gui-builder -p /sbin/ldconfig
-%post gui-qt -p /sbin/ldconfig
-%postun gui-qt -p /sbin/ldconfig
-%post gui-qtgsi -p /sbin/ldconfig
-%postun gui-qtgsi -p /sbin/ldconfig
-%post gui-recorder -p /sbin/ldconfig
-%postun gui-recorder -p /sbin/ldconfig
-%post hbook -p /sbin/ldconfig
-%postun hbook -p /sbin/ldconfig
-%post hist -p /sbin/ldconfig
-%postun hist -p /sbin/ldconfig
-%post hist-painter -p /sbin/ldconfig
-%postun hist-painter -p /sbin/ldconfig
-%post spectrum -p /sbin/ldconfig
-%postun spectrum -p /sbin/ldconfig
-%post spectrum-painter -p /sbin/ldconfig
-%postun spectrum-painter -p /sbin/ldconfig
-%post hist-factory -p /sbin/ldconfig
-%postun hist-factory -p /sbin/ldconfig
-%post html -p /sbin/ldconfig
-%postun html -p /sbin/ldconfig
-%post io -p /sbin/ldconfig
-%postun io -p /sbin/ldconfig
-%post io-dcache -p /sbin/ldconfig
-%postun io-dcache -p /sbin/ldconfig
-%post io-gfal -p /sbin/ldconfig
-%postun io-gfal -p /sbin/ldconfig
+%ldconfig_scriptlets core
+%ldconfig_scriptlets multiproc
+%ldconfig_scriptlets cling
+%ldconfig_scriptlets r
+%ldconfig_scriptlets r-tools
+%ldconfig_scriptlets genetic
+%ldconfig_scriptlets geom
+%ldconfig_scriptlets gdml
+%ldconfig_scriptlets geocad
+%ldconfig_scriptlets graf
+%ldconfig_scriptlets graf-asimage
+%ldconfig_scriptlets graf-fitsio
+%ldconfig_scriptlets graf-gpad
+%ldconfig_scriptlets graf-gviz
+%ldconfig_scriptlets graf-postscript
+%ldconfig_scriptlets graf-qt
+%ldconfig_scriptlets graf-x11
+%ldconfig_scriptlets graf3d
+%ldconfig_scriptlets graf3d-eve
+%ldconfig_scriptlets graf3d-gl
+%ldconfig_scriptlets graf3d-gviz3d
+%ldconfig_scriptlets graf3d-x3d
+%ldconfig_scriptlets gui
+%ldconfig_scriptlets gui-html
+%ldconfig_scriptlets gui-fitpanel
+%ldconfig_scriptlets gui-ged
+%ldconfig_scriptlets gui-builder
+%ldconfig_scriptlets gui-qt
+%ldconfig_scriptlets gui-qtgsi
+%ldconfig_scriptlets gui-recorder
+%ldconfig_scriptlets hbook
+%ldconfig_scriptlets hist
+%ldconfig_scriptlets hist-painter
+%ldconfig_scriptlets spectrum
+%ldconfig_scriptlets spectrum-painter
+%ldconfig_scriptlets hist-factory
+%ldconfig_scriptlets html
+%ldconfig_scriptlets io
+%ldconfig_scriptlets io-dcache
+%ldconfig_scriptlets io-gfal
 %if %{hadoop}
-%post io-hdfs -p /sbin/ldconfig
-%postun io-hdfs -p /sbin/ldconfig
+%ldconfig_scriptlets io-hdfs
 %endif
-%post io-rfio -p /sbin/ldconfig
-%postun io-rfio -p /sbin/ldconfig
-%post io-sql -p /sbin/ldconfig
-%postun io-sql -p /sbin/ldconfig
-%post io-xml -p /sbin/ldconfig
-%postun io-xml -p /sbin/ldconfig
-%post io-xmlparser -p /sbin/ldconfig
-%postun io-xmlparser -p /sbin/ldconfig
-%post foam -p /sbin/ldconfig
-%postun foam -p /sbin/ldconfig
-%post fftw -p /sbin/ldconfig
-%postun fftw -p /sbin/ldconfig
-%post fumili -p /sbin/ldconfig
-%postun fumili -p /sbin/ldconfig
-%post genvector -p /sbin/ldconfig
-%postun genvector -p /sbin/ldconfig
-%post mathcore -p /sbin/ldconfig
-%postun mathcore -p /sbin/ldconfig
-%post mathmore -p /sbin/ldconfig
-%postun mathmore -p /sbin/ldconfig
-%post matrix -p /sbin/ldconfig
-%postun matrix -p /sbin/ldconfig
-%post minuit -p /sbin/ldconfig
-%postun minuit -p /sbin/ldconfig
-%post minuit2 -p /sbin/ldconfig
-%postun minuit2 -p /sbin/ldconfig
-%post mlp -p /sbin/ldconfig
-%postun mlp -p /sbin/ldconfig
-%post physics -p /sbin/ldconfig
-%postun physics -p /sbin/ldconfig
-%post quadp -p /sbin/ldconfig
-%postun quadp -p /sbin/ldconfig
-%post smatrix -p /sbin/ldconfig
-%postun smatrix -p /sbin/ldconfig
-%post splot -p /sbin/ldconfig
-%postun splot -p /sbin/ldconfig
-%post unuran -p /sbin/ldconfig
-%postun unuran -p /sbin/ldconfig
-%post vecops -p /sbin/ldconfig
-%postun vecops -p /sbin/ldconfig
-%post memstat -p /sbin/ldconfig
-%postun memstat -p /sbin/ldconfig
-%post table -p /sbin/ldconfig
-%postun table -p /sbin/ldconfig
-%post montecarlo-eg -p /sbin/ldconfig
-%postun montecarlo-eg -p /sbin/ldconfig
-%post montecarlo-pythia8 -p /sbin/ldconfig
-%postun montecarlo-pythia8 -p /sbin/ldconfig
-%post montecarlo-vmc -p /sbin/ldconfig
-%postun montecarlo-vmc -p /sbin/ldconfig
-%post net -p /sbin/ldconfig
-%postun net -p /sbin/ldconfig
-%post net-rpdutils -p /sbin/ldconfig
-%postun net-rpdutils -p /sbin/ldconfig
-%post net-bonjour -p /sbin/ldconfig
-%postun net-bonjour -p /sbin/ldconfig
-%post net-auth -p /sbin/ldconfig
-%postun net-auth -p /sbin/ldconfig
-%post net-davix -p /sbin/ldconfig
-%postun net-davix -p /sbin/ldconfig
-%post net-globus -p /sbin/ldconfig
-%postun net-globus -p /sbin/ldconfig
-%post net-krb5 -p /sbin/ldconfig
-%postun net-krb5 -p /sbin/ldconfig
-%post net-ldap -p /sbin/ldconfig
-%postun net-ldap -p /sbin/ldconfig
-%post net-http -p /sbin/ldconfig
-%postun net-http -p /sbin/ldconfig
+%ldconfig_scriptlets io-rfio
+%ldconfig_scriptlets io-sql
+%ldconfig_scriptlets io-xml
+%ldconfig_scriptlets io-xmlparser
+%ldconfig_scriptlets foam
+%ldconfig_scriptlets fftw
+%ldconfig_scriptlets fumili
+%ldconfig_scriptlets genvector
+%ldconfig_scriptlets mathcore
+%ldconfig_scriptlets mathmore
+%ldconfig_scriptlets matrix
+%ldconfig_scriptlets minuit
+%ldconfig_scriptlets minuit2
+%ldconfig_scriptlets mlp
+%ldconfig_scriptlets physics
+%ldconfig_scriptlets quadp
+%ldconfig_scriptlets smatrix
+%ldconfig_scriptlets splot
+%ldconfig_scriptlets unuran
+%ldconfig_scriptlets vecops
+%ldconfig_scriptlets memstat
+%ldconfig_scriptlets table
+%ldconfig_scriptlets montecarlo-eg
+%ldconfig_scriptlets montecarlo-pythia8
+%ldconfig_scriptlets montecarlo-vmc
+%ldconfig_scriptlets net
+%ldconfig_scriptlets net-rpdutils
+%ldconfig_scriptlets net-bonjour
+%ldconfig_scriptlets net-auth
+%ldconfig_scriptlets net-davix
+%ldconfig_scriptlets net-globus
+%ldconfig_scriptlets net-krb5
+%ldconfig_scriptlets net-ldap
+%ldconfig_scriptlets net-http
 
 %pretrans net-http -p <lua>
 path = "%{_datadir}/%{name}/http"
@@ -2934,65 +2859,37 @@ if st and st.type == "directory" then
   os.execute("rm -rf " .. path)
 end
 
-%post net-httpsniff -p /sbin/ldconfig
-%postun net-httpsniff -p /sbin/ldconfig
-%post netx -p /sbin/ldconfig
-%postun netx -p /sbin/ldconfig
-%post proof -p /sbin/ldconfig
-%postun proof -p /sbin/ldconfig
-%post proof-bench -p /sbin/ldconfig
-%postun proof-bench -p /sbin/ldconfig
-%post proof-player -p /sbin/ldconfig
-%postun proof-player -p /sbin/ldconfig
-%post proof-sessionviewer -p /sbin/ldconfig
-%postun proof-sessionviewer -p /sbin/ldconfig
-%post xproof -p /sbin/ldconfig
-%postun xproof -p /sbin/ldconfig
-%post roofit -p /sbin/ldconfig
-%postun roofit -p /sbin/ldconfig
-%post sql-mysql -p /sbin/ldconfig
-%postun sql-mysql -p /sbin/ldconfig
-%post sql-odbc -p /sbin/ldconfig
-%postun sql-odbc -p /sbin/ldconfig
-%post sql-sqlite -p /sbin/ldconfig
-%postun sql-sqlite -p /sbin/ldconfig
-%post sql-pgsql -p /sbin/ldconfig
-%postun sql-pgsql -p /sbin/ldconfig
-%post tmva -p /sbin/ldconfig
-%postun tmva -p /sbin/ldconfig
-%post tmva-python -p /sbin/ldconfig
-%postun tmva-python -p /sbin/ldconfig
-%post tmva-r -p /sbin/ldconfig
-%postun tmva-r -p /sbin/ldconfig
-%post tmva-gui -p /sbin/ldconfig
-%postun tmva-gui -p /sbin/ldconfig
-%post tree -p /sbin/ldconfig
-%postun tree -p /sbin/ldconfig
-%post tree-dataframe -p /sbin/ldconfig
-%postun tree-dataframe -p /sbin/ldconfig
-%post tree-player -p /sbin/ldconfig
-%postun tree-player -p /sbin/ldconfig
-%post tree-viewer -p /sbin/ldconfig
-%postun tree-viewer -p /sbin/ldconfig
-%post unfold -p /sbin/ldconfig
-%postun unfold -p /sbin/ldconfig
+%ldconfig_scriptlets net-httpsniff
+%ldconfig_scriptlets netx
+%ldconfig_scriptlets proof
+%ldconfig_scriptlets proof-bench
+%ldconfig_scriptlets proof-player
+%ldconfig_scriptlets proof-sessionviewer
+%ldconfig_scriptlets xproof
+%ldconfig_scriptlets roofit
+%ldconfig_scriptlets sql-mysql
+%ldconfig_scriptlets sql-odbc
+%ldconfig_scriptlets sql-sqlite
+%ldconfig_scriptlets sql-pgsql
+%ldconfig_scriptlets tmva
+%ldconfig_scriptlets tmva-python
+%ldconfig_scriptlets tmva-r
+%ldconfig_scriptlets tmva-gui
+%ldconfig_scriptlets tree
+%ldconfig_scriptlets tree-dataframe
+%ldconfig_scriptlets tree-player
+%ldconfig_scriptlets tree-viewer
+%ldconfig_scriptlets unfold
 %if %{root7}
-%post graf-gpadv7 -p /sbin/ldconfig
-%postun graf-gpadv7 -p /sbin/ldconfig
-%post graf-primitives -p /sbin/ldconfig
-%postun graf-primitives -p /sbin/ldconfig
-%post gui-canvaspainter -p /sbin/ldconfig
-%postun gui-canvaspainter -p /sbin/ldconfig
-%post gui-fitpanelv7 -p /sbin/ldconfig
-%postun gui-fitpanelv7 -p /sbin/ldconfig
+%ldconfig_scriptlets graf-gpadv7
+%ldconfig_scriptlets graf-primitives
+%ldconfig_scriptlets gui-canvaspainter
+%ldconfig_scriptlets gui-fitpanelv7
 %ifarch %{qt5_qtwebengine_arches}
-%post gui-qt5webdisplay -p /sbin/ldconfig
-%postun gui-qt5webdisplay -p /sbin/ldconfig
+%ldconfig_scriptlets gui-qt5webdisplay
 %endif
-%post gui-webdisplay -p /sbin/ldconfig
-%postun gui-webdisplay -p /sbin/ldconfig
-%post hist-draw -p /sbin/ldconfig
-%postun hist-draw -p /sbin/ldconfig
+%ldconfig_scriptlets gui-webdisplay
+%ldconfig_scriptlets hist-draw
 %endif
 
 %files

From f5cfd58b12102b3bc49ae720756b87d7eb1cbc2b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 27 Jan 2019 13:14:43 +0100
Subject: [PATCH 148/344] Remove obsolete scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0899bf8..c629aa1 100644
--- a/root.spec
+++ b/root.spec
@@ -2609,7 +2609,7 @@ excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
-%if %{?rhel}%{!?rhel:0} == 7
+%if %{?rhel} && 0%{?rhel} <= 7
 %post
 touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 update-desktop-database >/dev/null 2>&1 || :

From 786482506c647ff72646e7bd88c844a43a77dee7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 11:31:06 +0000
Subject: [PATCH 149/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index c629aa1..b1f976a 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3692,6 +3692,9 @@ end
 %endif
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 6.14.08-2
 - Rebuilt for libcrypt.so.2 (#1666033)
 

From 0aea483c48b496acf44cc45ec33dc5c8bcea439b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 4 Feb 2019 21:57:42 +0100
Subject: [PATCH 150/344] Revert "Remove obsolete scriptlets" The old version
 already removed the obsolete scriptlets where appropriate (i.e. everywhere
 except for EPEL 7), there was no need to change it. The new version
 introduced an error that made the specfile unparsable, which resulted in that
 the package failed to build during the Fedora 30 mass rebuild.

This reverts commit f5cfd58b12102b3bc49ae720756b87d7eb1cbc2b.
---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b1f976a..4353d44 100644
--- a/root.spec
+++ b/root.spec
@@ -2609,7 +2609,7 @@ excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
-%if %{?rhel} && 0%{?rhel} <= 7
+%if %{?rhel}%{!?rhel:0} == 7
 %post
 touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 update-desktop-database >/dev/null 2>&1 || :

From 85f4c754b6c004e1e75d6193c68278ad59a765ad Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 4 Feb 2019 22:12:56 +0100
Subject: [PATCH 151/344] Remove obsolete /sbin/ldconfig scriptlets The
 root-core package installs a file in /etc/ld.so.conf.d, so it should   always
 call /sbin/ldconfig and not use the macros

---
 root.spec | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/root.spec b/root.spec
index 4353d44..04665e9 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.14.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2668,7 +2668,7 @@ fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
-/sbin/ldconfig
+%{?ldconfig}
 
 %preun -n python2-%{name}
 if [ $1 = 0 ] ; then
@@ -2676,7 +2676,7 @@ if [ $1 = 0 ] ; then
 	libPyROOT.so %{python2_sitearch}/libPyROOT.so
 fi
 
-%postun -n python2-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python2-%{name}
 
 %triggerpostun -n python2-%{name} -- %{name}-python
 # Uninstalling the old %{name}-python will remove the alternatives
@@ -2684,7 +2684,7 @@ fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
-/sbin/ldconfig
+%{?ldconfig}
 
 %post -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2706,7 +2706,7 @@ fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
-/sbin/ldconfig
+%{?ldconfig}
 
 %preun -n python%{python3_pkgversion}-%{name}
 if [ $1 = 0 ] ; then
@@ -2714,7 +2714,7 @@ if [ $1 = 0 ] ; then
 	libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
 fi
 
-%postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python%{python3_pkgversion}-%{name}
 
 %triggerpostun -n python%{python3_pkgversion}-%{name} -- %{name}-python%{python3_pkgversion}
 # Uninstalling the old %{name}-python%{python3_pkgversion} will remove the alternatives
@@ -2722,7 +2722,7 @@ fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
-/sbin/ldconfig
+%{?ldconfig}
 
 %if %{?rhel}%{!?rhel:0} == 7
 %post -n python%{python3_other_pkgversion}-%{name}
@@ -2741,7 +2741,7 @@ fi
 %{_sbindir}/update-alternatives --install \
     %{_libdir}/%{name}/libPyROOT.so.%{version} \
     libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5
-/sbin/ldconfig
+%{?ldconfig}
 
 %preun -n python%{python3_other_pkgversion}-%{name}
 if [ $1 = 0 ] ; then
@@ -2749,7 +2749,7 @@ if [ $1 = 0 ] ; then
 	libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
 fi
 
-%postun -n python%{python3_other_pkgversion}-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python%{python3_other_pkgversion}-%{name}
 %endif
 
 %post notebook
@@ -2774,7 +2774,9 @@ if [ $1 -eq 0 ] ; then
     fi
 fi
 
-%ldconfig_scriptlets core
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
+
 %ldconfig_scriptlets multiproc
 %ldconfig_scriptlets cling
 %ldconfig_scriptlets r
@@ -3692,6 +3694,11 @@ end
 %endif
 
 %changelog
+* Mon Feb 04 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.08-4
+- Remove obsolete /sbin/ldconfig scriptlets
+- The root-core package installs a file in /etc/ld.so.conf.d, so it should
+  always call /sbin/ldconfig and not use the macros
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From b8c850043912306ac61bb3069c9a6f47ef0ddfbd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 15 Feb 2019 12:57:22 +0100
Subject: [PATCH 152/344] Update to 6.16.00 Drop patches accepted upstream:  
 root-adjust-allowed-test-difference-for-32-bit-ix86.patch   root-crypto.patch
   root-js-syntax.patch   root-missing-header.patch  
 root-set-cache-file-dir.patch   root-stressgraphics-ref.patch  
 root-test-compilation-epel7.patch   root-test-subdirs.patch  
 root-unique-filenames.patch Dropped subpackages:   root-rootd (obsolete - use
 xrootd)   root-proofd (obsolete - use root-xproofd)   root-proof-pq2 New ROOT
 7 subpackage:   root-graf3d-eve7   root-gui-webgui6 Make tutorial/v7/line.cxx
 run in batch mode

---
 proofd.service                                |  12 -
 root-32bit-dataframe.patch                    | 124 +++++++
 ...non-simple-MVT-in-STBRX-optimization.patch |   1 -
 ...owed-test-difference-for-32-bit-ix86.patch |  22 --
 root-crypto.patch                             |  36 --
 root-doc-no-notebooks.patch                   |  16 +-
 root-dont-install-eve7-files.patch            |  39 ++
 root-doxygen-generation-with-python-3.patch   | 248 +++++++++++++
 root-fontconfig.patch                         |   3 +-
 root-js-syntax.patch                          | 114 ------
 root-jupyroot-static.patch                    |   6 +-
 root-memory-usage.patch                       |  15 +-
 root-missing-header.patch                     |  21 --
 root-ppc64-doc.patch                          |  23 +-
 root-set-cache-file-dir.patch                 |  38 --
 root-stressgraphics-ref.patch                 |  33 --
 root-test-compilation-epel7.patch             |  27 --
 root-test-subdirs.patch                       |  36 --
 root-testfiles.sh                             |   2 +-
 root-unbundle-gtest.patch                     |  11 +-
 root-unique-filenames.patch                   |  50 ---
 root-v7-line.patch                            |  32 ++
 root.spec                                     | 333 ++++++++----------
 rootd.service                                 |  12 -
 sources                                       |   4 +-
 25 files changed, 633 insertions(+), 625 deletions(-)
 delete mode 100644 proofd.service
 create mode 100644 root-32bit-dataframe.patch
 delete mode 100644 root-adjust-allowed-test-difference-for-32-bit-ix86.patch
 delete mode 100644 root-crypto.patch
 create mode 100644 root-dont-install-eve7-files.patch
 create mode 100644 root-doxygen-generation-with-python-3.patch
 delete mode 100644 root-js-syntax.patch
 delete mode 100644 root-missing-header.patch
 delete mode 100644 root-set-cache-file-dir.patch
 delete mode 100644 root-stressgraphics-ref.patch
 delete mode 100644 root-test-compilation-epel7.patch
 delete mode 100644 root-test-subdirs.patch
 delete mode 100644 root-unique-filenames.patch
 create mode 100644 root-v7-line.patch
 delete mode 100644 rootd.service

diff --git a/proofd.service b/proofd.service
deleted file mode 100644
index 4972553..0000000
--- a/proofd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=PROOF (The Parallel ROOT Facility)
-Documentation=man:proofd(8)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/proofd
-ExecStart=/usr/bin/proofd $PROOFDOPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
new file mode 100644
index 0000000..250d947
--- /dev/null
+++ b/root-32bit-dataframe.patch
@@ -0,0 +1,124 @@
+diff -ur root-6.16.00.orig/bindings/pyroot/ROOT.py root-6.16.00/bindings/pyroot/ROOT.py
+--- root-6.16.00.orig/bindings/pyroot/ROOT.py	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/bindings/pyroot/ROOT.py	2019-02-12 03:57:19.824223542 +0100
+@@ -379,9 +379,7 @@
+     else:
+         return reshaped_matrix_np
+ 
+-# This Pythonisation is there only for 64 bits builds
+-if (sys.maxsize > 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
+-    _root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
++_root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
+ 
+ 
+ ### RINT command emulation ------------------------------------------------------
+diff -ur root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.16.00/bindings/pyroot/test/CMakeLists.txt
+--- root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/bindings/pyroot/test/CMakeLists.txt	2019-02-11 19:30:17.443068631 +0100
+@@ -4,9 +4,6 @@
+ ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
+ if(NUMPY_FOUND)
+   ROOT_ADD_PYUNITTEST(pyroot_array_interface array_interface.py)
+-  # this excludes RDF for 32 bits builds because of clang/gcc abi issues
+-  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+-    ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
+-  endif()
++  ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
+ endif()
+ 
+diff -ur root-6.16.00.orig/build/unix/makepchinput.py root-6.16.00/build/unix/makepchinput.py
+--- root-6.16.00.orig/build/unix/makepchinput.py	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/build/unix/makepchinput.py	2019-02-12 04:01:47.071320473 +0100
+@@ -261,9 +261,6 @@
+                            "math/vdt",
+                            "tmva/rmva"]
+ 
+-   if (sys.platform != 'win32' and sys.maxsize <= 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
+-      PCHPatternsBlacklist.append("tree/dataframe")
+-
+    accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
+                not isAnyPatternInString(PCHPatternsBlacklist,dirName)
+ 
+diff -ur root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.16.00/cmake/scripts/ROOTConfig.cmake.in
+--- root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/cmake/scripts/ROOTConfig.cmake.in	2019-02-11 19:42:40.603045735 +0100
+@@ -83,7 +83,7 @@
+   set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+   set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+ endif()
+-foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
++foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame ROOTVecOps Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
+   find_library(ROOT_${_cpt}_LIBRARY ${_cpt} HINTS ${ROOT_LIBRARY_DIR})
+   if(ROOT_${_cpt}_LIBRARY)
+     mark_as_advanced(ROOT_${_cpt}_LIBRARY)
+diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config.in
+--- root-6.16.00.orig/config/root-config.in	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/config/root-config.in	2019-02-11 19:42:38.951063533 +0100
+@@ -72,15 +72,10 @@
+ newlib="-lNew"
+ rootglibs="-lGui"
+ rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
+-rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
++rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame -lROOTVecOps-lTree -lTreePlayer\
+           -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
+           -lMultiProc"
+ 
+-if [ `uname -m` != 'i686' ]; then
+-   rootlibs="$rootlibs -lROOTDataFrame"
+-fi
+-
+-
+ if test "$platform" = "win32"; then
+    rootulibs="-include:_G__cpp_setupG__Net        \
+               -include:_G__cpp_setupG__IO         \
+diff -ur root-6.16.00.orig/tree/dataframe/CMakeLists.txt root-6.16.00/tree/dataframe/CMakeLists.txt
+--- root-6.16.00.orig/tree/dataframe/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tree/dataframe/CMakeLists.txt	2019-02-11 19:26:43.236382519 +0100
+@@ -3,11 +3,6 @@
+ # @author Danilo Piparo CERN, Pere Mato CERN
+ ############################################################################
+ 
+-# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
+-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+-  return()
+-endif()
+-
+ if(arrow)
+   list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
+   list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
+diff -ur root-6.16.00.orig/tutorials/CMakeLists.txt root-6.16.00/tutorials/CMakeLists.txt
+--- root-6.16.00.orig/tutorials/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/CMakeLists.txt	2019-02-11 19:29:09.215805630 +0100
+@@ -207,10 +207,6 @@
+       )
+ endif()
+ 
+-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+-  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C)
+-endif()
+-
+ #---These ones are disabled !!! ------------------------------------
+ set(extra_veto
+   htmlex.C
+@@ -262,7 +258,6 @@
+              ${classic_veto}
+              ${pythia_veto}
+              ${root7_veto}
+-             ${bits32_veto}
+              ${xrootd_veto}
+              )
+ 
+@@ -418,13 +413,6 @@
+ 
+   list(REMOVE_ITEM pytutorials ${pyveto})
+ 
+-  if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+-    set(bits32_veto_py dataframe/*.py)
+-    file(GLOB bits32_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py)
+-    list(REMOVE_ITEM pytutorials ${bits32_veto_py})
+-    list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
+-  endif()
+-
+   #---Python tutorials dependencies--------------------------------------
+   set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
+   set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)
diff --git a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
index c5d0b59..5cf51c2 100644
--- a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
+++ b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
@@ -21,4 +21,3 @@ diff -ur root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLoweri
        if (Op1VT.bitsGT(mVT)) {
          int Shift = Op1VT.getSizeInBits() - mVT.getSizeInBits();
          BSwapOp = DAG.getNode(ISD::SRL, dl, Op1VT, BSwapOp,
-Endast i root-6.14.00/interpreter/llvm/src: test
diff --git a/root-adjust-allowed-test-difference-for-32-bit-ix86.patch b/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
deleted file mode 100644
index b7aa84d..0000000
--- a/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e363a175b96bbd1d24f5b4030192b8fb4b525681 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 29 Jun 2018 09:43:01 +0200
-Subject: [PATCH] Adjust allowed test difference for 32-bit ix86
-
----
- math/mathmore/test/VavilovTest.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/math/mathmore/test/VavilovTest.cxx b/math/mathmore/test/VavilovTest.cxx
-index f99e8291046..d5020f8a386 100644
---- a/math/mathmore/test/VavilovTest.cxx
-+++ b/math/mathmore/test/VavilovTest.cxx
-@@ -886,7 +886,7 @@ void VavilovTest::GetCdfTestParams (const Vavilov& v, double& maxabsdiff, double
-    }
-    else {
-       maxabsdiff = 1E-5;
--      maxcdfdiff = 5E-15;
-+      maxcdfdiff = 7E-15;
-    }
- }
- 
diff --git a/root-crypto.patch b/root-crypto.patch
deleted file mode 100644
index 82462c8..0000000
--- a/root-crypto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 40ffee7443df59a9702be993839fe6d7c3a6c1f1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 3 Aug 2018 11:05:24 +0200
-Subject: [PATCH] Add missing libcrypto for undefined references
-
----
- net/rootd/CMakeLists.txt    | 3 ++-
- net/rpdutils/CMakeLists.txt | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/net/rootd/CMakeLists.txt b/net/rootd/CMakeLists.txt
-index 67d1cd05f1b..bc49e5611f7 100644
---- a/net/rootd/CMakeLists.txt
-+++ b/net/rootd/CMakeLists.txt
-@@ -4,6 +4,7 @@
- ############################################################################
- 
- ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
--  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES})
-+  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
-+  BUILTINS OPENSSL)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../rpdutils/res)
-diff --git a/net/rpdutils/CMakeLists.txt b/net/rpdutils/CMakeLists.txt
-index 6a66e4aee7f..ac427424193 100644
---- a/net/rpdutils/CMakeLists.txt
-+++ b/net/rpdutils/CMakeLists.txt
-@@ -40,5 +40,6 @@ set_property(TARGET rpdutil PROPERTY POSITION_INDEPENDENT_CODE ON)
- add_dependencies(rpdutil move_headers)
- 
- ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx
--                    LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} DEPENDENCIES Net)
--
-+  LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
-+  DEPENDENCIES Net
-+  BUILTINS OPENSSL)
diff --git a/root-doc-no-notebooks.patch b/root-doc-no-notebooks.patch
index d2b3625..23ca293 100644
--- a/root-doc-no-notebooks.patch
+++ b/root-doc-no-notebooks.patch
@@ -1,13 +1,12 @@
-diff -ur root-6.08.02.orig/documentation/doxygen/filter.cxx root-6.08.02/documentation/doxygen/filter.cxx
---- root-6.08.02.orig/documentation/doxygen/filter.cxx	2016-12-03 00:07:29.000000000 +0100
-+++ root-6.08.02/documentation/doxygen/filter.cxx	2016-12-06 20:59:12.642635390 +0100
-@@ -306,18 +306,9 @@
+--- root-6.16.00.orig/documentation/doxygen/filter.cxx	2019-02-14 14:44:47.132678348 +0100
++++ root-6.16.00/documentation/doxygen/filter.cxx	2019-02-14 14:45:00.596532589 +0100
+@@ -367,16 +367,7 @@
  
        // notebook found
        if (gLineString.find("\\notebook") != string::npos) {
--         ExecuteCommand(StringFormat("python converttonotebook.py %s %s/notebooks/",
+-         ExecuteCommand(StringFormat("%s converttonotebook.py %s %s/notebooks/",
+-                                          gPythonExec.c_str(),
 -                                          gFileName.c_str(), gOutDir.c_str()));
--
 -         if (gPython){
 -             gLineString = "## ";
 -         }
@@ -15,10 +14,7 @@ diff -ur root-6.08.02.orig/documentation/doxygen/filter.cxx root-6.08.02/documen
 -             gLineString = "/// ";
 -         }
 -         gLineString += StringFormat( "\\htmlonly <a href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
--
 +         gLineString = "";
        }
-+
+ 
        // \macro_output found
-       if (gLineString.find("\\macro_output") != string::npos) {
-          if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()).c_str());
diff --git a/root-dont-install-eve7-files.patch b/root-dont-install-eve7-files.patch
new file mode 100644
index 0000000..e2c0561
--- /dev/null
+++ b/root-dont-install-eve7-files.patch
@@ -0,0 +1,39 @@
+From fb33e1aa0b7c0f2ea539a813df2d41b2c000f5b3 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 14 Feb 2019 13:09:02 +0100
+Subject: [PATCH] Don't install eve7 files if eve7 is not built
+
+---
+ CMakeLists.txt | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74d24d4419..ce38150875 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -446,17 +446,16 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+   else()
+     install(DIRECTORY README DESTINATION ${CMAKE_INSTALL_DOCDIR})
+   endif()
++  if (NOT root7)
++    set(excludeeve7 PATTERN "eve7" EXCLUDE)
++  endif()
+   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
+                          PATTERN "system.rootrc" EXCLUDE
+                          PATTERN "system.rootauthrc" EXCLUDE
+                          PATTERN "system.rootdaemonrc" EXCLUDE
+-                         PATTERN "rootd.rc.d" EXCLUDE
+-                         PATTERN "proofd.rc.d" EXCLUDE
+-                         PATTERN "rootd.xinetd" EXCLUDE
+-                         PATTERN "proofd.xinetd" EXCLUDE
+                          PATTERN "root.mimes" EXCLUDE
+-                         PATTERN "cmake" EXCLUDE
+-                         PATTERN "*.in" EXCLUDE)
++                         PATTERN "*.in" EXCLUDE
++                         ${excludeeve7})
+   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
+   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
+   install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
+-- 
+2.20.1
+
diff --git a/root-doxygen-generation-with-python-3.patch b/root-doxygen-generation-with-python-3.patch
new file mode 100644
index 0000000..05e17c1
--- /dev/null
+++ b/root-doxygen-generation-with-python-3.patch
@@ -0,0 +1,248 @@
+From b8b0d770b71b779812ec07b5689ccb30ea35d56e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 14 Feb 2019 14:22:22 +0100
+Subject: [PATCH] Fix doxygen generation with Python 3
+
+---
+ documentation/doxygen/Makefile             |  3 +++
+ documentation/doxygen/converttonotebook.py |  4 ++--
+ documentation/doxygen/filter.cxx           | 19 +++++++++++++------
+ documentation/doxygen/makeimage.py         |  4 ++--
+ documentation/doxygen/parallelNotebooks.py |  6 +++---
+ tutorials/dataframe/df003_profiles.py      |  5 ++---
+ tutorials/dataframe/df017_vecOpsHEP.py     | 13 ++++++-------
+ tutorials/math/tStudent.py                 |  7 ++++++-
+ 8 files changed, 37 insertions(+), 24 deletions(-)
+
+diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
+index a886c1b729..b50f3cea9a 100644
+--- a/documentation/doxygen/Makefile
++++ b/documentation/doxygen/Makefile
+@@ -1,6 +1,9 @@
+ 
+ .PHONY: filter folders mathjax images doxygen
+ 
++PYTHON_EXECUTABLE ?= /usr/bin/python
++export PYTHON_EXECUTABLE
++
+ DOXYGEN_OUTPUT_DIRECTORY ?= $(HOME)/rootdoc
+ export DOXYGEN_OUTPUT_DIRECTORY
+ export DOXYGEN_SOURCE_DIRECTORY := ../..
+diff --git a/documentation/doxygen/converttonotebook.py b/documentation/doxygen/converttonotebook.py
+index 77aeacedf8..5c9b6cdbd8 100755
+--- a/documentation/doxygen/converttonotebook.py
++++ b/documentation/doxygen/converttonotebook.py
+@@ -727,7 +727,7 @@ def mainfunction(text):
+ 
+     # add the corresponding metadata
+     if extension == "py":
+-        json_data[u'metadata'] = {
++        json_data['metadata'] = {
+             "kernelspec": {
+                 "display_name": "Python 2",
+                 "language": "python",
+@@ -747,7 +747,7 @@ def mainfunction(text):
+             }
+         }
+     elif isCpp():
+-        json_data[u'metadata'] = {
++        json_data['metadata'] = {
+             "kernelspec": {
+                 "display_name": "ROOT C++",
+                 "language": "c++",
+diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
+index a199f8137b..6d0f49aacd 100644
+--- a/documentation/doxygen/filter.cxx
++++ b/documentation/doxygen/filter.cxx
+@@ -106,6 +106,7 @@ string gImageWidth;    // Width of image
+ string gCwd;           // Current working directory
+ string gOutDir;        // Output directory
+ string gSourceDir;     // Source directory
++string gPythonExec;    // Python executable
+ string gOutputName;    // File containing a macro std::out
+ bool   gHeader;        // True if the input file is a header
+ bool   gSource;        // True if the input file is a source file
+@@ -150,6 +151,10 @@ int main(int argc, char *argv[])
+    gSourceDir = getenv("DOXYGEN_SOURCE_DIRECTORY");
+    ReplaceAll(gSourceDir,"\"","");
+ 
++   // Retrieve the python executable
++   gPythonExec = getenv("PYTHON_EXECUTABLE");
++   ReplaceAll(gPythonExec,"\"","");
++
+    // Open the input file name.
+    f = fopen(gFileName.c_str(),"r");
+ 
+@@ -331,10 +336,12 @@ void FilterTutorial()
+          } else {
+             if (gPython) {
+                if (nobatch) {
+-                  ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1 0",
++                  ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1 0",
++                                             gPythonExec.c_str(),
+                                              gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
+                } else {
+-                  ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1 1",
++                  ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1 1",
++                                             gPythonExec.c_str(),
+                                              gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
+                }
+             } else {
+@@ -360,9 +367,9 @@ void FilterTutorial()
+ 
+       // notebook found
+       if (gLineString.find("\\notebook") != string::npos) {
+-         ExecuteCommand(StringFormat("python converttonotebook.py %s %s/notebooks/",
++         ExecuteCommand(StringFormat("%s converttonotebook.py %s %s/notebooks/",
++                                          gPythonExec.c_str(),
+                                           gFileName.c_str(), gOutDir.c_str()));
+-
+          if (gPython){
+              gLineString = "## ";
+          }
+@@ -370,13 +377,13 @@ void FilterTutorial()
+              gLineString = "/// ";
+          }
+          gLineString += StringFormat( "\\htmlonly <a href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
+-
+       }
++
+       // \macro_output found
+       if (gLineString.find("\\macro_output") != string::npos) {
+          remove(gOutputName.c_str());
+          if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()).c_str());
+-         else          ExecuteCommand(StringFormat("python %s", gFileName.c_str()).c_str());
++         else          ExecuteCommand(StringFormat("%s %s", gPythonExec.c_str(), gFileName.c_str()).c_str());
+          ExecuteCommand(StringFormat("sed -i '/Processing/d' %s", gOutputName.c_str()).c_str());
+          rename(gOutputName.c_str(), StringFormat("%s/macros/%s",gOutDir.c_str(), gOutputName.c_str()).c_str());
+          ReplaceAll(gLineString, "\\macro_output", StringFormat("\\include %s",gOutputName.c_str()));
+diff --git a/documentation/doxygen/makeimage.py b/documentation/doxygen/makeimage.py
+index 8c68ac6314..f4f0ee9565 100755
+--- a/documentation/doxygen/makeimage.py
++++ b/documentation/doxygen/makeimage.py
+@@ -12,7 +12,7 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
+     if batch:
+         ROOT.gROOT.SetBatch(1)
+ 
+-    if py: execfile(MacroName)
++    if py: exec(compile(open(MacroName, "rb").read(), MacroName, 'exec'))
+     else: ROOT.gInterpreter.ProcessLine(".x " + MacroName)
+ 
+     if cp:
+@@ -37,4 +37,4 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
+ 
+ if __name__ == "__main__":
+     from sys import argv
+-    makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
+\ No newline at end of file
++    makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
+diff --git a/documentation/doxygen/parallelNotebooks.py b/documentation/doxygen/parallelNotebooks.py
+index 1c8d1f4ef1..6144b72f5a 100644
+--- a/documentation/doxygen/parallelNotebooks.py
++++ b/documentation/doxygen/parallelNotebooks.py
+@@ -52,7 +52,7 @@ try:
+             iterator.remove(element)
+ 
+     for i in newinputs:
+-        print i
++        print(i)
+ 
+     def processInput(inputFile):
+         subprocess.call(['python', 
+@@ -69,5 +69,5 @@ try:
+         parallel(input)
+ 
+ except:
+-    print 'Parallel notebooks converter failed!!'
+-    pass
+\ No newline at end of file
++    print('Parallel notebooks converter failed!!')
++    pass
+diff --git a/tutorials/dataframe/df003_profiles.py b/tutorials/dataframe/df003_profiles.py
+index c80febfaed..cd8c324086 100644
+--- a/tutorials/dataframe/df003_profiles.py
++++ b/tutorials/dataframe/df003_profiles.py
+@@ -12,12 +12,11 @@
+ ## \author Danilo Piparo
+ 
+ import ROOT
+-RDataFrame = ROOT.ROOT.RDataFrame
+ 
+ # A simple helper function to fill a test tree: this makes the example
+ # stand-alone.
+ def fill_tree(treeName, fileName):
+-    d = RDataFrame(25000)
++    d = ROOT.ROOT.RDataFrame(25000)
+     d.Define("px", "gRandom->Gaus()")\
+      .Define("py", "gRandom->Gaus()")\
+      .Define("pz", "sqrt(px * px + py * py)")\
+@@ -35,7 +34,7 @@ columns = ROOT.vector('string')()
+ columns.push_back("px")
+ columns.push_back("py")
+ columns.push_back("pz")
+-d = RDataFrame(treeName, fileName, columns)
++d = ROOT.ROOT.RDataFrame(treeName, fileName, columns)
+ 
+ # Create the profiles
+ hprof1d = d.Profile1D(("hprof1d", "Profile of pz versus px", 64, -4, 4))
+diff --git a/tutorials/dataframe/df017_vecOpsHEP.py b/tutorials/dataframe/df017_vecOpsHEP.py
+index c213c612c0..348b10de5f 100644
+--- a/tutorials/dataframe/df017_vecOpsHEP.py
++++ b/tutorials/dataframe/df017_vecOpsHEP.py
+@@ -11,13 +11,12 @@
+ ## \author Danilo Piparo, Andre Vieira Silva
+ 
+ import ROOT
+-from math import sqrt
+ 
+ filename = ROOT.gROOT.GetTutorialDir().Data() + "/dataframe/df017_vecOpsHEP.root"
+ treename = "myDataset"
+-RDF = ROOT.ROOT.RDataFrame
+ 
+-def WithPyROOT():
++def WithPyROOT(filename):
++    from math import sqrt
+     f = ROOT.TFile(filename)
+     h = ROOT.TH1F("pt", "pt", 16, 0, 4)
+     for event in f.myDataset:
+@@ -26,8 +25,8 @@ def WithPyROOT():
+                h.Fill(sqrt(px*px + py*py))
+     h.DrawCopy()
+ 
+-def WithRDataFrameVecOpsJit():
+-    f = RDF(treename, filename)
++def WithRDataFrameVecOpsJit(treename, filename):
++    f = ROOT.ROOT.RDataFrame(treename, filename)
+     h = f.Define("good_pt", "sqrt(px*px + py*py)[E>100]")\
+          .Histo1D(("pt", "pt", 16, 0, 4), "good_pt")
+     h.DrawCopy()
+@@ -37,6 +36,6 @@ def WithRDataFrameVecOpsJit():
+ c = ROOT.TCanvas()
+ c.Divide(2,1)
+ c.cd(1)
+-WithPyROOT()
++WithPyROOT(filename)
+ c.cd(2)
+-WithRDataFrameVecOpsJit()
++WithRDataFrameVecOpsJit(treename, filename)
+diff --git a/tutorials/math/tStudent.py b/tutorials/math/tStudent.py
+index fe920c843a..12761d49fb 100644
+--- a/tutorials/math/tStudent.py
++++ b/tutorials/math/tStudent.py
+@@ -38,7 +38,12 @@ for i in range(1, 10):
+                                                               3.0))
+ 
+ # For each quantile fill with the pdf
+-xx = [-1.5] + [quant.GetBinContent(i)for i in range(1, 9)] + [1.5]
++xx = []
++xx.append(-1.5)
++for i in range(1, 9):
++    xx.append(quant.GetBinContent(i))
++xx.append(1.5)
++
+ pdfq = []
+ for i in range(9):
+     nbin = int(n * (xx[i+1] - xx[i]) / 3.0 + 1.0)
+-- 
+2.20.1
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 4016fbc..d540b45 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -203,14 +203,13 @@ diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx root-6.14.00/graf2d/a
 diff -ur root-6.14.00.orig/graf2d/graf/CMakeLists.txt root-6.14.00/graf2d/graf/CMakeLists.txt
 --- root-6.14.00.orig/graf2d/graf/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
 +++ root-6.14.00/graf2d/graf/CMakeLists.txt	2018-06-14 10:36:18.869871880 +0200
-@@ -7,6 +7,6 @@
+@@ -7,5 +7,5 @@
  
  ROOT_STANDARD_LIBRARY_PACKAGE(Graf
                                DICTIONARY_OPTIONS "-writeEmptyRootPCM"
 -                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext
 +                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext fontconfig
                                DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
- 
 diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TTF.h
 --- root-6.14.00.orig/graf2d/graf/inc/TTF.h	2018-06-13 12:10:40.000000000 +0200
 +++ root-6.14.00/graf2d/graf/inc/TTF.h	2018-06-14 10:28:26.055618281 +0200
diff --git a/root-js-syntax.patch b/root-js-syntax.patch
deleted file mode 100644
index 1d8a6c8..0000000
--- a/root-js-syntax.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 575c6e2851939afc6d80395c5e4cae9d2e10b433 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 16 Jan 2018 06:40:07 +0100
-Subject: [PATCH 1/3] Quote word default
-
----
- etc/notebook/JsMVA/js/DecisionTree.js     | 6 +++---
- etc/notebook/JsMVA/js/DecisionTree.min.js | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/DecisionTree.js b/etc/notebook/JsMVA/js/DecisionTree.js
-index 5311974202..18eb8eb200 100644
---- a/etc/notebook/JsMVA/js/DecisionTree.js
-+++ b/etc/notebook/JsMVA/js/DecisionTree.js
-@@ -54,7 +54,7 @@
-         },
-         link: {
-             colors:{
--                default: "#ccc",
-+                "default": "#CCC",
-                 focus: "#033A00"
-             },
-             width: "4px",
-@@ -235,7 +235,7 @@
-         linkSelector.transition().duration(style.aduration)
-             .attr("d", d3path)
-             .style("fill", "none")
--            .style("stroke", style.link.colors.default)
-+            .style("stroke", style.link.colors["default"])
-             .style("stroke-width", style.link.width)
-             .attr("id", function(d){return "link"+d.target.id;});
- 
-@@ -251,7 +251,7 @@
-     var path = function(node, i, clear){
-         svg.selectAll("path.link").filter(function(d){return d.target.id==node.id;})
-             .style("stroke-width", (clear) ? style.link.width : style.link.focus_width)
--            .style("stroke", (clear) ? style.link.colors.default : style.link.colors.focus);
-+            .style("stroke", (clear) ? style.link.colors["default"] : style.link.colors.focus);
- 
-         svg.selectAll("g.nodes rect").filter(function(d){return d.id==node.id;})
-             .style("stroke-width", style.node.swidth)
--- 
-2.14.3
-
-From 21d4b8c311a07fa32dc29e76f2a116e7ed429ec0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 16 Jan 2018 06:44:31 +0100
-Subject: [PATCH 2/3] Avoid new syntax for default arguments
-
----
- etc/notebook/JsMVA/js/NeuralNetwork.js     | 5 ++++-
- etc/notebook/JsMVA/js/NeuralNetwork.min.js | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/NeuralNetwork.js b/etc/notebook/JsMVA/js/NeuralNetwork.js
-index 8e52252be3..25ba32c6ec 100644
---- a/etc/notebook/JsMVA/js/NeuralNetwork.js
-+++ b/etc/notebook/JsMVA/js/NeuralNetwork.js
-@@ -506,7 +506,10 @@
-     };
- 
- 
--    NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure=false) {
-+    NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure) {
-+        if (oldStructure===undefined) {
-+            oldStructure = false;
-+        }
-         var div = d3.select("#"+divid);
-         canvas = {
-             width:  Number(div.property("style")["width"].replace("px","")),
--- 
-2.14.3
-
-From 501e9d62367de6c1d4e487dd413277e4d74a5ce1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 16 Jan 2018 06:48:16 +0100
-Subject: [PATCH 3/3] Adapt to filename change in jsroot
-
----
- etc/notebook/JsMVA/js/JsMVA.js               | 2 +-
- etc/notebook/JsMVA/js/JsMVA.min.js           | 2 +-
- etc/notebook/JsMVA/js/NetworkDesigner.js     | 2 +-
- etc/notebook/JsMVA/js/NetworkDesigner.min.js | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/JsMVA.js b/etc/notebook/JsMVA/js/JsMVA.js
-index c8e4522e27..9e474d080e 100644
---- a/etc/notebook/JsMVA/js/JsMVA.js
-+++ b/etc/notebook/JsMVA/js/JsMVA.js
-@@ -32,7 +32,7 @@
- 
-     require.config({
-         paths: {
--            'd3': JSROOT_source_dir+'d3.v3.min',
-+            'd3': JSROOT_source_dir+'d3.min',
-             'JsRootCore': JSROOT_source_dir+'JSRootCore.min',
-             'nn': url+'NeuralNetwork.min',
-             'dtree': url+'DecisionTree.min',
-diff --git a/etc/notebook/JsMVA/js/NetworkDesigner.js b/etc/notebook/JsMVA/js/NetworkDesigner.js
-index ed771fbf81..a744b2371e 100644
---- a/etc/notebook/JsMVA/js/NetworkDesigner.js
-+++ b/etc/notebook/JsMVA/js/NetworkDesigner.js
-@@ -19,7 +19,7 @@
-         paths: {
-             "jquery-connections": baseURL + "jquery.connections.min",
-             "jquery-timing": baseURL + "jquery-timing.min",
--            "d3": "https://root.cern.ch/js/notebook/scripts/d3.v3.min"
-+            "d3": "https://root.cern.ch/js/notebook/scripts/d3.min"
-         },
-         shim: {
-             "jquery-ui": {
--- 
-2.14.3
-
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index 67c8ff4..551e019 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -10,9 +10,9 @@ diff -ur root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.12.04/bi
   
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py root-6.12.04/bindings/pyroot/JupyROOT/utils.py
---- root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/bindings/pyroot/JupyROOT/utils.py	2018-01-08 13:13:40.857391851 +0100
+diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py
+--- root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2017-12-13 08:27:42.000000000 +0100
++++ root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py	2018-01-08 13:13:40.857391851 +0100
 @@ -39,7 +39,7 @@
  _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
  
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index 193a9bf..27fac76 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -1,4 +1,4 @@
-From 3617dd1d911bb5e8fa17a6139dbb887c44dae0fe Mon Sep 17 00:00:00 2001
+From b587d85a5fc8f706362396dc347830f16797b1f2 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 16 Jan 2018 10:25:50 +0100
 Subject: [PATCH] Reduce the needed memory for compilation
@@ -18,18 +18,17 @@ A similar dependency existed before the code latest code changes
 (see commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
 rootcling and libCling.
 ---
- core/metacling/Module.mk          | 6 +++++-
  core/metacling/src/CMakeLists.txt | 4 ++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index e820d144eb..3a1f1ca446 100644
+index eccd77681d..df941eb3b7 100644
 --- a/core/metacling/src/CMakeLists.txt
 +++ b/core/metacling/src/CMakeLists.txt
-@@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling
-         $<TARGET_OBJECTS:Dictgen>
+@@ -86,6 +86,10 @@ ROOT_LINKER_LIBRARY(Cling
          $<TARGET_OBJECTS:MetaCling>
-         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS})
+         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
+ 
 +# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
 +# rootcling_stage1 from being linked in parallel.
 +# This avoids doing two memory consuming operations in parallel.
@@ -38,5 +37,5 @@ index e820d144eb..3a1f1ca446 100644
  if(MSVC)
    set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 -- 
-2.14.3
+2.20.1
 
diff --git a/root-missing-header.patch b/root-missing-header.patch
deleted file mode 100644
index c98116d..0000000
--- a/root-missing-header.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f33ac48317fc1a144d6a7f0a7028e898b664e3a2 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 28 Jun 2018 23:02:46 +0200
-Subject: [PATCH] Add missing include for std::shuffle
-
----
- tmva/tmva/test/TestRandomGenerator.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tmva/tmva/test/TestRandomGenerator.cxx b/tmva/tmva/test/TestRandomGenerator.cxx
-index c8f0f50ee5f..02f941d7f26 100644
---- a/tmva/tmva/test/TestRandomGenerator.cxx
-+++ b/tmva/tmva/test/TestRandomGenerator.cxx
-@@ -10,6 +10,7 @@
- #include "TMVA/Tools.h"
- 
- // Stdlib
-+#include <algorithm>
- #include <iostream>
- 
- // External
diff --git a/root-ppc64-doc.patch b/root-ppc64-doc.patch
index 6ab5ab1..843e94e 100644
--- a/root-ppc64-doc.patch
+++ b/root-ppc64-doc.patch
@@ -1,6 +1,17 @@
-diff -ur root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C
---- root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C	2018-01-15 21:30:10.608693441 +0100
+diff -ur root-6.16.00.orig/tutorials/dataframe/df006_ranges.py root-6.16.00/tutorials/dataframe/df006_ranges.py
+--- root-6.16.00.orig/tutorials/dataframe/df006_ranges.py	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/dataframe/df006_ranges.py	2019-02-14 15:05:28.515294288 +0100
+@@ -4,7 +4,6 @@
+ ## This tutorial shows how to express the concept of ranges when working with the RDataFrame.
+ ##
+ ## \macro_code
+-## \macro_output
+ ##
+ ## \date March 2017
+ ## \author Danilo Piparo
+diff -ur root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C
+--- root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C	2019-02-14 15:00:40.498382881 +0100
 @@ -13,8 +13,6 @@
  /// In this example, shape uncertainties are not taken into account, but
  /// normalization uncertainties are.
@@ -10,9 +21,9 @@ diff -ur root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C root-6.
  /// \macro_code
  ///
  /// \author Kyle Cranmer
-diff -ur root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C
---- root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C	2018-01-15 21:30:39.405371047 +0100
+diff -ur root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C
+--- root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C	2019-02-14 15:00:40.510382752 +0100
 @@ -5,8 +5,6 @@
  ///
  /// This tutorial shows an example of using the BayesianCalculator class
diff --git a/root-set-cache-file-dir.patch b/root-set-cache-file-dir.patch
deleted file mode 100644
index 5ea37d7..0000000
--- a/root-set-cache-file-dir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e8778178329efc8e04ea35643259cfc6ec2f9b51 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 26 Jun 2018 11:11:48 +0200
-Subject: [PATCH] Set cache file dir when using CACHEREAD option Remove
- unnecessary CACHEREAD for local file
-
----
- tmva/tmva/test/DNN/CNN/TestMethodDL.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tmva/tmva/test/DNN/CNN/TestMethodDL.h b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-index 1cac008458e..904fb54cd97 100644
---- a/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-+++ b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-@@ -49,14 +49,12 @@ void testMethodDL_CNN(TString architectureStr)
-    // Load the input data
- 
-    TString fname = "imagesData.root";
--   TString fopt = "CACHEREAD";
--   //auto input = TFile::Open(fname,fopt);
- 
-    // generate the files
-    // 1000 for testing 1000 for training
-    makeImages(2000);
- 
--   auto input = TFile::Open(fname,fopt);
-+   auto input = TFile::Open(fname);
- 
-    R__ASSERT(input);
-    
-@@ -174,6 +172,7 @@ void testMethodDL_DNN(TString architectureStr)
-    // TString fname = "/Users/vladimirilievski/Desktop/Vladimir/GSoC/ROOT-CI/common-version/root/tmva/tmva/test/DNN/CNN/"
-    //                 "dataset/tmva_class_example.root";
-    TString fname = "http://root.cern.ch/files/tmva_class_example.root";
-+   TFile::SetCacheFileDir(".");
-    TString fopt = "CACHEREAD";
-    input = TFile::Open(fname,fopt);
- 
diff --git a/root-stressgraphics-ref.patch b/root-stressgraphics-ref.patch
deleted file mode 100644
index 4ba858c..0000000
--- a/root-stressgraphics-ref.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 034dd2ec5ab656551b84bcec7cc1e7f7e23b663c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 31 May 2018 10:18:58 +0200
-Subject: [PATCH] Adjust reference for Aarch64
-
----
- test/stressGraphics.ref | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 00e034737b8..00899519366 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -30,15 +30,15 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-    29      7419       500     15112       200      8113      4200     18872     21600      7928      7000      7296       500
-    30     17016      5500     18198       100     13764      3400     32434     17400     22157      5000     20823      5500
-    31     30615      8200     27494       150     29010      5900     50520     18200     35724      5400     36690      8200
--   32   3304592       100    712308       100    155478     32000     62688     19000    123056      7000         0         0
--   33    321963      5500    434394      1000     34942      8300     65532     27800     37314     12000    331505      5500
-+   32   3304592       100    712308       500    155478     32000     62688     19000    123056      7000         0         0
-+   33    321963      5500    434394      1100     34942      8300     65532     27800     37314     12000    331505      5500
-    34     36514       300     16815       200     25333      2200     47408     12700     33739      3700     36399       300
-    35    207729       750     87126       100     41853      6200     76094     38000     54717     11000    210497       800
-    36    401670      6500    156361       500     38898     10400     62719     34100     45592     14000    410114      6500
-    37    566142      5000    225206       750     43638      6300     65828     31800     53934      6500    573396      5000
--   38   3738751     35000   1292739       500     84139      3400     60580      9900    133547      3500   3783013     35000
-+   38   3738751     35000   1292739      8000     84139      3400     60580      9900    133547      3500   3783013     35000
-    39   1456993      9000    853193     50000     54777      8600     38425     13500     91242     18100   1463263      7500
--   40     38312       200     56877       100     47205      3900     36524     11800    119641      8000     38121       200
-+   40     38312       200     56877       250     47205      3900     36524     11800    119641      8000     38121       200
-    41     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    42    254604      5000    376027      7000     34608      5000     55666     30400     46534      6500    259594      7000
-    43      4846       150     14075       100     24281       200     33239       600     25303       300      4877       150
diff --git a/root-test-compilation-epel7.patch b/root-test-compilation-epel7.patch
deleted file mode 100644
index 97e31ff..0000000
--- a/root-test-compilation-epel7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cefdf878609deb650b1e548d84efab2ab5c775ce Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 28 Jun 2018 07:38:07 +0200
-Subject: [PATCH] Fix test compilation on RHEL 7
-
----
- tree/dataframe/test/dataframe_resptr.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tree/dataframe/test/dataframe_resptr.cxx b/tree/dataframe/test/dataframe_resptr.cxx
-index 9fef6e54fcf..7c45f016d0c 100644
---- a/tree/dataframe/test/dataframe_resptr.cxx
-+++ b/tree/dataframe/test/dataframe_resptr.cxx
-@@ -45,11 +45,11 @@ TEST(RResultPtr, ImplConv)
-                 return (int)1;
-              }).Histo1D<int>("i");
- 
--   EXPECT_TRUE(m);
-+   EXPECT_TRUE(m != nullptr);
-    EXPECT_FALSE(hasRun);
- 
-    *m;
- 
--   EXPECT_TRUE(m);
-+   EXPECT_TRUE(m != nullptr);
-    EXPECT_TRUE(hasRun);
- }
diff --git a/root-test-subdirs.patch b/root-test-subdirs.patch
deleted file mode 100644
index 67a22c2..0000000
--- a/root-test-subdirs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 41e33db9d17e4d295bf12958398fc3758d3e3a5b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 19 Jun 2018 09:20:21 +0200
-Subject: [PATCH] Include test directory using ROOT_ADD_TEST_SUBDIRECTORY
-
----
- graf2d/gpadv7/CMakeLists.txt     | 5 +----
- graf2d/primitives/CMakeLists.txt | 5 ++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/graf2d/gpadv7/CMakeLists.txt b/graf2d/gpadv7/CMakeLists.txt
-index 525ce415451..9d6870231f3 100644
---- a/graf2d/gpadv7/CMakeLists.txt
-+++ b/graf2d/gpadv7/CMakeLists.txt
-@@ -11,7 +11,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-                               DEPENDENCIES ROOTGraphicsPrimitives)
- 
--
--if(testing)
--   ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
-diff --git a/graf2d/primitives/CMakeLists.txt b/graf2d/primitives/CMakeLists.txt
-index f491eb70a90..d33597805d8 100644
---- a/graf2d/primitives/CMakeLists.txt
-+++ b/graf2d/primitives/CMakeLists.txt
-@@ -11,6 +11,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGraphicsPrimitives
-                               SOURCES ${src}
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
-                               DEPENDENCIES RIO Core)
--if(testing)
--    add_subdirectory(v7/test)
--endif()
-+
-+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
diff --git a/root-testfiles.sh b/root-testfiles.sh
index c3f1d40..5984c5f 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -11,7 +11,7 @@ wget -N ${SITE}/alice3_ref_6.root
 wget -N ${SITE}/alice3.root
 wget -N ${SITE}/ams_ref_4.root
 wget -N ${SITE}/ams.root
-wget -N ${SITE}/atlas_ref_5.root
+wget -N ${SITE}/atlas_ref_6.root
 wget -N ${SITE}/atlas.root
 wget -N ${SITE}/babar2_ref_4.root
 wget -N ${SITE}/babar2.root
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index b5f0531..3daf4b9 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake	2018-11-05 10:30:03.000000000 +0100
-+++ root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake	2018-11-06 10:06:56.399528378 +0100
-@@ -1556,75 +1556,18 @@
+diff -ur root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake	2019-01-25 12:43:58.106532400 +0100
+@@ -1525,76 +1525,18 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -48,6 +48,7 @@ diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.14
 -                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 -                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 -                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-                  -DCMAKE_AR=${CMAKE_AR}
 -                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
 -                  ${EXTRA_GTEST_OPTS}
 -    # Disable install step
@@ -82,4 +83,4 @@ diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.14
 + endif()
  endif()
  
- #---Report non implemented options---------------------------------------------------
+ 
diff --git a/root-unique-filenames.patch b/root-unique-filenames.patch
deleted file mode 100644
index 4a9b5a6..0000000
--- a/root-unique-filenames.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 430c06386ec70a40265c77047ccc1e980322091e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 22 Nov 2018 16:59:55 +0100
-Subject: [PATCH] Make tutorial filenames unique to avoid overwrites
-
----
- tutorials/multicore/mp001_fillHistos.C   | 2 +-
- tutorials/multicore/mt001_fillHistos.C   | 2 +-
- tutorials/multicore/mtbb001_fillHistos.C | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tutorials/multicore/mp001_fillHistos.C b/tutorials/multicore/mp001_fillHistos.C
-index 081d5a3645a..6fd461b4442 100644
---- a/tutorials/multicore/mp001_fillHistos.C
-+++ b/tutorials/multicore/mp001_fillHistos.C
-@@ -23,7 +23,7 @@ Int_t mp001_fillHistos()
-    auto workItem = [](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
--      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+      TFile f(Form("myFile_mp001_%u.root", workerID), "RECREATE");
-       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
-       for (UInt_t i = 0; i < nNumbers; ++i) {
-          h.Fill(workerRndm.Gaus());
-diff --git a/tutorials/multicore/mt001_fillHistos.C b/tutorials/multicore/mt001_fillHistos.C
-index 4a4c08558c1..d293e1f2b7d 100644
---- a/tutorials/multicore/mt001_fillHistos.C
-+++ b/tutorials/multicore/mt001_fillHistos.C
-@@ -26,7 +26,7 @@ Int_t mt001_fillHistos()
-    auto workItem = [](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
--      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+      TFile f(Form("myFile_mt001_%u.root", workerID), "RECREATE");
-       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
-       for (UInt_t i = 0; i < nNumbers; ++i) {
-          h.Fill(workerRndm.Gaus());
-diff --git a/tutorials/multicore/mtbb001_fillHistos.C b/tutorials/multicore/mtbb001_fillHistos.C
-index 9f967938017..64390b2d4cc 100644
---- a/tutorials/multicore/mtbb001_fillHistos.C
-+++ b/tutorials/multicore/mtbb001_fillHistos.C
-@@ -23,7 +23,7 @@ Int_t mtbb001_fillHistos()
-    auto workItem = [](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
--      TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+      TFile f(Form("myFile_mtbb001_%u.root", workerID), "RECREATE");
-       TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4, 4);
-       for (UInt_t i = 0; i < nNumbers; ++i) {
-          h.Fill(workerRndm.Gaus());
diff --git a/root-v7-line.patch b/root-v7-line.patch
new file mode 100644
index 0000000..db9da4a
--- /dev/null
+++ b/root-v7-line.patch
@@ -0,0 +1,32 @@
+From 197ba8fbeccaa49d70a3593ed0e4b1595dd64218 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 14 Feb 2019 13:14:54 +0100
+Subject: [PATCH] Fix v7 line tutorial when running in batch mode
+
+---
+ tutorials/v7/line.cxx | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/tutorials/v7/line.cxx b/tutorials/v7/line.cxx
+index b016fd0371..3256de4ecf 100644
+--- a/tutorials/v7/line.cxx
++++ b/tutorials/v7/line.cxx
+@@ -6,7 +6,6 @@
+ /// "normal" coordinates' system and changing the line color linearly from black
+ /// to red.
+ ///
+-/// \macro_image (line.png)
+ /// \macro_code
+ ///
+ /// \date 2018-03-18
+@@ -43,6 +42,5 @@ void line()
+    canvas->Draw(RLine({0.1_normal, 0.1_normal}, {0.1_normal,0.9_normal}));
+    canvas->Draw(RLine({0.0_normal, 1.0_normal}, {1.0_normal,0.0_normal}));
+ 
+-  // canvas->Show();
+-   canvas->SaveAs("line.png");
++   canvas->Show();
+ }
+-- 
+2.20.1
+
diff --git a/root.spec b/root.spec
index 04665e9..db883bb 100644
--- a/root.spec
+++ b/root.spec
@@ -44,9 +44,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.14.08
+Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -61,13 +61,10 @@ Source0:	%{name}-%{version}.tar.xz
 Source1:	%{name}-testfiles.tar.xz
 #		Script to generate above source
 Source2:	%{name}-testfiles.sh
-#		systemd unit files
-Source3:	rootd.service
-Source4:	proofd.service
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
-#		Don't create documentation notebooks
-Patch1:		%{name}-doc-no-notebooks.patch
+#		Revert the removal of DataFrame for 32 bit architectures
+Patch1:		%{name}-32bit-dataframe.patch
 #		Don't run gui macros
 Patch2:		%{name}-avoid-gui-crash.patch
 #		Unbundle gtest
@@ -78,52 +75,35 @@ Patch4:		%{name}-jupyroot-static.patch
 Patch5:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
 Patch6:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
 Patch7:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
-#		Fix some javascript syntax choking yuicompressor
-#		Adapt d3 path to updated jsroot
-#		https://github.com/root-project/root/pull/1520
-Patch8:		%{name}-js-syntax.patch
-#		Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test dirs
-#		https://github.com/root-project/root/pull/2247
-Patch9:		%{name}-test-subdirs.patch
 #		Reduce memory usage of build
 #		https://github.com/root-project/root/pull/1516
-Patch10:	%{name}-memory-usage.patch
+Patch8:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
 #		Fedora builders run out of memory with the default setting.
-Patch11:	%{name}-memory-arm-x86.patch
+Patch9:		%{name}-memory-arm-x86.patch
 #		Don't run tutorials that crash on ppc64 during doc generation.
 #		Ensures content of doc package is the same on all architecture
 #		so that koji accepts it as a noarch package.
-Patch12:	%{name}-ppc64-doc.patch
-#		Adjust allowed deviation for PDF file sizes (aarch64)
-#		https://github.com/root-project/root/pull/2120
-Patch13:	%{name}-stressgraphics-ref.patch
-#		Adjust Vavilov test for Fedora 29 ix86
-#		https://github.com/root-project/root/pull/2273
-Patch14:	%{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
+Patch10:	%{name}-ppc64-doc.patch
 #		Don't install minicern static library
-Patch15:	%{name}-dont-install-minicern.patch
-#		Set Cache File Dir
-#		https://github.com/root-project/root/pull/2246
-Patch16:	%{name}-set-cache-file-dir.patch
-#		Fix test compilation on EPEL 7
-#		https://github.com/root-project/root/pull/2263
-Patch17:	%{name}-test-compilation-epel7.patch
-#		Missing include for std::shuffle
-#		https://github.com/root-project/root/pull/2267
-Patch18:	%{name}-missing-header.patch
+Patch11:	%{name}-dont-install-minicern.patch
 #		Optimization issue in Geom library
-Patch19:	%{name}-ix32-geom-opt.patch
-#		Missing libcrypto dependency for libSrvAuth
-#		https://github.com/root-project/root/pull/2436
-Patch20:	%{name}-crypto.patch
+Patch12:	%{name}-ix32-geom-opt.patch
 #		Let clang ignore some gcc options it hasn't implemented
 #		https://github.com/root-project/root/pull/2933
-Patch21:	%{name}-clang-ignore-gcc-options.patch
-#		Make tutorial filenames unique to avoid overwrites
-#		https://github.com/root-project/root/pull/3029
-Patch22:	%{name}-unique-filenames.patch
+Patch13:	%{name}-clang-ignore-gcc-options.patch
+#		Make doxygen generation wotk with Python 3
+#		https://github.com/root-project/root/pull/3434
+Patch14:	%{name}-doxygen-generation-with-python-3.patch
+#		Don't create documentation notebooks
+Patch15:	%{name}-doc-no-notebooks.patch
+#		Make tutorial/v7/line.cxx run in batch mode
+#		https://github.com/root-project/root/pull/3435
+Patch16:	%{name}-v7-line.patch
+#		Only install eve7 js files when eve7 is built
+#		https://github.com/root-project/root/pull/3436
+Patch17:	%{name}-dont-install-eve7-files.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -231,7 +211,6 @@ BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
 BuildRequires:	perl-generators
-BuildRequires:	systemd-units
 BuildRequires:	gtest-devel
 BuildRequires:	gmock-devel
 #		Some of the tests call lsb_release
@@ -375,6 +354,8 @@ Requires:	urw-fonts
 Requires:	font(droidsansfallback)
 Obsoletes:	%{name}-ruby < 6.00.00
 Obsoletes:	%{name}-vdt < 6.10.00
+Obsoletes:	%{name}-proof-pq2 < 6.16.00
+Obsoletes:	%{name}-rootd < 6.16.00
 %if %{py3default}
 #		Don't build python2-jupyroot/jsmva packages for Fedora >= 29
 Obsoletes:	python2-jupyroot < %{version}-%{release}
@@ -418,38 +399,6 @@ Obsoletes:	%{name}-reflex < 6.00.00
 Cling is an interactive C++ interpreter, built on top of Clang and
 LLVM compiler infrastructure.
 
-%package proofd
-Summary:	Parallel ROOT Facility - distributed, parallel computing
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	systemd-units
-Requires(post):		systemd-units
-Requires(postun):	systemd-units
-
-%description proofd
-This package contains the PROOF server. Proofd is the core daemon of
-the PROOF (Parallel ROOT Facility) system for distributed parallel
-computing. Installing this package on a machine makes it possible
-for the machine to participate in a parallel computing farm (cluster
-or via the Internet), either as a master or a slave, using a
-transparent interface.
-
-%package rootd
-Summary:	ROOT remote file server
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun):	systemd-units
-Requires(post):		systemd-units
-Requires(postun):	systemd-units
-
-%description rootd
-This package contains the ROOT file server. Rootd is a server for ROOT
-files, serving files over the Internet. Using this daemon, you can
-access files on the machine from anywhere on the Internet, using a
-transparent interface.
-
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
 Provides:	%{name}-python = %{version}-%{release}
@@ -1312,11 +1261,11 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 This package contains the ROOT networking library.
 
 %package net-rpdutils
-Summary:	Authentication utilities used by rootd and proofd
+Summary:	Authentication utilities used by xproofd
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description net-rpdutils
-This package contains authentication utilities used by rootd and proofd.
+This package contains authentication utilities used by xproofd.
 
 %package net-bonjour
 Summary:	Bonjour extension for ROOT
@@ -1460,17 +1409,6 @@ Obsoletes:	%{name}-proof < 6.14.00
 %description proof-player
 This package contains the proof player extension for ROOT.
 
-%package proof-pq2
-Summary:	PROOF Quick Query (pq2)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-
-%description proof-pq2
-Shell-based interface to the PROOF dataset handling.
-
 %package proof-sessionviewer
 Summary:	GUI to browse an interactive PROOF session
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1495,6 +1433,7 @@ Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires:	xrootd-server%{?_isa}
+Obsoletes:	%{name}-proofd < 6.16.00
 
 %description xproof
 This package contains the xproof extension for ROOT. This provides a
@@ -1575,6 +1514,7 @@ ROOT environment.
 Summary:	Toolkit for multivariate data analysis
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1663,6 +1603,7 @@ This package contains the Tree library for ROOT.
 Summary:	A high level interface to ROOT trees
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 #		Library split (tree-dataframe and vecops from tree-player)
@@ -1754,6 +1695,25 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 %description graf-primitives
 This package contains graphics primitives for ROOT 7
 
+%package graf3d-eve7
+Summary:	Event display library for ROOT (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description graf3d-eve7
+This package contains a library for defining event displays in ROOT 7.
+
 %package gui-canvaspainter
 Summary:	Canvas painter (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1781,10 +1741,11 @@ various kinds of data.
 %package gui-qt5webdisplay
 Summary:	Qt5 Web display (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 
 %description gui-qt5webdisplay
-This package contains a Qt5 web display extension for ROOT 7
+This package contains a Qt5 web display extension for ROOT 7.
 %endif
 
 %package gui-webdisplay
@@ -1794,7 +1755,19 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 
 %description gui-webdisplay
-This package contains a web display extension for ROOT 7
+This package contains a web display extension for ROOT 7.
+
+%package gui-webgui6
+Summary:	Web based GUI for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-webgui6
+This package provides a Web based GUI for ROOT.
 
 %package hist-draw
 Summary:	Histogram drawing (ROOT 7)
@@ -1818,7 +1791,10 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%if %{?fedora}%{!?fedora:0} <= 28 && %{?rhel}%{!?rhel:0} <= 7
+# Only relevant for distributions with ppc64 build (ppc64le not affected)
 %patch10 -p1
+%endif
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -1826,11 +1802,6 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1955,7 +1926,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_xxhash:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dafdsmgrd:BOOL=OFF \
-       -Dafs:BOOL=OFF \
        -Dalien:BOOL=OFF \
        -Darrow:BOOL=OFF \
        -Dasimage:BOOL=ON \
@@ -1964,7 +1934,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcastor:BOOL=OFF \
        -Dccache:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
-       -Dchirp:BOOL=OFF \
+       -Dclad:BOOL=OFF \
        -Dcling:BOOL=ON \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
@@ -1985,10 +1955,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
-       -Dgenvector:BOOL=ON \
        -Dgeocad:BOOL=ON \
        -Dgfal:BOOL=ON \
-       -Dglite:BOOL=OFF \
        -Dglobus:BOOL=ON \
        -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
@@ -2035,12 +2003,10 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Drpath:BOOL=OFF \
        -Druby:BOOL=OFF \
        -Druntime_cxxmodules:BOOL=OFF \
-       -Dsapdb:BOOL=OFF \
        -Dshadowpw:BOOL=ON \
        -Dshared:BOOL=ON \
        -Dsoversion:BOOL=ON \
        -Dsqlite:BOOL=ON \
-       -Dsrp:BOOL=OFF \
        -Dssl:BOOL=ON \
        -Dtable:BOOL=ON \
        -Dtcmalloc:BOOL=OFF \
@@ -2052,6 +2018,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-cpu:BOOL=OFF \
 %endif
        -Dtmva-gpu:BOOL=OFF \
+       -Dtmva-pymva:BOOL=ON \
+       -Dtmva-rmva:BOOL=ON \
        -Dunuran:BOOL=ON \
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=OFF \
@@ -2189,11 +2157,6 @@ install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
 install -p -m 644 build/package/debian/application-x-root.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
-# systemd unit files for services
-mkdir -p %{buildroot}%{_unitdir}
-install -p -m 644 %SOURCE3 %{buildroot}%{_unitdir}
-install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
-
 # Move python cli helper to its own directory
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
@@ -2381,12 +2344,9 @@ if [ -z "\$(type jupyter-notebook 2>/dev/null)" ] ; then
    echo jupyter-notebook not found in path. Exiting.
    exit 1
 fi
-jupyter notebook
+jupyter notebook "\$@"
 EOF
 
-# These should be in PATH
-mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
-
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
@@ -2418,15 +2378,10 @@ sed -e 's!/usr/bin/env python!%{__pythondef}!' \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
 
 # Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.rc.d
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
-rm %{buildroot}%{_datadir}/%{name}/daemons/README
 rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
 rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
 rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
 rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
@@ -2434,11 +2389,11 @@ rm %{buildroot}%{_mandir}/man1/g2rootold.1
 rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
 rm %{buildroot}%{_mandir}/man1/roota.1
-rm %{buildroot}%{_mandir}/man1/setup-pq2.1
 rm %{buildroot}%{_includedir}/%{name}/*.cw
 rm %{buildroot}%{_includedir}/%{name}/*.pri
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
+rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
 # Only used on Windows
@@ -2450,7 +2405,6 @@ rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
-rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
 %if %{hadoop} == 0
 rm TFile/P110_THDFSFile.C
@@ -2459,6 +2413,9 @@ rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
 rm TGrid/P020_TGLite.C
+%if %{root7} == 0
+rm TGuiFactory/P030_TWebGuiFactory.C
+%endif
 rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
@@ -2472,6 +2429,9 @@ rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
+%if %{root7} == 0
+rm TVirtualX/P060_TWebVirtualX.C
+%endif
 rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
@@ -2511,6 +2471,7 @@ cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
 # Generate documentation
 pushd documentation/doxygen
 ln -s ../../files files
+ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
 # Create the py-hsimple.root file in advance (needed as input)
 ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
@@ -2521,7 +2482,7 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
     LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
     PYTHONPATH=${PWD}/../../builddir/lib \
-    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
+    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc PYTHON_EXECUTABLE=%{__pythondef}
 mv doc/html %{buildroot}%{_pkgdocdir}/html
 popd
 
@@ -2556,8 +2517,8 @@ pushd runtutorials
 ln -s ../../files files
 ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
 popd
-pushd tmva/tmva/test/DNN/CNN
-ln -s ../../../../../../files files
+pushd tmva/tmva/test/DNN
+ln -s ../../../../../files files
 popd
 pushd tmva/tmva/test/envelope
 ln -s ../../../../../files files
@@ -2578,32 +2539,41 @@ popd
 # - tutorial-multicore-imt101_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
+# - gtest-tree-dataframe-test-datasource-sqlite
+#   reads sqlite data over network:
+#   http://root.cern.ch/files/RSqliteDS_test.sqlite
+#
+# - tutorial-dataframe-df102_NanoAODDimuonAnalysis
+# - tutorial-dataframe-df103_NanoAODHiggsAnalysis
+#   reads input data over network:
+#   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
+#
 # - tutorial-pythia-pythia8
 #   sometimes times out
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8"
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|gtest-tree-dataframe-test-datasource-sqlite|tutorial-dataframe-df102_NanoAODDimuonAnalysis|tutorial-dataframe-df103_NanoAODHiggsAnalysis|tutorial-pythia-pythia8"
 
-%ifarch %{arm}
-# Tests failing on arm on Fedora <= 27
-# https://sft.its.cern.ch/jira/browse/ROOT-8500
-# - test-stressiterators-interpreted
-# - tutorial-hist-sparsehist
-# - tutorial-r-*
-%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
+%ifarch %{ix86}
+%if %{?fedora}%{!?fedora:0} == 28
+# Test failing on ix86 on Fedora 28
+# https://sft.its.cern.ch/jira/browse/ROOT-9893
+# - test-stressgeometry(-interpreted)
+excluded="${excluded}|test-stressgeometry"
 %endif
 %endif
 
 %ifarch ppc64
 # Tests failing on ppc64
 # https://sft.its.cern.ch/jira/browse/ROOT-6434
-# - test-stresshistogram[-interpreted]
-# - test-stressroostats[-interpreted]
-# - test-stresshistofit[-interpreted]
-# - tutorial-roofit-rf511_wsfactory_basic
+# - test-stresshistofit(-interpreted)
+# - test-stresshistogram(-interpreted)
+# - test-stressroostats(-interpreted)
+# - tutorial-dataframe-df006_ranges-py
+# - tutorial-roofit-rf203_ranges-py
+# - tutorial-roofit-rf511_wsfactory_basic(-py)
+# - tutorial-roofit-rf902_numgenconfig-py
 # - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7)
 # - tutorial-roostats-rs701_BayesianCalculator
-# - tutorial-dataframe-df006_ranges-py
-excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-df006_ranges-py"
+excluded="${excluded}|test-stresshistofit|test-stresshistogram|test-stressroostats|tutorial-dataframe-df006_ranges-py|tutorial-roofit-rf203_ranges-py|tutorial-roofit-rf511_wsfactory_basic|tutorial-roofit-rf902_numgenconfig-py|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator"
 %endif
 
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
@@ -2627,32 +2597,6 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %endif
 
-%pre rootd
-# Remove old init config when systemd is used
-/sbin/chkconfig --del rootd >/dev/null 2>&1 || :
-
-%post rootd
-%systemd_post rootd.service
-
-%preun rootd
-%systemd_preun rootd.service
-
-%postun rootd
-%systemd_postun_with_restart rootd.service
-
-%pre proofd
-# Remove old init config when systemd is used
-/sbin/chkconfig --del proofd >/dev/null 2>&1 || :
-
-%post proofd
-%systemd_post proofd.service
-
-%preun proofd
-%systemd_preun proofd.service
-
-%postun proofd
-%systemd_postun_with_restart proofd.service
-
 %post -n python2-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
@@ -2885,12 +2829,14 @@ end
 %if %{root7}
 %ldconfig_scriptlets graf-gpadv7
 %ldconfig_scriptlets graf-primitives
+%ldconfig_scriptlets graf3d-eve7
 %ldconfig_scriptlets gui-canvaspainter
 %ldconfig_scriptlets gui-fitpanelv7
 %ifarch %{qt5_qtwebengine_arches}
 %ldconfig_scriptlets gui-qt5webdisplay
 %endif
 %ldconfig_scriptlets gui-webdisplay
+%ldconfig_scriptlets gui-webgui6
 %ldconfig_scriptlets hist-draw
 %endif
 
@@ -2901,13 +2847,11 @@ end
 %{_bindir}/rootn.exe
 %{_bindir}/roots
 %{_bindir}/roots.exe
-%{_bindir}/ssh2rpd
 %{_mandir}/man1/hadd.1*
 %{_mandir}/man1/root.1*
 %{_mandir}/man1/root.exe.1*
 %{_mandir}/man1/rootn.exe.1*
 %{_mandir}/man1/roots.exe.1*
-%{_mandir}/man1/ssh2rpd.1*
 %{_datadir}/applications/root.desktop
 %{_datadir}/icons/hicolor/48x48/apps/root.png
 %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
@@ -3005,21 +2949,6 @@ end
 %doc %{_pkgdocdir}/test
 %doc %{_pkgdocdir}/tutorials
 
-%files proofd
-%{_bindir}/proofd
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
-%{_mandir}/man1/proofd.1*
-%{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
-%{_unitdir}/proofd.service
-
-%files rootd
-%{_bindir}/rootd
-%{_mandir}/man1/rootd.1*
-%{_unitdir}/rootd.service
-
 %files -n python2-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
@@ -3526,7 +3455,6 @@ end
 %{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
 %{_datadir}/%{name}/plugins/TProof/P040_TProof.C
 %{_datadir}/%{name}/valgrind-root.supp
-%doc %{_pkgdocdir}/README.PROOF
 
 %files proof-bench -f includelist-proof-proofbench
 %{_libdir}/%{name}/libProofBench.*
@@ -3547,10 +3475,6 @@ end
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
 
-%files proof-pq2
-%{_bindir}/pq2*
-%{_mandir}/man1/pq2*.1*
-
 %files proof-sessionviewer -f includelist-gui-sessionviewer
 %{_libdir}/%{name}/libSessionViewer.*
 %{_libdir}/%{name}/libSessionViewer_rdict.pcm
@@ -3560,7 +3484,12 @@ end
 
 %files xproof -f includelist-proof-proofx
 %{_bindir}/proofexecv
+%{_bindir}/proofserv
+%{_bindir}/proofserv.exe
+%{_bindir}/xpdtest
 %{_bindir}/xproofd
+%{_mandir}/man1/proofserv.1*
+%{_mandir}/man1/xpdtest.1*
 %{_mandir}/man1/xproofd.1*
 %{_libdir}/%{name}/libProofx.*
 %{_libdir}/%{name}/libProofx_rdict.pcm
@@ -3672,6 +3601,11 @@ end
 %{_libdir}/%{name}/libROOTGraphicsPrimitives.*
 %{_libdir}/%{name}/libROOTGraphicsPrimitives_rdict.pcm
 
+%files graf3d-eve7 -f includelist-graf3d-eve7
+%{_libdir}/%{name}/libROOTEve.*
+%{_libdir}/%{name}/libROOTEve_rdict.pcm
+%{_datadir}/%{name}/eve7
+
 %files gui-canvaspainter
 %{_libdir}/%{name}/libROOTCanvasPainter.*
 
@@ -3688,12 +3622,39 @@ end
 %{_libdir}/%{name}/libROOTWebDisplay.*
 %{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
 
+%files gui-webgui6 -f includelist-gui-webgui6
+%{_libdir}/%{name}/libWebGui6.*
+%{_libdir}/%{name}/libWebGui6_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
+%{_datadir}/%{name}/plugins/TVirtualX/P060_TWebVirtualX.C
+
 %files hist-draw -f includelist-hist-histdraw
 %{_libdir}/%{name}/libROOTHistDraw.*
 %{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
 %endif
 
 %changelog
+* Mon Feb 11 2019 Mattias Ellert <ellert@ellert.physics.uu.se> - 6.16.00-1
+- Update to 6.16.00
+- Drop patches accepted upstream:
+  - root-adjust-allowed-test-difference-for-32-bit-ix86.patch
+  - root-crypto.patch
+  - root-js-syntax.patch
+  - root-missing-header.patch
+  - root-set-cache-file-dir.patch
+  - root-stressgraphics-ref.patch
+  - root-test-compilation-epel7.patch
+  - root-test-subdirs.patch
+  - root-unique-filenames.patch
+- Dropped subpackages:
+  - root-rootd (obsolete - use xrootd)
+  - root-proofd (obsolete - use root-xproofd)
+  - root-proof-pq2
+- New ROOT 7 subpackage:
+  - root-graf3d-eve7
+  - root-gui-webgui6
+- Make tutorial/v7/line.cxx run in batch mode
+
 * Mon Feb 04 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.14.08-4
 - Remove obsolete /sbin/ldconfig scriptlets
 - The root-core package installs a file in /etc/ld.so.conf.d, so it should
@@ -3780,10 +3741,10 @@ end
   - root-io-xmlparser from root-io-xml
   - root-proof-player from root-proof
 - New ROOT 7 subpackages
-  - graf-gpadv7
-  - graf-primitives
-  - gui-fitpanelv7
-  - gui-qt5webdisplay
+  - root-graf-gpadv7
+  - root-graf-primitives
+  - root-gui-fitpanelv7
+  - root-gui-qt5webdisplay
 - Rename root-guibuilder package to root-gui-builder
 - Create empty .dist-info files so that rpm auto-generates provides
 
diff --git a/rootd.service b/rootd.service
deleted file mode 100644
index 596a3f9..0000000
--- a/rootd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=ROOT file server daemon
-Documentation=man:rootd(8)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/rootd
-ExecStart=/usr/bin/rootd $ROOTDOPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
index 24f942a..bbb7292 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.14.08.tar.xz) = 609139b2e148d5a10f41923f33fa288d9e3bc56f79d741b8b9df98f46556b83244ad71b9f2fd30cf6675a0cc9c46fa3d8e6bfe979c734bb10cec29e60dd8436a
-SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2
+SHA512 (root-6.16.00.tar.xz) = 2e8906f8cf7c4c434e5e695c379f34aee3f421e6370ccff42dcd4519e281c3844760957f434b737c21f2b5bdf86deaf3928a67e1b952b424f2954d2c6a98ee0b
+SHA512 (root-testfiles.tar.xz) = 309231f065f4165b28816f2f511830077f3d1bf8920800b2390bf956481753b304db85719b251e862376bc94a65b3319cff7383fdf9b2a949dc9d7cf0d0114d5

From e68833ced7bf79207677b973b9ee320112780c03 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 17 Feb 2019 09:30:54 +0100
Subject: [PATCH 153/344] Rebuild for readline 8.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index db883bb..4bfb0e4 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3634,6 +3634,9 @@ end
 %endif
 
 %changelog
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.16.00-2
+- Rebuild for readline 8.0
+
 * Mon Feb 11 2019 Mattias Ellert <ellert@ellert.physics.uu.se> - 6.16.00-1
 - Update to 6.16.00
 - Drop patches accepted upstream:

From e02c54a09c6b63cd6222d4445d1dda49490e7be8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 18 Feb 2019 09:29:21 +0100
Subject: [PATCH 154/344] Fix typo in patch (missing space)

---
 root-32bit-dataframe.patch | 2 +-
 root.spec                  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index 250d947..90a4222 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -59,7 +59,7 @@ diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config
  rootglibs="-lGui"
  rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
 -rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
-+rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame -lROOTVecOps-lTree -lTreePlayer\
++rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame -lROOTVecOps -lTree -lTreePlayer\
            -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
            -lMultiProc"
  
diff --git a/root.spec b/root.spec
index 4bfb0e4..0915def 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3634,10 +3634,13 @@ end
 %endif
 
 %changelog
+* Mon Feb 18 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-3
+- Fix typo in patch (missing space)
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.16.00-2
 - Rebuild for readline 8.0
 
-* Mon Feb 11 2019 Mattias Ellert <ellert@ellert.physics.uu.se> - 6.16.00-1
+* Mon Feb 11 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-1
 - Update to 6.16.00
 - Drop patches accepted upstream:
   - root-adjust-allowed-test-difference-for-32-bit-ix86.patch

From 3cde189ab8ca2cc768ae52007779b48e25be6b6c Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Fri, 8 Mar 2019 07:10:52 -0800
Subject: [PATCH 155/344] Rebuilt to change main python from 3.4 to 3.6

---
 root.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 0915def..d2fff96 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -160,8 +160,8 @@ BuildRequires:	python2-devel
 BuildRequires:	python3-devel
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
-BuildRequires:	python34-devel
-BuildRequires:	python36-devel
+BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_other_pkgversion}-devel
 %endif
 BuildRequires:	qt4-devel
 %if %{root7}
@@ -3634,6 +3634,9 @@ end
 %endif
 
 %changelog
+* Fri Mar 08 2019 Troy Dawson <tdawson@redhat.com> - 6.16.00-4
+- Rebuilt to change main python from 3.4 to 3.6
+
 * Mon Feb 18 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-3
 - Fix typo in patch (missing space)
 

From 637fe32582a2eb88c6c94ac231d48220e2d0cea3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 18 May 2019 08:19:09 +0200
Subject: [PATCH 156/344] Build without HDFS support on Fedora 31+   Hadoop is
 FTBFS and uninstallable due to missing Java dependencies Build without HDFS
 support for 32 bit architectures on Fedora 30   Hadoop is not installable due
 to missing Eclipse dependencies

---
 root-v7-line.patch | 27 +++------------------------
 root.spec          | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/root-v7-line.patch b/root-v7-line.patch
index db9da4a..29eed7e 100644
--- a/root-v7-line.patch
+++ b/root-v7-line.patch
@@ -1,16 +1,6 @@
-From 197ba8fbeccaa49d70a3593ed0e4b1595dd64218 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 14 Feb 2019 13:14:54 +0100
-Subject: [PATCH] Fix v7 line tutorial when running in batch mode
-
----
- tutorials/v7/line.cxx | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/tutorials/v7/line.cxx b/tutorials/v7/line.cxx
-index b016fd0371..3256de4ecf 100644
---- a/tutorials/v7/line.cxx
-+++ b/tutorials/v7/line.cxx
+diff -ur root-6.16.00.orig/tutorials/v7/line.cxx root-6.16.00/tutorials/v7/line.cxx
+--- root-6.16.00.orig/tutorials/v7/line.cxx	2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/v7/line.cxx	2019-05-17 11:02:14.378664352 +0200
 @@ -6,7 +6,6 @@
  /// "normal" coordinates' system and changing the line color linearly from black
  /// to red.
@@ -19,14 +9,3 @@ index b016fd0371..3256de4ecf 100644
  /// \macro_code
  ///
  /// \date 2018-03-18
-@@ -43,6 +42,5 @@ void line()
-    canvas->Draw(RLine({0.1_normal, 0.1_normal}, {0.1_normal,0.9_normal}));
-    canvas->Draw(RLine({0.0_normal, 1.0_normal}, {1.0_normal,0.0_normal}));
- 
--  // canvas->Show();
--   canvas->SaveAs("line.png");
-+   canvas->Show();
- }
--- 
-2.20.1
-
diff --git a/root.spec b/root.spec
index d2fff96..813f9ed 100644
--- a/root.spec
+++ b/root.spec
@@ -13,6 +13,18 @@
 %global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 %global py3_other_soabi %([ -x %{__python3_other} ] && %{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
+%if %{?fedora}%{!?fedora:0} >= 31
+# Hadoop is FTBFS and uninstallable due to missing Java dependencies
+%global hadoop 0
+%else
+%if %{?fedora}%{!?fedora:0} >= 30
+# Hadoop is not installable on 32 bit archs due to missing Eclipse dependencies
+%ifarch %{arm} %{ix86}
+%global hadoop 0
+%else
+%global hadoop 1
+%endif
+%else
 %if %{?fedora}%{!?fedora:0} >= 24
 # libhdfs is available for all architectures for Fedora 24 and later.
 # For Fedora 20-23 it was only available on Intel (ix86 and x86_64).
@@ -20,6 +32,8 @@
 %else
 %global hadoop 0
 %endif
+%endif
+%endif
 
 %if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
 # Building the experimental ROOT 7 classes requires c++-14.
@@ -46,7 +60,7 @@
 Name:		root
 Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -66,6 +80,7 @@ Patch0:		%{name}-fontconfig.patch
 #		Revert the removal of DataFrame for 32 bit architectures
 Patch1:		%{name}-32bit-dataframe.patch
 #		Don't run gui macros
+#		https://github.com/root-project/root/pull/3563
 Patch2:		%{name}-avoid-gui-crash.patch
 #		Unbundle gtest
 Patch3:		%{name}-unbundle-gtest.patch
@@ -98,8 +113,7 @@ Patch13:	%{name}-clang-ignore-gcc-options.patch
 Patch14:	%{name}-doxygen-generation-with-python-3.patch
 #		Don't create documentation notebooks
 Patch15:	%{name}-doc-no-notebooks.patch
-#		Make tutorial/v7/line.cxx run in batch mode
-#		https://github.com/root-project/root/pull/3435
+#		Don't run tutorial requiring firefox during doc generation
 Patch16:	%{name}-v7-line.patch
 #		Only install eve7 js files when eve7 is built
 #		https://github.com/root-project/root/pull/3436
@@ -130,7 +144,9 @@ BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:	lz4-devel
 BuildRequires:	xxhash-devel
-BuildRequires:	libAfterImage-devel >= 1.20
+#		Require a version of libAfterImage that is properly linked to
+#		its dependencies
+BuildRequires:	libAfterImage-devel >= 1.20-21
 BuildRequires:	ncurses-devel
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	avahi-devel
@@ -362,6 +378,9 @@ Obsoletes:	python2-jupyroot < %{version}-%{release}
 Obsoletes:	python2-jsmva < %{version}-%{release}
 Obsoletes:	%{name}-rootaas < 6.08.00
 %endif
+%if ! %{hadoop}
+Obsoletes:	%{name}-io-hdfs < %{version}-%{release}
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -596,6 +615,9 @@ Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+#		Require a version of libAfterImage that is properly linked to
+#		its dependencies
+Requires:	libAfterImage >= 1.20-21
 
 %description graf-asimage
 This package contains the AfterImage renderer for ROOT, which allows
@@ -1952,6 +1974,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dexceptions:BOOL=ON \
        -Dexplicitlink:BOOL=ON \
        -Dfftw3:BOOL=ON \
+       -DFIREFOX_EXECUTABLE:PATH=/usr/bin/firefox \
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
@@ -2550,7 +2573,10 @@ popd
 #
 # - tutorial-pythia-pythia8
 #   sometimes times out
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|gtest-tree-dataframe-test-datasource-sqlite|tutorial-dataframe-df102_NanoAODDimuonAnalysis|tutorial-dataframe-df103_NanoAODHiggsAnalysis|tutorial-pythia-pythia8"
+#
+# - tutorial-v7-line.cxx
+#   requires a web browser (and js-jsroot) to render javascript graphics
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|gtest-tree-dataframe-test-datasource-sqlite|tutorial-dataframe-df102_NanoAODDimuonAnalysis|tutorial-dataframe-df103_NanoAODHiggsAnalysis|tutorial-pythia-pythia8|tutorial-v7-line.cxx"
 
 %ifarch %{ix86}
 %if %{?fedora}%{!?fedora:0} == 28
@@ -3634,6 +3660,12 @@ end
 %endif
 
 %changelog
+* Fri May 17 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-5
+- Build without HDFS support on Fedora 31+
+  - Hadoop is FTBFS and uninstallable due to missing Java dependencies
+- Build without HDFS support for 32 bit architectures on Fedora 30
+  - Hadoop is not installable due to missing Eclipse dependencies
+
 * Fri Mar 08 2019 Troy Dawson <tdawson@redhat.com> - 6.16.00-4
 - Rebuilt to change main python from 3.4 to 3.6
 

From dd4b4780b488edbd99508624e8af03f8475cc8c6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 11 Jun 2019 09:14:28 +0200
Subject: [PATCH 157/344] Check python-config for --embed flag (python 3.8
 compatibility)

---
 root.spec | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index 813f9ed..350aa6e 100644
--- a/root.spec
+++ b/root.spec
@@ -60,7 +60,7 @@
 Name:		root
 Version:	6.16.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2083,8 +2083,13 @@ sed 's!bindings/pyroot!bindings/python2!g' CMakeFiles/Makefile2.save \
     > CMakeFiles/Makefile2
 py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
 py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+if pkg-config --exists python3-embed ; then
+    py3i=`pkg-config --cflags-only-I python3-embed | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python3-embed | sed -e 's/-l//' -e 's/\s*$//'`
+else
+    py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+fi
 sed -e "s,${py3i},${py2i},g" -e "s,-l${py3l},-l${py2l},g" \
     -e "s,lib${py3l},lib${py2l},g" -e 's,%{__python3},%{__python2},g' \
     -e 's,lib/libPyROOT,python2/libPyROOT,g' \
@@ -2103,8 +2108,13 @@ sed 's!bindings/pyroot!bindings/python3!g' CMakeFiles/Makefile2.save \
     > CMakeFiles/Makefile2
 py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
 py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+if pkg-config --exists python3-embed ; then
+    py3i=`pkg-config --cflags-only-I python3-embed | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python3-embed | sed -e 's/-l//' -e 's/\s*$//'`
+else
+    py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
+fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
     -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3},g' \
     -e 's,lib/libPyROOT,python3/libPyROOT,g' \
@@ -2125,8 +2135,13 @@ sed 's!bindings/pyroot!bindings/python3oth!g' CMakeFiles/Makefile2.save \
     > CMakeFiles/Makefile2
 py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
 py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-py3i=`pkg-config --cflags-only-I python-%{python3_other_version} | sed -e 's/-I//' -e 's/\s*$//'`
-py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
+if pkg-config --exists python-%{python3_other_version}-embed ; then
+    py3i=`pkg-config --cflags-only-I python-%{python3_other_version}-embed | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python-%{python3_other_version}-embed | sed -e 's/-l//' -e 's/\s*$//'`
+else
+    py3i=`pkg-config --cflags-only-I python-%{python3_other_version} | sed -e 's/-I//' -e 's/\s*$//'`
+    py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
+fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
     -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3_other},g' \
     -e 's,lib/libPyROOT,python3oth/libPyROOT,g' \
@@ -3660,6 +3675,9 @@ end
 %endif
 
 %changelog
+* Tue Jun 11 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-6
+- Check python-config for --embed flag (python 3.8 compatibility)
+
 * Fri May 17 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-5
 - Build without HDFS support on Fedora 31+
   - Hadoop is FTBFS and uninstallable due to missing Java dependencies

From aff214ede0bc640ca66d08bf4fe69107d086af49 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 3 Jul 2019 14:52:40 +0200
Subject: [PATCH 158/344] Update to 6.18.00 Drop patches accepted upstream:  
 root-avoid-gui-crash.patch   root-doxygen-generation-with-python-3.patch Drop
 patches with alternative fix implemented upstream:  
 root-dont-install-eve7-files.patch   root-ix32-geom-opt.patch Drop ppc64
 specific workaround (ppc64 no longer built in Fedora or EPEL):  
 root-ppc64-doc.patch Dropped subpackages:   root-geocad   root-graf-qt  
 root-gui-qt   root-gui-qtgsi   root-io-hdfs   root-io-rfio   root-net-bonjour
   root-net-globus   root-net-ldap   root-net-krb5   root-table Drop
 BuildRequires needed by the dropped subpackages New subpackages:  
 root-graf3d-csg (split off from root-graf3d-gl)   root-gui-browserv7  
 root-tree-ntuple Don't build python2-root for Fedora >= 31 Include desktop
 and MIME type files in source RPM (removed from source) Install man pages in
 correct directory Use correct library names in plugin definitions Don't
 download test input file if it already exists Python 3 fixes Increase test
 tolerance (aarch64 and ppc64le) Fix GDB pretty printers install name and
 location

---
 application-x-root.png                        | Bin 0 -> 4272 bytes
 root-32bit-dataframe.patch                    |  66 +-
 root-avoid-gui-crash.patch                    |  37 -
 ...load-input-file-if-it-already-exists.patch |  64 ++
 root-dont-install-eve7-files.patch            |  39 -
 root-doxygen-generation-with-python-3.patch   | 248 -------
 root-fix-plugin-definition.patch              |  92 +++
 root-fontconfig.patch                         | 139 ++--
 root-ix32-geom-opt.patch                      |  14 -
 root-jupyroot-static.patch                    |  30 +-
 root-man-install.patch                        |  24 +
 root-ppc64-doc.patch                          |  35 -
 root-pretty-printers.patch                    |  50 ++
 root-python3.patch                            |  69 ++
 root-stress-aarch64-ppc64le.patch             |  29 +
 root-testfiles.sh                             |   2 +-
 root-unbundle-gtest.patch                     |  14 +-
 root.desktop                                  |  11 +
 root.png                                      | Bin 0 -> 3494 bytes
 root.spec                                     | 678 ++++++++----------
 root.xml                                      |  15 +
 sources                                       |   4 +-
 22 files changed, 803 insertions(+), 857 deletions(-)
 create mode 100644 application-x-root.png
 delete mode 100644 root-avoid-gui-crash.patch
 create mode 100644 root-dont-download-input-file-if-it-already-exists.patch
 delete mode 100644 root-dont-install-eve7-files.patch
 delete mode 100644 root-doxygen-generation-with-python-3.patch
 create mode 100644 root-fix-plugin-definition.patch
 delete mode 100644 root-ix32-geom-opt.patch
 create mode 100644 root-man-install.patch
 delete mode 100644 root-ppc64-doc.patch
 create mode 100644 root-pretty-printers.patch
 create mode 100644 root-python3.patch
 create mode 100644 root-stress-aarch64-ppc64le.patch
 create mode 100644 root.desktop
 create mode 100644 root.png
 create mode 100644 root.xml

diff --git a/application-x-root.png b/application-x-root.png
new file mode 100644
index 0000000000000000000000000000000000000000..64a62f9c0b492065d48d45dae14a09a89b8f522d
GIT binary patch
literal 4272
zcmV;h5Kr%kP)<h;3K|Lk000e1NJLTq001xm001-y1^@s6%#*v300009a7bBm000XT
z000XT0n*)m`~Uy|2XskIMF-Xh6AUXN&}E~`0000TbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAXI2&AV*0}Q14_VZU6uP24YJ`L;(K){{a7>y{D4^01y;OL_t(&-qo5}a2(fl
zhQHh0vtoe30D~PM0fHn1Qluz}6fHBNtc4O~YNu?=b~%-*R8lTGDf=OQNR|DT%2OVa
zlq*hBVpW_tv1P3mMNt+ZiklXaA}K-u7XTzd?7#qn+1KuS^Dql$z-1su56)%v1G;bD
zKIcFGIsdtL2=F67{V`nK-QBaRSFiqWU=QF0Y^-3Yp`ju5$1oC!ggSTboci&Pe_U{C
zHQ)xc+d5DfM~@!;QVo()exWOy&8kEqp%xYv)R7}c3Qlz0&IyArX-K7rSQded$)agu
zN=4wxAfLRtkGh6>wtn}ou{*s;r9dfcLXc4k@|I~rAWf5nXpA~vEwZPVe?RdNufO~I
zt8HI>;Ab_htr6jHj{02AsXDuH>4&Y2F#wT|z#nY*OeV|acnTq)M$>3<*r+yiT$;wI
zfwP=CGsva}od>`Eor-Iv(`kl>huO4g69B<rkfTSB^6hVbo3HHJwYl?~-%EP$y|+tg
zMx)oJ`*cmql!fKkv14D@fl$^&N6~J#aYvOCzs<m<X_(m*!Gxr@wU!-^?xg~Ui`UfD
z6ac1~#OJGJ^XAR$+xHUZjved&<)41b8u+JwI8&#xXCtOLlg(xu%OY^>*fDnQ+__@o
zOCvX%&N7q95|&vqn9MI+$5c9gr=Z!NVcoFCoNke9SVLOVL4nkC6bel#EL|g$%`$v>
zh}Df=rY>EgX>BX^mJQ5|k24bp@bYh7rt8UPf8zA}M|$hLCw{VF-TWU!p-S_!W`+wR
zgBY<88@E1$QW9lZNF|X7qOmw9PmO`yjmvGLv%`tsUq>dB;m|v8v3dJ_%v>JAZ3rT!
zj@#|V;jnY<+9)r+_~O3;e+LABjIo?Tw~N3^9UU7RW_8DU0$0xG-w_DiKnHXblLO~z
z?CfUd>J;-qgJypla}#4UH#Jk^@!}H(zkKyqoF7}rrztcwHS*+>PXT-%_%|R1n8ufZ
z`0{yK>A=tghNc6G($|x*FcYyjR`x2}AK1p3;{!}j1o71f(&=%w?byNi`A@j-vFF*C
zh%+}AU~Fs*fR|o+sjy5f-~?i24lGB%lHs>{t}Kh-d;q)QpnQtrv(q1w)EuncbPod9
zbnjZuot#3?KwYN`9Yvkb$Hwgs5ekL4cI_&<zLRh`%#kBC96EFez+RAmn^Gv7%@T{n
z2m}JS-R>1QRE}~gnIe%$k)9YO9E?-d){YP&A04>=tM?O)CpdcI0#?dPaPB(mds{&`
zIn#HL?z`?~Vq${K_&9fM-_D5>CwT0!$5>np6+R(uDr5x%hlYljo14R5Ur$R*3sqHB
zUw~GMa3n&<>Qy*5_7YnRF?)5Gt~)nkcY82XF;b>vHXI{5KaO%Na?kFs(AnT4F+WRB
z?>ZXVR^>EiW*SgPDFJXgowrtEr4$c7_#jeBg25m<aJ|2uOgPM@?b|U7om(@iJOVvE
z>lq%tg1gp7d!rw3eH~XXUBvFGW`2GSO*wG8J+!P|Mf>_Y@z+!lizl!aW@zrYv$&p8
z3Mm!4ckd<^i((izrmR-#z>y<I&@_!5J9cpQ#*H*AF0yd=FeCl_WHQ-h2A5t-_dy{L
ztY5bl8;Z{^jgYn^ojrHZ(%M4L#=F_Drh`^r4QqQhV`NiI%mrDzc$&6#8;XW2CG$~M
zy!-A!Jf3P+&<m+DWo&XfX$plH+`k`}r;7IOwM8zM&%arMOB(%k)Of1+Z15tQCb)Y;
z4>pGbo6u--8(1zo{nx_StPD*p%?Ke-N*32#a^}{>q$~no``SZTmX*sAk;{};kB7UG
zNlyOHubG~hD56|IemVL|Nu-p;XAXx0m(9kSt}dihNTqUurX-881YUmw*}yoS=1!zs
zq7KNS@lQPQb;9BB?HvHc2Ok_p*L9Rq2n9}EM-ze;r-S<w2@dbuM=F)RiP1T(77QqL
z#<DDCBQZP<8wi1}X)Gi&oEn?s!tf{yvvbsXstbK(@yh2dN+}K;IDpsdtrUTBG$o3(
zlt{}01nn*tyHhEC@zb9YoSi8~AZK*$qeqS$W#7JEBc;N!BvR(?uW6_SY2h#oEYl<q
z43mjOuyi}t><~@eJ!RZ4yjO^3fvOcF@bJSAlg(yHCR3!7DQrTZX&NYn0{ku)PiYzl
z|MR~HF3cAbt>DbTg9D6@*ON%Z%M!i5u8w#-j;3iiT~0hz4!XPAXtAZ}-LR#wqbLKV
z6qr4Go+KDts2qXAhYw@3**JOf6OMoQA%SR=L^fOY!Wy@mZJ`jS-abGi6fPpAlq8X8
zK+~ESAD_r0nlmaI4dbfP5kjB|jrO`)j7$oT&A{ex<S7VJmLk67(Ek1VsjI869Dzc%
zcXX^`?Yec?9Cmb(4`7~S0$5|{v|qZ&`MyJh!x5xZB$FxPaW{tHV|I2SZ+z}G%Q7*o
zRL)Q((KU_m<QTQhZF#h1vHFxoZb>j#RE6M?M;;-QNz>KUNqcK6h5{k9l0|Y08A4;N
zVT043^6|Ux5{-lz9leIj)rn=<iAGh)I}*3sLpU5mDif56QVOTnS4O{5U0D*c-2JDX
zdYbw9K;<&p*Vl*L?kH9gL)Xv*H?7M~UFQzKcIp&^AAQ8hPtN1@c43;3NR(D5FbsoO
zJc=n(WUM&4Q0O*0>2!J-IBHq#&jI$<Tff8aZ&*2nl#(a}3IVbdmGW>lxZT|Ea*;fK
zoYN=9vD>Ti4wP3X(=<_JNm&t;Fo`7QsdBqWB$LDw@nx#Mr0h8W<jRChO2w{SyGSOJ
zxfhfK%R=S$Y)G|~3wd_{h1+IhyRP$;Gl8bUc?U#^m?;cHXJTv?OD3_D$=KvIQf82r
z_F6PeBaw)glyOx|<^llEJo7Abb2F7AaOlu`xLmHBkRfo`Y-oARMLs5~oKFZ8)pk3N
z`r(1tuQAh6A`wL-5<w{or6e|+9n%EU%91gYB;$&}LV%PRr?%cfJQ*)BT;0$lzWL@G
zG&VL@PU6DLu~>}RxmhxqObM+h32*)$qUeiFgRi=$d0f7SZs~k}`V67DxgwQxp%Dzk
z7`=KOD{T=AC9zbJl(mRv<b<!Z4_p4N6;vU~<Bva1EEeV3wNXx=Im?ylDPrjiC|T??
zmnf9~SUx%mfgu$4c>;7V9A)y-2<cdSscSUs1Ofrfv`##hAel~ZePReHEJCsAn{a)p
z5<UCub4*W9R?dM!+uGZE2ai7TFs%)ZI1IgLI7$_c!YIi!a>_4rbTTaNaYWF9Gfa<-
zk&H%>Qew9`NF~!G<5@s4I5<cw5+`HDnGejPX<}KMz69(WZ@flJOIzg}C>=tGeCsSq
zo|Si@r6q9bZ}8h}v`EE3-}{V>j9^(7iA0R1re^xjo#yPh_o!llY9TrH-eKCCdY853
zOX^<Uqj9?(8SLKu1mSR~xarh|K!^hHc~nHXv&-)(1uhg@9d^9QBqJYwNPSxyW7n_q
z>512<^*QkisIIM|@6=g#ZhMYKf8#RcEqCVm=l3!-HBmVS-g)N$UT<x25kuGV6PByx
za<rChiWF2!#g>|CT7dm8|As3AA7isp$cb^{_6#2n2I#EcOlN!N4b)k#{I9?MDy^;U
zm6f>E5QV~&5~&nQs$2mT#hOYkElQKPR3~!(go1WmM+T=b%s6s>ns{din%TexdlSKn
zpB0mLx%!sx?p9ER0QT(J!{TBvuLEG$w6ZN^p{x~95+%;x3<OX##$yBm<D`Rg%r|w>
zIs=YHldIQ<Fv#9=%UBxmy?b9^a&o+K1P&Z{8=tR^bUMw%#3WhML`hjhwt%!i70YR{
ztjh8#rBtr$evk;!)mjBvNqZnpFc#%Xa28*^kA}{TWK$`mWnm_hHz^Le@!D&z($>~d
zIR^^oF91T<nTyAXX3d*WB)4hKQH!GCOFAJ)3wSLN<oMJ@KJUK*$rRF%gd8rq*L2e6
zZ=)%i;qp5N3C_$i-uHeP@5`gH!cBdlZ8Z#o27f&shXbd6<9Sdq?1CHU1rRa>{}CU>
z<CT23b1SP>cj9etqrRh^Eo&MO8HImn26r}tVVNk)#9^AZq|pm6e1nOJvC0k<+E$fM
zT)j{s3$!Sq69p$q61kA$SDhBkwKo35s;5_iTXTWTKq5>$Q$t5>8{tfvsaPDVL=bNP
zC_i3(^|!RQud1vArO77*=$e+(0hvczEVU9)UX)bHLUySzl$$C`krV={2|T_Q{B3uU
z6;7%g4ytQvxE`1%8;Q_V?5l1Fb;SebG9`Zc>1UXmo6S*LXxMZ;H=(3`kU-Kjmy9k=
zW~IoQCTr3L^9oEMnAD-x<H6_iQ{`<eMy<i=q|0B=bTmpR6w0;lw}`+CFMN}+vC+yA
z_}%Z`<e6ulWp;L&tWwOo-Iz_yxjrSoprs_CSOTA?3QdTmTu`}9c`BX8<#b_9g}B&M
zhh5jnhB7obJdBTCq`tlbODZDG&FIzDthU)WbLK2HQZjUO={GvdGU=$Pp<XFodF5rk
z@r`dWFmU144&?grB^eLJ<6N~FJh=DyGK!^ANhZ#nqq_GFytTDu&*o-l7#X=j&)QDp
zE1%P{_jxp-vt??EPY=CKCKe!(4AHygUaGe3!sYfbdioUWJk_jUw-%x6#Ry!uaFOHZ
z`{};tp4(EW_#4^G%rwo-EzHbJ-9r6tEmnp5(^oHZ@#q2OM+Vvc-M?b>hP#Wi5{Wpc
zKj<TS{W4<{BQ&h;;ITjZ33j`qV!2$ks*|y?Q3eJsuxHO6fZf0VFjJNTZ@lq3&CRW4
z$Ae2pedUKur8PU7$*}*IKj-qv59r*ql_&r9AIppf=s)~6kqc*-4a}2Cr8s%^B2!l{
z-IVjo$1AVA%&JwLE2%<i8LE}fWdJUm`H=e_eVV4WRkxgz&1CU<>WJCm%mij}+6|8P
z9i(;59oTI4vbnKnlt?5(jn|9E<GJm(4S?a{VLTo;&po%7>FLReh%6VIWX8O$@k%LL
zdhX)l^|x5RWgB<ye2i=|#=yBx`Io={8J*qhX=-UjcU7a5g-zG78#+_hQkY8T{s$gl
zY;2Ut$;q2LFf%hlG#cgHx$}I{VVNeuz&!o^0~P0{b&V^RFXL@#rKPKfEjyne5s#wl
z28PX!o=@Te2b@kXN+}Na^)Wj;OU6<(G&B$h1j^9;KmC89T|2g_&W_fK^Qzo#_0NCv
z7wUV@KB2zz+#cnt^(sx%l%{Db`i`b)%H#2<b?bWG1ReyM0KL%7Yy+yu{d_4_g8cgR
z-OZ0~-TZZBCNjVH?eBlJ{JGt37Z3c&jx|1CZHJkPdU{*xAM#dvYLE3_{dv+f7w+5C
z^P*uGj(9vaKX`4r?@-_S!z*DdkOpRfDIiub)|WS4U#SB>_`&z@Ir-7?ku#qSMoRDN
zx-Ne7!@vA<TPk|D=C1BP{rS*qeeb_N&zCb4U;#-W0hpqsr4ao88M#wq;C}%wgs(-`
SupVXr0000<MNUMnLSTaX+!hP~

literal 0
HcmV?d00001

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index 90a4222..5a34084 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,9 +1,9 @@
-diff -ur root-6.16.00.orig/bindings/pyroot/ROOT.py root-6.16.00/bindings/pyroot/ROOT.py
---- root-6.16.00.orig/bindings/pyroot/ROOT.py	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/bindings/pyroot/ROOT.py	2019-02-12 03:57:19.824223542 +0100
-@@ -379,9 +379,7 @@
-     else:
-         return reshaped_matrix_np
+diff -ur root-6.18.00.orig/bindings/pyroot/ROOT.py root-6.18.00/bindings/pyroot/ROOT.py
+--- root-6.18.00.orig/bindings/pyroot/ROOT.py	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/bindings/pyroot/ROOT.py	2019-06-26 15:14:34.684257765 +0200
+@@ -449,9 +449,7 @@
+ # This function is injected as method to the respective classes in Pythonize.cxx.
+ _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
  
 -# This Pythonisation is there only for 64 bits builds
 -if (sys.maxsize > 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
@@ -12,24 +12,26 @@ diff -ur root-6.16.00.orig/bindings/pyroot/ROOT.py root-6.16.00/bindings/pyroot/
  
  
  ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.16.00/bindings/pyroot/test/CMakeLists.txt
---- root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/bindings/pyroot/test/CMakeLists.txt	2019-02-11 19:30:17.443068631 +0100
-@@ -4,9 +4,6 @@
+diff -ur root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.00/bindings/pyroot/test/CMakeLists.txt
+--- root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/bindings/pyroot/test/CMakeLists.txt	2019-06-26 15:22:03.843577496 +0200
+@@ -4,10 +4,7 @@
  ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
  if(NUMPY_FOUND)
    ROOT_ADD_PYUNITTEST(pyroot_array_interface array_interface.py)
 -  # this excludes RDF for 32 bits builds because of clang/gcc abi issues
 -  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+-    ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
 -    ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
 -  endif()
++  ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
 +  ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
  endif()
  
-diff -ur root-6.16.00.orig/build/unix/makepchinput.py root-6.16.00/build/unix/makepchinput.py
---- root-6.16.00.orig/build/unix/makepchinput.py	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/build/unix/makepchinput.py	2019-02-12 04:01:47.071320473 +0100
-@@ -261,9 +261,6 @@
+diff -ur root-6.18.00.orig/build/unix/makepchinput.py root-6.18.00/build/unix/makepchinput.py
+--- root-6.18.00.orig/build/unix/makepchinput.py	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/build/unix/makepchinput.py	2019-06-26 15:14:34.760256972 +0200
+@@ -263,9 +263,6 @@
                             "math/vdt",
                             "tmva/rmva"]
  
@@ -39,9 +41,9 @@ diff -ur root-6.16.00.orig/build/unix/makepchinput.py root-6.16.00/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.16.00/cmake/scripts/ROOTConfig.cmake.in
---- root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/cmake/scripts/ROOTConfig.cmake.in	2019-02-11 19:42:40.603045735 +0100
+diff -ur root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.18.00/cmake/scripts/ROOTConfig.cmake.in
+--- root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/cmake/scripts/ROOTConfig.cmake.in	2019-06-26 15:14:34.768256889 +0200
 @@ -83,7 +83,7 @@
    set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
    set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
@@ -51,9 +53,9 @@ diff -ur root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.16.00/cmake/
    find_library(ROOT_${_cpt}_LIBRARY ${_cpt} HINTS ${ROOT_LIBRARY_DIR})
    if(ROOT_${_cpt}_LIBRARY)
      mark_as_advanced(ROOT_${_cpt}_LIBRARY)
-diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config.in
---- root-6.16.00.orig/config/root-config.in	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/config/root-config.in	2019-02-11 19:42:38.951063533 +0100
+diff -ur root-6.18.00.orig/config/root-config.in root-6.18.00/config/root-config.in
+--- root-6.18.00.orig/config/root-config.in	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/config/root-config.in	2019-06-26 15:41:39.518330743 +0200
 @@ -72,15 +72,10 @@
  newlib="-lNew"
  rootglibs="-lGui"
@@ -63,7 +65,7 @@ diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config
            -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
            -lMultiProc"
  
--if [ `uname -m` != 'i686' ]; then
+-if [ "@UNIX@" != "1" ] || [ "@CMAKE_SIZEOF_VOID_P@" != "4" ]; then
 -   rootlibs="$rootlibs -lROOTDataFrame"
 -fi
 -
@@ -71,9 +73,9 @@ diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config
  if test "$platform" = "win32"; then
     rootulibs="-include:_G__cpp_setupG__Net        \
                -include:_G__cpp_setupG__IO         \
-diff -ur root-6.16.00.orig/tree/dataframe/CMakeLists.txt root-6.16.00/tree/dataframe/CMakeLists.txt
---- root-6.16.00.orig/tree/dataframe/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tree/dataframe/CMakeLists.txt	2019-02-11 19:26:43.236382519 +0100
+diff -ur root-6.18.00.orig/tree/dataframe/CMakeLists.txt root-6.18.00/tree/dataframe/CMakeLists.txt
+--- root-6.18.00.orig/tree/dataframe/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/tree/dataframe/CMakeLists.txt	2019-06-26 15:14:34.827256273 +0200
 @@ -3,11 +3,6 @@
  # @author Danilo Piparo CERN, Pere Mato CERN
  ############################################################################
@@ -86,21 +88,21 @@ diff -ur root-6.16.00.orig/tree/dataframe/CMakeLists.txt root-6.16.00/tree/dataf
  if(arrow)
    list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
    list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
-diff -ur root-6.16.00.orig/tutorials/CMakeLists.txt root-6.16.00/tutorials/CMakeLists.txt
---- root-6.16.00.orig/tutorials/CMakeLists.txt	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tutorials/CMakeLists.txt	2019-02-11 19:29:09.215805630 +0100
-@@ -207,10 +207,6 @@
-       )
+diff -ur root-6.18.00.orig/tutorials/CMakeLists.txt root-6.18.00/tutorials/CMakeLists.txt
+--- root-6.18.00.orig/tutorials/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/tutorials/CMakeLists.txt	2019-06-26 15:18:15.834951333 +0200
+@@ -212,10 +212,6 @@
+                  v7/ntuple/ntpl004_dimuon.C)
  endif()
  
 -if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
--  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C)
+-  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C v7/ntuple/ntpl004_dimuon.C)
 -endif()
 -
  #---These ones are disabled !!! ------------------------------------
  set(extra_veto
    htmlex.C
-@@ -262,7 +258,6 @@
+@@ -266,7 +262,6 @@
               ${classic_veto}
               ${pythia_veto}
               ${root7_veto}
@@ -108,7 +110,7 @@ diff -ur root-6.16.00.orig/tutorials/CMakeLists.txt root-6.16.00/tutorials/CMake
               ${xrootd_veto}
               )
  
-@@ -418,13 +413,6 @@
+@@ -424,13 +419,6 @@
  
    list(REMOVE_ITEM pytutorials ${pyveto})
  
diff --git a/root-avoid-gui-crash.patch b/root-avoid-gui-crash.patch
deleted file mode 100644
index 98c0c1c..0000000
--- a/root-avoid-gui-crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
---- root-6.06.02.orig/gui/gui/src/TGTable.cxx	2016-03-03 10:36:03.000000000 +0100
-+++ root-6.06.02/gui/gui/src/TGTable.cxx	2016-03-29 15:05:17.952862862 +0200
-@@ -72,7 +72,7 @@
- <br><br>
- A simple macro to use a TGTable with a TGSimpleTableInterface:
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    Int_t i = 0, j = 0;
-    UInt_t nrows = 6, ncolumns = 5;
-@@ -111,13 +111,13 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- Begin_Html
- 
- It is also possible to visualise data from a tree. A simple macro
- showing the use of a TTreeTableInterface follows.
- End_Html
--Begin_Macro(source, gui)
-+~~~
- {
-    // Open a root file.
-    TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
-@@ -153,7 +153,7 @@
- 
-    return mainframe;
- }
--End_Macro
-+~~~
- */
- 
- // const TGGC *TGTable::fgDefaultSelectGC = 0;
diff --git a/root-dont-download-input-file-if-it-already-exists.patch b/root-dont-download-input-file-if-it-already-exists.patch
new file mode 100644
index 0000000..78557b2
--- /dev/null
+++ b/root-dont-download-input-file-if-it-already-exists.patch
@@ -0,0 +1,64 @@
+From 3207d634576d48462b41b4aec0e9198293aa4a9f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 28 Jun 2019 09:23:19 +0200
+Subject: [PATCH] Don't download input file if it already exists This allows
+ running the tests with pre-fetched file in environments without network -
+ like e.g. the Fedora package build server
+
+---
+ tutorials/dataframe/df014_CSVDataSource.C  | 3 ++-
+ tutorials/dataframe/df014_CSVDataSource.py | 4 +++-
+ tutorials/dataframe/df015_LazyDataSource.C | 3 ++-
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/tutorials/dataframe/df014_CSVDataSource.C b/tutorials/dataframe/df014_CSVDataSource.C
+index 18a6a5afaf..9f1b69688a 100644
+--- a/tutorials/dataframe/df014_CSVDataSource.C
++++ b/tutorials/dataframe/df014_CSVDataSource.C
+@@ -23,7 +23,8 @@ int df014_CSVDataSource()
+    // The types of the columns will be automatically inferred.
+    auto fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv";
+    auto fileName = "df014_CsvDataSource_MuRun2010B_cpp.csv";
+-   TFile::Cp(fileNameUrl, fileName);
++   if(gSystem->AccessPathName(fileName))
++      TFile::Cp(fileNameUrl, fileName);
+    auto tdf = ROOT::RDF::MakeCsvDataFrame(fileName);
+ 
+    // Now we will apply a first filter based on two columns of the CSV,
+diff --git a/tutorials/dataframe/df014_CSVDataSource.py b/tutorials/dataframe/df014_CSVDataSource.py
+index dd4823d62f..a8668f5e49 100644
+--- a/tutorials/dataframe/df014_CSVDataSource.py
++++ b/tutorials/dataframe/df014_CSVDataSource.py
+@@ -18,12 +18,14 @@
+ ## \author Enric Tejedor
+ 
+ import ROOT
++import os
+ 
+ # Let's first create a RDF that will read from the CSV file.
+ # The types of the columns will be automatically inferred.
+ fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv"
+ fileName = "df014_CsvDataSource_MuRun2010B_py.csv"
+-ROOT.TFile.Cp(fileNameUrl, fileName)
++if not os.path.isfile(fileName):
++    ROOT.TFile.Cp(fileNameUrl, fileName)
+ 
+ MakeCsvDataFrame = ROOT.ROOT.RDF.MakeCsvDataFrame
+ tdf = MakeCsvDataFrame(fileName)
+diff --git a/tutorials/dataframe/df015_LazyDataSource.C b/tutorials/dataframe/df015_LazyDataSource.C
+index fc5567b5bd..f8623ddce4 100644
+--- a/tutorials/dataframe/df015_LazyDataSource.C
++++ b/tutorials/dataframe/df015_LazyDataSource.C
+@@ -25,7 +25,8 @@ int df015_LazyDataSource()
+    // See the tutorial relative to CSV data sources for more details!
+    auto fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv";
+    auto fileName = "df015_CsvDataSource_MuRun2010B.csv";
+-   TFile::Cp(fileNameUrl, fileName);
++   if(gSystem->AccessPathName(fileName))
++      TFile::Cp(fileNameUrl, fileName);
+ 
+    auto csv_rdf = MakeCsvDataFrame(fileName);
+ 
+-- 
+2.21.0
+
diff --git a/root-dont-install-eve7-files.patch b/root-dont-install-eve7-files.patch
deleted file mode 100644
index e2c0561..0000000
--- a/root-dont-install-eve7-files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fb33e1aa0b7c0f2ea539a813df2d41b2c000f5b3 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 14 Feb 2019 13:09:02 +0100
-Subject: [PATCH] Don't install eve7 files if eve7 is not built
-
----
- CMakeLists.txt | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74d24d4419..ce38150875 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -446,17 +446,16 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-   else()
-     install(DIRECTORY README DESTINATION ${CMAKE_INSTALL_DOCDIR})
-   endif()
-+  if (NOT root7)
-+    set(excludeeve7 PATTERN "eve7" EXCLUDE)
-+  endif()
-   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
-                          PATTERN "system.rootrc" EXCLUDE
-                          PATTERN "system.rootauthrc" EXCLUDE
-                          PATTERN "system.rootdaemonrc" EXCLUDE
--                         PATTERN "rootd.rc.d" EXCLUDE
--                         PATTERN "proofd.rc.d" EXCLUDE
--                         PATTERN "rootd.xinetd" EXCLUDE
--                         PATTERN "proofd.xinetd" EXCLUDE
-                          PATTERN "root.mimes" EXCLUDE
--                         PATTERN "cmake" EXCLUDE
--                         PATTERN "*.in" EXCLUDE)
-+                         PATTERN "*.in" EXCLUDE
-+                         ${excludeeve7})
-   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
-   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
-   install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
--- 
-2.20.1
-
diff --git a/root-doxygen-generation-with-python-3.patch b/root-doxygen-generation-with-python-3.patch
deleted file mode 100644
index 05e17c1..0000000
--- a/root-doxygen-generation-with-python-3.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From b8b0d770b71b779812ec07b5689ccb30ea35d56e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 14 Feb 2019 14:22:22 +0100
-Subject: [PATCH] Fix doxygen generation with Python 3
-
----
- documentation/doxygen/Makefile             |  3 +++
- documentation/doxygen/converttonotebook.py |  4 ++--
- documentation/doxygen/filter.cxx           | 19 +++++++++++++------
- documentation/doxygen/makeimage.py         |  4 ++--
- documentation/doxygen/parallelNotebooks.py |  6 +++---
- tutorials/dataframe/df003_profiles.py      |  5 ++---
- tutorials/dataframe/df017_vecOpsHEP.py     | 13 ++++++-------
- tutorials/math/tStudent.py                 |  7 ++++++-
- 8 files changed, 37 insertions(+), 24 deletions(-)
-
-diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
-index a886c1b729..b50f3cea9a 100644
---- a/documentation/doxygen/Makefile
-+++ b/documentation/doxygen/Makefile
-@@ -1,6 +1,9 @@
- 
- .PHONY: filter folders mathjax images doxygen
- 
-+PYTHON_EXECUTABLE ?= /usr/bin/python
-+export PYTHON_EXECUTABLE
-+
- DOXYGEN_OUTPUT_DIRECTORY ?= $(HOME)/rootdoc
- export DOXYGEN_OUTPUT_DIRECTORY
- export DOXYGEN_SOURCE_DIRECTORY := ../..
-diff --git a/documentation/doxygen/converttonotebook.py b/documentation/doxygen/converttonotebook.py
-index 77aeacedf8..5c9b6cdbd8 100755
---- a/documentation/doxygen/converttonotebook.py
-+++ b/documentation/doxygen/converttonotebook.py
-@@ -727,7 +727,7 @@ def mainfunction(text):
- 
-     # add the corresponding metadata
-     if extension == "py":
--        json_data[u'metadata'] = {
-+        json_data['metadata'] = {
-             "kernelspec": {
-                 "display_name": "Python 2",
-                 "language": "python",
-@@ -747,7 +747,7 @@ def mainfunction(text):
-             }
-         }
-     elif isCpp():
--        json_data[u'metadata'] = {
-+        json_data['metadata'] = {
-             "kernelspec": {
-                 "display_name": "ROOT C++",
-                 "language": "c++",
-diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
-index a199f8137b..6d0f49aacd 100644
---- a/documentation/doxygen/filter.cxx
-+++ b/documentation/doxygen/filter.cxx
-@@ -106,6 +106,7 @@ string gImageWidth;    // Width of image
- string gCwd;           // Current working directory
- string gOutDir;        // Output directory
- string gSourceDir;     // Source directory
-+string gPythonExec;    // Python executable
- string gOutputName;    // File containing a macro std::out
- bool   gHeader;        // True if the input file is a header
- bool   gSource;        // True if the input file is a source file
-@@ -150,6 +151,10 @@ int main(int argc, char *argv[])
-    gSourceDir = getenv("DOXYGEN_SOURCE_DIRECTORY");
-    ReplaceAll(gSourceDir,"\"","");
- 
-+   // Retrieve the python executable
-+   gPythonExec = getenv("PYTHON_EXECUTABLE");
-+   ReplaceAll(gPythonExec,"\"","");
-+
-    // Open the input file name.
-    f = fopen(gFileName.c_str(),"r");
- 
-@@ -331,10 +336,12 @@ void FilterTutorial()
-          } else {
-             if (gPython) {
-                if (nobatch) {
--                  ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1 0",
-+                  ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1 0",
-+                                             gPythonExec.c_str(),
-                                              gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
-                } else {
--                  ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1 1",
-+                  ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1 1",
-+                                             gPythonExec.c_str(),
-                                              gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
-                }
-             } else {
-@@ -360,9 +367,9 @@ void FilterTutorial()
- 
-       // notebook found
-       if (gLineString.find("\\notebook") != string::npos) {
--         ExecuteCommand(StringFormat("python converttonotebook.py %s %s/notebooks/",
-+         ExecuteCommand(StringFormat("%s converttonotebook.py %s %s/notebooks/",
-+                                          gPythonExec.c_str(),
-                                           gFileName.c_str(), gOutDir.c_str()));
--
-          if (gPython){
-              gLineString = "## ";
-          }
-@@ -370,13 +377,13 @@ void FilterTutorial()
-              gLineString = "/// ";
-          }
-          gLineString += StringFormat( "\\htmlonly <a href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
--
-       }
-+
-       // \macro_output found
-       if (gLineString.find("\\macro_output") != string::npos) {
-          remove(gOutputName.c_str());
-          if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()).c_str());
--         else          ExecuteCommand(StringFormat("python %s", gFileName.c_str()).c_str());
-+         else          ExecuteCommand(StringFormat("%s %s", gPythonExec.c_str(), gFileName.c_str()).c_str());
-          ExecuteCommand(StringFormat("sed -i '/Processing/d' %s", gOutputName.c_str()).c_str());
-          rename(gOutputName.c_str(), StringFormat("%s/macros/%s",gOutDir.c_str(), gOutputName.c_str()).c_str());
-          ReplaceAll(gLineString, "\\macro_output", StringFormat("\\include %s",gOutputName.c_str()));
-diff --git a/documentation/doxygen/makeimage.py b/documentation/doxygen/makeimage.py
-index 8c68ac6314..f4f0ee9565 100755
---- a/documentation/doxygen/makeimage.py
-+++ b/documentation/doxygen/makeimage.py
-@@ -12,7 +12,7 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
-     if batch:
-         ROOT.gROOT.SetBatch(1)
- 
--    if py: execfile(MacroName)
-+    if py: exec(compile(open(MacroName, "rb").read(), MacroName, 'exec'))
-     else: ROOT.gInterpreter.ProcessLine(".x " + MacroName)
- 
-     if cp:
-@@ -37,4 +37,4 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
- 
- if __name__ == "__main__":
-     from sys import argv
--    makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
-\ No newline at end of file
-+    makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
-diff --git a/documentation/doxygen/parallelNotebooks.py b/documentation/doxygen/parallelNotebooks.py
-index 1c8d1f4ef1..6144b72f5a 100644
---- a/documentation/doxygen/parallelNotebooks.py
-+++ b/documentation/doxygen/parallelNotebooks.py
-@@ -52,7 +52,7 @@ try:
-             iterator.remove(element)
- 
-     for i in newinputs:
--        print i
-+        print(i)
- 
-     def processInput(inputFile):
-         subprocess.call(['python', 
-@@ -69,5 +69,5 @@ try:
-         parallel(input)
- 
- except:
--    print 'Parallel notebooks converter failed!!'
--    pass
-\ No newline at end of file
-+    print('Parallel notebooks converter failed!!')
-+    pass
-diff --git a/tutorials/dataframe/df003_profiles.py b/tutorials/dataframe/df003_profiles.py
-index c80febfaed..cd8c324086 100644
---- a/tutorials/dataframe/df003_profiles.py
-+++ b/tutorials/dataframe/df003_profiles.py
-@@ -12,12 +12,11 @@
- ## \author Danilo Piparo
- 
- import ROOT
--RDataFrame = ROOT.ROOT.RDataFrame
- 
- # A simple helper function to fill a test tree: this makes the example
- # stand-alone.
- def fill_tree(treeName, fileName):
--    d = RDataFrame(25000)
-+    d = ROOT.ROOT.RDataFrame(25000)
-     d.Define("px", "gRandom->Gaus()")\
-      .Define("py", "gRandom->Gaus()")\
-      .Define("pz", "sqrt(px * px + py * py)")\
-@@ -35,7 +34,7 @@ columns = ROOT.vector('string')()
- columns.push_back("px")
- columns.push_back("py")
- columns.push_back("pz")
--d = RDataFrame(treeName, fileName, columns)
-+d = ROOT.ROOT.RDataFrame(treeName, fileName, columns)
- 
- # Create the profiles
- hprof1d = d.Profile1D(("hprof1d", "Profile of pz versus px", 64, -4, 4))
-diff --git a/tutorials/dataframe/df017_vecOpsHEP.py b/tutorials/dataframe/df017_vecOpsHEP.py
-index c213c612c0..348b10de5f 100644
---- a/tutorials/dataframe/df017_vecOpsHEP.py
-+++ b/tutorials/dataframe/df017_vecOpsHEP.py
-@@ -11,13 +11,12 @@
- ## \author Danilo Piparo, Andre Vieira Silva
- 
- import ROOT
--from math import sqrt
- 
- filename = ROOT.gROOT.GetTutorialDir().Data() + "/dataframe/df017_vecOpsHEP.root"
- treename = "myDataset"
--RDF = ROOT.ROOT.RDataFrame
- 
--def WithPyROOT():
-+def WithPyROOT(filename):
-+    from math import sqrt
-     f = ROOT.TFile(filename)
-     h = ROOT.TH1F("pt", "pt", 16, 0, 4)
-     for event in f.myDataset:
-@@ -26,8 +25,8 @@ def WithPyROOT():
-                h.Fill(sqrt(px*px + py*py))
-     h.DrawCopy()
- 
--def WithRDataFrameVecOpsJit():
--    f = RDF(treename, filename)
-+def WithRDataFrameVecOpsJit(treename, filename):
-+    f = ROOT.ROOT.RDataFrame(treename, filename)
-     h = f.Define("good_pt", "sqrt(px*px + py*py)[E>100]")\
-          .Histo1D(("pt", "pt", 16, 0, 4), "good_pt")
-     h.DrawCopy()
-@@ -37,6 +36,6 @@ def WithRDataFrameVecOpsJit():
- c = ROOT.TCanvas()
- c.Divide(2,1)
- c.cd(1)
--WithPyROOT()
-+WithPyROOT(filename)
- c.cd(2)
--WithRDataFrameVecOpsJit()
-+WithRDataFrameVecOpsJit(treename, filename)
-diff --git a/tutorials/math/tStudent.py b/tutorials/math/tStudent.py
-index fe920c843a..12761d49fb 100644
---- a/tutorials/math/tStudent.py
-+++ b/tutorials/math/tStudent.py
-@@ -38,7 +38,12 @@ for i in range(1, 10):
-                                                               3.0))
- 
- # For each quantile fill with the pdf
--xx = [-1.5] + [quant.GetBinContent(i)for i in range(1, 9)] + [1.5]
-+xx = []
-+xx.append(-1.5)
-+for i in range(1, 9):
-+    xx.append(quant.GetBinContent(i))
-+xx.append(1.5)
-+
- pdfq = []
- for i in range(9):
-     nbin = int(n * (xx[i+1] - xx[i]) / 3.0 + 1.0)
--- 
-2.20.1
-
diff --git a/root-fix-plugin-definition.patch b/root-fix-plugin-definition.patch
new file mode 100644
index 0000000..3f3d3d5
--- /dev/null
+++ b/root-fix-plugin-definition.patch
@@ -0,0 +1,92 @@
+From 444b03b6e3ce0554f687443a42310fe01fba276c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 27 Jun 2019 18:24:58 +0200
+Subject: [PATCH 2/2] Use the correct library name in the plugin definitions
+
+---
+ etc/plugins/TFile/P090_TSQLFile.C                     | 4 ++--
+ etc/plugins/TFileStager/P010_TXNetFileStager.C        | 2 +-
+ etc/plugins/TGuiFactory/P030_TWebGuiFactory.C         | 2 +-
+ etc/plugins/TImagePlugin/P010_TASPluginGS.C           | 6 +++---
+ etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C | 2 +-
+ etc/plugins/TVirtualX/P060_TWebVirtualX.C             | 2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/etc/plugins/TFile/P090_TSQLFile.C b/etc/plugins/TFile/P090_TSQLFile.C
+index bc006053d4..a6441ffbef 100644
+--- a/etc/plugins/TFile/P090_TSQLFile.C
++++ b/etc/plugins/TFile/P090_TSQLFile.C
+@@ -1,7 +1,7 @@
+ void P090_TSQLFile()
+ {
+    gPluginMgr->AddHandler("TFile", "^mysql:", "TSQLFile",
+-      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
++      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
+    gPluginMgr->AddHandler("TFile", "^oracle:", "TSQLFile",
+-      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
++      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
+ }
+diff --git a/etc/plugins/TFileStager/P010_TXNetFileStager.C b/etc/plugins/TFileStager/P010_TXNetFileStager.C
+index 884ce7e103..66cd8d575e 100644
+--- a/etc/plugins/TFileStager/P010_TXNetFileStager.C
++++ b/etc/plugins/TFileStager/P010_TXNetFileStager.C
+@@ -2,7 +2,7 @@ void P010_TXNetFileStager()
+ {
+    if (!gEnv->GetValue("XNet.UseOldClient", 0)) {
+       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TNetXNGFileStager",
+-         "NetXNG", "TNetXNGFileStager(const char *)");
++         "NetxNG", "TNetXNGFileStager(const char *)");
+    } else {
+       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TXNetFileStager",
+          "Netx", "TXNetFileStager(const char *)");
+diff --git a/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C b/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
+index 873ba03ebd..fe83cf06e1 100644
+--- a/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
++++ b/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
+@@ -1,4 +1,4 @@
+ void P030_TWebGuiFactory()
+ {
+-   gPluginMgr->AddHandler("TGuiFactory", "web", "TWebGuiFactory", "WebGui", "TWebGuiFactory()");
++   gPluginMgr->AddHandler("TGuiFactory", "web", "TWebGuiFactory", "WebGui6", "TWebGuiFactory()");
+ }
+diff --git a/etc/plugins/TImagePlugin/P010_TASPluginGS.C b/etc/plugins/TImagePlugin/P010_TASPluginGS.C
+index c2e3e45c1a..9e401e74f1 100644
+--- a/etc/plugins/TImagePlugin/P010_TASPluginGS.C
++++ b/etc/plugins/TImagePlugin/P010_TASPluginGS.C
+@@ -1,9 +1,9 @@
+ void P010_TASPluginGS()
+ {
+    gPluginMgr->AddHandler("TImagePlugin", "ps", "TASPluginGS",
+-      "ASPluginGS", "TASPluginGS(const char*)");
++      "ASImage", "TASPluginGS(const char*)");
+    gPluginMgr->AddHandler("TImagePlugin", "eps", "TASPluginGS",
+-      "ASPluginGS", "TASPluginGS(const char*)");
++      "ASImage", "TASPluginGS(const char*)");
+    gPluginMgr->AddHandler("TImagePlugin", "pdf", "TASPluginGS",
+-      "ASPluginGS", "TASPluginGS(const char*)");
++      "ASImage", "TASPluginGS(const char*)");
+ }
+diff --git a/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C b/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
+index 2a919023f9..f1be760487 100644
+--- a/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
++++ b/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
+@@ -1,5 +1,5 @@
+ void P010_TGraphPainter()
+ {
+    gPluginMgr->AddHandler("TVirtualGraphPainter", "*", "TGraphPainter",
+-      "GraphPainter", "TGraphPainter()");
++      "HistPainter", "TGraphPainter()");
+ }
+diff --git a/etc/plugins/TVirtualX/P060_TWebVirtualX.C b/etc/plugins/TVirtualX/P060_TWebVirtualX.C
+index e624c34e7b..26f9650e94 100644
+--- a/etc/plugins/TVirtualX/P060_TWebVirtualX.C
++++ b/etc/plugins/TVirtualX/P060_TWebVirtualX.C
+@@ -1,4 +1,4 @@
+ void P060_TWebVirtualX()
+ {
+-   gPluginMgr->AddHandler("TVirtualX", "web", "TWebVirtualX", "WebGui", "TWebVirtualX(const char*,const char*)");
++   gPluginMgr->AddHandler("TVirtualX", "web", "TWebVirtualX", "WebGui6", "TWebVirtualX(const char*,const char*)");
+ }
+-- 
+2.21.0
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index d540b45..4f39a68 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.14.00.orig/core/base/src/TApplication.cxx root-6.14.00/core/base/src/TApplication.cxx
---- root-6.14.00.orig/core/base/src/TApplication.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/core/base/src/TApplication.cxx	2018-06-14 10:28:26.052618314 +0200
-@@ -277,18 +277,11 @@
+diff -ur root-6.18.00.orig/core/base/src/TApplication.cxx root-6.18.00/core/base/src/TApplication.cxx
+--- root-6.18.00.orig/core/base/src/TApplication.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/core/base/src/TApplication.cxx	2019-06-26 15:00:32.048047903 +0200
+@@ -267,18 +267,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.14.00.orig/core/base/src/TApplication.cxx root-6.14.00/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -302,7 +295,6 @@
+@@ -292,7 +285,6 @@
        }
     }
  #endif
@@ -30,21 +30,20 @@ diff -ur root-6.14.00.orig/core/base/src/TApplication.cxx root-6.14.00/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.14.00.orig/graf2d/asimage/CMakeLists.txt root-6.14.00/graf2d/asimage/CMakeLists.txt
---- root-6.14.00.orig/graf2d/asimage/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/asimage/CMakeLists.txt	2018-06-14 10:32:01.365570910 +0200
-@@ -15,7 +15,7 @@
-                               HEADERS TASImage.h TASImagePlugin.h TASPluginGS.h
-                               SOURCES TASImage.cxx TASPluginGS.cxx
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB
-+                              LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB
-                               DEPENDENCIES Graf BUILTINS AFTERIMAGE)
- 
- 
-diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx root-6.14.00/graf2d/asimage/src/TASImage.cxx
---- root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/asimage/src/TASImage.cxx	2018-06-14 10:28:26.054618292 +0200
+diff -ur root-6.18.00.orig/graf2d/asimage/CMakeLists.txt root-6.18.00/graf2d/asimage/CMakeLists.txt
+--- root-6.18.00.orig/graf2d/asimage/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/asimage/CMakeLists.txt	2019-06-26 15:05:32.584912789 +0200
+@@ -26,6 +26,7 @@
+     ${FREETYPE_LIBRARIES}
+     ${X11_LIBRARIES}
+     ZLIB::ZLIB
++    fontconfig
+   DEPENDENCIES
+     Core
+     Graf
+diff -ur root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx root-6.18.00/graf2d/asimage/src/TASImage.cxx
+--- root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/asimage/src/TASImage.cxx	2019-06-26 15:00:32.062047757 +0200
 @@ -110,6 +110,8 @@
  #   include <draw.h>
  }
@@ -200,19 +199,20 @@ diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx root-6.14.00/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.14.00.orig/graf2d/graf/CMakeLists.txt root-6.14.00/graf2d/graf/CMakeLists.txt
---- root-6.14.00.orig/graf2d/graf/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/graf/CMakeLists.txt	2018-06-14 10:36:18.869871880 +0200
-@@ -7,5 +7,5 @@
- 
- ROOT_STANDARD_LIBRARY_PACKAGE(Graf
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext
-+                              LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext fontconfig
-                               DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
-diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TTF.h
---- root-6.14.00.orig/graf2d/graf/inc/TTF.h	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/graf/inc/TTF.h	2018-06-14 10:28:26.055618281 +0200
+diff -ur root-6.18.00.orig/graf2d/graf/CMakeLists.txt root-6.18.00/graf2d/graf/CMakeLists.txt
+--- root-6.18.00.orig/graf2d/graf/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/graf/CMakeLists.txt	2019-06-26 15:03:42.153064782 +0200
+@@ -87,6 +87,7 @@
+     ${FREETYPE_LIBRARIES}
+     ZLIB::ZLIB
+     mathtext
++    fontconfig
+   DEPENDENCIES
+     Hist
+     Matrix
+diff -ur root-6.18.00.orig/graf2d/graf/inc/TTF.h root-6.18.00/graf2d/graf/inc/TTF.h
+--- root-6.18.00.orig/graf2d/graf/inc/TTF.h	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/graf/inc/TTF.h	2019-06-26 15:00:32.063047746 +0200
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -224,9 +224,9 @@ diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.14.00.orig/graf2d/graf/src/TTF.cxx root-6.14.00/graf2d/graf/src/TTF.cxx
---- root-6.14.00.orig/graf2d/graf/src/TTF.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/graf/src/TTF.cxx	2018-06-14 10:28:26.055618281 +0200
+diff -ur root-6.18.00.orig/graf2d/graf/src/TTF.cxx root-6.18.00/graf2d/graf/src/TTF.cxx
+--- root-6.18.00.orig/graf2d/graf/src/TTF.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/graf/src/TTF.cxx	2019-06-26 15:00:32.064047736 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -787,19 +787,20 @@ diff -ur root-6.14.00.orig/graf2d/graf/src/TTF.cxx root-6.14.00/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.14.00.orig/graf2d/postscript/CMakeLists.txt root-6.14.00/graf2d/postscript/CMakeLists.txt
---- root-6.14.00.orig/graf2d/postscript/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/postscript/CMakeLists.txt	2018-06-14 10:35:47.829194226 +0200
-@@ -5,5 +5,5 @@
- 
- ROOT_STANDARD_LIBRARY_PACKAGE(Postscript
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES  ZLIB::ZLIB mathtext
-+                              LIBRARIES  ZLIB::ZLIB mathtext fontconfig
-                               DEPENDENCIES Graf)
-diff -ur root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.14.00/graf2d/postscript/src/TPostScript.cxx
---- root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf2d/postscript/src/TPostScript.cxx	2018-06-14 10:28:26.057618259 +0200
+diff -ur root-6.18.00.orig/graf2d/postscript/CMakeLists.txt root-6.18.00/graf2d/postscript/CMakeLists.txt
+--- root-6.18.00.orig/graf2d/postscript/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/postscript/CMakeLists.txt	2019-06-26 15:06:11.017511871 +0200
+@@ -21,6 +21,7 @@
+   LIBRARIES
+     ZLIB::ZLIB
+     mathtext
++    fontconfig
+   DEPENDENCIES
+     Graf
+ )
+diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/graf2d/postscript/src/TPostScript.cxx
+--- root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf2d/postscript/src/TPostScript.cxx	2019-06-26 15:00:32.065047726 +0200
 @@ -229,6 +229,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -1059,20 +1060,20 @@ diff -ur root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.14.00/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.14.00.orig/graf3d/gl/CMakeLists.txt root-6.14.00/graf3d/gl/CMakeLists.txt
---- root-6.14.00.orig/graf3d/gl/CMakeLists.txt	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf3d/gl/CMakeLists.txt	2018-06-14 10:28:26.057618259 +0200
-@@ -41,6 +41,6 @@
-                               HEADERS ${headers}
-                               SOURCES ${sources}
-                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
--                              LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES}
-+                              LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig
-                               DEPENDENCIES Hist Gui Ged
-                               INSTALL_OPTIONS ${installoptions})
-diff -ur root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.14.00/graf3d/gl/src/TGLFontManager.cxx
---- root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf3d/gl/src/TGLFontManager.cxx	2018-06-14 10:28:26.058618248 +0200
+diff -ur root-6.18.00.orig/graf3d/gl/CMakeLists.txt root-6.18.00/graf3d/gl/CMakeLists.txt
+--- root-6.18.00.orig/graf3d/gl/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf3d/gl/CMakeLists.txt	2019-06-26 15:02:38.318730684 +0200
+@@ -206,6 +206,7 @@
+     ${FTGL_LIBRARIES}
+     ${GL2PS_LIBRARIES}
+     ${X11_LIBRARIES}
++    fontconfig
+   DEPENDENCIES
+     Hist
+     Gui
+diff -ur root-6.18.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.18.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.18.00.orig/graf3d/gl/src/TGLFontManager.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf3d/gl/src/TGLFontManager.cxx	2019-06-26 15:00:32.066047715 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1328,9 +1329,9 @@ diff -ur root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.14.00/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.14.00.orig/graf3d/gl/src/TGLText.cxx root-6.14.00/graf3d/gl/src/TGLText.cxx
---- root-6.14.00.orig/graf3d/gl/src/TGLText.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/graf3d/gl/src/TGLText.cxx	2018-06-14 10:28:26.058618248 +0200
+diff -ur root-6.18.00.orig/graf3d/gl/src/TGLText.cxx root-6.18.00/graf3d/gl/src/TGLText.cxx
+--- root-6.18.00.orig/graf3d/gl/src/TGLText.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/graf3d/gl/src/TGLText.cxx	2019-06-26 15:00:32.066047715 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1465,9 +1466,9 @@ diff -ur root-6.14.00.orig/graf3d/gl/src/TGLText.cxx root-6.14.00/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.14.00.orig/gui/gui/src/TGApplication.cxx root-6.14.00/gui/gui/src/TGApplication.cxx
---- root-6.14.00.orig/gui/gui/src/TGApplication.cxx	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/gui/gui/src/TGApplication.cxx	2018-06-14 10:28:26.058618248 +0200
+diff -ur root-6.18.00.orig/gui/gui/src/TGApplication.cxx root-6.18.00/gui/gui/src/TGApplication.cxx
+--- root-6.18.00.orig/gui/gui/src/TGApplication.cxx	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/gui/gui/src/TGApplication.cxx	2019-06-26 15:00:32.066047715 +0200
 @@ -83,20 +83,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-ix32-geom-opt.patch b/root-ix32-geom-opt.patch
deleted file mode 100644
index 153629b..0000000
--- a/root-ix32-geom-opt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/geom/geom/CMakeLists.txt b/geom/geom/CMakeLists.txt
-index 520be8b5d5..d197cc3db3 100644
---- a/geom/geom/CMakeLists.txt
-+++ b/geom/geom/CMakeLists.txt
-@@ -24,7 +24,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Geom
-                               HEADERS ${headers1} ${headers2}
-                               DEPENDENCIES Thread RIO MathCore)
- 
--# GCC 4.x has bugs with -O3 or -Ofast that break Geom
--if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-+# 32 bit ix86 has bugs with -O3 or -Ofast that break Geom
-+if(CMAKE_COMPILER_IS_GNUCXX AND ROOT_ARCHITECTURE STREQUAL "linux")
-   target_compile_options(Geom PRIVATE -O2)
- endif()
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index 551e019..bb8e721 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.12.04/bindings/pyroot/JsMVA/JPyInterface.py
---- root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/bindings/pyroot/JsMVA/JPyInterface.py	2018-01-08 13:07:08.088711528 +0100
+diff -ur root-6.18.00.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.18.00/bindings/pyroot/JsMVA/JPyInterface.py
+--- root-6.18.00.orig/bindings/pyroot/JsMVA/JPyInterface.py	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/bindings/pyroot/JsMVA/JPyInterface.py	2019-06-28 22:54:03.937480738 +0200
 @@ -188,7 +188,7 @@
  ## Class for creating the output scripts and inserting them to cell output
  class JsDraw:
@@ -10,9 +10,9 @@ diff -ur root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.12.04/bi
   
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py
---- root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py	2018-01-08 13:13:40.857391851 +0100
+diff -ur root-6.18.00.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.18.00/bindings/pyroot/JupyROOT/helpers/utils.py
+--- root-6.18.00.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/bindings/pyroot/JupyROOT/helpers/utils.py	2019-06-28 22:54:03.938480727 +0200
 @@ -39,7 +39,7 @@
  _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
  
@@ -22,9 +22,9 @@ diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.12.0
  _jsCanvasWidth = 800
  _jsCanvasHeight = 600
  
-diff -ur root-6.12.04.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.12.04/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.12.04.orig/etc/notebook/JsMVA/js/JsMVA.js	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/etc/notebook/JsMVA/js/JsMVA.js	2018-01-08 13:20:04.248138322 +0100
+diff -ur root-6.18.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.18.00/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.18.00.orig/etc/notebook/JsMVA/js/JsMVA.js	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/etc/notebook/JsMVA/js/JsMVA.js	2019-06-28 22:54:03.938480727 +0200
 @@ -16,7 +16,7 @@
  
  (function(factory){
@@ -34,3 +34,15 @@ diff -ur root-6.12.04.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.12.04/etc/noteb
  
      var url = "";
      if (requirejs.s.contexts.hasOwnProperty("_")) {
+diff -ur root-6.18.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.18.00/etc/notebook/JsMVA/js/NetworkDesigner.js
+--- root-6.18.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/etc/notebook/JsMVA/js/NetworkDesigner.js	2019-06-29 07:08:46.582682582 +0200
+@@ -19,7 +19,7 @@
+         paths: {
+             "jquery-connections": baseURL + "jquery.connections.min",
+             "jquery-timing": baseURL + "jquery-timing.min",
+-            "d3": "https://root.cern.ch/js/notebook/scripts/d3.min"
++            "d3": "/static/jsroot/scripts/d3.min"
+         },
+         shim: {
+             "jquery-ui": {
diff --git a/root-man-install.patch b/root-man-install.patch
new file mode 100644
index 0000000..b5d54e1
--- /dev/null
+++ b/root-man-install.patch
@@ -0,0 +1,24 @@
+From 3f1e65654ddec561e5161d0f62367497d16aa223 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 27 Jun 2019 18:22:13 +0200
+Subject: [PATCH 1/2] Install generated man pages in the correct subdirectory
+ (man/man1)
+
+---
+ cmake/modules/RootNewMacros.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
+index 0780ea5a5a..58e403a249 100644
+--- a/cmake/modules/RootNewMacros.cmake
++++ b/cmake/modules/RootNewMacros.cmake
+@@ -1540,5 +1540,5 @@ function(generateManual name input output)
+       ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/build/misc/argparse2help.py ${input} ${output}
+   )
+ 
+-  install(FILES ${output} DESTINATION ${CMAKE_INSTALL_MANDIR})
++  install(FILES ${output} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ endfunction()
+-- 
+2.21.0
+
diff --git a/root-ppc64-doc.patch b/root-ppc64-doc.patch
deleted file mode 100644
index 843e94e..0000000
--- a/root-ppc64-doc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur root-6.16.00.orig/tutorials/dataframe/df006_ranges.py root-6.16.00/tutorials/dataframe/df006_ranges.py
---- root-6.16.00.orig/tutorials/dataframe/df006_ranges.py	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tutorials/dataframe/df006_ranges.py	2019-02-14 15:05:28.515294288 +0100
-@@ -4,7 +4,6 @@
- ## This tutorial shows how to express the concept of ranges when working with the RDataFrame.
- ##
- ## \macro_code
--## \macro_output
- ##
- ## \date March 2017
- ## \author Danilo Piparo
-diff -ur root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C
---- root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C	2019-02-14 15:00:40.498382881 +0100
-@@ -13,8 +13,6 @@
- /// In this example, shape uncertainties are not taken into account, but
- /// normalization uncertainties are.
- ///
--/// \macro_image
--/// \macro_output
- /// \macro_code
- ///
- /// \author Kyle Cranmer
-diff -ur root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C
---- root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C	2019-02-14 15:00:40.510382752 +0100
-@@ -5,8 +5,6 @@
- ///
- /// This tutorial shows an example of using the BayesianCalculator class
- ///
--/// \macro_image
--/// \macro_output
- /// \macro_code
- ///
- /// \author Gregory Schott
diff --git a/root-pretty-printers.patch b/root-pretty-printers.patch
new file mode 100644
index 0000000..eb198e7
--- /dev/null
+++ b/root-pretty-printers.patch
@@ -0,0 +1,50 @@
+From 88f6e1b332489582f457d17afd6a2a6f6a4f988d Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 1 Jul 2019 08:56:27 +0200
+Subject: [PATCH] Install GDB pretty printers with correct filename when using
+ soversion
+
+The name of the pretty printer script must match the name of the
+binary, not a symlink. When soversion is used the unversioned .so file
+is a symlink to the versioned library file.
+---
+ build/CMakeLists.txt | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index b84481041b..03644b6c00 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -20,12 +20,23 @@ ROOT_EXECUTABLE(rmkdepend
+ )
+ 
+ IF(CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo")
+-  file(COPY "gdbPrinters/"
+-       DESTINATION ${CMAKE_BINARY_DIR}/lib
+-       FILES_MATCHING PATTERN "*-gdb.py")
++  file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
++  set(PRETTY_PRINTER_DESTS)
++  foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
++    get_filename_component(PRETTY_PRINTER_DEST ${PRETTY_PRINTER} NAME)
++    if(soversion)
++      string(REPLACE ".so-gdb.py" ".so.${ROOT_VERSION}-gdb.py"
++        PRETTY_PRINTER_DEST ${PRETTY_PRINTER_DEST})
++    endif(soversion)
++    string(PREPEND PRETTY_PRINTER_DEST ${CMAKE_BINARY_DIR}/lib/)
++    add_custom_command(OUTPUT ${PRETTY_PRINTER_DEST}
++      COMMAND ${CMAKE_COMMAND} -E copy ${PRETTY_PRINTER} ${PRETTY_PRINTER_DEST}
++      DEPENDS ${PRETTY_PRINTER})
++    list(APPEND PRETTY_PRINTER_DESTS ${PRETTY_PRINTER_DEST})
++  endforeach()
++  add_custom_target(copy_pretty_printers ALL DEPENDS ${PRETTY_PRINTER_DESTS})
+ 
+-  file(GLOB PRETTY_PRINTERS "gdbPrinters/*-gdb.py")
+-  install(FILES ${PRETTY_PRINTERS}
+-          DESTINATION lib
++  install(FILES ${PRETTY_PRINTER_DESTS}
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+           CONFIGURATIONS Debug RelWithDebInfo)
+ ENDIF()
+-- 
+2.21.0
+
diff --git a/root-python3.patch b/root-python3.patch
new file mode 100644
index 0000000..e1cda30
--- /dev/null
+++ b/root-python3.patch
@@ -0,0 +1,69 @@
+From 4cf9170f308934688e7f767086589cd8cc0a0a85 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 28 Jun 2019 22:23:49 +0200
+Subject: [PATCH] Python 3 compatibility
+
+---
+ tutorials/histfactory/example.py |  2 +-
+ tutorials/pyroot/mrt.py          | 20 ++++++++++----------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/tutorials/histfactory/example.py b/tutorials/histfactory/example.py
+index 91e1d26939..6ccf3bb350 100755
+--- a/tutorials/histfactory/example.py
++++ b/tutorials/histfactory/example.py
+@@ -12,7 +12,7 @@ def main():
+     try:
+         import ROOT
+     except:
+-        print "It seems that pyROOT isn't properly configured"
++        print("It seems that pyROOT isn't properly configured")
+         return
+ 
+     """
+diff --git a/tutorials/pyroot/mrt.py b/tutorials/pyroot/mrt.py
+index b3a8c0d719..17a73f6881 100644
+--- a/tutorials/pyroot/mrt.py
++++ b/tutorials/pyroot/mrt.py
+@@ -10,28 +10,28 @@
+ ##
+ ## \author Wim Lavrijsen
+ 
+-import sys, string, os
+-from ROOT import TFile, TNtuple
++import sys, os
++from ROOT import TFile, TNtuple, TROOT
+ 
+ 
+-ifn = os.path.expandvars("${ROOTSYS}/tutorials/pyroot/aptuple.txt")
++ifn = os.path.join(str(TROOT.GetTutorialDir()), 'pyroot', 'aptuple.txt')
+ ofn = 'aptuple.root'
+ 
+-print 'opening file', ifn, '...'
++print('opening file %s ...' % ifn)
+ infile = open( ifn, 'r' )
+ lines  = infile.readlines()
+ title  = lines[0]
+-labels = string.split( lines[1] )
++labels = lines[1].split()
+ 
+-print 'writing file', ofn, '...'
++print('writing file %s ...' % ofn)
+ outfile = TFile( ofn, 'RECREATE', 'ROOT file with an NTuple' )
+-ntuple  = TNtuple( 'ntuple', title, string.join( labels, ':') )
++ntuple  = TNtuple( 'ntuple', title, ':'.join( labels ) )
+ 
+ for line in lines[2:]:
+-    words = string.split( line )
++    words = line.split()
+     row = map( float, words )
+-    apply( ntuple.Fill, row )
++    ntuple.Fill(*row)
+ 
+ outfile.Write()
+ 
+-print 'done'
++print('done')
+-- 
+2.21.0
+
diff --git a/root-stress-aarch64-ppc64le.patch b/root-stress-aarch64-ppc64le.patch
new file mode 100644
index 0000000..a925460
--- /dev/null
+++ b/root-stress-aarch64-ppc64le.patch
@@ -0,0 +1,29 @@
+From dd6d00b07778023449a7e6fe01f90a524237b20a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 1 Jul 2019 08:53:15 +0200
+Subject: [PATCH] Increase test tolerence
+
+Test fails on aarch64 and ppc64le on Fedora 30 and Fedora rawhide:
+Test  3 : Purge, Reuse of gaps in TFile......................... FAILED
+         File size= 52010 (expected 51886 +/- 100)
+         Comp Fact=  2.00 (expected 2.1 +/- 0.3)
+---
+ test/stress.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/stress.cxx b/test/stress.cxx
+index 509bb0f17d..c0b44d9b77 100644
+--- a/test/stress.cxx
++++ b/test/stress.cxx
+@@ -406,7 +406,7 @@ void stress3()
+ #else
+    constexpr Long64_t lastgood = 51886;
+ #endif
+-   constexpr Long64_t tolerance = 100;
++   constexpr Long64_t tolerance = 150;
+ #ifdef R__HAS_DEFAULT_LZ4
+       constexpr Long64_t difflastgoodlz4 = 5500;
+       if (last < lastgood - tolerance || last > lastgood + difflastgoodlz4 + tolerance || comp < 1.5 || comp > 2.1)
+-- 
+2.21.0
+
diff --git a/root-testfiles.sh b/root-testfiles.sh
index 5984c5f..c16a23e 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -67,7 +67,7 @@ wget -N ${SITE}/sld_ref_4.root
 wget -N ${SITE}/sld.root
 wget -N ${SITE}/star_ref_4.root
 wget -N ${SITE}/star.root
-wget -N ${SITE}/tesla_ref_3.root
+wget -N ${SITE}/tesla_ref_4.root
 wget -N ${SITE}/tesla.root
 wget -N ${SITE}/wa91_ref_3.root
 wget -N ${SITE}/wa91.root
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index 3daf4b9..0fe4103 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake	2019-01-25 12:43:58.106532400 +0100
-@@ -1525,76 +1525,18 @@
+diff -ur root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.18.00/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2019-06-25 10:52:11.000000000 +0200
++++ root-6.18.00/cmake/modules/SearchInstalledSoftware.cmake	2019-06-26 16:00:21.275634375 +0200
+@@ -1380,80 +1380,18 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -74,6 +74,10 @@ diff -ur root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.16
 +  foreach (lib gmock gmock_main)
      add_library(${lib} IMPORTED STATIC GLOBAL)
 -    add_dependencies(${lib} googletest)
+-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+-        ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 9)
+-      target_compile_options(${lib} INTERFACE -Wno-deprecated-copy)
+-    endif()
    endforeach()
 -  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
 -  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -83,4 +87,4 @@ diff -ur root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.16
 + endif()
  endif()
  
- 
+ #------------------------------------------------------------------------------------
diff --git a/root.desktop b/root.desktop
new file mode 100644
index 0000000..159a1db
--- /dev/null
+++ b/root.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Root
+GenericName=Root
+Comment=Numerical data analysis framework
+Exec=root
+Icon=root
+Terminal=true
+Type=Application
+MimeType=application/x-root;
+Categories=Utility;
+Encoding=UTF-8
diff --git a/root.png b/root.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7813e516c3c0ad24f8d3553a551ee3731d6d86b
GIT binary patch
literal 3494
zcmV;X4O#MuP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-Xh6AUf^4|OK|0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbN24YJ`L;(K){{a7>y{D4^01XaFL_t(&-o;sIRFl`%eo*49
zb)c<n_11Q&U)6qAt+igot8KM{V$h3dabOaVlp%z9l7v8*#{eQCf}$cSjtE8Yf)r3e
zp@ND84O3(kkuiY)`}?8vYt>>4>GiDju65Sg=iPfh@3V(<5<o$tuv<39ue$zIoARpf
zT*Z&~8kbh+^3Ns2+SurJdU#p31ee_j6G|Gr-NdyHyYD^HH7l*u)hT(Xt8=$pSO4B4
zU6WF=uC1urNGNFv^r@=jvq~T8T8b(SJ*w&g9Yj^8jt^^0ZADd^JSuCKM$|S=P?X>B
zsj6FIEvn|&J*?)iN-H!s6_$N`qOo~803@cJKPrqpLdU{f&kxtmtxoAAZdvt5R%MlI
zElMkQx<0Hi=ZYVj3>$!bd9}KIS(Sy$qnb6=<y8|>THBNX;Czzp#7lWMI?kUxF8Vo^
zKk2XPt*sNjQ&}I)czJz)ZQ~fPs=EKNd{D8~xvbJvVN7^Elzd@cTJdjFQMsvWwaC-?
zR&rvTs8GuP<y@Gc*~R#Q(Pp*uQ$kmV%xvbKydvhF+(PEgg8NLJn<dQM*Nd53@02mO
zmWY^64<!a(X%~H?5|2ruvy)EyRn_`BlvkVDl~-GG#gA>-532OcODomGs_UlV?;64b
zw&U`Puh(Q<iaQSg4`f$HRh@PpbN6<_<g?iqCP&2|`TXGF|6EDFTGn^<x|kkR)`%|E
zRL^GJtC$=f?XP;bLPQxqC3j}T`Dx>AjD*B6<EQQIbTL-o_&Rw~SYTj&X%$_(e4P?c
z7tp=(S}GGgXf7)kG14=xgg>qnQ%;1v9^TeSPEYr4>+GOJKZ{qKNC@D3bn0}X_(Db|
z)wgxf<;yoHBl9j56qK|io;kg@q2+0RQP$<+rjiScw+0|9C+B!&RRyK*_jm<>r;V}W
z>C`J!)X+)|Z5>oy|Aa1FD5lJ`V!BgSPET5z>2j!@F5c$&IXCZk!R;bSKN_2z5gepb
z5+AEHAUhcB<t%A!r_$O6I+c=131<r_;=nmdzjl-Eh(wfnGVV#;jU!XuDuC3qv;!?|
ztt6GnsHv`=@>4J0%sjyV005!_+%z6Gw^CN=Bk~Oixf2?9LUO&bmg+jC^r)(`|7xtK
z(O)*WdGlt*j2SbgC@U+^0r1gqpXt-5e;geX>;FhnEANrZsi&uh3a{sh0s;c|2K%^$
z=a-gKepMYsCnn?-*FB-yPAQc)Hd6xMA!0~hOhZFM_3N*{{`Y$-DvJP&R}>R5@h4a1
z7L`car81Ircau~mrIwZ!>gbk{q^*-gjZf)*wS@939@DjyGj}}3j#@S(LuzVjT3;_%
zps^6xF&|h7Kv_{BLL-Hf&!uOj<`(`!T{0<kbahd8PY=m^dr2mjQ@*Hzib~7q#u0%g
z7g#!EL)L%_A2728_ALVz15j8Qi#v14t*)h&I=Z^3t+SJ)-7@Ny_fTC+E0sO%pq%t%
zaa~E&$YB9+1XL~odu{@O765k<Fb9B=A^^l+&bZ#*)kPgrDRoMvBze|GKR=St)%-h@
zS1P8A_yZgO;0*`BK44lZU?>CJ3jrT3fcpV3QxO2poWEe&-qB8Sxt!YC+o?!gLsyIL
z)0Nw$lzjfgwWj=Z<zWL50@H2)dVK)5AK>K!zG{FwfYHMSa5iaHeM3F<_4QFtubj#o
z8maPGD-{*yKRo7bK6zl@uo*}L^t%B*y#Vn5@Ldc9E(6|w{ad5I0X{T-lkSKJ;mX#|
zrr!Ske(LS(BdNTHB#jOIsj))lZ}$xuz{ZUm$Ggm(JL~$$kp{g0kDfnV0=Vgb|8l^7
z5-|1EH<$SXwtN6%2h$%A=()1Ft-5M}fu6ozD!F~5u`w_0chzplNvy7}zGKU(Rn|u)
zOt5YQ1iu9!2Y4xf*S`S$8NfTgf0Gpf#Bu?pxr6CHay0fcQN^A7-o75WyjRxW-7BXD
zqSD-#_YIi=CX=~HZSLHE#skK!faeS6e`TTz;GY6~zX!CHfr$h019-#%*Ia<9s|M3=
z#WtT*Sdt@>$=l?e-A{UZ`+BIdrn<#HBxsUC7ytkp;N2v^xZ_0*(C<Tu_Z0990Q?pJ
z+b05(0DJ~qiUf-G0bgwxOm|Ak<t4Z8W{IE4YUJ(R_4Ks8mYSNINK`Jm6%!XXOHoOz
zGEhce2Y>+HeZbEX2wo0sP{K3=pveok;|?$fy*V8_estQ!)YGj`x<t}vG70_iAeU+y
z%G#vzr+qb#Ys67eku!!3z!{j90vO2tfPsN|10di6eiO0!2tYibSO6Hl@%EIMbX;8D
zey^jkqnxha&Y{BlIn*Mp?(6JslIP#P88z$>;sGi@0efCB@M{vkH0Kh)l>lDum~&t>
zB<{dnUx32`Fk<jta8i8#(aqlc;ta~kyGGf0>D1I&M$KJi{rAg%xm#FRs5C4F!hxyz
zfNuY5zWQ(Gzpiy)B;Oa`28=>x2*7m!FnKWjr_LngUb~S@c?FsMX;)GyE%O51D!W9D
zUH2)kDE0Bh<Vy_hFsjgGgL(57XO0|c)H_HHyu=8v9Sptz-wP+g-+3lRe*Yct-XGZr
ziwNVVWhV7r&AQT?b|pm~6z)Y?1t<F@?FDr5LS(_Pa$wDxHL9CbRb9PDk9L0yc)uxx
ze!C{Y1W$9!4g3P{SZe~G{*jFX2g73u?`1ax2MfsC*NURTZRl1(d|Uh}&sGPn<C0+k
zP*YP=G8;AO{nLO+2jKB%85o%700Ji9xd!-lBQW9RQ|!g$i(|sVL!R-Rbo)d6OeosV
zgiapgkXM*hms_Blrb5an2T(Z&7<Im(3cYTv3E;W|Uh07Vm(QITITIK&pxfPj-)A;I
z>X5*G8wFXaQ%HzDv7L62K;Rs!kWLH$ZqNI`9@$^Wfq{7+z>@%O$ADmUz~%#Bss`}o
zi^?>@!BRKE!GuX3hO5XU$b^Ieb`-_6p>P+A_LC>hj8I4?_64S01N7xX05C9@13W%p
zJqxhe259{NEY+Gjdo^p@xAj(AmlNAbmtyQqD9VLH4*HwufU9Xo+@Yuu3Sofz{5Wm!
zXZpY(a$Y9D{t@t50z?`B8#p_dDG}CN$Vzh=`5S4G|BpIk&)PvgHo7EqWydHigd+aG
z4-D$yn*ekJZmj@MW75RKhRk&(mRnc#o333*R^KlqU(+q*!ZD;Me`h)r;8Gm5Km1*V
z09dhN#VDQm^Ot9h8Dl(*5c(BF<-9o&?nawBL)coC+t#j*+h?$`nQN#{hXfXMI?REh
zyzNdpEnYNPVaMt9>(?{17A{;GHf9W`2JjjV0|anWO}5^Ow$qZD&6{ob3BYA<SF7gg
ze@D@dI#T}TwNc+O82|7Dv|kg(Lk}SfK;;x*-2S|b4mk%1;9lLOku9{)ZZHDW*L^UZ
z?PH`Z^XKfMqnh7DI{|tdfLSqsj=~rK0DIuw^MLVC`oPN|nr6)m3bfPfHk&d<(|ptV
zki#}cbck<7q3Y{{Z2|p_z^uc-4uvw{_WU$z_=YO<r$UGTp6#{`V#}|VnC<*>v2~=Q
zS?^h2SK@EqP_#=~nftde5C}}o1$6sf`og^c@5%FP<|_>J0lco?%eVya?tS$|oWOwD
zX*c`Rt*XHG;2(bQKWJmt7R=TqfvI-eK{r;?;m_w;DHOoYapR_XF&JAj0h1iSC>Jo!
z1&sfrq_p=4gJG8qnB=}#ACPA&DeX;WFgUq@aSnrFlDKMVco1`WvEL7?diF8DP1*}=
z(gd_Pz~-ZKW;+D2S;etVX5_wmJ^7hwwSK-}-ZlX10IZuhe*C5_QwP6W4?1Rl^2w+3
zKmJ(f1TZcM7<cx?vuDbbcNc#6q1HMEW5&SRfLv$s;{VlHvBLPE#`^c2cB`j*8*E69
zVsCeiX6b*na_LfkQ(&w%FqRFBjq$K8+Ha{xK1SQgMSC^rZCFVG&MY>7aRA1Bvu4fa
zf2pcQ;B5>pYr8$y(m-{vJyC8}MaP{v<YuH@u}5<a?cKbZ?2Wa{5A64P<=>b<fA86j
zw(M2MVq+HmR{*$L8hF34(+k|J_gkBg2Wz*0XKT)OXB)U#>1`=A->KPZt*4dj!7+~X
z;X3UP@#ZB2a2-M;1TG<7juxRpfA5Qtp+4*WHs{0r_$uy}`usQTOG`~27i44H>HedB
zc7U60Bmi9gDP_Ei9cw{!Wa#QpVW`S$e-w+0W%#-~+dA1;xLaGZw+aOO`3eQ#@4({u
zyRuc^wD0(__$iT&EUAy3*?B)#o0E|t{xdIJyfo6DV=?N_*f|szs~jv0elIRQah^gP
zx3b*(i6_U{$D6&2`#QN;EFKXd3|YkEy6A9N`YaC%y_{eNR+)!`&Dxl#i1~hQw($X6
z`y?M1tI)8}pfCUHi5nIcvRvR|^~!;4uZ5Wsf1jh3o4H|vFW13F7#i~4-|5Hy0ru<M
Uh{F8*F#rGn07*qoM6N<$f&nV7T>t<8

literal 0
HcmV?d00001

diff --git a/root.spec b/root.spec
index 350aa6e..8663a17 100644
--- a/root.spec
+++ b/root.spec
@@ -1,4 +1,10 @@
 %if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8
+# Use Python 3 as the default python for Fedora >= 29
+# - Give python3 libPyROOT higher priority than python2 libPyROOT
+# - The python scripts in root-cli use python3-root
+# - Let root-tmva-python use python3-numpy
+# - Don't build python2-jupyroot/jsmva packages
+# - Use Python 3 during testing and documentation build
 %global py3default 1
 %global py2prio 10
 %global py3prio 20
@@ -10,31 +16,16 @@
 %global __pythondef %{__python2}
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 31
+# Don't build python2-root for Fedora >= 31
+%global buildpy2 0
+%else
+%global buildpy2 1
+%endif
+
 %global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 %global py3_other_soabi %([ -x %{__python3_other} ] && %{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
-%if %{?fedora}%{!?fedora:0} >= 31
-# Hadoop is FTBFS and uninstallable due to missing Java dependencies
-%global hadoop 0
-%else
-%if %{?fedora}%{!?fedora:0} >= 30
-# Hadoop is not installable on 32 bit archs due to missing Eclipse dependencies
-%ifarch %{arm} %{ix86}
-%global hadoop 0
-%else
-%global hadoop 1
-%endif
-%else
-%if %{?fedora}%{!?fedora:0} >= 24
-# libhdfs is available for all architectures for Fedora 24 and later.
-# For Fedora 20-23 it was only available on Intel (ix86 and x86_64).
-%global hadoop 1
-%else
-%global hadoop 0
-%endif
-%endif
-%endif
-
 %if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
 # Building the experimental ROOT 7 classes requires c++-14.
 # This is the default for gcc 6.1 and later.
@@ -58,9 +49,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.16.00
+Version:	6.18.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -75,49 +66,58 @@ Source0:	%{name}-%{version}.tar.xz
 Source1:	%{name}-testfiles.tar.xz
 #		Script to generate above source
 Source2:	%{name}-testfiles.sh
+#		Desktop file and icon
+Source3:	%{name}.desktop
+Source4:	%{name}.png
+#		MIME type file and icon
+Source5:	%{name}.xml
+Source6:	application-x-root.png
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Revert the removal of DataFrame for 32 bit architectures
 Patch1:		%{name}-32bit-dataframe.patch
-#		Don't run gui macros
-#		https://github.com/root-project/root/pull/3563
-Patch2:		%{name}-avoid-gui-crash.patch
 #		Unbundle gtest
-Patch3:		%{name}-unbundle-gtest.patch
+Patch2:		%{name}-unbundle-gtest.patch
 #		Use local static script and style files for JupyROOT
-Patch4:		%{name}-jupyroot-static.patch
+Patch3:		%{name}-jupyroot-static.patch
 #		Fedora's llvm patches
-Patch5:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
-Patch6:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
-Patch7:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
+Patch4:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
+Patch5:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
+Patch6:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 #		Reduce memory usage of build
 #		https://github.com/root-project/root/pull/1516
-Patch8:		%{name}-memory-usage.patch
+Patch7:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
 #		Fedora builders run out of memory with the default setting.
-Patch9:		%{name}-memory-arm-x86.patch
-#		Don't run tutorials that crash on ppc64 during doc generation.
-#		Ensures content of doc package is the same on all architecture
-#		so that koji accepts it as a noarch package.
-Patch10:	%{name}-ppc64-doc.patch
+Patch8:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
-Patch11:	%{name}-dont-install-minicern.patch
-#		Optimization issue in Geom library
-Patch12:	%{name}-ix32-geom-opt.patch
+Patch9:		%{name}-dont-install-minicern.patch
 #		Let clang ignore some gcc options it hasn't implemented
 #		https://github.com/root-project/root/pull/2933
-Patch13:	%{name}-clang-ignore-gcc-options.patch
-#		Make doxygen generation wotk with Python 3
-#		https://github.com/root-project/root/pull/3434
-Patch14:	%{name}-doxygen-generation-with-python-3.patch
+Patch10:	%{name}-clang-ignore-gcc-options.patch
 #		Don't create documentation notebooks
-Patch15:	%{name}-doc-no-notebooks.patch
+Patch11:	%{name}-doc-no-notebooks.patch
 #		Don't run tutorial requiring firefox during doc generation
-Patch16:	%{name}-v7-line.patch
-#		Only install eve7 js files when eve7 is built
-#		https://github.com/root-project/root/pull/3436
-Patch17:	%{name}-dont-install-eve7-files.patch
+Patch12:	%{name}-v7-line.patch
+#		Install man pages in correct directory
+#		https://github.com/root-project/root/pull/4026
+Patch13:	%{name}-man-install.patch
+#		Use correct library names in plugin definitions
+#		https://github.com/root-project/root/pull/4026
+Patch14:	%{name}-fix-plugin-definition.patch
+#		Don't download test input file if it already exists
+#		https://github.com/root-project/root/pull/4026
+Patch15:	%{name}-dont-download-input-file-if-it-already-exists.patch
+#		Python 3 fixes
+#		https://github.com/root-project/root/pull/4026
+Patch16:	%{name}-python3.patch
+#		Increase test tolerance (aarch64 and ppc64le)
+#		https://github.com/root-project/root/pull/4025
+Patch17:	%{name}-stress-aarch64-ppc64le.patch
+#		Fix GDB pretty printers install name and location
+#		https://github.com/root-project/root/pull/4024
+Patch18:	%{name}-pretty-printers.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -148,15 +148,10 @@ BuildRequires:	xxhash-devel
 #		its dependencies
 BuildRequires:	libAfterImage-devel >= 1.20-21
 BuildRequires:	ncurses-devel
-BuildRequires:	avahi-compat-libdns_sd-devel
-BuildRequires:	avahi-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
 BuildRequires:	unuran-devel
-BuildRequires:	krb5-devel
-BuildRequires:	krb5-workstation
-BuildRequires:	openldap-devel
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	mariadb-connector-c-devel
 %else
@@ -171,15 +166,13 @@ BuildRequires:	libpq-devel
 %else
 BuildRequires:	postgresql-devel
 %endif
+%if %{buildpy2}
 BuildRequires:	python2-devel
-%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires:	python3-devel
 %endif
-%if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	python%{python3_pkgversion}-devel
+%if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	python%{python3_other_pkgversion}-devel
 %endif
-BuildRequires:	qt4-devel
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-devel
@@ -187,23 +180,15 @@ BuildRequires:	qt5-qtwebengine-devel
 %endif
 %endif
 BuildRequires:	openssl-devel
-BuildRequires:	globus-gss-assist-devel
-BuildRequires:	globus-gsi-credential-devel
-BuildRequires:	globus-proxy-utils
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
-BuildRequires:	dpm-devel
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%if %{hadoop}
-BuildRequires:	hadoop-devel
-%endif
-BuildRequires:	OCE-devel
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
@@ -372,15 +357,25 @@ Obsoletes:	%{name}-ruby < 6.00.00
 Obsoletes:	%{name}-vdt < 6.10.00
 Obsoletes:	%{name}-proof-pq2 < 6.16.00
 Obsoletes:	%{name}-rootd < 6.16.00
+Obsoletes:	%{name}-geocad < 6.18.00
+Obsoletes:	%{name}-graf-qt < 6.18.00
+Obsoletes:	%{name}-gui-qt < 6.18.00
+Obsoletes:	%{name}-gui-qtgsi < 6.18.00
+Obsoletes:	%{name}-io-hdfs < 6.18.00
+Obsoletes:	%{name}-io-rfio < 6.18.00
+Obsoletes:	%{name}-net-bonjour < 6.18.00
+Obsoletes:	%{name}-net-globus < 6.18.00
+Obsoletes:	%{name}-net-ldap < 6.18.00
+Obsoletes:	%{name}-net-krb5 < 6.18.00
+Obsoletes:	%{name}-table < 6.18.00
+%if ! %{buildpy2}
+Obsoletes:	python2-%{name} < %{version}-%{release}
+%endif
 %if %{py3default}
-#		Don't build python2-jupyroot/jsmva packages for Fedora >= 29
 Obsoletes:	python2-jupyroot < %{version}-%{release}
 Obsoletes:	python2-jsmva < %{version}-%{release}
 Obsoletes:	%{name}-rootaas < 6.08.00
 %endif
-%if ! %{hadoop}
-Obsoletes:	%{name}-io-hdfs < %{version}-%{release}
-%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -418,8 +413,10 @@ Obsoletes:	%{name}-reflex < 6.00.00
 Cling is an interactive C++ interpreter, built on top of Clang and
 LLVM compiler infrastructure.
 
+%if %{buildpy2}
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
+%{?python_provide:%python_provide python2-%{name}}
 Provides:	%{name}-python = %{version}-%{release}
 Obsoletes:	%{name}-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -429,10 +426,12 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 %description -n python2-%{name}
 This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
+%endif
 
 %if ! %{py3default}
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
+%{?python_provide:%python_provide python2-jupyroot}
 Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python2-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -453,6 +452,7 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
+%{?python_provide:%python_provide python2-jsmva}
 BuildArch:	noarch
 Requires:	%{name}-tmva = %{version}-%{release}
 
@@ -462,6 +462,7 @@ TMVA interface used by JupyROOT.
 
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -474,6 +475,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
+%{?python_provide:%python_provide python%{python3_pkgversion}-jupyroot}
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -493,6 +495,7 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
+%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
 BuildArch:	noarch
 Requires:	%{name}-tmva = %{version}-%{release}
 
@@ -502,6 +505,7 @@ TMVA interface used by JupyROOT.
 %if %{?rhel}%{!?rhel:0} == 7
 %package -n python%{python3_other_pkgversion}-%{name}
 Summary:	Python extension for ROOT
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -512,6 +516,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python%{python3_other_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-jupyroot}
 Requires:	python%{python3_other_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_other_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -523,6 +528,7 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_other_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
 BuildArch:	noarch
 Requires:	%{name}-tmva = %{version}-%{release}
 
@@ -589,14 +595,6 @@ Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
 %description gdml
 This package contains an import/export module for ROOT geometries.
 
-%package geocad
-Summary:	OpenCascade import/export for ROOT geometries
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-
-%description geocad
-This package contains an import/export module for ROOT geometries.
-
 %package graf
 Summary:	2D graphics library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -666,15 +664,6 @@ Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 This package contains a library for ROOT, which allows rendering
 postscript and PDF output.
 
-%package graf-qt
-Summary:	Qt renderer for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-
-%description graf-qt
-This package contains the Qt renderer for ROOT.
-
 %package graf-x11
 Summary:	X window system renderer for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -696,6 +685,13 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This library contains the basic 3D shapes and classes for ROOT. For
 a more full-blown geometry library, see the root-geom package.
 
+%package graf3d-csg
+Summary:	Constructive solid geometry
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description graf3d-csg
+This library is used to generate composite shapes.
+
 %package graf3d-eve
 Summary:	Event display library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -723,6 +719,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
@@ -830,28 +827,6 @@ Obsoletes:	%{name}-guibuilder < 6.14.00
 This package contains a library for editing graphical user interfaces
 in ROOT.
 
-%package gui-qt
-Summary:	Qt GUI for ROOT (BNL)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-qt%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-#		Package split (gui-qtgsi from gui-qt)
-Obsoletes:	%{name}-qt < 6.14.00
-
-%description gui-qt
-This package contains the BNL Qt GUI for ROOT.
-
-%package gui-qtgsi
-Summary:	Qt GUI for ROOT (GSI)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-#		Package split (gui-qtgsi from gui-qt)
-Obsoletes:	%{name}-qt < 6.14.00
-
-%description gui-qtgsi
-This package contains the GSI Qt GUI for ROOT.
-
 %package gui-recorder
 Summary:	Interface for recording and replaying events in ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -970,24 +945,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
 
-%if %{hadoop}
-%package io-hdfs
-Summary:	Hadoop File System input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-hdfs
-This package contains the Hadoop File System extension for ROOT.
-%endif
-
-%package io-rfio
-Summary:	Remote File input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-rfio
-This package contains the Remote File IO extension for ROOT.
-
 %package io-sql
 Summary:	SQL input/output library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1229,19 +1186,6 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains the memory statistics tool for debugging memory
 leaks and such.
 
-%package table
-Summary:	Table library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description table
-This package contains the Table library for ROOT.
-
 %package montecarlo-eg
 Summary:	Event generator library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1270,6 +1214,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
 
 %description montecarlo-vmc
 This package contains the VMC library for ROOT.
@@ -1289,13 +1234,6 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 %description net-rpdutils
 This package contains authentication utilities used by xproofd.
 
-%package net-bonjour
-Summary:	Bonjour extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-bonjour
-This package contains a bonjour extension for ROOT.
-
 %package net-auth
 Summary:	Authentication extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1315,36 +1253,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 This package contains the davix extension for ROOT, that provides
 access to http based storage such as webdav and S3.
 
-%package net-globus
-Summary:	Globus extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	globus-proxy-utils
-
-%description net-globus
-This package contains the Globus extension for ROOT, that allows
-authentication and authorization against Globus.
-
-%package net-krb5
-Summary:	Kerberos (version 5) extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-auth%{?_isa} = %{version}-%{release}
-Requires:	krb5-workstation
-
-%description net-krb5
-This package contains the Kerberos (version 5) extension for ROOT, that
-allows authentication and authorization using Kerberos tokens.
-
-%package net-ldap
-Summary:	LDAP extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description net-ldap
-This package contains the LDAP extension for ROOT. This gives you
-access to LDAP directories via ROOT.
-
 %package net-http
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1627,6 +1535,9 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+%if %{root7}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+%endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 #		Library split (tree-dataframe and vecops from tree-player)
 Obsoletes:	%{name}-tree-player < 6.14.00
@@ -1704,7 +1615,6 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description graf-gpadv7
@@ -1713,6 +1623,7 @@ This package contains a library for canvas and pad manipulations.
 %package graf-primitives
 Summary:	Graphics primitives (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 
 %description graf-primitives
 This package contains graphics primitives for ROOT 7
@@ -1722,11 +1633,9 @@ Summary:	Event display library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
 Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
@@ -1736,6 +1645,15 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description graf3d-eve7
 This package contains a library for defining event displays in ROOT 7.
 
+%package gui-browserv7
+Summary:	Browser (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-browserv7
+This package contains a file browser for ROOT 7.
+
 %package gui-canvaspainter
 Summary:	Canvas painter (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1749,11 +1667,11 @@ This package contains a canvas painter extension for ROOT 7
 %package gui-fitpanelv7
 Summary:	GUI element for fits in ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
 %description gui-fitpanelv7
 This package contains a library to show a pop-up dialog when fitting
@@ -1782,6 +1700,7 @@ This package contains a web display extension for ROOT 7.
 %package gui-webgui6
 Summary:	Web based GUI for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
@@ -1794,10 +1713,18 @@ This package provides a Web based GUI for ROOT.
 %package hist-draw
 Summary:	Histogram drawing (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-primitives%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 
 %description hist-draw
 This package contains an histogram drawing extension for ROOT 7.
+
+%package tree-ntuple
+Summary:	Ntuple (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description tree-ntuple
+This package contains an ntuple extension for ROOT 7.
 %endif
 
 %prep
@@ -1813,10 +1740,7 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%if %{?fedora}%{!?fedora:0} <= 28 && %{?rhel}%{!?rhel:0} <= 7
-# Only relevant for distributions with ppc64 build (ppc64le not affected)
 %patch10 -p1
-%endif
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -1824,6 +1748,7 @@ This package contains an histogram drawing extension for ROOT 7.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1834,9 +1759,7 @@ rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 rm -rf graf2d/freetype/src
 #  * glew
 rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem
-#  * pcre
-rm -rf core/pcre/src
-#  * zlib, lz4, xxhash
+#  * lz4, pcre, xxhash, zlib
 rm -rf builtins
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
@@ -1851,15 +1774,13 @@ rm -rf graf2d/x11/inc/X11
 #  * mathjax
 rm -rf documentation/doxygen/mathjax.tar.gz
 sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
-sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \
-    -i documentation/doxygen/Doxyfile
 %if %{root7}
 #  * string_view (<experimental/string_view> requires c++-14)
 rm core/foundation/inc/ROOT/libcpp_string_view.h \
    core/foundation/inc/ROOT/RWrap_libcpp_string_view.h
 %endif
 #  * jsroot
-rm -rf etc/http/*
+rm -rf etc/js/*
 
 # Fix file permissions
 chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
@@ -1868,14 +1789,16 @@ chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
 %if %{py3default}
+%if %{buildpy2}
 # Build PyROOT for python 2
 cp -pr bindings/pyroot bindings/python2
+%endif
 %else
 # Build PyROOT for python 3
 cp -pr bindings/pyroot bindings/python3
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
-# Build PyROOT for python 3.6
+# Build PyROOT for python 3 (other)
 cp -pr bindings/pyroot bindings/python3oth
 %endif
 
@@ -1947,13 +1870,10 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_xxhash:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
-       -Dafdsmgrd:BOOL=OFF \
        -Dalien:BOOL=OFF \
        -Darrow:BOOL=OFF \
        -Dasimage:BOOL=ON \
        -Dastiff:BOOL=ON \
-       -Dbonjour:BOOL=ON \
-       -Dcastor:BOOL=OFF \
        -Dccache:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
        -Dclad:BOOL=OFF \
@@ -1961,13 +1881,14 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
 %if %{root7}
-       -Dcxx14:BOOL=ON \
+       -DCMAKE_CXX_STANDARD=14 \
        -Droot7:BOOL=ON \
+       -Dwebgui:BOOL=ON \
 %else
-       -Dcxx14:BOOL=OFF \
+       -DCMAKE_CXX_STANDARD=11 \
        -Droot7:BOOL=OFF \
+       -Dwebgui:BOOL=OFF \
 %endif
-       -Dcxx17:BOOL=OFF \
        -Dcxxmodules:BOOL=OFF \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
@@ -1978,16 +1899,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
-       -Dgeocad:BOOL=ON \
        -Dgfal:BOOL=ON \
-       -Dglobus:BOOL=ON \
        -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
-%if %{hadoop}
-       -Dhdfs:BOOL=ON \
-%else
-       -Dhdfs:BOOL=OFF \
-%endif
        -Dhttp:BOOL=ON \
 %if %{tbb}
        -Dimt:BOOL=ON \
@@ -1995,8 +1909,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dimt:BOOL=OFF \
 %endif
        -Djemalloc:BOOL=OFF \
-       -Dkrb5:BOOL=ON \
-       -Dldap:BOOL=ON \
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
@@ -2013,15 +1925,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dpythia8:BOOL=ON \
        -Dpython:BOOL=ON \
        -DPYTHON_EXECUTABLE:PATH=%{__pythondef} \
-       -Dqt:BOOL=ON \
-       -Dqtgsi:BOOL=ON \
 %ifarch %{qt5_qtwebengine_arches}
        -Dqt5web:BOOL=ON \
 %else
        -Dqt5web:BOOL=OFF \
 %endif
        -Dr:BOOL=ON \
-       -Drfio:BOOL=ON \
        -Droofit:BOOL=ON \
        -Drpath:BOOL=OFF \
        -Druby:BOOL=OFF \
@@ -2031,7 +1940,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dsoversion:BOOL=ON \
        -Dsqlite:BOOL=ON \
        -Dssl:BOOL=ON \
-       -Dtable:BOOL=ON \
        -Dtcmalloc:BOOL=OFF \
        -Dthread:BOOL=ON \
        -Dtmva:BOOL=ON \
@@ -2048,8 +1956,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dvdt:BOOL=OFF \
        -Dveccore:BOOL=OFF \
        -Dvecgeom:BOOL=OFF \
+       -Dvmc:BOOL=ON \
        -Dx11:BOOL=ON \
-       -Dxft:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
        -Dfail-on-missing:BOOL=ON \
@@ -2061,14 +1969,16 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        ..
 
 %if %{py3default}
+%if %{buildpy2}
 # Build PyROOT for python 2 (prep)
 cp -pr bindings/pyroot bindings/python2
+%endif
 %else
 # Build PyROOT for python 3 (prep)
 cp -pr bindings/pyroot bindings/python3
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
-# Build PyROOT for python 3.6 (prep)
+# Build PyROOT for python 3 (other) (prep)
 cp -pr bindings/pyroot bindings/python3oth
 %endif
 
@@ -2076,6 +1986,8 @@ make %{?_smp_mflags}
 
 %if %{py3default}
 
+%if %{buildpy2}
+
 # Build PyROOT for python 2
 mkdir python2
 mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
@@ -2099,6 +2011,8 @@ sed -e "s,${py3i},${py2i},g" -e "s,-l${py3l},-l${py2l},g" \
 make %{?_smp_mflags} -f bindings/python2/Makefile PyROOT JupyROOT
 mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
 
+%endif
+
 %else
 
 # Build PyROOT for python 3
@@ -2128,7 +2042,7 @@ mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
 
 %if %{?rhel}%{!?rhel:0} == 7
 
-# Build PyROOT for python 3.6
+# Build PyROOT for python 3 (other)
 mkdir python3oth
 mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
 sed 's!bindings/pyroot!bindings/python3oth!g' CMakeFiles/Makefile2.save \
@@ -2167,32 +2081,14 @@ emacs -batch -no-site-file -f batch-byte-compile \
 # Install desktop entry and icon
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-
-cat > root.desktop << EOF
-[Desktop Entry]
-Name=Root
-GenericName=Root
-Comment=Numerical data analysis framework
-Exec=root
-Icon=root
-Terminal=true
-Type=Application
-MimeType=application/x-root;
-Categories=Utility;
-Encoding=UTF-8
-EOF
-
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-		     --vendor "" root.desktop
-install -p -m 644 build/package/debian/root-system-bin.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/root.png
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
 # Install mime type and icon
 mkdir -p %{buildroot}%{_datadir}/mime/packages
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-install -p -m 644 build/package/debian/root-system-bin.sharedmimeinfo \
-    %{buildroot}%{_datadir}/mime/packages/root.xml
-install -p -m 644 build/package/debian/application-x-root.png \
+install -p -m 644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages
+install -p -m 644 %{SOURCE6} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
 # Move python cli helper to its own directory
@@ -2201,8 +2097,21 @@ mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
 sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
+# Move GDB pretty printers to auto load safe path
+mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
+   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
+
+# Do python byte compilation (for non-standard paths)
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+# This is the default for Fedora 30+, set it for Fedora 28-29
+%global _python_bytecompile_extra 0
 %if %{py3default}
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
+%else
+%py_byte_compile %{__python2} %{buildroot}%{_datadir}/%{name}/cli
+%endif
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 %endif
 
 %if %{py3default}
@@ -2229,6 +2138,8 @@ touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
 touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
 touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 
+%if %{buildpy2}
+
 tmpdir=`mktemp -d`
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
@@ -2247,6 +2158,8 @@ rm -rf $tmpdir
 # Create empty .egg-info files so that rpm auto-generates provides
 touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
 
+%endif
+
 %else
 
 # Move the python modules to sitearch/sitelib
@@ -2416,19 +2329,15 @@ sed -e 's!/usr/bin/env python!%{__pythondef}!' \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
 
 # Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
 rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
 rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_bindir}/setenvwrap.csh
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
 rm %{buildroot}%{_mandir}/man1/g2rootold.1
 rm %{buildroot}%{_mandir}/man1/genmap.1
 rm %{buildroot}%{_mandir}/man1/proofserva.1
 rm %{buildroot}%{_mandir}/man1/roota.1
-rm %{buildroot}%{_includedir}/%{name}/*.cw
-rm %{buildroot}%{_includedir}/%{name}/*.pri
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
@@ -2439,47 +2348,31 @@ rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
 pushd %{buildroot}%{_datadir}/%{name}/plugins
-rm TAFS/P010_TAFS.C
 rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P030_TCastorFile.C
 rm TFile/P070_TAlienFile.C
-%if %{hadoop} == 0
-rm TFile/P110_THDFSFile.C
-%endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
-rm TGrid/P020_TGLite.C
 %if %{root7} == 0
 rm TGuiFactory/P030_TWebGuiFactory.C
 %endif
-rm TImagePlugin/P010_TASPluginGS.C
-rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
-%if %{hadoop} == 0
-rm TSystem/P060_THDFSSystem.C
-%endif
-rm TViewerX3D/P020_TQtViewerX3D.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
-%if %{root7} == 0
 rm TVirtualX/P060_TWebVirtualX.C
-%endif
-rmdir TAFS
 rmdir TDataProgressDialog
 rmdir TGrid
-rmdir TImagePlugin
 rmdir TVirtualGeoConverter
 popd
 
 # Replace bundled jsroot with symlink to system version
-rm -rf %{buildroot}%{_datadir}/%{name}/http
-ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/http
+rm -rf %{buildroot}%{_datadir}/%{name}/js
+ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/js
 
 # Create ldconfig configuration
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -2508,8 +2401,14 @@ cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
 
 # Generate documentation
 pushd documentation/doxygen
+mkdir -p doc/html
+ln -s /usr/share/javascript/mathjax doc/html/mathjax
 ln -s ../../files files
-ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
+for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
+	 df014_CsvDataSource_MuRun2010B_py.csv \
+	 df015_CsvDataSource_MuRun2010B.csv ; do
+    ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
+done
 # Create the py-hsimple.root file in advance (needed as input)
 ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
     ROOTSYS=${PWD}/../../builddir \
@@ -2534,8 +2433,7 @@ for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
 %else
     DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
 %endif
-    ( cd $tmpdir ; find . -type f -a '!' -name '*.cw' -a '!' -name '*.pri') | \
-	sort | sed 's!^\.!!' > $l
+    ( cd $tmpdir ; find . -type f) | sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
 done
 
@@ -2553,7 +2451,11 @@ ln -s ../../files files
 popd
 pushd runtutorials
 ln -s ../../files files
-ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
+for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
+	 df014_CsvDataSource_MuRun2010B_py.csv \
+	 df015_CsvDataSource_MuRun2010B.csv ; do
+    ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
+done
 popd
 pushd tmva/tmva/test/DNN
 ln -s ../../../../../files files
@@ -2581,40 +2483,92 @@ popd
 #   reads sqlite data over network:
 #   http://root.cern.ch/files/RSqliteDS_test.sqlite
 #
+# - tutorial-dataframe-df###_SQlite*
+#   reads sqlite data over network:
+#   http://root.cern.ch/files/root_download_stats.sqlite
+#
+# - gtest-tree-treeplayer-test-treeprocessormt
 # - tutorial-dataframe-df102_NanoAODDimuonAnalysis
 # - tutorial-dataframe-df103_NanoAODHiggsAnalysis
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
 #
+# - tutorial-v7-ntuple-ntpl003_lhcbOpenData
+#   reads input data over network
+#   http://root.cern.ch/files/LHCb/lhcb_B2HHH_MagnetUp.root (425 MB)
+#
+# - tutorial-v7-ntuple-ntpl004_dimuon
+#   reads input data over network
+#   http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
+#
 # - tutorial-pythia-pythia8
 #   sometimes times out
 #
 # - tutorial-v7-line.cxx
 #   requires a web browser (and js-jsroot) to render javascript graphics
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|gtest-tree-dataframe-test-datasource-sqlite|tutorial-dataframe-df102_NanoAODDimuonAnalysis|tutorial-dataframe-df103_NanoAODHiggsAnalysis|tutorial-pythia-pythia8|tutorial-v7-line.cxx"
+excluded="\
+test-stressIOPlugins|\
+tutorial-dataframe-df101_h1Analysis|\
+tutorial-tree-run_h1analysis|\
+tutorial-multicore-imt001_parBranchProcessing|\
+tutorial-multicore-mp103_processSelector|\
+tutorial-multicore-mp104_processH1|\
+tutorial-multicore-mp105_processEntryList|\
+tutorial-multicore-imt101_parTreeProcessing|\
+gtest-tree-dataframe-test-datasource-sqlite|\
+tutorial-dataframe-df..._SQlite|\
+gtest-tree-treeplayer-test-treeprocessormt|\
+tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
+tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
+tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
+tutorial-v7-ntuple-ntpl004_dimuon|\
+tutorial-pythia-pythia8|\
+tutorial-v7-line.cxx"
 
-%ifarch %{ix86}
-%if %{?fedora}%{!?fedora:0} == 28
-# Test failing on ix86 on Fedora 28
-# https://sft.its.cern.ch/jira/browse/ROOT-9893
-# - test-stressgeometry(-interpreted)
-excluded="${excluded}|test-stressgeometry"
+%ifarch %{ix86} %{arm}
+%if %{?fedora}%{!?fedora:0} >= 30
+# Tests failing on 32 bit architectures on Fedoea 30+ (gcc 9?)
+# A bit random - not all the tests fail every time...
+# - gtest-tree-dataframe-test-dataframe-cache
+# - gtest-tree-dataframe-test-dataframe-callbacks
+# - gtest-tree-dataframe-test-dataframe-colnames
+# - gtest-tree-dataframe-test-dataframe-friends
+# - gtest-tree-dataframe-test-dataframe-helpers
+# - gtest-tree-dataframe-test-dataframe-simple
+# - gtest-tree-dataframe-test-dataframe-snapshot
+excluded="${excluded}|\
+gtest-tree-dataframe-test-dataframe-cache|\
+gtest-tree-dataframe-test-dataframe-callbacks|\
+gtest-tree-dataframe-test-dataframe-colnames|\
+gtest-tree-dataframe-test-dataframe-friends|\
+gtest-tree-dataframe-test-dataframe-helpers|\
+gtest-tree-dataframe-test-dataframe-simple|\
+gtest-tree-dataframe-test-dataframe-snapshot"
 %endif
 %endif
 
-%ifarch ppc64
-# Tests failing on ppc64
-# https://sft.its.cern.ch/jira/browse/ROOT-6434
-# - test-stresshistofit(-interpreted)
-# - test-stresshistogram(-interpreted)
-# - test-stressroostats(-interpreted)
-# - tutorial-dataframe-df006_ranges-py
-# - tutorial-roofit-rf203_ranges-py
-# - tutorial-roofit-rf511_wsfactory_basic(-py)
-# - tutorial-roofit-rf902_numgenconfig-py
-# - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7)
-# - tutorial-roostats-rs701_BayesianCalculator
-excluded="${excluded}|test-stresshistofit|test-stresshistogram|test-stressroostats|tutorial-dataframe-df006_ranges-py|tutorial-roofit-rf203_ranges-py|tutorial-roofit-rf511_wsfactory_basic|tutorial-roofit-rf902_numgenconfig-py|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator"
+%ifarch %{arm}
+# Tests failing on 32 bit arm
+# - tutorial-v7-draw.cxx
+# - tutorial-v7-draw_mt.cxx
+# - tutorial-v7-draw_rh1.cxx
+# - tutorial-v7-draw_subpads.cxx
+excluded="${excluded}|\
+tutorial-v7-draw.cxx|\
+tutorial-v7-draw_mt.cxx|\
+tutorial-v7-draw_rh1.cxx|\
+tutorial-v7-draw_subpads.cxx"
+%endif
+
+%ifarch ppc64le
+%if %{?fedora}%{!?fedora:0} == 30
+# This test fails on Fedora 30 ppc64le with the following error:
+# cling::DynamicLibraryManager::loadLibrary():
+#   /lib64/libGLdispatch.so.0: cannot allocate memory in static TLS block
+# Error in <TInterpreter::TCling::AutoLoad>:
+#   failure loading library libRGL.so for TGLHistPainter
+excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
+%endif
 %endif
 
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
@@ -2638,6 +2592,8 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %endif
 
+%if %{buildpy2}
+
 %post -n python2-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
@@ -2671,6 +2627,8 @@ fi
     libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
 %{?ldconfig}
 
+%endif
+
 %post -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
@@ -2769,16 +2727,15 @@ fi
 %ldconfig_scriptlets genetic
 %ldconfig_scriptlets geom
 %ldconfig_scriptlets gdml
-%ldconfig_scriptlets geocad
 %ldconfig_scriptlets graf
 %ldconfig_scriptlets graf-asimage
 %ldconfig_scriptlets graf-fitsio
 %ldconfig_scriptlets graf-gpad
 %ldconfig_scriptlets graf-gviz
 %ldconfig_scriptlets graf-postscript
-%ldconfig_scriptlets graf-qt
 %ldconfig_scriptlets graf-x11
 %ldconfig_scriptlets graf3d
+%ldconfig_scriptlets graf3d-csg
 %ldconfig_scriptlets graf3d-eve
 %ldconfig_scriptlets graf3d-gl
 %ldconfig_scriptlets graf3d-gviz3d
@@ -2788,8 +2745,6 @@ fi
 %ldconfig_scriptlets gui-fitpanel
 %ldconfig_scriptlets gui-ged
 %ldconfig_scriptlets gui-builder
-%ldconfig_scriptlets gui-qt
-%ldconfig_scriptlets gui-qtgsi
 %ldconfig_scriptlets gui-recorder
 %ldconfig_scriptlets hbook
 %ldconfig_scriptlets hist
@@ -2801,10 +2756,6 @@ fi
 %ldconfig_scriptlets io
 %ldconfig_scriptlets io-dcache
 %ldconfig_scriptlets io-gfal
-%if %{hadoop}
-%ldconfig_scriptlets io-hdfs
-%endif
-%ldconfig_scriptlets io-rfio
 %ldconfig_scriptlets io-sql
 %ldconfig_scriptlets io-xml
 %ldconfig_scriptlets io-xmlparser
@@ -2825,27 +2776,14 @@ fi
 %ldconfig_scriptlets unuran
 %ldconfig_scriptlets vecops
 %ldconfig_scriptlets memstat
-%ldconfig_scriptlets table
 %ldconfig_scriptlets montecarlo-eg
 %ldconfig_scriptlets montecarlo-pythia8
 %ldconfig_scriptlets montecarlo-vmc
 %ldconfig_scriptlets net
 %ldconfig_scriptlets net-rpdutils
-%ldconfig_scriptlets net-bonjour
 %ldconfig_scriptlets net-auth
 %ldconfig_scriptlets net-davix
-%ldconfig_scriptlets net-globus
-%ldconfig_scriptlets net-krb5
-%ldconfig_scriptlets net-ldap
 %ldconfig_scriptlets net-http
-
-%pretrans net-http -p <lua>
-path = "%{_datadir}/%{name}/http"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  os.execute("rm -rf " .. path)
-end
-
 %ldconfig_scriptlets net-httpsniff
 %ldconfig_scriptlets netx
 %ldconfig_scriptlets proof
@@ -2871,6 +2809,7 @@ end
 %ldconfig_scriptlets graf-gpadv7
 %ldconfig_scriptlets graf-primitives
 %ldconfig_scriptlets graf3d-eve7
+%ldconfig_scriptlets gui-browserv7
 %ldconfig_scriptlets gui-canvaspainter
 %ldconfig_scriptlets gui-fitpanelv7
 %ifarch %{qt5_qtwebengine_arches}
@@ -2879,6 +2818,7 @@ end
 %ldconfig_scriptlets gui-webdisplay
 %ldconfig_scriptlets gui-webgui6
 %ldconfig_scriptlets hist-draw
+%ldconfig_scriptlets tree-ntuple
 %endif
 
 %files
@@ -2921,6 +2861,12 @@ end
 %{_libdir}/%{name}/libRint.*
 %{_libdir}/%{name}/libThread.*
 %{_libdir}/%{name}/lib*Dict.*
+%dir %{_datadir}/gdb/auto-load%{_libdir}/%{name}
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libCore.*
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+%dir %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libCore.*
+%endif
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/allDict.cxx.pch
 %{_datadir}/%{name}/class.rules
@@ -2951,10 +2897,8 @@ end
 %{_includedir}/%{name}/libc.modulemap
 %{_includedir}/%{name}/module.modulemap
 %{_includedir}/%{name}/stl.modulemap
-%{_includedir}/%{name}/modulemap.overlay.yaml
 %dir %{_includedir}/%{name}/Math
 %dir %{_includedir}/%{name}/ROOT
-%{_datadir}/aclocal/root.m4
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %dir %{_pkgdocdir}
 # CREDITS and LICENSE are used at runtime by the .credits and .license commands
@@ -2973,6 +2917,7 @@ end
 %{_bindir}/genreflex
 %{_bindir}/rootcint
 %{_bindir}/rootcling
+%{_mandir}/man1/rootcling.1*
 %{_libdir}/%{name}/libCling.*
 %{_datadir}/%{name}/cling
 %{_datadir}/%{name}/dictpch
@@ -2987,9 +2932,9 @@ end
 %doc %{_pkgdocdir}/html
 
 %files tutorial
-%doc %{_pkgdocdir}/test
 %doc %{_pkgdocdir}/tutorials
 
+%if %{buildpy2}
 %files -n python2-%{name} -f includelist-bindings-pyroot
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
@@ -3001,6 +2946,7 @@ end
 %{python2_sitearch}/ROOT-*.egg-info
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
+%endif
 
 %if ! %{py3default}
 %files -n python2-jupyroot
@@ -3095,10 +3041,6 @@ end
 %{_libdir}/%{name}/libGdml.*
 %{_libdir}/%{name}/libGdml_rdict.pcm
 
-%files geocad -f includelist-geom-geocad
-%{_libdir}/%{name}/libGeoCad.*
-%{_libdir}/%{name}/libGeoCad_rdict.pcm
-
 %files graf -f includelist-graf2d-graf
 %{_libdir}/%{name}/libGraf.*
 %{_libdir}/%{name}/libGraf_rdict.pcm
@@ -3110,6 +3052,7 @@ end
 %{_libdir}/%{name}/libASImageGui.*
 %{_libdir}/%{name}/libASImageGui_rdict.pcm
 %{_datadir}/%{name}/plugins/TImage/P010_TASImage.C
+%{_datadir}/%{name}/plugins/TImagePlugin/P010_TASPluginGS.C
 %{_datadir}/%{name}/plugins/TPaletteEditor/P010_TASPaletteEditor.C
 
 %files graf-fitsio -f includelist-graf2d-fitsio
@@ -3134,11 +3077,6 @@ end
 %{_datadir}/%{name}/plugins/TVirtualPS/P040_TImageDump.C
 %{_datadir}/%{name}/plugins/TVirtualPS/P050_TTeXDump.C
 
-%files graf-qt -f includelist-graf2d-qt
-%{_libdir}/%{name}/libGQt.*
-%{_libdir}/%{name}/libGQt_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualX/P040_TGQt.C
-
 %files graf-x11 -f includelist-graf2d-x11
 %{_libdir}/%{name}/libGX11.*
 %{_libdir}/%{name}/libGX11_rdict.pcm
@@ -3152,6 +3090,10 @@ end
 %{_libdir}/%{name}/libGraf3d_rdict.pcm
 %{_datadir}/%{name}/plugins/TView/P010_TView3D.C
 
+%files graf3d-csg -f includelist-graf3d-csg
+%{_libdir}/%{name}/libRCsg.*
+%{_libdir}/%{name}/libRCsg_rdict.pcm
+
 %files graf3d-eve -f includelist-graf3d-eve
 %{_libdir}/%{name}/libEve.*
 %{_libdir}/%{name}/libEve_rdict.pcm
@@ -3204,15 +3146,6 @@ end
 %{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C
 %{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C
 
-%files gui-qt -f includelist-gui-qtroot
-%{_libdir}/%{name}/libQtRoot.*
-%{_libdir}/%{name}/libQtRoot_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C
-
-%files gui-qtgsi -f includelist-gui-qtgsi
-%{_libdir}/%{name}/libQtGSI.*
-%{_libdir}/%{name}/libQtGSI_rdict.pcm
-
 %files gui-recorder -f includelist-gui-recorder
 %{_libdir}/%{name}/libRecorder.*
 %{_libdir}/%{name}/libRecorder_rdict.pcm
@@ -3276,20 +3209,6 @@ end
 %{_libdir}/%{name}/libGFAL_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 
-%if %{hadoop}
-%files io-hdfs -f includelist-io-hdfs
-%{_libdir}/%{name}/libHDFS.*
-%{_libdir}/%{name}/libHDFS_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
-%{_datadir}/%{name}/plugins/TSystem/P060_THDFSSystem.C
-%endif
-
-%files io-rfio -f includelist-io-rfio
-%{_libdir}/%{name}/libRFIO.*
-%{_libdir}/%{name}/libRFIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P020_TRFIOFile.C
-%{_datadir}/%{name}/plugins/TSystem/P010_TRFIOSystem.C
-
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
 %{_libdir}/%{name}/libSQLIO_rdict.pcm
@@ -3404,10 +3323,6 @@ end
 %{_libdir}/%{name}/libMemStat.*
 %{_libdir}/%{name}/libMemStat_rdict.pcm
 
-%files table -f includelist-misc-table
-%{_libdir}/%{name}/libTable.*
-%{_libdir}/%{name}/libTable_rdict.pcm
-
 %files montecarlo-eg -f includelist-montecarlo-eg
 %{_libdir}/%{name}/libEG.*
 %{_libdir}/%{name}/libEG_rdict.pcm
@@ -3439,10 +3354,6 @@ end
 %files net-rpdutils
 %{_libdir}/%{name}/libSrvAuth.*
 
-%files net-bonjour -f includelist-net-bonjour
-%{_libdir}/%{name}/libBonjour.*
-%{_libdir}/%{name}/libBonjour_rdict.pcm
-
 %files net-auth -f includelist-net-auth
 %{_libdir}/%{name}/libRootAuth.*
 %{_libdir}/%{name}/libRootAuth_rdict.pcm
@@ -3455,22 +3366,10 @@ end
 %{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
 %{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
 
-%files net-globus
-%{_libdir}/%{name}/libGlobusAuth.*
-%doc %{_pkgdocdir}/README.GLOBUS
-
-%files net-krb5 -f includelist-net-krb5auth
-%{_libdir}/%{name}/libKrb5Auth.*
-%{_libdir}/%{name}/libKrb5Auth_rdict.pcm
-
-%files net-ldap -f includelist-net-ldap
-%{_libdir}/%{name}/libRLDAP.*
-%{_libdir}/%{name}/libRLDAP_rdict.pcm
-
 %files net-http -f includelist-net-http
 %{_libdir}/%{name}/libRHTTP.*
 %{_libdir}/%{name}/libRHTTP_rdict.pcm
-%{_datadir}/%{name}/http
+%{_datadir}/%{name}/js
 %doc net/http/README.txt net/http/civetweb/*.md
 
 %files net-httpsniff -f includelist-net-httpsniff
@@ -3544,6 +3443,10 @@ end
 %{_libdir}/%{name}/libRooFit_rdict.pcm
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
+%endif
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
 %dir %{_includedir}/%{name}/RooStats
@@ -3645,7 +3548,10 @@ end
 %files graf3d-eve7 -f includelist-graf3d-eve7
 %{_libdir}/%{name}/libROOTEve.*
 %{_libdir}/%{name}/libROOTEve_rdict.pcm
-%{_datadir}/%{name}/eve7
+
+%files gui-browserv7 -f includelist-gui-browserv7
+%{_libdir}/%{name}/libROOTBrowserv7.*
+%{_libdir}/%{name}/libROOTBrowserv7_rdict.pcm
 
 %files gui-canvaspainter
 %{_libdir}/%{name}/libROOTCanvasPainter.*
@@ -3662,21 +3568,61 @@ end
 %files gui-webdisplay -f includelist-gui-webdisplay
 %{_libdir}/%{name}/libROOTWebDisplay.*
 %{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+%{_datadir}/%{name}/ui5
 
 %files gui-webgui6 -f includelist-gui-webgui6
 %{_libdir}/%{name}/libWebGui6.*
 %{_libdir}/%{name}/libWebGui6_rdict.pcm
 %{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
-%{_datadir}/%{name}/plugins/TVirtualX/P060_TWebVirtualX.C
 
 %files hist-draw -f includelist-hist-histdraw
 %{_libdir}/%{name}/libROOTHistDraw.*
 %{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
+
+%files tree-ntuple -f includelist-tree-ntuple
+%{_libdir}/%{name}/libROOTNTuple.*
+%{_libdir}/%{name}/libROOTNTuple_rdict.pcm
 %endif
 
 %changelog
+* Wed Jun 26 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.00-1
+- Update to 6.18.00
+- Drop patches accepted upstream:
+  - root-avoid-gui-crash.patch
+  - root-doxygen-generation-with-python-3.patch
+- Drop patches with alternative fix implemented upstream:
+  - root-dont-install-eve7-files.patch
+  - root-ix32-geom-opt.patch
+- Drop ppc64 specific workaround (ppc64 no longer built in Fedora or EPEL):
+  - root-ppc64-doc.patch
+- Dropped subpackages:
+  - root-geocad
+  - root-graf-qt
+  - root-gui-qt
+  - root-gui-qtgsi
+  - root-io-hdfs
+  - root-io-rfio
+  - root-net-bonjour
+  - root-net-globus
+  - root-net-ldap
+  - root-net-krb5
+  - root-table
+- Drop BuildRequires needed by the dropped subpackages
+- New subpackages:
+  - root-graf3d-csg (split off from root-graf3d-gl)
+  - root-gui-browserv7
+  - root-tree-ntuple
+- Don't build python2-root for Fedora >= 31
+- Include desktop and MIME type files in source RPM (removed from source)
+- Install man pages in correct directory
+- Use correct library names in plugin definitions
+- Don't download test input file if it already exists
+- Python 3 fixes
+- Increase test tolerance (aarch64 and ppc64le)
+- Fix GDB pretty printers install name and location
+
 * Tue Jun 11 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-6
-- Check python-config for --embed flag (python 3.8 compatibility)
+- Use python-embed pkg-config module if it exists (python 3.8 compatibility)
 
 * Fri May 17 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.16.00-5
 - Build without HDFS support on Fedora 31+
diff --git a/root.xml b/root.xml
new file mode 100644
index 0000000..956f69e
--- /dev/null
+++ b/root.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-root">
+    <comment>ROOT data file</comment>
+    <comment xml:lang="de">ROOT Datei</comment>
+    <comment xml:lang="fr">ROOT banque de donnees</comment>
+    <comment xml:lang="sv">ROOT data fil</comment>
+    <comment xml:lang="no">ROOT data fil</comment>
+    <comment xml:lang="da">ROOT data fil</comment>
+    <glob pattern="*.root"/>
+    <magic priority="80">
+      <match type="string" value="ROOT" offset="0:3"/>
+    </magic>
+  </mime-type>
+</mime-info>
diff --git a/sources b/sources
index bbb7292..e1e5742 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.16.00.tar.xz) = 2e8906f8cf7c4c434e5e695c379f34aee3f421e6370ccff42dcd4519e281c3844760957f434b737c21f2b5bdf86deaf3928a67e1b952b424f2954d2c6a98ee0b
-SHA512 (root-testfiles.tar.xz) = 309231f065f4165b28816f2f511830077f3d1bf8920800b2390bf956481753b304db85719b251e862376bc94a65b3319cff7383fdf9b2a949dc9d7cf0d0114d5
+SHA512 (root-6.18.00.tar.xz) = d7e34c04f22ed2f3a6caf94263126c296df7fda176fc644a166ac47f93663134bd3b34c5d1dfb99cf84071eb93a08602b1cb0a8526610993f099fd3161c897c7
+SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From eb2d446b8b7b1772ef4f8872a3d5830ae3cdc3e9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 18:42:20 +0000
Subject: [PATCH 159/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8663a17..8d6b900 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3585,6 +3585,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.18.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jun 26 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.00-1
 - Update to 6.18.00
 - Drop patches accepted upstream:

From 5736fd78d48e337ee1f48fae0f5b2e7f8eb7816f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 1 Aug 2019 17:06:23 +0200
Subject: [PATCH 160/344] Root 6.18 requires pcm files to be in the same
 directory as libraries Add libPyROOT.rootmap and libPyROOT_rdict.pcm as
 slaves to libPyROOT.so   in update-alternatives

---
 root-pretty-printers.patch |   2 +-
 root.spec                  | 110 +++++++++++++++++++++++++++++--------
 2 files changed, 89 insertions(+), 23 deletions(-)

diff --git a/root-pretty-printers.patch b/root-pretty-printers.patch
index eb198e7..4ded487 100644
--- a/root-pretty-printers.patch
+++ b/root-pretty-printers.patch
@@ -30,7 +30,7 @@ index b84481041b..03644b6c00 100644
 +      string(REPLACE ".so-gdb.py" ".so.${ROOT_VERSION}-gdb.py"
 +        PRETTY_PRINTER_DEST ${PRETTY_PRINTER_DEST})
 +    endif(soversion)
-+    string(PREPEND PRETTY_PRINTER_DEST ${CMAKE_BINARY_DIR}/lib/)
++    set(PRETTY_PRINTER_DEST ${CMAKE_BINARY_DIR}/lib/${PRETTY_PRINTER_DEST})
 +    add_custom_command(OUTPUT ${PRETTY_PRINTER_DEST}
 +      COMMAND ${CMAKE_COMMAND} -E copy ${PRETTY_PRINTER} ${PRETTY_PRINTER_DEST}
 +      DEPENDS ${PRETTY_PRINTER})
diff --git a/root.spec b/root.spec
index 8d6b900..6e2e920 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2120,6 +2120,10 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
 mkdir -p %{buildroot}%{python3_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.rootmap \
+   %{buildroot}%{python3_sitearch}/libPyROOT.rootmap
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT_rdict.pcm \
+   %{buildroot}%{python3_sitearch}/libPyROOT_rdict.pcm
 mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libJupyROOT.so
 mv %{buildroot}%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
@@ -2151,6 +2155,10 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python2/cmake_install.cmake
 mkdir -p %{buildroot}%{python2_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python2_sitearch}/libPyROOT.so
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
+   %{buildroot}%{python2_sitearch}/libPyROOT.rootmap
+mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
+   %{buildroot}%{python2_sitearch}/libPyROOT_rdict.pcm
 mv $tmpdir%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
 
 rm -rf $tmpdir
@@ -2166,6 +2174,10 @@ touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
 mkdir -p %{buildroot}%{python2_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python2_sitearch}/libPyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT.rootmap \
+   %{buildroot}%{python2_sitearch}/libPyROOT.rootmap
+mv %{buildroot}%{_libdir}/%{name}/libPyROOT_rdict.pcm \
+   %{buildroot}%{python2_sitearch}/libPyROOT_rdict.pcm
 mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python2_sitearch}/libJupyROOT.so
 mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
@@ -2194,6 +2206,10 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3/cmake_install.cmake
 mkdir -p %{buildroot}%{python3_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
+   %{buildroot}%{python3_sitearch}/libPyROOT.rootmap
+mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
+   %{buildroot}%{python3_sitearch}/libPyROOT_rdict.pcm
 mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python3_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
@@ -2225,6 +2241,10 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3oth/cmake_install.cmake
 mkdir -p %{buildroot}%{python3_other_sitearch}
 mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
    %{buildroot}%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
+mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
+   %{buildroot}%{python3_other_sitearch}/libPyROOT.rootmap
+mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
+   %{buildroot}%{python3_other_sitearch}/libPyROOT_rdict.pcm
 mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
    %{buildroot}%{python3_other_sitearch}/libJupyROOT.so
 mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_other_sitearch}
@@ -2606,9 +2626,18 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
 	fi
     done
 fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
+for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
+    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
+	rm %{_libdir}/%{name}/$f
+    fi
+done
+%{_sbindir}/update-alternatives \
+    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
+    %{python2_sitearch}/libPyROOT.so %{py2prio} \
+    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
+    %{python2_sitearch}/libPyROOT.rootmap \
+    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
+    %{python2_sitearch}/libPyROOT_rdict.pcm
 %{?ldconfig}
 
 %preun -n python2-%{name}
@@ -2622,9 +2651,13 @@ fi
 %triggerpostun -n python2-%{name} -- %{name}-python
 # Uninstalling the old %{name}-python will remove the alternatives
 # for python2-%{name} - put them back in this triggerpostun script
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
+%{_sbindir}/update-alternatives \
+    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
+    %{python2_sitearch}/libPyROOT.so %{py2prio} \
+    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
+    %{python2_sitearch}/libPyROOT.rootmap \
+    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
+    %{python2_sitearch}/libPyROOT_rdict.pcm
 %{?ldconfig}
 
 %endif
@@ -2646,9 +2679,18 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
 	fi
     done
 fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
+for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
+    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
+	rm %{_libdir}/%{name}/$f
+    fi
+done
+%{_sbindir}/update-alternatives \
+    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
+    %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio} \
+    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
+    %{python3_sitearch}/libPyROOT.rootmap \
+    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
+    %{python3_sitearch}/libPyROOT_rdict.pcm
 %{?ldconfig}
 
 %preun -n python%{python3_pkgversion}-%{name}
@@ -2662,9 +2704,13 @@ fi
 %triggerpostun -n python%{python3_pkgversion}-%{name} -- %{name}-python%{python3_pkgversion}
 # Uninstalling the old %{name}-python%{python3_pkgversion} will remove the alternatives
 # for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
+%{_sbindir}/update-alternatives \
+    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
+    %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio} \
+    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
+    %{python3_sitearch}/libPyROOT.rootmap \
+    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
+    %{python3_sitearch}/libPyROOT_rdict.pcm
 %{?ldconfig}
 
 %if %{?rhel}%{!?rhel:0} == 7
@@ -2681,9 +2727,18 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
 	fi
     done
 fi
-%{_sbindir}/update-alternatives --install \
-    %{_libdir}/%{name}/libPyROOT.so.%{version} \
-    libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5
+for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
+    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
+	rm %{_libdir}/%{name}/$f
+    fi
+done
+%{_sbindir}/update-alternatives \
+    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
+    %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5 \
+    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
+    %{python3_other_sitearch}/libPyROOT.rootmap \
+    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
+    %{python3_other_sitearch}/libPyROOT_rdict.pcm
 %{?ldconfig}
 
 %preun -n python%{python3_other_pkgversion}-%{name}
@@ -2936,12 +2991,14 @@ fi
 
 %if %{buildpy2}
 %files -n python2-%{name} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
+%ghost %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python2_sitearch}/libPyROOT.rootmap
 %{python2_sitearch}/libPyROOT.so
+%{python2_sitearch}/libPyROOT_rdict.pcm
 %{python2_sitearch}/ROOT.py*
 %{python2_sitearch}/ROOT-*.egg-info
 %{python2_sitearch}/cppyy.py*
@@ -2962,12 +3019,14 @@ fi
 %endif
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
+%ghost %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_sitearch}/libPyROOT.rootmap
 %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
+%{python3_sitearch}/libPyROOT_rdict.pcm
 %{python3_sitearch}/ROOT.py
 %{python3_sitearch}/ROOT-*.egg-info
 %{python3_sitearch}/cppyy.py
@@ -2987,12 +3046,14 @@ fi
 
 %if %{?rhel}%{!?rhel:0} == 7
 %files -n python%{python3_other_pkgversion}-%{name} -f includelist-bindings-pyroot
-%{_libdir}/%{name}/libPyROOT.rootmap
+%ghost %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.%{libversion}
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%{_libdir}/%{name}/libPyROOT_rdict.pcm
+%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
+%{python3_other_sitearch}/libPyROOT.rootmap
 %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
+%{python3_other_sitearch}/libPyROOT_rdict.pcm
 %{python3_other_sitearch}/ROOT.py
 %{python3_other_sitearch}/ROOT-*.egg-info
 %{python3_other_sitearch}/cppyy.py
@@ -3585,6 +3646,11 @@ fi
 %endif
 
 %changelog
+* Wed Jul 31 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.00-3
+- Root 6.18 requires pcm files to be in the same directory as libraries
+- Add libPyROOT.rootmap and libPyROOT_rdict.pcm as slaves to libPyROOT.so
+  in update-alternatives
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.18.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From ac7ef9a2e3672f8414e22df3c29d6113c1965c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Aug 2019 11:05:09 +0200
Subject: [PATCH 161/344] Rebuilt for Python 3.8

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 6e2e920..135dd53 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3646,6 +3646,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 6.18.00-4
+- Rebuilt for Python 3.8
+
 * Wed Jul 31 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.00-3
 - Root 6.18 requires pcm files to be in the same directory as libraries
 - Add libPyROOT.rootmap and libPyROOT_rdict.pcm as slaves to libPyROOT.so

From d01240d460d483d3cc139c1727952b79054f4276 Mon Sep 17 00:00:00 2001
From: Susi Lehtola <jussilehtola@fedoraproject.org>
Date: Tue, 20 Aug 2019 22:13:22 +0200
Subject: [PATCH 162/344] Rebuilt for GSL 2.6.

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 135dd53..4330068 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3646,6 +3646,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 6.18.00-5
+- Rebuilt for GSL 2.6.
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 6.18.00-4
 - Rebuilt for Python 3.8
 

From 0172e0c499ce31d4c194a16abb01634d4cf13f1c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 30 Aug 2019 09:20:16 +0200
Subject: [PATCH 163/344] Update to 6.18.02 Add workarounds for issues caused
 by the RHEL 7.7 update, that left the   aarch64 architecture at RHEL 7.6.

---
 root.spec | 48 +++++++++++++++++++++++++++++++++++++-----------
 sources   |  2 +-
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/root.spec b/root.spec
index 4330068..f477501 100644
--- a/root.spec
+++ b/root.spec
@@ -16,7 +16,7 @@
 %global __pythondef %{__python2}
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 31
+%if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
 # Don't build python2-root for Fedora >= 31
 %global buildpy2 0
 %else
@@ -49,9 +49,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.18.00
+Version:	6.18.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -282,13 +282,8 @@ This package contains icons used by the ROOT GUI.
 %package fonts
 Summary:	ROOT font collection
 BuildArch:	noarch
-%if %{?rhel}%{!?rhel:0}
-#		STIX version 0.9 and Driod Sans Fallback
-License:	OFL and ASL 2.0
-%else
 #		STIX version 0.9 only
 License:	OFL
-%endif
 Requires:	%{name}-core = %{version}-%{release}
 
 %description fonts
@@ -297,7 +292,15 @@ In particular it contains STIX version 0.9 that is used by TMathText.
 
 %package doc
 Summary:	Documentation for the ROOT system
+%if %{?rhel}%{!?rhel:0} != 7
+#		RHEL 7 is now RHEL 7.7, but aarch64 is stuck on RHEL 7.6.
+#		Differences in graphics libraries (SVG support in doxygen)
+#		between the releases result in that the content of the
+#		documentation package differs between architectures in such a
+#		way that the build is rejected as invalid if the documentation
+#		package is noarch. Don't declare the package noarch in EPEL 7.
 BuildArch:	noarch
+%endif
 License:	LGPLv2+ and GPLv2+ and BSD
 Requires:	mathjax
 
@@ -452,8 +455,8 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python2-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python2-jsmva}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
@@ -463,6 +466,12 @@ TMVA interface used by JupyROOT.
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-%{name} = %{version}-%{release}
+%endif
+%endif
 Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -476,6 +485,12 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
 %{?python_provide:%python_provide python%{python3_pkgversion}-jupyroot}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-jupyroot = %{version}-%{release}
+%endif
+%endif
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -495,8 +510,14 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-jsmva = %{version}-%{release}
+%endif
+%endif
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-jsmva
@@ -528,8 +549,8 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_other_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_other_pkgversion}-jsmva
@@ -3646,6 +3667,11 @@ fi
 %endif
 
 %changelog
+* Mon Aug 26 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.02-1
+- Update to 6.18.02
+- Add workarounds for issues caused by the RHEL 7.7 update, that left the
+  aarch64 architecture at RHEL 7.6.
+
 * Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 6.18.00-5
 - Rebuilt for GSL 2.6.
 
diff --git a/sources b/sources
index e1e5742..8289c06 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.18.00.tar.xz) = d7e34c04f22ed2f3a6caf94263126c296df7fda176fc644a166ac47f93663134bd3b34c5d1dfb99cf84071eb93a08602b1cb0a8526610993f099fd3161c897c7
+SHA512 (root-6.18.02.tar.xz) = fe9ab15282f112b8a322e2b25fd15f7703055bcdc2de9f0a3a4457b1e727a172d122d4613faf84ccc27fe4149dc4489f62ee4dac3189c44ad3376e1c81186c28
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From 90ad7be9df61eabfd0cdf80f86cff9b113febc38 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 12 Sep 2019 19:57:07 +0200
Subject: [PATCH 164/344] Rebuild for g++ 9.2

---
 root.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index f477501..1ed21b7 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -204,7 +204,7 @@ BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
 BuildRequires:	blas-devel
 %if %{py3default}
-BuildRequires:	python3-numpy
+BuildRequires:	python%{python3_pkgversion}-numpy
 %else
 BuildRequires:	python2-numpy
 %endif
@@ -526,7 +526,7 @@ TMVA interface used by JupyROOT.
 %if %{?rhel}%{!?rhel:0} == 7
 %package -n python%{python3_other_pkgversion}-%{name}
 Summary:	Python extension for ROOT
-%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}}
+%{?python_provide:%python_provide python%{?python3_other_pkgversion}-%{name}}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -537,7 +537,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 
 %package -n python%{python3_other_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
-%{?python_provide:%python_provide python%{python3_other_pkgversion}-jupyroot}
+%{?python_provide:%python_provide python%{?python3_other_pkgversion}-jupyroot}
 Requires:	python%{python3_other_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_other_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -550,7 +550,7 @@ The Jupyter kernel for the ROOT notebook.
 %package -n python%{python3_other_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
-%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
+%{?python_provide:%python_provide python%{?python3_other_pkgversion}-jsmva}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_other_pkgversion}-jsmva
@@ -1505,7 +1505,7 @@ License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 %if %{py3default}
-Requires:	python3-numpy
+Requires:	python%{python3_pkgversion}-numpy
 %else
 Requires:	python2-numpy
 %endif
@@ -1614,7 +1614,7 @@ An algorithm to unfold distributions from detector to truth level.
 Summary:	ROOT command line utilities
 BuildArch:	noarch
 %if %{py3default}
-Requires:	python3-%{name} = %{version}-%{release}
+Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
 %else
 Requires:	python2-%{name} = %{version}-%{release}
 %endif
@@ -3667,6 +3667,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 12 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.02-2
+- Rebuild for g++ 9.2
+
 * Mon Aug 26 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.02-1
 - Update to 6.18.02
 - Add workarounds for issues caused by the RHEL 7.7 update, that left the

From e337f50c4784b459744be04d144d53f18320c411 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 9 Oct 2019 15:59:54 +0200
Subject: [PATCH 165/344] Update to 6.18.04 First build for EPEL 8

---
 root.spec | 24 ++++++++++++++++++------
 sources   |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index 1ed21b7..341aaa2 100644
--- a/root.spec
+++ b/root.spec
@@ -34,6 +34,12 @@
 %global root7 0
 %endif
 
+%if %{?rhel}%{!?rhel:0} == 8
+# qt5-qtwebengine not yet available in EPEL 8 (only in -playground)
+# https://pagure.io/epel/issue/79
+%global qt5_qtwebengine_arches none
+%endif
+
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # Multi-threading support requires TBB version >= 2018
 %global tbb 1
@@ -49,9 +55,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.18.02
+Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -439,13 +445,13 @@ Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python2-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-notebook = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0} >= 26
 #		python-metakernel for python2 not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
 Requires:	python2-ipython
 Requires:	python2-metakernel
 %endif
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0} >= 28
 Requires:	python-jupyter-filesystem
 %endif
 Obsoletes:	%{name}-rootaas < 6.08.00
@@ -495,13 +501,13 @@ Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-notebook = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0} >= 26
 #		python-metakernel for python3 not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
 Requires:	python%{python3_pkgversion}-ipython
 Requires:	python%{python3_pkgversion}-metakernel
 %endif
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0} >= 28
 Requires:	python-jupyter-filesystem
 %endif
 
@@ -2343,6 +2349,7 @@ EOF
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e 's!/usr/bin/env python3!%{__python3}!' \
+    -e 's!/usr/bin/env platform-python!%{__pythondef}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2357,6 +2364,7 @@ sed -e 's!/usr/bin/env python2!%{__python2}!' \
        %{buildroot}%{_bindir}/rootslimtree
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e 's!/usr/bin/env python3!%{__python3}!' \
+    -e 's!/usr/bin/env platform-python!%{__pythondef}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__pythondef}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
@@ -3667,6 +3675,10 @@ fi
 %endif
 
 %changelog
+* Mon Sep 30 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-1
+- Update to 6.18.04
+- First build for EPEL 8
+
 * Thu Sep 12 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.02-2
 - Rebuild for g++ 9.2
 
diff --git a/sources b/sources
index 8289c06..b86045b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.18.02.tar.xz) = fe9ab15282f112b8a322e2b25fd15f7703055bcdc2de9f0a3a4457b1e727a172d122d4613faf84ccc27fe4149dc4489f62ee4dac3189c44ad3376e1c81186c28
+SHA512 (root-6.18.04.tar.xz) = 9ce3b5e1fa79cc010aa3b20ad3bfd8c4cf8605c17c0fb79991614ae299f3e08f00e76a1847b53f368a7bf006d90c1b5d152d1bf65a32b94f80835a47c60e03e6
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From 3021cd531dcb990c1a3b30b9eda198adee4855eb Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 11 Oct 2019 13:19:37 +0200
Subject: [PATCH 166/344] Exclude failing test on Fedora 29 ppc64le

---
 root.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 341aaa2..d4b1d6b 100644
--- a/root.spec
+++ b/root.spec
@@ -2610,8 +2610,8 @@ tutorial-v7-draw_subpads.cxx"
 %endif
 
 %ifarch ppc64le
-%if %{?fedora}%{!?fedora:0} == 30
-# This test fails on Fedora 30 ppc64le with the following error:
+%if %{?fedora}%{!?fedora:0} == 29 || %{?fedora}%{!?fedora:0} == 30
+# This test fails on Fedora 29 and 30 ppc64le with the following error:
 # cling::DynamicLibraryManager::loadLibrary():
 #   /lib64/libGLdispatch.so.0: cannot allocate memory in static TLS block
 # Error in <TInterpreter::TCling::AutoLoad>:

From 69d6612d8675184db1718516f483b7b9a36cabbf Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 3 Dec 2019 22:35:14 +0100
Subject: [PATCH 167/344] Remove workarounds for RHEL 7 aarch64 (architecture
 dropped by EPEL 7) Enable QtWebEngine dependent modules on EPEL 8 (now
 available)

---
 JupyROOT-on-EPEL | 37 +++++++++++++++++++++++++++
 root.spec        | 66 +++++++++++++-----------------------------------
 2 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100644 JupyROOT-on-EPEL

diff --git a/JupyROOT-on-EPEL b/JupyROOT-on-EPEL
new file mode 100644
index 0000000..cf2b5e0
--- /dev/null
+++ b/JupyROOT-on-EPEL
@@ -0,0 +1,37 @@
+While all is fine in Fedora and all packages needed to run the JupyROOT
+notebook are available there, this is not true for EPEL.
+
+Hopefully the ipython/jupyter stack will at some point be available in
+EPEL too, but at this point in time it is not.
+
+However, it is possible to work around this issue using a python
+virtual environment.
+
+First, install the required root packages (as root):
+
+$ yum install root root-notebook python3-jupyroot
+
+Then return to your non-root user and create a python3 virtual
+environment:
+
+$ python3 -m venv ~/jupyter-env
+
+Activate the environment:
+
+$ . ~/jupyter-env/bin/activate
+
+Then install the missing packages in the virtual environment using pip:
+
+$ pip install notebook metakernel
+
+Then start the root notebook:
+
+$ PYTHONPATH=~/jupyter-env/lib/python3.6/site-packages root --notebook
+
+And that is it.
+
+If you want to start it again and you haven't removed the virtual
+environment, only two of the steps are necessary:
+
+$ . ~/jupyter-env/bin/activate
+$ PYTHONPATH=~/jupyter-env/lib/python3.6/site-packages root --notebook
diff --git a/root.spec b/root.spec
index d4b1d6b..cdf9fa9 100644
--- a/root.spec
+++ b/root.spec
@@ -34,12 +34,6 @@
 %global root7 0
 %endif
 
-%if %{?rhel}%{!?rhel:0} == 8
-# qt5-qtwebengine not yet available in EPEL 8 (only in -playground)
-# https://pagure.io/epel/issue/79
-%global qt5_qtwebengine_arches none
-%endif
-
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # Multi-threading support requires TBB version >= 2018
 %global tbb 1
@@ -57,7 +51,7 @@
 Name:		root
 Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -78,6 +72,9 @@ Source4:	%{name}.png
 #		MIME type file and icon
 Source5:	%{name}.xml
 Source6:	application-x-root.png
+#		Instructions for setting up a python virtual environment
+#		for running the JupyROOT notebook on EPEL
+Source7:	JupyROOT-on-EPEL
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Revert the removal of DataFrame for 32 bit architectures
@@ -226,13 +223,9 @@ BuildRequires:	redhat-lsb-core
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
 BuildRequires:	font(freemono)
-%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	font(standardsymbolsps)
 BuildRequires:	font(d050000l)
 BuildRequires:	font(z003)
-%else
-BuildRequires:	urw-fonts
-%endif
 BuildRequires:	font(droidsansfallback)
 #		With gdb installed test failures will show backtraces
 BuildRequires:	gdb
@@ -298,15 +291,7 @@ In particular it contains STIX version 0.9 that is used by TMathText.
 
 %package doc
 Summary:	Documentation for the ROOT system
-%if %{?rhel}%{!?rhel:0} != 7
-#		RHEL 7 is now RHEL 7.7, but aarch64 is stuck on RHEL 7.6.
-#		Differences in graphics libraries (SVG support in doxygen)
-#		between the releases result in that the content of the
-#		documentation package differs between architectures in such a
-#		way that the build is rejected as invalid if the documentation
-#		package is noarch. Don't declare the package noarch in EPEL 7.
 BuildArch:	noarch
-%endif
 License:	LGPLv2+ and GPLv2+ and BSD
 Requires:	mathjax
 
@@ -354,13 +339,9 @@ Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
 Requires:	font(freeserif)
 Requires:	font(freemono)
-%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
 Requires:	font(standardsymbolsps)
 Requires:	font(d050000l)
 Requires:	font(z003)
-%else
-Requires:	urw-fonts
-%endif
 Requires:	font(droidsansfallback)
 Obsoletes:	%{name}-ruby < 6.00.00
 Obsoletes:	%{name}-vdt < 6.10.00
@@ -472,12 +453,6 @@ TMVA interface used by JupyROOT.
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
-%if %{?rhel}%{!?rhel:0} == 7
-%ifarch aarch64
-#		Workaround broken RHEL 7 aarch64
-Provides:	python3-%{name} = %{version}-%{release}
-%endif
-%endif
 Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -491,12 +466,6 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
 %{?python_provide:%python_provide python%{python3_pkgversion}-jupyroot}
-%if %{?rhel}%{!?rhel:0} == 7
-%ifarch aarch64
-#		Workaround broken RHEL 7 aarch64
-Provides:	python3-jupyroot = %{version}-%{release}
-%endif
-%endif
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -518,12 +487,6 @@ The Jupyter kernel for the ROOT notebook.
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
 %{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
-%if %{?rhel}%{!?rhel:0} == 7
-%ifarch aarch64
-#		Workaround broken RHEL 7 aarch64
-Provides:	python3-jsmva = %{version}-%{release}
-%endif
-%endif
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-jsmva
@@ -1634,6 +1597,11 @@ Summary:	Static files for the Jupyter ROOT Notebook
 BuildArch:	noarch
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	js-jsroot
+%if %{?fedora}%{!?fedora:0} >= 26
+#		jupyter-notebook not available in
+#		Fedora <= 25 or RHEL/EPEL - some functionality missing
+Requires:	jupyter-notebook
+%endif
 
 %description notebook
 Javascript and style files for the Jupyter ROOT Notebook.
@@ -2118,6 +2086,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages
 install -p -m 644 %{SOURCE6} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
+# Additional documentation
+install -p -m 644 %{SOURCE7} %{buildroot}%{_pkgdocdir}
+
 # Move python cli helper to its own directory
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
@@ -2133,11 +2104,7 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # This is the default for Fedora 30+, set it for Fedora 28-29
 %global _python_bytecompile_extra 0
-%if %{py3default}
-%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
-%else
-%py_byte_compile %{__python2} %{buildroot}%{_datadir}/%{name}/cli
-%endif
+%py_byte_compile %{__pythondef} %{buildroot}%{_datadir}/%{name}/cli
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 %endif
 
@@ -2349,7 +2316,6 @@ EOF
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e 's!/usr/bin/env python3!%{__python3}!' \
-    -e 's!/usr/bin/env platform-python!%{__pythondef}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2364,7 +2330,6 @@ sed -e 's!/usr/bin/env python2!%{__python2}!' \
        %{buildroot}%{_bindir}/rootslimtree
 sed -e 's!/usr/bin/env python2!%{__python2}!' \
     -e 's!/usr/bin/env python3!%{__python3}!' \
-    -e 's!/usr/bin/env platform-python!%{__pythondef}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__pythondef}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
@@ -3625,6 +3590,7 @@ fi
 %files notebook
 %{_bindir}/rootnb.exe
 %{_datadir}/%{name}/notebook
+%doc %{_pkgdocdir}/JupyROOT-on-EPEL
 
 %if %{root7}
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
@@ -3675,6 +3641,10 @@ fi
 %endif
 
 %changelog
+* Tue Dec 03 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-2
+- Remove workarounds for RHEL 7 aarch64 (architecture dropped by EPEL 7)
+- Enable QtWebEngine dependent modules on EPEL 8 (now available)
+
 * Mon Sep 30 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-1
 - Update to 6.18.04
 - First build for EPEL 8

From a8a22f4c901157952fb7eafeb666e49812e2287c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 4 Dec 2019 15:11:16 +0100
Subject: [PATCH 168/344] Fix shebangs in root-cli for EPEL 8

---
 root.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/root.spec b/root.spec
index cdf9fa9..9a73900 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2093,6 +2093,9 @@ install -p -m 644 %{SOURCE7} %{buildroot}%{_pkgdocdir}
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
+%if %{py3default}
+rm %{buildroot}%{_libdir}/%{name}/__pycache__/cmdLineUtils.*
+%endif
 sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
 # Move GDB pretty printers to auto load safe path
@@ -2314,8 +2317,7 @@ EOF
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed -e 's!/usr/bin/env python2!%{__python2}!' \
-    -e 's!/usr/bin/env python3!%{__python3}!' \
+sed -e 's!/usr/bin/env python.*!%{__pythondef}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2328,8 +2330,7 @@ sed -e 's!/usr/bin/env python2!%{__python2}!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
-sed -e 's!/usr/bin/env python2!%{__python2}!' \
-    -e 's!/usr/bin/env python3!%{__python3}!' \
+sed -e 's!/usr/bin/env python.*!%{__pythondef}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__pythondef}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
@@ -3641,6 +3642,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec 04 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-3
+- Fix shebangs in root-cli for EPEL 8
+
 * Tue Dec 03 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-2
 - Remove workarounds for RHEL 7 aarch64 (architecture dropped by EPEL 7)
 - Enable QtWebEngine dependent modules on EPEL 8 (now available)

From e9736ff4813e0946e69b69b0ca5d44d6d432942f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 17:48:04 +0000
Subject: [PATCH 169/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9a73900..32f8148 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3642,6 +3642,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.18.04-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Dec 04 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-3
 - Fix shebangs in root-cli for EPEL 8
 

From baedd3ac92b83e79769aa3f8bd50c9330a66f7b1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 22 Feb 2020 14:31:21 +0100
Subject: [PATCH 170/344] Fixes and workarounds for gcc 10 ExcludeArch for 32
 bit ARM because rootcling_stage1 segfaults

---
 root-clang-altivec-vector.patch   | 12 +++++++++
 root-missing-include-string.patch | 11 ++++++++
 root-static-constexpr.patch       | 12 +++++++++
 root.spec                         | 42 ++++++++++++++++++++++++++++++-
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 root-clang-altivec-vector.patch
 create mode 100644 root-missing-include-string.patch
 create mode 100644 root-static-constexpr.patch

diff --git a/root-clang-altivec-vector.patch b/root-clang-altivec-vector.patch
new file mode 100644
index 0000000..23202bd
--- /dev/null
+++ b/root-clang-altivec-vector.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.18.04.orig/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp root-6.18.04/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
+--- root-6.18.04.orig/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp	2020-02-06 14:36:14.580497452 +0100
+@@ -2373,7 +2373,7 @@
+         '/', '/', '/', '/',  '/', '/', '/', '/'
+       };
+       while (CurPtr+16 <= BufferEnd &&
+-             !vec_any_eq(*(const vector unsigned char*)CurPtr, Slashes))
++             !vec_any_eq(*(const __vector unsigned char*)CurPtr, Slashes))
+         CurPtr += 16;
+ #else
+       // Scan for '/' quickly.  Many block comments are very large.
diff --git a/root-missing-include-string.patch b/root-missing-include-string.patch
new file mode 100644
index 0000000..f870e14
--- /dev/null
+++ b/root-missing-include-string.patch
@@ -0,0 +1,11 @@
+diff -ur root-6.18.04.orig/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx root-6.18.04/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx
+--- root-6.18.04.orig/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx	2020-01-23 11:27:58.637463837 +0100
+@@ -17,6 +17,7 @@
+ #define ROOT7_RColor
+ 
+ #include <array>
++#include <string>
+ #include <vector>
+ 
+ namespace ROOT {
diff --git a/root-static-constexpr.patch b/root-static-constexpr.patch
new file mode 100644
index 0000000..c04ba6f
--- /dev/null
+++ b/root-static-constexpr.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.18.04.orig/graf2d/gpadv7/v7/src/RDrawingAttr.cxx root-6.18.04/graf2d/gpadv7/v7/src/RDrawingAttr.cxx
+--- root-6.18.04.orig/graf2d/gpadv7/v7/src/RDrawingAttr.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/graf2d/gpadv7/v7/src/RDrawingAttr.cxx	2020-02-15 21:16:58.819735413 +0100
+@@ -26,6 +26,8 @@
+ {
+ }
+ 
++constexpr const ROOT::Experimental::RDrawingAttrBase::FromOption_t ROOT::Experimental::RDrawingAttrBase::FromOption;
++
+ ROOT::Experimental::RDrawingAttrBase::RDrawingAttrBase(FromOption_t, const Name &name, RDrawingOptsBase &opts) :
+    fPath{name.fStr}, fHolder(opts.GetHolder())
+ {
diff --git a/root.spec b/root.spec
index 32f8148..21f5387 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -121,11 +121,22 @@ Patch17:	%{name}-stress-aarch64-ppc64le.patch
 #		Fix GDB pretty printers install name and location
 #		https://github.com/root-project/root/pull/4024
 Patch18:	%{name}-pretty-printers.patch
+#		Missing include - fails with gcc 10
+Patch19:	%{name}-missing-include-string.patch
+#		Fix ppc64le build with gcc 10
+Patch20:	%{name}-clang-altivec-vector.patch
+#		Missing symbol - with gcc 10
+Patch21:	%{name}-static-constexpr.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
+%if %{?fedora}%{!?fedora:0} >= 32
+#		The rootcling_stage1 binary segfaults on 32-bit arm when
+#		compiled with gcc 10 - exclude the architecture for now
+ExcludeArch:	%{arm}
+%endif
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	cmake >= 3.4.3
@@ -1744,6 +1755,9 @@ This package contains an ntuple extension for ROOT 7.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2586,6 +2600,28 @@ excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
 %endif
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 32
+# New failures with Fedora 32+ (gcc 10)
+excluded="${excluded}|tutorial-v7-markerStyle.cxx"
+%ifarch %{ix86}
+excluded="${excluded}|\
+TMVA-DNN-CNN-Reshape-CPU|\
+gtest-tree-dataframe-test-dataframe-interface"
+%endif
+%ifarch ppc64le
+excluded="${excluded}|\
+TMVA-DNN-CNN-Reshape-CPU|\
+tutorial-v7-lineStyle.cxx|\
+tutorial-v7-lineWidth.cxx"
+%endif
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 33
+%ifarch aarch64
+excluded="${excluded}|tutorial-tmva-TMVARegression"
+%endif
+%endif
+
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -3642,6 +3678,10 @@ fi
 %endif
 
 %changelog
+* Sat Feb 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-5
+- Fixes and workarounds for gcc 10
+- ExcludeArch for 32 bit ARM because rootcling_stage1 segfaults
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.18.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 9efe68edd415287672edac13845cfb57446afff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 9 Mar 2020 11:34:00 +0100
Subject: [PATCH 171/344] Link to a bug report for the exclusion on 32-bit ARM

---
 root.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 21f5387..e7223a2 100644
--- a/root.spec
+++ b/root.spec
@@ -134,7 +134,8 @@ Patch21:	%{name}-static-constexpr.patch
 ExcludeArch:	s390x
 %if %{?fedora}%{!?fedora:0} >= 32
 #		The rootcling_stage1 binary segfaults on 32-bit arm when
-#		compiled with gcc 10 - exclude the architecture for now
+#		compiled with gcc 10 - exclude the architecture for now,
+#		bug #1811604
 ExcludeArch:	%{arm}
 %endif
 
@@ -3680,7 +3681,7 @@ fi
 %changelog
 * Sat Feb 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-5
 - Fixes and workarounds for gcc 10
-- ExcludeArch for 32 bit ARM because rootcling_stage1 segfaults
+- ExcludeArch for 32 bit ARM because rootcling_stage1 segfaults (bug #1811604)
 
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.18.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

From cce2ff465c6ebe5f416eb42212a37fad1a389f46 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 15 Mar 2020 00:24:13 +0100
Subject: [PATCH 172/344] Build for 32 bit ARM again - gcc-10.0.1-0.9 fixes the
 problem

---
 root-32bit-dataframe.patch            | 149 +++++--
 root-32bit-tests.patch                |  53 +++
 root-FitData-assert-fix.patch         |  28 ++
 root-clang-altivec-vector.patch       |  23 +-
 root-format-fix.patch                 |  28 ++
 root-python3.8-object.patch           | 539 ++++++++++++++++++++++++++
 root-tutorials-unique-filenames.patch |  22 ++
 root-xmlmodify-dep.patch              |  25 ++
 root.spec                             |  72 ++--
 9 files changed, 871 insertions(+), 68 deletions(-)
 create mode 100644 root-32bit-tests.patch
 create mode 100644 root-FitData-assert-fix.patch
 create mode 100644 root-format-fix.patch
 create mode 100644 root-python3.8-object.patch
 create mode 100644 root-tutorials-unique-filenames.patch
 create mode 100644 root-xmlmodify-dep.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index 5a34084..dd71ad6 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.18.00.orig/bindings/pyroot/ROOT.py root-6.18.00/bindings/pyroot/ROOT.py
---- root-6.18.00.orig/bindings/pyroot/ROOT.py	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/bindings/pyroot/ROOT.py	2019-06-26 15:14:34.684257765 +0200
+diff -ur root-6.18.04.orig/bindings/pyroot/ROOT.py root-6.18.04/bindings/pyroot/ROOT.py
+--- root-6.18.04.orig/bindings/pyroot/ROOT.py	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/ROOT.py	2020-03-13 19:58:32.330575246 +0100
 @@ -449,9 +449,7 @@
  # This function is injected as method to the respective classes in Pythonize.cxx.
  _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
@@ -12,9 +12,9 @@ diff -ur root-6.18.00.orig/bindings/pyroot/ROOT.py root-6.18.00/bindings/pyroot/
  
  
  ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.00/bindings/pyroot/test/CMakeLists.txt
---- root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/bindings/pyroot/test/CMakeLists.txt	2019-06-26 15:22:03.843577496 +0200
+diff -ur root-6.18.04.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.04/bindings/pyroot/test/CMakeLists.txt
+--- root-6.18.04.orig/bindings/pyroot/test/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/test/CMakeLists.txt	2020-03-13 19:58:32.330575246 +0100
 @@ -4,10 +4,7 @@
  ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
  if(NUMPY_FOUND)
@@ -28,9 +28,9 @@ diff -ur root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.00/bind
 +  ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
  endif()
  
-diff -ur root-6.18.00.orig/build/unix/makepchinput.py root-6.18.00/build/unix/makepchinput.py
---- root-6.18.00.orig/build/unix/makepchinput.py	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/build/unix/makepchinput.py	2019-06-26 15:14:34.760256972 +0200
+diff -ur root-6.18.04.orig/build/unix/makepchinput.py root-6.18.04/build/unix/makepchinput.py
+--- root-6.18.04.orig/build/unix/makepchinput.py	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/build/unix/makepchinput.py	2020-03-13 19:58:32.331575236 +0100
 @@ -263,9 +263,6 @@
                             "math/vdt",
                             "tmva/rmva"]
@@ -41,27 +41,10 @@ diff -ur root-6.18.00.orig/build/unix/makepchinput.py root-6.18.00/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.18.00/cmake/scripts/ROOTConfig.cmake.in
---- root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/cmake/scripts/ROOTConfig.cmake.in	2019-06-26 15:14:34.768256889 +0200
-@@ -83,7 +83,7 @@
-   set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
-   set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
- endif()
--foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
-+foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame ROOTVecOps Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
-   find_library(ROOT_${_cpt}_LIBRARY ${_cpt} HINTS ${ROOT_LIBRARY_DIR})
-   if(ROOT_${_cpt}_LIBRARY)
-     mark_as_advanced(ROOT_${_cpt}_LIBRARY)
-diff -ur root-6.18.00.orig/config/root-config.in root-6.18.00/config/root-config.in
---- root-6.18.00.orig/config/root-config.in	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/config/root-config.in	2019-06-26 15:41:39.518330743 +0200
-@@ -72,15 +72,10 @@
- newlib="-lNew"
- rootglibs="-lGui"
- rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
--rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
-+rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame -lROOTVecOps -lTree -lTreePlayer\
+diff -ur root-6.18.04.orig/config/root-config.in root-6.18.04/config/root-config.in
+--- root-6.18.04.orig/config/root-config.in	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/config/root-config.in	2020-03-13 20:06:39.876361426 +0100
+@@ -76,10 +76,7 @@
            -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
            -lMultiProc"
  
@@ -69,13 +52,13 @@ diff -ur root-6.18.00.orig/config/root-config.in root-6.18.00/config/root-config
 -   rootlibs="$rootlibs -lROOTDataFrame"
 -fi
 -
--
++rootlibs="$rootlibs -lROOTDataFrame"
+ 
  if test "$platform" = "win32"; then
     rootulibs="-include:_G__cpp_setupG__Net        \
-               -include:_G__cpp_setupG__IO         \
-diff -ur root-6.18.00.orig/tree/dataframe/CMakeLists.txt root-6.18.00/tree/dataframe/CMakeLists.txt
---- root-6.18.00.orig/tree/dataframe/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/tree/dataframe/CMakeLists.txt	2019-06-26 15:14:34.827256273 +0200
+diff -ur root-6.18.04.orig/tree/dataframe/CMakeLists.txt root-6.18.04/tree/dataframe/CMakeLists.txt
+--- root-6.18.04.orig/tree/dataframe/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/CMakeLists.txt	2020-03-13 19:58:32.332575225 +0100
 @@ -3,11 +3,6 @@
  # @author Danilo Piparo CERN, Pere Mato CERN
  ############################################################################
@@ -88,9 +71,99 @@ diff -ur root-6.18.00.orig/tree/dataframe/CMakeLists.txt root-6.18.00/tree/dataf
  if(arrow)
    list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
    list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
-diff -ur root-6.18.00.orig/tutorials/CMakeLists.txt root-6.18.00/tutorials/CMakeLists.txt
---- root-6.18.00.orig/tutorials/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/tutorials/CMakeLists.txt	2019-06-26 15:18:15.834951333 +0200
+diff -ur root-6.18.04.orig/tree/dataframe/test/dataframe_cache.cxx root-6.18.04/tree/dataframe/test/dataframe_cache.cxx
+--- root-6.18.04.orig/tree/dataframe/test/dataframe_cache.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/test/dataframe_cache.cxx	2020-03-13 20:13:04.021253192 +0100
+@@ -224,8 +224,6 @@
+ 
+ }
+ 
+-#ifdef R__B64
+-
+ TEST(Cache, Regex)
+ {
+ 
+@@ -334,5 +332,3 @@
+ 
+    gSystem->Unlink(fileName);
+ }
+-
+-#endif // R__B64
+diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_arrow.cxx root-6.18.04/tree/dataframe/test/datasource_arrow.cxx
+--- root-6.18.04.orig/tree/dataframe/test/datasource_arrow.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/test/datasource_arrow.cxx	2020-03-13 20:13:04.021253192 +0100
+@@ -163,8 +163,6 @@
+ }
+ #endif
+ 
+-#ifdef R__B64
+-
+ TEST(RArrowDS, FromARDF)
+ {
+    std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
+@@ -236,5 +234,3 @@
+ }
+ 
+ #endif // R__USE_IMT
+-
+-#endif // R__B64
+diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_csv.cxx root-6.18.04/tree/dataframe/test/datasource_csv.cxx
+--- root-6.18.04.orig/tree/dataframe/test/datasource_csv.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/test/datasource_csv.cxx	2020-03-13 20:26:14.841831219 +0100
+@@ -193,8 +193,6 @@
+ }
+ #endif
+ 
+-#ifdef R__B64
+-
+ TEST(RCsvDS, FromARDF)
+ {
+    std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
+@@ -290,5 +288,3 @@
+ }
+ 
+ #endif // R__USE_IMT
+-
+-#endif // R__B64
+diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_root.cxx root-6.18.04/tree/dataframe/test/datasource_root.cxx
+--- root-6.18.04.orig/tree/dataframe/test/datasource_root.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/test/datasource_root.cxx	2020-03-13 20:13:04.021253192 +0100
+@@ -117,8 +117,6 @@
+ }
+ #endif
+ 
+-#ifdef R__B64
+-
+ TEST(TRootTDS, FromARDF)
+ {
+    std::unique_ptr<RDataSource> tds(new RRootDS(treeName, fileGlob));
+@@ -190,5 +188,3 @@
+ }
+ 
+ #endif // R__USE_IMT
+-
+-#endif // R__B64
+diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_trivial.cxx root-6.18.04/tree/dataframe/test/datasource_trivial.cxx
+--- root-6.18.04.orig/tree/dataframe/test/datasource_trivial.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tree/dataframe/test/datasource_trivial.cxx	2020-03-13 20:13:04.021253192 +0100
+@@ -132,8 +132,6 @@
+    EXPECT_EQ(*tdfAll.Count(), 20ULL);
+ }
+ 
+-#ifdef R__B64
+-
+ TEST(RTrivialDS, FromARDFWithJitting)
+ {
+    std::unique_ptr<RDataSource> tds(new RTrivialDS(32));
+@@ -236,5 +234,3 @@
+ }
+ 
+ #endif // R__USE_IMT
+-
+-#endif // R__B64
+diff -ur root-6.18.04.orig/tutorials/CMakeLists.txt root-6.18.04/tutorials/CMakeLists.txt
+--- root-6.18.04.orig/tutorials/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/tutorials/CMakeLists.txt	2020-03-13 19:58:32.333575214 +0100
 @@ -212,10 +212,6 @@
                   v7/ntuple/ntpl004_dimuon.C)
  endif()
diff --git a/root-32bit-tests.patch b/root-32bit-tests.patch
new file mode 100644
index 0000000..ea926b4
--- /dev/null
+++ b/root-32bit-tests.patch
@@ -0,0 +1,53 @@
+From 70d941cd6ebbc3726e08ef7f52d0135453f0b840 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 16:21:55 +0100
+Subject: [PATCH 2/3] Run tests on 32 bit
+
+---
+ test/stressGeometry.cxx       |  8 --------
+ tree/tree/test/CMakeLists.txt | 10 +++-------
+ 2 files changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
+index 5e81f5f2ca..18e41a6f45 100644
+--- a/test/stressGeometry.cxx
++++ b/test/stressGeometry.cxx
+@@ -257,14 +257,6 @@ void stressGeometry(const char *exp="*", Bool_t generate_ref=kFALSE, Bool_t vecg
+       if (opt.Contains(exps[i])) iexp[i] = 1;
+       else                       iexp[i] = 0;
+    }
+-#if defined(linux) && !defined(__x86_64__)
+-   // 32bit linux: we have an error with ATLAS, see https://sft.its.cern.ch/jira/browse/ROOT-9893
+-   // Disable unless explicitly enabled.
+-   if (all) {
+-      printf("DISABLED ATLAS TEST due to known failure on Linux 32 bit!\n");
+-      iexp[32] = 0;
+-   }
+-#endif
+    TFile::SetCacheFileDir(".");
+    TString fname;
+    for (i=0; i<NG; i++) {
+diff --git a/tree/tree/test/CMakeLists.txt b/tree/tree/test/CMakeLists.txt
+index 0c1a39d01e..3bafe47934 100644
+--- a/tree/tree/test/CMakeLists.txt
++++ b/tree/tree/test/CMakeLists.txt
+@@ -12,13 +12,9 @@ ROOT_ADD_GTEST(testTOffsetGeneration TOffsetGeneration.cxx ElementStruct.cxx Ele
+ target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+ ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
+ ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
+-#FIXME: tests are having timeout on 32bit CERN VM (in docker container everything is fine),
+-# to be reverted after investigation.
+-if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
+-  ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
+-  ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
+-  ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
+-endif()
++ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
++ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
++ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
+ ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
+ ROOT_ADD_GTEST(testTBranch TBranch.cxx LIBRARIES RIO Tree MathCore)
+ ROOT_ADD_GTEST(testTIOFeatures TIOFeatures.cxx LIBRARIES RIO Tree)
+-- 
+2.24.1
+
diff --git a/root-FitData-assert-fix.patch b/root-FitData-assert-fix.patch
new file mode 100644
index 0000000..8e9ba00
--- /dev/null
+++ b/root-FitData-assert-fix.patch
@@ -0,0 +1,28 @@
+From 07c5d640dd53c83c8b3350b520170fd9a5526495 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 14:09:07 +0100
+Subject: [PATCH] Correct broken assert statements
+
+---
+ math/mathcore/src/FitData.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/math/mathcore/src/FitData.cxx b/math/mathcore/src/FitData.cxx
+index a2be20ab0d..0bad8ff7cd 100644
+--- a/math/mathcore/src/FitData.cxx
++++ b/math/mathcore/src/FitData.cxx
+@@ -200,9 +200,9 @@ namespace ROOT {
+       /// dummy virtual destructor
+       FitData::~FitData()
+       {
++         assert(fWrapped == fCoords.empty());
+          for (unsigned int i = 0; i < fDim; i++) {
+-            assert(fWrapped == fCoords.empty());
+-            assert(fCoords.empty() || &fCoords[i].front() == fCoordsPtr[i]);
++            assert(fWrapped || fCoords[i].empty() || &fCoords[i].front() == fCoordsPtr[i]);
+          }
+          if (fpTmpCoordVector)  delete[] fpTmpCoordVector;
+ 
+-- 
+2.24.1
+
diff --git a/root-clang-altivec-vector.patch b/root-clang-altivec-vector.patch
index 23202bd..4648ccc 100644
--- a/root-clang-altivec-vector.patch
+++ b/root-clang-altivec-vector.patch
@@ -1,7 +1,19 @@
-diff -ur root-6.18.04.orig/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp root-6.18.04/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
---- root-6.18.04.orig/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp	2020-02-06 14:36:14.580497452 +0100
-@@ -2373,7 +2373,7 @@
+From f0e7ee696e416f5cb42619889fcbff7db64f17e1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 17:09:03 +0100
+Subject: [PATCH] Fix ppc64le compilation with gcc 10
+
+Backported from llvm upstream
+https://reviews.llvm.org/D74129
+---
+ interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
+index dbe6b4db94..2096ba6982 100644
+--- a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
++++ b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
+@@ -2373,7 +2373,7 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr,
          '/', '/', '/', '/',  '/', '/', '/', '/'
        };
        while (CurPtr+16 <= BufferEnd &&
@@ -10,3 +22,6 @@ diff -ur root-6.18.04.orig/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp ro
          CurPtr += 16;
  #else
        // Scan for '/' quickly.  Many block comments are very large.
+-- 
+2.24.1
+
diff --git a/root-format-fix.patch b/root-format-fix.patch
new file mode 100644
index 0000000..9d7f4e2
--- /dev/null
+++ b/root-format-fix.patch
@@ -0,0 +1,28 @@
+From 1d4aaf9e503669ccb0275f3f9b8a87a486671334 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 14:34:48 +0100
+Subject: [PATCH] Size types should use %z
+
+---
+ tree/dataframe/src/RCsvDS.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tree/dataframe/src/RCsvDS.cxx b/tree/dataframe/src/RCsvDS.cxx
+index 81f802285b..fc0a18e21f 100644
+--- a/tree/dataframe/src/RCsvDS.cxx
++++ b/tree/dataframe/src/RCsvDS.cxx
+@@ -368,9 +368,9 @@ std::vector<std::pair<ULong64_t, ULong64_t>> RCsvDS::GetEntryRanges()
+ 
+    if (gDebug > 0) {
+       if (fLinesChunkSize == -1LL) {
+-         Info("GetEntryRanges", "Attempted to read entire CSV file into memory, %lu lines read", fRecords.size());
++         Info("GetEntryRanges", "Attempted to read entire CSV file into memory, %zu lines read", fRecords.size());
+       } else {
+-         Info("GetEntryRanges", "Attempted to read chunk of %lld lines of CSV file into memory, %lu lines read", fLinesChunkSize, fRecords.size());
++         Info("GetEntryRanges", "Attempted to read chunk of %lld lines of CSV file into memory, %zu lines read", fLinesChunkSize, fRecords.size());
+       }
+    }
+ 
+-- 
+2.24.1
+
diff --git a/root-python3.8-object.patch b/root-python3.8-object.patch
new file mode 100644
index 0000000..ed4ef9f
--- /dev/null
+++ b/root-python3.8-object.patch
@@ -0,0 +1,539 @@
+diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bindings/pyroot/src/MethodProxy.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/MethodProxy.cxx	2020-03-13 16:46:56.538971601 +0100
+@@ -839,7 +839,8 @@
+    sizeof(MethodProxy),       // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)mp_dealloc,    // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -888,6 +889,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx	2020-03-13 16:46:56.539971591 +0100
+@@ -397,7 +397,8 @@
+    sizeof(ObjectProxy),       // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)op_dealloc,    // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -449,6 +450,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx	2020-03-13 16:46:56.539971591 +0100
+@@ -133,7 +133,8 @@
+    sizeof(PropertyProxy),     // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)pp_dealloc,    // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -182,6 +183,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindings/pyroot/src/PyRootType.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/PyRootType.cxx	2020-03-13 16:46:56.539971591 +0100
+@@ -230,7 +230,8 @@
+    sizeof(PyROOT::PyRootClass),// tp_basicsize
+    0,                         // tp_itemsize
+    0,                         // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -279,6 +280,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx root-6.18.04/bindings/pyroot/src/Pythonize.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/Pythonize.cxx	2020-03-13 16:46:56.540971580 +0100
+@@ -944,6 +944,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+       , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++      , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++      , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+    };
+ 
+    static PyObject* vector_iter( PyObject* v ) {
+diff -ur root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx root-6.18.04/bindings/pyroot/src/RootModule.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/RootModule.cxx	2020-03-13 16:46:56.540971580 +0100
+@@ -134,6 +134,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ PyObject _PyROOT_NullPtrStruct = {
+diff -ur root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-13 16:46:56.540971580 +0100
+@@ -19,7 +19,8 @@
+    0,                         // tp_basicsize
+    0,                         // tp_itemsize
+    0,                         // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -69,6 +70,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ //= long type allowed for reference passing ==================================
+@@ -78,7 +85,8 @@
+    0,                         // tp_basicsize
+    0,                         // tp_itemsize
+    0,                         // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -128,6 +136,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ //= instancemethod object with a more efficient call function ================
+@@ -277,7 +291,8 @@
+    0,                         // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)im_dealloc,    // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -327,6 +342,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx	2020-03-13 16:46:56.541971570 +0100
+@@ -395,7 +395,8 @@
+    sizeof(TemplateProxy),     // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)tpp_dealloc,   // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -444,6 +445,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx
+--- root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-13 16:46:56.540971580 +0100
+@@ -42,7 +42,8 @@
+    0,                         // tp_basicsize
+    0,                         // tp_itemsize
+    0,                         // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -92,6 +93,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace PyROOT
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-13 16:47:15.029777701 +0100
+@@ -168,7 +168,8 @@
+     sizeof(CPPDataMember),         // tp_basicsize
+     0,                             // tp_itemsize
+     (destructor)pp_dealloc,        // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -217,6 +218,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-13 16:47:15.029777701 +0100
+@@ -385,7 +385,8 @@
+     sizeof(CPPInstance),           // tp_basicsize
+     0,                             // tp_itemsize
+     (destructor)op_dealloc,        // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -437,6 +438,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-13 16:47:15.030777691 +0100
+@@ -813,7 +813,8 @@
+     sizeof(CPPOverload),           // tp_basicsize
+     0,                             // tp_itemsize
+     (destructor)mp_dealloc,        // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -862,6 +863,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-13 16:47:15.030777691 +0100
+@@ -424,7 +424,8 @@
+     sizeof(CPyCppyy::CPPScope),    // tp_basicsize
+     0,                             // tp_itemsize
+     0,                             // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -473,6 +474,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-13 16:47:15.030777691 +0100
+@@ -140,6 +140,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                  // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                  // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                  // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ namespace {
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-13 16:57:57.529034828 +0100
+@@ -32,6 +32,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ //= long type allowed for reference passing ==================================
+@@ -54,6 +60,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ //= instancemethod object with a more efficient call function ================
+@@ -219,6 +231,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ 
+@@ -269,6 +287,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                           // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                           // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                           // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ 
+@@ -320,6 +344,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                           // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                           // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                           // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-13 16:47:15.031777680 +0100
+@@ -657,7 +657,8 @@
+     sizeof(CPyCppyy::LowLevelView),// tp_basicsize
+     0,                             // tp_itemsize
+     (destructor)ll_dealloc,        // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -707,6 +708,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-13 16:47:15.032777670 +0100
+@@ -515,7 +515,8 @@
+    sizeof(TemplateProxy),     // tp_basicsize
+    0,                         // tp_itemsize
+    (destructor)tpp_dealloc,   // tp_dealloc
+-   0,                         // tp_print
++   0,                         // tp_print (python < 3.8)
++                              // tp_vectorcall_offset (python >= 3.8)
+    0,                         // tp_getattr
+    0,                         // tp_setattr
+    0,                         // tp_compare
+@@ -564,6 +565,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+    , 0                        // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++   , 0                        // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++   , 0                        // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
+--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2019-09-11 15:36:49.000000000 +0200
++++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-13 16:47:15.032777670 +0100
+@@ -79,6 +79,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                           // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                           // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                           // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ 
+@@ -152,7 +158,8 @@
+     0,                             // tp_basicsize
+     0,                             // tp_itemsize
+     0,                             // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -202,6 +209,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
diff --git a/root-tutorials-unique-filenames.patch b/root-tutorials-unique-filenames.patch
new file mode 100644
index 0000000..dee82fb
--- /dev/null
+++ b/root-tutorials-unique-filenames.patch
@@ -0,0 +1,22 @@
+diff --git a/tutorials/multicore/mtbb101_fillNtuples.C b/tutorials/multicore/mtbb101_fillNtuples.C
+index 80c19ce626..d7a9dbbdaa 100644
+--- a/tutorials/multicore/mtbb101_fillNtuples.C
++++ b/tutorials/multicore/mtbb101_fillNtuples.C
+@@ -40,7 +40,7 @@ Int_t mtbb101_fillNtuples()
+ 
+    // Create a random generator and and Ntuple to hold the numbers
+    TRandom3 rndm(1);
+-   TFile ofile("mp101_singleCore.root", "RECREATE");
++   TFile ofile("mtbb101_singleCore.root", "RECREATE");
+    TNtuple randomNumbers("singleCore", "Random Numbers", "r");
+    fillRandom(randomNumbers, rndm, nNumbers);
+    randomNumbers.Write();
+@@ -52,7 +52,7 @@ Int_t mtbb101_fillNtuples()
+    auto workItem = [](UInt_t workerID) {
+       // One generator, file and ntuple per worker
+       TRandom3 workerRndm(workerID); // Change the seed
+-      TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
++      TFile ofile(Form("mtbb101_multiCore_%u.root", workerID), "RECREATE");
+       TNtuple workerRandomNumbers("multiCore", "Random Numbers", "r");
+       fillRandom(workerRandomNumbers, workerRndm, workSize);
+       workerRandomNumbers.Write();
diff --git a/root-xmlmodify-dep.patch b/root-xmlmodify-dep.patch
new file mode 100644
index 0000000..02a0498
--- /dev/null
+++ b/root-xmlmodify-dep.patch
@@ -0,0 +1,25 @@
+From a651fb9278438d5ad7e4ddbf6082a791e1187e0d Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 12:58:14 +0100
+Subject: [PATCH] The test that creates the file must run before the test that
+ modifies it
+
+---
+ tutorials/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index f920da54ee..b1abd03d36 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -375,6 +375,7 @@ set(unfold-testUnfold5b-depends tutorial-unfold-testUnfold5a)
+ set(unfold-testUnfold7d-depends tutorial-unfold-testUnfold7c)
+ set(unfold-testUnfold7c-depends tutorial-unfold-testUnfold7b)
+ set(unfold-testUnfold7b-depends tutorial-unfold-testUnfold7a)
++set(xml-xmlmodifyfile-depends tutorial-xml-xmlnewfile)
+ set(xml-xmlreadfile-depends tutorial-xml-xmlnewfile)
+ set(roofit-rf503_wspaceread-depends tutorial-roofit-rf502_wspacewrite)
+ set(histfactory-example-depends tutorial-roostats-CreateExampleFile)
+-- 
+2.24.1
+
diff --git a/root.spec b/root.spec
index e7223a2..02e7bb6 100644
--- a/root.spec
+++ b/root.spec
@@ -46,12 +46,12 @@
 
 # Do not generate autoprovides for libJupyROOT.so
 # Note: the ones from libPyROOT.so we do want though
-%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
+%global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
 Version:	6.18.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -124,20 +124,35 @@ Patch18:	%{name}-pretty-printers.patch
 #		Missing include - fails with gcc 10
 Patch19:	%{name}-missing-include-string.patch
 #		Fix ppc64le build with gcc 10
+#		https://github.com/root-project/root/pull/5157
 Patch20:	%{name}-clang-altivec-vector.patch
 #		Missing symbol - with gcc 10
 Patch21:	%{name}-static-constexpr.patch
+#		Fix -Wmissing-field-initializers in python bindings for
+#		Python 3.8 and 3.9
+#		https://github.com/root-project/root/pull/5158
+Patch22:	%{name}-python3.8-object.patch
+#		Correct broken assert statements
+#		https://github.com/root-project/root/pull/5159
+Patch23:	%{name}-FitData-assert-fix.patch
+#		The test that creates the file must run before the test that
+#		modifies it
+#		https://github.com/root-project/root/pull/5160
+Patch24:	%{name}-xmlmodify-dep.patch
+#		Use unique filenames in tutorials so they can be run in
+#		parallel
+#		Backport from upstream's git
+Patch25:	%{name}-tutorials-unique-filenames.patch
+#		Size types should use %z
+#		https://github.com/root-project/root/pull/5161
+Patch26:	%{name}-format-fix.patch
+#		Run some test on 32 bit that upstream has disabled
+Patch27:	%{name}-32bit-tests.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
-%if %{?fedora}%{!?fedora:0} >= 32
-#		The rootcling_stage1 binary segfaults on 32-bit arm when
-#		compiled with gcc 10 - exclude the architecture for now,
-#		bug #1811604
-ExcludeArch:	%{arm}
-%endif
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	cmake >= 3.4.3
@@ -1759,6 +1774,12 @@ This package contains an ntuple extension for ROOT 7.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1769,7 +1790,7 @@ rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 rm -rf graf2d/freetype/src
 #  * glew
 rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem
-#  * lz4, pcre, xxhash, zlib
+#  * davix, lz4, openssl, pcre, xxhash, zlib
 rm -rf builtins
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
@@ -1788,9 +1809,10 @@ sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
 #  * string_view (<experimental/string_view> requires c++-14)
 rm core/foundation/inc/ROOT/libcpp_string_view.h \
    core/foundation/inc/ROOT/RWrap_libcpp_string_view.h
+sed /RWrap_libcpp_string_view.h/d -i build/unix/module.modulemap
 %endif
 #  * jsroot
-rm -rf etc/js/*
+rm -rf js/*
 
 # Fix file permissions
 chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
@@ -2401,7 +2423,7 @@ rmdir TVirtualGeoConverter
 popd
 
 # Replace bundled jsroot with symlink to system version
-rm -rf %{buildroot}%{_datadir}/%{name}/js
+rmdir %{buildroot}%{_datadir}/%{name}/js
 ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/js
 
 # Create ldconfig configuration
@@ -2564,26 +2586,32 @@ tutorial-v7-line.cxx"
 # - gtest-tree-dataframe-test-dataframe-colnames
 # - gtest-tree-dataframe-test-dataframe-friends
 # - gtest-tree-dataframe-test-dataframe-helpers
+# - gtest-tree-dataframe-test-dataframe-interface
 # - gtest-tree-dataframe-test-dataframe-simple
 # - gtest-tree-dataframe-test-dataframe-snapshot
+# - gtest-tree-dataframe-test-datasource-root
 excluded="${excluded}|\
 gtest-tree-dataframe-test-dataframe-cache|\
 gtest-tree-dataframe-test-dataframe-callbacks|\
 gtest-tree-dataframe-test-dataframe-colnames|\
 gtest-tree-dataframe-test-dataframe-friends|\
 gtest-tree-dataframe-test-dataframe-helpers|\
+gtest-tree-dataframe-test-dataframe-interface|\
 gtest-tree-dataframe-test-dataframe-simple|\
-gtest-tree-dataframe-test-dataframe-snapshot"
+gtest-tree-dataframe-test-dataframe-snapshot|\
+gtest-tree-dataframe-test-datasource-root"
 %endif
 %endif
 
 %ifarch %{arm}
 # Tests failing on 32 bit arm
+# - gtest-tree-tree-test-testBulkApiSillyStruct
 # - tutorial-v7-draw.cxx
 # - tutorial-v7-draw_mt.cxx
 # - tutorial-v7-draw_rh1.cxx
 # - tutorial-v7-draw_subpads.cxx
 excluded="${excluded}|\
+gtest-tree-tree-test-testBulkApiSillyStruct|\
 tutorial-v7-draw.cxx|\
 tutorial-v7-draw_mt.cxx|\
 tutorial-v7-draw_rh1.cxx|\
@@ -2604,22 +2632,11 @@ excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
 %if %{?fedora}%{!?fedora:0} >= 32
 # New failures with Fedora 32+ (gcc 10)
 excluded="${excluded}|tutorial-v7-markerStyle.cxx"
-%ifarch %{ix86}
-excluded="${excluded}|\
-TMVA-DNN-CNN-Reshape-CPU|\
-gtest-tree-dataframe-test-dataframe-interface"
+%ifarch %{ix86} ppc64le
+excluded="${excluded}|TMVA-DNN-CNN-Reshape-CPU"
 %endif
 %ifarch ppc64le
-excluded="${excluded}|\
-TMVA-DNN-CNN-Reshape-CPU|\
-tutorial-v7-lineStyle.cxx|\
-tutorial-v7-lineWidth.cxx"
-%endif
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 33
-%ifarch aarch64
-excluded="${excluded}|tutorial-tmva-TMVARegression"
+excluded="${excluded}|tutorial-v7-lineStyle.cxx|tutorial-v7-lineWidth.cxx"
 %endif
 %endif
 
@@ -3679,6 +3696,9 @@ fi
 %endif
 
 %changelog
+* Sat Mar 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-6
+- Build for 32 bit ARM again - gcc-10.0.1-0.9 fixes the problem
+
 * Sat Feb 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-5
 - Fixes and workarounds for gcc 10
 - ExcludeArch for 32 bit ARM because rootcling_stage1 segfaults (bug #1811604)

From fba71390e25b305d35bd7bb28a909f03ece6da25 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 23 Mar 2020 10:03:24 +0100
Subject: [PATCH 173/344] Update to 6.20.02 Drop patches accepted upstream  
 root-dont-download-input-file-if-it-already-exists.patch  
 root-fix-plugin-definition.patch   root-man-install.patch  
 root-pretty-printers.patch   root-python3.patch  
 root-stress-aarch64-ppc64le.patch Drop patches no longer relevant due to
 changes to the code   root-missing-include-string.patch  
 root-static-constexpr.patch Add workaround for PyROOT issues on ppc64le in
 EPEL 7   root-epel7-ppc64le-pyroot.patch (patch conditionally applied) Fix
 path to moved data file in tutorial   root-moved-file.patch Split the
 root-roofit subpackage into four different packages   root-roofit,
 root-roofit-core, root-roofit-more and root-roostats   The root-roofit-more
 library splits out the part of roofit that depends on     the root-mathmore
 package New subpackage: root-histv7

---
 root-32bit-dataframe.patch                    | 132 +++----
 root-doc-no-notebooks.patch                   |   9 +-
 ...load-input-file-if-it-already-exists.patch |  64 ----
 root-epel7-ppc64le-pyroot.patch               |  23 ++
 root-fix-plugin-definition.patch              |  92 -----
 root-jupyroot-static.patch                    |  44 +--
 root-man-install.patch                        |  24 --
 root-memory-arm-x86.patch                     |   4 +-
 root-missing-include-string.patch             |  11 -
 root-moved-file.patch                         |  27 ++
 root-pretty-printers.patch                    |  50 ---
 root-python3.8-object.patch                   | 192 ++++++-----
 root-python3.patch                            |  69 ----
 root-static-constexpr.patch                   |  12 -
 root-stress-aarch64-ppc64le.patch             |  29 --
 root-unbundle-gtest.patch                     |  13 +-
 root.spec                                     | 324 ++++++++++++------
 sources                                       |   2 +-
 18 files changed, 458 insertions(+), 663 deletions(-)
 delete mode 100644 root-dont-download-input-file-if-it-already-exists.patch
 create mode 100644 root-epel7-ppc64le-pyroot.patch
 delete mode 100644 root-fix-plugin-definition.patch
 delete mode 100644 root-man-install.patch
 delete mode 100644 root-missing-include-string.patch
 create mode 100644 root-moved-file.patch
 delete mode 100644 root-pretty-printers.patch
 delete mode 100644 root-python3.patch
 delete mode 100644 root-static-constexpr.patch
 delete mode 100644 root-stress-aarch64-ppc64le.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index dd71ad6..e47b913 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.18.04.orig/bindings/pyroot/ROOT.py root-6.18.04/bindings/pyroot/ROOT.py
---- root-6.18.04.orig/bindings/pyroot/ROOT.py	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/ROOT.py	2020-03-13 19:58:32.330575246 +0100
-@@ -449,9 +449,7 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/ROOT.py root-6.20.02/bindings/pyroot/ROOT.py
+--- root-6.20.02.orig/bindings/pyroot/ROOT.py	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/ROOT.py	2020-03-15 19:50:25.303179253 +0100
+@@ -438,9 +438,7 @@
  # This function is injected as method to the respective classes in Pythonize.cxx.
  _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
  
@@ -12,26 +12,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/ROOT.py root-6.18.04/bindings/pyroot/
  
  
  ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.18.04.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.04/bindings/pyroot/test/CMakeLists.txt
---- root-6.18.04.orig/bindings/pyroot/test/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/test/CMakeLists.txt	2020-03-13 19:58:32.330575246 +0100
-@@ -4,10 +4,7 @@
- ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
- if(NUMPY_FOUND)
-   ROOT_ADD_PYUNITTEST(pyroot_array_interface array_interface.py)
--  # this excludes RDF for 32 bits builds because of clang/gcc abi issues
--  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
--    ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
--    ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
--  endif()
-+  ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
-+  ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
- endif()
- 
-diff -ur root-6.18.04.orig/build/unix/makepchinput.py root-6.18.04/build/unix/makepchinput.py
---- root-6.18.04.orig/build/unix/makepchinput.py	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/build/unix/makepchinput.py	2020-03-13 19:58:32.331575236 +0100
-@@ -263,9 +263,6 @@
+diff -ur root-6.20.02.orig/build/unix/makepchinput.py root-6.20.02/build/unix/makepchinput.py
+--- root-6.20.02.orig/build/unix/makepchinput.py	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/build/unix/makepchinput.py	2020-03-15 19:50:25.304179242 +0100
+@@ -252,9 +252,6 @@
                             "math/vdt",
                             "tmva/rmva"]
  
@@ -41,39 +25,9 @@ diff -ur root-6.18.04.orig/build/unix/makepchinput.py root-6.18.04/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.18.04.orig/config/root-config.in root-6.18.04/config/root-config.in
---- root-6.18.04.orig/config/root-config.in	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/config/root-config.in	2020-03-13 20:06:39.876361426 +0100
-@@ -76,10 +76,7 @@
-           -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
-           -lMultiProc"
- 
--if [ "@UNIX@" != "1" ] || [ "@CMAKE_SIZEOF_VOID_P@" != "4" ]; then
--   rootlibs="$rootlibs -lROOTDataFrame"
--fi
--
-+rootlibs="$rootlibs -lROOTDataFrame"
- 
- if test "$platform" = "win32"; then
-    rootulibs="-include:_G__cpp_setupG__Net        \
-diff -ur root-6.18.04.orig/tree/dataframe/CMakeLists.txt root-6.18.04/tree/dataframe/CMakeLists.txt
---- root-6.18.04.orig/tree/dataframe/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/CMakeLists.txt	2020-03-13 19:58:32.332575225 +0100
-@@ -3,11 +3,6 @@
- # @author Danilo Piparo CERN, Pere Mato CERN
- ############################################################################
- 
--# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
--if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
--  return()
--endif()
--
- if(arrow)
-   list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
-   list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
-diff -ur root-6.18.04.orig/tree/dataframe/test/dataframe_cache.cxx root-6.18.04/tree/dataframe/test/dataframe_cache.cxx
---- root-6.18.04.orig/tree/dataframe/test/dataframe_cache.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/test/dataframe_cache.cxx	2020-03-13 20:13:04.021253192 +0100
+diff -ur root-6.20.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.20.02/tree/dataframe/test/dataframe_cache.cxx
+--- root-6.20.02.orig/tree/dataframe/test/dataframe_cache.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tree/dataframe/test/dataframe_cache.cxx	2020-03-15 19:50:09.075351525 +0100
 @@ -224,8 +224,6 @@
  
  }
@@ -89,9 +43,9 @@ diff -ur root-6.18.04.orig/tree/dataframe/test/dataframe_cache.cxx root-6.18.04/
  }
 -
 -#endif // R__B64
-diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_arrow.cxx root-6.18.04/tree/dataframe/test/datasource_arrow.cxx
---- root-6.18.04.orig/tree/dataframe/test/datasource_arrow.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/test/datasource_arrow.cxx	2020-03-13 20:13:04.021253192 +0100
+diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.20.02/tree/dataframe/test/datasource_arrow.cxx
+--- root-6.20.02.orig/tree/dataframe/test/datasource_arrow.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tree/dataframe/test/datasource_arrow.cxx	2020-03-15 19:50:09.075351525 +0100
 @@ -163,8 +163,6 @@
  }
  #endif
@@ -107,10 +61,10 @@ diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_arrow.cxx root-6.18.04
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_csv.cxx root-6.18.04/tree/dataframe/test/datasource_csv.cxx
---- root-6.18.04.orig/tree/dataframe/test/datasource_csv.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/test/datasource_csv.cxx	2020-03-13 20:26:14.841831219 +0100
-@@ -193,8 +193,6 @@
+diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.20.02/tree/dataframe/test/datasource_csv.cxx
+--- root-6.20.02.orig/tree/dataframe/test/datasource_csv.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tree/dataframe/test/datasource_csv.cxx	2020-03-15 19:57:05.490930922 +0100
+@@ -195,8 +195,6 @@
  }
  #endif
  
@@ -119,15 +73,15 @@ diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_csv.cxx root-6.18.04/t
  TEST(RCsvDS, FromARDF)
  {
     std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
-@@ -290,5 +288,3 @@
+@@ -292,5 +290,3 @@
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_root.cxx root-6.18.04/tree/dataframe/test/datasource_root.cxx
---- root-6.18.04.orig/tree/dataframe/test/datasource_root.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/test/datasource_root.cxx	2020-03-13 20:13:04.021253192 +0100
+diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_root.cxx root-6.20.02/tree/dataframe/test/datasource_root.cxx
+--- root-6.20.02.orig/tree/dataframe/test/datasource_root.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tree/dataframe/test/datasource_root.cxx	2020-03-15 19:50:09.076351514 +0100
 @@ -117,8 +117,6 @@
  }
  #endif
@@ -143,9 +97,9 @@ diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_root.cxx root-6.18.04/
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_trivial.cxx root-6.18.04/tree/dataframe/test/datasource_trivial.cxx
---- root-6.18.04.orig/tree/dataframe/test/datasource_trivial.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tree/dataframe/test/datasource_trivial.cxx	2020-03-13 20:13:04.021253192 +0100
+diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.20.02/tree/dataframe/test/datasource_trivial.cxx
+--- root-6.20.02.orig/tree/dataframe/test/datasource_trivial.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tree/dataframe/test/datasource_trivial.cxx	2020-03-15 19:50:09.076351514 +0100
 @@ -132,8 +132,6 @@
     EXPECT_EQ(*tdfAll.Count(), 20ULL);
  }
@@ -161,11 +115,11 @@ diff -ur root-6.18.04.orig/tree/dataframe/test/datasource_trivial.cxx root-6.18.
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.18.04.orig/tutorials/CMakeLists.txt root-6.18.04/tutorials/CMakeLists.txt
---- root-6.18.04.orig/tutorials/CMakeLists.txt	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/tutorials/CMakeLists.txt	2020-03-13 19:58:32.333575214 +0100
-@@ -212,10 +212,6 @@
-                  v7/ntuple/ntpl004_dimuon.C)
+diff -ur root-6.20.02.orig/tutorials/CMakeLists.txt root-6.20.02/tutorials/CMakeLists.txt
+--- root-6.20.02.orig/tutorials/CMakeLists.txt	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/tutorials/CMakeLists.txt	2020-03-15 19:59:35.808335176 +0100
+@@ -255,10 +255,6 @@
+   set(root7_veto v7/ntuple/ntpl004_dimuon.C)
  endif()
  
 -if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
@@ -174,26 +128,20 @@ diff -ur root-6.18.04.orig/tutorials/CMakeLists.txt root-6.18.04/tutorials/CMake
 -
  #---These ones are disabled !!! ------------------------------------
  set(extra_veto
-   htmlex.C
-@@ -266,7 +262,6 @@
+   legacy/benchmarks.C
+@@ -311,7 +307,6 @@
               ${classic_veto}
               ${pythia_veto}
               ${root7_veto}
 -             ${bits32_veto}
               ${xrootd_veto}
-              )
- 
-@@ -424,13 +419,6 @@
- 
+              ${mlp_veto}
+              ${spectrum_veto}
+@@ -513,7 +508,6 @@
    list(REMOVE_ITEM pytutorials ${pyveto})
  
--  if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
--    set(bits32_veto_py dataframe/*.py)
--    file(GLOB bits32_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py)
--    list(REMOVE_ITEM pytutorials ${bits32_veto_py})
--    list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
--  endif()
--
-   #---Python tutorials dependencies--------------------------------------
-   set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
-   set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)
+   if(NOT dataframe)
+-    set(dataframe_veto_py dataframe/*.py)
+     file(GLOB dataframe_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py tmva/tmva*.py)
+     list(REMOVE_ITEM pytutorials ${dataframe_veto_py})
+     list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
diff --git a/root-doc-no-notebooks.patch b/root-doc-no-notebooks.patch
index 23ca293..f94d31f 100644
--- a/root-doc-no-notebooks.patch
+++ b/root-doc-no-notebooks.patch
@@ -1,6 +1,7 @@
---- root-6.16.00.orig/documentation/doxygen/filter.cxx	2019-02-14 14:44:47.132678348 +0100
-+++ root-6.16.00/documentation/doxygen/filter.cxx	2019-02-14 14:45:00.596532589 +0100
-@@ -367,16 +367,7 @@
+diff -ur root-6.20.02.orig/documentation/doxygen/filter.cxx root-6.20.02/documentation/doxygen/filter.cxx
+--- root-6.20.02.orig/documentation/doxygen/filter.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/documentation/doxygen/filter.cxx	2020-03-15 20:05:59.047270429 +0100
+@@ -378,16 +378,7 @@
  
        // notebook found
        if (gLineString.find("\\notebook") != string::npos) {
@@ -13,7 +14,7 @@
 -         else{
 -             gLineString = "/// ";
 -         }
--         gLineString += StringFormat( "\\htmlonly <a href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
+-         gLineString += StringFormat( "\\htmlonly <a href=\"https://nbviewer.jupyter.org/url/root.cern/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"https://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
 +         gLineString = "";
        }
  
diff --git a/root-dont-download-input-file-if-it-already-exists.patch b/root-dont-download-input-file-if-it-already-exists.patch
deleted file mode 100644
index 78557b2..0000000
--- a/root-dont-download-input-file-if-it-already-exists.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3207d634576d48462b41b4aec0e9198293aa4a9f Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 28 Jun 2019 09:23:19 +0200
-Subject: [PATCH] Don't download input file if it already exists This allows
- running the tests with pre-fetched file in environments without network -
- like e.g. the Fedora package build server
-
----
- tutorials/dataframe/df014_CSVDataSource.C  | 3 ++-
- tutorials/dataframe/df014_CSVDataSource.py | 4 +++-
- tutorials/dataframe/df015_LazyDataSource.C | 3 ++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/tutorials/dataframe/df014_CSVDataSource.C b/tutorials/dataframe/df014_CSVDataSource.C
-index 18a6a5afaf..9f1b69688a 100644
---- a/tutorials/dataframe/df014_CSVDataSource.C
-+++ b/tutorials/dataframe/df014_CSVDataSource.C
-@@ -23,7 +23,8 @@ int df014_CSVDataSource()
-    // The types of the columns will be automatically inferred.
-    auto fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv";
-    auto fileName = "df014_CsvDataSource_MuRun2010B_cpp.csv";
--   TFile::Cp(fileNameUrl, fileName);
-+   if(gSystem->AccessPathName(fileName))
-+      TFile::Cp(fileNameUrl, fileName);
-    auto tdf = ROOT::RDF::MakeCsvDataFrame(fileName);
- 
-    // Now we will apply a first filter based on two columns of the CSV,
-diff --git a/tutorials/dataframe/df014_CSVDataSource.py b/tutorials/dataframe/df014_CSVDataSource.py
-index dd4823d62f..a8668f5e49 100644
---- a/tutorials/dataframe/df014_CSVDataSource.py
-+++ b/tutorials/dataframe/df014_CSVDataSource.py
-@@ -18,12 +18,14 @@
- ## \author Enric Tejedor
- 
- import ROOT
-+import os
- 
- # Let's first create a RDF that will read from the CSV file.
- # The types of the columns will be automatically inferred.
- fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv"
- fileName = "df014_CsvDataSource_MuRun2010B_py.csv"
--ROOT.TFile.Cp(fileNameUrl, fileName)
-+if not os.path.isfile(fileName):
-+    ROOT.TFile.Cp(fileNameUrl, fileName)
- 
- MakeCsvDataFrame = ROOT.ROOT.RDF.MakeCsvDataFrame
- tdf = MakeCsvDataFrame(fileName)
-diff --git a/tutorials/dataframe/df015_LazyDataSource.C b/tutorials/dataframe/df015_LazyDataSource.C
-index fc5567b5bd..f8623ddce4 100644
---- a/tutorials/dataframe/df015_LazyDataSource.C
-+++ b/tutorials/dataframe/df015_LazyDataSource.C
-@@ -25,7 +25,8 @@ int df015_LazyDataSource()
-    // See the tutorial relative to CSV data sources for more details!
-    auto fileNameUrl = "http://root.cern.ch/files/tutorials/df014_CsvDataSource_MuRun2010B.csv";
-    auto fileName = "df015_CsvDataSource_MuRun2010B.csv";
--   TFile::Cp(fileNameUrl, fileName);
-+   if(gSystem->AccessPathName(fileName))
-+      TFile::Cp(fileNameUrl, fileName);
- 
-    auto csv_rdf = MakeCsvDataFrame(fileName);
- 
--- 
-2.21.0
-
diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch
new file mode 100644
index 0000000..2d9c400
--- /dev/null
+++ b/root-epel7-ppc64le-pyroot.patch
@@ -0,0 +1,23 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/pyroot/src/Cppyy.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx	2020-03-21 14:10:09.322489811 +0100
+@@ -74,10 +74,6 @@
+ class ApplicationStarter {
+ public:
+    ApplicationStarter() {
+-      // Insure ROOT's atexit is executed *after* the atexit that calls
+-      // ApplicationStarter's destructor, by forcing the ROOT's atexit
+-      // registration now.
+-      TROOT::Initialize();
+       // setup dummy holders for global and std namespaces
+       assert( g_classrefs.size() == GLOBAL_HANDLE );
+       g_name2classrefidx[ "" ]      = GLOBAL_HANDLE;
+@@ -90,8 +86,6 @@
+    }
+ 
+    ~ApplicationStarter() {
+-      for ( auto ifunc : g_method2callfunc )
+-         gInterpreter->CallFunc_Delete( ifunc.second );
+    }
+ } _applicationStarter;
+ 
diff --git a/root-fix-plugin-definition.patch b/root-fix-plugin-definition.patch
deleted file mode 100644
index 3f3d3d5..0000000
--- a/root-fix-plugin-definition.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 444b03b6e3ce0554f687443a42310fe01fba276c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 27 Jun 2019 18:24:58 +0200
-Subject: [PATCH 2/2] Use the correct library name in the plugin definitions
-
----
- etc/plugins/TFile/P090_TSQLFile.C                     | 4 ++--
- etc/plugins/TFileStager/P010_TXNetFileStager.C        | 2 +-
- etc/plugins/TGuiFactory/P030_TWebGuiFactory.C         | 2 +-
- etc/plugins/TImagePlugin/P010_TASPluginGS.C           | 6 +++---
- etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C | 2 +-
- etc/plugins/TVirtualX/P060_TWebVirtualX.C             | 2 +-
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/etc/plugins/TFile/P090_TSQLFile.C b/etc/plugins/TFile/P090_TSQLFile.C
-index bc006053d4..a6441ffbef 100644
---- a/etc/plugins/TFile/P090_TSQLFile.C
-+++ b/etc/plugins/TFile/P090_TSQLFile.C
-@@ -1,7 +1,7 @@
- void P090_TSQLFile()
- {
-    gPluginMgr->AddHandler("TFile", "^mysql:", "TSQLFile",
--      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
-+      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
-    gPluginMgr->AddHandler("TFile", "^oracle:", "TSQLFile",
--      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
-+      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
- }
-diff --git a/etc/plugins/TFileStager/P010_TXNetFileStager.C b/etc/plugins/TFileStager/P010_TXNetFileStager.C
-index 884ce7e103..66cd8d575e 100644
---- a/etc/plugins/TFileStager/P010_TXNetFileStager.C
-+++ b/etc/plugins/TFileStager/P010_TXNetFileStager.C
-@@ -2,7 +2,7 @@ void P010_TXNetFileStager()
- {
-    if (!gEnv->GetValue("XNet.UseOldClient", 0)) {
-       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TNetXNGFileStager",
--         "NetXNG", "TNetXNGFileStager(const char *)");
-+         "NetxNG", "TNetXNGFileStager(const char *)");
-    } else {
-       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TXNetFileStager",
-          "Netx", "TXNetFileStager(const char *)");
-diff --git a/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C b/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
-index 873ba03ebd..fe83cf06e1 100644
---- a/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
-+++ b/etc/plugins/TGuiFactory/P030_TWebGuiFactory.C
-@@ -1,4 +1,4 @@
- void P030_TWebGuiFactory()
- {
--   gPluginMgr->AddHandler("TGuiFactory", "web", "TWebGuiFactory", "WebGui", "TWebGuiFactory()");
-+   gPluginMgr->AddHandler("TGuiFactory", "web", "TWebGuiFactory", "WebGui6", "TWebGuiFactory()");
- }
-diff --git a/etc/plugins/TImagePlugin/P010_TASPluginGS.C b/etc/plugins/TImagePlugin/P010_TASPluginGS.C
-index c2e3e45c1a..9e401e74f1 100644
---- a/etc/plugins/TImagePlugin/P010_TASPluginGS.C
-+++ b/etc/plugins/TImagePlugin/P010_TASPluginGS.C
-@@ -1,9 +1,9 @@
- void P010_TASPluginGS()
- {
-    gPluginMgr->AddHandler("TImagePlugin", "ps", "TASPluginGS",
--      "ASPluginGS", "TASPluginGS(const char*)");
-+      "ASImage", "TASPluginGS(const char*)");
-    gPluginMgr->AddHandler("TImagePlugin", "eps", "TASPluginGS",
--      "ASPluginGS", "TASPluginGS(const char*)");
-+      "ASImage", "TASPluginGS(const char*)");
-    gPluginMgr->AddHandler("TImagePlugin", "pdf", "TASPluginGS",
--      "ASPluginGS", "TASPluginGS(const char*)");
-+      "ASImage", "TASPluginGS(const char*)");
- }
-diff --git a/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C b/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
-index 2a919023f9..f1be760487 100644
---- a/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
-+++ b/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
-@@ -1,5 +1,5 @@
- void P010_TGraphPainter()
- {
-    gPluginMgr->AddHandler("TVirtualGraphPainter", "*", "TGraphPainter",
--      "GraphPainter", "TGraphPainter()");
-+      "HistPainter", "TGraphPainter()");
- }
-diff --git a/etc/plugins/TVirtualX/P060_TWebVirtualX.C b/etc/plugins/TVirtualX/P060_TWebVirtualX.C
-index e624c34e7b..26f9650e94 100644
---- a/etc/plugins/TVirtualX/P060_TWebVirtualX.C
-+++ b/etc/plugins/TVirtualX/P060_TWebVirtualX.C
-@@ -1,4 +1,4 @@
- void P060_TWebVirtualX()
- {
--   gPluginMgr->AddHandler("TVirtualX", "web", "TWebVirtualX", "WebGui", "TWebVirtualX(const char*,const char*)");
-+   gPluginMgr->AddHandler("TVirtualX", "web", "TWebVirtualX", "WebGui6", "TWebVirtualX(const char*,const char*)");
- }
--- 
-2.21.0
-
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index bb8e721..2cdb5aa 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.18.00.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.18.00/bindings/pyroot/JsMVA/JPyInterface.py
---- root-6.18.00.orig/bindings/pyroot/JsMVA/JPyInterface.py	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/bindings/pyroot/JsMVA/JPyInterface.py	2019-06-28 22:54:03.937480738 +0200
+diff -ur root-6.20.02.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.20.02/bindings/pyroot/JsMVA/JPyInterface.py
+--- root-6.20.02.orig/bindings/pyroot/JsMVA/JPyInterface.py	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/JsMVA/JPyInterface.py	2020-03-15 20:07:18.921423559 +0100
 @@ -188,7 +188,7 @@
  ## Class for creating the output scripts and inserting them to cell output
  class JsDraw:
@@ -10,21 +10,21 @@ diff -ur root-6.18.00.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.18.00/bi
   
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.18.00.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.18.00/bindings/pyroot/JupyROOT/helpers/utils.py
---- root-6.18.00.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/bindings/pyroot/JupyROOT/helpers/utils.py	2019-06-28 22:54:03.938480727 +0200
-@@ -39,7 +39,7 @@
- _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
- 
- 
--_jsROOTSourceDir = "https://root.cern.ch/js/notebook/"
-+_jsROOTSourceDir = "/static/jsroot/"
- _jsCanvasWidth = 800
- _jsCanvasHeight = 600
- 
-diff -ur root-6.18.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.18.00/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.18.00.orig/etc/notebook/JsMVA/js/JsMVA.js	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/etc/notebook/JsMVA/js/JsMVA.js	2019-06-28 22:54:03.938480727 +0200
+diff -ur root-6.20.02.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.20.02/bindings/pyroot/JupyROOT/helpers/utils.py
+--- root-6.20.02.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/JupyROOT/helpers/utils.py	2020-03-15 20:07:18.921423559 +0100
+@@ -82,7 +82,7 @@
+ function requirejs_success(base_url) {{
+     return function() {{
+         require.config({{
+-            baseUrl: base_url + 'static/'
++            baseUrl: base_url + 'static/jsroot/'
+         }});
+         display_{jsDivId}();
+     }}
+diff -ur root-6.20.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.20.02/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.20.02.orig/etc/notebook/JsMVA/js/JsMVA.js	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/etc/notebook/JsMVA/js/JsMVA.js	2020-03-15 20:07:18.922423549 +0100
 @@ -16,7 +16,7 @@
  
  (function(factory){
@@ -34,14 +34,14 @@ diff -ur root-6.18.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.18.00/etc/noteb
  
      var url = "";
      if (requirejs.s.contexts.hasOwnProperty("_")) {
-diff -ur root-6.18.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.18.00/etc/notebook/JsMVA/js/NetworkDesigner.js
---- root-6.18.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/etc/notebook/JsMVA/js/NetworkDesigner.js	2019-06-29 07:08:46.582682582 +0200
+diff -ur root-6.20.02.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.20.02/etc/notebook/JsMVA/js/NetworkDesigner.js
+--- root-6.20.02.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-03-15 20:07:18.922423549 +0100
 @@ -19,7 +19,7 @@
          paths: {
              "jquery-connections": baseURL + "jquery.connections.min",
              "jquery-timing": baseURL + "jquery-timing.min",
--            "d3": "https://root.cern.ch/js/notebook/scripts/d3.min"
+-            "d3": "/static/scripts/d3.min"
 +            "d3": "/static/jsroot/scripts/d3.min"
          },
          shim: {
diff --git a/root-man-install.patch b/root-man-install.patch
deleted file mode 100644
index b5d54e1..0000000
--- a/root-man-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3f1e65654ddec561e5161d0f62367497d16aa223 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 27 Jun 2019 18:22:13 +0200
-Subject: [PATCH 1/2] Install generated man pages in the correct subdirectory
- (man/man1)
-
----
- cmake/modules/RootNewMacros.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
-index 0780ea5a5a..58e403a249 100644
---- a/cmake/modules/RootNewMacros.cmake
-+++ b/cmake/modules/RootNewMacros.cmake
-@@ -1540,5 +1540,5 @@ function(generateManual name input output)
-       ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/build/misc/argparse2help.py ${input} ${output}
-   )
- 
--  install(FILES ${output} DESTINATION ${CMAKE_INSTALL_MANDIR})
-+  install(FILES ${output} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- endfunction()
--- 
-2.21.0
-
diff --git a/root-memory-arm-x86.patch b/root-memory-arm-x86.patch
index 54c4149..2de8e36 100644
--- a/root-memory-arm-x86.patch
+++ b/root-memory-arm-x86.patch
@@ -6,8 +6,8 @@
  
 +# Reduce memory usage during linking on ARM and x86 by generating minimal debuginfo
 +if(ROOT_ARCHITECTURE STREQUAL "linuxarm" OR ROOT_ARCHITECTURE STREQUAL "linux")
-+  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")  
-+  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")  
++  string(REPLACE " -g " " -g1 " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++  string(REPLACE " -g " " -g1 " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 +endif()
 +
  set(LLVM_TARGETS_TO_BUILD ${ROOT_CLING_TARGET} CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
diff --git a/root-missing-include-string.patch b/root-missing-include-string.patch
deleted file mode 100644
index f870e14..0000000
--- a/root-missing-include-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-6.18.04.orig/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx root-6.18.04/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx
---- root-6.18.04.orig/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/graf2d/gpadv7/v7/inc/ROOT/RColor.hxx	2020-01-23 11:27:58.637463837 +0100
-@@ -17,6 +17,7 @@
- #define ROOT7_RColor
- 
- #include <array>
-+#include <string>
- #include <vector>
- 
- namespace ROOT {
diff --git a/root-moved-file.patch b/root-moved-file.patch
new file mode 100644
index 0000000..948a78b
--- /dev/null
+++ b/root-moved-file.patch
@@ -0,0 +1,27 @@
+From 6492170d74f464286de22c40554adbd400ec838b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 12:53:34 +0100
+Subject: [PATCH] The file was moved - update path
+
+---
+ tutorials/legacy/mlp/mlpHiggs.C | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tutorials/legacy/mlp/mlpHiggs.C b/tutorials/legacy/mlp/mlpHiggs.C
+index 49d3ca2b30..0516ed7c50 100644
+--- a/tutorials/legacy/mlp/mlpHiggs.C
++++ b/tutorials/legacy/mlp/mlpHiggs.C
+@@ -18,8 +18,8 @@ void mlpHiggs(Int_t ntrain=100) {
+    TFile *input = 0;
+    if (!gSystem->AccessPathName(fname)) {
+       input = TFile::Open(fname);
+-   } else if (!gSystem->AccessPathName(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
+-      input = TFile::Open(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
++   } else if (!gSystem->AccessPathName(Form("%s/legacy/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
++      input = TFile::Open(Form("%s/legacy/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
+    } else {
+       printf("accessing %s file from http://root.cern.ch/files\n",fname);
+       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
+-- 
+2.24.1
+
diff --git a/root-pretty-printers.patch b/root-pretty-printers.patch
deleted file mode 100644
index 4ded487..0000000
--- a/root-pretty-printers.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 88f6e1b332489582f457d17afd6a2a6f6a4f988d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 1 Jul 2019 08:56:27 +0200
-Subject: [PATCH] Install GDB pretty printers with correct filename when using
- soversion
-
-The name of the pretty printer script must match the name of the
-binary, not a symlink. When soversion is used the unversioned .so file
-is a symlink to the versioned library file.
----
- build/CMakeLists.txt | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index b84481041b..03644b6c00 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -20,12 +20,23 @@ ROOT_EXECUTABLE(rmkdepend
- )
- 
- IF(CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo")
--  file(COPY "gdbPrinters/"
--       DESTINATION ${CMAKE_BINARY_DIR}/lib
--       FILES_MATCHING PATTERN "*-gdb.py")
-+  file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
-+  set(PRETTY_PRINTER_DESTS)
-+  foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
-+    get_filename_component(PRETTY_PRINTER_DEST ${PRETTY_PRINTER} NAME)
-+    if(soversion)
-+      string(REPLACE ".so-gdb.py" ".so.${ROOT_VERSION}-gdb.py"
-+        PRETTY_PRINTER_DEST ${PRETTY_PRINTER_DEST})
-+    endif(soversion)
-+    set(PRETTY_PRINTER_DEST ${CMAKE_BINARY_DIR}/lib/${PRETTY_PRINTER_DEST})
-+    add_custom_command(OUTPUT ${PRETTY_PRINTER_DEST}
-+      COMMAND ${CMAKE_COMMAND} -E copy ${PRETTY_PRINTER} ${PRETTY_PRINTER_DEST}
-+      DEPENDS ${PRETTY_PRINTER})
-+    list(APPEND PRETTY_PRINTER_DESTS ${PRETTY_PRINTER_DEST})
-+  endforeach()
-+  add_custom_target(copy_pretty_printers ALL DEPENDS ${PRETTY_PRINTER_DESTS})
- 
--  file(GLOB PRETTY_PRINTERS "gdbPrinters/*-gdb.py")
--  install(FILES ${PRETTY_PRINTERS}
--          DESTINATION lib
-+  install(FILES ${PRETTY_PRINTER_DESTS}
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}
-           CONFIGURATIONS Debug RelWithDebInfo)
- ENDIF()
--- 
-2.21.0
-
diff --git a/root-python3.8-object.patch b/root-python3.8-object.patch
index ed4ef9f..2447e31 100644
--- a/root-python3.8-object.patch
+++ b/root-python3.8-object.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bindings/pyroot/src/MethodProxy.cxx
---- root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/MethodProxy.cxx	2020-03-13 16:46:56.538971601 +0100
-@@ -839,7 +839,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx root-6.20.02/bindings/pyroot/src/MethodProxy.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/MethodProxy.cxx	2020-03-15 19:43:20.946684699 +0100
+@@ -845,7 +845,8 @@
     sizeof(MethodProxy),       // tp_basicsize
     0,                         // tp_itemsize
     (destructor)mp_dealloc,    // tp_dealloc
@@ -11,7 +11,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bind
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -888,6 +889,12 @@
+@@ -894,6 +895,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -24,10 +24,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bind
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx
---- root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx	2020-03-13 16:46:56.539971591 +0100
-@@ -397,7 +397,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx	2020-03-15 19:43:20.946684699 +0100
+@@ -398,7 +398,8 @@
     sizeof(ObjectProxy),       // tp_basicsize
     0,                         // tp_itemsize
     (destructor)op_dealloc,    // tp_dealloc
@@ -37,7 +37,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bind
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -449,6 +450,12 @@
+@@ -450,6 +451,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -50,9 +50,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bind
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx
---- root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx	2020-03-13 16:46:56.539971591 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx	2020-03-15 19:43:20.946684699 +0100
 @@ -133,7 +133,8 @@
     sizeof(PropertyProxy),     // tp_basicsize
     0,                         // tp_itemsize
@@ -76,10 +76,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.18.04/bi
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindings/pyroot/src/PyRootType.cxx
---- root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/PyRootType.cxx	2020-03-13 16:46:56.539971591 +0100
-@@ -230,7 +230,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx root-6.20.02/bindings/pyroot/src/PyRootType.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/PyRootType.cxx	2020-03-15 19:43:20.946684699 +0100
+@@ -232,7 +232,8 @@
     sizeof(PyROOT::PyRootClass),// tp_basicsize
     0,                         // tp_itemsize
     0,                         // tp_dealloc
@@ -89,7 +89,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindi
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -279,6 +280,12 @@
+@@ -281,6 +282,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -102,9 +102,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindi
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx root-6.18.04/bindings/pyroot/src/Pythonize.cxx
---- root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/Pythonize.cxx	2020-03-13 16:46:56.540971580 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx root-6.20.02/bindings/pyroot/src/Pythonize.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/Pythonize.cxx	2020-03-15 19:43:20.947684688 +0100
 @@ -944,6 +944,12 @@
  #if PY_VERSION_HEX >= 0x03040000
        , 0                        // tp_finalize
@@ -118,9 +118,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx root-6.18.04/bindin
     };
  
     static PyObject* vector_iter( PyObject* v ) {
-diff -ur root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx root-6.18.04/bindings/pyroot/src/RootModule.cxx
---- root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/RootModule.cxx	2020-03-13 16:46:56.540971580 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx root-6.20.02/bindings/pyroot/src/RootModule.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/RootModule.cxx	2020-03-15 19:43:20.948684678 +0100
 @@ -134,6 +134,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
@@ -134,9 +134,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx root-6.18.04/bindi
  };
  
  PyObject _PyROOT_NullPtrStruct = {
-diff -ur root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx
---- root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-13 16:46:56.540971580 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-15 19:43:20.948684678 +0100
 @@ -19,7 +19,8 @@
     0,                         // tp_basicsize
     0,                         // tp_itemsize
@@ -206,10 +206,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.18.04/b
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx
---- root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx	2020-03-13 16:46:56.541971570 +0100
-@@ -395,7 +395,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx	2020-03-15 19:43:20.948684678 +0100
+@@ -492,7 +492,8 @@
     sizeof(TemplateProxy),     // tp_basicsize
     0,                         // tp_itemsize
     (destructor)tpp_dealloc,   // tp_dealloc
@@ -219,7 +219,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bi
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -444,6 +445,12 @@
+@@ -541,6 +542,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -232,9 +232,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bi
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx
---- root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-13 16:46:56.540971580 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx
+--- root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-15 19:43:20.948684678 +0100
 @@ -42,7 +42,8 @@
     0,                         // tp_basicsize
     0,                         // tp_itemsize
@@ -258,10 +258,25 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.18.0
  };
  
  } // namespace PyROOT
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-13 16:47:15.029777701 +0100
-@@ -168,7 +168,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt	2020-03-15 19:43:20.949684667 +0100
+@@ -64,11 +64,6 @@
+     target_compile_options(cppyy PRIVATE -Wno-deprecated-register)
+ endif()
+ 
+-# Disables warnings due to new field tp_vectorcall in Python 3.8
+-if(NOT MSVC AND ${PYTHON_VERSION_STRING} VERSION_GREATER_EQUAL "3.8")
+-  target_compile_options(cppyy PRIVATE -Wno-missing-field-initializers)
+-endif()
+-
+ target_include_directories(cppyy PRIVATE ${CMAKE_BINARY_DIR}/include) # needed for string_view backport
+ 
+ target_include_directories(cppyy PUBLIC ${PYTHON_INCLUDE_DIRS}
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-15 19:43:20.949684667 +0100
+@@ -167,7 +167,8 @@
      sizeof(CPPDataMember),         // tp_basicsize
      0,                             // tp_itemsize
      (destructor)pp_dealloc,        // tp_dealloc
@@ -271,7 +286,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDa
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -217,6 +218,12 @@
+@@ -216,6 +217,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -284,10 +299,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDa
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-13 16:47:15.029777701 +0100
-@@ -385,7 +385,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-15 19:43:20.949684667 +0100
+@@ -565,7 +565,8 @@
      sizeof(CPPInstance),           // tp_basicsize
      0,                             // tp_itemsize
      (destructor)op_dealloc,        // tp_dealloc
@@ -297,7 +312,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -437,6 +438,12 @@
+@@ -617,6 +618,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -310,10 +325,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-13 16:47:15.030777691 +0100
-@@ -813,7 +813,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-15 19:43:20.950684656 +0100
+@@ -889,7 +889,8 @@
      sizeof(CPPOverload),           // tp_basicsize
      0,                             // tp_itemsize
      (destructor)mp_dealloc,        // tp_dealloc
@@ -323,7 +338,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -862,6 +863,12 @@
+@@ -938,6 +939,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -336,10 +351,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-13 16:47:15.030777691 +0100
-@@ -424,7 +424,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-15 19:43:20.950684656 +0100
+@@ -596,7 +596,8 @@
      sizeof(CPyCppyy::CPPScope),    // tp_basicsize
      0,                             // tp_itemsize
      0,                             // tp_dealloc
@@ -349,7 +364,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -473,6 +474,12 @@
+@@ -649,6 +650,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -362,9 +377,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-13 16:47:15.030777691 +0100
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-15 19:43:20.951684646 +0100
 @@ -140,6 +140,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                  // tp_finalize
@@ -378,10 +393,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCp
  };
  
  namespace {
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-13 16:57:57.529034828 +0100
-@@ -32,6 +32,12 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-15 19:43:20.951684646 +0100
+@@ -33,6 +33,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -394,7 +409,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  //= long type allowed for reference passing ==================================
-@@ -54,6 +60,12 @@
+@@ -59,6 +65,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -406,8 +421,21 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
 +#endif
  };
  
+ //- custom type representing typedef to pointer of class ---------------------
+@@ -89,6 +101,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                           // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                           // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                           // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
  //= instancemethod object with a more efficient call function ================
-@@ -219,6 +231,12 @@
+@@ -254,6 +272,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -420,7 +448,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  
-@@ -269,6 +287,12 @@
+@@ -304,6 +328,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -433,7 +461,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  
-@@ -320,6 +344,12 @@
+@@ -355,6 +385,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -446,10 +474,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-13 16:47:15.031777680 +0100
-@@ -657,7 +657,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-15 19:43:20.951684646 +0100
+@@ -651,7 +651,8 @@
      sizeof(CPyCppyy::LowLevelView),// tp_basicsize
      0,                             // tp_itemsize
      (destructor)ll_dealloc,        // tp_dealloc
@@ -459,7 +487,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLe
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -707,6 +708,12 @@
+@@ -701,6 +702,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -472,10 +500,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLe
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-13 16:47:15.032777670 +0100
-@@ -515,7 +515,8 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-15 19:43:20.952684635 +0100
+@@ -709,7 +709,8 @@
     sizeof(TemplateProxy),     // tp_basicsize
     0,                         // tp_itemsize
     (destructor)tpp_dealloc,   // tp_dealloc
@@ -485,7 +513,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -564,6 +565,12 @@
+@@ -758,6 +759,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -498,10 +526,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
---- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-13 16:47:15.032777670 +0100
-@@ -79,6 +79,12 @@
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-15 19:43:20.952684635 +0100
+@@ -82,6 +82,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -514,7 +542,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Tuple
  };
  
  
-@@ -152,7 +158,8 @@
+@@ -161,7 +167,8 @@
      0,                             // tp_basicsize
      0,                             // tp_itemsize
      0,                             // tp_dealloc
@@ -524,7 +552,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Tuple
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -202,6 +209,12 @@
+@@ -211,6 +218,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
diff --git a/root-python3.patch b/root-python3.patch
deleted file mode 100644
index e1cda30..0000000
--- a/root-python3.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4cf9170f308934688e7f767086589cd8cc0a0a85 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 28 Jun 2019 22:23:49 +0200
-Subject: [PATCH] Python 3 compatibility
-
----
- tutorials/histfactory/example.py |  2 +-
- tutorials/pyroot/mrt.py          | 20 ++++++++++----------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tutorials/histfactory/example.py b/tutorials/histfactory/example.py
-index 91e1d26939..6ccf3bb350 100755
---- a/tutorials/histfactory/example.py
-+++ b/tutorials/histfactory/example.py
-@@ -12,7 +12,7 @@ def main():
-     try:
-         import ROOT
-     except:
--        print "It seems that pyROOT isn't properly configured"
-+        print("It seems that pyROOT isn't properly configured")
-         return
- 
-     """
-diff --git a/tutorials/pyroot/mrt.py b/tutorials/pyroot/mrt.py
-index b3a8c0d719..17a73f6881 100644
---- a/tutorials/pyroot/mrt.py
-+++ b/tutorials/pyroot/mrt.py
-@@ -10,28 +10,28 @@
- ##
- ## \author Wim Lavrijsen
- 
--import sys, string, os
--from ROOT import TFile, TNtuple
-+import sys, os
-+from ROOT import TFile, TNtuple, TROOT
- 
- 
--ifn = os.path.expandvars("${ROOTSYS}/tutorials/pyroot/aptuple.txt")
-+ifn = os.path.join(str(TROOT.GetTutorialDir()), 'pyroot', 'aptuple.txt')
- ofn = 'aptuple.root'
- 
--print 'opening file', ifn, '...'
-+print('opening file %s ...' % ifn)
- infile = open( ifn, 'r' )
- lines  = infile.readlines()
- title  = lines[0]
--labels = string.split( lines[1] )
-+labels = lines[1].split()
- 
--print 'writing file', ofn, '...'
-+print('writing file %s ...' % ofn)
- outfile = TFile( ofn, 'RECREATE', 'ROOT file with an NTuple' )
--ntuple  = TNtuple( 'ntuple', title, string.join( labels, ':') )
-+ntuple  = TNtuple( 'ntuple', title, ':'.join( labels ) )
- 
- for line in lines[2:]:
--    words = string.split( line )
-+    words = line.split()
-     row = map( float, words )
--    apply( ntuple.Fill, row )
-+    ntuple.Fill(*row)
- 
- outfile.Write()
- 
--print 'done'
-+print('done')
--- 
-2.21.0
-
diff --git a/root-static-constexpr.patch b/root-static-constexpr.patch
deleted file mode 100644
index c04ba6f..0000000
--- a/root-static-constexpr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur root-6.18.04.orig/graf2d/gpadv7/v7/src/RDrawingAttr.cxx root-6.18.04/graf2d/gpadv7/v7/src/RDrawingAttr.cxx
---- root-6.18.04.orig/graf2d/gpadv7/v7/src/RDrawingAttr.cxx	2019-09-11 15:36:49.000000000 +0200
-+++ root-6.18.04/graf2d/gpadv7/v7/src/RDrawingAttr.cxx	2020-02-15 21:16:58.819735413 +0100
-@@ -26,6 +26,8 @@
- {
- }
- 
-+constexpr const ROOT::Experimental::RDrawingAttrBase::FromOption_t ROOT::Experimental::RDrawingAttrBase::FromOption;
-+
- ROOT::Experimental::RDrawingAttrBase::RDrawingAttrBase(FromOption_t, const Name &name, RDrawingOptsBase &opts) :
-    fPath{name.fStr}, fHolder(opts.GetHolder())
- {
diff --git a/root-stress-aarch64-ppc64le.patch b/root-stress-aarch64-ppc64le.patch
deleted file mode 100644
index a925460..0000000
--- a/root-stress-aarch64-ppc64le.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dd6d00b07778023449a7e6fe01f90a524237b20a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 1 Jul 2019 08:53:15 +0200
-Subject: [PATCH] Increase test tolerence
-
-Test fails on aarch64 and ppc64le on Fedora 30 and Fedora rawhide:
-Test  3 : Purge, Reuse of gaps in TFile......................... FAILED
-         File size= 52010 (expected 51886 +/- 100)
-         Comp Fact=  2.00 (expected 2.1 +/- 0.3)
----
- test/stress.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/stress.cxx b/test/stress.cxx
-index 509bb0f17d..c0b44d9b77 100644
---- a/test/stress.cxx
-+++ b/test/stress.cxx
-@@ -406,7 +406,7 @@ void stress3()
- #else
-    constexpr Long64_t lastgood = 51886;
- #endif
--   constexpr Long64_t tolerance = 100;
-+   constexpr Long64_t tolerance = 150;
- #ifdef R__HAS_DEFAULT_LZ4
-       constexpr Long64_t difflastgoodlz4 = 5500;
-       if (last < lastgood - tolerance || last > lastgood + difflastgoodlz4 + tolerance || comp < 1.5 || comp > 2.1)
--- 
-2.21.0
-
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index 0fe4103..44939ca 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.18.00/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/cmake/modules/SearchInstalledSoftware.cmake	2019-06-26 16:00:21.275634375 +0200
-@@ -1380,80 +1380,18 @@
+diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/cmake/modules/SearchInstalledSoftware.cmake	2020-03-15 20:12:34.446078193 +0100
+@@ -1528,83 +1528,18 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -24,7 +24,9 @@ diff -ur root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.18
 -  if(MSVC)
 -    set(EXTRA_GTEST_OPTS
 -      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=\\\"\\\"
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=\\\"\\\")
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL:PATH=\\\"\\\"
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=\\\"\\\"
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=\\\"\\\")
 -  endif()
 -  if(APPLE)
 -    set(EXTRA_GTEST_OPTS
@@ -34,6 +36,7 @@ diff -ur root-6.18.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.18
 -  ExternalProject_Add(
 -    googletest
 -    GIT_REPOSITORY https://github.com/google/googletest.git
+-    GIT_SHALLOW 1
 -    GIT_TAG release-1.8.0
 -    UPDATE_COMMAND ""
 -    # TIMEOUT 10
diff --git a/root.spec b/root.spec
index 02e7bb6..7a79f82 100644
--- a/root.spec
+++ b/root.spec
@@ -49,9 +49,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.18.04
+Version:	6.20.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -103,51 +103,36 @@ Patch10:	%{name}-clang-ignore-gcc-options.patch
 Patch11:	%{name}-doc-no-notebooks.patch
 #		Don't run tutorial requiring firefox during doc generation
 Patch12:	%{name}-v7-line.patch
-#		Install man pages in correct directory
-#		https://github.com/root-project/root/pull/4026
-Patch13:	%{name}-man-install.patch
-#		Use correct library names in plugin definitions
-#		https://github.com/root-project/root/pull/4026
-Patch14:	%{name}-fix-plugin-definition.patch
-#		Don't download test input file if it already exists
-#		https://github.com/root-project/root/pull/4026
-Patch15:	%{name}-dont-download-input-file-if-it-already-exists.patch
-#		Python 3 fixes
-#		https://github.com/root-project/root/pull/4026
-Patch16:	%{name}-python3.patch
-#		Increase test tolerance (aarch64 and ppc64le)
-#		https://github.com/root-project/root/pull/4025
-Patch17:	%{name}-stress-aarch64-ppc64le.patch
-#		Fix GDB pretty printers install name and location
-#		https://github.com/root-project/root/pull/4024
-Patch18:	%{name}-pretty-printers.patch
-#		Missing include - fails with gcc 10
-Patch19:	%{name}-missing-include-string.patch
 #		Fix ppc64le build with gcc 10
 #		https://github.com/root-project/root/pull/5157
-Patch20:	%{name}-clang-altivec-vector.patch
-#		Missing symbol - with gcc 10
-Patch21:	%{name}-static-constexpr.patch
+Patch13:	%{name}-clang-altivec-vector.patch
 #		Fix -Wmissing-field-initializers in python bindings for
 #		Python 3.8 and 3.9
 #		https://github.com/root-project/root/pull/5158
-Patch22:	%{name}-python3.8-object.patch
+Patch14:	%{name}-python3.8-object.patch
 #		Correct broken assert statements
 #		https://github.com/root-project/root/pull/5159
-Patch23:	%{name}-FitData-assert-fix.patch
+Patch15:	%{name}-FitData-assert-fix.patch
 #		The test that creates the file must run before the test that
 #		modifies it
 #		https://github.com/root-project/root/pull/5160
-Patch24:	%{name}-xmlmodify-dep.patch
+Patch16:	%{name}-xmlmodify-dep.patch
 #		Use unique filenames in tutorials so they can be run in
 #		parallel
 #		Backport from upstream's git
-Patch25:	%{name}-tutorials-unique-filenames.patch
+Patch17:	%{name}-tutorials-unique-filenames.patch
 #		Size types should use %z
 #		https://github.com/root-project/root/pull/5161
-Patch26:	%{name}-format-fix.patch
+Patch18:	%{name}-format-fix.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch27:	%{name}-32bit-tests.patch
+Patch19:	%{name}-32bit-tests.patch
+#		The file was moved - update path
+#		https://github.com/root-project/root/pull/5162
+Patch20:	%{name}-moved-file.patch
+#		Workaround for initialization problems for PyROOT on
+#		EPEL7 ppc64le
+#		https://sft.its.cern.ch/jira/browse/ROOT-10622
+Patch21:	%{name}-epel7-ppc64le-pyroot.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -155,9 +140,9 @@ Patch27:	%{name}-32bit-tests.patch
 ExcludeArch:	s390x
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires:	cmake >= 3.4.3
+BuildRequires:	cmake >= 3.9
 %else
-BuildRequires:	cmake3 >= 3.4.3
+BuildRequires:	cmake3 >= 3.9
 %endif
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
@@ -174,6 +159,7 @@ BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:	lz4-devel
 BuildRequires:	xxhash-devel
+BuildRequires:	libzstd-devel
 #		Require a version of libAfterImage that is properly linked to
 #		its dependencies
 BuildRequires:	libAfterImage-devel >= 1.20-21
@@ -888,9 +874,6 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-%if %{root7}
-Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
-%endif
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 
@@ -924,6 +907,8 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description hist-factory
@@ -1387,19 +1372,17 @@ This package contains the xproof extension for ROOT. This provides a
 client to be used in a PROOF environment.
 
 %package roofit
-Summary:	ROOT extension for modeling expected distributions
+Summary:	ROOT extension for modeling expected distributions - toolkit
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split / Library split (from roofit)
+Obsoletes:	%{name}-roofit < 6.20.00
 
 %description roofit
 The RooFit packages provide a toolkit for modeling the expected
@@ -1414,6 +1397,84 @@ primarily targeted to the high-energy physicists using the ROOT
 analysis environment, but the general nature of the package make it
 suitable for adoption in different disciplines as well.
 
+This package contains the RooFit toolkit classes.
+
+%package roofit-core
+Summary:	ROOT extension for modeling expected distributions - core
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split / Library split (from roofit)
+Obsoletes:	%{name}-roofit < 6.20.00
+
+%description roofit-core
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains the core RooFit classes.
+
+%package roofit-more
+Summary:	ROOT extension for modeling expected distributions - more
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+#		Package split / Library split (from roofit)
+Obsoletes:	%{name}-roofit < 6.20.00
+
+%description roofit-more
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains RooFit classes that use the mathmore library.
+
+%package roostats
+Summary:	Statistical tools built on top of RooFit
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split / Library split (from roofit)
+Obsoletes:	%{name}-roofit < 6.20.00
+
+%description roostats
+RooStats is a package containing statistical tools built on top of
+RooFit.
+
 %package sql-mysql
 Summary:	MySQL client plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1550,6 +1611,7 @@ This package contains the Tree library for ROOT.
 Summary:	A high level interface to ROOT trees
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 %if %{root7}
@@ -1637,7 +1699,6 @@ Javascript and style files for the Jupyter ROOT Notebook.
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description graf-gpadv7
 This package contains a library for canvas and pad manipulations.
@@ -1660,6 +1721,7 @@ Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
@@ -1670,8 +1732,13 @@ This package contains a library for defining event displays in ROOT 7.
 %package gui-browserv7
 Summary:	Browser (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description gui-browserv7
 This package contains a file browser for ROOT 7.
@@ -1732,6 +1799,13 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description gui-webgui6
 This package provides a Web based GUI for ROOT.
 
+%package histv7
+Summary:	Histogram library for ROOT (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description histv7
+This package contains a library for histogramming in ROOT 7.
+
 %package hist-draw
 Summary:	Histogram drawing (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1773,13 +1847,11 @@ This package contains an ntuple extension for ROOT 7.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch ppc64le
 %patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
+%endif
+%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1790,7 +1862,7 @@ rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 rm -rf graf2d/freetype/src
 #  * glew
 rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem
-#  * davix, lz4, openssl, pcre, xxhash, zlib
+#  * davix, lz4, openssl, pcre, xxhash, zlib, zstd
 rm -rf builtins
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
@@ -1902,14 +1974,13 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_xxhash:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
+       -Dbuiltin_zstd:BOOL=OFF \
        -Dalien:BOOL=OFF \
        -Darrow:BOOL=OFF \
        -Dasimage:BOOL=ON \
-       -Dastiff:BOOL=ON \
        -Dccache:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
        -Dclad:BOOL=OFF \
-       -Dcling:BOOL=ON \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
 %if %{root7}
@@ -1922,10 +1993,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dwebgui:BOOL=OFF \
 %endif
        -Dcxxmodules:BOOL=OFF \
+       -Ddataframe:BOOL=ON \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Dexceptions:BOOL=ON \
-       -Dexplicitlink:BOOL=ON \
+       -Dfcgi:BOOL=ON \
        -Dfftw3:BOOL=ON \
        -DFIREFOX_EXECUTABLE:PATH=/usr/bin/firefox \
        -Dfitsio:BOOL=ON \
@@ -1946,17 +2018,18 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dmemory_termination:BOOL=OFF \
        -Dmemstat:BOOL=ON \
        -Dminuit2:BOOL=ON \
+       -Dmlp:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
+       -Dmpi:BOOL=OFF \
        -Dmysql:BOOL=ON \
        -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
        -Doracle:BOOL=OFF \
-       -Dpch:BOOL=ON \
        -Dpgsql:BOOL=ON \
        -Dpythia6:BOOL=OFF \
        -Dpythia8:BOOL=ON \
-       -Dpython:BOOL=ON \
        -DPYTHON_EXECUTABLE:PATH=%{__pythondef} \
+       -Dpyroot:BOOL=ON \
 %ifarch %{qt5_qtwebengine_arches}
        -Dqt5web:BOOL=ON \
 %else
@@ -1970,10 +2043,10 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dshadowpw:BOOL=ON \
        -Dshared:BOOL=ON \
        -Dsoversion:BOOL=ON \
+       -Dspectrum:BOOL=ON \
        -Dsqlite:BOOL=ON \
        -Dssl:BOOL=ON \
        -Dtcmalloc:BOOL=OFF \
-       -Dthread:BOOL=ON \
        -Dtmva:BOOL=ON \
 %if %{tbb}
        -Dtmva-cpu:BOOL=ON \
@@ -2035,7 +2108,9 @@ else
     py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 fi
 sed -e "s,${py3i},${py2i},g" -e "s,-l${py3l},-l${py2l},g" \
-    -e "s,lib${py3l},lib${py2l},g" -e 's,%{__python3},%{__python2},g' \
+    -e "s,lib${py3l},lib${py2l},g" \
+    -e 's,%{__python}%{python3_version},%{__python2},g' \
+    -e 's,%{__python3},%{__python2},g' \
     -e 's,lib/libPyROOT,python2/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python2/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python2!g' \
@@ -2062,7 +2137,9 @@ else
     py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3},g' \
+    -e "s,lib${py2l},lib${py3l},g" \
+    -e 's,%{__python}%{python2_version},%{__python3},g' \
+    -e 's,%{__python2},%{__python3},g' \
     -e 's,lib/libPyROOT,python3/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python3/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python3!g' \
@@ -2089,7 +2166,9 @@ else
     py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
 fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3_other},g' \
+    -e "s,lib${py2l},lib${py3l},g" \
+    -e 's,%{__python}%{python2_version},%{__python3_other},g' \
+    -e 's,%{__python2},%{__python3_other},g' \
     -e 's,lib/libPyROOT,python3oth/libPyROOT,g' \
     -e 's,lib/libJupyROOT,python3oth/libJupyROOT,g' \
     -e 's!bindings/pyroot!bindings/python3oth!g' \
@@ -2135,10 +2214,14 @@ rm %{buildroot}%{_libdir}/%{name}/__pycache__/cmdLineUtils.*
 %endif
 sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
-# Move GDB pretty printers to auto load safe path
+# Install GDB pretty printers to auto load safe path
+# These are installed (in libdir) by "make install" if CMAKE_BUILD_TYPE
+# matches Debug or RelWithDebInfo
 mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
-mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
-   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
+install -p -m 644 build/gdbPrinters/libCore.so-gdb.py \
+   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libCore.so.%{version}-gdb.py
+install -p -m 644 build/gdbPrinters/libRooFitCore.so-gdb.py \
+   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.so.%{version}-gdb.py
 
 # Do python byte compilation (for non-standard paths)
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
@@ -2386,10 +2469,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
-rm %{buildroot}%{_mandir}/man1/g2rootold.1
-rm %{buildroot}%{_mandir}/man1/genmap.1
-rm %{buildroot}%{_mandir}/man1/proofserva.1
-rm %{buildroot}%{_mandir}/man1/roota.1
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
@@ -2400,7 +2479,6 @@ rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
 pushd %{buildroot}%{_datadir}/%{name}/plugins
-rm TDataProgressDialog/P010_TDataProgressDialog.C
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P070_TAlienFile.C
 rm TGLManager/P020_TGWin32GLManager.C
@@ -2416,8 +2494,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
-rm TVirtualX/P060_TWebVirtualX.C
-rmdir TDataProgressDialog
 rmdir TGrid
 rmdir TVirtualGeoConverter
 popd
@@ -2492,7 +2568,6 @@ done
 # ... and merge some of them
 cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
-cat includelist-roofit-roo* > includelist-roofit
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
 cat includelist-net-netx* > includelist-netx
 
@@ -2558,6 +2633,23 @@ popd
 #
 # - tutorial-v7-line.cxx
 #   requires a web browser (and js-jsroot) to render javascript graphics
+#
+# - gtest-io-io-test-RRawFile (*)
+# - gtest-net-davix-test-RRawFileDavix
+#   reads input file over network
+#   http://root.cern.ch/files/davix.test
+#   (*) one subtest RRawFile.Remote fails, others woud be OK
+#
+# - gtest-tmva-tmva-test-rreader
+# - gtest-tmva-tmva-test-rstandardscaler
+# - tutorial-tmva-tmva003_RReader
+# - tutorial-tmva-tmva004_RStandardScaler
+#   reads input data over network
+#   http://root.cern.ch/files/tmva_class_example.root
+#
+# - tutorial-tmva-tmva103_Application
+#   reads input data over network
+#   http://root.cern/files/tmva101.root
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2575,11 +2667,17 @@ tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
 tutorial-pythia-pythia8|\
-tutorial-v7-line.cxx"
+tutorial-v7-line.cxx|\
+gtest-io-io-test-RRawFile|\
+gtest-net-davix-test-RRawFileDavix|\
+gtest-tmva-tmva-test-rreader|\
+gtest-tmva-tmva-test-rstandardscaler|\
+tutorial-tmva-tmva003_RReader|\
+tutorial-tmva-tmva004_RStandardScaler|\
+tutorial-tmva-tmva103_Application"
 
 %ifarch %{ix86} %{arm}
-%if %{?fedora}%{!?fedora:0} >= 30
-# Tests failing on 32 bit architectures on Fedoea 30+ (gcc 9?)
+# Tests failing on 32 bit architectures (dataframe)
 # A bit random - not all the tests fail every time...
 # - gtest-tree-dataframe-test-dataframe-cache
 # - gtest-tree-dataframe-test-dataframe-callbacks
@@ -2590,6 +2688,7 @@ tutorial-v7-line.cxx"
 # - gtest-tree-dataframe-test-dataframe-simple
 # - gtest-tree-dataframe-test-dataframe-snapshot
 # - gtest-tree-dataframe-test-datasource-root
+# - gtest-tree-dataframe-test-datasource-trivial
 excluded="${excluded}|\
 gtest-tree-dataframe-test-dataframe-cache|\
 gtest-tree-dataframe-test-dataframe-callbacks|\
@@ -2599,23 +2698,14 @@ gtest-tree-dataframe-test-dataframe-helpers|\
 gtest-tree-dataframe-test-dataframe-interface|\
 gtest-tree-dataframe-test-dataframe-simple|\
 gtest-tree-dataframe-test-dataframe-snapshot|\
-gtest-tree-dataframe-test-datasource-root"
-%endif
+gtest-tree-dataframe-test-datasource-root|\
+gtest-tree-dataframe-test-datasource-trivial"
 %endif
 
 %ifarch %{arm}
 # Tests failing on 32 bit arm
 # - gtest-tree-tree-test-testBulkApiSillyStruct
-# - tutorial-v7-draw.cxx
-# - tutorial-v7-draw_mt.cxx
-# - tutorial-v7-draw_rh1.cxx
-# - tutorial-v7-draw_subpads.cxx
-excluded="${excluded}|\
-gtest-tree-tree-test-testBulkApiSillyStruct|\
-tutorial-v7-draw.cxx|\
-tutorial-v7-draw_mt.cxx|\
-tutorial-v7-draw_rh1.cxx|\
-tutorial-v7-draw_subpads.cxx"
+excluded="${excluded}|gtest-tree-tree-test-testBulkApiSillyStruct"
 %endif
 
 %ifarch ppc64le
@@ -2629,17 +2719,6 @@ excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
 %endif
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 32
-# New failures with Fedora 32+ (gcc 10)
-excluded="${excluded}|tutorial-v7-markerStyle.cxx"
-%ifarch %{ix86} ppc64le
-excluded="${excluded}|TMVA-DNN-CNN-Reshape-CPU"
-%endif
-%ifarch ppc64le
-excluded="${excluded}|tutorial-v7-lineStyle.cxx|tutorial-v7-lineWidth.cxx"
-%endif
-%endif
-
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -2896,6 +2975,9 @@ fi
 %ldconfig_scriptlets proof-sessionviewer
 %ldconfig_scriptlets xproof
 %ldconfig_scriptlets roofit
+%ldconfig_scriptlets roofit-core
+%ldconfig_scriptlets roofit-more
+%ldconfig_scriptlets roostats
 %ldconfig_scriptlets sql-mysql
 %ldconfig_scriptlets sql-odbc
 %ldconfig_scriptlets sql-sqlite
@@ -2921,6 +3003,7 @@ fi
 %endif
 %ldconfig_scriptlets gui-webdisplay
 %ldconfig_scriptlets gui-webgui6
+%ldconfig_scriptlets histv7
 %ldconfig_scriptlets hist-draw
 %ldconfig_scriptlets tree-ntuple
 %endif
@@ -2986,9 +3069,6 @@ fi
 %{_mandir}/man1/system.rootdaemonrc.1*
 %dir %{_datadir}/%{name}/cmake
 %{_datadir}/%{name}/cmake/*.cmake
-%dir %{_datadir}/%{name}/cmake/modules
-%{_datadir}/%{name}/cmake/modules/*.cmake
-%{_datadir}/%{name}/cmake/modules/*.cmake.in
 %dir %{_datadir}/%{name}/macros
 %{_datadir}/%{name}/macros/Dialogs.C
 %dir %{_datadir}/%{name}/plugins
@@ -2998,9 +3078,7 @@ fi
 %{_includedir}/%{name}/RConfigure.h
 %{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
-%{_includedir}/%{name}/libc.modulemap
 %{_includedir}/%{name}/module.modulemap
-%{_includedir}/%{name}/stl.modulemap
 %dir %{_includedir}/%{name}/Math
 %dir %{_includedir}/%{name}/ROOT
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -3052,6 +3130,7 @@ fi
 %{python2_sitearch}/ROOT-*.egg-info
 %{python2_sitearch}/cppyy.py*
 %{python2_sitearch}/_pythonization.py*
+%{python2_sitearch}/_rdf_utils.py*
 %endif
 
 %if ! %{py3default}
@@ -3080,6 +3159,7 @@ fi
 %{python3_sitearch}/ROOT-*.egg-info
 %{python3_sitearch}/cppyy.py
 %{python3_sitearch}/_pythonization.py
+%{python3_sitearch}/_rdf_utils.py
 %{python3_sitearch}/__pycache__/*
 
 %files -n python%{python3_pkgversion}-jupyroot
@@ -3107,6 +3187,7 @@ fi
 %{python3_other_sitearch}/ROOT-*.egg-info
 %{python3_other_sitearch}/cppyy.py
 %{python3_other_sitearch}/_pythonization.py
+%{python3_other_sitearch}/_rdf_utils.py
 %{python3_other_sitearch}/__pycache__/*
 
 %files -n python%{python3_other_pkgversion}-jupyroot
@@ -3475,6 +3556,7 @@ fi
 %{_libdir}/%{name}/libRDAVIX_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
 %{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
+%{_datadir}/%{name}/plugins/ROOT@@Internal@@RRawFile/P010_RRawFileDavix.C
 
 %files net-http -f includelist-net-http
 %{_libdir}/%{name}/libRHTTP.*
@@ -3548,15 +3630,23 @@ fi
 %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
 %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
 
-%files roofit -f includelist-roofit
+%files roofit -f includelist-roofit-roofit
 %{_libdir}/%{name}/libRooFit.*
 %{_libdir}/%{name}/libRooFit_rdict.pcm
+
+%files roofit-core -f includelist-roofit-roofitcore
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooFitCore_rdict.pcm
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
 %endif
+
+%files roofit-more -f includelist-roofit-roofitmore
+%{_libdir}/%{name}/libRooFitMore.*
+%{_libdir}/%{name}/libRooFitMore_rdict.pcm
+
+%files roostats -f includelist-roofit-roostats
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
 %dir %{_includedir}/%{name}/RooStats
@@ -3652,7 +3742,7 @@ fi
 %{_libdir}/%{name}/libROOTGpadv7.*
 %{_libdir}/%{name}/libROOTGpadv7_rdict.pcm
 
-%files graf-primitives -f includelist-graf2d-primitives
+%files graf-primitives -f includelist-graf2d-primitivesv7
 %{_libdir}/%{name}/libROOTGraphicsPrimitives.*
 %{_libdir}/%{name}/libROOTGraphicsPrimitives_rdict.pcm
 
@@ -3686,7 +3776,11 @@ fi
 %{_libdir}/%{name}/libWebGui6_rdict.pcm
 %{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
 
-%files hist-draw -f includelist-hist-histdraw
+%files histv7 -f includelist-hist-histv7
+%{_libdir}/%{name}/libROOTHist.*
+%{_libdir}/%{name}/libROOTHist_rdict.pcm
+
+%files hist-draw -f includelist-hist-histdrawv7
 %{_libdir}/%{name}/libROOTHistDraw.*
 %{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
 
@@ -3696,6 +3790,28 @@ fi
 %endif
 
 %changelog
+* Sun Mar 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.02-1
+- Update to 6.20.02
+- Drop patches accepted upstream
+  - root-dont-download-input-file-if-it-already-exists.patch
+  - root-fix-plugin-definition.patch
+  - root-man-install.patch
+  - root-pretty-printers.patch
+  - root-python3.patch
+  - root-stress-aarch64-ppc64le.patch
+- Drop patches no longer relevant due to changes to the code
+  - root-missing-include-string.patch
+  - root-static-constexpr.patch
+- Add workaround for PyROOT issues on ppc64le in EPEL 7
+  - root-epel7-ppc64le-pyroot.patch (patch conditionally applied)
+- Fix path to moved data file in tutorial
+  - root-moved-file.patch
+- Split the root-roofit subpackage into four different packages
+  - root-roofit, root-roofit-core, root-roofit-more and root-roostats
+  - The root-roofit-more library splits out the part of roofit that depends on
+    the root-mathmore package
+- New subpackage: root-histv7
+
 * Sat Mar 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.04-6
 - Build for 32 bit ARM again - gcc-10.0.1-0.9 fixes the problem
 
diff --git a/sources b/sources
index b86045b..0372c45 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.18.04.tar.xz) = 9ce3b5e1fa79cc010aa3b20ad3bfd8c4cf8605c17c0fb79991614ae299f3e08f00e76a1847b53f368a7bf006d90c1b5d152d1bf65a32b94f80835a47c60e03e6
+SHA512 (root-6.20.02.tar.xz) = 65f60c52485e72ef405daf10fa08a2d453c7f72f5f3721b97762094713dad1b0f5cb5a37a2a1c30f78bf97c358679f71829bc16833914e6f2ba82e9165521581
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From 245e52da342db471422f7ba901885ed09305317a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 5 Apr 2020 12:50:43 +0200
Subject: [PATCH 174/344] Update to 6.20.04 Drop previously backported patch
 root-tutorials-unique-filenames.patch Improved patch for the PyROOT issue on
 EPEL 7 ppc64le

---
 root-epel7-ppc64le-pyroot.patch       | 66 +++++++++++++++++++++++----
 root-tutorials-unique-filenames.patch | 22 ---------
 root.spec                             | 24 ++++------
 sources                               |  2 +-
 4 files changed, 69 insertions(+), 45 deletions(-)
 delete mode 100644 root-tutorials-unique-filenames.patch

diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch
index 2d9c400..d046855 100644
--- a/root-epel7-ppc64le-pyroot.patch
+++ b/root-epel7-ppc64le-pyroot.patch
@@ -1,6 +1,6 @@
 diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/pyroot/src/Cppyy.cxx
 --- root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx	2020-03-21 14:10:09.322489811 +0100
++++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx	2020-03-24 19:26:38.162272398 +0100
 @@ -74,10 +74,6 @@
  class ApplicationStarter {
  public:
@@ -12,12 +12,62 @@ diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/p
        // setup dummy holders for global and std namespaces
        assert( g_classrefs.size() == GLOBAL_HANDLE );
        g_name2classrefidx[ "" ]      = GLOBAL_HANDLE;
-@@ -90,8 +86,6 @@
-    }
+diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
+--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx	2020-03-24 19:26:38.182272186 +0100
+@@ -109,10 +109,6 @@
+ class ApplicationStarter {
+ public:
+     ApplicationStarter() {
+-     // Insure ROOT's atexit is executed *after* the atexit that calls
+-     // ApplicationStarter's destructor, by forcing the ROOT's atexit
+-     // registration now.
+-        TROOT::Initialize();
+     // setup dummy holders for global and std namespaces
+         assert(g_classrefs.size() == GLOBAL_HANDLE);
+         g_name2classrefidx[""]      = GLOBAL_HANDLE;
+diff -ur root-6.20.02.orig/core/base/inc/TROOT.h root-6.20.02/core/base/inc/TROOT.h
+--- root-6.20.02.orig/core/base/inc/TROOT.h	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/core/base/inc/TROOT.h	2020-03-24 19:26:38.182272186 +0100
+@@ -351,7 +351,6 @@
+    static void        SetMacroPath(const char *newpath);
+    static Int_t       IncreaseDirLevel();
+    static void        IndentLevel();
+-   static void        Initialize();
+    static Bool_t      Initialized();
+    static Bool_t      MemCheck();
+    static void        SetDirLevel(Int_t level = 0);
+diff -ur root-6.20.02.orig/core/base/src/TROOT.cxx root-6.20.02/core/base/src/TROOT.cxx
+--- root-6.20.02.orig/core/base/src/TROOT.cxx	2020-03-15 16:21:25.000000000 +0100
++++ root-6.20.02/core/base/src/TROOT.cxx	2020-03-24 20:10:54.640084486 +0100
+@@ -1022,10 +1022,12 @@
+       SafeDelete(fCleanups);
+ #endif
  
-    ~ApplicationStarter() {
--      for ( auto ifunc : g_method2callfunc )
--         gInterpreter->CallFunc_Delete( ifunc.second );
-    }
- } _applicationStarter;
+-#ifndef _MSC_VER
+-      // deleting the interpreter makes things crash at exit in some cases
+-      delete fInterpreter;
+-#endif
++      // llvm::TimingGroup used for measuring the timing relies the destructors.
++      // In order to make use of this feature we have to call the destructor of
++      // TCling which will shut down clang, cling and llvm.
++      // gSystem->Getenv is not available anymore.
++      if (::getenv("ROOT_CLING_TIMING"))
++         delete fInterpreter;
  
+       // Prints memory stats
+       TStorage::PrintStatistics();
+@@ -2848,13 +2850,6 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Initialize ROOT explicitly.
+-
+-void TROOT::Initialize() {
+-   (void) gROOT;
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+ /// Return kTRUE if the TROOT object has been initialized.
+ 
+ Bool_t TROOT::Initialized()
diff --git a/root-tutorials-unique-filenames.patch b/root-tutorials-unique-filenames.patch
deleted file mode 100644
index dee82fb..0000000
--- a/root-tutorials-unique-filenames.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tutorials/multicore/mtbb101_fillNtuples.C b/tutorials/multicore/mtbb101_fillNtuples.C
-index 80c19ce626..d7a9dbbdaa 100644
---- a/tutorials/multicore/mtbb101_fillNtuples.C
-+++ b/tutorials/multicore/mtbb101_fillNtuples.C
-@@ -40,7 +40,7 @@ Int_t mtbb101_fillNtuples()
- 
-    // Create a random generator and and Ntuple to hold the numbers
-    TRandom3 rndm(1);
--   TFile ofile("mp101_singleCore.root", "RECREATE");
-+   TFile ofile("mtbb101_singleCore.root", "RECREATE");
-    TNtuple randomNumbers("singleCore", "Random Numbers", "r");
-    fillRandom(randomNumbers, rndm, nNumbers);
-    randomNumbers.Write();
-@@ -52,7 +52,7 @@ Int_t mtbb101_fillNtuples()
-    auto workItem = [](UInt_t workerID) {
-       // One generator, file and ntuple per worker
-       TRandom3 workerRndm(workerID); // Change the seed
--      TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
-+      TFile ofile(Form("mtbb101_multiCore_%u.root", workerID), "RECREATE");
-       TNtuple workerRandomNumbers("multiCore", "Random Numbers", "r");
-       fillRandom(workerRandomNumbers, workerRndm, workSize);
-       workerRandomNumbers.Write();
diff --git a/root.spec b/root.spec
index 7a79f82..65e8296 100644
--- a/root.spec
+++ b/root.spec
@@ -49,7 +49,7 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.20.02
+Version:	6.20.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -117,22 +117,18 @@ Patch15:	%{name}-FitData-assert-fix.patch
 #		modifies it
 #		https://github.com/root-project/root/pull/5160
 Patch16:	%{name}-xmlmodify-dep.patch
-#		Use unique filenames in tutorials so they can be run in
-#		parallel
-#		Backport from upstream's git
-Patch17:	%{name}-tutorials-unique-filenames.patch
 #		Size types should use %z
 #		https://github.com/root-project/root/pull/5161
-Patch18:	%{name}-format-fix.patch
+Patch17:	%{name}-format-fix.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch19:	%{name}-32bit-tests.patch
+Patch18:	%{name}-32bit-tests.patch
 #		The file was moved - update path
 #		https://github.com/root-project/root/pull/5162
-Patch20:	%{name}-moved-file.patch
+Patch19:	%{name}-moved-file.patch
 #		Workaround for initialization problems for PyROOT on
 #		EPEL7 ppc64le
 #		https://sft.its.cern.ch/jira/browse/ROOT-10622
-Patch21:	%{name}-epel7-ppc64le-pyroot.patch
+Patch20:	%{name}-epel7-ppc64le-pyroot.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1847,11 +1843,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%if %{?rhel}%{!?rhel:0} == 7
-%ifarch ppc64le
-%patch21 -p1
-%endif
-%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3790,6 +3781,11 @@ fi
 %endif
 
 %changelog
+* Wed Apr 01 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.04-1
+- Update to 6.20.04
+- Drop previously backported patch root-tutorials-unique-filenames.patch
+- Improved patch for the PyROOT issue on EPEL 7 ppc64le
+
 * Sun Mar 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.02-1
 - Update to 6.20.02
 - Drop patches accepted upstream
diff --git a/sources b/sources
index 0372c45..acda19b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.20.02.tar.xz) = 65f60c52485e72ef405daf10fa08a2d453c7f72f5f3721b97762094713dad1b0f5cb5a37a2a1c30f78bf97c358679f71829bc16833914e6f2ba82e9165521581
+SHA512 (root-6.20.04.tar.xz) = 9e864e1b4c772871bdadec53b40ccce05fd537f04321b301ca78ad1e711e332b278e76bcd7673a6a11ef4dbac18bee8c24ae65cc7fe962e5e8b63630bdc62f27
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From 9cc859debf198e44004186621556a1bffcfc9f57 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 10 Apr 2020 14:58:56 +0200
Subject: [PATCH 175/344] Replace BR qt5-devel with qt5-qtbase-devel

---
 root.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 65e8296..6c23168 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.20.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -187,7 +187,7 @@ BuildRequires:	python%{python3_other_pkgversion}-devel
 %endif
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
-BuildRequires:	qt5-devel
+BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtwebengine-devel
 %endif
 %endif
@@ -3781,6 +3781,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 10 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.04-2
+- Replace BR qt5-devel with qt5-qtbase-devel
+
 * Wed Apr 01 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.04-1
 - Update to 6.20.04
 - Drop previously backported patch root-tutorials-unique-filenames.patch

From 52746b4384e5882813c2cee3d9f26e741138da6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 26 May 2020 03:49:26 +0200
Subject: [PATCH 176/344] Rebuilt for Python 3.9

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 6c23168..bfda37a 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.20.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3781,6 +3781,9 @@ fi
 %endif
 
 %changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.20.04-3
+- Rebuilt for Python 3.9
+
 * Fri Apr 10 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.04-2
 - Replace BR qt5-devel with qt5-qtbase-devel
 

From d5f9a3e4ced6692d4429ab2393b3a1fcf144fadd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 15 Jun 2020 08:33:47 +0200
Subject: [PATCH 177/344] Update to 6.20.06 Fix test failure on ppc64le and
 aarch64

---
 root-roostats-test-ppc64le-aarch64.patch | 34 +++++++++++++++++++++
 root.spec                                | 38 +++++++++++++++---------
 sources                                  |  2 +-
 3 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 root-roostats-test-ppc64le-aarch64.patch

diff --git a/root-roostats-test-ppc64le-aarch64.patch b/root-roostats-test-ppc64le-aarch64.patch
new file mode 100644
index 0000000..b88d052
--- /dev/null
+++ b/root-roostats-test-ppc64le-aarch64.patch
@@ -0,0 +1,34 @@
+From 357ac50a2420a4544c9c63594cccb994ee14f870 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 13 Jun 2020 14:23:15 +0200
+Subject: [PATCH] The roofit/roostats/test/testHypoTestInvResult.cxx test fails
+ on aarch64 and ppc64le. This commit adjusts the allowed deviation from the
+ expected value so that the test passes.
+
+The reported error is (with slight variations in the exact numbers):
+
+/builddir/build/BUILD/root-6.20.06/roofit/roostats/test/testHypoTestInvResult.cxx:24: Failure
+The difference between result->UpperLimitEstimatedError() and 0.059684301 is 1.1846561807221656e-07, which exceeds 1.E-8, where
+result->UpperLimitEstimatedError() evaluates to 0.05968418253438193,
+0.059684301 evaluates to 0.059684301000000002, and
+1.E-8 evaluates to 1e-08.
+---
+ roofit/roostats/test/testHypoTestInvResult.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/roofit/roostats/test/testHypoTestInvResult.cxx b/roofit/roostats/test/testHypoTestInvResult.cxx
+index 9c2896185a..b89eab9b69 100644
+--- a/roofit/roostats/test/testHypoTestInvResult.cxx
++++ b/roofit/roostats/test/testHypoTestInvResult.cxx
+@@ -21,7 +21,7 @@ TEST(HypoTestInvResult, ReadFromFile)
+ 
+   // This just reads members
+   EXPECT_NEAR(result->UpperLimit(), 2.4613465, 1.E-7);
+-  EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 1.E-8);
++  EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 2.E-7);
+ 
+   // This accesses the sampling distribution
+   EXPECT_DOUBLE_EQ(result->GetExpectedUpperLimit(0), 1.60988427028569);
+-- 
+2.26.2
+
diff --git a/root.spec b/root.spec
index bfda37a..60eba85 100644
--- a/root.spec
+++ b/root.spec
@@ -49,9 +49,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.20.04
+Version:	6.20.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -129,6 +129,9 @@ Patch19:	%{name}-moved-file.patch
 #		EPEL7 ppc64le
 #		https://sft.its.cern.ch/jira/browse/ROOT-10622
 Patch20:	%{name}-epel7-ppc64le-pyroot.patch
+#		Fix test failure on ppc64le and aarch64
+#		https://github.com/root-project/root/pull/5867
+Patch21:	%{name}-roostats-test-ppc64le-aarch64.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1843,6 +1846,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2128,6 +2132,7 @@ else
     py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
 fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g" \
     -e "s,lib${py2l},lib${py3l},g" \
     -e 's,%{__python}%{python2_version},%{__python3},g' \
     -e 's,%{__python2},%{__python3},g' \
@@ -2157,6 +2162,7 @@ else
     py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
 fi
 sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+    -e "s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g" \
     -e "s,lib${py2l},lib${py3l},g" \
     -e 's,%{__python}%{python2_version},%{__python3_other},g' \
     -e 's,%{__python2},%{__python3_other},g' \
@@ -2629,7 +2635,7 @@ popd
 # - gtest-net-davix-test-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
-#   (*) one subtest RRawFile.Remote fails, others woud be OK
+#   (*) one subtest RRawFile.Remote fails, others would be OK
 #
 # - gtest-tmva-tmva-test-rreader
 # - gtest-tmva-tmva-test-rstandardscaler
@@ -2676,6 +2682,7 @@ tutorial-tmva-tmva103_Application"
 # - gtest-tree-dataframe-test-dataframe-friends
 # - gtest-tree-dataframe-test-dataframe-helpers
 # - gtest-tree-dataframe-test-dataframe-interface
+# - gtest-tree-dataframe-test-dataframe-ranges
 # - gtest-tree-dataframe-test-dataframe-simple
 # - gtest-tree-dataframe-test-dataframe-snapshot
 # - gtest-tree-dataframe-test-datasource-root
@@ -2687,6 +2694,7 @@ gtest-tree-dataframe-test-dataframe-colnames|\
 gtest-tree-dataframe-test-dataframe-friends|\
 gtest-tree-dataframe-test-dataframe-helpers|\
 gtest-tree-dataframe-test-dataframe-interface|\
+gtest-tree-dataframe-test-dataframe-ranges|\
 gtest-tree-dataframe-test-dataframe-simple|\
 gtest-tree-dataframe-test-dataframe-snapshot|\
 gtest-tree-dataframe-test-datasource-root|\
@@ -2694,19 +2702,17 @@ gtest-tree-dataframe-test-datasource-trivial"
 %endif
 
 %ifarch %{arm}
-# Tests failing on 32 bit arm
+# This test fails on 32 bit arm
 # - gtest-tree-tree-test-testBulkApiSillyStruct
 excluded="${excluded}|gtest-tree-tree-test-testBulkApiSillyStruct"
 %endif
 
-%ifarch ppc64le
-%if %{?fedora}%{!?fedora:0} == 29 || %{?fedora}%{!?fedora:0} == 30
-# This test fails on Fedora 29 and 30 ppc64le with the following error:
-# cling::DynamicLibraryManager::loadLibrary():
-#   /lib64/libGLdispatch.so.0: cannot allocate memory in static TLS block
-# Error in <TInterpreter::TCling::AutoLoad>:
-#   failure loading library libRGL.so for TGLHistPainter
-excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
+%ifarch %{ix86} x86_64
+%if %{?fedora}%{!?fedora:0}
+# This test fails on ix86 and x86_64 for Fedora 31/32/33 in koji
+# I can not reproduce the failure in a local mock build
+# - tutorial-roofit-rf611_weightedfits
+excluded="${excluded}|tutorial-roofit-rf611_weightedfits"
 %endif
 %endif
 
@@ -3080,7 +3086,7 @@ fi
 %{_pkgdocdir}/LICENSE
 %doc %{_pkgdocdir}/README
 %doc %{_pkgdocdir}/ReleaseNotes
-%license LICENSE
+%license LICENSE LGPL2_1.txt
 
 %files multiproc -f includelist-core-multiproc
 %{_libdir}/%{name}/libMultiProc.*
@@ -3781,6 +3787,10 @@ fi
 %endif
 
 %changelog
+* Thu Jun 11 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.06-1
+- Update to 6.20.06
+- Fix test failure on ppc64le and aarch64
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.20.04-3
 - Rebuilt for Python 3.9
 
@@ -4599,7 +4609,7 @@ fi
 - Enable dCache support - dcap library is now in Fedora
 - Use system unuran library instead of embedded sources
 
-* Mon Feb  1 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
+* Mon Feb 01 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00a-1
 - Update to 5.26.00a
 - Disable cintex package for non-intel architectures
 - Remove embedded gl2ps sources
diff --git a/sources b/sources
index acda19b..86bdac6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.20.04.tar.xz) = 9e864e1b4c772871bdadec53b40ccce05fd537f04321b301ca78ad1e711e332b278e76bcd7673a6a11ef4dbac18bee8c24ae65cc7fe962e5e8b63630bdc62f27
+SHA512 (root-6.20.06.tar.xz) = 791f472cb40200c5f8b79efd1803044914bb8e41dc1f424e90508c059d548be7913417a08a770e0f041c9070af8dc6bbddf5366c3db2b1dac43d417992aade22
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e

From 4dabf92f1ed69fa9f2d03bd86fbe1a6ed485b012 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Sat, 11 Jul 2020 11:24:46 -0600
Subject: [PATCH 178/344] Disable LTO

---
 root.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 60eba85..2929aa2 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.20.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -1917,6 +1917,10 @@ rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
 %build
+# This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
+# is analyzed and fixed, disable LTO
+%define _lto_cflags %{nil}
+
 unset QTDIR
 unset QTLIB
 unset QTINC
@@ -3787,6 +3791,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 11 2020 Jeff Law <law@redhat.com> - 6.20.06-2
+- Disable LTO
+
 * Thu Jun 11 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.06-1
 - Update to 6.20.06
 - Fix test failure on ppc64le and aarch64

From b2cd7526352f1e83dddc9407a3b723e246ab6223 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 15 Jul 2020 04:44:51 +0200
Subject: [PATCH 179/344] Update to 6.22.00 Drop patches accepted upstream  
 root-FitData-assert-fix.patch   root-clang-altivec-vector.patch  
 root-format-fix.patch   root-moved-file.patch   root-xmlmodify-dep.patch New
 and improved Python bindings The new Python bindings can be built for both
 Python 2 and Python 3   out of the box. Dropped the workaround in specfile
 for this (EPEL 7) Dropped the python3-other packages (EPEL 7) The new Python
 bindings has split the TPython interface to a separate   library. Now in a
 separate root-tpython package root-tpython and root-tmva-python are now using
 Python 3 on EPEL 7 New subpackage root-gui-browsable New patches (submitted
 upstream)   Fix too aggressive -Werror replacements   Add missing call to
 TFile::SetCacheFileDir in a TMVA tutorial   Adjust stressGraphics.ref   Fix
 off-by-one error in histogram v7 bin iterator   Compatibility with python 2.7
 versions before 2.7.9   Fix the RNTuple.LargeFile test on 32bit (i386 and
 armv7hf)   Fix doxygen issues   Fix bad regex in TProofMgr   Compatibility
 with xrootd 5

---
 root-32bit-dataframe.patch            |   69 +-
 root-FitData-assert-fix.patch         |   28 -
 root-clang-altivec-vector.patch       |   27 -
 root-doxygen-crash.patch              |   33 +
 root-doxygen-endof-part1.patch        |   49 +
 root-doxygen-endof-part2.patch        |  978 ++++++++++++++++++++
 root-doxygen-filenames.patch          |  378 ++++++++
 root-doxygen-macro-name.patch         |   29 +
 root-doxygen-md-comments.patch        |  214 +++++
 root-doxygen-missing-underscore.patch |   25 +
 root-doxygen-parameter-names.patch    | 1211 +++++++++++++++++++++++++
 root-epel7-ppc64le-pyroot.patch       |   86 +-
 root-fix-bad-regex.patch              |   25 +
 root-fontconfig.patch                 |  102 +--
 root-format-fix.patch                 |   28 -
 root-histv7-bin-iterator.patch        |   51 ++
 root-jupyroot-static.patch            |   48 +-
 root-memory-usage.patch               |   15 +-
 root-moved-file.patch                 |   27 -
 root-ntuple-largefile.patch           |  139 +++
 root-old-gtest-compat.patch           |  161 ++++
 root-python2-compat.patch             |   41 +
 root-python3.8-object.patch           |  397 ++------
 root-setcachefiledir.patch            |   30 +
 root-stressGraphics.patch             |   34 +
 root-testfiles.sh                     |    2 +
 root-unbundle-gtest.patch             |   62 +-
 root-v7-line.patch                    |   11 -
 root-werror-fix.patch                 |   57 ++
 root-xmlmodify-dep.patch              |   25 -
 root-xrootd5-compat.patch             |  109 +++
 root.spec                             |  921 +++++++------------
 sources                               |    4 +-
 33 files changed, 4156 insertions(+), 1260 deletions(-)
 delete mode 100644 root-FitData-assert-fix.patch
 delete mode 100644 root-clang-altivec-vector.patch
 create mode 100644 root-doxygen-crash.patch
 create mode 100644 root-doxygen-endof-part1.patch
 create mode 100644 root-doxygen-endof-part2.patch
 create mode 100644 root-doxygen-filenames.patch
 create mode 100644 root-doxygen-macro-name.patch
 create mode 100644 root-doxygen-md-comments.patch
 create mode 100644 root-doxygen-missing-underscore.patch
 create mode 100644 root-doxygen-parameter-names.patch
 create mode 100644 root-fix-bad-regex.patch
 delete mode 100644 root-format-fix.patch
 create mode 100644 root-histv7-bin-iterator.patch
 delete mode 100644 root-moved-file.patch
 create mode 100644 root-ntuple-largefile.patch
 create mode 100644 root-old-gtest-compat.patch
 create mode 100644 root-python2-compat.patch
 create mode 100644 root-setcachefiledir.patch
 create mode 100644 root-stressGraphics.patch
 delete mode 100644 root-v7-line.patch
 create mode 100644 root-werror-fix.patch
 delete mode 100644 root-xmlmodify-dep.patch
 create mode 100644 root-xrootd5-compat.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index e47b913..310171f 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.20.02.orig/bindings/pyroot/ROOT.py root-6.20.02/bindings/pyroot/ROOT.py
---- root-6.20.02.orig/bindings/pyroot/ROOT.py	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/ROOT.py	2020-03-15 19:50:25.303179253 +0100
+diff -ur root-6.22.00.orig/bindings/pyroot_legacy/ROOT.py root-6.22.00/bindings/pyroot_legacy/ROOT.py
+--- root-6.22.00.orig/bindings/pyroot_legacy/ROOT.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot_legacy/ROOT.py	2020-06-29 09:07:41.574798580 +0200
 @@ -438,9 +438,7 @@
  # This function is injected as method to the respective classes in Pythonize.cxx.
  _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
@@ -12,9 +12,9 @@ diff -ur root-6.20.02.orig/bindings/pyroot/ROOT.py root-6.20.02/bindings/pyroot/
  
  
  ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.20.02.orig/build/unix/makepchinput.py root-6.20.02/build/unix/makepchinput.py
---- root-6.20.02.orig/build/unix/makepchinput.py	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/build/unix/makepchinput.py	2020-03-15 19:50:25.304179242 +0100
+diff -ur root-6.22.00.orig/build/unix/makepchinput.py root-6.22.00/build/unix/makepchinput.py
+--- root-6.22.00.orig/build/unix/makepchinput.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/build/unix/makepchinput.py	2020-06-29 09:07:41.639798769 +0200
 @@ -252,9 +252,6 @@
                             "math/vdt",
                             "tmva/rmva"]
@@ -25,9 +25,9 @@ diff -ur root-6.20.02.orig/build/unix/makepchinput.py root-6.20.02/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.20.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.20.02/tree/dataframe/test/dataframe_cache.cxx
---- root-6.20.02.orig/tree/dataframe/test/dataframe_cache.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tree/dataframe/test/dataframe_cache.cxx	2020-03-15 19:50:09.075351525 +0100
+diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_cache.cxx root-6.22.00/tree/dataframe/test/dataframe_cache.cxx
+--- root-6.22.00.orig/tree/dataframe/test/dataframe_cache.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/dataframe_cache.cxx	2020-06-29 09:07:41.640798772 +0200
 @@ -224,8 +224,6 @@
  
  }
@@ -37,16 +37,19 @@ diff -ur root-6.20.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.20.02/
  TEST(Cache, Regex)
  {
  
-@@ -334,5 +332,3 @@
- 
+@@ -335,8 +333,6 @@
     gSystem->Unlink(fileName);
  }
--
+ 
 -#endif // R__B64
-diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.20.02/tree/dataframe/test/datasource_arrow.cxx
---- root-6.20.02.orig/tree/dataframe/test/datasource_arrow.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tree/dataframe/test/datasource_arrow.cxx	2020-03-15 19:50:09.075351525 +0100
-@@ -163,8 +163,6 @@
+-
+ // ROOT-10563
+ TEST(Cache, Alias)
+ {
+diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_arrow.cxx root-6.22.00/tree/dataframe/test/datasource_arrow.cxx
+--- root-6.22.00.orig/tree/dataframe/test/datasource_arrow.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/datasource_arrow.cxx	2020-06-29 09:07:41.645798787 +0200
+@@ -177,8 +177,6 @@
  }
  #endif
  
@@ -55,15 +58,15 @@ diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.20.02
  TEST(RArrowDS, FromARDF)
  {
     std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
-@@ -236,5 +234,3 @@
+@@ -250,5 +248,3 @@
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.20.02/tree/dataframe/test/datasource_csv.cxx
---- root-6.20.02.orig/tree/dataframe/test/datasource_csv.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tree/dataframe/test/datasource_csv.cxx	2020-03-15 19:57:05.490930922 +0100
+diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_csv.cxx root-6.22.00/tree/dataframe/test/datasource_csv.cxx
+--- root-6.22.00.orig/tree/dataframe/test/datasource_csv.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/datasource_csv.cxx	2020-06-29 09:07:41.645798787 +0200
 @@ -195,8 +195,6 @@
  }
  #endif
@@ -79,9 +82,9 @@ diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.20.02/t
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_root.cxx root-6.20.02/tree/dataframe/test/datasource_root.cxx
---- root-6.20.02.orig/tree/dataframe/test/datasource_root.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tree/dataframe/test/datasource_root.cxx	2020-03-15 19:50:09.076351514 +0100
+diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_root.cxx root-6.22.00/tree/dataframe/test/datasource_root.cxx
+--- root-6.22.00.orig/tree/dataframe/test/datasource_root.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/datasource_root.cxx	2020-06-29 09:07:41.649798799 +0200
 @@ -117,8 +117,6 @@
  }
  #endif
@@ -97,9 +100,9 @@ diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_root.cxx root-6.20.02/
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.20.02/tree/dataframe/test/datasource_trivial.cxx
---- root-6.20.02.orig/tree/dataframe/test/datasource_trivial.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tree/dataframe/test/datasource_trivial.cxx	2020-03-15 19:50:09.076351514 +0100
+diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_trivial.cxx root-6.22.00/tree/dataframe/test/datasource_trivial.cxx
+--- root-6.22.00.orig/tree/dataframe/test/datasource_trivial.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/datasource_trivial.cxx	2020-06-29 09:07:41.654798814 +0200
 @@ -132,8 +132,6 @@
     EXPECT_EQ(*tdfAll.Count(), 20ULL);
  }
@@ -115,10 +118,10 @@ diff -ur root-6.20.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.20.
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.20.02.orig/tutorials/CMakeLists.txt root-6.20.02/tutorials/CMakeLists.txt
---- root-6.20.02.orig/tutorials/CMakeLists.txt	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/tutorials/CMakeLists.txt	2020-03-15 19:59:35.808335176 +0100
-@@ -255,10 +255,6 @@
+diff -ur root-6.22.00.orig/tutorials/CMakeLists.txt root-6.22.00/tutorials/CMakeLists.txt
+--- root-6.22.00.orig/tutorials/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tutorials/CMakeLists.txt	2020-06-29 09:07:41.655798816 +0200
+@@ -257,10 +257,6 @@
    set(root7_veto v7/ntuple/ntpl004_dimuon.C)
  endif()
  
@@ -129,7 +132,7 @@ diff -ur root-6.20.02.orig/tutorials/CMakeLists.txt root-6.20.02/tutorials/CMake
  #---These ones are disabled !!! ------------------------------------
  set(extra_veto
    legacy/benchmarks.C
-@@ -311,7 +307,6 @@
+@@ -313,7 +309,6 @@
               ${classic_veto}
               ${pythia_veto}
               ${root7_veto}
@@ -137,11 +140,11 @@ diff -ur root-6.20.02.orig/tutorials/CMakeLists.txt root-6.20.02/tutorials/CMake
               ${xrootd_veto}
               ${mlp_veto}
               ${spectrum_veto}
-@@ -513,7 +508,6 @@
+@@ -526,7 +521,6 @@
    list(REMOVE_ITEM pytutorials ${pyveto})
  
    if(NOT dataframe)
 -    set(dataframe_veto_py dataframe/*.py)
      file(GLOB dataframe_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py tmva/tmva*.py)
      list(REMOVE_ITEM pytutorials ${dataframe_veto_py})
-     list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
+     list(REMOVE_ITEM pytutorials
diff --git a/root-FitData-assert-fix.patch b/root-FitData-assert-fix.patch
deleted file mode 100644
index 8e9ba00..0000000
--- a/root-FitData-assert-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 07c5d640dd53c83c8b3350b520170fd9a5526495 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 14:09:07 +0100
-Subject: [PATCH] Correct broken assert statements
-
----
- math/mathcore/src/FitData.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/math/mathcore/src/FitData.cxx b/math/mathcore/src/FitData.cxx
-index a2be20ab0d..0bad8ff7cd 100644
---- a/math/mathcore/src/FitData.cxx
-+++ b/math/mathcore/src/FitData.cxx
-@@ -200,9 +200,9 @@ namespace ROOT {
-       /// dummy virtual destructor
-       FitData::~FitData()
-       {
-+         assert(fWrapped == fCoords.empty());
-          for (unsigned int i = 0; i < fDim; i++) {
--            assert(fWrapped == fCoords.empty());
--            assert(fCoords.empty() || &fCoords[i].front() == fCoordsPtr[i]);
-+            assert(fWrapped || fCoords[i].empty() || &fCoords[i].front() == fCoordsPtr[i]);
-          }
-          if (fpTmpCoordVector)  delete[] fpTmpCoordVector;
- 
--- 
-2.24.1
-
diff --git a/root-clang-altivec-vector.patch b/root-clang-altivec-vector.patch
deleted file mode 100644
index 4648ccc..0000000
--- a/root-clang-altivec-vector.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f0e7ee696e416f5cb42619889fcbff7db64f17e1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 17:09:03 +0100
-Subject: [PATCH] Fix ppc64le compilation with gcc 10
-
-Backported from llvm upstream
-https://reviews.llvm.org/D74129
----
- interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-index dbe6b4db94..2096ba6982 100644
---- a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-+++ b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-@@ -2373,7 +2373,7 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr,
-         '/', '/', '/', '/',  '/', '/', '/', '/'
-       };
-       while (CurPtr+16 <= BufferEnd &&
--             !vec_any_eq(*(const vector unsigned char*)CurPtr, Slashes))
-+             !vec_any_eq(*(const __vector unsigned char*)CurPtr, Slashes))
-         CurPtr += 16;
- #else
-       // Scan for '/' quickly.  Many block comments are very large.
--- 
-2.24.1
-
diff --git a/root-doxygen-crash.patch b/root-doxygen-crash.patch
new file mode 100644
index 0000000..b27f5ce
--- /dev/null
+++ b/root-doxygen-crash.patch
@@ -0,0 +1,33 @@
+diff -ur root-6.22.00.orig/tutorials/tmva/tmva003_RReader.C root-6.22.00/tutorials/tmva/tmva003_RReader.C
+--- root-6.22.00.orig/tutorials/tmva/tmva003_RReader.C	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tutorials/tmva/tmva003_RReader.C	2020-07-09 18:58:36.854733120 +0200
+@@ -5,7 +5,6 @@
+ /// TMVA XML files.
+ ///
+ /// \macro_code
+-/// \macro_output
+ ///
+ /// \date July 2019
+ /// \author Stefan Wunsch
+diff -ur root-6.22.00.orig/tutorials/tmva/tmva103_Application.C root-6.22.00/tutorials/tmva/tmva103_Application.C
+--- root-6.22.00.orig/tutorials/tmva/tmva103_Application.C	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tutorials/tmva/tmva103_Application.C	2020-07-09 18:58:36.855733122 +0200
+@@ -6,7 +6,6 @@
+ /// event-by-event inference, batch inference and pipelines with RDataFrame.
+ ///
+ /// \macro_code
+-/// \macro_output
+ ///
+ /// \date December 2018
+ /// \author Stefan Wunsch
+diff -ur root-6.22.00.orig/tutorials/v7/line.cxx root-6.22.00/tutorials/v7/line.cxx
+--- root-6.22.00.orig/tutorials/v7/line.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tutorials/v7/line.cxx	2020-07-09 18:58:42.202745047 +0200
+@@ -6,7 +6,6 @@
+ /// "normal" coordinates' system and changing the line color linearly from black
+ /// to red.
+ ///
+-/// \macro_image (line.png)
+ /// \macro_code
+ ///
+ /// \date 2018-03-18
diff --git a/root-doxygen-endof-part1.patch b/root-doxygen-endof-part1.patch
new file mode 100644
index 0000000..974b60e
--- /dev/null
+++ b/root-doxygen-endof-part1.patch
@@ -0,0 +1,49 @@
+From c454b8d31a840898a709452525267a8404a05d24 Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@cern.ch>
+Date: Tue, 30 Jun 2020 17:05:13 +0200
+Subject: [PATCH] [NFC][DF] Minor improvements to formatting and docs of
+ Display
+
+---
+ tree/dataframe/inc/ROOT/RDF/RDisplay.hxx | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx b/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
+index 90058f0706..9f5e3623ae 100644
+--- a/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
++++ b/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
+@@ -105,10 +105,10 @@ private:
+    }
+ 
+    ////////////////////////////////////////////////////////////////////////////
+-   /// Appends collection.size() cling::printValue call to the stringstream.
++   /// Appends collection.size() cling::printValue calls to the stringstream.
+    /// \tparam T the type of the event to convert
+    /// \param[in] stream Where the conversion function call will be chained.
+-   /// \param[in] element The event to convert to its string representation
++   /// \param[in] collection The event to convert to its string representation
+    /// \param[in] index To which column the event belongs to
+    /// \return true, the event is a collection
+    /// This function chains a sequence of call to cling::printValue, one for each element of the collection.
+@@ -128,7 +128,8 @@ private:
+       // For each element, append a call and feed the proper type returned by GetSplit
+       for (size_t i = 0; i < collectionSize; ++i) {
+          stream << "*((std::string*)" << ROOT::Internal::RDF::PrettyPrintAddr(&(fCollectionsRepresentations[index][i]))
+-                << ") = cling::printValue((" << output[1] << "*)" << ROOT::Internal::RDF::PrettyPrintAddr(&(collection[i])) << ");";
++                << ") = cling::printValue((" << output[1] << "*)"
++                << ROOT::Internal::RDF::PrettyPrintAddr(&(collection[i])) << ");";
+       }
+       return true;
+    }
+@@ -197,7 +198,7 @@ public:
+    /// Prints the representation to the standard output
+    ///
+    /// Collections are shortened to the first and last element. The overall width
+-   /// is shortened to a fixed size of TODO
++   /// is shortened to a fixed number of columns that should fit the screen width.
+    void Print() const;
+ 
+    ////////////////////////////////////////////////////////////////////////////
+-- 
+2.26.2
+
diff --git a/root-doxygen-endof-part2.patch b/root-doxygen-endof-part2.patch
new file mode 100644
index 0000000..a32b39f
--- /dev/null
+++ b/root-doxygen-endof-part2.patch
@@ -0,0 +1,978 @@
+From 1198ee3e08c46d1edc9258dbe857f66340f53a20 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 8 Jul 2020 10:39:54 +0200
+Subject: [PATCH 2/5] Fix various "end of ..." warnings from doxygen.
+
+This addresses warnings like:
+
+- end of comment block while expecting command </b>
+- end of comment block while expecting command </em>
+- end of comment block while expecting command </pre>
+- end of comment block while expecting command </s>
+- end of comment block while expecting command </sup>
+- end of comment block while expecting command </tt>
+- end of comment block while expecting command </u>
+- end of list marker found without any preceding list items
+- found </em> tag without matching <em>
+- found </li> tag without matching <li>
+- found </pre> tag without matching <pre>
+- found </sub> tag while expecting </sup>
+- found </sup> tag without matching <sup>
+- found </tt> tag without matching <tt>
+- found </ul> tag without matching <ul>
+- illegal </br> tag found
+- reached end of file while inside a 'code' block!
+- reached end of file while still inside a (nested) comment.
+- unexpected end of comment while inside <a href=...> tag
+- unexpected end of comment while inside <ul> block
+- unexpected html tag <blockquote> found within <h1> context
+- unexpected tag </h2> found
+- unexpected tag </h3> found
+- unsupported xml/html tag <it> found
+- unsupported xml/html tag </it> found
+---
+ bindings/r/inc/TRDataFrame.h                  |   2 +-
+ core/base/src/TEnv.cxx                        |   7 +-
+ core/cont/src/TBits.cxx                       |   2 +-
+ core/dictgen/res/DictSelectionReader.h        | 140 +++++++++---------
+ core/foundation/inc/ROOT/TypeTraits.hxx       |   2 +-
+ core/meta/src/TClass.cxx                      |   6 +-
+ core/metacling/src/TCling.cxx                 |   8 +-
+ graf2d/x11/src/TGX11.cxx                      |   6 +-
+ gui/guihtml/src/TGHtmlSizer.cxx               |   4 +-
+ hist/hist/src/TSVDUnfold.cxx                  |   8 +-
+ hist/histpainter/src/THistPainter.cxx         |   2 +-
+ hist/histv7/speed/histspeedtest.cxx           |   1 -
+ hist/unfold/inc/TUnfold.h                     |   8 +-
+ html/src/TDocDirective.cxx                    |   2 +-
+ math/mathcore/inc/Math/ProbFuncMathCore.h     |   8 +-
+ math/mathcore/inc/Math/QuantFuncMathCore.h    |   4 +-
+ math/mathcore/src/TMath.cxx                   |   2 +-
+ math/mathmore/inc/Math/GSLMultiRootFinder.h   |  16 +-
+ math/matrix/doc/Matrix.md                     |   2 +-
+ math/minuit/src/TMinuit.cxx                   |   4 +-
+ montecarlo/eg/src/TDatabasePDG.cxx            |   2 +-
+ montecarlo/vmc/README.md                      |   2 +-
+ net/http/civetweb/LICENSE.md                  |   4 -
+ proof/proof/src/TProofMgr.cxx                 |  50 ++++---
+ proof/proof/src/TProofServ.cxx                |  10 +-
+ roofit/histfactory/doc/index.md               |  11 +-
+ .../src/MakeModelAndMeasurementsFast.cxx      |  11 +-
+ roofit/roofitcore/inc/RooAbsCategory.h        |   2 +-
+ roofit/roofitcore/src/RooSimPdfBuilder.cxx    |   4 +-
+ tmva/tmva/src/Factory.cxx                     |   6 +-
+ tmva/tmva/src/Reader.cxx                      |   4 +-
+ tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx  |   2 +-
+ tutorials/net/udpserver.c                     |   2 +-
+ tutorials/tmva/TMVA_CNN_Classification.C      |   2 +-
+ 34 files changed, 168 insertions(+), 178 deletions(-)
+
+diff --git a/bindings/r/inc/TRDataFrame.h b/bindings/r/inc/TRDataFrame.h
+index b7bb4ed89d..dbf48e1383 100644
+--- a/bindings/r/inc/TRDataFrame.h
++++ b/bindings/r/inc/TRDataFrame.h
+@@ -136,7 +136,7 @@ namespace ROOT {
+          2 |1
+       \endcode
+ 
+-      </h2>Working with colunms between dataframes</h2><br>
++      <h2>Working with colunms between dataframes</h2><br>
+       \code{.cpp}
+       df2["v3"]<<df1["strings"];
+ 
+diff --git a/core/base/src/TEnv.cxx b/core/base/src/TEnv.cxx
+index 39c07caf21..ab697df7b7 100644
+--- a/core/base/src/TEnv.cxx
++++ b/core/base/src/TEnv.cxx
+@@ -388,10 +388,9 @@ TString TEnvRec::ExpandValue(const char *value)
+ ClassImp(TEnv);
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Create a resource table and read the (possibly) three resource files, i.e
+-/// `$ROOTSYS/etc/system``<name>` (or `ROOTETCDIR/system``<name>`),
+-/// `$HOME/``<name>` and
+-/// `./``<name>`.
++/// Create a resource table and read the (possibly) three resource files,
++/// i.e.\ `$ROOTSYS/etc/system<name>` (or `ROOTETCDIR/system<name>`),
++/// `$HOME/<name>` and `$PWD/<name>`.
+ /// ROOT always reads ".rootrc" (in TROOT::InitSystem()). You can
+ /// read additional user defined resource files by creating additional TEnv
+ /// objects. By setting the shell variable ROOTENV_NO_HOME=1 the reading of
+diff --git a/core/cont/src/TBits.cxx b/core/cont/src/TBits.cxx
+index 155bfd4b4c..95167dd5b1 100644
+--- a/core/cont/src/TBits.cxx
++++ b/core/cont/src/TBits.cxx
+@@ -10,7 +10,7 @@ Container of bits.
+ This class provides a simple container of bits.
+ Each bit can be set and tested via the functions SetBitNumber and
+ TestBitNumber.
+-                                             .
++
+ The default value of all bits is kFALSE.
+ The size of the container is automatically extended when a bit
+ number is either set or tested.  To reduce the memory size of the
+diff --git a/core/dictgen/res/DictSelectionReader.h b/core/dictgen/res/DictSelectionReader.h
+index 52921d6237..b19135badd 100644
+--- a/core/dictgen/res/DictSelectionReader.h
++++ b/core/dictgen/res/DictSelectionReader.h
+@@ -60,34 +60,32 @@ namespace clang {
+  * By default, the Name of the selection class is then
+  * @c ROOT::Meta::Selection::C.  If you have such a class, it will be found
+  * automatically.  If @c C is in a namespace, @c NS::C, then
+- * the selection class should be in the same namespace: @c
+-ROOT::Selection::NS::C.
++ * the selection class should be in the same namespace:
++ * @c ROOT::Meta::Selection::NS::C.
++ *
+  * Examples:
+  *
+-
+-**/
+-
+-/**
+  * The DictSelectionReader is used to create selection rules starting from
+  * C++ the constructs of the @c ROOT::Meta::Selection namespace. All rules
+  * are matching by name.
+  * A brief description of the operations that lead to class selection:
+- *    1. If a class declaration is present in the selection namespace, a class
+- * with the same name is selected outside the selection namespace.
+- *    2. If a template class declaration and a template instantiation is present
+- * in the selection namespace, all the instances of the template are
+- * selected outside the namespace.
++ * 1. If a class declaration is present in the selection namespace, a class
++ *    with the same name is selected outside the selection namespace.
++ * 2. If a template class declaration and a template instantiation is present
++ *    in the selection namespace, all the instances of the template are
++ *    selected outside the namespace.
++ *
+  * For example:
+  * @code
+  * [...]
+  * class classVanilla{};
+  * template <class A> class classTemplateVanilla {};
+  * classTemplateVanilla<char> t0;
+- * namespace ROOT{
++ * namespace ROOT {
+  *    namespace Meta {
+- *       namespace Selection{
+- *          class classVanilla{};
+- *          template <typename A> class classTemplateVanilla{};
++ *       namespace Selection {
++ *          class classVanilla {};
++ *          template <typename A> class classTemplateVanilla {};
+  *          classTemplateVanilla<char> st0;
+  *       }
+  *    }
+@@ -98,14 +96,15 @@ ROOT::Selection::NS::C.
+  *
+  * A brief description of the properties that can be assigned to classes
+  * with the @c ROOT::Meta::Selection::ClassAttributes class.
+- *    1. @c kNonSplittable : Makes the class non splittable
++ * 1. @c kNonSplittable : Makes the class non splittable
++ *
+  * The class properties can be assigned via a traits mechanism. For example:
+  * @code
+  * [...]
+- * class classWithAttributes{};
+- * namespace ROOT{
++ * class classWithAttributes {};
++ * namespace ROOT {
+  *    namespace Meta {
+- *       namespace Selection{
++ *       namespace Selection {
+  *          class classWithAttributes : ClassAttributes <kNonSplittable> {};
+  *       }
+  *    }
+@@ -116,9 +115,9 @@ ROOT::Selection::NS::C.
+  * properties can be assigned to a single class with this syntax:
+  * @code
+  * [...]
+- * namespace ROOT{
++ * namespace ROOT {
+  *    namespace Meta {
+- *       namespace Selection{
++ *       namespace Selection {
+  *          class classWithAttributes :
+  *             ClassAttributes <kProperty1 + kProperty2 + ... + kPropertyN> {};
+  *       }
+@@ -126,7 +125,6 @@ ROOT::Selection::NS::C.
+  * }
+  * @endcode
+  *
+- *
+  * The @c ROOT::Meta::Selection syntax allows to alter the number of template
+  * parameters of a certain template class within the ROOT type system, TClass.
+  * Technically it allows to alter the way in which the "normalized name" (in
+@@ -137,23 +135,21 @@ ROOT::Selection::NS::C.
+  * a long explaination in this case:
+  * @code
+  * [...]
+- * template <class T, class U=int, int V=3> class A{...};
+- * template <class T, class Alloc= myAllocator<T> > class myVector{...};
++ * template <class T, class U = int, int V = 3> class A {...};
++ * template <class T, class Alloc = myAllocator<T> > class myVector {...};
+  * A<char> a1;
+- * A<char,float> a2;
++ * A<char, float> a2;
+  * myVector<float> v1;
+  * myVector<A<char>> v2;
+  *
+- * namespace ROOT{
++ * namespace ROOT {
+  *    namespace Meta {
+- *       namespace Selection{
+- *          template <class T, class U=int, int V=3> class A
+- *            :KeepFirstTemplateArguments<1>{};
+- *
+- *          A<double> ;
+- *          template <class T, class Alloc= myAllocator<T> > class myVector
+- *            :KeepFirstTemplateArguments<1>{};
+- *
++ *       namespace Selection {
++ *          template <class T, class U = int, int V = 3> class A
++ *            : KeepFirstTemplateArguments<1> {};
++ *          A<double> a;
++ *          template <class T, class Alloc = myAllocator<T> > class myVector
++ *            : KeepFirstTemplateArguments<1> {};
+  *          myVector<double> vd;
+  *       }
+  *    }
+@@ -165,53 +161,55 @@ ROOT::Selection::NS::C.
+  * will be kept.
+  * In absence of any @c KeepFirstTemplateArguments trait, the normalization
+  * would be:
+- * @c A<char>           &rarr @c A<char,float,3>
+- * @c A<char,float>     &rarr @c A<char,int,3>
+- * @c myVector<float>   &rarr @c myVector<A<char,int,3>,myAllocator<A<char,int,3>>>
+- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
++ * - @c A<char>           &rarr; @c A<char,float,3>
++ * - @c A<char,float>     &rarr; @c A<char,int,3>
++ * - @c myVector<float>   &rarr; @c myVector<A<char,int,3>,myAllocator<A<char,int,3>>>
++ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
+  *
+  * Now, deciding to keep just one argument (@c KeepFirstTemplateArguments<1>):
+- * @c A<char>           &rarr @c A<char,float>
+- * @c A<char,float>     &rarr @c A<char>
+- * @c myVector<float>   &rarr @c myVector<A<char>,myAllocator<A<char>>>
+- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
++ * - @c A<char>           &rarr; @c A<char,float>
++ * - @c A<char,float>     &rarr; @c A<char>
++ * - @c myVector<float>   &rarr; @c myVector<A<char>,myAllocator<A<char>>>
++ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
+  *
+  * And deciding to keep two arguments (@c KeepFirstTemplateArguments<2>):
+- * @c A<char>           &rarr @c A<char,float>
+- * @c A<char,float>     &rarr @c A<char,int>
+- * @c myVector<float>   &rarr @c myVector<A<char,int>,myAllocator<A<char,int>>>
+- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
++ * - @c A<char>           &rarr; @c A<char,float>
++ * - @c A<char,float>     &rarr; @c A<char,int>
++ * - @c myVector<float>   &rarr; @c myVector<A<char,int>,myAllocator<A<char,int>>>
++ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
+  *
+  * A brief description of the properties that can be assigned to data members
+  * with the @c ROOT::Meta::Selection MemberAttributes class:
+- *    1. @c kTransient : the data member is transient, not persistified by the
+- * ROOT I/O.
+- *    2. @c kAutoSelected : the type of the data member is selected without the
+- * need of specifying its class explicitely.
++ * 1. @c kTransient : the data member is transient, not persistified by the
++ *    ROOT I/O.
++ * 2. @c kAutoSelected : the type of the data member is selected without the
++ *    need of specifying its class explicitely.
++ *
+  * For example:
+  * @code
+  * [...]
+- * class classTransientMember{
++ * class classTransientMember {
+  *  private:
+  *    int transientMember;
+  * };
+- * class classAutoselected{};
+- * class classTestAutoselect{
++ * class classAutoselected {};
++ * class classTestAutoselect {
+  *  private:
+  *    classAutoselected autoselected;
+  * };
+  *
+- * namespace ROOT{
++ * namespace ROOT {
+  *    namespace Meta {
+- *       namespace Selection{
+- *          class classTestAutoselect{
++ *       namespace Selection {
++ *          class classTestAutoselect {
+  *             MemberAttributes<kAutoSelected> autoselected;
+  *          };
+-
+-    class classTransientMember{
+-       MemberAttributes<kTransient> transientMember;
+-       };
+- *
++ *          class classTransientMember {
++ *             MemberAttributes<kTransient> transientMember;
++ *          };
++ *       }
++ *    }
++ * }
+  * @endcode
+  * would lead to the creation of selection rules for @c classTransientMember
+  * specifying that @c transientMember is transient, @c classTestAutoselect and
+@@ -229,10 +227,10 @@ ROOT::Selection::NS::C.
+  * template< class T, class BASE >
+  * class MyDataVector : KeepFirstTemplateArguments< 1 >, SelectNoInstance {
+  *     MemberAttributes< kTransient + kAutoSelected > m_isMostDerived;
+- *     MemberAttributes< kNonSplittable+ kAutoSelected > m_isNonSplit;
+- *  };
++ *     MemberAttributes< kNonSplittable + kAutoSelected > m_isNonSplit;
++ * };
+  * [...]
+- *
++ * @endcode
+  **/
+ namespace ROOT {
+ namespace Internal {
+@@ -265,12 +263,9 @@ private:
+    inline bool
+    InSelectionNamespace(const clang::RecordDecl &,
+                         const std::string &str =
+-                           ""); ///< Check if in the ROOT::Selection namespace
++                           ""); ///< Check if in the ROOT::Meta::Selection namespace
+    inline bool FirstPass(const clang::RecordDecl &); ///< First pass on the AST
+-   inline bool SecondPass(const clang::RecordDecl &); ///< Second pass on the
+-   ///AST, using the
+-   ///information of the first
+-   ///one
++   inline bool SecondPass(const clang::RecordDecl &); ///< Second pass on the AST, using the information of the first one
+    inline void
+    ManageFields(const clang::RecordDecl &,
+                 const std::string &,
+@@ -285,8 +280,7 @@ private:
+    inline const clang::TemplateArgumentList *GetTmplArgList(
+       const clang::CXXRecordDecl &); ///< Get the template arguments list if any
+ 
+-   std::string PatternifyName(const std::string &className); ///< Transform instance
+-   ///< name in pattern for selection
++   std::string PatternifyName(const std::string &className); ///< Transform instance name in pattern for selection
+    void GetPointeeType(std::string &typeName); ///< Get name of the pointee type
+ 
+    SelectionRules &fSelectionRules; ///< The selection rules to be filled
+@@ -300,9 +294,9 @@ private:
+    fNoAutoSelectedClassFieldNames; ///< Collect the autoexcluded classes
+    std::unordered_map<std::string, TemplateInfo> fTemplateInfoMap; ///< List template name - properties map
+    llvm::StringMap<ClassSelectionRule>
+-   fClassNameSelectionRuleMap; /// < Map of the already built sel rules
++   fClassNameSelectionRuleMap; ///< Map of the already built sel rules
+    bool fIsFirstPass; ///< Keep trance of the number of passes through the AST
+-   ROOT::TMetaUtils::TNormalizedCtxt &fNormCtxt; /// < The reference to the normalized context
++   ROOT::TMetaUtils::TNormalizedCtxt &fNormCtxt; ///< The reference to the normalized context
+ };
+ }
+ }
+diff --git a/core/foundation/inc/ROOT/TypeTraits.hxx b/core/foundation/inc/ROOT/TypeTraits.hxx
+index 1abf64e73a..ab491c2504 100644
+--- a/core/foundation/inc/ROOT/TypeTraits.hxx
++++ b/core/foundation/inc/ROOT/TypeTraits.hxx
+@@ -155,7 +155,7 @@ template <typename T>
+ using TakeFirstParameter_t = typename TakeFirstParameter<T>::type;
+ 
+ /// Remove first of possibly many template parameters.
+-/// e.g. RemoveFirstParameter_t<U<A,B>> is U<B>
++/// e.g. RemoveFirstParameter_t<U<A,B>> is U\<B\>
+ template <typename>
+ struct RemoveFirstParameter {
+ };
+diff --git a/core/meta/src/TClass.cxx b/core/meta/src/TClass.cxx
+index 4eeec81dc1..f29ab7fd85 100644
+--- a/core/meta/src/TClass.cxx
++++ b/core/meta/src/TClass.cxx
+@@ -6780,7 +6780,7 @@ void TClass::SetDestructor(ROOT::DesFunc_t destructorFunc)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Install a new wrapper around the directory auto add function..
++/// Install a new wrapper around the directory auto add function.
+ /// The function autoAddFunc has the signature void (*)(void *obj, TDirectory dir)
+ /// and should register 'obj' to the directory if dir is not null
+ /// and unregister 'obj' from its current directory if dir is null
+@@ -7120,12 +7120,12 @@ Bool_t ROOT::Internal::HasConsistentHashMember(TClass &clRef)
+ /// (public or not), use
+ /// \code{.cpp}
+ ///     cl->GetProperty() & kClassHasDefaultCtor
+-/// \code
++/// \endcode
+ /// To know if the class described by this TClass has a public default
+ /// constructor use:
+ /// \code{.cpp}
+ ///    gInterpreter->ClassInfo_HasDefaultConstructor(aClass->GetClassInfo());
+-/// \code
++/// \endcode
+ 
+ Bool_t TClass::HasDefaultConstructor(Bool_t testio) const
+ {
+diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
+index db0da13620..279744834a 100644
+--- a/core/metacling/src/TCling.cxx
++++ b/core/metacling/src/TCling.cxx
+@@ -5388,10 +5388,10 @@ int TCling::ReadRootmapFile(const char *rootmapfile, TUniqueString *uniqueString
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Create a resource table and read the (possibly) three resource files, i.e
+-/// $ROOTSYS/etc/system<name> (or ROOTETCDIR/system<name>), $HOME/<name> and
+-/// ./<name>. ROOT always reads ".rootrc" (in TROOT::InitSystem()). You can
+-/// read additional user defined resource files by creating additional TEnv
++/// Create a resource table and read the (possibly) three resource files,
++/// i.e.\ $ROOTSYS/etc/system<name> (or ROOTETCDIR/system<name>), $HOME/<name>
++/// and $PWD/<name>. ROOT always reads ".rootrc" (in TROOT::InitSystem()). You
++/// can read additional user defined resource files by creating additional TEnv
+ /// objects. By setting the shell variable ROOTENV_NO_HOME=1 the reading of
+ /// the $HOME/<name> resource file will be skipped. This might be useful in
+ /// case the home directory resides on an automounted remote file system
+diff --git a/graf2d/x11/src/TGX11.cxx b/graf2d/x11/src/TGX11.cxx
+index 59e5260c92..26f88dd045 100644
+--- a/graf2d/x11/src/TGX11.cxx
++++ b/graf2d/x11/src/TGX11.cxx
+@@ -3599,9 +3599,9 @@ Pixmap_t TGX11::ReadGIF(int x0, int y0, const char *file, Window_t id)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Returns an array of pixels created from a part of drawable (defined by x, y, w, h)
+-/// in format:
+-/// `b1, g1, r1, 0,  b2, g2, r2, 0 ... bn, gn, rn, 0 ..`
++/// Returns an array of pixels created from a part of drawable
++/// (defined by x, y, w, h) in format:
++/// `b1, g1, r1, 0,  b2, g2, r2, 0,  ...,  bn, gn, rn, 0`.
+ ///
+ /// Pixels are numbered from left to right and from top to bottom.
+ /// By default all pixels from the whole drawable are returned.
+diff --git a/gui/guihtml/src/TGHtmlSizer.cxx b/gui/guihtml/src/TGHtmlSizer.cxx
+index c73eb581b5..8e6e71dcf7 100644
+--- a/gui/guihtml/src/TGHtmlSizer.cxx
++++ b/gui/guihtml/src/TGHtmlSizer.cxx
+@@ -60,7 +60,7 @@ SHtmlStyle_t TGHtml::GetCurrentStyle()
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Push a new rendering style onto the stack.
+ ///
+-///  tag   - Tag for this style. Normally the end-tag such as </h3> or </em>.
++///  tag   - Tag for this style. Normally the end-tag such as \</h3\> or \</em\>.
+ ///  style - The style to push
+ 
+ void TGHtml::PushStyleStack(int tag, SHtmlStyle_t style)
+@@ -152,7 +152,7 @@ void TGHtml::MakeInvisible(TGHtmlElement *p_first, TGHtmlElement *p_last)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// For the markup <a href=XXX>, find out if the URL has been visited
++/// For the markup \<a href=XXX\>, find out if the URL has been visited
+ /// before or not.  Return COLOR_Visited or COLOR_Unvisited, as
+ /// appropriate.
+ 
+diff --git a/hist/hist/src/TSVDUnfold.cxx b/hist/hist/src/TSVDUnfold.cxx
+index 85cfa9f241..2b570bdb22 100644
+--- a/hist/hist/src/TSVDUnfold.cxx
++++ b/hist/hist/src/TSVDUnfold.cxx
+@@ -46,13 +46,11 @@
+  The measured distribution can be unfolded for any combination of resolution, efficiency and acceptance effects, provided an appropriate definition of <tt>xini</tt> and <tt>Adet</tt>.<br><br>
+  <p>
+  The unfolding can be performed by
+- <ul>
+- <pre>
++ \code{.cpp}
+  TSVDUnfold *tsvdunf = new TSVDUnfold( bdat, Bcov, bini, xini, Adet );
+  TH1D* unfresult = tsvdunf->Unfold( kreg );
+- </pre>
+- </ul>
+- where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|<\tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
++ \endcode
++ where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|</tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
+  <p>
+  Covariance matrices on the measured spectrum (for either the total uncertainties or individual sources of uncertainties) can be propagated to covariance matrices using the <tt>GetUnfoldCovMatrix</tt> method, which uses pseudo experiments for the propagation. In addition, <tt>GetAdetCovMatrix</tt> allows for the propagation of the statistical uncertainties on the response matrix using pseudo experiments. The covariance matrix corresponding to <tt>Bcov</tt> is also computed as described in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> and can be obtained from <tt>tsvdunf->GetXtau()</tt> and its (regularisation independent) inverse from  <tt>tsvdunf->GetXinv()</tt>. The distribution of singular values can be retrieved using <tt>tsvdunf->GetSV()</tt>.
+  <p>
+diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
+index 0f80505570..20a944a545 100644
+--- a/hist/histpainter/src/THistPainter.cxx
++++ b/hist/histpainter/src/THistPainter.cxx
+@@ -418,7 +418,7 @@ some combinations must be use with care.
+ - It does not work when combined with the `LEGO` and `SURF` options unless the
+   histogram plotted with the option `SAME` has exactly the same
+   ranges on the X, Y and Z axis as the currently drawn histogram. To superimpose
+-  lego plots [histograms' stacks](#HP26) should be used.</li>
++  lego plots [histograms' stacks](#HP26) should be used.
+ 
+ 
+ ### <a name="HP061"></a> Colors automatically picked in palette
+diff --git a/hist/histv7/speed/histspeedtest.cxx b/hist/histv7/speed/histspeedtest.cxx
+index 55c0992bd5..065a10f0d7 100644
+--- a/hist/histv7/speed/histspeedtest.cxx
++++ b/hist/histv7/speed/histspeedtest.cxx
+@@ -35,7 +35,6 @@ and
+  /opt/build/root_builds/rootcling.cmake/include/ROOT/THistBinIter.h:53:50: error: no member named 'GetUncertainty' in
+ 'ROOT::Experimental::THistDataContent<2, double, ROOT::Experimental::THistDataDefaultStorage>::TBinStat<double>' auto
+ GetUncertainty() const { return GetStat().GetUncertainty(); }
+- ~~~~~~~~~ ^
+ 
+  new ones (STATCLASSES)
+ 
+diff --git a/hist/unfold/inc/TUnfold.h b/hist/unfold/inc/TUnfold.h
+index a69da26b4c..ce6e16fb4a 100644
+--- a/hist/unfold/inc/TUnfold.h
++++ b/hist/unfold/inc/TUnfold.h
+@@ -179,15 +179,15 @@ class TUnfold : public TObject {
+    TMatrixD *fX;
+    /// covariance matrix Vxx
+    TMatrixDSparse *fVxx;
+-   /// inverse of covariance matrix Vxx<sup>-1</sub>
++   /// inverse of covariance matrix Vxx<sup>-1</sup>
+    TMatrixDSparse *fVxxInv;
+-   /// inverse of the input covariance matrix Vyy<sup>-1</sub>
++   /// inverse of the input covariance matrix Vyy<sup>-1</sup>
+    TMatrixDSparse *fVyyInv;
+    /// result x folded back A*x
+    TMatrixDSparse *fAx;
+-   /// chi**2 contribution from (y-Ax)Vyy<sup>-1</sub>(y-Ax)
++   /// chi**2 contribution from (y-Ax)Vyy<sup>-1</sup>(y-Ax)
+    Double_t fChi2A;
+-   /// chi**2 contribution from (x-s*x0)<sup>T</sub>L<sup>T</sub>L(x-s*x0)
++   /// chi**2 contribution from (x-s*x0)<sup>T</sup>L<sup>T</sup>L(x-s*x0)
+    Double_t fLXsquared;
+    /// maximum global correlation coefficient
+    Double_t fRhoMax;
+diff --git a/html/src/TDocDirective.cxx b/html/src/TDocDirective.cxx
+index f7ffdc29c3..ab43d1ab38 100644
+--- a/html/src/TDocDirective.cxx
++++ b/html/src/TDocDirective.cxx
+@@ -215,7 +215,7 @@ void TDocHtmlDirective::AddLine(const TSubString& line)
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Set result to the HTML code that was passed in via AddLine().
+-/// Prepend a closing </pre>, append an opening <pre>
++/// Prepend a closing \</pre\>, append an opening \<pre\>
+ 
+ Bool_t TDocHtmlDirective::GetResult(TString& result)
+ {
+diff --git a/math/mathcore/inc/Math/ProbFuncMathCore.h b/math/mathcore/inc/Math/ProbFuncMathCore.h
+index d751c47a36..16e205347c 100644
+--- a/math/mathcore/inc/Math/ProbFuncMathCore.h
++++ b/math/mathcore/inc/Math/ProbFuncMathCore.h
+@@ -41,8 +41,8 @@ namespace Math {
+    * These names are currently kept for backward compatibility, but
+    * their usage is deprecated.
+    *
+-   *  These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
+-   *  including all statistical functions <em>Math/DistFunc.h<em>
++   *  These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
++   *  including all statistical functions <em>Math/DistFunc.h</em>
+    *
+    */
+ 
+@@ -727,8 +727,8 @@ namespace Math {
+    first or the second momentum of the truncated distribution.
+    In the case of the Landau, first and second momentum functions are provided for the Landau
+    distribution truncated only on the right side.
+-   These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
+-   including all statistical functions <em>Math/StatFunc.h<em>
++   These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
++   including all statistical functions <em>Math/StatFunc.h</em>
+ 
+    */
+ 
+diff --git a/math/mathcore/inc/Math/QuantFuncMathCore.h b/math/mathcore/inc/Math/QuantFuncMathCore.h
+index 7da5bd1178..1be023b33f 100644
+--- a/math/mathcore/inc/Math/QuantFuncMathCore.h
++++ b/math/mathcore/inc/Math/QuantFuncMathCore.h
+@@ -41,8 +41,8 @@ namespace Math {
+    *
+    *  \f[ D(x) = \int_{x}^{+\infty} p(x') dx' \f]
+    *
+-   *  These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
+-   *  including all statistical functions <em>Math/DistFunc.h<em>
++   *  These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
++   *  including all statistical functions <em>Math/DistFunc.h</em>
+    *
+    *
+    * <strong>NOTE:</strong> In the old releases (< 5.14) the <em>_quantile</em> functions were called
+diff --git a/math/mathcore/src/TMath.cxx b/math/mathcore/src/TMath.cxx
+index 49a81d56f7..ba8799b570 100644
+--- a/math/mathcore/src/TMath.cxx
++++ b/math/mathcore/src/TMath.cxx
+@@ -857,7 +857,7 @@ Double_t TMath::KolmogorovTest(Int_t na, const Double_t *a, Int_t nb, const Doub
+ /// \f[
+ /// lorentz(xx) = \frac{ \frac{1}{\pi} \frac{lg}{2} }{ (xx^{2} + \frac{lg^{2}}{4}) }
+ /// \f]
+-/// .
++/// \.
+ ///
+ /// The Voigt function is known to be the real part of Faddeeva function also
+ /// called complex error function [2].
+diff --git a/math/mathmore/inc/Math/GSLMultiRootFinder.h b/math/mathmore/inc/Math/GSLMultiRootFinder.h
+index 42069d2387..b7efe4157d 100644
+--- a/math/mathmore/inc/Math/GSLMultiRootFinder.h
++++ b/math/mathmore/inc/Math/GSLMultiRootFinder.h
+@@ -69,23 +69,23 @@ namespace Math {
+      <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Algorithms-using-Derivatives.html">documentation</A> )
+      are the followings:
+      <ul>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridSJ</tt>  with name <it>"HybridSJ"</it>: modified Powell's hybrid
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridSJ</tt>  with name <i>"HybridSJ"</i>: modified Powell's hybrid
+      method as implemented in HYBRJ in MINPACK
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridJ</tt>  with name <it>"HybridJ"</it>: unscaled version of the
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridJ</tt>  with name <i>"HybridJ"</i>: unscaled version of the
+      previous algorithm</li>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kNewton</tt>  with name <it>"Newton"</it>: Newton method </li>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kGNewton</tt>  with name <it>"GNewton"</it>: modified Newton method </li>
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kNewton</tt>  with name <i>"Newton"</i>: Newton method </li>
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kGNewton</tt>  with name <i>"GNewton"</i>: modified Newton method </li>
+      </ul>
+      The algorithms without derivatives (see also the GSL
+      <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Algorithms-without-Derivatives.html">documentation</A> )
+      are the followings:
+      <ul>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridS</tt>  with name <it>"HybridS"</it>: same as HybridSJ but using
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridS</tt>  with name <i>"HybridS"</i>: same as HybridSJ but using
+      finate difference approximation for the derivatives</li>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybrid</tt>  with name <it>"Hybrid"</it>: unscaled version of the
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybrid</tt>  with name <i>"Hybrid"</i>: unscaled version of the
+      previous algorithm</li>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kDNewton</tt>  with name <it>"DNewton"</it>: discrete Newton algorithm </li>
+-         <li><tt>ROOT::Math::GSLMultiRootFinder::kBroyden</tt>  with name <it>"Broyden"</it>: Broyden algorithm </li>
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kDNewton</tt>  with name <i>"DNewton"</i>: discrete Newton algorithm </li>
++         <li><tt>ROOT::Math::GSLMultiRootFinder::kBroyden</tt>  with name <i>"Broyden"</i>: Broyden algorithm </li>
+      </ul>
+ 
+      @ingroup MultiRoot
+diff --git a/math/matrix/doc/Matrix.md b/math/matrix/doc/Matrix.md
+index f53b29ca0b..c484c27c72 100644
+--- a/math/matrix/doc/Matrix.md
++++ b/math/matrix/doc/Matrix.md
+@@ -325,7 +325,7 @@ constructor</td>
+       <td>C=A*B<br>
+ A*=B<br>
+ C.Mult(A,B)<br>TMatrixD(A,TMatrixD::kMult,B)<br>TMatrixD(A, TMatrixD(A, TMatrixD::kTransposeMult,B)<br>TMatrixD(A, TMatrixD::kMultTranspose,B)</td>
+-      <td>overwrites A<br>&nbsp;<br>&nbsp;<br>constructor of A.B<br>constructor of A<sup>T</sup> .B<br>constructor of A.B<sup>T</sup></td>
++      <td>overwrites A<br>&nbsp;<br>&nbsp;<br>constructor of A·B<br>constructor of A<sup>T</sup>·B<br>constructor of A·B<sup>T</sup></td>
+     </tr>
+       <tr>
+       <td>Element wise multiplication</td>
+diff --git a/math/minuit/src/TMinuit.cxx b/math/minuit/src/TMinuit.cxx
+index df3e563a73..18a6437c68 100644
+--- a/math/minuit/src/TMinuit.cxx
++++ b/math/minuit/src/TMinuit.cxx
+@@ -187,11 +187,11 @@ the error matrix, or setting of exact confidence levels see:
+ 
+   1. F.James.
+      Determining the statistical Significance of experimental Results.
+-     Technical Report DD/81/02 and CERN Report 81-03, CERN, 1981.</li>
++     Technical Report DD/81/02 and CERN Report 81-03, CERN, 1981.
+ 
+   2. W.T.Eadie, D.Drijard, F.James, M.Roos, and B.Sadoulet.
+      Statistical Methods in Experimental Physics.
+-     North-Holland, 1971.</li>
++     North-Holland, 1971.
+ 
+ ### Reliability of MINUIT error estimates.
+ 
+diff --git a/montecarlo/eg/src/TDatabasePDG.cxx b/montecarlo/eg/src/TDatabasePDG.cxx
+index 23c32e9668..85e9fe2a6d 100644
+--- a/montecarlo/eg/src/TDatabasePDG.cxx
++++ b/montecarlo/eg/src/TDatabasePDG.cxx
+@@ -46,7 +46,7 @@ Root.DatabasePDG: $(HOME)/my_pdg_table.txt
+ See TParticlePDG for the description of a static particle properties.
+ See TParticle    for the description of a dynamic particle particle.
+ 
+-<br>The current default pdg_table file displays lifetime 0 for some unstable particles.</br>
++The current default pdg_table file displays lifetime 0 for some unstable particles.
+ 
+ */
+ 
+diff --git a/montecarlo/vmc/README.md b/montecarlo/vmc/README.md
+index dc66ec401f..c731b26e92 100644
+--- a/montecarlo/vmc/README.md
++++ b/montecarlo/vmc/README.md
+@@ -43,7 +43,7 @@ See more detailed description in [the dedicated README](README.multiple.md).
+ ## Authors
+ 
+ The concept of Virtual MonteCarlo has been developed by the [ALICE Software Project](http://aliceinfo.cern.ch/Offline/).<br>
+-Authors: R.Brun<sup>1</sup>, F.Carminati<sup>1</sup>, A. Gheata<sup>1</sup>, I.Hrivnacova<sup>2</sup>, A.Morsch<sup>1</sup>, B.Volkel<sup>1</sup>;<br>
++Authors: R. Brun<sup>1</sup>, F. Carminati<sup>1</sup>, A. Gheata<sup>1</sup>, I. Hrivnacova<sup>2</sup>, A. Morsch<sup>1</sup>, B. Volkel<sup>1</sup>;<br>
+ <sup>1</sup>European Organization for Nuclear Research (CERN), Geneva, Switzerland;<br>
+ <sup>2</sup>Institut de Physique Nucléaire dʼOrsay (IPNO), Université Paris-Sud, CNRS-IN2P3, Orsay, France 
+ 
+diff --git a/net/http/civetweb/LICENSE.md b/net/http/civetweb/LICENSE.md
+index ab049e3e72..b6bb8ff037 100644
+--- a/net/http/civetweb/LICENSE.md
++++ b/net/http/civetweb/LICENSE.md
+@@ -180,10 +180,6 @@ Duktape License
+ 
+ https://github.com/svaarala/duktape/blob/master/LICENSE.txt
+ 
+-> ===============
+-> Duktape license
+-> ===============
+-> 
+ > (http://opensource.org/licenses/MIT)
+ > 
+ > Copyright (c) 2013-2017 by Duktape authors (see AUTHORS.rst)
+diff --git a/proof/proof/src/TProofMgr.cxx b/proof/proof/src/TProofMgr.cxx
+index 2a140e4e7a..e41b637a15 100644
+--- a/proof/proof/src/TProofMgr.cxx
++++ b/proof/proof/src/TProofMgr.cxx
+@@ -775,26 +775,29 @@ void TProofMgr::ReplaceSubdirs(const char *fn, TString &fdst, TList &dirph)
+ /// Upload files provided via the list 'src' (as TFileInfo or TObjString)
+ /// to 'mss'. The path under 'mss' is determined by 'dest'; the following
+ /// place-holders can be used in 'dest':
+-///      <d0>, <d1>, <d2>, ...         referring to the n-th sub-component
+-///                                    of the src path
+-///      <bn>                          basename in the source path
+-///      <bs>                          basename sans extension
+-///      <ex>                          Extension
+-///      <sn>                          serial number of file in the list
+-///      <s0>                          as <sn> but zero padded
+-///      <fn>                          the full file path
+-///      <us>, <gr>                    the local user and group names.
+-///      <pg>                          the users PROOF group
+-///      <pa>                          immediate parent directory
+-///      <gp>                          next-to immediate parent directory
++///
++/// Place-holder                | Meaning          |
++/// ----------------------------|------------------------------------
++/// \<d0\>, \<d1\>, \<d2\>, ... | referring to the n-th sub-component of the src path
++/// \<bn\>                      | basename in the source path
++/// \<bs\>                      | basename sans extension
++/// \<ex\>                      | Extension
++/// \<sn\>                      | serial number of file in the list
++/// \<s0\>                      | as \<sn\> but zero padded
++/// \<fn\>                      | the full file path
++/// \<us\>, \<gr\>              | the local user and group names.
++/// \<pg\>                      | the users PROOF group
++/// \<pa\>                      | immediate parent directory
++/// \<gp\>                      | next-to immediate parent directory
++///
+ /// So, for example, if the source filename for the 99-th file is
+ ///               protosrc://host//d0/d1/d2/d3/d4/d5/myfile
+-/// then with dest = '/pool/user/<d3>/<d4>/<d5>/<s>/<bn>' and
++/// then with dest = '/pool/user/\<d3\>/\<d4\>/\<d5\>/\<sn\>/\<bn\>' and
+ ///           mss = 'protodst://hostdst//nm/
+ /// the corresponding destination path is
+ ///           protodst://hostdst//nm/pool/user/d3/d4/d5/99/myfile
+ ///
+-/// If 'dest' is empty, <fn> is used.
++/// If 'dest' is empty, \<fn\> is used.
+ ///
+ /// Returns a TFileCollection with the destination files created; this
+ /// TFileCollection is, for example, ready to be registered as dataset.
+@@ -966,20 +969,23 @@ TFileCollection *TProofMgr::UploadFiles(TList *src,
+ /// line, with line beginning by '#' ignored (i.e. considered comments).
+ /// The path under 'mss' is defined by 'dest'; the following
+ /// place-holders can be used in 'dest':
+-///      <d0>, <d1>, <d2>, ...         referring to the n-th sub-component
+-///                                    of the src path
+-///      <bn>                          basename in the source path
+-///      <sn>                          serial number of file in the list
+-///      <fn>                          the full file path
+-///      <us>, <gr>                    the local user and group names.
++///
++/// Place-holder                | Meaning          |
++/// ----------------------------|------------------------------------
++/// \<d0\>, \<d1\>, \<d2\>, ... | referring to the n-th sub-component of the src path
++/// \<bn\>                      | basename in the source path
++/// \<sn\>                      | serial number of file in the list
++/// \<fn\>                      | the full file path
++/// \<us\>, \<gr\>              | the local user and group names.
++///
+ /// So, for example, if the source filename for the 99-th file is
+ ///               protosrc://host//d0/d1/d2/d3/d4/d5/myfile
+-/// then with dest = '/pool/user/<d3>/<d4>/<d5>/<s>/<bn>' and
++/// then with dest = '/pool/user/\<d3\>/\<d4\>/\<d5\>/\<sn\>/\<bn\>' and
+ ///           mss = 'protodst://hostdst//nm/
+ /// the corresponding destination path is
+ ///           protodst://hostdst//nm/pool/user/d3/d4/d5/99/myfile
+ ///
+-/// If 'dest' is empty, <fn> is used.
++/// If 'dest' is empty, \<fn\> is used.
+ ///
+ /// Returns a TFileCollection with the destination files created; this
+ /// TFileCollection is, for example, ready to be registered as dataset.
+diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx
+index 24c521743d..3697f257a0 100644
+--- a/proof/proof/src/TProofServ.cxx
++++ b/proof/proof/src/TProofServ.cxx
+@@ -6696,11 +6696,11 @@ Int_t TProofServ::Fork()
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Replace <ord>, <user>, <u>, <group>, <stag>, <qnum>, <file>, <rver> and
+-/// <build> placeholders in fname.
+-/// Here, <rver> is the root version in integer form, e.g. 53403, and <build> a
+-/// string includign version, architecture and compiler version, e.g.
+-/// '53403_linuxx8664gcc_gcc46' .
++/// Replace \<ord\>, \<user\>, \<u\>, \<group\>, \<stag\>, \<qnum\>, \<file\>,
++/// \<rver\> and \<build\> placeholders in fname.
++/// Here, \<rver\> is the root version in integer form, e.g. 53403, and
++/// \<build\> a string includign version, architecture and compiler version,
++/// e.g. '53403_linuxx8664gcc_gcc46' .
+ 
+ void TProofServ::ResolveKeywords(TString &fname, const char *path)
+ {
+diff --git a/roofit/histfactory/doc/index.md b/roofit/histfactory/doc/index.md
+index 32f1c551a4..9256a9cf11 100644
+--- a/roofit/histfactory/doc/index.md
++++ b/roofit/histfactory/doc/index.md
+@@ -41,12 +41,11 @@ it is organized as follows (see the examples in `${ROOTSYS}/tutorials/histfactor
+ <li> several 'Measurements' (corresponding to a full fit of the model) each of which specifies</li>
+ <ul>
+ <li> a name for this fit to be used in tables and files</li>
+-<ul>
+-<li>      what is the luminosity associated to the measurement in picobarns</li>
+-<li>      which bins of the histogram should be used</li>
+-<li>      what is the relative uncertainty on the luminosity </li>
+-<li>      what is (are) the parameter(s) of interest that will be measured</li>
+-<li>      which parameters should be fixed/floating (eg. nuisance parameters)</li>
++<li> what is the luminosity associated to the measurement in picobarns</li>
++<li> which bins of the histogram should be used</li>
++<li> what is the relative uncertainty on the luminosity </li>
++<li> what is (are) the parameter(s) of interest that will be measured</li>
++<li> which parameters should be fixed/floating (eg. nuisance parameters)</li>
+ </ul>
+ </ul>
+ </ul>
+diff --git a/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx b/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
+index e14e63ec89..73a3f627ba 100644
+--- a/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
++++ b/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
+@@ -92,12 +92,11 @@ using namespace RooFit;
+   <li> several 'Measurements' (corresponding to a full fit of the model) each of which specifies</li>
+   <ul>
+   <li> a name for this fit to be used in tables and files</li>
+-  <ul>
+-  <li>      what is the luminosity associated to the measurement in picobarns</li>
+-  <li>      which bins of the histogram should be used</li>
+-  <li>      what is the relative uncertainty on the luminosity </li>
+-  <li>      what is (are) the parameter(s) of interest that will be measured</li>
+-  <li>      which parameters should be fixed/floating (eg. nuisance parameters)</li>
++  <li> what is the luminosity associated to the measurement in picobarns</li>
++  <li> which bins of the histogram should be used</li>
++  <li> what is the relative uncertainty on the luminosity </li>
++  <li> what is (are) the parameter(s) of interest that will be measured</li>
++  <li> which parameters should be fixed/floating (eg. nuisance parameters)</li>
+   </ul>
+   </ul>
+   </ul>
+diff --git a/roofit/roofitcore/inc/RooAbsCategory.h b/roofit/roofitcore/inc/RooAbsCategory.h
+index a7eaf8772a..4f0937a99d 100644
+--- a/roofit/roofitcore/inc/RooAbsCategory.h
++++ b/roofit/roofitcore/inc/RooAbsCategory.h
+@@ -199,7 +199,7 @@ protected:
+     return hasIndex(_currentIndex);
+   }
+ 
+-  /// If a category depends on the shape of others, *i.e.*, its state numbers or names depend
++  /// If a category depends on the shape of others, i.e.\ its state numbers or names depend
+   /// on the states of other categories, this function has to be implemented to recompute
+   /// _stateNames and _insertionOrder.
+   /// If one of these two changes, setShapeDirty() has to be called to propagate this information
+diff --git a/roofit/roofitcore/src/RooSimPdfBuilder.cxx b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
+index 4c8289523d..57ea1e9196 100644
+--- a/roofit/roofitcore/src/RooSimPdfBuilder.cxx
++++ b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
+@@ -99,7 +99,7 @@
+ ///    PDF for each state of the C index category.
+ ///  </p>
+ ///  <p>
+-///    In the above example </tt>RooSimPdfBuilder</tt>
++///    In the above example <tt>RooSimPdfBuilder</tt>
+ ///    will first replicate <tt>k</tt> and <tt>s</tt> into
+ ///    <tt>k_C1,k_C2</tt> and <tt>s_C1,s_C2</tt>, as prescribed in the
+ ///    configuration. Then it will recursively replicate all PDF nodes that depend on
+@@ -383,7 +383,7 @@
+ ///    <tt>pdfA(x;p,q)</tt> and <tt>pdfB(x;p,r)</tt> that have a common parameter <tt>p</tt>.
+ ///    We want to build a <tt>RooSimultaneous</tt> for both <tt>pdfA</tt> and <tt>B</tt>,
+ ///    which involves a split of parameter <tt>p</tt> and we would like to build the
+-///    simultaneous pdfs </tt>simA</tt> and <tt>simB</tt> such that still share their (now split) parameters
++///    simultaneous pdfs <tt>simA</tt> and <tt>simB</tt> such that still share their (now split) parameters
+ ///    <tt>p_XXX</tt>. This is accomplished by letting a single instance of <tt>RooSimPdfBuilder</tt> handle
+ ///    the builds of both <tt>pdfA</tt> and <tt>pdfB</tt>, as illustrated in this example:
+ ///  </p>
+diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx
+index eda1b9ca1a..866aad0e18 100644
+--- a/tmva/tmva/src/Factory.cxx
++++ b/tmva/tmva/src/Factory.cxx
+@@ -683,9 +683,9 @@ void TMVA::Factory::WriteDataInformation(DataSetInfo&     fDataSetInfo)
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-/// Iterates through all booked methods and sees if they use parameter tuning and if so..
+-/// does just that  i.e. calls "Method::Train()" for different parameter settings and
+-/// keeps in mind the "optimal one"... and that's the one that will later on be used
++/// Iterates through all booked methods and sees if they use parameter tuning and if so
++/// does just that, i.e.\ calls "Method::Train()" for different parameter settings and
++/// keeps in mind the "optimal one"...\ and that's the one that will later on be used
+ /// in the main training loop.
+ 
+ std::map<TString,Double_t> TMVA::Factory::OptimizeAllMethods(TString fomType, TString fitType)
+diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx
+index 56d65bb9bf..b34ee9f1de 100644
+--- a/tmva/tmva/src/Reader.cxx
++++ b/tmva/tmva/src/Reader.cxx
+@@ -594,7 +594,7 @@ const std::vector< Float_t >& TMVA::Reader::EvaluateRegression( const TString& m
+ ////////////////////////////////////////////////////////////////////////////////
+ /// evaluates the regression MVA
+ /// check for NaN in event data:  (note: in the factory, this check was done already at the creation of the datasets, hence
+-/// it is not again checked in each of these subsequent calls..
++/// it is not again checked in each of these subsequent calls.
+ 
+ const std::vector< Float_t >& TMVA::Reader::EvaluateRegression( MethodBase* method, Double_t /*aux*/ )
+ {
+@@ -660,7 +660,7 @@ const std::vector< Float_t >& TMVA::Reader::EvaluateMulticlass( const TString& m
+ ////////////////////////////////////////////////////////////////////////////////
+ /// evaluates the multiclass MVA
+ /// check for NaN in event data:  (note: in the factory, this check was done already at the creation of the datasets, hence
+-/// it is not again checked in each of these subsequent calls..
++/// it is not again checked in each of these subsequent calls.
+ 
+ const std::vector< Float_t >& TMVA::Reader::EvaluateMulticlass( MethodBase* method, Double_t /*aux*/ )
+ {
+diff --git a/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx b/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
+index 17527ac16d..497dd3d5c6 100644
+--- a/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
++++ b/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
+@@ -93,7 +93,7 @@ class R__CLING_PTRCHECK(off) RColumnValue {
+    /// Enumerator for the different properties of the branch storage in memory
+    enum class EStorageType : char { kContiguous, kUnknown, kSparse };
+    /// Signal whether we ever checked that the branch we are reading with a TTreeReaderArray stores array elements
+-   /// in contiguous memory. Only used when T == RVec<U>.
++   /// in contiguous memory. Only used when T == RVec\<U\>.
+    EStorageType fStorageType = EStorageType::kUnknown;
+    /// If MustUseRVec, i.e. we are reading an array, we return a reference to this RVec to clients
+    RVec<ColumnValue_t> fRVec;
+diff --git a/tutorials/net/udpserver.c b/tutorials/net/udpserver.c
+index c54685400e..a74f6f0a85 100644
+--- a/tutorials/net/udpserver.c
++++ b/tutorials/net/udpserver.c
+@@ -4,7 +4,7 @@
+ 
+ /* Converted to echo client/server with select() (timeout option).
+    See testTUDPSocket.C */
+-/* Compile with: gcc udpserver.c -o udpserver
++/* Compile with: gcc udpserver.c -o udpserver */
+ /* on Windows: cl -nologo -Z7 -MD -GR -EHsc udpserver.c */
+ /* 3/30/05 John Schultz */
+ 
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
+index 47f26368d9..89373a8887 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.C
++++ b/tutorials/tmva/TMVA_CNN_Classification.C
+@@ -22,7 +22,7 @@
+ /// Helper function to create input images data
+ /// we create a signal and background 2D histograms from 2d gaussians
+ /// with a location (means in X and Y)  different for each event
+-/// The difference between signal and background is in the gaussian width..
++/// The difference between signal and background is in the gaussian width.
+ /// The width for the bakground gaussian is slightly larger than the signal width by few % values
+ ///
+ ///
+-- 
+2.26.2
+
diff --git a/root-doxygen-filenames.patch b/root-doxygen-filenames.patch
new file mode 100644
index 0000000..d891a7f
--- /dev/null
+++ b/root-doxygen-filenames.patch
@@ -0,0 +1,378 @@
+From 116be70d2786a3fecdfcd6445d06ad6f3768f5a6 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 3 Jul 2020 08:08:33 +0200
+Subject: [PATCH 1/5] Fix \file references in doxygen markup
+
+---
+ core/base/v7/inc/ROOT/RDirectory.hxx         | 2 +-
+ core/base/v7/inc/ROOT/RDirectoryEntry.hxx    | 2 +-
+ core/base/v7/inc/ROOT/RError.hxx             | 2 +-
+ core/base/v7/inc/ROOT/RIndexIter.hxx         | 2 +-
+ core/base/v7/inc/ROOT/RLogger.hxx            | 2 +-
+ core/base/v7/inc/ROOT/RTupleApply.hxx        | 2 +-
+ core/base/v7/inc/ROOT/impl_tuple_apply.hxx   | 2 +-
+ core/base/v7/src/RLogger.cxx                 | 2 +-
+ core/clingutils/test/TClingUtilsTests.cxx    | 2 +-
+ core/foundation/inc/ROOT/RNotFn.hxx          | 2 +-
+ core/foundation/inc/ROOT/RSpan.hxx           | 2 +-
+ core/foundation/inc/ROOT/span.hxx            | 2 +-
+ core/foundation/src/FoundationUtils.cxx      | 2 +-
+ gui/browsable/inc/ROOT/Browsable/RItem.hxx   | 2 +-
+ gui/browsable/src/RHistDraw7Provider.cxx     | 2 +-
+ gui/browsable/src/RSysFile.cxx               | 2 +-
+ gui/browserv7/inc/ROOT/RBrowserReply.hxx     | 2 +-
+ hist/hist/test/TFormulaGradientTests.cxx     | 2 +-
+ hist/histdrawv7/inc/ROOT/RHistDrawable.hxx   | 2 +-
+ hist/histv7/inc/ROOT/RAxis.hxx               | 2 +-
+ hist/histv7/inc/ROOT/RAxisConfig.hxx         | 2 +-
+ hist/histv7/inc/ROOT/RHist.hxx               | 2 +-
+ hist/histv7/inc/ROOT/RHistBinIter.hxx        | 2 +-
+ hist/histv7/inc/ROOT/RHistBufferedFill.hxx   | 2 +-
+ hist/histv7/inc/ROOT/RHistConcurrentFill.hxx | 2 +-
+ hist/histv7/inc/ROOT/RHistData.hxx           | 2 +-
+ hist/histv7/inc/ROOT/RHistImpl.hxx           | 2 +-
+ hist/histv7/inc/ROOT/RHistUtils.hxx          | 2 +-
+ hist/histv7/inc/ROOT/RHistView.hxx           | 2 +-
+ io/io/v7/inc/ROOT/RFile.hxx                  | 2 +-
+ math/mathcore/test/CladDerivatorTests.cxx    | 2 +-
+ math/mathcore/v7/inc/ROOT/RFit.hxx           | 2 +-
+ tmva/tmva/inc/TMVA/NeuralNet.h               | 2 +-
+ 33 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/core/base/v7/inc/ROOT/RDirectory.hxx b/core/base/v7/inc/ROOT/RDirectory.hxx
+index 5331f91144..6d1a4b0541 100644
+--- a/core/base/v7/inc/ROOT/RDirectory.hxx
++++ b/core/base/v7/inc/ROOT/RDirectory.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RDirectory.h
++/// \file ROOT/RDirectory.hxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff --git a/core/base/v7/inc/ROOT/RDirectoryEntry.hxx b/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
+index a7258bc642..1a33e5003a 100644
+--- a/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
++++ b/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RDirectoryEntry.h
++/// \file ROOT/RDirectoryEntry.hxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff --git a/core/base/v7/inc/ROOT/RError.hxx b/core/base/v7/inc/ROOT/RError.hxx
+index 7a0d363e7f..6af7a38f01 100644
+--- a/core/base/v7/inc/ROOT/RError.hxx
++++ b/core/base/v7/inc/ROOT/RError.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RError.h
++/// \file ROOT/RError.hxx
+ /// \ingroup Base ROOT7
+ /// \author Jakob Blomer <jblomer@cern.ch>
+ /// \date 2019-12-11
+diff --git a/core/base/v7/inc/ROOT/RIndexIter.hxx b/core/base/v7/inc/ROOT/RIndexIter.hxx
+index 1e290d82c8..fc424fdb8d 100644
+--- a/core/base/v7/inc/ROOT/RIndexIter.hxx
++++ b/core/base/v7/inc/ROOT/RIndexIter.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RIndexIter.h
++/// \file ROOT/RIndexIter.hxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2016-01-19
+diff --git a/core/base/v7/inc/ROOT/RLogger.hxx b/core/base/v7/inc/ROOT/RLogger.hxx
+index c1852656ee..d4e3e6e7bd 100644
+--- a/core/base/v7/inc/ROOT/RLogger.hxx
++++ b/core/base/v7/inc/ROOT/RLogger.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/TLogger.h
++/// \file ROOT/RLogger.hxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-29
+diff --git a/core/base/v7/inc/ROOT/RTupleApply.hxx b/core/base/v7/inc/ROOT/RTupleApply.hxx
+index 9a80bfcd6f..995246505f 100644
+--- a/core/base/v7/inc/ROOT/RTupleApply.hxx
++++ b/core/base/v7/inc/ROOT/RTupleApply.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RTupleApply.h
++/// \file ROOT/RTupleApply.hxx
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff --git a/core/base/v7/inc/ROOT/impl_tuple_apply.hxx b/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
+index dc12706906..68d6988f97 100644
+--- a/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
++++ b/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/impl_tuple_apply.h
++/// \file ROOT/impl_tuple_apply.hxx
+ /// \ingroup Base StdExt ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff --git a/core/base/v7/src/RLogger.cxx b/core/base/v7/src/RLogger.cxx
+index 69aba0b05c..3ac8bb760f 100644
+--- a/core/base/v7/src/RLogger.cxx
++++ b/core/base/v7/src/RLogger.cxx
+@@ -1,4 +1,4 @@
+-/// \file TLogger.cxx
++/// \file RLogger.cxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-07
+diff --git a/core/clingutils/test/TClingUtilsTests.cxx b/core/clingutils/test/TClingUtilsTests.cxx
+index fca26705c3..fbc12cd352 100644
+--- a/core/clingutils/test/TClingUtilsTests.cxx
++++ b/core/clingutils/test/TClingUtilsTests.cxx
+@@ -1,4 +1,4 @@
+-/// \file TClingUtilsTest.cxx
++/// \file TClingUtilsTests.cxx
+ ///
+ /// \brief The file contain unit tests which test the TClingUtils.h
+ ///
+diff --git a/core/foundation/inc/ROOT/RNotFn.hxx b/core/foundation/inc/ROOT/RNotFn.hxx
+index a6dd13679e..a3877797f3 100644
+--- a/core/foundation/inc/ROOT/RNotFn.hxx
++++ b/core/foundation/inc/ROOT/RNotFn.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RNotFn.h
++/// \file ROOT/RNotFn.hxx
+ /// \ingroup Base StdExt
+ /// \author Danilo Piparo, Enrico Guiraud
+ /// \date 2018-01-19
+diff --git a/core/foundation/inc/ROOT/RSpan.hxx b/core/foundation/inc/ROOT/RSpan.hxx
+index 9e356493e6..b7366d58e7 100644
+--- a/core/foundation/inc/ROOT/RSpan.hxx
++++ b/core/foundation/inc/ROOT/RSpan.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RSpan.h
++/// \file ROOT/RSpan.hxx
+ /// \ingroup Base StdExt
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff --git a/core/foundation/inc/ROOT/span.hxx b/core/foundation/inc/ROOT/span.hxx
+index ce1b0e1d96..185055bbe6 100644
+--- a/core/foundation/inc/ROOT/span.hxx
++++ b/core/foundation/inc/ROOT/span.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/rhysd_span.h
++/// \file ROOT/span.hxx
+ /// \ingroup Base StdExt
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff --git a/core/foundation/src/FoundationUtils.cxx b/core/foundation/src/FoundationUtils.cxx
+index 9de395698b..d70e196130 100644
+--- a/core/foundation/src/FoundationUtils.cxx
++++ b/core/foundation/src/FoundationUtils.cxx
+@@ -1,4 +1,4 @@
+-/// \file FoundationUtils.hxx
++/// \file FoundationUtils.cxx
+ ///
+ /// \brief The file contains utilities which are foundational and could be used
+ /// across the core component of ROOT.
+diff --git a/gui/browsable/inc/ROOT/Browsable/RItem.hxx b/gui/browsable/inc/ROOT/Browsable/RItem.hxx
+index a07870a2cb..290587013e 100644
+--- a/gui/browsable/inc/ROOT/Browsable/RItem.hxx
++++ b/gui/browsable/inc/ROOT/Browsable/RItem.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RBrowser.hxx
++/// \file ROOT/RItem.hxx
+ /// \ingroup WebGui ROOT7
+ /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
+ /// \author Sergey Linev <S.Linev@gsi.de>
+diff --git a/gui/browsable/src/RHistDraw7Provider.cxx b/gui/browsable/src/RHistDraw7Provider.cxx
+index 416db22472..e2e15303c6 100644
+--- a/gui/browsable/src/RHistDraw7Provider.cxx
++++ b/gui/browsable/src/RHistDraw7Provider.cxx
+@@ -1,4 +1,4 @@
+-/// \file RDrawableRHist.cxx
++/// \file RHistDraw7Provider.cxx
+ /// \ingroup rbrowser
+ /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
+ /// \author Sergey Linev <S.Linev@gsi.de>
+diff --git a/gui/browsable/src/RSysFile.cxx b/gui/browsable/src/RSysFile.cxx
+index d5f481cb83..4447164f52 100644
+--- a/gui/browsable/src/RSysFile.cxx
++++ b/gui/browsable/src/RSysFile.cxx
+@@ -6,7 +6,7 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
+-/// \file ROOT/RFileBrowsable.cxx
++/// \file ROOT/RSysFile.cxx
+ /// \ingroup rbrowser
+ /// \author Sergey Linev <S.Linev@gsi.de>
+ /// \date 2019-10-15
+diff --git a/gui/browserv7/inc/ROOT/RBrowserReply.hxx b/gui/browserv7/inc/ROOT/RBrowserReply.hxx
+index bdb94f60ea..35a2f1f978 100644
+--- a/gui/browserv7/inc/ROOT/RBrowserReply.hxx
++++ b/gui/browserv7/inc/ROOT/RBrowserReply.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RBrowserRequest.hxx
++/// \file ROOT/RBrowserReply.hxx
+ /// \ingroup WebGui ROOT7
+ /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
+ /// \author Sergey Linev <S.Linev@gsi.de>
+diff --git a/hist/hist/test/TFormulaGradientTests.cxx b/hist/hist/test/TFormulaGradientTests.cxx
+index 8c11a56077..74c0930f03 100644
+--- a/hist/hist/test/TFormulaGradientTests.cxx
++++ b/hist/hist/test/TFormulaGradientTests.cxx
+@@ -1,4 +1,4 @@
+-/// \file TFormulaGradientTests.h
++/// \file TFormulaGradientTests.cxx
+ ///
+ /// \brief The file contain unit tests which test the clad-based gradient
+ ///        computations.
+diff --git a/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx b/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
+index ac56b9c8f3..0b3b635d92 100644
+--- a/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
++++ b/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistDrawable.h
++/// \file ROOT/RHistDrawable.hxx
+ /// \ingroup HistDraw ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-09
+diff --git a/hist/histv7/inc/ROOT/RAxis.hxx b/hist/histv7/inc/ROOT/RAxis.hxx
+index 1d35ed9b93..0371a06f97 100644
+--- a/hist/histv7/inc/ROOT/RAxis.hxx
++++ b/hist/histv7/inc/ROOT/RAxis.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RAxis.h
++/// \file ROOT/RAxis.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-23
+diff --git a/hist/histv7/inc/ROOT/RAxisConfig.hxx b/hist/histv7/inc/ROOT/RAxisConfig.hxx
+index 1e100986f0..34bf2f6a4a 100644
+--- a/hist/histv7/inc/ROOT/RAxisConfig.hxx
++++ b/hist/histv7/inc/ROOT/RAxisConfig.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RAxisConfig.h
++/// \file ROOT/RAxisConfig.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2020-02-05
+diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
+index ebb319f1ef..5567683b27 100644
+--- a/hist/histv7/inc/ROOT/RHist.hxx
++++ b/hist/histv7/inc/ROOT/RHist.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHist.h
++/// \file ROOT/RHist.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-23
+diff --git a/hist/histv7/inc/ROOT/RHistBinIter.hxx b/hist/histv7/inc/ROOT/RHistBinIter.hxx
+index 60f57dd20e..ab77dfbeaa 100644
+--- a/hist/histv7/inc/ROOT/RHistBinIter.hxx
++++ b/hist/histv7/inc/ROOT/RHistBinIter.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistBinIter.h
++/// \file ROOT/RHistBinIter.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-08-07
+diff --git a/hist/histv7/inc/ROOT/RHistBufferedFill.hxx b/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
+index bb1cade29b..8efe00e207 100644
+--- a/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
++++ b/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistBufferedFill.h
++/// \file ROOT/RHistBufferedFill.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-03
+diff --git a/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx b/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
+index a6b4b6a8e2..8ff76eb659 100644
+--- a/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
++++ b/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistConcurrentFill.h
++/// \file ROOT/RHistConcurrentFill.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-03
+diff --git a/hist/histv7/inc/ROOT/RHistData.hxx b/hist/histv7/inc/ROOT/RHistData.hxx
+index 901bd5c33a..9757986ff4 100644
+--- a/hist/histv7/inc/ROOT/RHistData.hxx
++++ b/hist/histv7/inc/ROOT/RHistData.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistData.h
++/// \file ROOT/RHistData.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-06-14
+diff --git a/hist/histv7/inc/ROOT/RHistImpl.hxx b/hist/histv7/inc/ROOT/RHistImpl.hxx
+index 483d879f0e..b6d4b2c6b5 100644
+--- a/hist/histv7/inc/ROOT/RHistImpl.hxx
++++ b/hist/histv7/inc/ROOT/RHistImpl.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistImpl.h
++/// \file ROOT/RHistImpl.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-03-23
+diff --git a/hist/histv7/inc/ROOT/RHistUtils.hxx b/hist/histv7/inc/ROOT/RHistUtils.hxx
+index 3733113c2b..08a342bf61 100644
+--- a/hist/histv7/inc/ROOT/RHistUtils.hxx
++++ b/hist/histv7/inc/ROOT/RHistUtils.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistData.h
++/// \file ROOT/RHistUtils.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2016-06-01
+diff --git a/hist/histv7/inc/ROOT/RHistView.hxx b/hist/histv7/inc/ROOT/RHistView.hxx
+index b65d3518dd..d2b40e0f35 100644
+--- a/hist/histv7/inc/ROOT/RHistView.hxx
++++ b/hist/histv7/inc/ROOT/RHistView.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RHistView.h
++/// \file ROOT/RHistView.hxx
+ /// \ingroup Hist ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-08-06
+diff --git a/io/io/v7/inc/ROOT/RFile.hxx b/io/io/v7/inc/ROOT/RFile.hxx
+index 6d3baaec05..c371a25875 100644
+--- a/io/io/v7/inc/ROOT/RFile.hxx
++++ b/io/io/v7/inc/ROOT/RFile.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RFile.h
++/// \file ROOT/RFile.hxx
+ /// \ingroup Base ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-07-31
+diff --git a/math/mathcore/test/CladDerivatorTests.cxx b/math/mathcore/test/CladDerivatorTests.cxx
+index e4289a7286..d1682094e0 100644
+--- a/math/mathcore/test/CladDerivatorTests.cxx
++++ b/math/mathcore/test/CladDerivatorTests.cxx
+@@ -1,4 +1,4 @@
+-/// \file CladDerivator.h
++/// \file CladDerivatorTests.cxx
+ ///
+ /// \brief The file contain unit tests which test the CladDerivator facility.
+ ///
+diff --git a/math/mathcore/v7/inc/ROOT/RFit.hxx b/math/mathcore/v7/inc/ROOT/RFit.hxx
+index 4fae336242..5b92733152 100644
+--- a/math/mathcore/v7/inc/ROOT/RFit.hxx
++++ b/math/mathcore/v7/inc/ROOT/RFit.hxx
+@@ -1,4 +1,4 @@
+-/// \file ROOT/RFit.h
++/// \file ROOT/RFit.hxx
+ /// \ingroup MathCore ROOT7
+ /// \author Axel Naumann <axel@cern.ch>
+ /// \date 2015-09-06
+diff --git a/tmva/tmva/inc/TMVA/NeuralNet.h b/tmva/tmva/inc/TMVA/NeuralNet.h
+index 31229cb1cf..bae98a48b2 100644
+--- a/tmva/tmva/inc/TMVA/NeuralNet.h
++++ b/tmva/tmva/inc/TMVA/NeuralNet.h
+@@ -1,5 +1,5 @@
+ /**
+- * @file NeuralNet
++ * @file TMVA/NeuralNet.h
+  * @author  Peter Speckmayer
+  * @version 1.0
+  *
+-- 
+2.26.2
+
diff --git a/root-doxygen-macro-name.patch b/root-doxygen-macro-name.patch
new file mode 100644
index 0000000..a97bdf0
--- /dev/null
+++ b/root-doxygen-macro-name.patch
@@ -0,0 +1,29 @@
+From 8266262f76eaef4dc72ffda38e1d315be2ce3ff0 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 8 Jul 2020 19:41:34 +0200
+Subject: [PATCH 5/5] Make the name of macro match the filename
+
+Fixes:
+
+warning: Failed to call `rs302_JeffreysPriorDemo()` to execute the macro.
+Add this function or rename the macro. Falling back to `.L`.
+---
+ tutorials/roostats/rs302_JeffreysPriorDemo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tutorials/roostats/rs302_JeffreysPriorDemo.C b/tutorials/roostats/rs302_JeffreysPriorDemo.C
+index c2f720a5f9..1c52e5dd83 100644
+--- a/tutorials/roostats/rs302_JeffreysPriorDemo.C
++++ b/tutorials/roostats/rs302_JeffreysPriorDemo.C
+@@ -49,7 +49,7 @@
+ 
+ using namespace RooFit;
+ 
+-void JeffreysPriorDemo()
++void rs302_JeffreysPriorDemo()
+ {
+    RooWorkspace w("w");
+    w.factory("Uniform::u(x[0,1])");
+-- 
+2.26.2
+
diff --git a/root-doxygen-md-comments.patch b/root-doxygen-md-comments.patch
new file mode 100644
index 0000000..c1f57e2
--- /dev/null
+++ b/root-doxygen-md-comments.patch
@@ -0,0 +1,214 @@
+From 7336caccd3288a9164c82b78053e8f4f59eb1a9c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 12 Jul 2020 12:12:15 +0200
+Subject: [PATCH] Remove /** comments */ from md files
+
+---
+ math/genvector/doc/Genvector.md      | 7 -------
+ math/genvector/doc/LorentzVector.md  | 6 +-----
+ math/genvector/doc/Point3D.md        | 6 ------
+ math/genvector/doc/Transformation.md | 6 ------
+ math/genvector/doc/Vector3D.md       | 4 ----
+ math/genvector/doc/VectorPoint2D.md  | 6 ------
+ math/genvector/doc/externalUsage.md  | 6 ------
+ math/mathcore/doc/MathCore.md        | 5 -----
+ math/mathmore/doc/MathMore.md        | 5 -----
+ math/matrix/doc/Matrix.md            | 3 ---
+ math/unuran/doc/Unuran.md            | 8 ++------
+ 11 files changed, 3 insertions(+), 59 deletions(-)
+
+diff --git a/math/genvector/doc/Genvector.md b/math/genvector/doc/Genvector.md
+index 12e4e47a93..50dc61b2ce 100644
+--- a/math/genvector/doc/Genvector.md
++++ b/math/genvector/doc/Genvector.md
+@@ -1,5 +1,3 @@
+-/**
+-
+   \page Vector  Generic Vector for 2, 3 and 4 Dimensions
+ 
+ 
+@@ -113,8 +111,3 @@ A more detailed description of all the GenVector classes is available in this [d
+ 2.  [CLHEP Geometry package](http://www.hep.phy.cam.ac.uk/lhcb/doc/CLHEP/1.9.1.2/html/namespaceH)
+ 3.  [%ROOT Physics Vector classes](http://root.cern.ch/root/html/PHYSICS_Index.html)
+ 4.  [CMS Vector package](http://lcgapp.cern.ch/doxygen/SEAL/snapshot/html/dir_000007.html)
+-
+-* * *
+-
+-*/
+-
+diff --git a/math/genvector/doc/LorentzVector.md b/math/genvector/doc/LorentzVector.md
+index b40ea8c69c..e01ed4a8ca 100644
+--- a/math/genvector/doc/LorentzVector.md
++++ b/math/genvector/doc/LorentzVector.md
+@@ -1,6 +1,4 @@
+-// LorentzVector doxygen page
+-
+-/** \page LorentzVectorPage LorentzVector Classes
++\page LorentzVectorPage LorentzVector Classes
+ 
+ To avoid exposing templated parameter to the users, typedefs are defined for all types of vectors based an double's and float's. To use them, one must include the header file _Math/Vector4D.h_. The following typedef's, defined in the header file _Math/Vector4Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::LorentzVector:
+ 
+@@ -110,5 +108,3 @@ v.Beta();                                // return beta and gamma value
+ v.Gamma()                                // (vector must be time-like otherwise result is meaningless)
+ XYZVector b = v.BoostToCM()              // return boost vector which will bring the Vector in its mas frame (P=0)
+ </pre>
+-
+-*/
+diff --git a/math/genvector/doc/Point3D.md b/math/genvector/doc/Point3D.md
+index a273b182d4..db55c68752 100644
+--- a/math/genvector/doc/Point3D.md
++++ b/math/genvector/doc/Point3D.md
+@@ -1,7 +1,3 @@
+-// Point3d doxygen page
+-
+-/**
+-
+ \page Point3DPage Point3D Classes
+ 
+ To avoid exposing templated parameter to the users, typedefs are defined for all types of vectors based an double's and float's. To use them, one must include the header file _Math/Point3D.h_. The following typedef's, defined in the header file _Math/Point3Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::PositionVector3D:
+@@ -61,5 +57,3 @@ Exactly as for the 3D Vectors, the following operations are allowed:
+ *   comparison of points
+ *   scaling and division of points with a scalar
+ *   dot and cross product with any type of vector
+-
+-*/
+diff --git a/math/genvector/doc/Transformation.md b/math/genvector/doc/Transformation.md
+index 7e66107f55..edc36778ed 100644
+--- a/math/genvector/doc/Transformation.md
++++ b/math/genvector/doc/Transformation.md
+@@ -1,7 +1,3 @@
+-// Rotation and transformation doxygen page
+-
+-/**
+-
+ \page TransformPage Vector Transformations
+ 
+ Transformations classes are grouped in Rotations (in 3 dimensions), Lorentz transformations and Poincarre transformations, which are Translation/Rotation combinations. Each group has several members which may model physically equivalent trasformations but with different internal representations.   
+@@ -114,5 +110,3 @@ Transform3D t;  t.GetComponens(m);             // fill matrix of size 3x4 with c
+ </pre>
+ 
+ For more detailed documentation on all methods see the reference doc for the specific transformation class.
+-
+-*/
+diff --git a/math/genvector/doc/Vector3D.md b/math/genvector/doc/Vector3D.md
+index 4f65f6b603..9d10ce7db2 100644
+--- a/math/genvector/doc/Vector3D.md
++++ b/math/genvector/doc/Vector3D.md
+@@ -1,5 +1,3 @@
+-/**
+-
+   \page Vector3DPage  Vector3D Classes
+ 
+ 
+@@ -120,5 +118,3 @@ Note that the multiplication between two vectors using the operator * is not sup
+ 
+ <pre>XYZVector u = v1.Unit();               //  return unit vector parallel to v1
+ </pre>
+-
+-*/
+diff --git a/math/genvector/doc/VectorPoint2D.md b/math/genvector/doc/VectorPoint2D.md
+index 5c5e665088..287f3f8b73 100644
+--- a/math/genvector/doc/VectorPoint2D.md
++++ b/math/genvector/doc/VectorPoint2D.md
+@@ -1,7 +1,3 @@
+-// Vector2d doxygen page
+-
+-/**
+-
+ \page Vector2DPage 2D Point and Vector Classes
+ 
+ Similar to the \ref Vector3DPage and \ref Point3DPage , typedefs are defined to avoid exposing templated parameter to the users, for all 2D vectors based an double's and float's. To use them, one must include the header file _Math/Vector2D.h_ or _Math/Point2D.h_. The following typedef's, defined in the header file _Math/Vector2Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::DisplacementVector2D:
+@@ -19,5 +15,3 @@ The typedef's, defined in the header file _Math/Point2Dfwd.h_, available for the
+ *   ROOT::Math::Polar2DPointF vector based on r,phi coordinates (polar) in float precision
+ 
+ Similar constructs, functions and operations available for the 3D vectors and points (see \ref Vector3DPage and \ref Point3DPage ) are available also for the 2D vector and points. No transformations or rotation classes are available for the 2D vectors.
+-
+-*/
+diff --git a/math/genvector/doc/externalUsage.md b/math/genvector/doc/externalUsage.md
+index f8580225a5..4413bbafca 100644
+--- a/math/genvector/doc/externalUsage.md
++++ b/math/genvector/doc/externalUsage.md
+@@ -1,7 +1,3 @@
+-// example on using with exteral classes (doxygen page)
+-
+-/**
+-
+   \page ExtUsagePage Examples with External Packages
+ 
+ ### Connection to Linear Algebra classes
+@@ -48,5 +44,3 @@ XYZPoint p1(hp);                            // create a 3D Point from CLHEP geom
+ 
+ CLHEP::HepLorentzVector  hq;
+ XYZTVector    q(hq);                        // create a LorentzVector  from CLHEP L.V.</double> </pre>
+-
+-*/
+diff --git a/math/mathcore/doc/MathCore.md b/math/mathcore/doc/MathCore.md
+index 4efc043cab..8d38b4ae19 100644
+--- a/math/mathcore/doc/MathCore.md
++++ b/math/mathcore/doc/MathCore.md
+@@ -1,5 +1,3 @@
+-/**
+-
+ \defgroup MathCore  MathCore
+ 
+ \brief The Core Mathematical Library of %ROOT. See the \ref MathCorePage "MathCore" description page.
+@@ -32,6 +30,3 @@ MathCore contains instead now classes which were originally part of _libCore_. T
+ *   Other classes, such as
+ 	*   TKDTree for partitioning the data using a kd-Tree and TKDTreeBinning for binning data using a kdTree
+ 	*   ROOT::Math::GoFTest for goodness of fit tests
+-
+-
+-*/
+diff --git a/math/mathmore/doc/MathMore.md b/math/mathmore/doc/MathMore.md
+index 28b3528a68..f30ef6d0be 100644
+--- a/math/mathmore/doc/MathMore.md
++++ b/math/mathmore/doc/MathMore.md
+@@ -1,6 +1,3 @@
+-
+-/** 
+-
+   \defgroup MathMore  MathMore
+ 
+     \brief The Mathematical library providing some advanced functionality and based on GSL. See the \ref MathMorePage "MathMore" Library page. 
+@@ -32,5 +29,3 @@ To build MathMore you need to have first GSL installed somewhere in your system.
+ MathMore (and its %ROOT CINT dictionary) can be built within %ROOT whenever a GSL library is found in the system. Optionally the GSL library and header file location can be specified in the %ROOT configure script with _configure --with-gsl-incdir=... --with-gsl-libdir=..._
+ MathMore links with the GSL static libraries. On some platform (like Linux x86-64)  GSL needs to be compiled with the option _--with-pic_.
+ The source code of MathMore is distributed under the GNU General Public License
+-
+-*/
+diff --git a/math/matrix/doc/Matrix.md b/math/matrix/doc/Matrix.md
+index ed0d9fffe8..f0b9d7a06a 100644
+--- a/math/matrix/doc/Matrix.md
++++ b/math/matrix/doc/Matrix.md
+@@ -1,6 +1,3 @@
+-/**
+-
+-
+ \page MatrixPage The ROOT Matrix Linear Algebra classes.
+ 
+ 
+diff --git a/math/unuran/doc/Unuran.md b/math/unuran/doc/Unuran.md
+index d807c4e807..4c64e0d214 100644
+--- a/math/unuran/doc/Unuran.md
++++ b/math/unuran/doc/Unuran.md
+@@ -1,9 +1,7 @@
+-/**
+-
+-Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers
+-
+ \defgroup Unuran Unuran
+ 
++\brief Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers.
++
+ \ingroup Math
+ 
+ UNU.RAN, (Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers)
+@@ -120,5 +118,3 @@ TRandom pointer when constructing the TUnuran class (by default the ROOT gRandom
+ 
+ The (UNU.RAN documentation)[http://statistik.wu-wien.ac.at/unuran/doc/unuran.html#Top] provides a detailed
+ description of all the available methods and the possible options which one can pass to UNU.RAN for the various distributions.
+-*/
+-
+-- 
+2.26.2
+
diff --git a/root-doxygen-missing-underscore.patch b/root-doxygen-missing-underscore.patch
new file mode 100644
index 0000000..630d58f
--- /dev/null
+++ b/root-doxygen-missing-underscore.patch
@@ -0,0 +1,25 @@
+From e6e6715a73fb8b65ee24c11ff08ca34e25db9ef1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 8 Jul 2020 19:41:10 +0200
+Subject: [PATCH 4/5] Add missing underscore
+
+---
+ tutorials/fit/vectorizedFit.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tutorials/fit/vectorizedFit.C b/tutorials/fit/vectorizedFit.C
+index d6b13e2fa7..1f6e317aa6 100644
+--- a/tutorials/fit/vectorizedFit.C
++++ b/tutorials/fit/vectorizedFit.C
+@@ -8,7 +8,7 @@
+ /// TF1::SetVectorized
+ ///
+ /// \macro_image
+-/// \macro output
++/// \macro_output
+ /// \macro_code
+ ///
+ /// \author Lorenzo Moneta
+-- 
+2.26.2
+
diff --git a/root-doxygen-parameter-names.patch b/root-doxygen-parameter-names.patch
new file mode 100644
index 0000000..7cc7d2e
--- /dev/null
+++ b/root-doxygen-parameter-names.patch
@@ -0,0 +1,1211 @@
+From e65727913e435819a3fc26513d9892d179eab1f2 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 8 Jul 2020 19:32:51 +0200
+Subject: [PATCH 3/5] Adjust parameter names in doxygen markup so they match
+ the code
+
+Addresses warnings:
+
+argument '<name>' of command @param is not found in the argument list
+of <function>.
+---
+ .../pythonizations/src/PyzPythonHelpers.cxx   |  2 +-
+ bindings/r/inc/TRInterface.h                  |  4 +--
+ hist/hist/src/TF1.cxx                         |  5 ++-
+ hist/hist/src/TGraph.cxx                      |  6 ++--
+ hist/histpainter/src/TPainter3dAlgorithms.cxx |  6 ++--
+ hist/histv7/inc/ROOT/RAxis.hxx                | 11 +++----
+ hist/histv7/inc/ROOT/RHist.hxx                |  2 +-
+ hist/unfold/src/TUnfoldBinning.cxx            | 24 +++++++-------
+ hist/unfold/src/TUnfoldBinningXML.cxx         |  2 +-
+ hist/unfold/src/TUnfoldDensity.cxx            |  2 +-
+ hist/unfold/src/TUnfoldSys.cxx                |  7 ++--
+ io/io/inc/ROOT/TBufferMerger.hxx              |  2 +-
+ math/mathcore/inc/Math/IntegratorMultiDim.h   |  2 +-
+ math/minuit2/inc/Minuit2/FCNBase.h            |  4 +--
+ math/minuit2/inc/Minuit2/FumiliChi2FCN.h      |  2 +-
+ math/minuit2/inc/Minuit2/FumiliErrorUpdator.h |  2 +-
+ .../inc/Minuit2/FumiliMaximumLikelihoodFCN.h  |  2 +-
+ roofit/roofit/src/RooExponential.cxx          |  2 +-
+ roofit/roofit/src/RooGExpModel.cxx            | 32 +++++++++----------
+ roofit/roofit/src/RooGaussian.cxx             |  2 +-
+ roofit/roofit/src/RooJohnson.cxx              |  2 +-
+ roofit/roofit/src/RooLandau.cxx               |  2 +-
+ roofit/roofitcore/src/BatchData.cxx           |  2 +-
+ roofit/roofitcore/src/RooAbsPdf.cxx           |  4 +--
+ roofit/roofitcore/src/RooAbsReal.cxx          |  2 +-
+ roofit/roofitcore/src/RooCustomizer.cxx       |  4 +--
+ roofit/roofitcore/src/RooDataHist.cxx         |  4 +--
+ roofit/roofitcore/src/RooDataSet.cxx          | 10 +++---
+ roofit/roofitcore/src/RooFormulaVar.cxx       |  2 +-
+ roofit/roofitcore/src/RooSuperCategory.cxx    |  2 +-
+ roofit/roofitmore/src/RooHypatia2.cxx         |  6 ++--
+ tmva/tmva/inc/TMVA/BDTEventWrapper.h          |  4 +--
+ tmva/tmva/inc/TMVA/NeuralNet.h                | 14 +++-----
+ tmva/tmva/inc/TMVA/NeuralNet.icc              |  2 +-
+ tmva/tmva/inc/TMVA/RTensor.hxx                |  2 +-
+ .../inc/TMVA/TreeInference/BranchlessTree.hxx |  4 +--
+ tmva/tmva/inc/TMVA/TreeInference/Forest.hxx   |  2 +-
+ tmva/tmva/src/BDTEventWrapper.cxx             |  2 +-
+ tmva/tmva/src/CrossValidation.cxx             |  2 +-
+ tmva/tmva/src/CvSplit.cxx                     | 18 +++++------
+ tmva/tmva/src/Envelope.cxx                    | 12 +++----
+ tree/dataframe/inc/ROOT/RDF/RInterface.hxx    | 16 +++++-----
+ tree/dataframe/inc/ROOT/RDFHelpers.hxx        |  2 +-
+ tree/dataframe/inc/ROOT/RDataSource.hxx       |  8 ++---
+ tree/dataframe/inc/ROOT/RResultPtr.hxx        |  2 +-
+ tree/dataframe/src/RArrowDS.cxx               |  4 +--
+ tree/tree/inc/TTree.h                         |  2 +-
+ tree/tree/src/TIOFeatures.cxx                 | 14 ++++----
+ 48 files changed, 131 insertions(+), 140 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx b/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
+index 059debcee4..c5e354f300 100644
+--- a/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
++++ b/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
+@@ -99,7 +99,7 @@ PyObject *PyROOT::GetDataPointer(PyObject * /*self*/, PyObject *args)
+ /// \brief Get endianess of the system
+ /// \param[in] self Always null, since this is a module function.
+ /// \param[in] args Pointer to an empty Python tuple.
+-/// \param[out] Endianess as Python string
++/// \return Endianess as Python string
+ ///
+ /// This function returns endianess of the system as a Python integer. The
+ /// return value is either '<' or '>' for little or big endian, respectively.
+diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h
+index bdb559bfb5..e097007429 100644
+--- a/bindings/r/inc/TRInterface.h
++++ b/bindings/r/inc/TRInterface.h
+@@ -206,7 +206,7 @@ namespace ROOT {
+          The command line arguments are by deafult argc=0 and argv=NULL,
+          The verbose mode is by default disabled but you can enable it to show procedures information in stdout/stderr         \note some time can produce so much noise in the output
+          \param argc default 0
+-         \param args default null
++         \param argv default null
+          \param loadRcpp default true
+          \param verbose default false
+          \param interactive default true
+@@ -226,7 +226,7 @@ namespace ROOT {
+          /**
+          Method to eval R code and you get the result in a reference to TRObject
+          \param code R code
+-         \param ands reference to TRObject
++         \param ans reference to TRObject
+          \return an true or false if the execution was sucessful or not.
+          */
+          Int_t Eval(const TString &code, TRObject  &ans); // parse line, returns in ans; error code rc
+diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx
+index a72b309c1e..0b7c0b5e45 100644
+--- a/hist/hist/src/TF1.cxx
++++ b/hist/hist/src/TF1.cxx
+@@ -1973,12 +1973,11 @@ Double_t TF1::GetProb() const
+ ///        F(x_{\frac{1}{2}}) = \prod(x < x_{\frac{1}{2}}) = \frac{1}{2}
+ /// \f]
+ ///
+-/// \param[in] this TF1 function
+ /// \param[in] nprobSum maximum size of array q and size of array probSum
++/// \param[out] q array filled with nq quantiles
+ /// \param[in] probSum array of positions where quantiles will be computed.
+ ///     It is assumed to contain at least nprobSum values.
+-/// \param[out] return value nq (<=nprobSum) with the number of quantiles computed
+-/// \param[out] array q filled with nq quantiles
++/// \return value nq (<=nprobSum) with the number of quantiles computed
+ ///
+ ///  Getting quantiles from two histograms and storing results in a TGraph,
+ ///  a so-called QQ-plot
+diff --git a/hist/hist/src/TGraph.cxx b/hist/hist/src/TGraph.cxx
+index b6e05a4a9c..614c63d697 100644
+--- a/hist/hist/src/TGraph.cxx
++++ b/hist/hist/src/TGraph.cxx
+@@ -1900,9 +1900,9 @@ Int_t TGraph::IsInside(Double_t x, Double_t y) const
+ /// Least squares polynomial fitting without weights.
+ ///
+ /// \param [in] m     number of parameters
+-/// \param [in] ma     array of parameters
+-/// \param [in] mfirst 1st point number to fit (default =0)
+-/// \param [in] mlast  last point number to fit (default=fNpoints-1)
++/// \param [in] a     array of parameters
++/// \param [in] xmin  1st point number to fit (default =0)
++/// \param [in] xmax  last point number to fit (default=fNpoints-1)
+ ///
+ /// based on CERNLIB routine LSQ: Translated to C++ by Rene Brun
+ 
+diff --git a/hist/histpainter/src/TPainter3dAlgorithms.cxx b/hist/histpainter/src/TPainter3dAlgorithms.cxx
+index e0dd1f28e4..a95ac36d2d 100644
+--- a/hist/histpainter/src/TPainter3dAlgorithms.cxx
++++ b/hist/histpainter/src/TPainter3dAlgorithms.cxx
+@@ -3122,8 +3122,8 @@ L500:
+ /// Set light source
+ ///
+ /// \param[in] nl   source number: 1 off all light sources, 0 set diffused light
+-/// \param[in] xl   intensity of the light source
+-/// \param[in] xscr   `yscr` `zscr`  direction of the light (in respect of the screen)
++/// \param[in] yl   intensity of the light source
++/// \param[in] xscr, yscr, zscr  direction of the light (in respect of the screen)
+ ///
+ /// \param[out] irep   reply (0 - O.K, -1 error)
+ 
+@@ -4074,7 +4074,7 @@ L500:
+ /// \param[in] qqa   diffusion coefficient for diffused light  [0.,1.]
+ /// \param[in] qqd   diffusion coefficient for direct light    [0.,1.]
+ /// \param[in] qqs   diffusion coefficient for reflected light [0.,1.]
+-/// \param[in] nncs   power coefficient for reflected light     (.GE.1)
++/// \param[in] nnqs   power coefficient for reflected light     (.GE.1)
+ ///
+ ///    Lightness model formula: Y = YD*QA + > YLi*(QD*cosNi+QS*cosRi)
+ ///
+diff --git a/hist/histv7/inc/ROOT/RAxis.hxx b/hist/histv7/inc/ROOT/RAxis.hxx
+index 0371a06f97..52ed88b9d8 100644
+--- a/hist/histv7/inc/ROOT/RAxis.hxx
++++ b/hist/histv7/inc/ROOT/RAxis.hxx
+@@ -68,7 +68,7 @@ protected:
+    /// determine the bin number taking into account how over/underflow
+    /// should be handled.
+    ///
+-   /// \param[out] result status of the bin determination.
++   /// \param[in] rawbin for which to determine the bin number.
+    /// \return Returns the bin number adjusted for potential over- and underflow
+    /// bins. Returns `kInvalidBin` if the axis cannot handle the over- / underflow.
+    ///
+@@ -390,7 +390,7 @@ protected:
+    /// Determine the inverse bin width.
+    /// \param nbinsNoOver - number of bins without unter-/overflow
+    /// \param lowOrHigh - first axis boundary
+-   /// \param lighOrLow - second axis boundary
++   /// \param highOrLow - second axis boundary
+    static double GetInvBinWidth(int nbinsNoOver, double lowOrHigh, double highOrLow)
+    {
+       return nbinsNoOver / std::fabs(highOrLow - lowOrHigh);
+@@ -413,7 +413,7 @@ public:
+ 
+    /// Initialize a RAxisEquidistant.
+    /// \param[in] title - axis title used for graphics and text representation.
+-   /// \param nbins - number of bins in the axis, excluding under- and overflow
++   /// \param nbinsNoOver - number of bins in the axis, excluding under- and overflow
+    ///   bins.
+    /// \param low - the low axis range. Any coordinate below that is considered
+    ///   as underflow. The first bin's lower edge is at this value.
+@@ -427,13 +427,12 @@ public:
+    {}
+ 
+    /// Initialize a RAxisEquidistant.
+-   /// \param nbins - number of bins in the axis, excluding under- and overflow
++   /// \param nbinsNoOver - number of bins in the axis, excluding under- and overflow
+    ///   bins.
+    /// \param low - the low axis range. Any coordinate below that is considered
+    ///   as underflow. The first bin's lower edge is at this value.
+    /// \param high - the high axis range. Any coordinate above that is considered
+    ///   as overflow. The last bin's higher edge is at this value.
+-   /// \param canGrow - whether this axis can extend its range.
+    explicit RAxisEquidistant(int nbinsNoOver, double low, double high) noexcept
+       : RAxisEquidistant("", nbinsNoOver, low, high)
+    {}
+@@ -505,6 +504,7 @@ struct AxisConfigToType<RAxisConfig::kEquidistant> {
+ class RAxisGrow: public RAxisEquidistant {
+ public:
+    /// Initialize a RAxisGrow.
++   /// \param[in] title - axis title used for graphics and text representation.
+    /// \param nbins - number of bins in the axis, excluding under- and overflow
+    ///   bins. This value is fixed over the lifetime of the object.
+    /// \param low - the initial value for the low axis range. Any coordinate
+@@ -518,7 +518,6 @@ public:
+    {}
+ 
+    /// Initialize a RAxisGrow.
+-   /// \param[in] title - axis title used for graphics and text representation.
+    /// \param nbins - number of bins in the axis, excluding under- and overflow
+    ///   bins. This value is fixed over the lifetime of the object.
+    /// \param low - the initial value for the low axis range. Any coordinate
+diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
+index 5567683b27..e2b7649975 100644
+--- a/hist/histv7/inc/ROOT/RHist.hxx
++++ b/hist/histv7/inc/ROOT/RHist.hxx
+@@ -219,9 +219,9 @@ struct RHistImplGen {
+    ///
+    /// Delegate to the appropriate MakeNextAxis instantiation, depending on the
+    /// axis type selected in the RAxisConfig.
++   /// \param title - title of the derived object.
+    /// \param axes - `RAxisConfig` objects describing the axis of the resulting
+    ///   RHistImpl.
+-   /// \param statConfig - the statConfig parameter to be passed to the RHistImpl
+    /// \param processedAxisArgs - the RAxisBase-derived axis objects describing the
+    ///   axes of the resulting RHistImpl. There are `IDIM` of those; in the end
+    /// (`IDIM` == `GetNDim()`), all `axes` have been converted to
+diff --git a/hist/unfold/src/TUnfoldBinning.cxx b/hist/unfold/src/TUnfoldBinning.cxx
+index 3aecbf53c2..2500230dca 100644
+--- a/hist/unfold/src/TUnfoldBinning.cxx
++++ b/hist/unfold/src/TUnfoldBinning.cxx
+@@ -205,7 +205,7 @@ Int_t TUnfoldBinning::UpdateFirstLastBin(Bool_t startWithRootNode)
+ /// Create a new node without axis.
+ ///
+ /// \param[in] name identifier of the node
+-/// \param[in] nBin number of unconnected bins (could be zero)
++/// \param[in] nBins number of unconnected bins (could be zero)
+ /// \param[in] binNames (optional) names of the bins separated by ';'
+ 
+ TUnfoldBinning::TUnfoldBinning
+@@ -241,7 +241,7 @@ TUnfoldBinning::TUnfoldBinning
+ /// Add a new binning node as last last child of this node.
+ ///
+ /// \param[in] name name of the node
+-/// \param[in] nBin number of extra bins
++/// \param[in] nBins number of extra bins
+ /// \param[in] binNames (optional) names of the bins separated by ';'
+ ///
+ /// this is a shortcut for AddBinning(new TUnfoldBinning(name,nBins,binNames))
+@@ -695,11 +695,11 @@ Int_t TUnfoldBinning::GetTH1xNumberOfBins
+ ///
+ /// \param[in] histogramName name of the histogram which is created
+ /// \param[in] originalAxisBinning if true, try to preserve the axis binning
+-/// \param[out] (default=0) binMap mapping of global bins to histogram bins.
++/// \param[out] binMap (default=0) mapping of global bins to histogram bins.
+ /// if(binMap==0), no binMap is created
+-/// \param[in] (default=0) histogramTitle title of the histogram. If zero, a title
++/// \param[in] histogramTitle (default=0) title of the histogram. If zero, a title
+ /// is selected automatically
+-/// \param[in] (default=0) axisSteering steer the handling of underflow/overflow
++/// \param[in] axisSteering (default=0) steer the handling of underflow/overflow
+ /// and projections
+ ///
+ /// returns a new histogram (TH1D, TH2D or TH3D)
+@@ -789,11 +789,11 @@ TH1 *TUnfoldBinning::CreateHistogram
+ ///
+ /// \param[in] histogramName name of the histogram which is created
+ /// \param[in] originalAxisBinning if true, try to preserve the axis binning
+-/// \param[out] (default=0) binMap mapping of global bins to histogram bins.
++/// \param[out] binMap (default=0) mapping of global bins to histogram bins.
+ /// if(binMap==0), no binMap is created
+-/// \param[in] (default=0) histogramTitle title of the histogram. If zero, a title
++/// \param[in] histogramTitle (default=0) title of the histogram. If zero, a title
+ /// is selected automatically
+-/// \param[in] (default=0) axisSteering steer the handling of underflow/overflow
++/// \param[in] axisSteering (default=0) steer the handling of underflow/overflow
+ /// and projections
+ ///
+ /// returns a new TH2D. The options are described in greater detail
+@@ -832,7 +832,7 @@ TH2D *TUnfoldBinning::CreateErrorMatrixHistogram
+ /// Create a TH2D histogram capable to hold the bins of the two
+ /// input binning schemes on the x and y axes, respectively.
+ ///
+-/// \paran[in] xAxis binning scheme for the x axis
++/// \param[in] xAxis binning scheme for the x axis
+ /// \param[in] yAxis binning scheme for the y axis
+ /// \param[in] histogramName name of the histogram which is created
+ /// \param[in] originalXAxisBinning preserve x-axis bin widths if possible
+@@ -1053,8 +1053,8 @@ Int_t *TUnfoldBinning::CreateEmptyBinMap(void) const {
+ /// Set one entry in a bin map.
+ ///
+ /// \param[out] binMap to be used with TUnfoldSys::GetOutput() etc
+-/// \param[in] source bin, global bin number in this binning scheme
+-/// \param[in] destination bin in the output histogram
++/// \param[in] globalBin source bin, global bin number in this binning scheme
++/// \param[in] destBin destination bin in the output histogram
+ 
+ void TUnfoldBinning::SetBinMapEntry
+ (Int_t *binMap,Int_t globalBin,Int_t destBin) const {
+@@ -2075,7 +2075,7 @@ Int_t TUnfoldBinning::ToGlobalBin
+ /// and bin numbers on the corresponding axes.
+ ///
+ /// \param[in] globalBin global bin number
+-/// \param[out] local bin numbers of the distribution's axes
++/// \param[out] axisBins local bin numbers of the distribution's axes
+ ///
+ /// returns the distribution in which the globalBin is located
+ ///  or 0 if the globalBin is outside this node and its children
+diff --git a/hist/unfold/src/TUnfoldBinningXML.cxx b/hist/unfold/src/TUnfoldBinningXML.cxx
+index 28ce408128..a1daf58215 100644
+--- a/hist/unfold/src/TUnfoldBinningXML.cxx
++++ b/hist/unfold/src/TUnfoldBinningXML.cxx
+@@ -472,7 +472,7 @@ void TUnfoldBinningXML::AddAxisXML(TXMLNode *node) {
+ /// Export a binning scheme to a stream in XML format.
+ ///
+ /// \param[in] binning the binning scheme to export
+-/// \param[out] stream to write to
++/// \param[in] out stream to write to
+ /// \param[in] writeHeader set true when writing the first binning
+ /// scheme to this stream
+ /// \param[in] writeFooter  set true when writing the last binning
+diff --git a/hist/unfold/src/TUnfoldDensity.cxx b/hist/unfold/src/TUnfoldDensity.cxx
+index 9b32da0961..78c7ddbf14 100644
+--- a/hist/unfold/src/TUnfoldDensity.cxx
++++ b/hist/unfold/src/TUnfoldDensity.cxx
+@@ -1311,7 +1311,7 @@ const TUnfoldBinning *TUnfoldDensity::GetOutputBinning
+ /// \param[out] scanResult the scanned function wrt log(tau)
+ /// \param[in] mode 1st parameter for the scan function
+ /// \param[in] distribution 2nd parameter for the scan function
+-/// \param[in] projectionMode 3rd parameter for the scan function
++/// \param[in] axisSteering 3rd parameter for the scan function
+ /// \param[out] lCurvePlot for monitoring, shows the L-curve
+ /// \param[out] logTauXPlot for monitoring, L-curve(X) as a function of log(tau)
+ /// \param[out] logTauYPlot for monitoring, L-curve(Y) as a function of log(tau)
+diff --git a/hist/unfold/src/TUnfoldSys.cxx b/hist/unfold/src/TUnfoldSys.cxx
+index 42bbc7751c..1e89445cde 100644
+--- a/hist/unfold/src/TUnfoldSys.cxx
++++ b/hist/unfold/src/TUnfoldSys.cxx
+@@ -463,7 +463,7 @@ Int_t TUnfoldSys::SetInput(const TH1 *hist_y,Double_t scaleBias,
+ /// \param[in] bgr background distribution with uncorrelated errors
+ /// \param[in] name identifier for this background source
+ /// \param[in] scale normalisation factor applied to the background
+-/// \param[in] scaleError normalisation uncertainty
++/// \param[in] scale_error normalisation uncertainty
+ ///
+ /// The contribution <b>scale</b>*<b>bgr</b> is subtracted from the
+ /// measurement prior to unfolding. The following contributions are
+@@ -1045,7 +1045,6 @@ Bool_t TUnfoldSys::GetDeltaSysBackgroundScale
+ /// Correlated one-sigma shifts from shifting tau.
+ ///
+ /// \param[out] hist_delta histogram to store shifts
+-/// \param[in] source  identifier of the background source
+ /// \param[in] binMap (default=0) remapping of histogram bins
+ ///
+ /// returns true if the background source was found.
+@@ -1100,8 +1099,8 @@ void TUnfoldSys::GetEmatrixSysSource
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Covariance contribution from background normalisation uncertainty.
+ ///
+-/// \param[inout] ematrix output histogram
+-/// \param[in] source identifier of the background source
++/// \param[in,out] ematrix output histogram
++/// \param[in] name identifier of the background source
+ /// \param[in] binMap (default=0) remapping of histogram bins
+ /// \param[in] clearEmat (default=true) if true, clear the histogram
+ /// prior to adding the covariance matrix contribution
+diff --git a/io/io/inc/ROOT/TBufferMerger.hxx b/io/io/inc/ROOT/TBufferMerger.hxx
+index 27fe36d399..5e4cfe52cb 100644
+--- a/io/io/inc/ROOT/TBufferMerger.hxx
++++ b/io/io/inc/ROOT/TBufferMerger.hxx
+@@ -43,7 +43,7 @@ public:
+    /** Constructor
+     * @param name Output file name
+     * @param option Output file creation options
+-    * @param compression Output file compression level
++    * @param compress Output file compression level
+     */
+    TBufferMerger(const char *name, Option_t *option = "RECREATE", Int_t compress = ROOT::RCompressionSetting::EDefaults::kUseCompiledDefault);
+ 
+diff --git a/math/mathcore/inc/Math/IntegratorMultiDim.h b/math/mathcore/inc/Math/IntegratorMultiDim.h
+index 0d2d56396e..7b14f96d8e 100644
+--- a/math/mathcore/inc/Math/IntegratorMultiDim.h
++++ b/math/mathcore/inc/Math/IntegratorMultiDim.h
+@@ -60,7 +60,7 @@ public:
+        @param type   integration type (adaptive, MC methods, etc..)
+        @param absTol desired absolute Error
+        @param relTol desired relative Error
+-       @param size maximum number of sub-intervals
++       @param ncall  number of function calls (apply only to MC integratioon methods)
+ 
+        In case no parameter  values are passed the default ones used in IntegratorMultiDimOptions are used
+     */
+diff --git a/math/minuit2/inc/Minuit2/FCNBase.h b/math/minuit2/inc/Minuit2/FCNBase.h
+index bf6c64bd9e..760df5b6f4 100644
+--- a/math/minuit2/inc/Minuit2/FCNBase.h
++++ b/math/minuit2/inc/Minuit2/FCNBase.h
+@@ -65,7 +65,7 @@ public:
+       as it searches for the Minimum or performs whatever analysis is requested by
+       the user.
+ 
+-      @param par function parameters as defined by the user.
++      @param v function parameters as defined by the user.
+ 
+       @return the Value of the function.
+ 
+@@ -75,7 +75,7 @@ public:
+ 
+    */
+ 
+-   virtual double operator()(const std::vector<double>& x) const = 0;
++   virtual double operator()(const std::vector<double>& v) const = 0;
+ 
+ 
+    /**
+diff --git a/math/minuit2/inc/Minuit2/FumiliChi2FCN.h b/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
+index 6af985ef08..fac33baaf6 100644
+--- a/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
++++ b/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
+@@ -62,7 +62,7 @@ public:
+ 
+   Sets the model function for the data (for example gaussian+linear for a peak)
+ 
+-  @param modelFunction a reference to the model function.
++  @param modelFCN a reference to the model function.
+ 
+   */
+ 
+diff --git a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
+index 3eb5da9c36..4b620c57a8 100644
+--- a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
++++ b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
+@@ -67,7 +67,7 @@ public:
+ 
+   @param fGradientCalculator the Gradient calculator used to retrieved the Parameter transformation
+ 
+-  @param fFumiliFCNBase the function calculating the figure of merit.
++  @param lambda the Marquard lambda factor
+ 
+ 
+   \todo Some nice latex mathematical formuli...
+diff --git a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
+index c6725ae350..1661bee94a 100644
+--- a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
++++ b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
+@@ -61,7 +61,7 @@ public:
+ 
+   Sets the model function for the data (for example gaussian+linear for a peak)
+ 
+-  @param modelFunction a reference to the model function.
++  @param modelFCN a reference to the model function.
+ 
+   */
+ 
+diff --git a/roofit/roofit/src/RooExponential.cxx b/roofit/roofit/src/RooExponential.cxx
+index dc211f5275..e16871c5eb 100644
+--- a/roofit/roofit/src/RooExponential.cxx
++++ b/roofit/roofit/src/RooExponential.cxx
+@@ -102,7 +102,7 @@ void compute(size_t n, double* __restrict output, Tx x, Tc c) {
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Evaluate the exponential without normalising it on the given batch.
+-/// \param[in] batchIndex Index of the batch to be computed.
++/// \param[in] begin Index of the batch to be computed.
+ /// \param[in] batchSize Size of each batch. The last batch may be smaller.
+ /// \return A span with the computed values.
+ 
+diff --git a/roofit/roofit/src/RooGExpModel.cxx b/roofit/roofit/src/RooGExpModel.cxx
+index 9c7f184b69..18f5688217 100644
+--- a/roofit/roofit/src/RooGExpModel.cxx
++++ b/roofit/roofit/src/RooGExpModel.cxx
+@@ -48,10 +48,10 @@ ClassImp(RooGExpModel);
+ ///
+ /// \param[in] name Name of this instance.
+ /// \param[in] title Title (e.g. for plotting)
+-/// \param[in] x The convolution observable.
+-/// \param[in] mean The mean of the Gaussian.
+-/// \param[in] sigma Width of the Gaussian.
+-/// \param[in] rlife Lifetime constant \f$ \tau \f$.
++/// \param[in] xIn The convolution observable.
++/// \param[in] meanIn The mean of the Gaussian.
++/// \param[in] sigmaIn Width of the Gaussian.
++/// \param[in] rlifeIn Lifetime constant \f$ \tau \f$.
+ /// \param[in] meanSF  Scale factor for mean.
+ /// \param[in] sigmaSF Scale factor for sigma.
+ /// \param[in] rlifeSF Scale factor for rlife.
+@@ -81,9 +81,9 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
+ ///
+ /// \param[in] name Name of this instance.
+ /// \param[in] title Title (e.g. for plotting)
+-/// \param[in] x The convolution observable.
+-/// \param[in] sigma Width of the Gaussian.
+-/// \param[in] rlife Lifetime constant \f$ \tau \f$.
++/// \param[in] xIn The convolution observable.
++/// \param[in] _sigma Width of the Gaussian.
++/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
+ /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
+ /// \param[in] type  Switch between normal and flipped model.
+ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
+@@ -105,10 +105,10 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
+ ///
+ /// \param[in] name Name of this instance.
+ /// \param[in] title Title (e.g. for plotting)
+-/// \param[in] x The convolution observable.
+-/// \param[in] sigma Width of the Gaussian.
+-/// \param[in] rlife Lifetime constant \f$ \tau \f$.
+-/// \param[in] srSF Scale factor for both sigma and tau.
++/// \param[in] xIn The convolution observable.
++/// \param[in] _sigma Width of the Gaussian.
++/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
++/// \param[in] _rsSF Scale factor for both sigma and tau.
+ /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
+ /// \param[in] type  Switch between normal and flipped model.
+ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
+@@ -134,11 +134,11 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
+ ///
+ /// \param[in] name Name of this instance.
+ /// \param[in] title Title (e.g. for plotting)
+-/// \param[in] x The convolution observable.
+-/// \param[in] sigma Width of the Gaussian.
+-/// \param[in] rlife Lifetime constant \f$ \tau \f$.
+-/// \param[in] sigmaSF Scale factor for sigma.
+-/// \param[in] rlifeSF Scale factor for rlife.
++/// \param[in] xIn The convolution observable.
++/// \param[in] _sigma Width of the Gaussian.
++/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
++/// \param[in] _sigmaSF Scale factor for sigma.
++/// \param[in] _rlifeSF Scale factor for rlife.
+ /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
+ /// \param[in] type  Switch between normal and flipped model.
+ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
+diff --git a/roofit/roofit/src/RooGaussian.cxx b/roofit/roofit/src/RooGaussian.cxx
+index 9d18be7354..aec93528ba 100644
+--- a/roofit/roofit/src/RooGaussian.cxx
++++ b/roofit/roofit/src/RooGaussian.cxx
+@@ -92,7 +92,7 @@ void compute(RooSpan<double> output, Tx x, TMean mean, TSig sigma) {
+ /// and if found, the computation will be batched over their
+ /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
+ /// be constant over the batch.
+-/// \param[in] batchIndex Index of the batch to be computed.
++/// \param[in] begin Index of the batch to be computed.
+ /// \param[in] batchSize Size of each batch. The last batch may be smaller.
+ /// \return A span with the computed values.
+ 
+diff --git a/roofit/roofit/src/RooJohnson.cxx b/roofit/roofit/src/RooJohnson.cxx
+index ba6686f698..1dd6de96b2 100644
+--- a/roofit/roofit/src/RooJohnson.cxx
++++ b/roofit/roofit/src/RooJohnson.cxx
+@@ -153,7 +153,7 @@ void compute(RooSpan<double> output, TMass mass, TMu mu, TLambda lambda, TGamma
+ /// and if found, the computation will be batched over their
+ /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
+ /// be constant over the batch.
+-/// \param[in] batchIndex Index of the batch to be computed.
++/// \param[in] begin Index of the batch to be computed.
+ /// \param[in] maxSize Maximal size of the batches. May return smaller batches depending on inputs.
+ /// \return A span with the computed values.
+ 
+diff --git a/roofit/roofit/src/RooLandau.cxx b/roofit/roofit/src/RooLandau.cxx
+index e59a923cf0..2dade45b3a 100644
+--- a/roofit/roofit/src/RooLandau.cxx
++++ b/roofit/roofit/src/RooLandau.cxx
+@@ -169,7 +169,7 @@ void compute(	size_t batchSize,
+ /// and if found, the computation will be batched over their
+ /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
+ /// be constant over the batch.
+-/// \param[in] batchIndex Index of the batch to be computed.
++/// \param[in] begin Index of the batch to be computed.
+ /// \param[in] batchSize Size of each batch. The last batch may be smaller.
+ /// \return A span with the computed values.
+ 
+diff --git a/roofit/roofitcore/src/BatchData.cxx b/roofit/roofitcore/src/BatchData.cxx
+index fd05343076..5bbe34e20b 100644
+--- a/roofit/roofitcore/src/BatchData.cxx
++++ b/roofit/roofitcore/src/BatchData.cxx
+@@ -73,7 +73,7 @@ bool BatchData::setStatus(std::size_t begin, std::size_t size, Status_t stat,
+ /// Retrieve an existing batch.
+ ///
+ /// \param[in] begin Begin index of the batch.
+-/// \param[in] size  Requested size. Batch may come out smaller than this.
++/// \param[in] maxSize  Requested size. Batch may come out smaller than this.
+ /// \param[in] normSet Optional normSet pointer to distinguish differently normalised computations.
+ /// \param[in] ownerTag Optional owner tag. This avoids reusing batch memory for e.g. getVal() and getLogVal().
+ /// \return Non-mutable contiguous batch data.
+diff --git a/roofit/roofitcore/src/RooAbsPdf.cxx b/roofit/roofitcore/src/RooAbsPdf.cxx
+index 9f68b1cdb7..9e7eb69e09 100644
+--- a/roofit/roofitcore/src/RooAbsPdf.cxx
++++ b/roofit/roofitcore/src/RooAbsPdf.cxx
+@@ -711,7 +711,7 @@ bool checkInfNaNNeg(const T& inputs) {
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Scan through outputs and fix+log all nans and negative values.
+-/// \param[in/out] outputs Array to be scanned & fixed.
++/// \param[in,out] outputs Array to be scanned & fixed.
+ /// \param[in] begin Begin of event range. Only needed to print the correct event number
+ /// where the error occurred.
+ void RooAbsPdf::logBatchComputationErrors(RooSpan<const double>& outputs, std::size_t begin) const {
+@@ -734,7 +734,7 @@ void RooAbsPdf::logBatchComputationErrors(RooSpan<const double>& outputs, std::s
+ /// Compute the log-likelihoods for all events in the requested batch.
+ /// The arguments are passed over to getValBatch().
+ /// \param[in] begin Start of the batch.
+-/// \param[in] size  Maximum size of the batch. Depending on data layout and memory, the batch
++/// \param[in] maxSize  Maximum size of the batch. Depending on data layout and memory, the batch
+ /// may come back smaller.
+ /// \return    Returns a batch of doubles that contains the log probabilities.
+ RooSpan<const double> RooAbsPdf::getLogValBatch(std::size_t begin, std::size_t maxSize,
+diff --git a/roofit/roofitcore/src/RooAbsReal.cxx b/roofit/roofitcore/src/RooAbsReal.cxx
+index 2d2ceeaf2d..6cac5f5897 100644
+--- a/roofit/roofitcore/src/RooAbsReal.cxx
++++ b/roofit/roofitcore/src/RooAbsReal.cxx
+@@ -4294,7 +4294,7 @@ RooAbsMoment* RooAbsReal::moment(RooRealVar& obs, Int_t order, Bool_t central, B
+ /// \param[in] order Order of the moment
+ /// \param[in] central If true, the central moment is given by \f$ \langle (x- \langle x \rangle )^2 \rangle \f$
+ /// \param[in] takeRoot Calculate the square root
+-/// \param[in] intNormOb If true, the moment of the function integrated over all normalization observables is returned.
++/// \param[in] intNormObs If true, the moment of the function integrated over all normalization observables is returned.
+ 
+ RooAbsMoment* RooAbsReal::moment(RooRealVar& obs, const RooArgSet& normObs, Int_t order, Bool_t central, Bool_t takeRoot, Bool_t intNormObs)
+ {
+diff --git a/roofit/roofitcore/src/RooCustomizer.cxx b/roofit/roofitcore/src/RooCustomizer.cxx
+index 97d6d3176c..818991873d 100644
+--- a/roofit/roofitcore/src/RooCustomizer.cxx
++++ b/roofit/roofitcore/src/RooCustomizer.cxx
+@@ -198,7 +198,7 @@ static Int_t init()
+ /// replaceArg() and splitArg() functionality.
+ /// \param[in] pdf Proto PDF to be customised.
+ /// \param[in] masterCat Category to be used for splitting.
+-/// \param[in/out] splitLeafs All nodes created in
++/// \param[in,out] splitLeafs All nodes created in
+ /// the customisation process are added to this set.
+ /// The user can provide nodes that are *taken*
+ /// from the set if they have a name that matches `<parameterNameToBeReplaced>_<category>`.
+@@ -209,7 +209,7 @@ static Int_t init()
+ ///  auto yield1 = new RooFormulaVar("yieldSig_BBG1m2T","sigy1","M/3.360779",mass);
+ ///  customisedLeafs.addOwned(*yield1);
+ /// ```
+-/// \param[in/out] splitLeafsAll All leafs that are used when customising are collected here.
++/// \param[in,out] splitLeafsAll All leafs that are used when customising are collected here.
+ /// If this set already contains leaves, they will be used for customising if the names match
+ /// as above.
+ /// 
+diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
+index 1c8b517b0d..8c90dd0ade 100644
+--- a/roofit/roofitcore/src/RooDataHist.cxx
++++ b/roofit/roofitcore/src/RooDataHist.cxx
+@@ -632,8 +632,8 @@ void RooDataHist::_adjustBinning(RooRealVar &theirVar, const TAxis &axis,
+ /// observable to binning in given reference TH1. Used by constructors
+ /// that import data from an external TH1.
+ /// Both the variables in vars and in this RooDataHist are adjusted.
+-/// @param List with variables that are supposed to have their binning adjusted.
+-/// @param Reference histogram that dictates the binning
++/// @param vars List with variables that are supposed to have their binning adjusted.
++/// @param href Reference histogram that dictates the binning
+ /// @param offset If not nullptr, a possible bin count offset for the axes x,y,z is saved here as Int_t[3]
+ 
+ void RooDataHist::adjustBinning(const RooArgList& vars, const TH1& href, Int_t* offset)
+diff --git a/roofit/roofitcore/src/RooDataSet.cxx b/roofit/roofitcore/src/RooDataSet.cxx
+index 1e54dfbde0..f03ec78a0d 100644
+--- a/roofit/roofitcore/src/RooDataSet.cxx
++++ b/roofit/roofitcore/src/RooDataSet.cxx
+@@ -765,7 +765,7 @@ RooDataSet::RooDataSet(const char *name, const char *title, TTree *theTree,
+ ///
+ /// \param[in] name Name of this dataset.
+ /// \param[in] title Title for e.g. plotting.
+-/// \param[in] tree Tree to be imported.
++/// \param[in] theTree Tree to be imported.
+ /// \param[in] vars Defines the columns of the data set. For each dimension
+ /// specified, the TTree must have a branch with the same name. For category
+ /// branches, this branch should contain the numeric index value. Real dimensions
+@@ -1205,11 +1205,11 @@ void RooDataSet::add(const RooArgSet& data, Double_t wgt, Double_t wgtError)
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Add a data point, with its coordinates specified in the 'data' argset, to the data set. 
+ /// Any variables present in 'data' but not in the dataset will be silently ignored.
+-/// \param[in] data Data point.
+-/// \param[in] wgt Event weight. The current value of the weight variable is ignored.
++/// \param[in] indata Data point.
++/// \param[in] inweight Event weight. The current value of the weight variable is ignored.
+ /// \note To obtain weighted events, a variable must be designated `WeightVar` in the constructor.
+-/// \param[in] wgtErrorLo Asymmetric weight error.
+-/// \param[in] wgtErrorHi Asymmetric weight error.
++/// \param[in] weightErrorLo Asymmetric weight error.
++/// \param[in] weightErrorHi Asymmetric weight error.
+ /// \note This requires including the weight variable in the set of `StoreAsymError` variables when constructing
+ /// the dataset.
+ 
+diff --git a/roofit/roofitcore/src/RooFormulaVar.cxx b/roofit/roofitcore/src/RooFormulaVar.cxx
+index 90ee32d619..947c505598 100644
+--- a/roofit/roofitcore/src/RooFormulaVar.cxx
++++ b/roofit/roofitcore/src/RooFormulaVar.cxx
+@@ -66,7 +66,7 @@ ClassImp(RooFormulaVar);
+ /// Constructor with formula expression and list of input variables.
+ /// \param[in] name Name of the formula.
+ /// \param[in] title Title of the formula.
+-/// \param[in] formula Expression to be evaluated.
++/// \param[in] inFormula Expression to be evaluated.
+ /// \param[in] dependents Variables that should be passed to the formula.
+ /// \param[in] checkVariables Check that all variables from `dependents` are used in the expression.
+ RooFormulaVar::RooFormulaVar(const char *name, const char *title, const char* inFormula, const RooArgList& dependents,
+diff --git a/roofit/roofitcore/src/RooSuperCategory.cxx b/roofit/roofitcore/src/RooSuperCategory.cxx
+index 4c0b705e50..e5668ffb98 100644
+--- a/roofit/roofitcore/src/RooSuperCategory.cxx
++++ b/roofit/roofitcore/src/RooSuperCategory.cxx
+@@ -54,7 +54,7 @@ RooSuperCategory::RooSuperCategory() :
+ /// Construct a super category from other categories.
+ /// \param[in] name Name of this object
+ /// \param[in] title Title (for e.g. printing)
+-/// \param[in] inputCatList RooArgSet with category objects. These all need to derive from RooAbsCategoryLValue, *i.e.*
++/// \param[in] inputCategories RooArgSet with category objects. These all need to derive from RooAbsCategoryLValue, *i.e.*
+ /// one needs to be able to assign to them.
+ RooSuperCategory::RooSuperCategory(const char *name, const char *title, const RooArgSet& inputCategories) :
+   RooAbsCategoryLValue(name, title),
+diff --git a/roofit/roofitmore/src/RooHypatia2.cxx b/roofit/roofitmore/src/RooHypatia2.cxx
+index 691aa6073d..7d550b2753 100644
+--- a/roofit/roofitmore/src/RooHypatia2.cxx
++++ b/roofit/roofitmore/src/RooHypatia2.cxx
+@@ -119,21 +119,21 @@
+ /// \param[in] a2 Start of right tail.
+ /// \param[in] n2 Shape parameter of right tail (\f$ n2 \ge 0 \f$). With \f$ n2 = 0 \f$, the function is constant.
+ RooHypatia2::RooHypatia2(const char *name, const char *title, RooAbsReal& x, RooAbsReal& lambda,
+-    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigm, RooAbsReal& mu, RooAbsReal& a,
++    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigma, RooAbsReal& mu, RooAbsReal& a,
+     RooAbsReal& n, RooAbsReal& a2, RooAbsReal& n2) :
+                 RooAbsPdf(name, title),
+                 _x("x", "x", this, x),
+                 _lambda("lambda", "Lambda", this, lambda),
+                 _zeta("zeta", "zeta", this, zeta),
+                 _beta("beta", "Asymmetry parameter beta", this, beta),
+-                _sigma("sigma", "Width parameter sigma", this, sigm),
++                _sigma("sigma", "Width parameter sigma", this, sigma),
+                 _mu("mu", "Location parameter mu", this, mu),
+                 _a("a", "Left tail location a", this, a),
+                 _n("n", "Left tail parameter n", this, n),
+                 _a2("a2", "Right tail location a2", this, a2),
+                 _n2("n2", "Right tail parameter n2", this, n2)
+ {
+-  RooHelpers::checkRangeOfParameters(this, {&sigm}, 0.);
++  RooHelpers::checkRangeOfParameters(this, {&sigma}, 0.);
+   RooHelpers::checkRangeOfParameters(this, {&zeta, &n, &n2, &a, &a2}, 0., std::numeric_limits<double>::max(), true);
+   if (zeta.getVal() == 0. && zeta.isConstant()) {
+     RooHelpers::checkRangeOfParameters(this, {&lambda}, -std::numeric_limits<double>::max(), 0., false,
+diff --git a/tmva/tmva/inc/TMVA/BDTEventWrapper.h b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
+index 7d4c4f8dd6..2c99341dd9 100644
+--- a/tmva/tmva/inc/TMVA/BDTEventWrapper.h
++++ b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
+@@ -40,14 +40,14 @@ namespace TMVA {
+ 
+       // Set the accumulated weight, for sorted signal/background events
+       /**
+-       * @param fType - true for signal, false for background
++       * @param type - true for signal, false for background
+        * @param weight - the total weight
+        */
+       void SetCumulativeWeight( Bool_t type, Double_t weight );
+ 
+       // Get the accumulated weight
+       /**
+-       * @param fType - true for signal, false for background
++       * @param type - true for signal, false for background
+        * @return the cumulative weight for sorted signal/background events
+        */
+       Double_t GetCumulativeWeight( Bool_t type ) const;
+diff --git a/tmva/tmva/inc/TMVA/NeuralNet.h b/tmva/tmva/inc/TMVA/NeuralNet.h
+index bae98a48b2..a11b543b59 100644
+--- a/tmva/tmva/inc/TMVA/NeuralNet.h
++++ b/tmva/tmva/inc/TMVA/NeuralNet.h
+@@ -478,10 +478,8 @@ namespace TMVA
+           * \param size size of the layer
+           * \param itWeightBegin indicates the start of the weights for this layer on the weight vector
+           * \param itGradientBegin indicates the start of the gradients for this layer on the gradient vector
+-          * \param itFunctionBegin indicates the start of the vector of activation functions for this layer on the 
+-          *                        activation function vector
+-          * \param itInverseFunctionBegin indicates the start of the vector of activation functions for this 
+-          *                               layer on the activation function vector
++          * \param activationFunction indicates activation functions for this layer
++          * \param inverseActivationFunction indicates the inverse activation functions for this layer
+           * \param eModeOutput indicates a potential tranformation of the output values before further computation
+           *                    DIRECT does not further transformation; SIGMOID applies a sigmoid transformation to each
+           *                    output value (to create a probability); SOFTMAX applies a softmax transformation to all 
+@@ -500,8 +498,7 @@ namespace TMVA
+           * 
+           * \param size size of the layer
+           * \param itWeightBegin indicates the start of the weights for this layer on the weight vector
+-          * \param itFunctionBegin indicates the start of the vector of activation functions for this layer on the 
+-          *                        activation function vector
++          * \param activationFunction indicates the activation function for this layer
+           * \param eModeOutput indicates a potential tranformation of the output values before further computation
+           *                    DIRECT does not further transformation; SIGMOID applies a sigmoid transformation to each
+           *                    output value (to create a probability); SOFTMAX applies a softmax transformation to all 
+@@ -679,9 +676,6 @@ namespace TMVA
+          /*! \brief c'tor for defining a Layer
+           *
+           * 
+-          * \param itInputBegin indicates the start of the input node vector
+-          * \param itInputEnd indicates the end of the input node vector
+-          *
+           */
+          Layer (size_t numNodes, EnumFunction activationFunction, ModeOutputValues eModeOutputValues = ModeOutputValues::DIRECT);
+ 
+@@ -1141,7 +1135,7 @@ namespace TMVA
+     
+          /*! \brief executes one training cycle
+           *
+-          * \param minimizier the minimizer to be used
++          * \param minimizer the minimizer to be used
+           * \param weights the weight vector to be used
+           * \param itPatternBegin the pattern to be trained with
+           * \param itPatternEnd the pattern to be trainied with
+diff --git a/tmva/tmva/inc/TMVA/NeuralNet.icc b/tmva/tmva/inc/TMVA/NeuralNet.icc
+index 95cad21e26..e511e49d43 100644
+--- a/tmva/tmva/inc/TMVA/NeuralNet.icc
++++ b/tmva/tmva/inc/TMVA/NeuralNet.icc
+@@ -933,7 +933,7 @@ template <typename LAYERDATA>
+  * \param minimizer the minimizer to be used (e.g. SGD)
+  * \param weights the weight container with all the synapse weights
+  * \param itPatternBegin begin of the pattern container
+- * \parama itPatternEnd the end of the pattern container
++ * \param itPatternEnd the end of the pattern container
+  * \param settings the settings for this training (e.g. multithreading or not, regularization, etc.)
+  * \param dropContainer the data for dropping-out nodes (regularization technique)
+  */
+diff --git a/tmva/tmva/inc/TMVA/RTensor.hxx b/tmva/tmva/inc/TMVA/RTensor.hxx
+index c131384ae2..7d9773b457 100644
+--- a/tmva/tmva/inc/TMVA/RTensor.hxx
++++ b/tmva/tmva/inc/TMVA/RTensor.hxx
+@@ -73,7 +73,7 @@ inline std::vector<std::size_t> ComputeStridesFromShape(const T &shape, MemoryLa
+ }
+ 
+ /// \brief Compute indices from global index
+-/// \param[in] Shape vector
++/// \param[in] shape Shape vector
+ /// \param[in] idx Global index
+ /// \param[in] layout Memory layout
+ /// \return Indice vector
+diff --git a/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx b/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
+index 4ac460be64..a1c6fdf773 100644
+--- a/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
++++ b/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
+@@ -72,7 +72,7 @@ struct BranchlessTree {
+ /// Perform inference on a single input vector
+ /// \param[in] input Pointer to data containing the input values
+ /// \param[in] stride Stride to go from one input variable to the next one
+-/// \param[out] Tree score, result of the inference
++/// \return Tree score, result of the inference
+ template <typename T>
+ inline T BranchlessTree<T>::Inference(const T *input, const int stride)
+ {
+@@ -105,7 +105,7 @@ inline void BranchlessTree<T>::FillSparse()
+ ///
+ /// \param[in] funcName Name of the function
+ /// \param[in] typeName Name of the type used for the computation
+-/// \param[out] Code of the inference function as string
++/// \return Code of the inference function as string
+ template <typename T>
+ inline std::string BranchlessTree<T>::GetInferenceCode(const std::string& funcName, const std::string& typeName)
+ {
+diff --git a/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx b/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
+index 70d1e3eb68..18b385a8e0 100644
+--- a/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
++++ b/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
+@@ -195,7 +195,7 @@ struct BranchlessJittedForest : public ForestBase<T, std::function<void (const T
+ /// \param[in] filename Filename of the ROOT file
+ /// \param[in] output Load trees corresponding to the given output node of the forest
+ /// \param[in] sortTrees Flag to indicate sorting the input trees by the cut value of the first node of each tree
+-/// \param[out] Return jitted code as string
++/// \return Return jitted code as string
+ template <typename T>
+ inline std::string
+ BranchlessJittedForest<T>::Load(const std::string &key, const std::string &filename, const int output, const bool sortTrees)
+diff --git a/tmva/tmva/src/BDTEventWrapper.cxx b/tmva/tmva/src/BDTEventWrapper.cxx
+index 63171c886b..9702660936 100644
+--- a/tmva/tmva/src/BDTEventWrapper.cxx
++++ b/tmva/tmva/src/BDTEventWrapper.cxx
+@@ -48,7 +48,7 @@ BDTEventWrapper::~BDTEventWrapper() {
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Set the accumulated weight, for sorted signal/background events
+ ///
+-/// @param fType - true for signal, false for background
++/// @param type - true for signal, false for background
+ /// @param weight - the total weight
+ 
+ void BDTEventWrapper::SetCumulativeWeight(Bool_t type, Double_t weight) {
+diff --git a/tmva/tmva/src/CrossValidation.cxx b/tmva/tmva/src/CrossValidation.cxx
+index 453927c5b7..58bd9130d1 100644
+--- a/tmva/tmva/src/CrossValidation.cxx
++++ b/tmva/tmva/src/CrossValidation.cxx
+@@ -99,7 +99,7 @@ TMultiGraph *TMVA::CrossValidationResult::GetROCCurves(Bool_t /*fLegend*/)
+ ///
+ /// \note You own the returned pointer.
+ ///
+-/// \param numSamples[in] Number of samples used for generating the average ROC
++/// \param[in] numSamples Number of samples used for generating the average ROC
+ ///                       Curve. Avg. curve will be evaluated only at these
+ ///                       points (using interpolation if necessary).
+ ///
+diff --git a/tmva/tmva/src/CvSplit.cxx b/tmva/tmva/src/CvSplit.cxx
+index d6d44ac1cc..9eedcf3d72 100644
+--- a/tmva/tmva/src/CvSplit.cxx
++++ b/tmva/tmva/src/CvSplit.cxx
+@@ -227,15 +227,15 @@ UInt_t TMVA::CvSplitKFoldsExpr::GetSpectatorIndexForName(DataSetInfo &dsi, TStri
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// \brief Splits a dataset into k folds, ready for use in cross validation.
+-/// \param numFolds[in] Number of folds to split data into
+-/// \param stratified[in] If true, use stratified splitting, balancing the
++/// \param[in] numFolds Number of folds to split data into
++/// \param[in] stratified If true, use stratified splitting, balancing the
+ ///                       number of events across classes and folds. If false,
+ ///                       no such balancing is done. For
+-/// \param splitExpr[in] Expression used to split data into folds. If `""` a
++/// \param[in] splitExpr Expression used to split data into folds. If `""` a
+ ///                      random assignment will be done. Otherwise the
+ ///                      expression is fed into a TFormula and evaluated per
+ ///                      event. The resulting value is the the fold assignment.
+-/// \param seed[in] Used only when using random splitting (i.e. when
++/// \param[in] seed Used only when using random splitting (i.e. when
+ ///                 `splitExpr` is `""`). Seed is used to initialise the random
+ ///                 number generator when assigning events to folds.
+ ///
+@@ -282,9 +282,9 @@ void TMVA::CvSplitKFolds::MakeKFoldDataSet(DataSetInfo &dsi)
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// \brief Generates a vector of fold assignments
+-/// \param nEntires[in] Number of events in range
+-/// \param numFolds[in] Number of folds to split data into
+-/// \param seed[in] Random seed
++/// \param[in] nEntries Number of events in range
++/// \param[in] numFolds Number of folds to split data into
++/// \param[in] seed Random seed
+ ///
+ /// Randomly assigns events to `numFolds` folds. Each fold will hold at most
+ /// `nEntries / numFolds + 1` events.
+@@ -311,8 +311,8 @@ std::vector<UInt_t> TMVA::CvSplitKFolds::GetEventIndexToFoldMapping(UInt_t nEntr
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ /// \brief Split sets for into k-folds
+-/// \param oldSet[in] Original, unsplit, events
+-/// \param numFolds[in] Number of folds to split data into
++/// \param[in] oldSet Original, unsplit, events
++/// \param[in] numFolds Number of folds to split data into
+ ///
+ 
+ std::vector<std::vector<TMVA::Event *>>
+diff --git a/tmva/tmva/src/Envelope.cxx b/tmva/tmva/src/Envelope.cxx
+index 5fab98c13b..8a0c6b23f4 100644
+--- a/tmva/tmva/src/Envelope.cxx
++++ b/tmva/tmva/src/Envelope.cxx
+@@ -37,8 +37,8 @@ this is a generic one protected.
+ \param file optional file to save the results.
+ \param options extra options for the algorithm.
+ */
+-Envelope::Envelope(const TString &name, DataLoader *dalaloader, TFile *file, const TString options)
+-   : Configurable(options), fDataLoader(dalaloader), fFile(file), fModelPersistence(kTRUE), fVerbose(kFALSE),
++Envelope::Envelope(const TString &name, DataLoader *dataloader, TFile *file, const TString options)
++   : Configurable(options), fDataLoader(dataloader), fFile(file), fModelPersistence(kTRUE), fVerbose(kFALSE),
+      fTransformations("I"), fSilentFile(kFALSE), fJobs(1)
+ {
+     SetName(name.Data());
+@@ -120,7 +120,7 @@ DataLoader *Envelope::GetDataLoader(){    return fDataLoader.get();}
+ //_______________________________________________________________________
+ /**
+ Method to set the pointer to TMVA::DataLoader object.
+-\param dalaloader pointer to TMVA::DataLoader object.
++\param dataloader pointer to TMVA::DataLoader object.
+ */
+ 
+ void Envelope::SetDataLoader(DataLoader *dataloader)
+@@ -146,7 +146,7 @@ void TMVA::Envelope::SetModelPersistence(Bool_t status){fModelPersistence=status
+ /**
+ Method to book the machine learning method to perform the algorithm.
+ \param method enum TMVA::Types::EMVA with the type of the mva method
+-\param methodtitle String with the method title.
++\param methodTitle String with the method title.
+ \param options String with the options for the method.
+ */
+ void TMVA::Envelope::BookMethod(Types::EMVA method, TString methodTitle, TString options){
+@@ -156,8 +156,8 @@ void TMVA::Envelope::BookMethod(Types::EMVA method, TString methodTitle, TString
+ //_______________________________________________________________________
+ /**
+ Method to book the machine learning method to perform the algorithm.
+-\param methodname String with the name of the mva method
+-\param methodtitle String with the method title.
++\param methodName String with the name of the mva method
++\param methodTitle String with the method title.
+ \param options String with the options for the method.
+ */
+ void TMVA::Envelope::BookMethod(TString methodName, TString methodTitle, TString options){
+diff --git a/tree/dataframe/inc/ROOT/RDF/RInterface.hxx b/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
+index b5e39251a8..da09c0be3c 100644
+--- a/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
++++ b/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
+@@ -568,7 +568,7 @@ public:
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief Save selected columns in memory
+    /// \tparam ColumnTypes variadic list of branch/column types.
+-   /// \param[in] columns to be cached in memory.
++   /// \param[in] columnList columns to be cached in memory.
+    /// \return a `RDataFrame` that wraps the cached dataset.
+    ///
+    /// This action returns a new `RDataFrame` object, completely detached from
+@@ -603,7 +603,7 @@ public:
+ 
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief Save selected columns in memory
+-   /// \param[in] columns to be cached in memory
++   /// \param[in] columnList columns to be cached in memory
+    /// \return a `RDataFrame` that wraps the cached dataset.
+    ///
+    /// See the previous overloads for more information.
+@@ -660,7 +660,7 @@ public:
+ 
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief Save selected columns in memory
+-   /// \param[in] columns to be cached in memory.
++   /// \param[in] columnList columns to be cached in memory.
+    /// \return a `RDataFrame` that wraps the cached dataset.
+    ///
+    /// See the previous overloads for more information.
+@@ -1528,13 +1528,13 @@ public:
+    /// ~~~
+    ///
+    template <typename T>
+-   RResultPtr<T> Fill(T &&model, const ColumnNames_t &bl)
++   RResultPtr<T> Fill(T &&model, const ColumnNames_t &columnList)
+    {
+       auto h = std::make_shared<T>(std::forward<T>(model));
+       if (!RDFInternal::HistoUtils<T>::HasAxisLimits(*h)) {
+          throw std::runtime_error("The absence of axes limits is not supported yet.");
+       }
+-      return CreateAction<RDFInternal::ActionTags::Fill, RDFDetail::RInferredType>(bl, h, bl.size());
++      return CreateAction<RDFInternal::ActionTags::Fill, RDFDetail::RInferredType>(columnList, h, columnList.size());
+    }
+ 
+    ////////////////////////////////////////////////////////////////////////////
+@@ -2134,7 +2134,7 @@ public:
+    /// \brief Provides a representation of the columns in the dataset
+    /// \tparam ColumnTypes variadic list of branch/column types.
+    /// \param[in] columnList Names of the columns to be displayed.
+-   /// \param[in] rows Number of events for each column to be displayed.
++   /// \param[in] nRows Number of events for each column to be displayed.
+    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
+    ///
+    /// This function returns a `RResultPtr<RDisplay>` containing all the entries to be displayed, organized in a tabular
+@@ -2165,7 +2165,7 @@ public:
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief Provides a representation of the columns in the dataset
+    /// \param[in] columnList Names of the columns to be displayed.
+-   /// \param[in] rows Number of events for each column to be displayed.
++   /// \param[in] nRows Number of events for each column to be displayed.
+    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
+    ///
+    /// This overload automatically infers the column types.
+@@ -2181,7 +2181,7 @@ public:
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief Provides a representation of the columns in the dataset
+    /// \param[in] columnNameRegexp A regular expression to select the columns.
+-   /// \param[in] rows Number of events for each column to be displayed.
++   /// \param[in] nRows Number of events for each column to be displayed.
+    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
+    ///
+    /// The existing columns are matched against the regular expression. If the string provided
+diff --git a/tree/dataframe/inc/ROOT/RDFHelpers.hxx b/tree/dataframe/inc/ROOT/RDFHelpers.hxx
+index 2193e1772e..63a0f90cab 100644
+--- a/tree/dataframe/inc/ROOT/RDFHelpers.hxx
++++ b/tree/dataframe/inc/ROOT/RDFHelpers.hxx
+@@ -138,7 +138,7 @@ void SaveGraph(NodeType node, const std::string &outputFile)
+ 
+ // clang-format off
+ /// Cast a RDataFrame node to the common type ROOT::RDF::RNode
+-/// \param[in] Any node of a RDataFrame graph
++/// \param[in] node Any node of a RDataFrame graph
+ // clang-format on
+ template <typename NodeType>
+ RNode AsRNode(NodeType node)
+diff --git a/tree/dataframe/inc/ROOT/RDataSource.hxx b/tree/dataframe/inc/ROOT/RDataSource.hxx
+index f4af9abded..04f7dc850c 100644
+--- a/tree/dataframe/inc/ROOT/RDataSource.hxx
++++ b/tree/dataframe/inc/ROOT/RDataSource.hxx
+@@ -126,14 +126,14 @@ public:
+    virtual const std::vector<std::string> &GetColumnNames() const = 0;
+ 
+    /// \brief Checks if the dataset has a certain column
+-   /// \param[in] columnName The name of the column
+-   virtual bool HasColumn(std::string_view) const = 0;
++   /// \param[in] colName The name of the column
++   virtual bool HasColumn(std::string_view colName) const = 0;
+ 
+    // clang-format off
+    /// \brief Type of a column as a string, e.g. `GetTypeName("x") == "double"`. Required for jitting e.g. `df.Filter("x>0")`.
+-   /// \param[in] columnName The name of the column
++   /// \param[in] colName The name of the column
+    // clang-format on
+-   virtual std::string GetTypeName(std::string_view) const = 0;
++   virtual std::string GetTypeName(std::string_view colName) const = 0;
+ 
+    // clang-format off
+    /// Called at most once per column by RDF. Return vector of pointers to pointers to column values - one per slot.
+diff --git a/tree/dataframe/inc/ROOT/RResultPtr.hxx b/tree/dataframe/inc/ROOT/RResultPtr.hxx
+index 8358832b14..8acb2bfae6 100644
+--- a/tree/dataframe/inc/ROOT/RResultPtr.hxx
++++ b/tree/dataframe/inc/ROOT/RResultPtr.hxx
+@@ -262,7 +262,7 @@ public:
+    /// Register a callback that RDataFrame will execute in each worker thread concurrently on that thread's partial result.
+    ///
+    /// \param[in] everyNEvents Frequency at which the callback will be called by each thread, as a number of events processed
+-   /// \param[in] a callable with signature `void(unsigned int, Value_t&)` where Value_t is the type of the value contained in this RResultPtr
++   /// \param[in] callback A callable with signature `void(unsigned int, Value_t&)` where Value_t is the type of the value contained in this RResultPtr
+    /// \return this RResultPtr, to allow chaining of OnPartialResultSlot with other calls
+    ///
+    /// See `OnPartialResult` for a generic explanation of the callback mechanism.
+diff --git a/tree/dataframe/src/RArrowDS.cxx b/tree/dataframe/src/RArrowDS.cxx
+index d9e2fae32f..0152b9a813 100644
+--- a/tree/dataframe/src/RArrowDS.cxx
++++ b/tree/dataframe/src/RArrowDS.cxx
+@@ -382,8 +382,8 @@ public:
+ 
+ ////////////////////////////////////////////////////////////////////////
+ /// Constructor to create an Arrow RDataSource for RDataFrame.
+-/// \param[in] table the arrow Table to observe.
+-/// \param[in] columns the name of the columns to use
++/// \param[in] inTable the arrow Table to observe.
++/// \param[in] inColumns the name of the columns to use
+ /// In case columns is empty, we use all the columns found in the table
+ RArrowDS::RArrowDS(std::shared_ptr<arrow::Table> inTable, std::vector<std::string> const &inColumns)
+    : fTable{inTable}, fColumnNames{inColumns}
+diff --git a/tree/tree/inc/TTree.h b/tree/tree/inc/TTree.h
+index 8560e28ab5..e95d4ce301 100644
+--- a/tree/tree/inc/TTree.h
++++ b/tree/tree/inc/TTree.h
+@@ -357,7 +357,7 @@ public:
+    /// possible, unless e.g. type conversions are needed.
+    ///
+    /// \param[in] name Name of the branch to be created.
+-   /// \param[in] obj Array of the objects to be added. When calling Fill(), the current value of the type/object will be saved.
++   /// \param[in] addobj Array of the objects to be added. When calling Fill(), the current value of the type/object will be saved.
+    /// \param[in] bufsize he buffer size in bytes for this branch. When the buffer is full, it is compressed and written to disc.
+    /// The default value of 32000 bytes and should be ok for most simple types. Larger buffers (e.g. 256000) if your Tree is not split and each entry is large (Megabytes).
+    /// A small value for bufsize is beneficial if entries in the Tree are accessed randomly and the Tree is in split mode.
+diff --git a/tree/tree/src/TIOFeatures.cxx b/tree/tree/src/TIOFeatures.cxx
+index 681f2172bd..ca292fb30a 100644
+--- a/tree/tree/src/TIOFeatures.cxx
++++ b/tree/tree/src/TIOFeatures.cxx
+@@ -51,7 +51,7 @@ using namespace ROOT;
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Clear a specific IO feature from this set.
+-/// \param[in] enum_bits The specific feature to disable.
++/// \param[in] input_bits The specific feature to disable.
+ ///
+ /// Removes a feature from the `TIOFeatures` object; emits an Error message if
+ /// the IO feature is not supported by this version of ROOT.
+@@ -62,7 +62,7 @@ void TIOFeatures::Clear(Experimental::EIOFeatures input_bits)
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Clear a specific IO feature from this set.
+-/// \param[in] enum_bits The specific feature to disable.
++/// \param[in] input_bits The specific feature to disable.
+ ///
+ /// Removes a feature from the `TIOFeatures` object; emits an Error message if
+ /// the IO feature is not supported by this version of ROOT.
+@@ -73,7 +73,7 @@ void TIOFeatures::Clear(Experimental::EIOUnsupportedFeatures input_bits)
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Clear a specific IO feature from this set.
+-/// \param[in] enum_bits The specific feature to disable.
++/// \param[in] input_bits The specific feature to disable.
+ ///
+ /// Removes a feature from the `TIOFeatures` object; emits an Error message if
+ /// the IO feature is not supported by this version of ROOT.
+@@ -115,7 +115,7 @@ static std::string GetUnsupportedName(TBasket::EUnsupportedIOBits enum_flag)
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Set a specific IO feature.
+-/// \param[in] enum_bits The specific feature to enable.
++/// \param[in] input_bits The specific feature to enable.
+ ///
+ /// Sets a feature in the `TIOFeatures` object; emits an Error message if
+ /// the IO feature is not supported by this version of ROOT.
+@@ -129,7 +129,7 @@ bool TIOFeatures::Set(Experimental::EIOFeatures input_bits)
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Set a specific IO feature.
+-/// \param[in] enum_bits The specific feature to enable.
++/// \param[in] input_bits The specific feature to enable.
+ ///
+ /// Sets a feature in the `TIOFeatures` object; emits an Error message if
+ /// the IO feature is not supported by this version of ROOT.
+@@ -221,7 +221,7 @@ void TIOFeatures::Print() const
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Test to see if a given feature is set
+-/// \param[in] enum_bits The specific feature to test.
++/// \param[in] input_bits The specific feature to test.
+ ///
+ /// Returns kTRUE if the feature is enables in this object and supported by
+ /// this version of ROOT.
+@@ -232,7 +232,7 @@ bool TIOFeatures::Test(Experimental::EIOFeatures input_bits) const
+ 
+ ////////////////////////////////////////////////////////////////////////////
+ /// \brief Test to see if a given feature is set
+-/// \param[in] enum_bits The specific feature to test.
++/// \param[in] input_bits The specific feature to test.
+ ///
+ /// Returns kTRUE if the feature is enables in this object and supported by
+ /// this version of ROOT.
+-- 
+2.26.2
+
diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch
index d046855..4b4d314 100644
--- a/root-epel7-ppc64le-pyroot.patch
+++ b/root-epel7-ppc64le-pyroot.patch
@@ -1,73 +1,17 @@
-diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/pyroot/src/Cppyy.cxx
---- root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx	2020-03-24 19:26:38.162272398 +0100
-@@ -74,10 +74,6 @@
- class ApplicationStarter {
- public:
-    ApplicationStarter() {
--      // Insure ROOT's atexit is executed *after* the atexit that calls
--      // ApplicationStarter's destructor, by forcing the ROOT's atexit
--      // registration now.
--      TROOT::Initialize();
-       // setup dummy holders for global and std namespaces
-       assert( g_classrefs.size() == GLOBAL_HANDLE );
-       g_name2classrefidx[ "" ]      = GLOBAL_HANDLE;
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx	2020-03-24 19:26:38.182272186 +0100
-@@ -109,10 +109,6 @@
- class ApplicationStarter {
- public:
-     ApplicationStarter() {
--     // Insure ROOT's atexit is executed *after* the atexit that calls
--     // ApplicationStarter's destructor, by forcing the ROOT's atexit
--     // registration now.
--        TROOT::Initialize();
-     // setup dummy holders for global and std namespaces
-         assert(g_classrefs.size() == GLOBAL_HANDLE);
-         g_name2classrefidx[""]      = GLOBAL_HANDLE;
-diff -ur root-6.20.02.orig/core/base/inc/TROOT.h root-6.20.02/core/base/inc/TROOT.h
---- root-6.20.02.orig/core/base/inc/TROOT.h	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/core/base/inc/TROOT.h	2020-03-24 19:26:38.182272186 +0100
-@@ -351,7 +351,6 @@
-    static void        SetMacroPath(const char *newpath);
-    static Int_t       IncreaseDirLevel();
-    static void        IndentLevel();
--   static void        Initialize();
-    static Bool_t      Initialized();
-    static Bool_t      MemCheck();
-    static void        SetDirLevel(Int_t level = 0);
-diff -ur root-6.20.02.orig/core/base/src/TROOT.cxx root-6.20.02/core/base/src/TROOT.cxx
---- root-6.20.02.orig/core/base/src/TROOT.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/core/base/src/TROOT.cxx	2020-03-24 20:10:54.640084486 +0100
-@@ -1022,10 +1022,12 @@
-       SafeDelete(fCleanups);
- #endif
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/__init__.py
+index 227f80765b..eb03251c28 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/__init__.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/__init__.py
+@@ -25,6 +25,12 @@ environ['CPPYY_API_PATH'] = 'none'
+ # Prevent cppyy from filtering ROOT libraries
+ environ['CPPYY_NO_ROOT_FILTER'] = '1'
  
--#ifndef _MSC_VER
--      // deleting the interpreter makes things crash at exit in some cases
--      delete fInterpreter;
--#endif
-+      // llvm::TimingGroup used for measuring the timing relies the destructors.
-+      // In order to make use of this feature we have to call the destructor of
-+      // TCling which will shut down clang, cling and llvm.
-+      // gSystem->Getenv is not available anymore.
-+      if (::getenv("ROOT_CLING_TIMING"))
-+         delete fInterpreter;
++try:
++    from ctypes import cdll
++    libCore = cdll.LoadLibrary("libCore.so")
++except:
++    print("An exception occurred while loading libCore.so with ctypes")
++
+ import cppyy
  
-       // Prints memory stats
-       TStorage::PrintStatistics();
-@@ -2848,13 +2850,6 @@
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Initialize ROOT explicitly.
--
--void TROOT::Initialize() {
--   (void) gROOT;
--}
--
--////////////////////////////////////////////////////////////////////////////////
- /// Return kTRUE if the TROOT object has been initialized.
- 
- Bool_t TROOT::Initialized()
+ # import libROOTPythonizations with Python version number
diff --git a/root-fix-bad-regex.patch b/root-fix-bad-regex.patch
new file mode 100644
index 0000000..e1e667e
--- /dev/null
+++ b/root-fix-bad-regex.patch
@@ -0,0 +1,25 @@
+From b7dc989f9a49ad31094331aa272859ff7480f943 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 9 Jul 2020 21:29:46 +0200
+Subject: [PATCH] Fix bad regex
+
+---
+ proof/proof/src/TProofMgr.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/proof/proof/src/TProofMgr.cxx b/proof/proof/src/TProofMgr.cxx
+index 2a140e4e7a..35c91b77ac 100644
+--- a/proof/proof/src/TProofMgr.cxx
++++ b/proof/proof/src/TProofMgr.cxx
+@@ -820,7 +820,7 @@ TFileCollection *TProofMgr::UploadFiles(TList *src,
+    if (dest && strlen(dest) > 0) {
+       TString dst(dest), dt;
+       Ssiz_t from = 0;
+-      TRegexp re("<d+[0-9]>");
++      TRegexp re("<d[0-9]+>");
+       while (dst.Tokenize(dt, from, "/")) {
+          if (dt.Contains(re)) {
+             TParameter<Int_t> *pi = new TParameter<Int_t>(dt, -1);
+-- 
+2.26.2
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 4f39a68..1b2e880 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.18.00.orig/core/base/src/TApplication.cxx root-6.18.00/core/base/src/TApplication.cxx
---- root-6.18.00.orig/core/base/src/TApplication.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/core/base/src/TApplication.cxx	2019-06-26 15:00:32.048047903 +0200
-@@ -267,18 +267,11 @@
+diff -ur root-6.22.00.orig/core/base/src/TApplication.cxx root-6.22.00/core/base/src/TApplication.cxx
+--- root-6.22.00.orig/core/base/src/TApplication.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/core/base/src/TApplication.cxx	2020-06-29 08:53:15.066085533 +0200
+@@ -264,18 +264,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.18.00.orig/core/base/src/TApplication.cxx root-6.18.00/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -292,7 +285,6 @@
+@@ -289,7 +282,6 @@
        }
     }
  #endif
@@ -30,10 +30,10 @@ diff -ur root-6.18.00.orig/core/base/src/TApplication.cxx root-6.18.00/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.18.00.orig/graf2d/asimage/CMakeLists.txt root-6.18.00/graf2d/asimage/CMakeLists.txt
---- root-6.18.00.orig/graf2d/asimage/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/asimage/CMakeLists.txt	2019-06-26 15:05:32.584912789 +0200
-@@ -26,6 +26,7 @@
+diff -ur root-6.22.00.orig/graf2d/asimage/CMakeLists.txt root-6.22.00/graf2d/asimage/CMakeLists.txt
+--- root-6.22.00.orig/graf2d/asimage/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/asimage/CMakeLists.txt	2020-06-29 08:53:15.066085533 +0200
+@@ -30,6 +30,7 @@
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
      ZLIB::ZLIB
@@ -41,10 +41,10 @@ diff -ur root-6.18.00.orig/graf2d/asimage/CMakeLists.txt root-6.18.00/graf2d/asi
    DEPENDENCIES
      Core
      Graf
-diff -ur root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx root-6.18.00/graf2d/asimage/src/TASImage.cxx
---- root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/asimage/src/TASImage.cxx	2019-06-26 15:00:32.062047757 +0200
-@@ -110,6 +110,8 @@
+diff -ur root-6.22.00.orig/graf2d/asimage/src/TASImage.cxx root-6.22.00/graf2d/asimage/src/TASImage.cxx
+--- root-6.22.00.orig/graf2d/asimage/src/TASImage.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/asimage/src/TASImage.cxx	2020-06-29 08:53:15.068085538 +0200
+@@ -111,6 +111,8 @@
  #   include <draw.h>
  }
  
@@ -53,7 +53,7 @@ diff -ur root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx root-6.18.00/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2593,14 +2595,120 @@
+@@ -2594,14 +2596,120 @@
     TString fn = font_name;
     fn.Strip();
  
@@ -181,7 +181,7 @@ diff -ur root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx root-6.18.00/graf2d/a
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2624,14 +2732,11 @@
+@@ -2625,14 +2733,11 @@
        return;
     }
  
@@ -199,10 +199,10 @@ diff -ur root-6.18.00.orig/graf2d/asimage/src/TASImage.cxx root-6.18.00/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.18.00.orig/graf2d/graf/CMakeLists.txt root-6.18.00/graf2d/graf/CMakeLists.txt
---- root-6.18.00.orig/graf2d/graf/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/graf/CMakeLists.txt	2019-06-26 15:03:42.153064782 +0200
-@@ -87,6 +87,7 @@
+diff -ur root-6.22.00.orig/graf2d/graf/CMakeLists.txt root-6.22.00/graf2d/graf/CMakeLists.txt
+--- root-6.22.00.orig/graf2d/graf/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/graf/CMakeLists.txt	2020-06-29 08:53:15.068085538 +0200
+@@ -91,6 +91,7 @@
      ${FREETYPE_LIBRARIES}
      ZLIB::ZLIB
      mathtext
@@ -210,9 +210,9 @@ diff -ur root-6.18.00.orig/graf2d/graf/CMakeLists.txt root-6.18.00/graf2d/graf/C
    DEPENDENCIES
      Hist
      Matrix
-diff -ur root-6.18.00.orig/graf2d/graf/inc/TTF.h root-6.18.00/graf2d/graf/inc/TTF.h
---- root-6.18.00.orig/graf2d/graf/inc/TTF.h	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/graf/inc/TTF.h	2019-06-26 15:00:32.063047746 +0200
+diff -ur root-6.22.00.orig/graf2d/graf/inc/TTF.h root-6.22.00/graf2d/graf/inc/TTF.h
+--- root-6.22.00.orig/graf2d/graf/inc/TTF.h	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/graf/inc/TTF.h	2020-06-29 08:53:15.068085538 +0200
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -224,9 +224,9 @@ diff -ur root-6.18.00.orig/graf2d/graf/inc/TTF.h root-6.18.00/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.18.00.orig/graf2d/graf/src/TTF.cxx root-6.18.00/graf2d/graf/src/TTF.cxx
---- root-6.18.00.orig/graf2d/graf/src/TTF.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/graf/src/TTF.cxx	2019-06-26 15:00:32.064047736 +0200
+diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/TTF.cxx
+--- root-6.22.00.orig/graf2d/graf/src/TTF.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/graf/src/TTF.cxx	2020-06-29 08:53:15.086085582 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -787,10 +787,10 @@ diff -ur root-6.18.00.orig/graf2d/graf/src/TTF.cxx root-6.18.00/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.18.00.orig/graf2d/postscript/CMakeLists.txt root-6.18.00/graf2d/postscript/CMakeLists.txt
---- root-6.18.00.orig/graf2d/postscript/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/postscript/CMakeLists.txt	2019-06-26 15:06:11.017511871 +0200
-@@ -21,6 +21,7 @@
+diff -ur root-6.22.00.orig/graf2d/postscript/CMakeLists.txt root-6.22.00/graf2d/postscript/CMakeLists.txt
+--- root-6.22.00.orig/graf2d/postscript/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/postscript/CMakeLists.txt	2020-06-29 08:53:15.086085582 +0200
+@@ -27,6 +27,7 @@
    LIBRARIES
      ZLIB::ZLIB
      mathtext
@@ -798,10 +798,10 @@ diff -ur root-6.18.00.orig/graf2d/postscript/CMakeLists.txt root-6.18.00/graf2d/
    DEPENDENCIES
      Graf
  )
-diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/graf2d/postscript/src/TPostScript.cxx
---- root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf2d/postscript/src/TPostScript.cxx	2019-06-26 15:00:32.065047726 +0200
-@@ -229,6 +229,7 @@
+diff -ur root-6.22.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.00/graf2d/postscript/src/TPostScript.cxx
+--- root-6.22.00.orig/graf2d/postscript/src/TPostScript.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf2d/postscript/src/TPostScript.cxx	2020-06-29 08:53:15.087085585 +0200
+@@ -233,6 +233,7 @@
  #include <string.h>
  #include <ctype.h>
  #include <wchar.h>
@@ -809,7 +809,7 @@ diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/gr
  
  #include "Riostream.h"
  #include "Byteswap.h"
-@@ -1575,56 +1576,179 @@
+@@ -1583,56 +1584,179 @@
  
  void TPostScript::FontEmbed(void)
  {
@@ -1034,7 +1034,7 @@ diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1633,9 +1757,8 @@
+@@ -1641,9 +1765,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -1046,7 +1046,7 @@ diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/gr
              }
              delete [] ttfont;
           }
-@@ -2803,10 +2926,10 @@
+@@ -2835,10 +2958,10 @@
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -1060,20 +1060,20 @@ diff -ur root-6.18.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.18.00/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.18.00.orig/graf3d/gl/CMakeLists.txt root-6.18.00/graf3d/gl/CMakeLists.txt
---- root-6.18.00.orig/graf3d/gl/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf3d/gl/CMakeLists.txt	2019-06-26 15:02:38.318730684 +0200
-@@ -206,6 +206,7 @@
-     ${FTGL_LIBRARIES}
+diff -ur root-6.22.00.orig/graf3d/gl/CMakeLists.txt root-6.22.00/graf3d/gl/CMakeLists.txt
+--- root-6.22.00.orig/graf3d/gl/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf3d/gl/CMakeLists.txt	2020-06-29 08:53:15.087085585 +0200
+@@ -208,6 +208,7 @@
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
+     RGlew
 +    fontconfig
    DEPENDENCIES
      Hist
      Gui
-diff -ur root-6.18.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.18.00/graf3d/gl/src/TGLFontManager.cxx
---- root-6.18.00.orig/graf3d/gl/src/TGLFontManager.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf3d/gl/src/TGLFontManager.cxx	2019-06-26 15:00:32.066047715 +0200
+diff -ur root-6.22.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.22.00.orig/graf3d/gl/src/TGLFontManager.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf3d/gl/src/TGLFontManager.cxx	2020-06-29 08:53:15.087085585 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1329,9 +1329,9 @@ diff -ur root-6.18.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.18.00/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.18.00.orig/graf3d/gl/src/TGLText.cxx root-6.18.00/graf3d/gl/src/TGLText.cxx
---- root-6.18.00.orig/graf3d/gl/src/TGLText.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/graf3d/gl/src/TGLText.cxx	2019-06-26 15:00:32.066047715 +0200
+diff -ur root-6.22.00.orig/graf3d/gl/src/TGLText.cxx root-6.22.00/graf3d/gl/src/TGLText.cxx
+--- root-6.22.00.orig/graf3d/gl/src/TGLText.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/graf3d/gl/src/TGLText.cxx	2020-06-29 08:53:15.088085587 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1466,10 +1466,10 @@ diff -ur root-6.18.00.orig/graf3d/gl/src/TGLText.cxx root-6.18.00/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.18.00.orig/gui/gui/src/TGApplication.cxx root-6.18.00/gui/gui/src/TGApplication.cxx
---- root-6.18.00.orig/gui/gui/src/TGApplication.cxx	2019-06-25 10:52:11.000000000 +0200
-+++ root-6.18.00/gui/gui/src/TGApplication.cxx	2019-06-26 15:00:32.066047715 +0200
-@@ -83,20 +83,12 @@
+diff -ur root-6.22.00.orig/gui/gui/src/TGApplication.cxx root-6.22.00/gui/gui/src/TGApplication.cxx
+--- root-6.22.00.orig/gui/gui/src/TGApplication.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/gui/gui/src/TGApplication.cxx	2020-06-29 08:53:15.088085587 +0200
+@@ -80,20 +80,12 @@
     gROOT->SetBatch(kFALSE);
  
     if (strcmp(appClassName, "proofserv")) {
diff --git a/root-format-fix.patch b/root-format-fix.patch
deleted file mode 100644
index 9d7f4e2..0000000
--- a/root-format-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1d4aaf9e503669ccb0275f3f9b8a87a486671334 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 14:34:48 +0100
-Subject: [PATCH] Size types should use %z
-
----
- tree/dataframe/src/RCsvDS.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tree/dataframe/src/RCsvDS.cxx b/tree/dataframe/src/RCsvDS.cxx
-index 81f802285b..fc0a18e21f 100644
---- a/tree/dataframe/src/RCsvDS.cxx
-+++ b/tree/dataframe/src/RCsvDS.cxx
-@@ -368,9 +368,9 @@ std::vector<std::pair<ULong64_t, ULong64_t>> RCsvDS::GetEntryRanges()
- 
-    if (gDebug > 0) {
-       if (fLinesChunkSize == -1LL) {
--         Info("GetEntryRanges", "Attempted to read entire CSV file into memory, %lu lines read", fRecords.size());
-+         Info("GetEntryRanges", "Attempted to read entire CSV file into memory, %zu lines read", fRecords.size());
-       } else {
--         Info("GetEntryRanges", "Attempted to read chunk of %lld lines of CSV file into memory, %lu lines read", fLinesChunkSize, fRecords.size());
-+         Info("GetEntryRanges", "Attempted to read chunk of %lld lines of CSV file into memory, %zu lines read", fLinesChunkSize, fRecords.size());
-       }
-    }
- 
--- 
-2.24.1
-
diff --git a/root-histv7-bin-iterator.patch b/root-histv7-bin-iterator.patch
new file mode 100644
index 0000000..9e52725
--- /dev/null
+++ b/root-histv7-bin-iterator.patch
@@ -0,0 +1,51 @@
+From af2e5c8b1bf17a0a0e1c1492735395bdd49ffd65 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 29 Jun 2020 12:57:43 +0200
+Subject: [PATCH] Fix off-by-one error in the histogram v7 bin iterator
+
+The histogram bin iterator should start at 1 and end at N + 1, not
+start at 0 and end at N. (As for all iterators, the end element is the
+invalid element after the last one.)
+
+Fixes an assertion in the histhistv7testUnit test
+
+[----------] 2 tests from BinIterNBins
+[ RUN      ] BinIterNBins.NumBins
+/usr/include/c++/10/bits/stl_vector.h:1045: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = float; _Alloc = std::allocator<float>; std::vector<_Tp, _Alloc>::reference = float&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed.
+---
+ hist/histv7/inc/ROOT/RHist.hxx | 4 ++--
+ hist/histv7/test/biniter.cxx   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
+index ebb319f1ef..9521fe182f 100644
+--- a/hist/histv7/inc/ROOT/RHist.hxx
++++ b/hist/histv7/inc/ROOT/RHist.hxx
+@@ -158,9 +158,9 @@ public:
+    /// Get the uncertainty on the content of the bin at `x`.
+    double GetBinUncertainty(const CoordArray_t &x) const { return fImpl->GetBinUncertainty(x); }
+ 
+-   const_iterator begin() const { return const_iterator(*fImpl); }
++   const_iterator begin() const { return const_iterator(*fImpl, 1); }
+ 
+-   const_iterator end() const { return const_iterator(*fImpl, fImpl->GetNBinsNoOver()); }
++   const_iterator end() const { return const_iterator(*fImpl, fImpl->GetNBinsNoOver() + 1); }
+ 
+    /// Swap *this and other.
+    ///
+diff --git a/hist/histv7/test/biniter.cxx b/hist/histv7/test/biniter.cxx
+index aa1c2dfef9..1f940aa8e7 100644
+--- a/hist/histv7/test/biniter.cxx
++++ b/hist/histv7/test/biniter.cxx
+@@ -45,7 +45,7 @@ TEST(BinIterNBins, BinRef) {
+   double founduncert = -1.;
+   RH2F::CoordArray_t foundcoord{};
+ 
+-  int nBins = 0;
++  int nBins = 1;
+   for (auto bin: h) {
+     auto binCenter = bin.GetCenter();
+     if (std::fabs(binCenter[0] - x) < 0.1 && std::fabs(binCenter[1] - y) < 0.1) {
+-- 
+2.26.2
+
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index 2cdb5aa..b39110a 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -1,6 +1,30 @@
-diff -ur root-6.20.02.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.20.02/bindings/pyroot/JsMVA/JPyInterface.py
---- root-6.20.02.orig/bindings/pyroot/JsMVA/JPyInterface.py	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/JsMVA/JPyInterface.py	2020-03-15 20:07:18.921423559 +0100
+diff -ur root-6.22.00.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.22.00/bindings/jsmva/python/JsMVA/JPyInterface.py
+--- root-6.22.00.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/jsmva/python/JsMVA/JPyInterface.py	2020-06-21 20:20:27.744527667 +0200
+@@ -188,7 +188,7 @@
+ ## Class for creating the output scripts and inserting them to cell output
+ class JsDraw:
+     ## Base repository
+-    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
++    __jsMVARepo = "/static/JsMVA"
+ 
+     ## String containing the link to JavaScript files
+     __jsMVASourceDir = __jsMVARepo + "/js"
+diff -ur root-6.22.00.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.00/bindings/jupyroot/python/JupyROOT/helpers/utils.py
+--- root-6.22.00.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2020-06-21 20:18:22.840258397 +0200
+@@ -40,7 +40,7 @@
+ _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
+ 
+ 
+-_jsROOTSourceDir = "/static/"
++_jsROOTSourceDir = "/static/jsroot/"
+ _jsCanvasWidth = 800
+ _jsCanvasHeight = 600
+ 
+diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.22.00/bindings/pyroot_legacy/JsMVA/JPyInterface.py
+--- root-6.22.00.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2020-06-21 20:09:42.265004565 +0200
 @@ -188,7 +188,7 @@
  ## Class for creating the output scripts and inserting them to cell output
  class JsDraw:
@@ -10,9 +34,9 @@ diff -ur root-6.20.02.orig/bindings/pyroot/JsMVA/JPyInterface.py root-6.20.02/bi
   
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.20.02.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.20.02/bindings/pyroot/JupyROOT/helpers/utils.py
---- root-6.20.02.orig/bindings/pyroot/JupyROOT/helpers/utils.py	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/JupyROOT/helpers/utils.py	2020-03-15 20:07:18.921423559 +0100
+diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py root-6.22.00/bindings/pyroot_legacy/JupyROOT/helpers/utils.py
+--- root-6.22.00.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2020-06-21 20:09:42.266004568 +0200
 @@ -82,7 +82,7 @@
  function requirejs_success(base_url) {{
      return function() {{
@@ -22,9 +46,9 @@ diff -ur root-6.20.02.orig/bindings/pyroot/JupyROOT/helpers/utils.py root-6.20.0
          }});
          display_{jsDivId}();
      }}
-diff -ur root-6.20.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.20.02/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.20.02.orig/etc/notebook/JsMVA/js/JsMVA.js	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/etc/notebook/JsMVA/js/JsMVA.js	2020-03-15 20:07:18.922423549 +0100
+diff -ur root-6.22.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.22.00/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.22.00.orig/etc/notebook/JsMVA/js/JsMVA.js	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/etc/notebook/JsMVA/js/JsMVA.js	2020-06-21 20:10:34.552121014 +0200
 @@ -16,7 +16,7 @@
  
  (function(factory){
@@ -34,9 +58,9 @@ diff -ur root-6.20.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.20.02/etc/noteb
  
      var url = "";
      if (requirejs.s.contexts.hasOwnProperty("_")) {
-diff -ur root-6.20.02.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.20.02/etc/notebook/JsMVA/js/NetworkDesigner.js
---- root-6.20.02.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-03-15 20:07:18.922423549 +0100
+diff -ur root-6.22.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.22.00/etc/notebook/JsMVA/js/NetworkDesigner.js
+--- root-6.22.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-06-21 20:10:34.552121014 +0200
 @@ -19,7 +19,7 @@
          paths: {
              "jquery-connections": baseURL + "jquery.connections.min",
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index 27fac76..9910ec3 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -1,4 +1,4 @@
-From b587d85a5fc8f706362396dc347830f16797b1f2 Mon Sep 17 00:00:00 2001
+From 636b26baf214559e209e72b2a14946d0cc18c2f1 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 16 Jan 2018 10:25:50 +0100
 Subject: [PATCH] Reduce the needed memory for compilation
@@ -18,14 +18,14 @@ A similar dependency existed before the code latest code changes
 (see commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
 rootcling and libCling.
 ---
- core/metacling/src/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
+ core/metacling/src/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index eccd77681d..df941eb3b7 100644
+index 2923345f7c..b44a4d4115 100644
 --- a/core/metacling/src/CMakeLists.txt
 +++ b/core/metacling/src/CMakeLists.txt
-@@ -86,6 +86,10 @@ ROOT_LINKER_LIBRARY(Cling
+@@ -114,6 +114,11 @@ ROOT_LINKER_LIBRARY(Cling
          $<TARGET_OBJECTS:MetaCling>
          LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
  
@@ -33,9 +33,10 @@ index eccd77681d..df941eb3b7 100644
 +# rootcling_stage1 from being linked in parallel.
 +# This avoids doing two memory consuming operations in parallel.
 +add_dependencies(Cling rootcling_stage1)
- 
++
  if(MSVC)
    set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   set(cling_exports
 -- 
-2.20.1
+2.26.2
 
diff --git a/root-moved-file.patch b/root-moved-file.patch
deleted file mode 100644
index 948a78b..0000000
--- a/root-moved-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6492170d74f464286de22c40554adbd400ec838b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 12:53:34 +0100
-Subject: [PATCH] The file was moved - update path
-
----
- tutorials/legacy/mlp/mlpHiggs.C | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tutorials/legacy/mlp/mlpHiggs.C b/tutorials/legacy/mlp/mlpHiggs.C
-index 49d3ca2b30..0516ed7c50 100644
---- a/tutorials/legacy/mlp/mlpHiggs.C
-+++ b/tutorials/legacy/mlp/mlpHiggs.C
-@@ -18,8 +18,8 @@ void mlpHiggs(Int_t ntrain=100) {
-    TFile *input = 0;
-    if (!gSystem->AccessPathName(fname)) {
-       input = TFile::Open(fname);
--   } else if (!gSystem->AccessPathName(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
--      input = TFile::Open(Form("%s/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
-+   } else if (!gSystem->AccessPathName(Form("%s/legacy/mlp/%s", TROOT::GetTutorialDir().Data(), fname))) {
-+      input = TFile::Open(Form("%s/legacy/mlp/%s", TROOT::GetTutorialDir().Data(), fname));
-    } else {
-       printf("accessing %s file from http://root.cern.ch/files\n",fname);
-       input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
--- 
-2.24.1
-
diff --git a/root-ntuple-largefile.patch b/root-ntuple-largefile.patch
new file mode 100644
index 0000000..b4242f0
--- /dev/null
+++ b/root-ntuple-largefile.patch
@@ -0,0 +1,139 @@
+diff -ur root-6.22.00.orig/io/io/src/RRawFileUnix.cxx root-6.22.00/io/io/src/RRawFileUnix.cxx
+--- root-6.22.00.orig/io/io/src/RRawFileUnix.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/io/io/src/RRawFileUnix.cxx	2020-07-02 09:02:48.202677798 +0200
+@@ -9,6 +9,8 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
++#include "ROOT/RConfig.hxx"
++
+ #include "ROOT/RRawFileUnix.hxx"
+ #include "ROOT/RMakeUnique.hxx"
+ 
+@@ -47,8 +49,13 @@
+ 
+ std::uint64_t ROOT::Internal::RRawFileUnix::GetSizeImpl()
+ {
++#ifdef R__SEEK64
++   struct stat64 info;
++   int res = fstat64(fFileDes, &info);
++#else
+    struct stat info;
+    int res = fstat(fFileDes, &info);
++#endif
+    if (res != 0)
+       throw std::runtime_error("Cannot call fstat on '" + fUrl + "', error: " + std::string(strerror(errno)));
+    return info.st_size;
+@@ -68,7 +75,11 @@
+ 
+ void ROOT::Internal::RRawFileUnix::OpenImpl()
+ {
++#ifdef R__SEEK64
++   fFileDes = open64(GetLocation(fUrl).c_str(), O_RDONLY);
++#else
+    fFileDes = open(GetLocation(fUrl).c_str(), O_RDONLY);
++#endif
+    if (fFileDes < 0) {
+       throw std::runtime_error("Cannot open '" + fUrl + "', error: " + std::string(strerror(errno)));
+    }
+@@ -76,8 +87,13 @@
+    if (fOptions.fBlockSize >= 0)
+       return;
+ 
++#ifdef R__SEEK64
++   struct stat64 info;
++   int res = fstat64(fFileDes, &info);
++#else
+    struct stat info;
+    int res = fstat(fFileDes, &info);
++#endif
+    if (res != 0) {
+       throw std::runtime_error("Cannot call fstat on '" + fUrl + "', error: " + std::string(strerror(errno)));
+    }
+@@ -92,7 +108,11 @@
+ {
+    size_t total_bytes = 0;
+    while (nbytes) {
++#ifdef R__SEEK64
++      ssize_t res = pread64(fFileDes, buffer, nbytes, offset);
++#else
+       ssize_t res = pread(fFileDes, buffer, nbytes, offset);
++#endif
+       if (res < 0) {
+          if (errno == EINTR)
+             continue;
+diff -ur root-6.22.00.orig/tree/ntuple/v7/src/RMiniFile.cxx root-6.22.00/tree/ntuple/v7/src/RMiniFile.cxx
+--- root-6.22.00.orig/tree/ntuple/v7/src/RMiniFile.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/ntuple/v7/src/RMiniFile.cxx	2020-07-02 10:06:55.066204147 +0200
+@@ -13,6 +13,8 @@
+  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+  *************************************************************************/
+ 
++#include <ROOT/RConfig.hxx>
++
+ #include "ROOT/RMiniFile.hxx"
+ 
+ #include <ROOT/RRawFile.hxx>
+@@ -999,7 +1001,11 @@
+    R__ASSERT(fFile);
+    size_t retval;
+    if ((offset >= 0) && (static_cast<std::uint64_t>(offset) != fFilePos)) {
++#ifdef R__SEEK64
++      retval = fseeko64(fFile, offset, SEEK_SET);
++#else
+       retval = fseek(fFile, offset, SEEK_SET);
++#endif
+       R__ASSERT(retval == 0);
+       fFilePos = offset;
+    }
+@@ -1099,7 +1105,11 @@
+    if (idxDirSep != std::string::npos) {
+       fileName.erase(0, idxDirSep + 1);
+    }
++#ifdef R__SEEK64
++   FILE *fileStream = fopen64(std::string(path.data(), path.size()).c_str(), "wb");
++#else
+    FILE *fileStream = fopen(std::string(path.data(), path.size()).c_str(), "wb");
++#endif
+    R__ASSERT(fileStream);
+ 
+    auto writer = new RNTupleFileWriter(ntupleName);
+@@ -1319,7 +1329,11 @@
+    fFileSimple.Write(&strEmpty, strEmpty.GetSize());
+    fFileSimple.Write(&fileRoot, fileRoot.GetSize());
+    fFileSimple.fFilePos = tail;
++#ifdef R__SEEK64
++   auto retval = fseeko64(fFileSimple.fFile, tail, SEEK_SET);
++#else
+    auto retval = fseek(fFileSimple.fFile, tail, SEEK_SET);
++#endif
+    R__ASSERT(retval == 0);
+    fFileSimple.fFilePos = tail;
+ }
+diff -ur root-6.22.00.orig/tree/ntuple/v7/test/ntuple.cxx root-6.22.00/tree/ntuple/v7/test/ntuple.cxx
+--- root-6.22.00.orig/tree/ntuple/v7/test/ntuple.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/ntuple/v7/test/ntuple.cxx	2020-07-02 10:10:54.409737807 +0200
+@@ -1,3 +1,5 @@
++#include <ROOT/RConfig.hxx>
++
+ #include <ROOT/RColumnModel.hxx>
+ #include <ROOT/RDataFrame.hxx>
+ #include <ROOT/RNTuple.hxx>
+@@ -891,10 +893,17 @@
+          ntuple->Fill();
+       }
+    }
++#ifdef R__SEEK64
++   FILE *file = fopen64(fileGuard.GetPath().c_str(), "rb");
++   ASSERT_TRUE(file != nullptr);
++   EXPECT_EQ(0, fseeko64(file, 0, SEEK_END));
++   EXPECT_GT(ftello64(file), 2048LL * 1024LL * 1024LL);
++#else
+    FILE *file = fopen(fileGuard.GetPath().c_str(), "rb");
+    ASSERT_TRUE(file != nullptr);
+    EXPECT_EQ(0, fseek(file, 0, SEEK_END));
+    EXPECT_GT(ftell(file), 2048LL * 1024LL * 1024LL);
++#endif
+    fclose(file);
+ 
+    auto ntuple = RNTupleReader::Open("myNTuple", fileGuard.GetPath());
diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
new file mode 100644
index 0000000..a25a8e8
--- /dev/null
+++ b/root-old-gtest-compat.patch
@@ -0,0 +1,161 @@
+diff -ur root-6.22.00.orig/math/mathcore/test/stress/testGenVector.cxx root-6.22.00/math/mathcore/test/stress/testGenVector.cxx
+--- root-6.22.00.orig/math/mathcore/test/stress/testGenVector.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/stress/testGenVector.cxx	2020-06-29 19:38:08.524050438 +0200
+@@ -4,6 +4,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include "StatFunction.h"
+ #include "TestHelper.h"
+ #include "VectorTest.h"
+diff -ur root-6.22.00.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.22.00/math/mathcore/test/stress/testSMatrix.cxx
+--- root-6.22.00.orig/math/mathcore/test/stress/testSMatrix.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/stress/testSMatrix.cxx	2020-06-29 19:38:08.524050438 +0200
+@@ -7,6 +7,16 @@
+ #include "TestHelper.h"
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include "VectorTest.h"
+ #include "TROOT.h"
+ #include "TSystem.h"
+diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector34.cxx root-6.22.00/math/mathcore/test/stress/testVector34.cxx
+--- root-6.22.00.orig/math/mathcore/test/stress/testVector34.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/stress/testVector34.cxx	2020-06-29 19:38:08.525050440 +0200
+@@ -4,6 +4,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include "StatFunction.h"
+ #include "VectorTest.h"
+ 
+diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector.cxx root-6.22.00/math/mathcore/test/stress/testVector.cxx
+--- root-6.22.00.orig/math/mathcore/test/stress/testVector.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/stress/testVector.cxx	2020-06-29 19:38:08.525050440 +0200
+@@ -4,6 +4,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include "StatFunction.h"
+ #include "TestHelper.h"
+ #include "VectorTest.h"
+diff -ur root-6.22.00.orig/math/mathcore/test/testGradient.cxx root-6.22.00/math/mathcore/test/testGradient.cxx
+--- root-6.22.00.orig/math/mathcore/test/testGradient.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/testGradient.cxx	2020-06-29 19:38:08.525050440 +0200
+@@ -22,6 +22,10 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE
++#define TYPED_TEST_SUITE TYPED_TEST_CASE
++#endif
++
+ #include <chrono>
+ #include <iostream>
+ #include <string>
+diff -ur root-6.22.00.orig/math/mathcore/test/testGradientFitting.cxx root-6.22.00/math/mathcore/test/testGradientFitting.cxx
+--- root-6.22.00.orig/math/mathcore/test/testGradientFitting.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathcore/test/testGradientFitting.cxx	2020-06-29 19:38:08.525050440 +0200
+@@ -12,6 +12,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include <iostream>
+ #include <string>
+ 
+diff -ur root-6.22.00.orig/math/mathmore/test/testStress.cxx root-6.22.00/math/mathmore/test/testStress.cxx
+--- root-6.22.00.orig/math/mathmore/test/testStress.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/math/mathmore/test/testStress.cxx	2020-06-29 19:38:08.526050443 +0200
+@@ -28,6 +28,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ using ::testing::TestWithParam;
+ using ::testing::Values;
+ 
+diff -ur root-6.22.00.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx root-6.22.00/roofit/roofitcore/test/testProxiesAndCategories.cxx
+--- root-6.22.00.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/roofit/roofitcore/test/testProxiesAndCategories.cxx	2020-06-29 19:38:08.526050443 +0200
+@@ -16,6 +16,9 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
+ 
+ TEST(RooCategory, CategoryDefineMultiState) {
+   RooCategory myCat("myCat", "A category", { {"0Lep", 0}, {"1Lep", 1}, {"2Lep", 2}, {"3Lep", 3} });
+diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.00/tree/dataframe/test/dataframe_simple.cxx
+--- root-6.22.00.orig/tree/dataframe/test/dataframe_simple.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/tree/dataframe/test/dataframe_simple.cxx	2020-06-29 19:38:45.667130468 +0200
+@@ -1,5 +1,10 @@
+ /****** Run RDataFrame tests both with and without IMT enabled *******/
+ #include <gtest/gtest.h>
++
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <ROOT/RDataFrame.hxx>
+ #include <ROOT/TSeq.hxx>
+ #include <TChain.h>
diff --git a/root-python2-compat.patch b/root-python2-compat.patch
new file mode 100644
index 0000000..8006a8f
--- /dev/null
+++ b/root-python2-compat.patch
@@ -0,0 +1,41 @@
+From 056b67d05c950cf04a8290dcdf376078ee92b449 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 29 Jun 2020 17:01:03 +0200
+Subject: [PATCH] Compatibility with python 2.7 versions before 2.7.9
+
+This is a workaround for https://bugs.python.org/issue21591 which
+affect Python 2 versions before 2.7.9. This includes Python 2.7.5
+which is the Python 2 version on RHEL/CentOS 7.
+---
+ .../pyroot/pythonizations/python/ROOT/_numbadeclare.py    | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py b/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
+index 1bef862af5..9aa893b8f0 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
+@@ -32,7 +32,7 @@ def _NumbaDeclareDecorator(input_types, return_type, name=None):
+         import cffi
+     except:
+         raise Exception('Failed to import cffi')
+-    import re
++    import re, sys
+ 
+     # Normalize input types by stripping ROOT and VecOps namespaces from input types
+     def normalize_typename(t):
+@@ -195,7 +195,11 @@ def pywrapper({SIGNATURE}):
+         if 'RVec' in return_type:
+             glob['dtype_r'] = get_numba_type(get_inner_type(return_type))
+ 
+-        exec(pywrappercode, glob, locals())
++        if sys.version_info[0] >= 3:
++            exec(pywrappercode, glob, locals()) in {}
++        else:
++            exec(pywrappercode) in glob, locals()
++
+         if not 'pywrapper' in locals():
+             raise Exception('Failed to create Python wrapper function:\n{}'.format(pywrappercode))
+ 
+-- 
+2.26.2
+
diff --git a/root-python3.8-object.patch b/root-python3.8-object.patch
index 2447e31..a4d2759 100644
--- a/root-python3.8-object.patch
+++ b/root-python3.8-object.patch
@@ -1,281 +1,21 @@
-diff -ur root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx root-6.20.02/bindings/pyroot/src/MethodProxy.cxx
---- root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/MethodProxy.cxx	2020-03-15 19:43:20.946684699 +0100
-@@ -845,7 +845,8 @@
-    sizeof(MethodProxy),       // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)mp_dealloc,    // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -894,6 +895,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt	2020-06-21 20:54:24.848992803 +0200
+@@ -85,11 +85,6 @@
+     target_compile_options(${libname} PRIVATE -Wno-deprecated-register)
+   endif()
  
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx
---- root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx	2020-03-15 19:43:20.946684699 +0100
-@@ -398,7 +398,8 @@
-    sizeof(ObjectProxy),       // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)op_dealloc,    // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -450,6 +451,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx
---- root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx	2020-03-15 19:43:20.946684699 +0100
-@@ -133,7 +133,8 @@
-    sizeof(PropertyProxy),     // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)pp_dealloc,    // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -182,6 +183,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx root-6.20.02/bindings/pyroot/src/PyRootType.cxx
---- root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/PyRootType.cxx	2020-03-15 19:43:20.946684699 +0100
-@@ -232,7 +232,8 @@
-    sizeof(PyROOT::PyRootClass),// tp_basicsize
-    0,                         // tp_itemsize
-    0,                         // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -281,6 +282,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx root-6.20.02/bindings/pyroot/src/Pythonize.cxx
---- root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/Pythonize.cxx	2020-03-15 19:43:20.947684688 +0100
-@@ -944,6 +944,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-       , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+      , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+      , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
-    };
- 
-    static PyObject* vector_iter( PyObject* v ) {
-diff -ur root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx root-6.20.02/bindings/pyroot/src/RootModule.cxx
---- root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/RootModule.cxx	2020-03-15 19:43:20.948684678 +0100
-@@ -134,6 +134,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- PyObject _PyROOT_NullPtrStruct = {
-diff -ur root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx
---- root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx	2020-03-15 19:43:20.948684678 +0100
-@@ -19,7 +19,8 @@
-    0,                         // tp_basicsize
-    0,                         // tp_itemsize
-    0,                         // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -69,6 +70,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- //= long type allowed for reference passing ==================================
-@@ -78,7 +85,8 @@
-    0,                         // tp_basicsize
-    0,                         // tp_itemsize
-    0,                         // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -128,6 +136,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- //= instancemethod object with a more efficient call function ================
-@@ -277,7 +291,8 @@
-    0,                         // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)im_dealloc,    // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -327,6 +342,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx
---- root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx	2020-03-15 19:43:20.948684678 +0100
-@@ -492,7 +492,8 @@
-    sizeof(TemplateProxy),     // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)tpp_dealloc,   // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -541,6 +542,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx
---- root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx	2020-03-15 19:43:20.948684678 +0100
-@@ -42,7 +42,8 @@
-    0,                         // tp_basicsize
-    0,                         // tp_itemsize
-    0,                         // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -92,6 +93,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace PyROOT
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt	2020-03-15 19:43:20.949684667 +0100
-@@ -64,11 +64,6 @@
-     target_compile_options(cppyy PRIVATE -Wno-deprecated-register)
- endif()
- 
--# Disables warnings due to new field tp_vectorcall in Python 3.8
--if(NOT MSVC AND ${PYTHON_VERSION_STRING} VERSION_GREATER_EQUAL "3.8")
--  target_compile_options(cppyy PRIVATE -Wno-missing-field-initializers)
--endif()
+-  # Disables warnings due to new field tp_vectorcall in Python 3.8
+-  if(NOT MSVC AND ${python_version_string} VERSION_GREATER_EQUAL "3.8")
+-    target_compile_options(${libname} PRIVATE -Wno-missing-field-initializers)
+-  endif()
 -
- target_include_directories(cppyy PRIVATE ${CMAKE_BINARY_DIR}/include) # needed for string_view backport
- 
- target_include_directories(cppyy PUBLIC ${PYTHON_INCLUDE_DIRS}
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-03-15 19:43:20.949684667 +0100
+   target_include_directories(${libname}
+      PRIVATE
+         ${CMAKE_SOURCE_DIR}/core/foundation/inc   # needed for string_view backport
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-06-21 20:53:49.651914431 +0200
 @@ -167,7 +167,8 @@
      sizeof(CPPDataMember),         // tp_basicsize
      0,                             // tp_itemsize
@@ -299,10 +39,36 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDa
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-03-15 19:43:20.949684667 +0100
-@@ -565,7 +565,8 @@
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx	2020-06-21 20:53:49.651914431 +0200
+@@ -158,7 +158,8 @@
+     sizeof(CPPExcInstance),        // tp_basicsize
+     0,                             // tp_itemsize
+     (destructor)ep_dealloc,        // tp_dealloc
+-    0,                             // tp_print
++    0,                             // tp_print (python < 3.8)
++                                   // tp_vectorcall_offset (python >= 3.8)
+     0,                             // tp_getattr
+     0,                             // tp_setattr
+     0,                             // tp_compare
+@@ -211,6 +212,12 @@
+ #if PY_VERSION_HEX >= 0x03040000
+     , 0                            // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++    , 0                            // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++    , 0                            // tp_print (python 3.8 only)
++#endif
++#endif
+ };
+ 
+ } // namespace CPyCppyy
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-06-21 20:53:49.651914431 +0200
+@@ -746,7 +746,8 @@
      sizeof(CPPInstance),           // tp_basicsize
      0,                             // tp_itemsize
      (destructor)op_dealloc,        // tp_dealloc
@@ -312,7 +78,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -617,6 +618,12 @@
+@@ -798,6 +799,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -325,10 +91,10 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-03-15 19:43:20.950684656 +0100
-@@ -889,7 +889,8 @@
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-06-21 20:53:49.652914433 +0200
+@@ -866,7 +866,8 @@
      sizeof(CPPOverload),           // tp_basicsize
      0,                             // tp_itemsize
      (destructor)mp_dealloc,        // tp_dealloc
@@ -338,7 +104,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -938,6 +939,12 @@
+@@ -915,6 +916,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -351,10 +117,10 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx	2020-03-15 19:43:20.950684656 +0100
-@@ -596,7 +596,8 @@
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx	2020-06-21 20:53:49.652914433 +0200
+@@ -616,7 +616,8 @@
      sizeof(CPyCppyy::CPPScope),    // tp_basicsize
      0,                             // tp_itemsize
      0,                             // tp_dealloc
@@ -364,7 +130,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
      0,                             // tp_getattr
      0,                             // tp_setattr
      0,                             // tp_compare
-@@ -649,6 +650,12 @@
+@@ -669,6 +670,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -377,10 +143,11 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-03-15 19:43:20.951684646 +0100
-@@ -140,6 +140,12 @@
+Endast i root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src: CPPScope.cxx.orig
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-21 20:53:49.652914433 +0200
+@@ -141,6 +141,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                  // tp_finalize
  #endif
@@ -393,10 +160,10 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCp
  };
  
  namespace {
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-03-15 19:43:20.951684646 +0100
-@@ -33,6 +33,12 @@
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-06-21 20:53:49.652914433 +0200
+@@ -34,6 +34,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -409,7 +176,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  //= long type allowed for reference passing ==================================
-@@ -59,6 +65,12 @@
+@@ -60,6 +66,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -422,7 +189,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  //- custom type representing typedef to pointer of class ---------------------
-@@ -89,6 +101,12 @@
+@@ -90,6 +102,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -435,7 +202,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  //= instancemethod object with a more efficient call function ================
-@@ -254,6 +272,12 @@
+@@ -255,6 +273,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                            // tp_finalize
  #endif
@@ -448,7 +215,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  
-@@ -304,6 +328,12 @@
+@@ -305,6 +329,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -461,7 +228,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  
-@@ -355,6 +385,12 @@
+@@ -364,6 +394,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
  #endif
@@ -474,9 +241,9 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-03-15 19:43:20.951684646 +0100
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-06-21 20:53:49.653914436 +0200
 @@ -651,7 +651,8 @@
      sizeof(CPyCppyy::LowLevelView),// tp_basicsize
      0,                             // tp_itemsize
@@ -500,10 +267,10 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLe
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-03-15 19:43:20.952684635 +0100
-@@ -709,7 +709,8 @@
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-06-21 20:53:49.653914436 +0200
+@@ -730,7 +730,8 @@
     sizeof(TemplateProxy),     // tp_basicsize
     0,                         // tp_itemsize
     (destructor)tpp_dealloc,   // tp_dealloc
@@ -513,7 +280,7 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
     0,                         // tp_getattr
     0,                         // tp_setattr
     0,                         // tp_compare
-@@ -758,6 +759,12 @@
+@@ -779,6 +780,12 @@
  #if PY_VERSION_HEX >= 0x03040000
     , 0                        // tp_finalize
  #endif
@@ -526,9 +293,9 @@ diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
  };
  
  } // namespace CPyCppyy
-diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
---- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-03-15 19:43:20.952684635 +0100
+diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx
+--- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-06-21 20:53:49.653914436 +0200
 @@ -82,6 +82,12 @@
  #if PY_VERSION_HEX >= 0x03040000
      , 0                           // tp_finalize
diff --git a/root-setcachefiledir.patch b/root-setcachefiledir.patch
new file mode 100644
index 0000000..f73615e
--- /dev/null
+++ b/root-setcachefiledir.patch
@@ -0,0 +1,30 @@
+From 0bf4cdfee3f2189f4d43f7cde9ba114ce682cac5 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 29 Jun 2020 12:08:15 +0200
+Subject: [PATCH] Add missing call to TFile::SetCacheFileDir(".")
+
+Without it the following TFile::Open call using the CACHEREAD option
+will as work as intrnded:
+inputFile = TFile::Open(inputFileLink, "CACHEREAD");
+---
+ tutorials/tmva/TMVA_Higgs_Classification.C | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tutorials/tmva/TMVA_Higgs_Classification.C b/tutorials/tmva/TMVA_Higgs_Classification.C
+index 6b4a8ed028..85dffc2790 100644
+--- a/tutorials/tmva/TMVA_Higgs_Classification.C
++++ b/tutorials/tmva/TMVA_Higgs_Classification.C
+@@ -72,9 +72,8 @@ Define now input data file and signal and background trees
+    if (!inputFile) {
+       // download file from Cernbox location
+       Info("TMVA_Higgs_Classification","Download Higgs_data.root file");
++      TFile::SetCacheFileDir(".");
+       inputFile = TFile::Open(inputFileLink, "CACHEREAD");
+-      //gSystem->Exec( TString::Format("wget -O %s %s",inputFileName.Data(), downloadLinkFile.Data() ) );
+-      //inputFile = TFile::Open( inputFileName);
+       if (!inputFile) {
+          Error("TMVA_Higgs_Classification","Input file cannot be downloaded - exit");
+          return;
+-- 
+2.26.2
+
diff --git a/root-stressGraphics.patch b/root-stressGraphics.patch
new file mode 100644
index 0000000..c7ac170
--- /dev/null
+++ b/root-stressGraphics.patch
@@ -0,0 +1,34 @@
+From 141dc7359fa890b081802532b97c25eeb5be5ee1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 29 Jun 2020 12:53:07 +0200
+Subject: [PATCH] Adjust stressGraphics.ref
+
+---
+ test/stressGraphics.ref | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 38474d0549..2aecf462e8 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -3,7 +3,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
+     2      4627       600     14506       100      7608      1500     13368      7900      9208      3000      4690       600
+     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
+     4     23617      1500     19386       100     43077     12000    143320    123000     45665     11000     24908      1500
+-    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
++    5      1025       150     12802       200     19715      2900     33468      9900     30846      5000      1072       200
+     6       430        50     12669        50      4041       400      9558       100      5325       700       471        50
+     7      4980        50     13893        50      8215       310     16143      1300     12230       500      5011        70
+     8      5442        80     13473        50      9599       150     18430       700     12398       300      5469        80
+@@ -41,7 +41,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
+    40     38312       200     56877       250     47205      3900     36524     11800    119641      8000     38121       200
+    41     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
+    42    254604      5000    383258      7000     34608      5000     55666     30400     46534      6500    259594      7000
+-   43      4846       150     14075       100     24281       200     33239       600     25303       300      4877       150
++   43      4846       150     14075       150     24281       200     33239       600     25303       300      4877       150
+    44   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
+    45      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
+    46      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
+-- 
+2.26.2
+
diff --git a/root-testfiles.sh b/root-testfiles.sh
index c16a23e..db4d721 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -74,9 +74,11 @@ wget -N ${SITE}/wa91.root
 
 wget -N ${SITE}/AtlasGraphs.root
 wget -N ${SITE}/europe.root
+wget -N ${SITE}/Higgs_data.root
 wget -N ${SITE}/linearIO.root
 wget -N ${SITE}/stressHistogram.5.18.00.root
 wget -N ${SITE}/tmva_class_example.root
+wget -N ${SITE}/tmva_multiclass_example.root
 wget -N ${SITE}/tmva_reg_example.root
 wget -N ${SITE}/usa.root
 
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index 44939ca..6821f22 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/cmake/modules/SearchInstalledSoftware.cmake	2020-03-15 20:12:34.446078193 +0100
-@@ -1528,83 +1528,18 @@
+diff -ur root-6.22.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.22.00/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.22.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/cmake/modules/SearchInstalledSoftware.cmake	2020-06-21 18:29:13.973655810 +0200
+@@ -1592,100 +1592,17 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -13,20 +13,22 @@ diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20
 +  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
  
 -  set(_gtest_byproduct_binary_dir
--    ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build/googlemock/)
+-    ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build)
 -  set(_gtest_byproducts
--    ${_gtest_byproduct_binary_dir}/gtest/libgtest.a
--    ${_gtest_byproduct_binary_dir}/gtest/libgtest_main.a
--    ${_gtest_byproduct_binary_dir}/libgmock.a
--    ${_gtest_byproduct_binary_dir}/libgmock_main.a
+-    ${_gtest_byproduct_binary_dir}/lib/libgtest.a
+-    ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a
+-    ${_gtest_byproduct_binary_dir}/lib/libgmock.a
+-    ${_gtest_byproduct_binary_dir}/lib/libgmock_main.a
 -    )
 -
 -  if(MSVC)
 -    set(EXTRA_GTEST_OPTS
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=\\\"\\\"
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL:PATH=\\\"\\\"
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=\\\"\\\"
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=\\\"\\\")
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${_gtest_byproduct_binary_dir}/lib/
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL:PATH=${_gtest_byproduct_binary_dir}/lib/
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${_gtest_byproduct_binary_dir}/lib/
+-      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=${_gtest_byproduct_binary_dir}/lib/
+-      -Dgtest_force_shared_crt=ON
+-      BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release)
 -  endif()
 -  if(APPLE)
 -    set(EXTRA_GTEST_OPTS
@@ -37,7 +39,7 @@ diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20
 -    googletest
 -    GIT_REPOSITORY https://github.com/google/googletest.git
 -    GIT_SHALLOW 1
--    GIT_TAG release-1.8.0
+-    GIT_TAG release-1.10.0
 -    UPDATE_COMMAND ""
 -    # TIMEOUT 10
 -    # # Force separate output paths for debug and release builds to allow easy
@@ -46,11 +48,11 @@ diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20
 -    #            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
 -    #            -Dgtest_force_shared_crt=ON
 -    CMAKE_ARGS -G ${CMAKE_GENERATOR}
--                  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+-                  -DCMAKE_BUILD_TYPE=Release
 -                  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
 -                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 -                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-                  -DCMAKE_CXX_FLAGS=${ROOT_EXTERNAL_CXX_FLAGS}
 -                  -DCMAKE_AR=${CMAKE_AR}
 -                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
 -                  ${EXTRA_GTEST_OPTS}
@@ -66,24 +68,38 @@ diff -ur root-6.20.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.20
 -  ExternalProject_Get_Property(googletest source_dir)
 -  set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
 -  set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include)
+-  # Create the directories. Prevents bug https://gitlab.kitware.com/cmake/cmake/issues/15052
+-  file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
 -
 -  # Libraries
 -  ExternalProject_Get_Property(googletest binary_dir)
--  set(_G_LIBRARY_PATH ${binary_dir}/googlemock/)
+-  set(_G_LIBRARY_PATH ${binary_dir}/lib/)
 -
--  # Register gtest, gtest_main, gmock, gmock_main
--  foreach (lib gtest gtest_main gmock gmock_main)
-+  # Register gmock, gmock_main
-+  foreach (lib gmock gmock_main)
+-  # Use gmock_main instead of gtest_main because it initializes gtest as well.
+-  # Note: The libraries are listed in reverse order of their dependancies.
+-  foreach(lib gtest gtest_main gmock gmock_main)
++  foreach(lib gmock gmock_main)
      add_library(${lib} IMPORTED STATIC GLOBAL)
+-    set_target_properties(${lib} PROPERTIES
+-      IMPORTED_LOCATION "${_G_LIBRARY_PATH}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+-      INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
+-    )
 -    add_dependencies(${lib} googletest)
 -    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
 -        ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 9)
 -      target_compile_options(${lib} INTERFACE -Wno-deprecated-copy)
 -    endif()
    endforeach()
--  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
--  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  # Once we require at least cmake 3.11, target_include_directories will work for imported targets
+-  # Because of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/1264
+-  # We need this workaround:
+-  SET_PROPERTY(TARGET gtest APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR})
+-  SET_PROPERTY(TARGET gmock APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR})
+-  #target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIR})
+-  #target_include_directories(gmock INTERFACE ${GMOCK_INCLUDE_DIR})
+-
+-  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
    set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
    set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX})
  
diff --git a/root-v7-line.patch b/root-v7-line.patch
deleted file mode 100644
index 29eed7e..0000000
--- a/root-v7-line.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur root-6.16.00.orig/tutorials/v7/line.cxx root-6.16.00/tutorials/v7/line.cxx
---- root-6.16.00.orig/tutorials/v7/line.cxx	2019-01-23 09:23:37.000000000 +0100
-+++ root-6.16.00/tutorials/v7/line.cxx	2019-05-17 11:02:14.378664352 +0200
-@@ -6,7 +6,6 @@
- /// "normal" coordinates' system and changing the line color linearly from black
- /// to red.
- ///
--/// \macro_image (line.png)
- /// \macro_code
- ///
- /// \date 2018-03-18
diff --git a/root-werror-fix.patch b/root-werror-fix.patch
new file mode 100644
index 0000000..341cca9
--- /dev/null
+++ b/root-werror-fix.patch
@@ -0,0 +1,57 @@
+From a5185f2cdf509314970c1b332c5926283f6962e2 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 22 Jun 2020 09:21:23 +0200
+Subject: [PATCH] Fix too aggressive -Werror replacements
+
+The replacements removes the -Werror option for externals, which is
+intended. However, it also replaces e.g. -Werror=format-security with
+=format-security, which results in compilation failures due to the
+unknown option =format-security.
+---
+ builtins/davix/CMakeLists.txt               | 2 +-
+ cmake/modules/SearchInstalledSoftware.cmake | 2 +-
+ interpreter/CMakeLists.txt                  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt
+index 52614ae2e0..c9b291ec45 100644
+--- a/builtins/davix/CMakeLists.txt
++++ b/builtins/davix/CMakeLists.txt
+@@ -21,7 +21,7 @@ foreach(lib davix neon)
+   list(APPEND DAVIX_LIBRARIES ${DAVIX_PREFIX}/lib/${libname})
+ endforeach()
+ 
+-string(REPLACE "-Werror" "" DAVIX_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" DAVIX_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+ 
+ ExternalProject_Add(DAVIX
+   URL ${DAVIX_URL}/davix-${DAVIX_VERSION}.tar.gz
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index ad63f08cd0..36aa88d8cf 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -9,7 +9,7 @@ include(ExternalProject)
+ include(FindPackageHandleStandardArgs)
+ 
+ set(lcgpackages http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources)
+-string(REPLACE "-Werror" "" ROOT_EXTERNAL_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" ROOT_EXTERNAL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+ 
+ macro(find_package)
+   if(NOT "${ARGV0}" IN_LIST ROOT_BUILTINS)
+diff --git a/interpreter/CMakeLists.txt b/interpreter/CMakeLists.txt
+index 0f43893443..1274758410 100644
+--- a/interpreter/CMakeLists.txt
++++ b/interpreter/CMakeLists.txt
+@@ -140,7 +140,7 @@ if(gcctoolchain)
+ endif()
+ 
+ # We will not fix llvm or clang.
+-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+ 
+ if(LLVM_SHARED_LINKER_FLAGS)
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LLVM_SHARED_LINKER_FLAGS}")
+-- 
+2.26.2
+
diff --git a/root-xmlmodify-dep.patch b/root-xmlmodify-dep.patch
deleted file mode 100644
index 02a0498..0000000
--- a/root-xmlmodify-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a651fb9278438d5ad7e4ddbf6082a791e1187e0d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 12:58:14 +0100
-Subject: [PATCH] The test that creates the file must run before the test that
- modifies it
-
----
- tutorials/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index f920da54ee..b1abd03d36 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -375,6 +375,7 @@ set(unfold-testUnfold5b-depends tutorial-unfold-testUnfold5a)
- set(unfold-testUnfold7d-depends tutorial-unfold-testUnfold7c)
- set(unfold-testUnfold7c-depends tutorial-unfold-testUnfold7b)
- set(unfold-testUnfold7b-depends tutorial-unfold-testUnfold7a)
-+set(xml-xmlmodifyfile-depends tutorial-xml-xmlnewfile)
- set(xml-xmlreadfile-depends tutorial-xml-xmlnewfile)
- set(roofit-rf503_wspaceread-depends tutorial-roofit-rf502_wspacewrite)
- set(histfactory-example-depends tutorial-roostats-CreateExampleFile)
--- 
-2.24.1
-
diff --git a/root-xrootd5-compat.patch b/root-xrootd5-compat.patch
new file mode 100644
index 0000000..5a7ecda
--- /dev/null
+++ b/root-xrootd5-compat.patch
@@ -0,0 +1,109 @@
+From c81fab4b81b4767abdca612f33604b252fc665b7 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 14 Jul 2020 08:10:00 +0200
+Subject: [PATCH] Compatibility with xrootd 5.
+
+The old client library libXrdClient is removed.
+Also XrdSysDNS is removed.
+
+Do not build the legacy XProofD file server and client (already
+disabled by default - give error if someone enables it while building
+with xrootd 5).
+
+Do not build the old libNetx.
+
+Build the new libNetNG without XrdSysDNS, use XrdNetAddr instead.
+---
+ cmake/modules/SearchInstalledSoftware.cmake | 15 +++++++++++++++
+ net/CMakeLists.txt                          |  2 +-
+ net/netxng/src/TNetXNGSystem.cxx            | 18 +++++++++++++++++-
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index 12f9d65371..3578303c5d 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -925,6 +925,21 @@ if(xrootd AND XROOTD_VERSIONNUM VERSION_GREATER 300030005)
+ else()
+   set(netxng OFF)
+ endif()
++if(xrootd AND XROOTD_VERSIONNUM VERSION_LESS 500000000)
++  set(netx ON)
++else()
++  set(netx OFF)
++endif()
++if(xrootd AND XROOTD_VERSIONNUM VERSION_GREATER_EQUAL 500000000)
++  if(xproofd)
++    if(fail-on-missing)
++      message(FATAL_ERROR "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Use -Dxproofd:BOOL=OFF to disable.")
++    else()
++      message(STATUS "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Disbaling xproofd' option.")
++      set(xproofd OFF CACHE BOOL "Disabled because xrootd version is 5 or greater" FORCE)
++    endif()
++  endif()
++endif()
+ 
+ #---Alien support----------------------------------------------------------------
+ if(alien)
+diff --git a/net/CMakeLists.txt b/net/CMakeLists.txt
+index 953d9c5d6f..676eb63672 100644
+--- a/net/CMakeLists.txt
++++ b/net/CMakeLists.txt
+@@ -11,7 +11,7 @@ if(NOT WIN32 AND ssl)
+   add_subdirectory(rpdutils)
+ endif()
+ 
+-if(xrootd)
++if(netx)
+   add_subdirectory(netx)
+ endif()
+ 
+diff --git a/net/netxng/src/TNetXNGSystem.cxx b/net/netxng/src/TNetXNGSystem.cxx
+index 6599aa2c2f..d30a12554f 100644
+--- a/net/netxng/src/TNetXNGSystem.cxx
++++ b/net/netxng/src/TNetXNGSystem.cxx
+@@ -27,7 +27,12 @@
+ #include "TVirtualMutex.h"
+ #include <XrdCl/XrdClFileSystem.hh>
+ #include <XrdCl/XrdClXRootDResponses.hh>
++#include <XrdVersion.hh>
++#if XrdVNUMBER >= 40000
++#include <XrdNet/XrdNetAddr.hh>
++#else
+ #include <XrdSys/XrdSysDNS.hh>
++#endif
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -352,6 +357,16 @@ Int_t TNetXNGSystem::Locate(const char *path, TString &endurl)
+    TNamed *hn = 0;
+    if (fgAddrFQDN.GetSize() <= 0 ||
+        !(hn = dynamic_cast<TNamed *>(fgAddrFQDN.FindObject(loc)))) {
++#if XrdVNUMBER >= 40000
++      XrdNetAddr netaddr;
++      netaddr.Set(loc.Data());
++      const char* name = netaddr.Name();
++      if (name) {
++         hn = new TNamed(loc.Data(), name);
++      } else {
++         hn = new TNamed(loc, loc);
++      }
++#else
+       char *addr[1] = {0}, *name[1] = {0};
+       int naddr = XrdSysDNS::getAddrName(loc.Data(), 1, addr, name);
+       if (naddr == 1) {
+@@ -359,9 +374,10 @@ Int_t TNetXNGSystem::Locate(const char *path, TString &endurl)
+       } else {
+          hn = new TNamed(loc, loc);
+       }
+-      fgAddrFQDN.Add(hn);
+       free(addr[0]);
+       free(name[0]);
++#endif
++      fgAddrFQDN.Add(hn);
+       if (gDebug > 0)
+          Info("Locate","caching host name: %s", hn->GetTitle());
+    }
+-- 
+2.26.2
+
diff --git a/root.spec b/root.spec
index 2929aa2..57d53a7 100644
--- a/root.spec
+++ b/root.spec
@@ -1,19 +1,8 @@
-%if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8
-# Use Python 3 as the default python for Fedora >= 29
-# - Give python3 libPyROOT higher priority than python2 libPyROOT
-# - The python scripts in root-cli use python3-root
-# - Let root-tmva-python use python3-numpy
-# - Don't build python2-jupyroot/jsmva packages
-# - Use Python 3 during testing and documentation build
-%global py3default 1
-%global py2prio 10
-%global py3prio 20
-%global __pythondef %{__python3}
+%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 9
+%undefine __cmake_in_source_build
+%global oldcmakemacro 0
 %else
-%global py3default 0
-%global py2prio 20
-%global py3prio 10
-%global __pythondef %{__python2}
+%global oldcmakemacro 1
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
@@ -23,8 +12,12 @@
 %global buildpy2 1
 %endif
 
+%if %{buildpy2}
+%global python2_version_uscore %(tr . _ <<< "%{python2_version}")
+%endif
+%global python3_version_uscore %(tr . _ <<< "%{python3_version}")
+
 %global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
-%global py3_other_soabi %([ -x %{__python3_other} ] && %{__python3_other} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
 
 %if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
 # Building the experimental ROOT 7 classes requires c++-14.
@@ -44,14 +37,13 @@
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
-# Do not generate autoprovides for libJupyROOT.so
-# Note: the ones from libPyROOT.so we do want though
-%global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
+# Do not generate autoprovides for Python modules
+%global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.20.06
+Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -101,37 +93,56 @@ Patch9:		%{name}-dont-install-minicern.patch
 Patch10:	%{name}-clang-ignore-gcc-options.patch
 #		Don't create documentation notebooks
 Patch11:	%{name}-doc-no-notebooks.patch
-#		Don't run tutorial requiring firefox during doc generation
-Patch12:	%{name}-v7-line.patch
-#		Fix ppc64le build with gcc 10
-#		https://github.com/root-project/root/pull/5157
-Patch13:	%{name}-clang-altivec-vector.patch
+#		Don't run tutorials that crash during doc generation
+Patch12:	%{name}-doxygen-crash.patch
+#		Compatibility with older gtest
+Patch13:	%{name}-old-gtest-compat.patch
 #		Fix -Wmissing-field-initializers in python bindings for
 #		Python 3.8 and 3.9
 #		https://github.com/root-project/root/pull/5158
 Patch14:	%{name}-python3.8-object.patch
-#		Correct broken assert statements
-#		https://github.com/root-project/root/pull/5159
-Patch15:	%{name}-FitData-assert-fix.patch
-#		The test that creates the file must run before the test that
-#		modifies it
-#		https://github.com/root-project/root/pull/5160
-Patch16:	%{name}-xmlmodify-dep.patch
-#		Size types should use %z
-#		https://github.com/root-project/root/pull/5161
-Patch17:	%{name}-format-fix.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch18:	%{name}-32bit-tests.patch
-#		The file was moved - update path
-#		https://github.com/root-project/root/pull/5162
-Patch19:	%{name}-moved-file.patch
+Patch15:	%{name}-32bit-tests.patch
 #		Workaround for initialization problems for PyROOT on
 #		EPEL7 ppc64le
 #		https://sft.its.cern.ch/jira/browse/ROOT-10622
-Patch20:	%{name}-epel7-ppc64le-pyroot.patch
+Patch16:	%{name}-epel7-ppc64le-pyroot.patch
 #		Fix test failure on ppc64le and aarch64
 #		https://github.com/root-project/root/pull/5867
-Patch21:	%{name}-roostats-test-ppc64le-aarch64.patch
+Patch17:	%{name}-roostats-test-ppc64le-aarch64.patch
+#		Fix too aggressive -Werror replacements
+#		https://github.com/root-project/root/pull/5902
+Patch18:	%{name}-werror-fix.patch
+#		Add missing call to TFile::SetCacheFileDir in a TMVA tutorial
+#		https://github.com/root-project/root/pull/5944
+Patch19:	%{name}-setcachefiledir.patch
+#		Adjust stressGraphics.ref
+#		https://github.com/root-project/root/pull/5957
+Patch20:	%{name}-stressGraphics.patch
+#		Fix off-by-one error in histogram v7 bin iterator
+#		https://github.com/root-project/root/pull/5958
+Patch21:	%{name}-histv7-bin-iterator.patch
+#		Compatibility with python 2.7 versions before 2.7.9
+#		https://github.com/root-project/root/pull/5960
+Patch22:	%{name}-python2-compat.patch
+#		Fix the RNTuple.LargeFile test on 32bit (i386 and armv7hf)
+#		https://github.com/root-project/root/pull/5977
+Patch23:	%{name}-ntuple-largefile.patch
+#		Fix doxygen issues
+#		https://github.com/root-project/root/pull/6029
+Patch24:	%{name}-doxygen-filenames.patch
+Patch25:	%{name}-doxygen-endof-part1.patch
+Patch26:	%{name}-doxygen-endof-part2.patch
+Patch27:	%{name}-doxygen-parameter-names.patch
+Patch28:	%{name}-doxygen-macro-name.patch
+Patch29:	%{name}-doxygen-missing-underscore.patch
+Patch30:	%{name}-doxygen-md-comments.patch
+#		Fix bad regex in TProofMgr
+#		https://github.com/root-project/root/pull/6030
+Patch31:	%{name}-fix-bad-regex.patch
+#		Compatibility with xrootd 5
+#		https://github.com/root-project/root/pull/6031
+Patch32:	%{name}-xrootd5-compat.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -185,9 +196,6 @@ BuildRequires:	postgresql-devel
 BuildRequires:	python2-devel
 %endif
 BuildRequires:	python%{python3_pkgversion}-devel
-%if %{?rhel}%{!?rhel:0} == 7
-BuildRequires:	python%{python3_other_pkgversion}-devel
-%endif
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel
@@ -218,11 +226,7 @@ BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
 BuildRequires:	blas-devel
-%if %{py3default}
 BuildRequires:	python%{python3_pkgversion}-numpy
-%else
-BuildRequires:	python2-numpy
-%endif
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
@@ -372,12 +376,15 @@ Obsoletes:	%{name}-net-krb5 < 6.18.00
 Obsoletes:	%{name}-table < 6.18.00
 %if ! %{buildpy2}
 Obsoletes:	python2-%{name} < %{version}-%{release}
-%endif
-%if %{py3default}
 Obsoletes:	python2-jupyroot < %{version}-%{release}
 Obsoletes:	python2-jsmva < %{version}-%{release}
 Obsoletes:	%{name}-rootaas < 6.08.00
 %endif
+%if %{?rhel}%{!?rhel:0} == 7
+Obsoletes:	python%{python3_other_pkgversion}-%{name} < 6.22.00
+Obsoletes:	python%{python3_other_pkgversion}-jupyroot < 6.22.00
+Obsoletes:	python%{python3_other_pkgversion}-jsmva < 6.22.00
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -415,6 +422,17 @@ Obsoletes:	%{name}-reflex < 6.00.00
 Cling is an interactive C++ interpreter, built on top of Clang and
 LLVM compiler infrastructure.
 
+%package tpython
+Summary:	ROOT's TPython interface
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
+#		Package split (tpython from Python bindings)
+Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
+
+%description tpython
+This package contains ROOT's TPython interface. It makes it possible
+to call Python from ROOT.
+
 %if %{buildpy2}
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
@@ -426,11 +444,9 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description -n python2-%{name}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-%endif
+This package contains the Python extension for ROOT. It makes it
+possible to use ROOT classes in Python.
 
-%if ! %{py3default}
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
 %{?python_provide:%python_provide python2-jupyroot}
@@ -470,10 +486,12 @@ Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split (tpython from Python bindings)
+Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
 
 %description -n python%{python3_pkgversion}-%{name}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
+This package contains the Python extension for ROOT. It makes it
+possible to use ROOT classes in Python.
 
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
@@ -504,44 +522,12 @@ Requires:	%{name}-tmva = %{version}-%{release}
 %description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
-%if %{?rhel}%{!?rhel:0} == 7
-%package -n python%{python3_other_pkgversion}-%{name}
-Summary:	Python extension for ROOT
-%{?python_provide:%python_provide python%{?python3_other_pkgversion}-%{name}}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description -n python%{python3_other_pkgversion}-%{name}
-This package contains the Python extension for ROOT. This package
-provide a Python interface to ROOT, and a ROOT interface to Python.
-
-%package -n python%{python3_other_pkgversion}-jupyroot
-Summary:	ROOT Jupyter kernel
-%{?python_provide:%python_provide python%{?python3_other_pkgversion}-jupyroot}
-Requires:	python%{python3_other_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
-Requires:	python%{python3_other_pkgversion}-jsmva = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-notebook = %{version}-%{release}
-#		python-metakernel not available - some functionality missing
-
-%description -n python%{python3_other_pkgversion}-jupyroot
-The Jupyter kernel for the ROOT notebook.
-
-%package -n python%{python3_other_pkgversion}-jsmva
-Summary:	TMVA interface used by JupyROOT
-BuildArch:	noarch
-%{?python_provide:%python_provide python%{?python3_other_pkgversion}-jsmva}
-Requires:	%{name}-tmva = %{version}-%{release}
-
-%description -n python%{python3_other_pkgversion}-jsmva
-TMVA interface used by JupyROOT.
-%endif
-
 %package r
 Summary:	R interface for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	R-Rcpp-devel
+Requires:	R-RInside-devel
 
 %description r
 ROOT R is an interface in ROOT to call R functions using an R C++
@@ -794,6 +780,7 @@ Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 
 %description gui-fitpanel
 This package contains a library to show a pop-up dialog when fitting
@@ -1560,11 +1547,7 @@ Summary:	Toolkit for multivariate data analysis (Python)
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
-%if %{py3default}
 Requires:	python%{python3_pkgversion}-numpy
-%else
-Requires:	python2-numpy
-%endif
 
 %description tmva-python
 Python integration with TMVA.
@@ -1670,11 +1653,7 @@ An algorithm to unfold distributions from detector to truth level.
 %package cli
 Summary:	ROOT command line utilities
 BuildArch:	noarch
-%if %{py3default}
 Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
-%else
-Requires:	python2-%{name} = %{version}-%{release}
-%endif
 
 %description cli
 The ROOT command line utilities is a set of scripts for common tasks
@@ -1728,16 +1707,26 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description graf3d-eve7
 This package contains a library for defining event displays in ROOT 7.
 
+%package gui-browsable
+Summary:	GUI browsable (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description gui-browsable
+This package contains GUI browsable components for ROOT 7.
+
 %package gui-browserv7
 Summary:	Browser (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description gui-browserv7
 This package contains a file browser for ROOT 7.
@@ -1847,6 +1836,17 @@ This package contains an ntuple extension for ROOT 7.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1855,9 +1855,7 @@ rm -rf graf2d/asimage/src/libAfterImage
 rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 #  * freetype
 rm -rf graf2d/freetype/src
-#  * glew
-rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem
-#  * davix, lz4, openssl, pcre, xxhash, zlib, zstd
+#  * davix, glew, lz4, openssl, pcre, xxhash, zlib, zstd
 rm -rf builtins
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
@@ -1887,20 +1885,6 @@ chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
-%if %{py3default}
-%if %{buildpy2}
-# Build PyROOT for python 2
-cp -pr bindings/pyroot bindings/python2
-%endif
-%else
-# Build PyROOT for python 3
-cp -pr bindings/pyroot bindings/python3
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
-# Build PyROOT for python 3 (other)
-cp -pr bindings/pyroot bindings/python3oth
-%endif
-
 # Work around missing libraries in Fedora's gmock packaging < 1.8.0
 if [ ! -r %{_libdir}/libgmock.so ] ; then
 mkdir googlemock
@@ -1933,12 +1917,13 @@ for s in etc/notebook/JsMVA/css/*.css ; do
     yuicompressor ${s} -o ${s%.css}.min.css
 done
 
-mkdir builddir
-pushd builddir
-
 # Avoid overlinking (this used to be the default with the old configure script)
 LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 
+%if %{oldcmakemacro}
+mkdir %{_vpath_builddir}
+pushd %{_vpath_builddir}
+%endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 %cmake \
 %else
@@ -1995,6 +1980,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Ddataframe:BOOL=ON \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
+       -Ddev:BOOL=OFF \
        -Dexceptions:BOOL=ON \
        -Dfcgi:BOOL=ON \
        -Dfftw3:BOOL=ON \
@@ -2027,8 +2013,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dpgsql:BOOL=ON \
        -Dpythia6:BOOL=OFF \
        -Dpythia8:BOOL=ON \
-       -DPYTHON_EXECUTABLE:PATH=%{__pythondef} \
        -Dpyroot:BOOL=ON \
+       -Dpyroot_legacy:BOOL=OFF \
 %ifarch %{qt5_qtwebengine_arches}
        -Dqt5web:BOOL=ON \
 %else
@@ -2064,127 +2050,23 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dx11:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
+       -Dxproofd:BOOL=ON \
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
        -Dclingtest:BOOL=OFF \
        -Dcoverage:BOOL=OFF \
        -Droottest:BOOL=OFF \
        -Drootbench:BOOL=OFF \
+       -Dasan:BOOL=OFF \
+%if %{oldcmakemacro}
        ..
-
-%if %{py3default}
-%if %{buildpy2}
-# Build PyROOT for python 2 (prep)
-cp -pr bindings/pyroot bindings/python2
-%endif
-%else
-# Build PyROOT for python 3 (prep)
-cp -pr bindings/pyroot bindings/python3
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
-# Build PyROOT for python 3 (other) (prep)
-cp -pr bindings/pyroot bindings/python3oth
-%endif
-
-make %{?_smp_mflags}
-
-%if %{py3default}
-
-%if %{buildpy2}
-
-# Build PyROOT for python 2
-mkdir python2
-mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python2!g' CMakeFiles/Makefile2.save \
-    > CMakeFiles/Makefile2
-py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
-py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-if pkg-config --exists python3-embed ; then
-    py3i=`pkg-config --cflags-only-I python3-embed | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python3-embed | sed -e 's/-l//' -e 's/\s*$//'`
-else
-    py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
-fi
-sed -e "s,${py3i},${py2i},g" -e "s,-l${py3l},-l${py2l},g" \
-    -e "s,lib${py3l},lib${py2l},g" \
-    -e 's,%{__python}%{python3_version},%{__python2},g' \
-    -e 's,%{__python3},%{__python2},g' \
-    -e 's,lib/libPyROOT,python2/libPyROOT,g' \
-    -e 's,lib/libJupyROOT,python2/libJupyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python2!g' \
-    -i `find bindings/python2 -type f`
-make %{?_smp_mflags} -f bindings/python2/Makefile PyROOT JupyROOT
-mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
-
-%endif
-
-%else
-
-# Build PyROOT for python 3
-mkdir python3
-mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python3!g' CMakeFiles/Makefile2.save \
-    > CMakeFiles/Makefile2
-py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
-py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-if pkg-config --exists python3-embed ; then
-    py3i=`pkg-config --cflags-only-I python3-embed | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python3-embed | sed -e 's/-l//' -e 's/\s*$//'`
-else
-    py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'`
-fi
-sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g" \
-    -e "s,lib${py2l},lib${py3l},g" \
-    -e 's,%{__python}%{python2_version},%{__python3},g' \
-    -e 's,%{__python2},%{__python3},g' \
-    -e 's,lib/libPyROOT,python3/libPyROOT,g' \
-    -e 's,lib/libJupyROOT,python3/libJupyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python3!g' \
-    -i `find bindings/python3 -type f`
-make %{?_smp_mflags} -f bindings/python3/Makefile PyROOT JupyROOT
-mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
-
-%endif
-
-%if %{?rhel}%{!?rhel:0} == 7
-
-# Build PyROOT for python 3 (other)
-mkdir python3oth
-mv CMakeFiles/Makefile2 CMakeFiles/Makefile2.save
-sed 's!bindings/pyroot!bindings/python3oth!g' CMakeFiles/Makefile2.save \
-    > CMakeFiles/Makefile2
-py2i=`pkg-config --cflags-only-I python2 | sed -e 's/-I//' -e 's/\s*$//'`
-py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'`
-if pkg-config --exists python-%{python3_other_version}-embed ; then
-    py3i=`pkg-config --cflags-only-I python-%{python3_other_version}-embed | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python-%{python3_other_version}-embed | sed -e 's/-l//' -e 's/\s*$//'`
-else
-    py3i=`pkg-config --cflags-only-I python-%{python3_other_version} | sed -e 's/-I//' -e 's/\s*$//'`
-    py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e 's/-l//' -e 's/\s*$//'`
-fi
-sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
-    -e "s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g" \
-    -e "s,lib${py2l},lib${py3l},g" \
-    -e 's,%{__python}%{python2_version},%{__python3_other},g' \
-    -e 's,%{__python2},%{__python3_other},g' \
-    -e 's,lib/libPyROOT,python3oth/libPyROOT,g' \
-    -e 's,lib/libJupyROOT,python3oth/libJupyROOT,g' \
-    -e 's!bindings/pyroot!bindings/python3oth!g' \
-    -i `find bindings/python3oth -type f`
-make %{?_smp_mflags} -f bindings/python3oth/Makefile PyROOT JupyROOT
-mv CMakeFiles/Makefile2.save CMakeFiles/Makefile2
-
-%endif
-
 popd
+%endif
+
+%make_build -C %{_vpath_builddir}
 
 %install
-pushd builddir
-make %{?_smp_mflags} install DESTDIR=%{buildroot}
-popd
+%make_install -C %{_vpath_builddir}
 
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
@@ -2210,9 +2092,7 @@ install -p -m 644 %{SOURCE7} %{buildroot}%{_pkgdocdir}
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
    %{buildroot}%{_datadir}/%{name}/cli
-%if %{py3default}
 rm %{buildroot}%{_libdir}/%{name}/__pycache__/cmdLineUtils.*
-%endif
 sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
 # Install GDB pretty printers to auto load safe path
@@ -2228,29 +2108,67 @@ install -p -m 644 build/gdbPrinters/libRooFitCore.so-gdb.py \
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # This is the default for Fedora 30+, set it for Fedora 28-29
 %global _python_bytecompile_extra 0
-%py_byte_compile %{__pythondef} %{buildroot}%{_datadir}/%{name}/cli
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 %endif
 
-%if %{py3default}
+%if %{buildpy2}
+
+# Move the python modules to sitearch/sitelib
+mkdir -p %{buildroot}%{python2_sitearch}
+
+cp -pr %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python2_sitearch}
+ln -s ../../root/libcppyy%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libcppyy%{python2_version_uscore}.so
+
+cp -pr %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python2_sitearch}
+ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libcppyy_backend%{python2_version_uscore}.so
+
+cp -pr %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python2_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libROOTPythonizations%{python2_version_uscore}.so
+rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so
+
+cp -pr %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so.%{version} \
+   %{buildroot}%{python2_sitearch}/libJupyROOT%{python2_version_uscore}.so
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so
+
+mkdir -p %{buildroot}%{python2_sitelib}
+cp -pr %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
+
+# Create empty .egg-info files so that rpm auto-generates provides
+touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
+touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
+
+%endif
 
 # Move the python modules to sitearch/sitelib
 mkdir -p %{buildroot}%{python3_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.rootmap \
-   %{buildroot}%{python3_sitearch}/libPyROOT.rootmap
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT_rdict.pcm \
-   %{buildroot}%{python3_sitearch}/libPyROOT_rdict.pcm
-mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libJupyROOT.so
-mv %{buildroot}%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
-rm %{buildroot}%{_libdir}/%{name}/JupyROOT/README.md
-rm -rf %{buildroot}%{_libdir}/%{name}/JupyROOT/src
+
+mv %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python3_sitearch}
+ln -s ../../root/libcppyy%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libcppyy%{python3_version_uscore}.%{py3_soabi}.so
+
+mv %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python3_sitearch}
+ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
+
+mv %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.%{py3_soabi}.so
+rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so
+
 mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
+mv %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.%{py3_soabi}.so
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{libversion}
+rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so
 
 mkdir -p %{buildroot}%{python3_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
@@ -2260,135 +2178,10 @@ touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
 touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
 touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 
-%if %{buildpy2}
-
-tmpdir=`mktemp -d`
-
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-DESTDIR=$tmpdir cmake -P builddir/bindings/python2/cmake_install.cmake
-%else
-DESTDIR=$tmpdir cmake3 -P builddir/bindings/python2/cmake_install.cmake
-%endif
-
-mkdir -p %{buildroot}%{python2_sitearch}
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libPyROOT.so
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
-   %{buildroot}%{python2_sitearch}/libPyROOT.rootmap
-mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
-   %{buildroot}%{python2_sitearch}/libPyROOT_rdict.pcm
-mv $tmpdir%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
-
-rm -rf $tmpdir
-
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-
-%endif
-
-%else
-
-# Move the python modules to sitearch/sitelib
-mkdir -p %{buildroot}%{python2_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libPyROOT.so
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT.rootmap \
-   %{buildroot}%{python2_sitearch}/libPyROOT.rootmap
-mv %{buildroot}%{_libdir}/%{name}/libPyROOT_rdict.pcm \
-   %{buildroot}%{python2_sitearch}/libPyROOT_rdict.pcm
-mv %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libJupyROOT.so
-mv %{buildroot}%{_libdir}/%{name}/*.py* %{buildroot}%{python2_sitearch}
-rm %{buildroot}%{_libdir}/%{name}/JupyROOT/README.md
-rm -rf %{buildroot}%{_libdir}/%{name}/JupyROOT/src
-mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT.so
-
-mkdir -p %{buildroot}%{python2_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
-
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
-
-tmpdir=`mktemp -d`
-
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-DESTDIR=$tmpdir cmake -P builddir/bindings/python3/cmake_install.cmake
-%else
-DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3/cmake_install.cmake
-%endif
-
-mkdir -p %{buildroot}%{python3_sitearch}
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
-   %{buildroot}%{python3_sitearch}/libPyROOT.rootmap
-mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
-   %{buildroot}%{python3_sitearch}/libPyROOT_rdict.pcm
-mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libJupyROOT.so
-mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch}
-mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_sitearch}
-rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
-rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
-mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
-
-mkdir -p %{buildroot}%{python3_sitelib}
-mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
-
-rm -rf $tmpdir
-
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
-
-%endif
-
-%if %{?rhel}%{!?rhel:0} == 7
-
-tmpdir=`mktemp -d`
-
-DESTDIR=$tmpdir cmake3 -P builddir/bindings/python3oth/cmake_install.cmake
-
-mkdir -p %{buildroot}%{python3_other_sitearch}
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \
-   %{buildroot}%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
-mv $tmpdir%{_libdir}/%{name}/libPyROOT.rootmap \
-   %{buildroot}%{python3_other_sitearch}/libPyROOT.rootmap
-mv $tmpdir%{_libdir}/%{name}/libPyROOT_rdict.pcm \
-   %{buildroot}%{python3_other_sitearch}/libPyROOT_rdict.pcm
-mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \
-   %{buildroot}%{python3_other_sitearch}/libJupyROOT.so
-mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_other_sitearch}
-mv $tmpdir%{_libdir}/%{name}/__pycache__ %{buildroot}%{python3_other_sitearch}
-rm $tmpdir%{_libdir}/%{name}/JupyROOT/README.md
-rm -rf $tmpdir%{_libdir}/%{name}/JupyROOT/src
-mv $tmpdir%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_other_sitearch}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{libversion}
-rm $tmpdir%{_libdir}/%{name}/libJupyROOT.so
-
-mkdir -p %{buildroot}%{python3_other_sitelib}
-mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_other_sitelib}
-
-rm -rf $tmpdir
-
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_other_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python3_other_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python3_other_sitelib}/JsMVA-%{version}.egg-info
-
-%endif
-
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
-%if ! %{py3default}
+%if %{buildpy2}
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
 sed -e 's/ROOT C++/& (Python 2)/' \
@@ -2406,16 +2199,6 @@ sed -e 's/ROOT C++/& (Python 3)/' \
 sed -e '/^\#!/d' \
     -i %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
 
-%if %{?rhel}%{!?rhel:0} == 7
-cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
-   %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
-sed -e 's/ROOT C++/& (Python %{python3_other_version})/' \
-    -e 's!python[0-9]*\.[0-9]*!%{__python3_other}!' \
-    -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot/kernel.json
-sed -e '/^\#!/d' \
-    -i %{buildroot}%{python3_other_sitearch}/JupyROOT/kernel/rootkernel.py
-%endif
-
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/kernels
@@ -2438,7 +2221,7 @@ EOF
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed -e 's!/usr/bin/env python.*!%{__pythondef}!' \
+sed -e 's!/usr/bin/env python.*!%{__python3}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2451,9 +2234,9 @@ sed -e 's!/usr/bin/env python.*!%{__pythondef}!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
-sed -e 's!/usr/bin/env python.*!%{__pythondef}!' \
+sed -e 's!/usr/bin/env python.*!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
-sed -e 's!/usr/bin/env python!%{__pythondef}!' \
+sed -e 's!/usr/bin/env python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
@@ -2491,6 +2274,9 @@ rm TGuiFactory/P030_TWebGuiFactory.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
+%if %{root7} == 0
+rm TVirtualGeoPainter/P020_REveGeoPainter.C
+%endif
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
@@ -2539,22 +2325,53 @@ for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
     ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
 done
 # Create the py-hsimple.root file in advance (needed as input)
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
-    ROOTSYS=${PWD}/../../builddir \
-    LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
-    PYTHONPATH=${PWD}/../../builddir/lib \
-    %{__pythondef} ../../tutorials/pyroot/hsimple.py
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
-    ROOTSYS=${PWD}/../../builddir \
-    LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
-    PYTHONPATH=${PWD}/../../builddir/lib \
-    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc PYTHON_EXECUTABLE=%{__pythondef}
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
+    ROOTSYS=${PWD}/../../%{_vpath_builddir} \
+    LD_LIBRARY_PATH=${PWD}/../../%{_vpath_builddir}/lib \
+    PYTHONPATH=${PWD}/../../%{_vpath_builddir}/lib \
+    %{__python3} ../../tutorials/pyroot/hsimple.py
+ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
+    ROOTSYS=${PWD}/../../%{_vpath_builddir} \
+    LD_LIBRARY_PATH=${PWD}/../../%{_vpath_builddir}/lib \
+    PYTHONPATH=${PWD}/../../%{_vpath_builddir}/lib \
+    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc PYTHON_EXECUTABLE=%{__python3}
 mv doc/html %{buildroot}%{_pkgdocdir}/html
 popd
 
+# Workaround for doxygen 1.8.17 and 1.8.18 doing slightly different things
+# on 32 and 64 bit
+doxver=$(doxygen -v)
+if [ "$doxver" = "1.8.17" -o "$doxver" = "1.8.18" ] ; then
+    for f in \
+	classDouble__t.html \
+	classPdfCacheElem.html \
+	classPdfCacheElem__inherit__graph.map \
+	classPdfCacheElem__inherit__graph.md5 \
+	classPdfCacheElem__inherit__graph.svg \
+	classROOT_1_1Experimental_1_1REveMagFieldDuo__coll__graph_org.svg \
+	classROOT_1_1Fit_1_1BasicFCN__coll__graph_org.svg \
+	classROOT_1_1Math_1_1MemGradFunHandler__coll__graph_org.svg \
+	classTAttImage__coll__graph_org.svg \
+	classTImagePalette__coll__graph_org.svg \
+	inherit_graph_1796.map \
+	inherit_graph_1796.md5 \
+	inherit_graph_1796.svg \
+	structEvent__t__coll__graph_org.svg \
+	structGLUvertex__coll__graph_org.svg \
+	structROOT_1_1Experimental_1_1REveBoxSet_1_1BEllipticCone__t__coll__graph_org.svg \
+	structROOT_1_1Internal_1_1RootCling_1_1DriverConfig__coll__graph_org.svg \
+	structTEveDigitSet_1_1DigitBase__t__inherit__graph.map \
+	structTEveDigitSet_1_1DigitBase__t__inherit__graph.md5 \
+	structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg \
+	structTGL5DPainter_1_1Surf__t__coll__graph_org.svg ; do
+	[ -r %{buildroot}%{_pkgdocdir}/html/${f} ] || \
+	    touch %{buildroot}%{_pkgdocdir}/html/${f}
+    done
+fi
+
 # Create includelist files ...
-for f in `find builddir -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
-    l=`sed 's!builddir/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
+for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+    l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
@@ -2570,10 +2387,11 @@ done
 cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
+cat includelist-graf3d-rglew >> includelist-graf3d-gl
 cat includelist-net-netx* > includelist-netx
 
 %check
-pushd builddir
+pushd %{_vpath_builddir}
 pushd test
 ln -s ../../files files
 popd
@@ -2651,6 +2469,10 @@ popd
 # - tutorial-tmva-tmva103_Application
 #   reads input data over network
 #   http://root.cern/files/tmva101.root
+#
+# - pyunittests-pyroot-numbadeclare
+# - tutorial-pyroot-pyroot004_NumbaDeclare-py
+#   these tests require the numba python module which is not available
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2675,7 +2497,9 @@ gtest-tmva-tmva-test-rreader|\
 gtest-tmva-tmva-test-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
 tutorial-tmva-tmva004_RStandardScaler|\
-tutorial-tmva-tmva103_Application"
+tutorial-tmva-tmva103_Application|\
+pyunittests-pyroot-numbadeclare|\
+tutorial-pyroot-pyroot004_NumbaDeclare-py"
 
 %ifarch %{ix86} %{arm}
 # Tests failing on 32 bit architectures (dataframe)
@@ -2683,6 +2507,7 @@ tutorial-tmva-tmva103_Application"
 # - gtest-tree-dataframe-test-dataframe-cache
 # - gtest-tree-dataframe-test-dataframe-callbacks
 # - gtest-tree-dataframe-test-dataframe-colnames
+# - gtest-tree-dataframe-test-dataframe-display
 # - gtest-tree-dataframe-test-dataframe-friends
 # - gtest-tree-dataframe-test-dataframe-helpers
 # - gtest-tree-dataframe-test-dataframe-interface
@@ -2695,6 +2520,7 @@ excluded="${excluded}|\
 gtest-tree-dataframe-test-dataframe-cache|\
 gtest-tree-dataframe-test-dataframe-callbacks|\
 gtest-tree-dataframe-test-dataframe-colnames|\
+gtest-tree-dataframe-test-dataframe-display|\
 gtest-tree-dataframe-test-dataframe-friends|\
 gtest-tree-dataframe-test-dataframe-helpers|\
 gtest-tree-dataframe-test-dataframe-interface|\
@@ -2720,6 +2546,13 @@ excluded="${excluded}|tutorial-roofit-rf611_weightedfits"
 %endif
 %endif
 
+%ifarch %{power64} aarch64
+# This test fails on ppc64le and aarch64 (but not on x86_64)
+# The interpreted version works though, only compiled version fails
+# - test-stresshistofit
+excluded="${excluded}|test-stresshistofit"
+%endif
+
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -2742,142 +2575,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %endif
 
 %if %{buildpy2}
-
-%post -n python2-%{name}
+%pre -n python2-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python2 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python2_sitearch}/libPyROOT.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
+    for alt in `grep python2.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
+	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
     done
 fi
-for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
-    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
-	rm %{_libdir}/%{name}/$f
-    fi
-done
-%{_sbindir}/update-alternatives \
-    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
-    %{python2_sitearch}/libPyROOT.so %{py2prio} \
-    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
-    %{python2_sitearch}/libPyROOT.rootmap \
-    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
-    %{python2_sitearch}/libPyROOT_rdict.pcm
-%{?ldconfig}
-
-%preun -n python2-%{name}
-if [ $1 = 0 ] ; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python2_sitearch}/libPyROOT.so
-fi
-
-%ldconfig_postun -n python2-%{name}
-
-%triggerpostun -n python2-%{name} -- %{name}-python
-# Uninstalling the old %{name}-python will remove the alternatives
-# for python2-%{name} - put them back in this triggerpostun script
-%{_sbindir}/update-alternatives \
-    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
-    %{python2_sitearch}/libPyROOT.so %{py2prio} \
-    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
-    %{python2_sitearch}/libPyROOT.rootmap \
-    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
-    %{python2_sitearch}/libPyROOT_rdict.pcm
-%{?ldconfig}
-
 %endif
 
-%post -n python%{python3_pkgversion}-%{name}
+%pre -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-%if %{?rhel}%{!?rhel:0} == 7
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] && \
-	   [ "$alt" != "%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so" ] ; then
-%else
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] ; then
-%endif
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
+    for alt in `grep python3.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
+	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
     done
 fi
-for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
-    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
-	rm %{_libdir}/%{name}/$f
-    fi
-done
-%{_sbindir}/update-alternatives \
-    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
-    %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio} \
-    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
-    %{python3_sitearch}/libPyROOT.rootmap \
-    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
-    %{python3_sitearch}/libPyROOT_rdict.pcm
-%{?ldconfig}
-
-%preun -n python%{python3_pkgversion}-%{name}
-if [ $1 = 0 ] ; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
-fi
-
-%ldconfig_postun -n python%{python3_pkgversion}-%{name}
-
-%triggerpostun -n python%{python3_pkgversion}-%{name} -- %{name}-python%{python3_pkgversion}
-# Uninstalling the old %{name}-python%{python3_pkgversion} will remove the alternatives
-# for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script
-%{_sbindir}/update-alternatives \
-    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
-    %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio} \
-    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
-    %{python3_sitearch}/libPyROOT.rootmap \
-    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
-    %{python3_sitearch}/libPyROOT_rdict.pcm
-%{?ldconfig}
-
-%if %{?rhel}%{!?rhel:0} == 7
-%post -n python%{python3_other_pkgversion}-%{name}
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
-	/var/lib/alternatives/libPyROOT.so || \
-    sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \
-	-i /var/lib/alternatives/libPyROOT.so
-    for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do
-	if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3_soabi}.so" ] && \
-	   [ "$alt" != "%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so" ] ; then
-	    %{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-	fi
-    done
-fi
-for f in libPyROOT.rootmap libPyROOT_rdict.pcm ; do
-    if [ -r %{_libdir}/%{name}/$f -a ! -h %{_libdir}/%{name}/$f ]; then
-	rm %{_libdir}/%{name}/$f
-    fi
-done
-%{_sbindir}/update-alternatives \
-    --install %{_libdir}/%{name}/libPyROOT.so.%{version} libPyROOT.so \
-    %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5 \
-    --slave %{_libdir}/%{name}/libPyROOT.rootmap libPyROOT.rootmap \
-    %{python3_other_sitearch}/libPyROOT.rootmap \
-    --slave %{_libdir}/%{name}/libPyROOT_rdict.pcm libPyROOT_rdict.pcm \
-    %{python3_other_sitearch}/libPyROOT_rdict.pcm
-%{?ldconfig}
-
-%preun -n python%{python3_other_pkgversion}-%{name}
-if [ $1 = 0 ] ; then
-    %{_sbindir}/update-alternatives --remove \
-	libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
-fi
-
-%ldconfig_postun -n python%{python3_other_pkgversion}-%{name}
-%endif
 
 %post notebook
 mkdir -p /etc/jupyter
@@ -2906,6 +2617,11 @@ fi
 
 %ldconfig_scriptlets multiproc
 %ldconfig_scriptlets cling
+%ldconfig_scriptlets tpython
+%if %{buildpy2}
+%ldconfig_scriptlets -n python2-%{name}
+%endif
+%ldconfig_scriptlets -n python%{python3_pkgversion}-%{name}
 %ldconfig_scriptlets r
 %ldconfig_scriptlets r-tools
 %ldconfig_scriptlets genetic
@@ -2996,6 +2712,7 @@ fi
 %ldconfig_scriptlets graf-gpadv7
 %ldconfig_scriptlets graf-primitives
 %ldconfig_scriptlets graf3d-eve7
+%ldconfig_scriptlets gui-browsable
 %ldconfig_scriptlets gui-browserv7
 %ldconfig_scriptlets gui-canvaspainter
 %ldconfig_scriptlets gui-fitpanelv7
@@ -3035,6 +2752,12 @@ fi
 %files fonts
 %{_datadir}/%{name}/fonts
 
+%files doc
+%doc %{_pkgdocdir}/html
+
+%files tutorial
+%doc %{_pkgdocdir}/tutorials
+
 %files core -f includelist-core
 %{_bindir}/memprobe
 %{_bindir}/rmkdepend
@@ -3061,6 +2784,7 @@ fi
 %{_datadir}/%{name}/gdb-backtrace.sh
 %{_datadir}/%{name}/gitinfo.txt
 %{_datadir}/%{name}/helgrind-root.supp
+%{_datadir}/%{name}/lsan-root.supp
 %{_datadir}/%{name}/Makefile.arch
 %{_datadir}/%{name}/root.mimes
 %{_datadir}/%{name}/system.rootauthrc
@@ -3111,98 +2835,58 @@ fi
 %doc interpreter/llvm/src/llvm-README.txt
 %license interpreter/llvm/src/llvm-LICENSE.TXT
 
-%files doc
-%doc %{_pkgdocdir}/html
-
-%files tutorial
-%doc %{_pkgdocdir}/tutorials
+%files tpython -f includelist-bindings-tpython
+%{_libdir}/%{name}/libROOTTPython.*
+%{_libdir}/%{name}/libROOTTPython_rdict.pcm
 
 %if %{buildpy2}
-%files -n python2-%{name} -f includelist-bindings-pyroot
-%ghost %{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python2_sitearch}/libPyROOT.rootmap
-%{python2_sitearch}/libPyROOT.so
-%{python2_sitearch}/libPyROOT_rdict.pcm
-%{python2_sitearch}/ROOT.py*
+%files -n python2-%{name}
+%{python2_sitearch}/cppyy
+%{python2_sitearch}/cppyy_backend
+%{python2_sitearch}/ROOT
 %{python2_sitearch}/ROOT-*.egg-info
-%{python2_sitearch}/cppyy.py*
-%{python2_sitearch}/_pythonization.py*
-%{python2_sitearch}/_rdf_utils.py*
-%endif
+%{python2_sitearch}/libcppyy%{python2_version_uscore}.so
+%{python2_sitearch}/libcppyy_backend%{python2_version_uscore}.so
+%{python2_sitearch}/libROOTPythonizations%{python2_version_uscore}.so
+%{_libdir}/%{name}/libcppyy%{python2_version_uscore}.*
+%{_libdir}/%{name}/libcppyy_backend%{python2_version_uscore}.*
+%{_includedir}/%{name}/CPyCppyy
 
-%if ! %{py3default}
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
 %{python2_sitearch}/JupyROOT-*.egg-info
-%{python2_sitearch}/libJupyROOT.so
+%{python2_sitearch}/libJupyROOT%{python2_version_uscore}.so
 %{_datadir}/jupyter/kernels/python2-jupyroot
-%doc bindings/pyroot/JupyROOT/README.md
+%doc bindings/jupyroot/README.md
 
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
 %{python2_sitelib}/JsMVA-*.egg-info
 %endif
 
-%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
-%ghost %{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_sitearch}/libPyROOT.rootmap
-%{python3_sitearch}/libPyROOT.%{py3_soabi}.so
-%{python3_sitearch}/libPyROOT_rdict.pcm
-%{python3_sitearch}/ROOT.py
+%files -n python%{python3_pkgversion}-%{name}
+%{python3_sitearch}/cppyy
+%{python3_sitearch}/cppyy_backend
+%{python3_sitearch}/ROOT
 %{python3_sitearch}/ROOT-*.egg-info
-%{python3_sitearch}/cppyy.py
-%{python3_sitearch}/_pythonization.py
-%{python3_sitearch}/_rdf_utils.py
-%{python3_sitearch}/__pycache__/*
+%{python3_sitearch}/libcppyy%{python3_version_uscore}.%{py3_soabi}.so
+%{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
+%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.%{py3_soabi}.so
+%{_libdir}/%{name}/libcppyy%{python3_version_uscore}.*
+%{_libdir}/%{name}/libcppyy_backend%{python3_version_uscore}.*
+%{_includedir}/%{name}/CPyCppyy
 
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
 %{python3_sitearch}/JupyROOT-*.egg-info
-%{python3_sitearch}/libJupyROOT.so
+%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.%{py3_soabi}.so
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
-%doc bindings/pyroot/JupyROOT/README.md
+%doc bindings/jupyroot/README.md
 
 %files -n python%{python3_pkgversion}-jsmva
 %{python3_sitelib}/JsMVA
 %{python3_sitelib}/JsMVA-*.egg-info
 
-%if %{?rhel}%{!?rhel:0} == 7
-%files -n python%{python3_other_pkgversion}-%{name} -f includelist-bindings-pyroot
-%ghost %{_libdir}/%{name}/libPyROOT.rootmap
-%{_libdir}/%{name}/libPyROOT.so
-%{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%ghost %{_libdir}/%{name}/libPyROOT.so.%{version}
-%ghost %{_libdir}/%{name}/libPyROOT_rdict.pcm
-%{python3_other_sitearch}/libPyROOT.rootmap
-%{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
-%{python3_other_sitearch}/libPyROOT_rdict.pcm
-%{python3_other_sitearch}/ROOT.py
-%{python3_other_sitearch}/ROOT-*.egg-info
-%{python3_other_sitearch}/cppyy.py
-%{python3_other_sitearch}/_pythonization.py
-%{python3_other_sitearch}/_rdf_utils.py
-%{python3_other_sitearch}/__pycache__/*
-
-%files -n python%{python3_other_pkgversion}-jupyroot
-%{python3_other_sitearch}/JupyROOT
-%{python3_other_sitearch}/JupyROOT-*.egg-info
-%{python3_other_sitearch}/libJupyROOT.so
-%{_datadir}/jupyter/kernels/python%{python3_other_pkgversion}-jupyroot
-%doc bindings/pyroot/JupyROOT/README.md
-
-%files -n python%{python3_other_pkgversion}-jsmva
-%{python3_other_sitelib}/JsMVA
-%{python3_other_sitelib}/JsMVA-*.egg-info
-%endif
-
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
 %{_libdir}/%{name}/libRInterface_rdict.pcm
@@ -3750,6 +3434,16 @@ fi
 %files graf3d-eve7 -f includelist-graf3d-eve7
 %{_libdir}/%{name}/libROOTEve.*
 %{_libdir}/%{name}/libROOTEve_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P020_REveGeoPainter.C
+
+%files gui-browsable -f includelist-gui-browsable
+%{_libdir}/%{name}/libROOTBrowsable.*
+%{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
+%{_libdir}/%{name}/libROOTHistDrawProvider.*
+%{_libdir}/%{name}/libROOTLeafDraw6Provider.*
+%{_libdir}/%{name}/libROOTLeafDraw7Provider.*
+%{_libdir}/%{name}/libROOTObjectDraw6Provider.*
+%{_libdir}/%{name}/libROOTObjectDraw7Provider.*
 
 %files gui-browserv7 -f includelist-gui-browserv7
 %{_libdir}/%{name}/libROOTBrowserv7.*
@@ -3791,7 +3485,34 @@ fi
 %endif
 
 %changelog
-* Thu Jul 11 2020 Jeff Law <law@redhat.com> - 6.20.06-2
+* Tue Jul 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-1
+- Update to 6.22.00
+- Drop patches accepted upstream
+  - root-FitData-assert-fix.patch
+  - root-clang-altivec-vector.patch
+  - root-format-fix.patch
+  - root-moved-file.patch
+  - root-xmlmodify-dep.patch
+- New and improved Python bindings
+- The new Python bindings can be built for both Python 2 and Python 3
+  out of the box. Dropped the workaround in specfile for this (EPEL 7)
+- Dropped the python3-other packages (EPEL 7)
+- The new Python bindings has split the TPython interface to a separate
+  library. Now in a separate root-tpython package
+- root-tpython and root-tmva-python are now using Python 3 on EPEL 7
+- New subpackage root-gui-browsable
+- New patches (submitted upstream)
+  - Fix too aggressive -Werror replacements
+  - Add missing call to TFile::SetCacheFileDir in a TMVA tutorial
+  - Adjust stressGraphics.ref
+  - Fix off-by-one error in histogram v7 bin iterator
+  - Compatibility with python 2.7 versions before 2.7.9
+  - Fix the RNTuple.LargeFile test on 32bit (i386 and armv7hf)
+  - Fix doxygen issues
+  - Fix bad regex in TProofMgr
+  - Compatibility with xrootd 5
+
+* Sat Jul 11 2020 Jeff Law <law@redhat.com> - 6.20.06-2
 - Disable LTO
 
 * Thu Jun 11 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.20.06-1
diff --git a/sources b/sources
index 86bdac6..b6ae6df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.20.06.tar.xz) = 791f472cb40200c5f8b79efd1803044914bb8e41dc1f424e90508c059d548be7913417a08a770e0f041c9070af8dc6bbddf5366c3db2b1dac43d417992aade22
-SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e
+SHA512 (root-6.22.00.tar.xz) = ca2f72d691619d8afadd3c20f7e3b19d4a12f9f5a38bda340ee4c9fd10993c78db4016a1904851c75478657d971a72f18ad4b1f1bdf61da8be8a0e6de0e1753a
+SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From f36ab4252202594594cca4efeee76448eeb20815 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 15 Jul 2020 21:26:33 +0200
Subject: [PATCH 180/344] Fix broken update on EPEL 7 with python34-root
 installed

---
 root.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 57d53a7..5aa4098 100644
--- a/root.spec
+++ b/root.spec
@@ -43,7 +43,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2585,7 +2585,11 @@ fi
 
 %pre -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
+%if %{?rhel}%{!?rhel:0} == 7
+    for alt in `grep python%{python3_version}/.*.so /var/lib/alternatives/libPyROOT.so` ; do
+%else
     for alt in `grep python3.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
+%endif
 	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
     done
 fi
@@ -3485,6 +3489,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-2
+- Fix broken update on EPEL 7 with python34-root installed
+
 * Tue Jul 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-1
 - Update to 6.22.00
 - Drop patches accepted upstream

From 32e56c3cc7c3238dc31f6b51256a352be4b7c257 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 05:51:59 +0000
Subject: [PATCH 181/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 5aa4098..5412f47 100644
--- a/root.spec
+++ b/root.spec
@@ -43,7 +43,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3489,6 +3489,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.00-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-2
 - Fix broken update on EPEL 7 with python34-root installed
 

From 94bb81bf7ff3077a9d1c4b8dc1fd9f8b1d45b389 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 1 Aug 2020 07:53:45 +0000
Subject: [PATCH 182/344] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 5412f47..2127704 100644
--- a/root.spec
+++ b/root.spec
@@ -43,7 +43,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3489,6 +3489,10 @@ fi
 %endif
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.00-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 4f7769c6fcc668a4a83665964841cdb4f70bfe2f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 12 Aug 2020 07:09:40 +0200
Subject: [PATCH 183/344] Fix wrong symlinks in EPEL 7 python2-root package

---
 root.spec | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

diff --git a/root.spec b/root.spec
index 2127704..fd2d1be 100644
--- a/root.spec
+++ b/root.spec
@@ -1,9 +1,5 @@
-%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 9
 %undefine __cmake_in_source_build
-%global oldcmakemacro 0
-%else
-%global oldcmakemacro 1
-%endif
+%undefine __cmake3_in_source_build
 
 %if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
 # Don't build python2-root for Fedora >= 31
@@ -43,7 +39,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -149,11 +145,7 @@ Patch32:	%{name}-xrootd5-compat.patch
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
 
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires:	cmake >= 3.9
-%else
 BuildRequires:	cmake3 >= 3.9
-%endif
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -1920,15 +1912,7 @@ done
 # Avoid overlinking (this used to be the default with the old configure script)
 LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 
-%if %{oldcmakemacro}
-mkdir %{_vpath_builddir}
-pushd %{_vpath_builddir}
-%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-%cmake \
-%else
 %cmake3 \
-%endif
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
@@ -2057,16 +2041,11 @@ pushd %{_vpath_builddir}
        -Dcoverage:BOOL=OFF \
        -Droottest:BOOL=OFF \
        -Drootbench:BOOL=OFF \
-       -Dasan:BOOL=OFF \
-%if %{oldcmakemacro}
-       ..
-popd
-%endif
-
-%make_build -C %{_vpath_builddir}
+       -Dasan:BOOL=OFF
+%cmake3_build
 
 %install
-%make_install -C %{_vpath_builddir}
+%cmake3_install
 
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
@@ -2118,11 +2097,11 @@ install -p -m 644 build/gdbPrinters/libRooFitCore.so-gdb.py \
 mkdir -p %{buildroot}%{python2_sitearch}
 
 cp -pr %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python2_sitearch}
-ln -s ../../root/libcppyy%{python3_version_uscore}.so.%{version} \
+ln -s ../../root/libcppyy%{python2_version_uscore}.so.%{version} \
    %{buildroot}%{python2_sitearch}/libcppyy%{python2_version_uscore}.so
 
 cp -pr %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python2_sitearch}
-ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
+ln -s ../../root/libcppyy_backend%{python2_version_uscore}.so.%{version} \
    %{buildroot}%{python2_sitearch}/libcppyy_backend%{python2_version_uscore}.so
 
 cp -pr %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python2_sitearch}
@@ -2221,7 +2200,7 @@ EOF
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
 sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed -e 's!/usr/bin/env python.*!%{__python3}!' \
+sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2234,7 +2213,7 @@ sed -e 's!/usr/bin/env python.*!%{__python3}!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
-sed -e 's!/usr/bin/env python.*!%{__python3}!' \
+sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
@@ -2374,11 +2353,7 @@ for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-%else
     DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-%endif
     ( cd $tmpdir ; find . -type f) | sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
 done
@@ -3489,6 +3464,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 11 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-5
+- Fix wrong symlinks in EPEL 7 python2-root package
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.00-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 9dd4f5fc05412f9702a6065ce32c9da4c66b6749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Sun, 16 Aug 2020 14:00:07 +0200
Subject: [PATCH 184/344] 
 https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager

---
 root-add-flexiblas-detection.patch | 31 ++++++++++++++++++++++++++++++
 root.spec                          | 16 +++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 root-add-flexiblas-detection.patch

diff --git a/root-add-flexiblas-detection.patch b/root-add-flexiblas-detection.patch
new file mode 100644
index 0000000..bcf8063
--- /dev/null
+++ b/root-add-flexiblas-detection.patch
@@ -0,0 +1,31 @@
+From 2f3c530cd8c8b9adc0303e2ae24a069f671aee1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Sun, 16 Aug 2020 13:46:21 +0200
+Subject: [PATCH] add flexiblas detection
+
+---
+ cmake/modules/SearchInstalledSoftware.cmake | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index f1c6ee27..12aa822f 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -1496,7 +1496,13 @@ endif()
+ if(tmva)
+   if(tmva-cpu AND imt)
+     message(STATUS "Looking for BLAS for optional parts of TMVA")
+-    find_package(BLAS)
++    pkg_check_modules(FLEXIBLAS flexiblas)
++    set(BLAS_FOUND ${FLEXIBLAS_FOUND})
++    set(BLAS_LIBRARIES "${FLEXIBLAS_LIBRARIES}")
++    set(BLAS_LINKER_FLAGS)
++    if (NOT BLAS_FOUND)
++      find_package(BLAS)
++    endif()
+     if(NOT BLAS_FOUND)
+       if (GSL_FOUND)
+         message(STATUS "Using GSL CBLAS for optional parts of TMVA")
+-- 
+2.25.2
+
diff --git a/root.spec b/root.spec
index fd2d1be..75dba66 100644
--- a/root.spec
+++ b/root.spec
@@ -30,6 +30,12 @@
 %global tbb 0
 %endif
 
+%if 0%{?fedora} >= 33
+%global blaslib flexiblas
+%else
+%global blaslib blas
+%endif
+
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
@@ -39,7 +45,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -139,6 +145,8 @@ Patch31:	%{name}-fix-bad-regex.patch
 #		Compatibility with xrootd 5
 #		https://github.com/root-project/root/pull/6031
 Patch32:	%{name}-xrootd5-compat.patch
+#   Enable FlexiBLAS detection
+Patch33:  %{name}-add-flexiblas-detection.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -217,7 +225,7 @@ BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
-BuildRequires:	blas-devel
+BuildRequires:	%{blaslib}-devel
 BuildRequires:	python%{python3_pkgversion}-numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
@@ -1839,6 +1847,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3464,6 +3473,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug 16 2020 Iñaki Úcar <iucar@fedoraproject.org> - 6.22.00-6
+- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
+
 * Tue Aug 11 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-5
 - Fix wrong symlinks in EPEL 7 python2-root package
 

From 82f0a3aaee49053661580bcf6a6197075f961eea Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 21 Aug 2020 01:41:39 +0200
Subject: [PATCH 185/344] Avoid unneeded build requirement on srm-ifce-devel Do
 not export Python modules in CMake config Drop patch
 root-clang-ignore-gcc-options.patch   ("Recent ROOT does not send all
 possible compiler flags to rootcling.")

---
 root-clang-ignore-gcc-options.patch | 33 -------------------
 root-fix-a-shadow-warning.patch     | 41 ++++++++++++++++++++++++
 root-memory-usage.patch             | 21 +++++++------
 root-no-export-python-modules.patch | 25 +++++++++++++++
 root-setcachefiledir.patch          |  4 +--
 root-srm-ifce-deps.patch            | 49 +++++++++++++++++++++++++++++
 root-xrootd5-compat.patch           |  6 ++--
 root.spec                           | 38 ++++++++++++++--------
 8 files changed, 156 insertions(+), 61 deletions(-)
 delete mode 100644 root-clang-ignore-gcc-options.patch
 create mode 100644 root-fix-a-shadow-warning.patch
 create mode 100644 root-no-export-python-modules.patch
 create mode 100644 root-srm-ifce-deps.patch

diff --git a/root-clang-ignore-gcc-options.patch b/root-clang-ignore-gcc-options.patch
deleted file mode 100644
index ebd8957..0000000
--- a/root-clang-ignore-gcc-options.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1303b60707614043993f9c97c79dd4fe89e6efa4 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 7 Nov 2018 12:05:30 +0100
-Subject: [PATCH] Let clang ignore some gcc options it hasn't implemented
-
----
- .../llvm/src/tools/clang/include/clang/Driver/Options.td       | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td b/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
-index 05dc9d7eb3..1e887ac6b1 100644
---- a/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
-+++ b/interpreter/llvm/src/tools/clang/include/clang/Driver/Options.td
-@@ -2464,6 +2464,8 @@ defm align_loops : BooleanFFlag<"align-loops">, Group<clang_ignored_gcc_optimiza
- def falign_loops_EQ : Joined<["-"], "falign-loops=">, Group<clang_ignored_gcc_optimization_f_Group>;
- defm align_jumps : BooleanFFlag<"align-jumps">, Group<clang_ignored_gcc_optimization_f_Group>;
- def falign_jumps_EQ : Joined<["-"], "falign-jumps=">, Group<clang_ignored_gcc_optimization_f_Group>;
-+defm cf_protection : BooleanFFlag<"cf-protection">, Group<clang_ignored_f_Group>;
-+def fcf_protection_EQ : Joined<["-"], "fcf-protection=">, Group<clang_ignored_f_Group>;
- 
- // FIXME: This option should be supported and wired up to our diognostics, but
- // ignore it for now to avoid breaking builds that use it.
-@@ -2524,6 +2526,7 @@ defm single_precision_constant : BooleanFFlag<"single-precision-constant">,
-     Group<clang_ignored_gcc_optimization_f_Group>;
- defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_f_Group>;
- defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
-+defm stack_clash_protection : BooleanFFlag<"stack-clash-protection">, Group<clang_ignored_f_Group>;
- defm strength_reduce :
-     BooleanFFlag<"strength-reduce">, Group<clang_ignored_gcc_optimization_f_Group>;
- defm tls_model : BooleanFFlag<"tls-model">, Group<clang_ignored_f_Group>;
--- 
-2.19.1
-
diff --git a/root-fix-a-shadow-warning.patch b/root-fix-a-shadow-warning.patch
new file mode 100644
index 0000000..f0daaaf
--- /dev/null
+++ b/root-fix-a-shadow-warning.patch
@@ -0,0 +1,41 @@
+From 00bbfddbf5c900923b284ddc540d2458bda15b7b Mon Sep 17 00:00:00 2001
+From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
+Date: Wed, 5 Aug 2020 13:22:46 +0200
+Subject: [PATCH] Fix a shadow warning.
+
+---
+ roofit/roofitmore/src/RooHypatia2.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/roofit/roofitmore/src/RooHypatia2.cxx b/roofit/roofitmore/src/RooHypatia2.cxx
+index 7d550b2753..fe80f414d0 100644
+--- a/roofit/roofitmore/src/RooHypatia2.cxx
++++ b/roofit/roofitmore/src/RooHypatia2.cxx
+@@ -119,21 +119,21 @@
+ /// \param[in] a2 Start of right tail.
+ /// \param[in] n2 Shape parameter of right tail (\f$ n2 \ge 0 \f$). With \f$ n2 = 0 \f$, the function is constant.
+ RooHypatia2::RooHypatia2(const char *name, const char *title, RooAbsReal& x, RooAbsReal& lambda,
+-    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigma, RooAbsReal& mu, RooAbsReal& a,
++    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& argSigma, RooAbsReal& mu, RooAbsReal& a,
+     RooAbsReal& n, RooAbsReal& a2, RooAbsReal& n2) :
+                 RooAbsPdf(name, title),
+                 _x("x", "x", this, x),
+                 _lambda("lambda", "Lambda", this, lambda),
+                 _zeta("zeta", "zeta", this, zeta),
+                 _beta("beta", "Asymmetry parameter beta", this, beta),
+-                _sigma("sigma", "Width parameter sigma", this, sigma),
++                _sigma("sigma", "Width parameter sigma", this, argSigma),
+                 _mu("mu", "Location parameter mu", this, mu),
+                 _a("a", "Left tail location a", this, a),
+                 _n("n", "Left tail parameter n", this, n),
+                 _a2("a2", "Right tail location a2", this, a2),
+                 _n2("n2", "Right tail parameter n2", this, n2)
+ {
+-  RooHelpers::checkRangeOfParameters(this, {&sigma}, 0.);
++  RooHelpers::checkRangeOfParameters(this, {&argSigma}, 0.);
+   RooHelpers::checkRangeOfParameters(this, {&zeta, &n, &n2, &a, &a2}, 0., std::numeric_limits<double>::max(), true);
+   if (zeta.getVal() == 0. && zeta.isConstant()) {
+     RooHelpers::checkRangeOfParameters(this, {&lambda}, -std::numeric_limits<double>::max(), 0., false,
+-- 
+2.26.2
+
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index 9910ec3..aad7f1c 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -1,21 +1,22 @@
-From 636b26baf214559e209e72b2a14946d0cc18c2f1 Mon Sep 17 00:00:00 2001
+From 21395b23947df7e2b5e0c93626453aeacdee026c Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 16 Jan 2018 10:25:50 +0100
 Subject: [PATCH] Reduce the needed memory for compilation
 
 The linking of rootcling_stage1 and libCling requires a lot of memory.
-Since these are linked from mostly the same objects, the build is ready
-to link them at the same time. If you make a parallel build this means
-that the two targets that require the most amount of memory are being
-linked in parallel. This exhausts the available memory, and the
+Since these are linked from mostly the same objects, the build is
+ready to link them at the same time. If you make a parallel build this
+means that the two targets that require the most amount of memory are
+being linked in parallel. This exhausts the available memory, and the
 computer starts swapping.
 
-This adds a dependency of one of the targets to the other. The dependency is
-not really there since it is not needed for building, but it prevents the
-two memory consuming targets to be built in parallel.
+This commit adds a dependency of one of the targets to the other. The
+dependency is not really there since it is not needed for building,
+but it prevents the two memory consuming targets to be built in
+parallel.
 
-A similar dependency existed before the code latest code changes
-(see commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
+A similar dependency existed before the latest code changes (see
+commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
 rootcling and libCling.
 ---
  core/metacling/src/CMakeLists.txt | 5 +++++
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
new file mode 100644
index 0000000..d27c135
--- /dev/null
+++ b/root-no-export-python-modules.patch
@@ -0,0 +1,25 @@
+diff -ur root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt root-6.22.00/bindings/jupyroot/CMakeLists.txt
+--- root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/jupyroot/CMakeLists.txt	2020-08-20 13:56:08.875471462 +0200
+@@ -58,7 +58,7 @@
+   endforeach()
+ 
+   # Install library
+-  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION ${runtimedir})
++  install(TARGETS ${libname} DESTINATION ${runtimedir})
+ 
+ endforeach()
+ 
+diff -ur root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt
+--- root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
++++ root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-20 13:57:31.465673116 +0200
+@@ -124,8 +124,7 @@
+   endforeach()
+ 
+   # Install library
+-  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
+-                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
++  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+                              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
+                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ endforeach()
diff --git a/root-setcachefiledir.patch b/root-setcachefiledir.patch
index f73615e..1244734 100644
--- a/root-setcachefiledir.patch
+++ b/root-setcachefiledir.patch
@@ -1,10 +1,10 @@
-From 0bf4cdfee3f2189f4d43f7cde9ba114ce682cac5 Mon Sep 17 00:00:00 2001
+From 532e02a0e5373d26f73495183dc13055e7f13421 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Mon, 29 Jun 2020 12:08:15 +0200
 Subject: [PATCH] Add missing call to TFile::SetCacheFileDir(".")
 
 Without it the following TFile::Open call using the CACHEREAD option
-will as work as intrnded:
+will not work as intended:
 inputFile = TFile::Open(inputFileLink, "CACHEREAD");
 ---
  tutorials/tmva/TMVA_Higgs_Classification.C | 3 +--
diff --git a/root-srm-ifce-deps.patch b/root-srm-ifce-deps.patch
new file mode 100644
index 0000000..929d799
--- /dev/null
+++ b/root-srm-ifce-deps.patch
@@ -0,0 +1,49 @@
+From 7e8706b21dc62fc7b56709cf03c2650c715e5b64 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 19 Aug 2020 20:23:15 +0200
+Subject: [PATCH] When building ROOT's libGFAL using gfal2, srm-ifce is not a
+ build dependency.
+
+---
+ cmake/modules/FindGFAL.cmake | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/modules/FindGFAL.cmake b/cmake/modules/FindGFAL.cmake
+index 71163a1714..74028ac5a7 100644
+--- a/cmake/modules/FindGFAL.cmake
++++ b/cmake/modules/FindGFAL.cmake
+@@ -17,22 +17,26 @@ find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h
+           HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
+ find_library(GFAL_LIBRARY NAMES gfal gfal2
+              HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
+-find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h 
+-          HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
+ 
+ set(GFAL_LIBRARIES ${GFAL_LIBRARY})
+-set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
++set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR})
+ 
+ if(GFAL_LIBRARY MATCHES gfal2)
+   # use pkg-config to get the directories for glib and then use these values
+   find_package(PkgConfig)
+   pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+   list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS})
++  set(GFAL_DEP GLIB2_INCLUDE_DIRS)
++else()
++  find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h 
++            HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
++  list(APPEND GFAL_INCLUDE_DIRS ${SRM_IFCE_INCLUDE_DIR})
++  set(GFAL_DEP SRM_IFCE_INCLUDE_DIR)
+ endif()
+ 
+ # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
+ # all listed variables are TRUE
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY)
++find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR ${GFAL_DEP} GFAL_LIBRARY)
+ 
+-mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR)
++mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS)
+-- 
+2.26.2
+
diff --git a/root-xrootd5-compat.patch b/root-xrootd5-compat.patch
index 5a7ecda..22802dd 100644
--- a/root-xrootd5-compat.patch
+++ b/root-xrootd5-compat.patch
@@ -1,4 +1,4 @@
-From c81fab4b81b4767abdca612f33604b252fc665b7 Mon Sep 17 00:00:00 2001
+From b9ab79d7eb3a3eeebd8671ebe78e5fed6a3f1100 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 14 Jul 2020 08:10:00 +0200
 Subject: [PATCH] Compatibility with xrootd 5.
@@ -20,7 +20,7 @@ Build the new libNetNG without XrdSysDNS, use XrdNetAddr instead.
  3 files changed, 33 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 12f9d65371..3578303c5d 100644
+index 12f9d65371..c04b9b09fb 100644
 --- a/cmake/modules/SearchInstalledSoftware.cmake
 +++ b/cmake/modules/SearchInstalledSoftware.cmake
 @@ -925,6 +925,21 @@ if(xrootd AND XROOTD_VERSIONNUM VERSION_GREATER 300030005)
@@ -37,7 +37,7 @@ index 12f9d65371..3578303c5d 100644
 +    if(fail-on-missing)
 +      message(FATAL_ERROR "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Use -Dxproofd:BOOL=OFF to disable.")
 +    else()
-+      message(STATUS "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Disbaling xproofd' option.")
++      message(STATUS "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Disabling 'xproofd' option.")
 +      set(xproofd OFF CACHE BOOL "Disabled because xrootd version is 5 or greater" FORCE)
 +    endif()
 +  endif()
diff --git a/root.spec b/root.spec
index 75dba66..08b3081 100644
--- a/root.spec
+++ b/root.spec
@@ -30,10 +30,10 @@
 %global tbb 0
 %endif
 
-%if 0%{?fedora} >= 33
+%if %{?fedora}%{!?fedora:0} >= 33
 %global blaslib flexiblas
 %else
-%global blaslib blas
+%global blaslib openblas
 %endif
 
 # Do not create .orig files when patching source
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -82,7 +82,7 @@ Patch4:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
 Patch5:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
 Patch6:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 #		Reduce memory usage of build
-#		https://github.com/root-project/root/pull/1516
+#		Do not link rootcling_stage1 and libCling in parallel
 Patch7:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
@@ -90,9 +90,8 @@ Patch7:		%{name}-memory-usage.patch
 Patch8:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
 Patch9:		%{name}-dont-install-minicern.patch
-#		Let clang ignore some gcc options it hasn't implemented
-#		https://github.com/root-project/root/pull/2933
-Patch10:	%{name}-clang-ignore-gcc-options.patch
+#		Do not export Python modules in CMake config
+Patch10:	%{name}-no-export-python-modules.patch
 #		Don't create documentation notebooks
 Patch11:	%{name}-doc-no-notebooks.patch
 #		Don't run tutorials that crash during doc generation
@@ -145,8 +144,14 @@ Patch31:	%{name}-fix-bad-regex.patch
 #		Compatibility with xrootd 5
 #		https://github.com/root-project/root/pull/6031
 Patch32:	%{name}-xrootd5-compat.patch
-#   Enable FlexiBLAS detection
-Patch33:  %{name}-add-flexiblas-detection.patch
+#		Enable FlexiBLAS detection
+Patch33:	%{name}-add-flexiblas-detection.patch
+#		Avoid unneeded build requirement on srm-ifce-devel
+#		https://github.com/root-project/root/pull/6233
+Patch34:	%{name}-srm-ifce-deps.patch
+#		Fix a shadow warning
+#		https://github.com/root-project/root/pull/6029
+Patch35:	%{name}-fix-a-shadow-warning.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -211,7 +216,6 @@ BuildRequires:	xrootd-private-devel >= 1:3.3.5
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
-BuildRequires:	srm-ifce-devel
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
@@ -381,9 +385,9 @@ Obsoletes:	python2-jsmva < %{version}-%{release}
 Obsoletes:	%{name}-rootaas < 6.08.00
 %endif
 %if %{?rhel}%{!?rhel:0} == 7
-Obsoletes:	python%{python3_other_pkgversion}-%{name} < 6.22.00
-Obsoletes:	python%{python3_other_pkgversion}-jupyroot < 6.22.00
-Obsoletes:	python%{python3_other_pkgversion}-jsmva < 6.22.00
+Obsoletes:	python%{?python3_other_pkgversion}-%{name} < 6.22.00
+Obsoletes:	python%{?python3_other_pkgversion}-jupyroot < 6.22.00
+Obsoletes:	python%{?python3_other_pkgversion}-jsmva < 6.22.00
 %endif
 
 %description core
@@ -1848,6 +1852,8 @@ This package contains an ntuple extension for ROOT 7.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
+%patch35 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3473,6 +3479,12 @@ fi
 %endif
 
 %changelog
+* Thu Aug 20 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-7
+- Avoid unneeded build requirement on srm-ifce-devel
+- Do not export Python modules in CMake config
+- Drop patch root-clang-ignore-gcc-options.patch
+  ("Recent ROOT does not send all possible compiler flags to rootcling.")
+
 * Sun Aug 16 2020 Iñaki Úcar <iucar@fedoraproject.org> - 6.22.00-6
 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
 

From 1361b0d800ff8793ce673cafed0af8ad24c4b552 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 23 Aug 2020 16:27:44 +0200
Subject: [PATCH 186/344] Update to 6.22.02 Drop patch previously backported:
 root-doxygen-endof-part1.patch Drop patch accepted upstream:
 root-python2-compat.patch Add back line accidentally removed in root-config
 Install headers in new PyROOT with COMPONENT headers Increase test timeout
 for ppc64le

---
 root-config-restore.patch                     | 28 +++++++
 root-doxygen-endof-part1.patch                | 49 ------------
 root-fontconfig.patch                         | 78 +++++++++----------
 root-increase-timeout-for-ppc64le.patch       | 21 +++++
 ...stall-headers-with-COMPONENT-headers.patch | 39 ++++++++++
 root-no-export-python-modules.patch           | 39 ++++++----
 root-python2-compat.patch                     | 41 ----------
 root-python3.8-object.patch                   |  1 -
 root.spec                                     | 59 +++++++++-----
 sources                                       |  2 +-
 10 files changed, 191 insertions(+), 166 deletions(-)
 create mode 100644 root-config-restore.patch
 delete mode 100644 root-doxygen-endof-part1.patch
 create mode 100644 root-increase-timeout-for-ppc64le.patch
 create mode 100644 root-install-headers-with-COMPONENT-headers.patch
 delete mode 100644 root-python2-compat.patch

diff --git a/root-config-restore.patch b/root-config-restore.patch
new file mode 100644
index 0000000..0615b8b
--- /dev/null
+++ b/root-config-restore.patch
@@ -0,0 +1,28 @@
+From d589c5f31f940ea6a3a5144ca1664b2ec9ea7d38 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 19 Aug 2020 20:08:32 +0200
+Subject: [PATCH] Add back line accidentally removed in commit
+ 17bc17715524b4cc6b46324c428845e9ab945684
+
+---
+ config/root-config.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/config/root-config.in b/config/root-config.in
+index d86b7d35af..7029439362 100755
+--- a/config/root-config.in
++++ b/config/root-config.in
+@@ -438,7 +438,9 @@ Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\
+  [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs]\
+  [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--tutdir] [--srcdir]\
+  [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\
+-[--python-version] [--python2-version] [--python3-version] [--cc] [--cxx] [--f77] [--ld ] [--help]"
++ [--platform] [--config] [--features] [--ncpu] [--git-revision]\
++ [--python-version] [--python2-version] [--python3-version]\
++ [--cc] [--cxx] [--f77] [--ld ] [--help]"
+ 
+ if test $# -eq 0; then
+    echo "${usage}" 1>&2
+-- 
+2.26.2
+
diff --git a/root-doxygen-endof-part1.patch b/root-doxygen-endof-part1.patch
deleted file mode 100644
index 974b60e..0000000
--- a/root-doxygen-endof-part1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c454b8d31a840898a709452525267a8404a05d24 Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@cern.ch>
-Date: Tue, 30 Jun 2020 17:05:13 +0200
-Subject: [PATCH] [NFC][DF] Minor improvements to formatting and docs of
- Display
-
----
- tree/dataframe/inc/ROOT/RDF/RDisplay.hxx | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx b/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
-index 90058f0706..9f5e3623ae 100644
---- a/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
-+++ b/tree/dataframe/inc/ROOT/RDF/RDisplay.hxx
-@@ -105,10 +105,10 @@ private:
-    }
- 
-    ////////////////////////////////////////////////////////////////////////////
--   /// Appends collection.size() cling::printValue call to the stringstream.
-+   /// Appends collection.size() cling::printValue calls to the stringstream.
-    /// \tparam T the type of the event to convert
-    /// \param[in] stream Where the conversion function call will be chained.
--   /// \param[in] element The event to convert to its string representation
-+   /// \param[in] collection The event to convert to its string representation
-    /// \param[in] index To which column the event belongs to
-    /// \return true, the event is a collection
-    /// This function chains a sequence of call to cling::printValue, one for each element of the collection.
-@@ -128,7 +128,8 @@ private:
-       // For each element, append a call and feed the proper type returned by GetSplit
-       for (size_t i = 0; i < collectionSize; ++i) {
-          stream << "*((std::string*)" << ROOT::Internal::RDF::PrettyPrintAddr(&(fCollectionsRepresentations[index][i]))
--                << ") = cling::printValue((" << output[1] << "*)" << ROOT::Internal::RDF::PrettyPrintAddr(&(collection[i])) << ");";
-+                << ") = cling::printValue((" << output[1] << "*)"
-+                << ROOT::Internal::RDF::PrettyPrintAddr(&(collection[i])) << ");";
-       }
-       return true;
-    }
-@@ -197,7 +198,7 @@ public:
-    /// Prints the representation to the standard output
-    ///
-    /// Collections are shortened to the first and last element. The overall width
--   /// is shortened to a fixed size of TODO
-+   /// is shortened to a fixed number of columns that should fit the screen width.
-    void Print() const;
- 
-    ////////////////////////////////////////////////////////////////////////////
--- 
-2.26.2
-
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 1b2e880..2a05c55 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.22.00.orig/core/base/src/TApplication.cxx root-6.22.00/core/base/src/TApplication.cxx
---- root-6.22.00.orig/core/base/src/TApplication.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/core/base/src/TApplication.cxx	2020-06-29 08:53:15.066085533 +0200
+diff -ur root-6.22.02.orig/core/base/src/TApplication.cxx root-6.22.02/core/base/src/TApplication.cxx
+--- root-6.22.02.orig/core/base/src/TApplication.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/core/base/src/TApplication.cxx	2020-08-18 09:50:12.739102596 +0200
 @@ -264,18 +264,11 @@
     LoadGraphicsLibs();
  
@@ -30,9 +30,9 @@ diff -ur root-6.22.00.orig/core/base/src/TApplication.cxx root-6.22.00/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.22.00.orig/graf2d/asimage/CMakeLists.txt root-6.22.00/graf2d/asimage/CMakeLists.txt
---- root-6.22.00.orig/graf2d/asimage/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/asimage/CMakeLists.txt	2020-06-29 08:53:15.066085533 +0200
+diff -ur root-6.22.02.orig/graf2d/asimage/CMakeLists.txt root-6.22.02/graf2d/asimage/CMakeLists.txt
+--- root-6.22.02.orig/graf2d/asimage/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/asimage/CMakeLists.txt	2020-08-18 09:50:12.761102650 +0200
 @@ -30,6 +30,7 @@
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
@@ -41,9 +41,9 @@ diff -ur root-6.22.00.orig/graf2d/asimage/CMakeLists.txt root-6.22.00/graf2d/asi
    DEPENDENCIES
      Core
      Graf
-diff -ur root-6.22.00.orig/graf2d/asimage/src/TASImage.cxx root-6.22.00/graf2d/asimage/src/TASImage.cxx
---- root-6.22.00.orig/graf2d/asimage/src/TASImage.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/asimage/src/TASImage.cxx	2020-06-29 08:53:15.068085538 +0200
+diff -ur root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx root-6.22.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/asimage/src/TASImage.cxx	2020-08-18 09:50:12.763102655 +0200
 @@ -111,6 +111,8 @@
  #   include <draw.h>
  }
@@ -199,9 +199,9 @@ diff -ur root-6.22.00.orig/graf2d/asimage/src/TASImage.cxx root-6.22.00/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.22.00.orig/graf2d/graf/CMakeLists.txt root-6.22.00/graf2d/graf/CMakeLists.txt
---- root-6.22.00.orig/graf2d/graf/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/graf/CMakeLists.txt	2020-06-29 08:53:15.068085538 +0200
+diff -ur root-6.22.02.orig/graf2d/graf/CMakeLists.txt root-6.22.02/graf2d/graf/CMakeLists.txt
+--- root-6.22.02.orig/graf2d/graf/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/graf/CMakeLists.txt	2020-08-18 09:50:12.763102655 +0200
 @@ -91,6 +91,7 @@
      ${FREETYPE_LIBRARIES}
      ZLIB::ZLIB
@@ -210,9 +210,9 @@ diff -ur root-6.22.00.orig/graf2d/graf/CMakeLists.txt root-6.22.00/graf2d/graf/C
    DEPENDENCIES
      Hist
      Matrix
-diff -ur root-6.22.00.orig/graf2d/graf/inc/TTF.h root-6.22.00/graf2d/graf/inc/TTF.h
---- root-6.22.00.orig/graf2d/graf/inc/TTF.h	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/graf/inc/TTF.h	2020-06-29 08:53:15.068085538 +0200
+diff -ur root-6.22.02.orig/graf2d/graf/inc/TTF.h root-6.22.02/graf2d/graf/inc/TTF.h
+--- root-6.22.02.orig/graf2d/graf/inc/TTF.h	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/graf/inc/TTF.h	2020-08-18 09:50:12.763102655 +0200
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -224,9 +224,9 @@ diff -ur root-6.22.00.orig/graf2d/graf/inc/TTF.h root-6.22.00/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/TTF.cxx
---- root-6.22.00.orig/graf2d/graf/src/TTF.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/graf/src/TTF.cxx	2020-06-29 08:53:15.086085582 +0200
+diff -ur root-6.22.02.orig/graf2d/graf/src/TTF.cxx root-6.22.02/graf2d/graf/src/TTF.cxx
+--- root-6.22.02.orig/graf2d/graf/src/TTF.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/graf/src/TTF.cxx	2020-08-18 09:54:27.734727819 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -245,7 +245,7 @@ diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/
  Int_t          TTF::fgNumGlyphs      = 0;
 -char          *TTF::fgFontName[kTTMaxFonts];
 +Int_t          TTF::fgFontID[kTTMaxFonts];
- FT_Matrix     *TTF::fgRotMatrix;
+ FT_Matrix     *TTF::fgRotMatrix      = nullptr;
  FT_Library     TTF::fgLibrary;
  FT_BBox        TTF::fgCBox;
 @@ -72,6 +73,11 @@
@@ -292,7 +292,7 @@ diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/
           {
              fgCharMap[fgCurFontIdx] = charmap;
              if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -378,27 +390,147 @@
+@@ -381,27 +393,147 @@
  
     if (!fontname || !fontname[0]) {
        Warning("TTF::SetTextFont",
@@ -453,7 +453,7 @@ diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/
        }
     }
  
-@@ -406,151 +538,215 @@
+@@ -409,151 +541,215 @@
     if (fgFontCount >= kTTMaxFonts) {
        Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
              kTTMaxFonts);
@@ -787,9 +787,9 @@ diff -ur root-6.22.00.orig/graf2d/graf/src/TTF.cxx root-6.22.00/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.22.00.orig/graf2d/postscript/CMakeLists.txt root-6.22.00/graf2d/postscript/CMakeLists.txt
---- root-6.22.00.orig/graf2d/postscript/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/postscript/CMakeLists.txt	2020-06-29 08:53:15.086085582 +0200
+diff -ur root-6.22.02.orig/graf2d/postscript/CMakeLists.txt root-6.22.02/graf2d/postscript/CMakeLists.txt
+--- root-6.22.02.orig/graf2d/postscript/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/postscript/CMakeLists.txt	2020-08-18 09:50:12.764102658 +0200
 @@ -27,6 +27,7 @@
    LIBRARIES
      ZLIB::ZLIB
@@ -798,9 +798,9 @@ diff -ur root-6.22.00.orig/graf2d/postscript/CMakeLists.txt root-6.22.00/graf2d/
    DEPENDENCIES
      Graf
  )
-diff -ur root-6.22.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.00/graf2d/postscript/src/TPostScript.cxx
---- root-6.22.00.orig/graf2d/postscript/src/TPostScript.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf2d/postscript/src/TPostScript.cxx	2020-06-29 08:53:15.087085585 +0200
+diff -ur root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf2d/postscript/src/TPostScript.cxx	2020-08-18 09:50:12.765102660 +0200
 @@ -233,6 +233,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -1060,9 +1060,9 @@ diff -ur root-6.22.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.00/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.22.00.orig/graf3d/gl/CMakeLists.txt root-6.22.00/graf3d/gl/CMakeLists.txt
---- root-6.22.00.orig/graf3d/gl/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf3d/gl/CMakeLists.txt	2020-06-29 08:53:15.087085585 +0200
+diff -ur root-6.22.02.orig/graf3d/gl/CMakeLists.txt root-6.22.02/graf3d/gl/CMakeLists.txt
+--- root-6.22.02.orig/graf3d/gl/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf3d/gl/CMakeLists.txt	2020-08-18 09:50:12.834102829 +0200
 @@ -208,6 +208,7 @@
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
@@ -1071,9 +1071,9 @@ diff -ur root-6.22.00.orig/graf3d/gl/CMakeLists.txt root-6.22.00/graf3d/gl/CMake
    DEPENDENCIES
      Hist
      Gui
-diff -ur root-6.22.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.00/graf3d/gl/src/TGLFontManager.cxx
---- root-6.22.00.orig/graf3d/gl/src/TGLFontManager.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf3d/gl/src/TGLFontManager.cxx	2020-06-29 08:53:15.087085585 +0200
+diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf3d/gl/src/TGLFontManager.cxx	2020-08-18 09:50:12.854102878 +0200
 @@ -37,6 +37,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1329,9 +1329,9 @@ diff -ur root-6.22.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.00/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.22.00.orig/graf3d/gl/src/TGLText.cxx root-6.22.00/graf3d/gl/src/TGLText.cxx
---- root-6.22.00.orig/graf3d/gl/src/TGLText.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/graf3d/gl/src/TGLText.cxx	2020-06-29 08:53:15.088085587 +0200
+diff -ur root-6.22.02.orig/graf3d/gl/src/TGLText.cxx root-6.22.02/graf3d/gl/src/TGLText.cxx
+--- root-6.22.02.orig/graf3d/gl/src/TGLText.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/graf3d/gl/src/TGLText.cxx	2020-08-18 09:50:12.881102944 +0200
 @@ -34,6 +34,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1466,9 +1466,9 @@ diff -ur root-6.22.00.orig/graf3d/gl/src/TGLText.cxx root-6.22.00/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.22.00.orig/gui/gui/src/TGApplication.cxx root-6.22.00/gui/gui/src/TGApplication.cxx
---- root-6.22.00.orig/gui/gui/src/TGApplication.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/gui/gui/src/TGApplication.cxx	2020-06-29 08:53:15.088085587 +0200
+diff -ur root-6.22.02.orig/gui/gui/src/TGApplication.cxx root-6.22.02/gui/gui/src/TGApplication.cxx
+--- root-6.22.02.orig/gui/gui/src/TGApplication.cxx	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/gui/gui/src/TGApplication.cxx	2020-08-18 09:50:13.153103608 +0200
 @@ -80,20 +80,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-increase-timeout-for-ppc64le.patch b/root-increase-timeout-for-ppc64le.patch
new file mode 100644
index 0000000..a00c3fe
--- /dev/null
+++ b/root-increase-timeout-for-ppc64le.patch
@@ -0,0 +1,21 @@
+diff -ur root-6.22.02.orig/tutorials/CMakeLists.txt root-6.22.02/tutorials/CMakeLists.txt
+--- root-6.22.02.orig/tutorials/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/tutorials/CMakeLists.txt	2020-08-21 18:52:30.059118093 +0200
+@@ -441,7 +441,7 @@
+   string(REPLACE "/" "-" tname ${tname})
+ 
+    # These tests on ARM64 need much more than 20 minutes - increase the timeout
+-   if(ROOT_ARCHITECTURE MATCHES arm64)
++   if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
+      set(thisTestTimeout 2400) # 40m
+    else()
+      set(thisTestTimeout 1200) # 20m
+@@ -468,7 +468,7 @@
+   string(REPLACE "/" "-" tname ${tname})
+ 
+    # These tests on ARM64 need much more than 20 minutes - increase the timeout
+-   if(ROOT_ARCHITECTURE MATCHES arm64)
++   if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
+      set(thisTestTimeout 2400) # 40m
+    else()
+      set(thisTestTimeout 1200) # 20m
diff --git a/root-install-headers-with-COMPONENT-headers.patch b/root-install-headers-with-COMPONENT-headers.patch
new file mode 100644
index 0000000..8948c1e
--- /dev/null
+++ b/root-install-headers-with-COMPONENT-headers.patch
@@ -0,0 +1,39 @@
+From c6b03126690439f5137e4a1090e81e93fd09df9a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 19 Aug 2020 20:17:37 +0200
+Subject: [PATCH] Install headers with COMPONENT headers
+
+---
+ bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 4 +++-
+ bindings/pyroot/pythonizations/CMakeLists.txt | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+index 00ce6c13b8..e23b439b3e 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
++++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+@@ -120,4 +120,6 @@ foreach(val RANGE ${how_many_pythons})
+ endforeach()
+ 
+ file(COPY ${headers} DESTINATION ${CMAKE_BINARY_DIR}/include/CPyCppyy)
+-install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy)
++install(FILES ${headers}
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy
++        COMPONENT headers)
+diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
+index 7827204396..377ec46916 100644
+--- a/bindings/pyroot/pythonizations/CMakeLists.txt
++++ b/bindings/pyroot/pythonizations/CMakeLists.txt
+@@ -159,6 +159,8 @@ install(DIRECTORY ${localruntimedir}/ROOT
+         COMPONENT libraries)
+ 
+ # Install headers required by pythonizations
+-install(FILES ${PYROOT_EXTRA_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT)
++install(FILES ${PYROOT_EXTRA_HEADERS}
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT
++        COMPONENT headers)
+ 
+ ROOT_ADD_TEST_SUBDIRECTORY(test)
+-- 
+2.26.2
+
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index d27c135..21b1319 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,19 +1,7 @@
-diff -ur root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt root-6.22.00/bindings/jupyroot/CMakeLists.txt
---- root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/jupyroot/CMakeLists.txt	2020-08-20 13:56:08.875471462 +0200
-@@ -58,7 +58,7 @@
-   endforeach()
- 
-   # Install library
--  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION ${runtimedir})
-+  install(TARGETS ${libname} DESTINATION ${runtimedir})
- 
- endforeach()
- 
-diff -ur root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt
---- root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-20 13:57:31.465673116 +0200
-@@ -124,8 +124,7 @@
+diff -ur root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt root-6.22.02/bindings/jupyroot/CMakeLists.txt
+--- root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/bindings/jupyroot/CMakeLists.txt	2020-08-19 09:49:12.094722642 +0200
+@@ -70,8 +70,7 @@
    endforeach()
  
    # Install library
@@ -22,4 +10,21 @@ diff -ur root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.
 +  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
                               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
                               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
- endforeach()
+ 
+diff -ur root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt
+--- root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
++++ root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-19 10:36:10.390486171 +0200
+@@ -133,11 +133,10 @@
+   # Create meta-target PyROOT2 and PyROOT3 (INTERFACE library)
+   # Export of targets are not supported for custom targets(add_custom_targets())
+   add_library(PyROOT${python_major_version_string} INTERFACE)
+-  target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string} ROOTPythonizations${python_under_version_string})
++  target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string})
+ 
+   # Install library
+-  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
+-                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
++  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+                              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
+                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ 
diff --git a/root-python2-compat.patch b/root-python2-compat.patch
deleted file mode 100644
index 8006a8f..0000000
--- a/root-python2-compat.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 056b67d05c950cf04a8290dcdf376078ee92b449 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 29 Jun 2020 17:01:03 +0200
-Subject: [PATCH] Compatibility with python 2.7 versions before 2.7.9
-
-This is a workaround for https://bugs.python.org/issue21591 which
-affect Python 2 versions before 2.7.9. This includes Python 2.7.5
-which is the Python 2 version on RHEL/CentOS 7.
----
- .../pyroot/pythonizations/python/ROOT/_numbadeclare.py    | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py b/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
-index 1bef862af5..9aa893b8f0 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
-@@ -32,7 +32,7 @@ def _NumbaDeclareDecorator(input_types, return_type, name=None):
-         import cffi
-     except:
-         raise Exception('Failed to import cffi')
--    import re
-+    import re, sys
- 
-     # Normalize input types by stripping ROOT and VecOps namespaces from input types
-     def normalize_typename(t):
-@@ -195,7 +195,11 @@ def pywrapper({SIGNATURE}):
-         if 'RVec' in return_type:
-             glob['dtype_r'] = get_numba_type(get_inner_type(return_type))
- 
--        exec(pywrappercode, glob, locals())
-+        if sys.version_info[0] >= 3:
-+            exec(pywrappercode, glob, locals()) in {}
-+        else:
-+            exec(pywrappercode) in glob, locals()
-+
-         if not 'pywrapper' in locals():
-             raise Exception('Failed to create Python wrapper function:\n{}'.format(pywrappercode))
- 
--- 
-2.26.2
-
diff --git a/root-python3.8-object.patch b/root-python3.8-object.patch
index a4d2759..1cc6c7b 100644
--- a/root-python3.8-object.patch
+++ b/root-python3.8-object.patch
@@ -143,7 +143,6 @@ diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx root-
  };
  
  } // namespace CPyCppyy
-Endast i root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src: CPPScope.cxx.orig
 diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
 --- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-14 17:51:48.000000000 +0200
 +++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-21 20:53:49.652914433 +0200
diff --git a/root.spec b/root.spec
index 08b3081..5b7c702 100644
--- a/root.spec
+++ b/root.spec
@@ -43,9 +43,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.22.00
+Version:	6.22.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -123,16 +123,18 @@ Patch20:	%{name}-stressGraphics.patch
 #		Fix off-by-one error in histogram v7 bin iterator
 #		https://github.com/root-project/root/pull/5958
 Patch21:	%{name}-histv7-bin-iterator.patch
-#		Compatibility with python 2.7 versions before 2.7.9
-#		https://github.com/root-project/root/pull/5960
-Patch22:	%{name}-python2-compat.patch
+#		Add back line accidentally removed in root-config
+#		https://github.com/root-project/root/pull/6236
+Patch22:	%{name}-config-restore.patch
 #		Fix the RNTuple.LargeFile test on 32bit (i386 and armv7hf)
 #		https://github.com/root-project/root/pull/5977
 Patch23:	%{name}-ntuple-largefile.patch
+#		Headers in new PyROOT are not installed with COMPONENT headers
+#		https://github.com/root-project/root/pull/6237
+Patch24:	%{name}-install-headers-with-COMPONENT-headers.patch
 #		Fix doxygen issues
 #		https://github.com/root-project/root/pull/6029
-Patch24:	%{name}-doxygen-filenames.patch
-Patch25:	%{name}-doxygen-endof-part1.patch
+Patch25:	%{name}-doxygen-filenames.patch
 Patch26:	%{name}-doxygen-endof-part2.patch
 Patch27:	%{name}-doxygen-parameter-names.patch
 Patch28:	%{name}-doxygen-macro-name.patch
@@ -152,6 +154,9 @@ Patch34:	%{name}-srm-ifce-deps.patch
 #		Fix a shadow warning
 #		https://github.com/root-project/root/pull/6029
 Patch35:	%{name}-fix-a-shadow-warning.patch
+#		Increase timeout for ppc64le
+#		https://github.com/root-project/root/pull/6246
+Patch36:	%{name}-increase-timeout-for-ppc64le.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1854,6 +1859,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2344,20 +2350,29 @@ if [ "$doxver" = "1.8.17" -o "$doxver" = "1.8.18" ] ; then
 	classPdfCacheElem__inherit__graph.svg \
 	classROOT_1_1Experimental_1_1REveMagFieldDuo__coll__graph_org.svg \
 	classROOT_1_1Fit_1_1BasicFCN__coll__graph_org.svg \
+	classROOT_1_1Math_1_1Delaunay2D__coll__graph_org.svg \
 	classROOT_1_1Math_1_1MemGradFunHandler__coll__graph_org.svg \
 	classTAttImage__coll__graph_org.svg \
+	classTDecompQRH__coll__graph_org.svg \
+	classTDecompSVD__coll__graph_org.svg \
 	classTImagePalette__coll__graph_org.svg \
-	inherit_graph_1796.map \
-	inherit_graph_1796.md5 \
-	inherit_graph_1796.svg \
+	classTMVA_1_1CrossValidationResult__coll__graph_org.svg \
+	classTQpDataBase__coll__graph_org.svg \
+	classTQpLinSolverBase__coll__graph_org.svg \
+	classTQpResidual__coll__graph_org.svg \
+	classunsigned_01int.html \
+	inherit_graph_1798.map \
+	inherit_graph_1798.md5 \
+	inherit_graph_1798.svg \
 	structEvent__t__coll__graph_org.svg \
 	structGLUvertex__coll__graph_org.svg \
 	structROOT_1_1Experimental_1_1REveBoxSet_1_1BEllipticCone__t__coll__graph_org.svg \
+	structROOT_1_1Experimental_1_1REveBoxSet_1_1BOrigin__t__inherit__graph_org.svg \
+	structROOT_1_1Experimental_1_1REveDigitSet_1_1DigitBase__t__inherit__graph_org.svg \
 	structROOT_1_1Internal_1_1RootCling_1_1DriverConfig__coll__graph_org.svg \
 	structTEveDigitSet_1_1DigitBase__t__inherit__graph.map \
 	structTEveDigitSet_1_1DigitBase__t__inherit__graph.md5 \
-	structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg \
-	structTGL5DPainter_1_1Surf__t__coll__graph_org.svg ; do
+	structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg ; do
 	[ -r %{buildroot}%{_pkgdocdir}/html/${f} ] || \
 	    touch %{buildroot}%{_pkgdocdir}/html/${f}
     done
@@ -2423,7 +2438,7 @@ popd
 #   reads sqlite data over network:
 #   http://root.cern.ch/files/root_download_stats.sqlite
 #
-# - gtest-tree-treeplayer-test-treeprocessormt
+# - gtest-tree-treeplayer-test-treeprocessormt-remotefiles
 # - tutorial-dataframe-df102_NanoAODDimuonAnalysis
 # - tutorial-dataframe-df103_NanoAODHiggsAnalysis
 #   reads input data over network:
@@ -2474,7 +2489,7 @@ tutorial-multicore-mp105_processEntryList|\
 tutorial-multicore-imt101_parTreeProcessing|\
 gtest-tree-dataframe-test-datasource-sqlite|\
 tutorial-dataframe-df..._SQlite|\
-gtest-tree-treeplayer-test-treeprocessormt|\
+gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
 tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
@@ -2834,7 +2849,7 @@ fi
 %{_libdir}/%{name}/libROOTTPython_rdict.pcm
 
 %if %{buildpy2}
-%files -n python2-%{name}
+%files -n python2-%{name} -f includelist-bindings-pyroot
 %{python2_sitearch}/cppyy
 %{python2_sitearch}/cppyy_backend
 %{python2_sitearch}/ROOT
@@ -2844,7 +2859,7 @@ fi
 %{python2_sitearch}/libROOTPythonizations%{python2_version_uscore}.so
 %{_libdir}/%{name}/libcppyy%{python2_version_uscore}.*
 %{_libdir}/%{name}/libcppyy_backend%{python2_version_uscore}.*
-%{_includedir}/%{name}/CPyCppyy
+%dir %{_includedir}/%{name}/CPyCppyy
 
 %files -n python2-jupyroot
 %{python2_sitearch}/JupyROOT
@@ -2858,7 +2873,7 @@ fi
 %{python2_sitelib}/JsMVA-*.egg-info
 %endif
 
-%files -n python%{python3_pkgversion}-%{name}
+%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{python3_sitearch}/cppyy
 %{python3_sitearch}/cppyy_backend
 %{python3_sitearch}/ROOT
@@ -2868,7 +2883,7 @@ fi
 %{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.%{py3_soabi}.so
 %{_libdir}/%{name}/libcppyy%{python3_version_uscore}.*
 %{_libdir}/%{name}/libcppyy_backend%{python3_version_uscore}.*
-%{_includedir}/%{name}/CPyCppyy
+%dir %{_includedir}/%{name}/CPyCppyy
 
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
@@ -3479,6 +3494,14 @@ fi
 %endif
 
 %changelog
+* Fri Aug 21 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-1
+- Update to 6.22.02
+- Drop patch previously backported: root-doxygen-endof-part1.patch
+- Drop patch accepted upstream: root-python2-compat.patch
+- Add back line accidentally removed in root-config
+- Install headers in new PyROOT with COMPONENT headers
+- Increase test timeout for ppc64le
+
 * Thu Aug 20 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.00-7
 - Avoid unneeded build requirement on srm-ifce-devel
 - Do not export Python modules in CMake config
diff --git a/sources b/sources
index b6ae6df..17c2067 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.22.00.tar.xz) = ca2f72d691619d8afadd3c20f7e3b19d4a12f9f5a38bda340ee4c9fd10993c78db4016a1904851c75478657d971a72f18ad4b1f1bdf61da8be8a0e6de0e1753a
+SHA512 (root-6.22.02.tar.xz) = cb169e71dc6e7107ba3353e4ec746fc6ff40ed77c7d1dff96afd22a89567ffa7c3cfbd346a4e60ff3e4e29f09f624ce779f0cdbd61a6cd399fcce9ece5b1738d
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 2c7e472d02f910f080b2859a347fe6e4bb7852d0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 30 Aug 2020 06:47:42 +0200
Subject: [PATCH 187/344] Adapt to xrootd 5 (Fedora 33+, EPEL 7+)   Don't build
 the old proof client (xproofd)   Don't build the old NetX module

---
 root-xproofd.patch | 54 ++++++++++++++++++++++++++++++++
 root.spec          | 77 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 root-xproofd.patch

diff --git a/root-xproofd.patch b/root-xproofd.patch
new file mode 100644
index 0000000..a62c8d7
--- /dev/null
+++ b/root-xproofd.patch
@@ -0,0 +1,54 @@
+From 0a752f33834a3520a7f18433f48bc9e1e9d32cea Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 30 Aug 2020 05:46:42 +0200
+Subject: [PATCH] Only install the xproofd script and man page if xproofd
+ option is on
+
+---
+ CMakeLists.txt                        | 7 ++++++-
+ cmake/modules/RootConfiguration.cmake | 4 ++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76f6ad93b3..b37a1bbe70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -528,7 +528,12 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+   if(webgui)
+      install(DIRECTORY ui5/    DESTINATION ${CMAKE_INSTALL_OPENUI5DIR})
+   endif()
+-  install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR})
++  if(xproofd AND xrootd AND ssl)
++     set(MAN_PATT_EXCL)
++  else()
++     set(MAN_PATT_EXCL PATTERN xproofd.1 EXCLUDE)
++  endif()
++  install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR} ${MAN_PATT_EXCL})
+   install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+   install(FILES
+     cmake/modules/RootMacros.cmake
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index 151235aa4e..a71ac72101 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -819,7 +819,7 @@ configure_file(${CMAKE_SOURCE_DIR}/config/setxrd.sh ${CMAKE_RUNTIME_OUTPUT_DIREC
+ configure_file(${CMAKE_SOURCE_DIR}/config/proofserv.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/proofserv @ONLY NEWLINE_STYLE UNIX)
+ configure_file(${CMAKE_SOURCE_DIR}/config/roots.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/roots @ONLY NEWLINE_STYLE UNIX)
+ configure_file(${CMAKE_SOURCE_DIR}/config/root-help.el.in root-help.el @ONLY NEWLINE_STYLE UNIX)
+-if (XROOTD_FOUND AND XROOTD_NOMAIN)
++if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
+   configure_file(${CMAKE_SOURCE_DIR}/config/xproofd.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd @ONLY NEWLINE_STYLE UNIX)
+ endif()
+ if(WIN32)
+@@ -857,7 +857,7 @@ install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/memprobe
+                           WORLD_EXECUTE WORLD_READ
+               DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-if (XROOTD_FOUND AND XROOTD_NOMAIN)
++if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
+    install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd
+                  PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                              GROUP_EXECUTE GROUP_READ
+-- 
+2.26.2
+
diff --git a/root.spec b/root.spec
index 5b7c702..9a17191 100644
--- a/root.spec
+++ b/root.spec
@@ -23,6 +23,12 @@
 %global root7 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 7
+%global xrootd5 1
+%else
+%global xrootd5 0
+%endif
+
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # Multi-threading support requires TBB version >= 2018
 %global tbb 1
@@ -45,7 +51,7 @@
 Name:		root
 Version:	6.22.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -157,6 +163,9 @@ Patch35:	%{name}-fix-a-shadow-warning.patch
 #		Increase timeout for ppc64le
 #		https://github.com/root-project/root/pull/6246
 Patch36:	%{name}-increase-timeout-for-ppc64le.patch
+#		Only install the xproofd script and man page if option is on
+#		https://github.com/root-project/root/pull/6281
+Patch37:	%{name}-xproofd.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1300,6 +1309,10 @@ Obsoletes:	%{name}-clarens < 5.34.01
 Obsoletes:	%{name}-peac < 5.34.01
 #		Package split (proof-player from proof)
 Obsoletes:	%{name}-proof < 6.14.00
+Obsoletes:	%{name}-proofd < 6.16.00
+%if %{xrootd5}
+Obsoletes:	%{name}-xproof < %{version}-%{release}
+%endif
 
 %description proof
 This package contains the proof extension for ROOT. This provides a
@@ -1351,6 +1364,7 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains a library for browsing an interactive PROOF
 session in ROOT.
 
+%if ! %{xrootd5}
 %package xproof
 Summary:	XPROOF extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1360,11 +1374,11 @@ Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
 Requires:	xrootd-server%{?_isa}
-Obsoletes:	%{name}-proofd < 6.16.00
 
 %description xproof
 This package contains the xproof extension for ROOT. This provides a
 client to be used in a PROOF environment.
+%endif
 
 %package roofit
 Summary:	ROOT extension for modeling expected distributions - toolkit
@@ -1860,6 +1874,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2055,7 +2070,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dx11:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
+%if %{xrootd5}
+       -Dxproofd:BOOL=OFF \
+%else
        -Dxproofd:BOOL=ON \
+%endif
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
        -Dclingtest:BOOL=OFF \
@@ -2268,13 +2287,18 @@ rm TFile/P070_TAlienFile.C
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
-%if %{root7} == 0
+%if ! %{root7}
 rm TGuiFactory/P030_TWebGuiFactory.C
 %endif
+%if %{xrootd5}
+rm TProofMgr/P010_TXProofMgr.C
+rm TProofServ/P010_TXProofServ.C
+rm TSlave/P010_TXSlave.C
+%endif
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
-%if %{root7} == 0
+%if ! %{root7}
 rm TVirtualGeoPainter/P020_REveGeoPainter.C
 %endif
 rm TVirtualGLImp/P020_TGWin32GL.C
@@ -2282,6 +2306,11 @@ rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
 rmdir TGrid
+%if %{xrootd5}
+rmdir TProofMgr
+rmdir TProofServ
+rmdir TSlave
+%endif
 rmdir TVirtualGeoConverter
 popd
 
@@ -2338,11 +2367,10 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
 mv doc/html %{buildroot}%{_pkgdocdir}/html
 popd
 
-# Workaround for doxygen 1.8.17 and 1.8.18 doing slightly different things
+%if %{?fedora}%{!?fedora:0} >= 31
+# Workaround for doxygen 1.8.17 and later doing slightly different things
 # on 32 and 64 bit
-doxver=$(doxygen -v)
-if [ "$doxver" = "1.8.17" -o "$doxver" = "1.8.18" ] ; then
-    for f in \
+for f in \
 	classDouble__t.html \
 	classPdfCacheElem.html \
 	classPdfCacheElem__inherit__graph.map \
@@ -2361,6 +2389,9 @@ if [ "$doxver" = "1.8.17" -o "$doxver" = "1.8.18" ] ; then
 	classTQpLinSolverBase__coll__graph_org.svg \
 	classTQpResidual__coll__graph_org.svg \
 	classunsigned_01int.html \
+	inherit_graph_1794.map \
+	inherit_graph_1794.md5 \
+	inherit_graph_1794.svg \
 	inherit_graph_1798.map \
 	inherit_graph_1798.md5 \
 	inherit_graph_1798.svg \
@@ -2375,8 +2406,8 @@ if [ "$doxver" = "1.8.17" -o "$doxver" = "1.8.18" ] ; then
 	structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg ; do
 	[ -r %{buildroot}%{_pkgdocdir}/html/${f} ] || \
 	    touch %{buildroot}%{_pkgdocdir}/html/${f}
-    done
-fi
+done
+%endif
 
 # Create includelist files ...
 for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
@@ -2393,7 +2424,10 @@ cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-geom-geom* > includelist-geom
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
 cat includelist-graf3d-rglew >> includelist-graf3d-gl
-cat includelist-net-netx* > includelist-netx
+cat includelist-net-netxng > includelist-netx
+%if ! %{xrootd5}
+cat includelist-net-netx >> includelist-netx
+%endif
 
 %check
 pushd %{_vpath_builddir}
@@ -2699,7 +2733,9 @@ fi
 %ldconfig_scriptlets proof-bench
 %ldconfig_scriptlets proof-player
 %ldconfig_scriptlets proof-sessionviewer
+%if ! %{xrootd5}
 %ldconfig_scriptlets xproof
+%endif
 %ldconfig_scriptlets roofit
 %ldconfig_scriptlets roofit-core
 %ldconfig_scriptlets roofit-more
@@ -3263,8 +3299,10 @@ fi
 %{_libdir}/%{name}/libRHTTPSniff_rdict.pcm
 
 %files netx -f includelist-netx
+%if ! %{xrootd5}
 %{_libdir}/%{name}/libNetx.*
 %{_libdir}/%{name}/libNetx_rdict.pcm
+%endif
 %{_libdir}/%{name}/libNetxNG.*
 %{_libdir}/%{name}/libNetxNG_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
@@ -3272,6 +3310,11 @@ fi
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
 
 %files proof -f includelist-proof-proof
+%{_bindir}/proofserv
+%{_bindir}/proofserv.exe
+%{_bindir}/xpdtest
+%{_mandir}/man1/proofserv.1*
+%{_mandir}/man1/xpdtest.1*
 %{_libdir}/%{name}/libProof.*
 %{_libdir}/%{name}/libProof_rdict.pcm
 %{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
@@ -3308,14 +3351,10 @@ fi
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
+%if ! %{xrootd5}
 %files xproof -f includelist-proof-proofx
 %{_bindir}/proofexecv
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
 %{_bindir}/xproofd
-%{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
 %{_mandir}/man1/xproofd.1*
 %{_libdir}/%{name}/libProofx.*
 %{_libdir}/%{name}/libProofx_rdict.pcm
@@ -3323,6 +3362,7 @@ fi
 %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
 %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
 %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
+%endif
 
 %files roofit -f includelist-roofit-roofit
 %{_libdir}/%{name}/libRooFit.*
@@ -3494,6 +3534,11 @@ fi
 %endif
 
 %changelog
+* Sun Aug 30 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-2
+- Adapt to xrootd 5 (Fedora 33+, EPEL 7+)
+  - Don't build the old proof client (xproofd)
+  - Don't build the old NetX module
+
 * Fri Aug 21 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-1
 - Update to 6.22.02
 - Drop patch previously backported: root-doxygen-endof-part1.patch

From 917227575d00fe2dc1daad7edd1019a476fc3d07 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 3 Oct 2020 09:43:44 +0200
Subject: [PATCH 188/344] Drop obsolete patch
 root-add-flexiblas-detection.patch (cmake's   FindBLAS.cmake supports
 flexiblas now) Drop the workaround for the bug in doxygen causing different
 results   on 32 and 64 bit architectures (use doxygen < 1.8.17 or >=
 1.8.20-3) Build require xrootd 5 (Fedora 33+, EPEL 7+)

---
 root-add-flexiblas-detection.patch | 31 ------------
 root.spec                          | 81 +++++++++---------------------
 2 files changed, 25 insertions(+), 87 deletions(-)
 delete mode 100644 root-add-flexiblas-detection.patch

diff --git a/root-add-flexiblas-detection.patch b/root-add-flexiblas-detection.patch
deleted file mode 100644
index bcf8063..0000000
--- a/root-add-flexiblas-detection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2f3c530cd8c8b9adc0303e2ae24a069f671aee1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sun, 16 Aug 2020 13:46:21 +0200
-Subject: [PATCH] add flexiblas detection
-
----
- cmake/modules/SearchInstalledSoftware.cmake | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index f1c6ee27..12aa822f 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -1496,7 +1496,13 @@ endif()
- if(tmva)
-   if(tmva-cpu AND imt)
-     message(STATUS "Looking for BLAS for optional parts of TMVA")
--    find_package(BLAS)
-+    pkg_check_modules(FLEXIBLAS flexiblas)
-+    set(BLAS_FOUND ${FLEXIBLAS_FOUND})
-+    set(BLAS_LIBRARIES "${FLEXIBLAS_LIBRARIES}")
-+    set(BLAS_LINKER_FLAGS)
-+    if (NOT BLAS_FOUND)
-+      find_package(BLAS)
-+    endif()
-     if(NOT BLAS_FOUND)
-       if (GSL_FOUND)
-         message(STATUS "Using GSL CBLAS for optional parts of TMVA")
--- 
-2.25.2
-
diff --git a/root.spec b/root.spec
index 9a17191..67e2349 100644
--- a/root.spec
+++ b/root.spec
@@ -36,12 +36,6 @@
 %global tbb 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 33
-%global blaslib flexiblas
-%else
-%global blaslib openblas
-%endif
-
 # Do not create .orig files when patching source
 %global _default_patch_flags --no-backup-if-mismatch
 
@@ -51,7 +45,7 @@
 Name:		root
 Version:	6.22.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -152,8 +146,9 @@ Patch31:	%{name}-fix-bad-regex.patch
 #		Compatibility with xrootd 5
 #		https://github.com/root-project/root/pull/6031
 Patch32:	%{name}-xrootd5-compat.patch
-#		Enable FlexiBLAS detection
-Patch33:	%{name}-add-flexiblas-detection.patch
+#		Only install the xproofd script and man page if option is on
+#		https://github.com/root-project/root/pull/6281
+Patch33:	%{name}-xproofd.patch
 #		Avoid unneeded build requirement on srm-ifce-devel
 #		https://github.com/root-project/root/pull/6233
 Patch34:	%{name}-srm-ifce-deps.patch
@@ -163,9 +158,6 @@ Patch35:	%{name}-fix-a-shadow-warning.patch
 #		Increase timeout for ppc64le
 #		https://github.com/root-project/root/pull/6246
 Patch36:	%{name}-increase-timeout-for-ppc64le.patch
-#		Only install the xproofd script and man page if option is on
-#		https://github.com/root-project/root/pull/6281
-Patch37:	%{name}-xproofd.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -225,8 +217,12 @@ BuildRequires:	openssl-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
+%if %{xrootd5}
+BuildRequires:	xrootd-client-devel >= 1:5.0.0
+%else
 BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
+%endif
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
@@ -243,7 +239,14 @@ BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
-BuildRequires:	%{blaslib}-devel
+%if %{?fedora}%{!?fedora:0} >= 33
+BuildRequires:	flexiblas-devel
+#		Required for FlexiBLAS support in FindBLAS.cmake
+#		(in cmake 3.19.0, backported to cmake 3.18.3-1 in Fedora)
+BuildRequires:	cmake-data >= 3.18.3-1
+%else
+BuildRequires:	openblas-devel
+%endif
 BuildRequires:	python%{python3_pkgversion}-numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
@@ -1874,7 +1877,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
-%patch37 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2367,48 +2369,6 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
 mv doc/html %{buildroot}%{_pkgdocdir}/html
 popd
 
-%if %{?fedora}%{!?fedora:0} >= 31
-# Workaround for doxygen 1.8.17 and later doing slightly different things
-# on 32 and 64 bit
-for f in \
-	classDouble__t.html \
-	classPdfCacheElem.html \
-	classPdfCacheElem__inherit__graph.map \
-	classPdfCacheElem__inherit__graph.md5 \
-	classPdfCacheElem__inherit__graph.svg \
-	classROOT_1_1Experimental_1_1REveMagFieldDuo__coll__graph_org.svg \
-	classROOT_1_1Fit_1_1BasicFCN__coll__graph_org.svg \
-	classROOT_1_1Math_1_1Delaunay2D__coll__graph_org.svg \
-	classROOT_1_1Math_1_1MemGradFunHandler__coll__graph_org.svg \
-	classTAttImage__coll__graph_org.svg \
-	classTDecompQRH__coll__graph_org.svg \
-	classTDecompSVD__coll__graph_org.svg \
-	classTImagePalette__coll__graph_org.svg \
-	classTMVA_1_1CrossValidationResult__coll__graph_org.svg \
-	classTQpDataBase__coll__graph_org.svg \
-	classTQpLinSolverBase__coll__graph_org.svg \
-	classTQpResidual__coll__graph_org.svg \
-	classunsigned_01int.html \
-	inherit_graph_1794.map \
-	inherit_graph_1794.md5 \
-	inherit_graph_1794.svg \
-	inherit_graph_1798.map \
-	inherit_graph_1798.md5 \
-	inherit_graph_1798.svg \
-	structEvent__t__coll__graph_org.svg \
-	structGLUvertex__coll__graph_org.svg \
-	structROOT_1_1Experimental_1_1REveBoxSet_1_1BEllipticCone__t__coll__graph_org.svg \
-	structROOT_1_1Experimental_1_1REveBoxSet_1_1BOrigin__t__inherit__graph_org.svg \
-	structROOT_1_1Experimental_1_1REveDigitSet_1_1DigitBase__t__inherit__graph_org.svg \
-	structROOT_1_1Internal_1_1RootCling_1_1DriverConfig__coll__graph_org.svg \
-	structTEveDigitSet_1_1DigitBase__t__inherit__graph.map \
-	structTEveDigitSet_1_1DigitBase__t__inherit__graph.md5 \
-	structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg ; do
-	[ -r %{buildroot}%{_pkgdocdir}/html/${f} ] || \
-	    touch %{buildroot}%{_pkgdocdir}/html/${f}
-done
-%endif
-
 # Create includelist files ...
 for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
@@ -3534,6 +3494,13 @@ fi
 %endif
 
 %changelog
+* Fri Oct 02 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-3
+- Drop obsolete patch root-add-flexiblas-detection.patch (cmake's
+  FindBLAS.cmake supports flexiblas now)
+- Drop the workaround for the bug in doxygen causing different results
+  on 32 and 64 bit architectures (use doxygen < 1.8.17 or >= 1.8.20-3)
+- Build require xrootd 5 (Fedora 33+, EPEL 7+)
+
 * Sun Aug 30 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-2
 - Adapt to xrootd 5 (Fedora 33+, EPEL 7+)
   - Don't build the old proof client (xproofd)
@@ -3595,6 +3562,8 @@ fi
   - Fix doxygen issues
   - Fix bad regex in TProofMgr
   - Compatibility with xrootd 5
+- Add workaround for a bug in doxygen 1.8.17 and later causing different
+  results on 32 and 64 bit
 
 * Sat Jul 11 2020 Jeff Law <law@redhat.com> - 6.20.06-2
 - Disable LTO

From 7e225d815e0f3910a0c86dd1408c50666ec71438 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 7 Nov 2020 12:54:12 +0100
Subject: [PATCH 189/344] Rebuild for C++ standard library __GLIBCXX__ 20201016

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 67e2349..d160ad5 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3494,6 +3494,9 @@ fi
 %endif
 
 %changelog
+* Sat Nov  7 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-4
+- Rebuild for C++ standard library __GLIBCXX__ 20201016
+
 * Fri Oct 02 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-3
 - Drop obsolete patch root-add-flexiblas-detection.patch (cmake's
   FindBLAS.cmake supports flexiblas now)

From 99ef1e39680ce26a4b39d7b35eeeecb0ce4aa8fd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 20 Nov 2020 08:58:27 +0100
Subject: [PATCH 190/344] Update to 6.22.04 Drop patch
 root-xrootd5-compat.patch (accepted upstream)

---
 root-epel7-ppc64le-pyroot.patch         |  13 ++-
 root-increase-timeout-for-ppc64le.patch |  25 ++++--
 root-xrootd5-compat.patch               | 109 ------------------------
 root.spec                               |  26 +++---
 sources                                 |   2 +-
 5 files changed, 42 insertions(+), 133 deletions(-)
 delete mode 100644 root-xrootd5-compat.patch

diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch
index 4b4d314..4619bf0 100644
--- a/root-epel7-ppc64le-pyroot.patch
+++ b/root-epel7-ppc64le-pyroot.patch
@@ -1,8 +1,7 @@
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/__init__.py
-index 227f80765b..eb03251c28 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/__init__.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/__init__.py
-@@ -25,6 +25,12 @@ environ['CPPYY_API_PATH'] = 'none'
+diff -ur root-6.22.04.orig/bindings/pyroot/pythonizations/python/ROOT/__init__.py root-6.22.04/bindings/pyroot/pythonizations/python/ROOT/__init__.py
+--- root-6.22.04.orig/bindings/pyroot/pythonizations/python/ROOT/__init__.py	2020-11-13 11:42:09.000000000 +0100
++++ root-6.22.04/bindings/pyroot/pythonizations/python/ROOT/__init__.py	2020-11-14 15:38:24.462463625 +0100
+@@ -19,6 +19,12 @@
  # Prevent cppyy from filtering ROOT libraries
  environ['CPPYY_NO_ROOT_FILTER'] = '1'
  
@@ -13,5 +12,5 @@ index 227f80765b..eb03251c28 100644
 +    print("An exception occurred while loading libCore.so with ctypes")
 +
  import cppyy
- 
- # import libROOTPythonizations with Python version number
+ if not 'ROOTSYS' in environ:
+     # Revert setting made by cppyy
diff --git a/root-increase-timeout-for-ppc64le.patch b/root-increase-timeout-for-ppc64le.patch
index a00c3fe..f4bbc79 100644
--- a/root-increase-timeout-for-ppc64le.patch
+++ b/root-increase-timeout-for-ppc64le.patch
@@ -1,8 +1,18 @@
-diff -ur root-6.22.02.orig/tutorials/CMakeLists.txt root-6.22.02/tutorials/CMakeLists.txt
---- root-6.22.02.orig/tutorials/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/tutorials/CMakeLists.txt	2020-08-21 18:52:30.059118093 +0200
-@@ -441,7 +441,7 @@
-   string(REPLACE "/" "-" tname ${tname})
+From 4a4f661e80aa569a2fe2fcadeb2632db52371f79 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 21 Aug 2020 18:46:36 +0200
+Subject: [PATCH] Increase timeout for PPC64
+
+---
+ tutorials/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index b49bc68209..ef6e884658 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -462,7 +462,7 @@ foreach(t ${tutorials})
+   endif()
  
     # These tests on ARM64 need much more than 20 minutes - increase the timeout
 -   if(ROOT_ARCHITECTURE MATCHES arm64)
@@ -10,7 +20,7 @@ diff -ur root-6.22.02.orig/tutorials/CMakeLists.txt root-6.22.02/tutorials/CMake
       set(thisTestTimeout 2400) # 40m
     else()
       set(thisTestTimeout 1200) # 20m
-@@ -468,7 +468,7 @@
+@@ -489,7 +489,7 @@ foreach(t ${mpi_tutorials})
    string(REPLACE "/" "-" tname ${tname})
  
     # These tests on ARM64 need much more than 20 minutes - increase the timeout
@@ -19,3 +29,6 @@ diff -ur root-6.22.02.orig/tutorials/CMakeLists.txt root-6.22.02/tutorials/CMake
       set(thisTestTimeout 2400) # 40m
     else()
       set(thisTestTimeout 1200) # 20m
+-- 
+2.28.0
+
diff --git a/root-xrootd5-compat.patch b/root-xrootd5-compat.patch
deleted file mode 100644
index 22802dd..0000000
--- a/root-xrootd5-compat.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From b9ab79d7eb3a3eeebd8671ebe78e5fed6a3f1100 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 14 Jul 2020 08:10:00 +0200
-Subject: [PATCH] Compatibility with xrootd 5.
-
-The old client library libXrdClient is removed.
-Also XrdSysDNS is removed.
-
-Do not build the legacy XProofD file server and client (already
-disabled by default - give error if someone enables it while building
-with xrootd 5).
-
-Do not build the old libNetx.
-
-Build the new libNetNG without XrdSysDNS, use XrdNetAddr instead.
----
- cmake/modules/SearchInstalledSoftware.cmake | 15 +++++++++++++++
- net/CMakeLists.txt                          |  2 +-
- net/netxng/src/TNetXNGSystem.cxx            | 18 +++++++++++++++++-
- 3 files changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 12f9d65371..c04b9b09fb 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -925,6 +925,21 @@ if(xrootd AND XROOTD_VERSIONNUM VERSION_GREATER 300030005)
- else()
-   set(netxng OFF)
- endif()
-+if(xrootd AND XROOTD_VERSIONNUM VERSION_LESS 500000000)
-+  set(netx ON)
-+else()
-+  set(netx OFF)
-+endif()
-+if(xrootd AND XROOTD_VERSIONNUM VERSION_GREATER_EQUAL 500000000)
-+  if(xproofd)
-+    if(fail-on-missing)
-+      message(FATAL_ERROR "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Use -Dxproofd:BOOL=OFF to disable.")
-+    else()
-+      message(STATUS "XROOTD is version 5 or greater. The legacy xproofd servers can not be built with this version. Disabling 'xproofd' option.")
-+      set(xproofd OFF CACHE BOOL "Disabled because xrootd version is 5 or greater" FORCE)
-+    endif()
-+  endif()
-+endif()
- 
- #---Alien support----------------------------------------------------------------
- if(alien)
-diff --git a/net/CMakeLists.txt b/net/CMakeLists.txt
-index 953d9c5d6f..676eb63672 100644
---- a/net/CMakeLists.txt
-+++ b/net/CMakeLists.txt
-@@ -11,7 +11,7 @@ if(NOT WIN32 AND ssl)
-   add_subdirectory(rpdutils)
- endif()
- 
--if(xrootd)
-+if(netx)
-   add_subdirectory(netx)
- endif()
- 
-diff --git a/net/netxng/src/TNetXNGSystem.cxx b/net/netxng/src/TNetXNGSystem.cxx
-index 6599aa2c2f..d30a12554f 100644
---- a/net/netxng/src/TNetXNGSystem.cxx
-+++ b/net/netxng/src/TNetXNGSystem.cxx
-@@ -27,7 +27,12 @@
- #include "TVirtualMutex.h"
- #include <XrdCl/XrdClFileSystem.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
-+#include <XrdVersion.hh>
-+#if XrdVNUMBER >= 40000
-+#include <XrdNet/XrdNetAddr.hh>
-+#else
- #include <XrdSys/XrdSysDNS.hh>
-+#endif
- 
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -352,6 +357,16 @@ Int_t TNetXNGSystem::Locate(const char *path, TString &endurl)
-    TNamed *hn = 0;
-    if (fgAddrFQDN.GetSize() <= 0 ||
-        !(hn = dynamic_cast<TNamed *>(fgAddrFQDN.FindObject(loc)))) {
-+#if XrdVNUMBER >= 40000
-+      XrdNetAddr netaddr;
-+      netaddr.Set(loc.Data());
-+      const char* name = netaddr.Name();
-+      if (name) {
-+         hn = new TNamed(loc.Data(), name);
-+      } else {
-+         hn = new TNamed(loc, loc);
-+      }
-+#else
-       char *addr[1] = {0}, *name[1] = {0};
-       int naddr = XrdSysDNS::getAddrName(loc.Data(), 1, addr, name);
-       if (naddr == 1) {
-@@ -359,9 +374,10 @@ Int_t TNetXNGSystem::Locate(const char *path, TString &endurl)
-       } else {
-          hn = new TNamed(loc, loc);
-       }
--      fgAddrFQDN.Add(hn);
-       free(addr[0]);
-       free(name[0]);
-+#endif
-+      fgAddrFQDN.Add(hn);
-       if (gDebug > 0)
-          Info("Locate","caching host name: %s", hn->GetTitle());
-    }
--- 
-2.26.2
-
diff --git a/root.spec b/root.spec
index d160ad5..240d07c 100644
--- a/root.spec
+++ b/root.spec
@@ -43,9 +43,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.22.02
+Version:	6.22.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -143,9 +143,9 @@ Patch30:	%{name}-doxygen-md-comments.patch
 #		Fix bad regex in TProofMgr
 #		https://github.com/root-project/root/pull/6030
 Patch31:	%{name}-fix-bad-regex.patch
-#		Compatibility with xrootd 5
-#		https://github.com/root-project/root/pull/6031
-Patch32:	%{name}-xrootd5-compat.patch
+#		Increase timeout for ppc64le
+#		https://github.com/root-project/root/pull/6246
+Patch32:	%{name}-increase-timeout-for-ppc64le.patch
 #		Only install the xproofd script and man page if option is on
 #		https://github.com/root-project/root/pull/6281
 Patch33:	%{name}-xproofd.patch
@@ -155,9 +155,6 @@ Patch34:	%{name}-srm-ifce-deps.patch
 #		Fix a shadow warning
 #		https://github.com/root-project/root/pull/6029
 Patch35:	%{name}-fix-a-shadow-warning.patch
-#		Increase timeout for ppc64le
-#		https://github.com/root-project/root/pull/6246
-Patch36:	%{name}-increase-timeout-for-ppc64le.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1876,7 +1873,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
-%patch36 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2552,6 +2548,12 @@ excluded="${excluded}|tutorial-roofit-rf611_weightedfits"
 excluded="${excluded}|test-stresshistofit"
 %endif
 
+%ifarch %{ix86}
+# This test fails with "symbol '__atomic_fetch_add_8' unresolved" on ix86
+# https://github.com/root-project/root/issues/6813
+excluded="${excluded}|pyunittests-pyroot-pyz-ttree-branch-attr"
+%endif
+
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -3494,7 +3496,11 @@ fi
 %endif
 
 %changelog
-* Sat Nov  7 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-4
+* Fri Nov 13 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.04-1
+- Update to 6.22.04
+- Drop patch root-xrootd5-compat.patch (accepted upstream)
+
+* Sat Nov 07 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-4
 - Rebuild for C++ standard library __GLIBCXX__ 20201016
 
 * Fri Oct 02 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.02-3
diff --git a/sources b/sources
index 17c2067..9b2d4be 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.22.02.tar.xz) = cb169e71dc6e7107ba3353e4ec746fc6ff40ed77c7d1dff96afd22a89567ffa7c3cfbd346a4e60ff3e4e29f09f624ce779f0cdbd61a6cd399fcce9ece5b1738d
+SHA512 (root-6.22.04.tar.xz) = 5ce502626c958b1bb4faba1bfb128f3c9162d132a39763765a678dfb8f60e9c9dcd25011dbf5fbc4791223872ce4d1c5582be4bc0d0c7d64729b54f38b35fdb9
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From a79f481e228daa4709b4c8946cfd005426b6a499 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 26 Nov 2020 11:38:23 +0100
Subject: [PATCH 191/344] Do not attempt to load_library the ROOT
 Pythonizations module

---
 ...t-load_library-libROOTPythonizations.patch | 42 +++++++++++++++++++
 root.spec                                     |  9 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 root-do-not-load_library-libROOTPythonizations.patch

diff --git a/root-do-not-load_library-libROOTPythonizations.patch b/root-do-not-load_library-libROOTPythonizations.patch
new file mode 100644
index 0000000..a108b30
--- /dev/null
+++ b/root-do-not-load_library-libROOTPythonizations.patch
@@ -0,0 +1,42 @@
+From 4aa3e75da6afba4dc7f86fa264acf30eca60d56f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 26 Nov 2020 11:14:57 +0100
+Subject: [PATCH] Do not attempt to load_library the ROOT Pythonizations module
+
+It is not necessary here, since it is already loaded due to the
+from libROOTPythonizations import ...
+earlier in the file, and it fails when the python module is not in the
+library path (it is in the python path only)
+
+/usr/lib64/python3.9/site-packages/libROOTPythonizations3_9.cpython-39-x86_64-linux-gnu.so
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1900661
+---
+ bindings/pyroot/pythonizations/python/ROOT/_facade.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+index c028006c70..37365c36ca 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+@@ -5,7 +5,7 @@ from functools import partial
+ 
+ import libcppyy as cppyy_backend
+ from cppyy import gbl as gbl_namespace
+-from cppyy import cppdef, include, load_library
++from cppyy import cppdef, include
+ from libROOTPythonizations import gROOT, CreateBufferFromAddress
+ 
+ from ._application import PyROOTApplication
+@@ -291,8 +291,6 @@ class ROOTFacade(types.ModuleType):
+     @property
+     def TPyDispatcher(self):
+         include('ROOT/TPyDispatcher.h')
+-        major, minor = sys.version_info[0:2]
+-        load_library('libROOTPythonizations{}_{}'.format(major, minor))
+         tpd = gbl_namespace.TPyDispatcher
+         type(self).TPyDispatcher = tpd
+         return tpd
+-- 
+2.28.0
+
diff --git a/root.spec b/root.spec
index 240d07c..5fe71bc 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -155,6 +155,9 @@ Patch34:	%{name}-srm-ifce-deps.patch
 #		Fix a shadow warning
 #		https://github.com/root-project/root/pull/6029
 Patch35:	%{name}-fix-a-shadow-warning.patch
+#		Do not attempt to load_library the ROOT Pythonizations module
+#		https://github.com/root-project/root/pull/6883
+Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1873,6 +1876,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3496,6 +3500,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 26 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.04-2
+- Do not attempt to load_library the ROOT Pythonizations module
+
 * Fri Nov 13 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.04-1
 - Update to 6.22.04
 - Drop patch root-xrootd5-compat.patch (accepted upstream)

From 7a6fb7e19d8623cda62890384afa05e8f8312414 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 29 Nov 2020 15:15:47 +0100
Subject: [PATCH 192/344] Update to 6.22.06 Filter out additional vDSO names
 for ppc

---
 root-linux-vdso.patch | 47 +++++++++++++++++++++++++++++++++++++++++++
 root.spec             | 16 +++++++++------
 sources               |  2 +-
 3 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 root-linux-vdso.patch

diff --git a/root-linux-vdso.patch b/root-linux-vdso.patch
new file mode 100644
index 0000000..f749e9e
--- /dev/null
+++ b/root-linux-vdso.patch
@@ -0,0 +1,47 @@
+From f7161d2612c035604146298809e628d806dbed3a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 29 Nov 2020 07:58:30 +0100
+Subject: [PATCH] Several new test failures on ppc64le with 6.22.06 due to:
+ g++: error: linux-vdso64.so.1: No such file or directory
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The list of names filtered out by TCling is incomplete.
+The vdso(7) man page gives the following list:
+
+       user ABI   vDSO name
+       ─────────────────────────────
+       aarch64    linux-vdso.so.1
+       arm        linux-vdso.so.1
+       ia64       linux-gate.so.1
+       mips       linux-vdso.so.1
+       ppc/32     linux-vdso32.so.1
+       ppc/64     linux-vdso64.so.1
+       riscv      linux-vdso.so.1
+       s390       linux-vdso32.so.1
+       s390x      linux-vdso64.so.1
+       sh         linux-gate.so.1
+       i386       linux-gate.so.1
+       x86-64     linux-vdso.so.1
+       x86/x32    linux-vdso.so.1
+---
+ core/metacling/src/TCling.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
+index 5078d7b93e..0e605a5388 100644
+--- a/core/metacling/src/TCling.cxx
++++ b/core/metacling/src/TCling.cxx
+@@ -3274,6 +3274,8 @@ static int callback_for_dl_iterate_phdr(struct dl_phdr_info *info, size_t size,
+       // Skip \0, "", and kernel pseudo-libs linux-vdso.so.1 or linux-gate.so.1
+       if (info->dlpi_name && info->dlpi_name[0]
+           && strncmp(info->dlpi_name, "linux-vdso.so", 13)
++          && strncmp(info->dlpi_name, "linux-vdso32.so", 15)
++          && strncmp(info->dlpi_name, "linux-vdso64.so", 15)
+           && strncmp(info->dlpi_name, "linux-gate.so", 13))
+          newLibs->emplace_back(info->dlpi_name);
+       sKnownLoadedLibBaseAddrs.insert(info->dlpi_addr);
+-- 
+2.28.0
+
diff --git a/root.spec b/root.spec
index 5fe71bc..b1c0956 100644
--- a/root.spec
+++ b/root.spec
@@ -43,9 +43,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.22.04
+Version:	6.22.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -158,6 +158,9 @@ Patch35:	%{name}-fix-a-shadow-warning.patch
 #		Do not attempt to load_library the ROOT Pythonizations module
 #		https://github.com/root-project/root/pull/6883
 Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
+#		Filter out additional vDSO names for ppc
+#		https://github.com/root-project/root/pull/6887
+Patch37:	%{name}-linux-vdso.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1877,6 +1880,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2446,9 +2450,6 @@ popd
 #   reads input data over network
 #   http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
 #
-# - tutorial-pythia-pythia8
-#   sometimes times out
-#
 # - tutorial-v7-line.cxx
 #   requires a web browser (and js-jsroot) to render javascript graphics
 #
@@ -2488,7 +2489,6 @@ tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
-tutorial-pythia-pythia8|\
 tutorial-v7-line.cxx|\
 gtest-io-io-test-RRawFile|\
 gtest-net-davix-test-RRawFileDavix|\
@@ -3500,6 +3500,10 @@ fi
 %endif
 
 %changelog
+* Sat Nov 28 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.06-1
+- Update to 6.22.06
+- Filter out additional vDSO names for ppc
+
 * Thu Nov 26 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.04-2
 - Do not attempt to load_library the ROOT Pythonizations module
 
diff --git a/sources b/sources
index 9b2d4be..7a1576a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.22.04.tar.xz) = 5ce502626c958b1bb4faba1bfb128f3c9162d132a39763765a678dfb8f60e9c9dcd25011dbf5fbc4791223872ce4d1c5582be4bc0d0c7d64729b54f38b35fdb9
+SHA512 (root-6.22.06.tar.xz) = 92d7cf67767639035a7b7c8a22e16a75ac9fea0523592635f245c2768da093651b7dcfd46a3e7b6a8f73a2a0262fc1b63d9f19b28b73b659ee1da33e876f3cee
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 0ecea4ad419ba780d1b2088f71fc6582ad033de7 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Fri, 8 Jan 2021 20:51:58 +0000
Subject: [PATCH 193/344] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 root.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/root.spec b/root.spec
index b1c0956..4c1cf98 100644
--- a/root.spec
+++ b/root.spec
@@ -167,6 +167,7 @@ Patch37:	%{name}-linux-vdso.patch
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
 
+BuildRequires: make
 BuildRequires:	cmake3 >= 3.9
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel

From c49c80395438023933a723ac817094fb32e84a1d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 27 Jan 2021 10:30:28 +0100
Subject: [PATCH 194/344] Cleanup last commit

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 4c1cf98..a24f50f 100644
--- a/root.spec
+++ b/root.spec
@@ -167,7 +167,7 @@ Patch37:	%{name}-linux-vdso.patch
 #		https://sft.its.cern.ch/jira/browse/ROOT-8703
 ExcludeArch:	s390x
 
-BuildRequires: make
+BuildRequires:	make
 BuildRequires:	cmake3 >= 3.9
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel

From 1be10b51b1da50c4fcb9af1251416cbc50d052a0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 15:24:05 +0000
Subject: [PATCH 195/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index a24f50f..6017506 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3501,6 +3501,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sat Nov 28 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.06-1
 - Update to 6.22.06
 - Filter out additional vDSO names for ppc

From 7b4114bd546701ad3395830ade17bba38176c471 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 3 Feb 2021 13:10:13 +0100
Subject: [PATCH 196/344] Rebuilt for cfitsio 3.490

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 6017506..31a8ef7 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3501,6 +3501,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 03 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.06-3
+- Rebuilt for cfitsio 3.490
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 6614fa1aa80aa58f130fe239b8d7706b0f9b2375 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 8 Feb 2021 10:28:48 +0100
Subject: [PATCH 197/344] rebuild for libpq ABI fix

Related: rhbz#1908268
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 31a8ef7..c3a6f1f 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3501,6 +3501,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 6.22.06-4
+- rebuild for libpq ABI fix rhbz#1908268
+
 * Wed Feb 03 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.06-3
 - Rebuilt for cfitsio 3.490
 

From 123427b9fe355309183a6ee07209516e09820fa6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 19 Mar 2021 06:26:34 +0100
Subject: [PATCH 198/344] Update to 6.22.08

---
 root.spec | 16 +++++-----------
 sources   |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/root.spec b/root.spec
index c3a6f1f..03e7056 100644
--- a/root.spec
+++ b/root.spec
@@ -43,9 +43,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.22.06
+Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2537,15 +2537,6 @@ gtest-tree-dataframe-test-datasource-trivial"
 excluded="${excluded}|gtest-tree-tree-test-testBulkApiSillyStruct"
 %endif
 
-%ifarch %{ix86} x86_64
-%if %{?fedora}%{!?fedora:0}
-# This test fails on ix86 and x86_64 for Fedora 31/32/33 in koji
-# I can not reproduce the failure in a local mock build
-# - tutorial-roofit-rf611_weightedfits
-excluded="${excluded}|tutorial-roofit-rf611_weightedfits"
-%endif
-%endif
-
 %ifarch %{power64} aarch64
 # This test fails on ppc64le and aarch64 (but not on x86_64)
 # The interpreted version works though, only compiled version fails
@@ -3501,6 +3492,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 19 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-1
+- Update to 6.22.08
+
 * Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 6.22.06-4
 - rebuild for libpq ABI fix rhbz#1908268
 
diff --git a/sources b/sources
index 7a1576a..9b75929 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.22.06.tar.xz) = 92d7cf67767639035a7b7c8a22e16a75ac9fea0523592635f245c2768da093651b7dcfd46a3e7b6a8f73a2a0262fc1b63d9f19b28b73b659ee1da33e876f3cee
+SHA512 (root-6.22.08.tar.xz) = 9080168116ffdd07cfce411dca77404177cd3ba57af498419432ca95169dbce581a7a2a667c22273685d659b3e0398d567b2d51d07ca767b076ee5196395d828
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 07ab2f0b596f20efb7f83bd8157eeca2a8045189 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 30 Mar 2021 19:39:57 +0100
Subject: [PATCH 199/344] Rebuilt for removed libstdc++ symbol (#1937698)

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 03e7056..ce2c011 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3492,6 +3492,9 @@ fi
 %endif
 
 %changelog
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 6.22.08-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
 * Fri Mar 19 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-1
 - Update to 6.22.08
 

From a49523d8a58444aaea12557f1bc16a2a2fe836de Mon Sep 17 00:00:00 2001
From: Tomas Hrnciar <thrnciar@redhat.com>
Date: Mon, 19 Apr 2021 13:18:32 +0200
Subject: [PATCH 200/344] BuildRequire setuptools explicitly

See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools
---
 root.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/root.spec b/root.spec
index ce2c011..16fefdd 100644
--- a/root.spec
+++ b/root.spec
@@ -211,6 +211,7 @@ BuildRequires:	postgresql-devel
 BuildRequires:	python2-devel
 %endif
 BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-setuptools
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel

From f21e05fd5fe40c0e81cc14c7553121aa064f326f Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 10 May 2021 16:08:35 +0100
Subject: [PATCH 201/344] Rebuilt for removed libstdc++ symbols (#1937698)

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 16fefdd..8b1cd7b 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3493,6 +3493,9 @@ fi
 %endif
 
 %changelog
+* Mon May 10 2021 Jonathan Wakely <jwakely@redhat.com> - 6.22.08-3
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 6.22.08-2
 - Rebuilt for removed libstdc++ symbol (#1937698)
 

From b1e3d73d24db3d3544d67d1c375c7b670f9c7f32 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 1 Jun 2021 09:42:05 +0200
Subject: [PATCH 202/344] Adapt to new Python RPM generators (empty .egg-info
 no longer works) Filter out parts of tests that require remote network access
 instead of   excluding the whole test Fix multicore tests when running on
 machines with few cores

---
 root-fix-multicore-tests-with-few-cores.patch | 143 ++++++++++++++++++
 root.spec                                     |  56 ++++---
 2 files changed, 182 insertions(+), 17 deletions(-)
 create mode 100644 root-fix-multicore-tests-with-few-cores.patch

diff --git a/root-fix-multicore-tests-with-few-cores.patch b/root-fix-multicore-tests-with-few-cores.patch
new file mode 100644
index 0000000..ada5a11
--- /dev/null
+++ b/root-fix-multicore-tests-with-few-cores.patch
@@ -0,0 +1,143 @@
+diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx root-6.22.08/tree/dataframe/test/dataframe_concurrency.cxx
+--- root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/tree/dataframe/test/dataframe_concurrency.cxx	2021-06-01 09:01:37.847751408 +0200
+@@ -46,33 +46,35 @@
+ // [DF] Warn on mismatch between slot pool size and effective number of slots
+ TEST(RDFSimpleTests, ThrowOnPoolSizeMismatch)
+ {
++   const unsigned int nslots = std::min(3u, std::thread::hardware_concurrency());
++
+    // pool created after RDF
+-   {
++   if (nslots > 1) {
+       ROOT::RDataFrame df(1);
+-      ROOT::EnableImplicitMT(3);
++      ROOT::EnableImplicitMT(nslots);
+       try {
+          df.Count().GetValue();
+       } catch (const std::runtime_error &e) {
+          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the size of the thread pool "
+-                                   "was 1, but when starting the event loop it was 3. Maybe EnableImplicitMT() was "
++                                   "was 1, but when starting the event loop it was " + std::to_string(nslots) + ". Maybe EnableImplicitMT() was "
+                                    "called after the RDataFrame was constructed?";
+-         EXPECT_STREQ(e.what(), expected_msg);
++         EXPECT_STREQ(e.what(), expected_msg.c_str());
+       }
+       ROOT::DisableImplicitMT();
+    }
+ 
+    // pool deleted after RDF creation
+-   {
+-      ROOT::EnableImplicitMT(3);
++   if (nslots > 1) {
++      ROOT::EnableImplicitMT(nslots);
+       ROOT::RDataFrame df(1);
+       ROOT::DisableImplicitMT();
+       try {
+          df.Count().GetValue();
+       } catch (const std::runtime_error &e) {
+          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the size of the thread pool "
+-                                   "was 3, but when starting the event loop it was 0. Maybe DisableImplicitMT() was "
++                                   "was " + std::to_string(nslots) + ", but when starting the event loop it was 0. Maybe DisableImplicitMT() was "
+                                    "called after the RDataFrame was constructed?";
+-         EXPECT_STREQ(e.what(), expected_msg);
++         EXPECT_STREQ(e.what(), expected_msg.c_str());
+       }
+    }
+ }
+diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx root-6.22.08/tree/dataframe/test/dataframe_interface.cxx
+--- root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/tree/dataframe/test/dataframe_interface.cxx	2021-06-01 08:51:39.351355999 +0200
+@@ -6,6 +6,8 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#include <thread>
++
+ using namespace ROOT;
+ using namespace ROOT::RDF;
+ 
+@@ -349,9 +351,10 @@
+    ROOT::RDataFrame df0(1);
+    EXPECT_EQ(1U, df0.GetNSlots());
+ #ifdef R__USE_IMT
+-   ROOT::EnableImplicitMT(3);
++   unsigned int nslots = std::min(3U, std::thread::hardware_concurrency());
++   ROOT::EnableImplicitMT(nslots);
+    ROOT::RDataFrame df3(1);
+-   EXPECT_EQ(3U, df3.GetNSlots());
++   EXPECT_EQ(nslots, df3.GetNSlots());
+    ROOT::DisableImplicitMT();
+    ROOT::RDataFrame df1(1);
+    EXPECT_EQ(1U, df1.GetNSlots());
+diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.08/tree/dataframe/test/dataframe_simple.cxx
+--- root-6.22.08.orig/tree/dataframe/test/dataframe_simple.cxx	2021-06-01 08:50:34.317205130 +0200
++++ root-6.22.08/tree/dataframe/test/dataframe_simple.cxx	2021-06-01 08:51:39.351355999 +0200
+@@ -30,7 +30,7 @@
+ // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
+ class RDFSimpleTests : public ::testing::TestWithParam<bool> {
+ protected:
+-   RDFSimpleTests() : NSLOTS(GetParam() ? 4u : 1u)
++   RDFSimpleTests() : NSLOTS(GetParam() ? std::min(4u, std::thread::hardware_concurrency()) : 1u)
+    {
+       if (GetParam())
+          ROOT::EnableImplicitMT(NSLOTS);
+diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx root-6.22.08/tree/dataframe/test/dataframe_snapshot.cxx
+--- root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/tree/dataframe/test/dataframe_snapshot.cxx	2021-06-01 08:51:39.351355999 +0200
+@@ -9,6 +9,7 @@
+ #include "gtest/gtest.h"
+ #include <limits>
+ #include <memory>
++#include <thread>
+ using namespace ROOT;         // RDataFrame
+ using namespace ROOT::RDF;    // RInterface
+ using namespace ROOT::VecOps; // RVec
+@@ -886,9 +887,10 @@
+ {
+    const auto fname = "emptybuffersmt.root";
+    const auto treename = "t";
+-   ROOT::EnableImplicitMT(4);
++   const unsigned int nslots = std::min(4U, std::thread::hardware_concurrency());
++   ROOT::EnableImplicitMT(nslots);
+    ROOT::RDataFrame d(10);
+-   auto dd = d.DefineSlot("x", [](unsigned int s) { return s == 3 ? 0 : 1; })
++   auto dd = d.DefineSlot("x", [&](unsigned int s) { return s == nslots - 1 ? 0 : 1; })
+                .Filter([](int x) { return x == 0; }, {"x"}, "f");
+    auto r = dd.Report();
+    dd.Snapshot<int>(treename, fname, {"x"});
+diff -ur root-6.22.08.orig/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx root-6.22.08/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
+--- root-6.22.08.orig/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx	2021-06-01 08:51:39.352356002 +0200
+@@ -294,14 +294,27 @@
+       }
+    };
+ 
+-   ROOT::EnableImplicitMT(4);
++   const unsigned int nslots = std::min(4U, std::thread::hardware_concurrency());
++   ROOT::EnableImplicitMT(nslots);
+ 
+    ROOT::TTreeProcessorMT p(filename, treename);
+    p.Process(f);
+ 
+-   EXPECT_EQ(nTasks, 96U) << "Wrong number of tasks generated!\n";
+-   EXPECT_EQ(nEntriesCountsMap[10], 65U) << "Wrong number of tasks with 10 clusters each!\n";
+-   EXPECT_EQ(nEntriesCountsMap[11], 31U) << "Wrong number of tasks with 11 clusters each!\n";
++   if (nslots == 4) {
++      EXPECT_EQ(nTasks, 96U) << "Wrong number of tasks generated!\n";
++      EXPECT_EQ(nEntriesCountsMap[10], 65U) << "Wrong number of tasks with 10 clusters each!\n";
++      EXPECT_EQ(nEntriesCountsMap[11], 31U) << "Wrong number of tasks with 11 clusters each!\n";
++   }
++   else if (nslots == 2) {
++      EXPECT_EQ(nTasks, 48U) << "Wrong number of tasks generated!\n";
++      EXPECT_EQ(nEntriesCountsMap[20], 17U) << "Wrong number of tasks with 20 clusters each!\n";
++      EXPECT_EQ(nEntriesCountsMap[21], 31U) << "Wrong number of tasks with 21 clusters each!\n";
++   }
++   else if (nslots == 1) {
++      EXPECT_EQ(nTasks, 24U) << "Wrong number of tasks generated!\n";
++      EXPECT_EQ(nEntriesCountsMap[41], 17U) << "Wrong number of tasks with 41 clusters each!\n";
++      EXPECT_EQ(nEntriesCountsMap[42], 7U) << "Wrong number of tasks with 42 clusters each!\n";
++   }
+ 
+    gSystem->Unlink(filename);
+    ROOT::DisableImplicitMT();
diff --git a/root.spec b/root.spec
index 8b1cd7b..0323321 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -161,6 +161,9 @@ Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
 #		Filter out additional vDSO names for ppc
 #		https://github.com/root-project/root/pull/6887
 Patch37:	%{name}-linux-vdso.patch
+#		Fix multicore tests when running on machines with few cores
+#		root-fix-multicore-tests-with-few-cores.patch
+Patch38:	%{name}-fix-multicore-tests-with-few-cores.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1883,6 +1886,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2167,10 +2171,19 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so
 mkdir -p %{buildroot}%{python2_sitelib}
 cp -pr %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
 
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
+# Create .egg-info files so that rpm auto-generates provides
+echo 'Name: ROOT' > \
+    %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
+echo 'Name: JupyROOT' > \
+    %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
+echo 'Name: JsMVA' > \
+    %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 
 %endif
 
@@ -2200,10 +2213,19 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so
 mkdir -p %{buildroot}%{python3_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
 
-# Create empty .egg-info files so that rpm auto-generates provides
-touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
-touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
-touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
+# Create .egg-info files so that rpm auto-generates provides
+echo 'Name: ROOT' > \
+    %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+echo 'Name: JupyROOT' > \
+    %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
+echo 'Name: JsMVA' > \
+    %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
@@ -2430,10 +2452,6 @@ popd
 # - tutorial-multicore-imt101_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
-# - gtest-tree-dataframe-test-datasource-sqlite
-#   reads sqlite data over network:
-#   http://root.cern.ch/files/RSqliteDS_test.sqlite
-#
 # - tutorial-dataframe-df###_SQlite*
 #   reads sqlite data over network:
 #   http://root.cern.ch/files/root_download_stats.sqlite
@@ -2455,11 +2473,9 @@ popd
 # - tutorial-v7-line.cxx
 #   requires a web browser (and js-jsroot) to render javascript graphics
 #
-# - gtest-io-io-test-RRawFile (*)
 # - gtest-net-davix-test-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
-#   (*) one subtest RRawFile.Remote fails, others would be OK
 #
 # - gtest-tmva-tmva-test-rreader
 # - gtest-tmva-tmva-test-rstandardscaler
@@ -2484,7 +2500,6 @@ tutorial-multicore-mp103_processSelector|\
 tutorial-multicore-mp104_processH1|\
 tutorial-multicore-mp105_processEntryList|\
 tutorial-multicore-imt101_parTreeProcessing|\
-gtest-tree-dataframe-test-datasource-sqlite|\
 tutorial-dataframe-df..._SQlite|\
 gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
 tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
@@ -2492,7 +2507,6 @@ tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
 tutorial-v7-line.cxx|\
-gtest-io-io-test-RRawFile|\
 gtest-net-davix-test-RRawFileDavix|\
 gtest-tmva-tmva-test-rreader|\
 gtest-tmva-tmva-test-rstandardscaler|\
@@ -2551,6 +2565,8 @@ excluded="${excluded}|test-stresshistofit"
 excluded="${excluded}|pyunittests-pyroot-pyz-ttree-branch-attr"
 %endif
 
+# Filter out parts of tests that require remote network access
+GTEST_FILTER=-RRawFile.Remote:RSqliteDS.Davix \
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -3493,6 +3509,12 @@ fi
 %endif
 
 %changelog
+* Tue Jun 01 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-4
+- Adapt to new Python RPM generators (empty .egg-info no longer works)
+- Filter out parts of tests that require remote network access instead of
+  excluding the whole test
+- Fix multicore tests when running on machines with few cores
+
 * Mon May 10 2021 Jonathan Wakely <jwakely@redhat.com> - 6.22.08-3
 - Rebuilt for removed libstdc++ symbols (#1937698)
 

From c4fdaa58588eda8dea0b6216d23cdd0bfb1ddfb6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 3 Jun 2021 18:02:44 +0200
Subject: [PATCH 203/344] Use C++17 for Fedora 34+ (gcc 11)

---
 root.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0323321..fe79931 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -171,7 +171,11 @@ Patch38:	%{name}-fix-multicore-tests-with-few-cores.patch
 ExcludeArch:	s390x
 
 BuildRequires:	make
+%if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	cmake3 >= 3.9
+%else
+BuildRequires:	cmake >= 3.9
+%endif
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -2000,7 +2004,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
 %if %{root7}
+%if %{?fedora}%{!?fedora:0} >= 34
+       -DCMAKE_CXX_STANDARD=17 \
+%else
        -DCMAKE_CXX_STANDARD=14 \
+%endif
        -Droot7:BOOL=ON \
        -Dwebgui:BOOL=ON \
 %else
@@ -3509,6 +3517,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 03 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-5
+- Use C++17 for Fedora 34+ (gcc 11)
+
 * Tue Jun 01 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-4
 - Adapt to new Python RPM generators (empty .egg-info no longer works)
 - Filter out parts of tests that require remote network access instead of

From 5bf9d682017c7b3dbd4b0572bf0049f850348294 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 4 Jun 2021 21:13:47 +0200
Subject: [PATCH 204/344] Rebuilt for Python 3.10

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index fe79931..990c19a 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3517,6 +3517,9 @@ fi
 %endif
 
 %changelog
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.22.08-6
+- Rebuilt for Python 3.10
+
 * Thu Jun 03 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-5
 - Use C++17 for Fedora 34+ (gcc 11)
 

From 37bb038cc96810b89f336b76e6d56b37794d6c6f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 13 Jun 2021 08:55:01 +0200
Subject: [PATCH 205/344] cmake in EPEL 8 no longer provides cmake3

---
 root.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 990c19a..51de763 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -162,7 +162,7 @@ Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
 #		https://github.com/root-project/root/pull/6887
 Patch37:	%{name}-linux-vdso.patch
 #		Fix multicore tests when running on machines with few cores
-#		root-fix-multicore-tests-with-few-cores.patch
+#		https://github.com/root-project/root/pull/8068
 Patch38:	%{name}-fix-multicore-tests-with-few-cores.patch
 
 #		s390x suffers from endian issues resulting in failing tests
@@ -216,9 +216,12 @@ BuildRequires:	postgresql-devel
 %endif
 %if %{buildpy2}
 BuildRequires:	python2-devel
+BuildRequires:	python2-setuptools
+BuildRequires:	python2-numpy
 %endif
 BuildRequires:	python%{python3_pkgversion}-devel
 BuildRequires:	python%{python3_pkgversion}-setuptools
+BuildRequires:	python%{python3_pkgversion}-numpy
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel
@@ -259,7 +262,6 @@ BuildRequires:	cmake-data >= 3.18.3-1
 %else
 BuildRequires:	openblas-devel
 %endif
-BuildRequires:	python%{python3_pkgversion}-numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
@@ -2410,7 +2412,11 @@ for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
+%if %{?rhel}%{!?rhel:0} == 7
     DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%else
+    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%endif
     ( cd $tmpdir ; find . -type f) | sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
 done
@@ -3517,6 +3523,9 @@ fi
 %endif
 
 %changelog
+* Sun Jun 13 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-7
+- cmake in EPEL 8 no longer provides cmake3
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.22.08-6
 - Rebuilt for Python 3.10
 

From f34d998c21e6ae4bb520c5e959f44de6cc731858 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 14 Jun 2021 11:20:14 +0200
Subject: [PATCH 206/344] Add configuration for jupyterlab

---
 root.spec | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 51de763..7ba2125 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2632,6 +2632,14 @@ cat << EOF >> /etc/jupyter/jupyter_notebook_config.py
 c.NotebookApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
 # Extra static path for JupyROOT - end - do not remove this line
 EOF
+if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
+    sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
+fi
+cat << EOF >> /etc/jupyter/jupyter_server_config.py
+# Extra static path for JupyROOT - start - do not remove this line
+c.ServerApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
+# Extra static path for JupyROOT - end - do not remove this line
+EOF
 
 %postun notebook
 if [ $1 -eq 0 ] ; then
@@ -2642,6 +2650,13 @@ if [ $1 -eq 0 ] ; then
 	    rmdir /etc/jupyter 2>/dev/null || :
 	fi
     fi
+    if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
+	sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
+	if [ ! -s /etc/jupyter/jupyter_server_config.py ] ; then
+	    rm /etc/jupyter/jupyter_server_config.py
+	    rmdir /etc/jupyter 2>/dev/null || :
+	fi
+    fi
 fi
 
 %post core -p /sbin/ldconfig
@@ -3523,6 +3538,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 14 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-8
+- Add configuration for jupyterlab
+
 * Sun Jun 13 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-7
 - cmake in EPEL 8 no longer provides cmake3
 

From 76c3a41c1c926c7640f4cee60d708e7723bf93b0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 17 Jun 2021 20:51:34 +0200
Subject: [PATCH 207/344] Backport fix for jsroot loading in jupyterlab

---
 root-jupyroot-jupyterlab-compat.patch | 125 ++++++++++++++++++++++++++
 root-jupyroot-static.patch            |  52 +++++------
 root.spec                             |  21 +++--
 3 files changed, 166 insertions(+), 32 deletions(-)
 create mode 100644 root-jupyroot-jupyterlab-compat.patch

diff --git a/root-jupyroot-jupyterlab-compat.patch b/root-jupyroot-jupyterlab-compat.patch
new file mode 100644
index 0000000..a7850c4
--- /dev/null
+++ b/root-jupyroot-jupyterlab-compat.patch
@@ -0,0 +1,125 @@
+diff -ur root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py
+--- root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:39.457234887 +0200
+@@ -39,24 +39,31 @@
+ 
+ _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
+ 
+-
+-_jsROOTSourceDir = "/static/"
+ _jsCanvasWidth = 800
+ _jsCanvasHeight = 600
+-
+ _jsCode = """
++
+ <div id="{jsDivId}"
+      style="width: {jsCanvasWidth}px; height: {jsCanvasHeight}px">
+ </div>
+ <script>
+ if (typeof require !== 'undefined') {{
+ 
+-    // All requirements met (we are in jupyter notebooks or we loaded requirejs before).
+-    display_{jsDivId}();
++    // We are in jupyter notebooks, use require.js which should be configured already
++    require(['scripts/JSRootCore'],
++        function(Core) {{
++           display_{jsDivId}(Core);
++        }}
++    );
++
++}} else if (typeof JSROOT !== 'undefined') {{
++
++   // JSROOT already loaded, just use it
++   display_{jsDivId}(JSROOT);
+ 
+ }} else {{
+ 
+-    // We are in jupyterlab, we need to insert requirejs and configure it.
++    // We are in jupyterlab without require.js, directly loading jsroot
+     // Jupyterlab might be installed in a different base_url so we need to know it.
+     try {{
+         var base_url = JSON.parse(document.getElementById('jupyter-config-data').innerHTML).baseUrl;
+@@ -65,14 +72,15 @@
+     }}
+ 
+     // Try loading a local version of requirejs and fallback to cdn if not possible.
+-    requirejs_load(base_url + 'static/components/requirejs/require.js', requirejs_success(base_url), function(){{
+-        requirejs_load('https://cdnjs.cloudflare.com/ajax/libs/require.js/2.2.0/require.min.js', requirejs_success(base_url), function(){{
+-            document.getElementById("{jsDivId}").innerHTML = "Failed to load requireJs";
++    script_load(base_url + 'static/scripts/JSRootCore.js', script_success, function(){{
++        console.error('Fail to load JSROOT locally, please check your jupyter_notebook_config.py file')
++        script_load('https://root.cern/js/5.9.1/scripts/JSRootCore.min.js', script_success, function(){{
++            document.getElementById("{jsDivId}").innerHTML = "Failed to load JSROOT";
+         }});
+     }});
+ }}
+ 
+-function requirejs_load(src, on_load, on_error) {{
++function script_load(src, on_load, on_error) {{
+     var script = document.createElement('script');
+     script.src = src;
+     script.onload = on_load;
+@@ -80,23 +88,14 @@
+     document.head.appendChild(script);
+ }}
+ 
+-function requirejs_success(base_url) {{
+-    return function() {{
+-        require.config({{
+-            baseUrl: base_url + 'static/'
+-        }});
+-        display_{jsDivId}();
+-    }}
++function script_success() {{
++   display_{jsDivId}(JSROOT);
+ }}
+ 
+-function display_{jsDivId}() {{
+-    require(['scripts/JSRootCore'],
+-        function(Core) {{
+-            var obj = Core.JSONR_unref({jsonContent});
+-            Core.key_handling = false;
+-            Core.draw("{jsDivId}", obj, "{jsDrawOptions}");
+-        }}
+-    );
++function display_{jsDivId}(Core) {{
++   var obj = Core.JSONR_unref({jsonContent});
++   Core.key_handling = false;
++   Core.draw("{jsDivId}", obj, "{jsDrawOptions}");
+ }}
+ </script>
+ """
+@@ -296,7 +295,7 @@
+    cnt = 0
+    for n in range(colors.GetLast()+1):
+       if colors.At(n): cnt = cnt+1
+-        
++
+    # add all colors if there are more than 598 colors defined
+    if cnt < 599 or prim.FindObject(colors):
+       colors = None
+@@ -312,14 +311,14 @@
+       prim.Add(palette)
+ 
+    ROOT.TColor.DefinedColors()
+-    
++
+    canvas_json = ROOT.TBufferJSON.ConvertToJSON(canvas, 3)
+ 
+    # Cleanup primitives after conversion
+    if style is not None: prim.Remove(style)
+    if colors is not None: prim.Remove(colors)
+    if palette is not None: prim.Remove(palette)
+-     
++
+    return canvas_json
+ 
+ transformers = []
+@@ -508,7 +507,6 @@
+ 
+         thisJsCode = _jsCode.format(jsCanvasWidth = height,
+                                     jsCanvasHeight = width,
+-                                    jsROOTSourceDir = _jsROOTSourceDir,
+                                     jsonContent = json.Data(),
+                                     jsDrawOptions = options,
+                                     jsDivId = divId)
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index b39110a..717e203 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.22.00.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.22.00/bindings/jsmva/python/JsMVA/JPyInterface.py
---- root-6.22.00.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/jsmva/python/JsMVA/JPyInterface.py	2020-06-21 20:20:27.744527667 +0200
+diff -ur root-6.22.08.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.22.08/bindings/jsmva/python/JsMVA/JPyInterface.py
+--- root-6.22.08.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-06-17 19:32:12.018598877 +0200
 @@ -188,7 +188,7 @@
  ## Class for creating the output scripts and inserting them to cell output
  class JsDraw:
@@ -10,21 +10,21 @@ diff -ur root-6.22.00.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.22
  
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.22.00.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.00/bindings/jupyroot/python/JupyROOT/helpers/utils.py
---- root-6.22.00.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2020-06-21 20:18:22.840258397 +0200
-@@ -40,7 +40,7 @@
- _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
+diff -ur root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py
+--- root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:39.457234887 +0200
++++ root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:00.146141086 +0200
+@@ -72,7 +72,7 @@
+     }}
  
- 
--_jsROOTSourceDir = "/static/"
-+_jsROOTSourceDir = "/static/jsroot/"
- _jsCanvasWidth = 800
- _jsCanvasHeight = 600
- 
-diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.22.00/bindings/pyroot_legacy/JsMVA/JPyInterface.py
---- root-6.22.00.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2020-06-21 20:09:42.265004565 +0200
+     // Try loading a local version of requirejs and fallback to cdn if not possible.
+-    script_load(base_url + 'static/scripts/JSRootCore.js', script_success, function(){{
++    script_load(base_url + 'static/jsroot/scripts/JSRootCore.js', script_success, function(){{
+         console.error('Fail to load JSROOT locally, please check your jupyter_notebook_config.py file')
+         script_load('https://root.cern/js/5.9.1/scripts/JSRootCore.min.js', script_success, function(){{
+             document.getElementById("{jsDivId}").innerHTML = "Failed to load JSROOT";
+diff -ur root-6.22.08.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.22.08/bindings/pyroot_legacy/JsMVA/JPyInterface.py
+--- root-6.22.08.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-06-17 19:32:12.019598879 +0200
 @@ -188,7 +188,7 @@
  ## Class for creating the output scripts and inserting them to cell output
  class JsDraw:
@@ -34,9 +34,9 @@ diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.2
   
      ## String containing the link to JavaScript files
      __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py root-6.22.00/bindings/pyroot_legacy/JupyROOT/helpers/utils.py
---- root-6.22.00.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2020-06-21 20:09:42.266004568 +0200
+diff -ur root-6.22.08.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py root-6.22.08/bindings/pyroot_legacy/JupyROOT/helpers/utils.py
+--- root-6.22.08.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2021-06-17 19:32:12.019598879 +0200
 @@ -82,7 +82,7 @@
  function requirejs_success(base_url) {{
      return function() {{
@@ -46,9 +46,9 @@ diff -ur root-6.22.00.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py root
          }});
          display_{jsDivId}();
      }}
-diff -ur root-6.22.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.22.00/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.22.00.orig/etc/notebook/JsMVA/js/JsMVA.js	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/etc/notebook/JsMVA/js/JsMVA.js	2020-06-21 20:10:34.552121014 +0200
+diff -ur root-6.22.08.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.22.08/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.22.08.orig/etc/notebook/JsMVA/js/JsMVA.js	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/etc/notebook/JsMVA/js/JsMVA.js	2021-06-17 19:32:12.020598882 +0200
 @@ -16,7 +16,7 @@
  
  (function(factory){
@@ -58,9 +58,9 @@ diff -ur root-6.22.00.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.22.00/etc/noteb
  
      var url = "";
      if (requirejs.s.contexts.hasOwnProperty("_")) {
-diff -ur root-6.22.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.22.00/etc/notebook/JsMVA/js/NetworkDesigner.js
---- root-6.22.00.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/etc/notebook/JsMVA/js/NetworkDesigner.js	2020-06-21 20:10:34.552121014 +0200
+diff -ur root-6.22.08.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.22.08/etc/notebook/JsMVA/js/NetworkDesigner.js
+--- root-6.22.08.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2021-03-10 15:19:14.000000000 +0100
++++ root-6.22.08/etc/notebook/JsMVA/js/NetworkDesigner.js	2021-06-17 19:32:12.020598882 +0200
 @@ -19,7 +19,7 @@
          paths: {
              "jquery-connections": baseURL + "jquery.connections.min",
diff --git a/root.spec b/root.spec
index 7ba2125..fffa16c 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -75,8 +75,9 @@ Patch0:		%{name}-fontconfig.patch
 Patch1:		%{name}-32bit-dataframe.patch
 #		Unbundle gtest
 Patch2:		%{name}-unbundle-gtest.patch
-#		Use local static script and style files for JupyROOT
-Patch3:		%{name}-jupyroot-static.patch
+#		Fix multicore tests when running on machines with few cores
+#		https://github.com/root-project/root/pull/8068
+Patch3:		%{name}-fix-multicore-tests-with-few-cores.patch
 #		Fedora's llvm patches
 Patch4:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
 Patch5:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
@@ -161,9 +162,13 @@ Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
 #		Filter out additional vDSO names for ppc
 #		https://github.com/root-project/root/pull/6887
 Patch37:	%{name}-linux-vdso.patch
-#		Fix multicore tests when running on machines with few cores
-#		https://github.com/root-project/root/pull/8068
-Patch38:	%{name}-fix-multicore-tests-with-few-cores.patch
+#		JupyROOT has problems loading JSRootCore.js in jupyterlab
+#		Backported from upstream git
+#		https://github.com/root-project/root/issues/8459
+#		https://bugzilla.redhat.com/show_bug.cgi?id=1973189
+Patch38:	%{name}-jupyroot-jupyterlab-compat.patch
+#		Use local static script and style files for JupyROOT
+Patch39:	%{name}-jupyroot-static.patch
 
 #		s390x suffers from endian issues resulting in failing tests
 #		and broken documentation generation
@@ -1893,6 +1898,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3538,6 +3544,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 17 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-9
+- Backport fix for jsroot loading in jupyterlab
+
 * Mon Jun 14 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-8
 - Add configuration for jupyterlab
 

From f5f5cab0a0ced5f17c9ee239fb5a81e952e8eced Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 11:32:11 +0000
Subject: [PATCH 208/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index fffa16c..9b0bcdd 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3544,6 +3544,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.08-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Jun 17 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-9
 - Backport fix for jsroot loading in jupyterlab
 

From 63048e8cb675f579120ea07145ded574d1d80015 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 26 Jul 2021 20:54:55 +0200
Subject: [PATCH 209/344] Drop the memstat module for Fedora 35+   The required
 __malloc_hook was removed from glibc 2.33.9000-48   The memstat module is
 deprecated and will be removed in root 6.26

---
 root.spec | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9b0bcdd..e61c683 100644
--- a/root.spec
+++ b/root.spec
@@ -29,6 +29,14 @@
 %global xrootd5 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 35
+# The required __malloc_hook was removed from glibc 2.33.9000-48
+# The memstat module is deprecated and will be removed in root 6.26
+%global memstat 0
+%else
+%global memstat 1
+%endif
+
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 # Multi-threading support requires TBB version >= 2018
 %global tbb 1
@@ -45,7 +53,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -425,6 +433,9 @@ Obsoletes:	python%{?python3_other_pkgversion}-%{name} < 6.22.00
 Obsoletes:	python%{?python3_other_pkgversion}-jupyroot < 6.22.00
 Obsoletes:	python%{?python3_other_pkgversion}-jsmva < 6.22.00
 %endif
+%if ! %{memstat}
+Obsoletes:	%{name}-memstat < %{version}-%{release}
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -1203,6 +1214,7 @@ Obsoletes:	%{name}-tree-player < 6.14.00
 %description vecops
 This package contains a vector operation extension for ROOT.
 
+%if %{memstat}
 %package memstat
 Summary:	Memory statistics tool for use with ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1213,6 +1225,7 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 %description memstat
 This package contains the memory statistics tool for debugging memory
 leaks and such.
+%endif
 
 %package montecarlo-eg
 Summary:	Event generator library for ROOT
@@ -2049,7 +2062,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
+%if %{memstat}
        -Dmemstat:BOOL=ON \
+%else
+       -Dmemstat:BOOL=OFF \
+%endif
        -Dminuit2:BOOL=ON \
        -Dmlp:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
@@ -2728,7 +2745,9 @@ fi
 %ldconfig_scriptlets splot
 %ldconfig_scriptlets unuran
 %ldconfig_scriptlets vecops
+%if %{memstat}
 %ldconfig_scriptlets memstat
+%endif
 %ldconfig_scriptlets montecarlo-eg
 %ldconfig_scriptlets montecarlo-pythia8
 %ldconfig_scriptlets montecarlo-vmc
@@ -3250,9 +3269,11 @@ fi
 %{_libdir}/%{name}/libROOTVecOps.*
 %{_libdir}/%{name}/libROOTVecOps_rdict.pcm
 
+%if %{memstat}
 %files memstat -f includelist-misc-memstat
 %{_libdir}/%{name}/libMemStat.*
 %{_libdir}/%{name}/libMemStat_rdict.pcm
+%endif
 
 %files montecarlo-eg -f includelist-montecarlo-eg
 %{_libdir}/%{name}/libEG.*
@@ -3544,6 +3565,11 @@ fi
 %endif
 
 %changelog
+* Mon Jul 26 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-11
+- Drop the memstat module for Fedora 35+
+  The required __malloc_hook was removed from glibc 2.33.9000-48
+  The memstat module is deprecated and will be removed in root 6.26
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.22.08-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 1fd9670b71e7200f88fa9049d4cd4eed7019814f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 22 Aug 2021 19:10:24 +0200
Subject: [PATCH 210/344] Update to 6.24.02 ROOT now uses llvm/clang version 9
 (updated from version 5) No longer exclude arch s390x (better supported in
 llvm/clang 9) Drop patches accepted upstream or previously backported
 Backport some fixes that make more tests work New subpackages:
 python{2,3}-distrdf, root-roofit-batchcompute Require js-jsroot >= 6

---
 root-32bit-dataframe.patch                    |   72 +-
 ...type-in-ORC-readMem-client-interface.patch |   14 -
 ...non-simple-MVT-in-STBRX-optimization.patch |   23 -
 ...owerPC-Don-t-use-xscvdpspn-on-the-P7.patch |   27 -
 root-add-RCutFlowReport-to-LinkDef-file.patch |   26 +
 root-add-RDisplay-to-LinkDef-file.patch       |   25 +
 ...add-TTreeProcessorMP-to-LinkDef-file.patch |   36 +
 root-config-restore.patch                     |   28 -
 ...t-load_library-libROOTPythonizations.patch |   42 -
 root-doxygen-crash.patch                      |  260 +++-
 root-doxygen-endof-part2.patch                |  978 -------------
 root-doxygen-filenames.patch                  |  378 -----
 root-doxygen-macro-name.patch                 |   29 -
 root-doxygen-md-comments.patch                |  214 ---
 root-doxygen-missing-underscore.patch         |   25 -
 root-doxygen-parameter-names.patch            | 1211 -----------------
 root-fix-a-shadow-warning.patch               |   41 -
 root-fix-bad-regex.patch                      |   25 -
 root-fix-multicore-tests-with-few-cores.patch |   77 +-
 ...-fix-ppc64le-compilation-with-gcc-10.patch |   29 +
 root-fontconfig.patch                         |  118 +-
 root-histv7-bin-iterator.patch                |   51 -
 root-increase-timeout-for-ppc64le.patch       |   34 -
 ...stall-headers-with-COMPONENT-headers.patch |   39 -
 root-jsmva-static.patch                       |   36 +
 root-jupyroot-jupyterlab-compat.patch         |  125 --
 root-jupyroot-static.patch                    |   72 -
 root-linux-vdso.patch                         |   47 -
 root-no-export-python-modules.patch           |   22 +-
 root-ntuple-largefile.patch                   |  139 --
 root-old-gtest-compat.patch                   |  112 +-
 root-older-python.patch                       |   46 +
 root-ppc-codemodel.patch                      |   36 +
 root-ppc-no-codemodel.patch                   |   13 +
 root-ptr-is-null-RooFit-TMVA.patch            |   80 ++
 root-ptr-is-null-TStreamerInfo.patch          |   32 +
 root-python3.8-object.patch                   |  333 -----
 root-roostats-test-ppc64le-aarch64.patch      |   34 -
 root-setcachefiledir.patch                    |   30 -
 root-srm-ifce-deps.patch                      |   49 -
 root-stress-s390x.patch                       |   39 +
 root-stressGraphics.patch                     |   34 -
 root-unbundle-gtest.patch                     |   12 +-
 root-uring.patch                              |   55 +
 root-werror-fix.patch                         |   57 -
 root-xproofd.patch                            |   54 -
 root.spec                                     |  583 ++++++--
 sources                                       |    2 +-
 48 files changed, 1391 insertions(+), 4453 deletions(-)
 delete mode 100644 root-Fix-return-type-in-ORC-readMem-client-interface.patch
 delete mode 100644 root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 delete mode 100644 root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
 create mode 100644 root-add-RCutFlowReport-to-LinkDef-file.patch
 create mode 100644 root-add-RDisplay-to-LinkDef-file.patch
 create mode 100644 root-add-TTreeProcessorMP-to-LinkDef-file.patch
 delete mode 100644 root-config-restore.patch
 delete mode 100644 root-do-not-load_library-libROOTPythonizations.patch
 delete mode 100644 root-doxygen-endof-part2.patch
 delete mode 100644 root-doxygen-filenames.patch
 delete mode 100644 root-doxygen-macro-name.patch
 delete mode 100644 root-doxygen-md-comments.patch
 delete mode 100644 root-doxygen-missing-underscore.patch
 delete mode 100644 root-doxygen-parameter-names.patch
 delete mode 100644 root-fix-a-shadow-warning.patch
 delete mode 100644 root-fix-bad-regex.patch
 create mode 100644 root-fix-ppc64le-compilation-with-gcc-10.patch
 delete mode 100644 root-histv7-bin-iterator.patch
 delete mode 100644 root-increase-timeout-for-ppc64le.patch
 delete mode 100644 root-install-headers-with-COMPONENT-headers.patch
 create mode 100644 root-jsmva-static.patch
 delete mode 100644 root-jupyroot-jupyterlab-compat.patch
 delete mode 100644 root-jupyroot-static.patch
 delete mode 100644 root-linux-vdso.patch
 delete mode 100644 root-ntuple-largefile.patch
 create mode 100644 root-older-python.patch
 create mode 100644 root-ppc-codemodel.patch
 create mode 100644 root-ppc-no-codemodel.patch
 create mode 100644 root-ptr-is-null-RooFit-TMVA.patch
 create mode 100644 root-ptr-is-null-TStreamerInfo.patch
 delete mode 100644 root-python3.8-object.patch
 delete mode 100644 root-roostats-test-ppc64le-aarch64.patch
 delete mode 100644 root-setcachefiledir.patch
 delete mode 100644 root-srm-ifce-deps.patch
 create mode 100644 root-stress-s390x.patch
 delete mode 100644 root-stressGraphics.patch
 create mode 100644 root-uring.patch
 delete mode 100644 root-werror-fix.patch
 delete mode 100644 root-xproofd.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index 310171f..f9ff85f 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.22.00.orig/bindings/pyroot_legacy/ROOT.py root-6.22.00/bindings/pyroot_legacy/ROOT.py
---- root-6.22.00.orig/bindings/pyroot_legacy/ROOT.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot_legacy/ROOT.py	2020-06-29 09:07:41.574798580 +0200
+diff -ur root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py root-6.24.02/bindings/pyroot_legacy/ROOT.py
+--- root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/bindings/pyroot_legacy/ROOT.py	2021-08-11 10:44:16.895804556 +0200
 @@ -438,9 +438,7 @@
  # This function is injected as method to the respective classes in Pythonize.cxx.
  _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
@@ -12,9 +12,9 @@ diff -ur root-6.22.00.orig/bindings/pyroot_legacy/ROOT.py root-6.22.00/bindings/
  
  
  ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.22.00.orig/build/unix/makepchinput.py root-6.22.00/build/unix/makepchinput.py
---- root-6.22.00.orig/build/unix/makepchinput.py	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/build/unix/makepchinput.py	2020-06-29 09:07:41.639798769 +0200
+diff -ur root-6.24.02.orig/build/unix/makepchinput.py root-6.24.02/build/unix/makepchinput.py
+--- root-6.24.02.orig/build/unix/makepchinput.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/build/unix/makepchinput.py	2021-08-11 10:44:16.926804638 +0200
 @@ -252,9 +252,6 @@
                             "math/vdt",
                             "tmva/rmva"]
@@ -25,9 +25,9 @@ diff -ur root-6.22.00.orig/build/unix/makepchinput.py root-6.22.00/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_cache.cxx root-6.22.00/tree/dataframe/test/dataframe_cache.cxx
---- root-6.22.00.orig/tree/dataframe/test/dataframe_cache.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/dataframe_cache.cxx	2020-06-29 09:07:41.640798772 +0200
+diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.24.02/tree/dataframe/test/dataframe_cache.cxx
+--- root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/dataframe_cache.cxx	2021-08-11 10:44:16.927804641 +0200
 @@ -224,8 +224,6 @@
  
  }
@@ -46,9 +46,9 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_cache.cxx root-6.22.00/
  // ROOT-10563
  TEST(Cache, Alias)
  {
-diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_arrow.cxx root-6.22.00/tree/dataframe/test/datasource_arrow.cxx
---- root-6.22.00.orig/tree/dataframe/test/datasource_arrow.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/datasource_arrow.cxx	2020-06-29 09:07:41.645798787 +0200
+diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.24.02/tree/dataframe/test/datasource_arrow.cxx
+--- root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/datasource_arrow.cxx	2021-08-11 10:44:16.927804641 +0200
 @@ -177,8 +177,6 @@
  }
  #endif
@@ -64,10 +64,10 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_arrow.cxx root-6.22.00
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_csv.cxx root-6.22.00/tree/dataframe/test/datasource_csv.cxx
---- root-6.22.00.orig/tree/dataframe/test/datasource_csv.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/datasource_csv.cxx	2020-06-29 09:07:41.645798787 +0200
-@@ -195,8 +195,6 @@
+diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.24.02/tree/dataframe/test/datasource_csv.cxx
+--- root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/datasource_csv.cxx	2021-08-11 10:44:16.927804641 +0200
+@@ -207,8 +207,6 @@
  }
  #endif
  
@@ -76,15 +76,15 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_csv.cxx root-6.22.00/t
  TEST(RCsvDS, FromARDF)
  {
     std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
-@@ -292,5 +290,3 @@
+@@ -321,5 +319,3 @@
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_root.cxx root-6.22.00/tree/dataframe/test/datasource_root.cxx
---- root-6.22.00.orig/tree/dataframe/test/datasource_root.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/datasource_root.cxx	2020-06-29 09:07:41.649798799 +0200
+diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx root-6.24.02/tree/dataframe/test/datasource_root.cxx
+--- root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/datasource_root.cxx	2021-08-11 10:44:16.928804644 +0200
 @@ -117,8 +117,6 @@
  }
  #endif
@@ -100,11 +100,11 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_root.cxx root-6.22.00/
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_trivial.cxx root-6.22.00/tree/dataframe/test/datasource_trivial.cxx
---- root-6.22.00.orig/tree/dataframe/test/datasource_trivial.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/datasource_trivial.cxx	2020-06-29 09:07:41.654798814 +0200
-@@ -132,8 +132,6 @@
-    EXPECT_EQ(*tdfAll.Count(), 20ULL);
+diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.24.02/tree/dataframe/test/datasource_trivial.cxx
+--- root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/datasource_trivial.cxx	2021-08-11 10:44:16.928804644 +0200
+@@ -141,8 +141,6 @@
+    EXPECT_EQ(df.Range(10).Count().GetValue(), 10);
  }
  
 -#ifdef R__B64
@@ -112,17 +112,17 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/datasource_trivial.cxx root-6.22.
  TEST(RTrivialDS, FromARDFWithJitting)
  {
     std::unique_ptr<RDataSource> tds(new RTrivialDS(32));
-@@ -236,5 +234,3 @@
+@@ -245,5 +243,3 @@
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.22.00.orig/tutorials/CMakeLists.txt root-6.22.00/tutorials/CMakeLists.txt
---- root-6.22.00.orig/tutorials/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tutorials/CMakeLists.txt	2020-06-29 09:07:41.655798816 +0200
-@@ -257,10 +257,6 @@
-   set(root7_veto v7/ntuple/ntpl004_dimuon.C)
+diff -ur root-6.24.02.orig/tutorials/CMakeLists.txt root-6.24.02/tutorials/CMakeLists.txt
+--- root-6.24.02.orig/tutorials/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/CMakeLists.txt	2021-08-11 10:44:16.974804766 +0200
+@@ -279,10 +279,6 @@
+   list(APPEND root7_veto ${v7_veto_files})
  endif()
  
 -if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
@@ -132,7 +132,7 @@ diff -ur root-6.22.00.orig/tutorials/CMakeLists.txt root-6.22.00/tutorials/CMake
  #---These ones are disabled !!! ------------------------------------
  set(extra_veto
    legacy/benchmarks.C
-@@ -313,7 +309,6 @@
+@@ -335,7 +331,6 @@
               ${classic_veto}
               ${pythia_veto}
               ${root7_veto}
@@ -140,11 +140,3 @@ diff -ur root-6.22.00.orig/tutorials/CMakeLists.txt root-6.22.00/tutorials/CMake
               ${xrootd_veto}
               ${mlp_veto}
               ${spectrum_veto}
-@@ -526,7 +521,6 @@
-   list(REMOVE_ITEM pytutorials ${pyveto})
- 
-   if(NOT dataframe)
--    set(dataframe_veto_py dataframe/*.py)
-     file(GLOB dataframe_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py tmva/tmva*.py)
-     list(REMOVE_ITEM pytutorials ${dataframe_veto_py})
-     list(REMOVE_ITEM pytutorials
diff --git a/root-Fix-return-type-in-ORC-readMem-client-interface.patch b/root-Fix-return-type-in-ORC-readMem-client-interface.patch
deleted file mode 100644
index 2fd426d..0000000
--- a/root-Fix-return-type-in-ORC-readMem-client-interface.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
---- root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h	2018-06-27 17:05:07.750663216 +0200
-@@ -713,8 +713,8 @@
- 
-   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
- 
--  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
--                                      uint64_t Size) {
-+  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
-+                                         uint64_t Size) {
-     // Check for an 'out-of-band' error, e.g. from an MM destructor.
-     if (ExistingError)
-       return std::move(ExistingError);
diff --git a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
deleted file mode 100644
index 5cf51c2..0000000
--- a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
---- root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-06-13 12:10:40.000000000 +0200
-+++ root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-06-27 17:06:55.739506085 +0200
-@@ -11861,6 +11861,11 @@
-          N->getOperand(1).getValueType() == MVT::i16 ||
-          (Subtarget.hasLDBRX() && Subtarget.isPPC64() &&
-           N->getOperand(1).getValueType() == MVT::i64))) {
-+      // STBRX can only handle simple types.
-+      EVT mVT = cast<StoreSDNode>(N)->getMemoryVT();
-+      if (mVT.isExtended())
-+        break;
-+
-       SDValue BSwapOp = N->getOperand(1).getOperand(0);
-       // Do an any-extend to 32-bits if this is a half-word input.
-       if (BSwapOp.getValueType() == MVT::i16)
-@@ -11868,7 +11873,6 @@
- 
-       // If the type of BSWAP operand is wider than stored memory width
-       // it need to be shifted to the right side before STBRX.
--      EVT mVT = cast<StoreSDNode>(N)->getMemoryVT();
-       if (Op1VT.bitsGT(mVT)) {
-         int Shift = Op1VT.getSizeInBits() - mVT.getSizeInBits();
-         BSwapOp = DAG.getNode(ISD::SRL, dl, Op1VT, BSwapOp,
diff --git a/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch b/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
deleted file mode 100644
index 3448ac8..0000000
--- a/root-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur root-6.12.04.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp root-6.12.04/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
---- root-6.12.04.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2017-12-13 08:27:42.000000000 +0100
-+++ root-6.12.04/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp	2018-01-11 12:40:14.956914822 +0100
-@@ -7448,9 +7448,11 @@
- /// - The node is a "load-and-splat"
- /// In all other cases, we will choose to keep the BUILD_VECTOR.
- static bool haveEfficientBuildVectorPattern(BuildVectorSDNode *V,
--                                            bool HasDirectMove) {
-+                                            bool HasDirectMove,
-+                                            bool HasP8Vector) {
-   EVT VecVT = V->getValueType(0);
--  bool RightType = VecVT == MVT::v2f64 || VecVT == MVT::v4f32 ||
-+  bool RightType = VecVT == MVT::v2f64 ||
-+    (HasP8Vector && VecVT == MVT::v4f32) ||
-     (HasDirectMove && (VecVT == MVT::v2i64 || VecVT == MVT::v4i32));
-   if (!RightType)
-     return false;
-@@ -7612,7 +7614,8 @@
-     // lowered to VSX instructions under certain conditions.
-     // Without VSX, there is no pattern more efficient than expanding the node.
-     if (Subtarget.hasVSX() &&
--        haveEfficientBuildVectorPattern(BVN, Subtarget.hasDirectMove()))
-+        haveEfficientBuildVectorPattern(BVN, Subtarget.hasDirectMove(),
-+                                        Subtarget.hasP8Vector()))
-       return Op;
-     return SDValue();
-   }
diff --git a/root-add-RCutFlowReport-to-LinkDef-file.patch b/root-add-RCutFlowReport-to-LinkDef-file.patch
new file mode 100644
index 0000000..9ec99a1
--- /dev/null
+++ b/root-add-RCutFlowReport-to-LinkDef-file.patch
@@ -0,0 +1,26 @@
+From 2e3fabbe5423f50ee98ce848d8e85ec7a2a2106d Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@cern.ch>
+Date: Thu, 15 Jul 2021 12:17:56 +0200
+Subject: [PATCH] [DF] Add RCutFlowReport to LinkDef
+
+This should fix some sporadic failures in cling's symbol resolution
+in builds without runtime cxx modules.
+---
+ tree/dataframe/inc/LinkDef.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tree/dataframe/inc/LinkDef.h b/tree/dataframe/inc/LinkDef.h
+index 8103468082..684fc3b6f1 100644
+--- a/tree/dataframe/inc/LinkDef.h
++++ b/tree/dataframe/inc/LinkDef.h
+@@ -58,6 +58,7 @@
+ #pragma link C++ class ROOT::Detail::RDF::RMergeableValue<TProfile>+;
+ #pragma link C++ class ROOT::Detail::RDF::RMergeableValue<TProfile2D>+;
+ #pragma link C++ class TNotifyLink<ROOT::Internal::RDF::RDataBlockFlag>;
++#pragma link C++ class ROOT::RDF::RCutFlowReport;
+ 
+ #endif
+ 
+-- 
+2.31.1
+
diff --git a/root-add-RDisplay-to-LinkDef-file.patch b/root-add-RDisplay-to-LinkDef-file.patch
new file mode 100644
index 0000000..e86880c
--- /dev/null
+++ b/root-add-RDisplay-to-LinkDef-file.patch
@@ -0,0 +1,25 @@
+From d9e15857c189edcfa75af5c6244ff68fac74f06f Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@cern.ch>
+Date: Thu, 10 Jun 2021 10:00:32 +0200
+Subject: [PATCH] [DF] Add RDisplay to LinkDef
+
+To help cling autoloading.
+---
+ tree/dataframe/inc/LinkDef.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tree/dataframe/inc/LinkDef.h b/tree/dataframe/inc/LinkDef.h
+index 3879ac8d5d..8103468082 100644
+--- a/tree/dataframe/inc/LinkDef.h
++++ b/tree/dataframe/inc/LinkDef.h
+@@ -20,6 +20,7 @@
+ #pragma link C++ namespace ROOT::Internal::RDF::GraphDrawing;
+ #pragma link C++ namespace ROOT::Detail::RDF;
+ #pragma link C++ namespace ROOT::RDF;
++#pragma link C++ class ROOT::RDF::RDisplay-;
+ #pragma link C++ class ROOT::Internal::RDF::RActionBase-;
+ #pragma link C++ class ROOT::Internal::RDF::RJittedAction-;
+ #pragma link C++ class ROOT::Detail::RDF::RFilterBase-;
+-- 
+2.31.1
+
diff --git a/root-add-TTreeProcessorMP-to-LinkDef-file.patch b/root-add-TTreeProcessorMP-to-LinkDef-file.patch
new file mode 100644
index 0000000..c8a0b1f
--- /dev/null
+++ b/root-add-TTreeProcessorMP-to-LinkDef-file.patch
@@ -0,0 +1,36 @@
+From 56d52ccf2fad2736e49d3cfc4c9df22492e1dbfc Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 8 Jun 2021 02:46:18 +0200
+Subject: [PATCH] Add TTreeProcessorMP to LinkDef
+
+This fixes test failure:
+
+ 745/1157 Test  #729: tutorial-multicore-mp102_readNtuplesFillHistosAndFit ................***Failed    1.55 sec
+Processing /builddir/build/BUILD/root-6.25.01/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C...
+IncrementalExecutor::executeFunction: symbol '_ZN4ROOT16TTreeProcessorMPC1Ej' unresolved while linking [cling interface function]!
+You are probably missing the definition of ROOT::TTreeProcessorMP::TTreeProcessorMP(unsigned int)
+Maybe you need to load the corresponding shared library?
+IncrementalExecutor::executeFunction: symbol '_ZN4ROOT16TTreeProcessorMP11ReplyToIdleEP7TSocket' unresolved while linking [cling interface function]!
+You are probably missing the definition of ROOT::TTreeProcessorMP::ReplyToIdle(TSocket*)
+Maybe you need to load the corresponding shared library?
+CMake Error at /builddir/build/BUILD/root-6.25.01/x86_64-redhat-linux-gnu/RootTestDriver.cmake:237 (message):
+  error code: 1
+---
+ tree/treeplayer/inc/LinkDef.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tree/treeplayer/inc/LinkDef.h b/tree/treeplayer/inc/LinkDef.h
+index e7fdd7c9bf..d195536a40 100644
+--- a/tree/treeplayer/inc/LinkDef.h
++++ b/tree/treeplayer/inc/LinkDef.h
+@@ -30,6 +30,7 @@
+ #pragma link C++ class TSimpleAnalysis+;
+ #ifndef _MSC_VER
+ #pragma link C++ class TMPWorkerTree+;
++#pragma link C++ class ROOT::TTreeProcessorMP-;
+ #endif
+ #ifdef R__USE_IMT
+ #pragma link C++ class ROOT::TTreeProcessorMT-;
+-- 
+2.31.1
+
diff --git a/root-config-restore.patch b/root-config-restore.patch
deleted file mode 100644
index 0615b8b..0000000
--- a/root-config-restore.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d589c5f31f940ea6a3a5144ca1664b2ec9ea7d38 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 19 Aug 2020 20:08:32 +0200
-Subject: [PATCH] Add back line accidentally removed in commit
- 17bc17715524b4cc6b46324c428845e9ab945684
-
----
- config/root-config.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/config/root-config.in b/config/root-config.in
-index d86b7d35af..7029439362 100755
---- a/config/root-config.in
-+++ b/config/root-config.in
-@@ -438,7 +438,9 @@ Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\
-  [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs]\
-  [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--tutdir] [--srcdir]\
-  [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\
--[--python-version] [--python2-version] [--python3-version] [--cc] [--cxx] [--f77] [--ld ] [--help]"
-+ [--platform] [--config] [--features] [--ncpu] [--git-revision]\
-+ [--python-version] [--python2-version] [--python3-version]\
-+ [--cc] [--cxx] [--f77] [--ld ] [--help]"
- 
- if test $# -eq 0; then
-    echo "${usage}" 1>&2
--- 
-2.26.2
-
diff --git a/root-do-not-load_library-libROOTPythonizations.patch b/root-do-not-load_library-libROOTPythonizations.patch
deleted file mode 100644
index a108b30..0000000
--- a/root-do-not-load_library-libROOTPythonizations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4aa3e75da6afba4dc7f86fa264acf30eca60d56f Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 26 Nov 2020 11:14:57 +0100
-Subject: [PATCH] Do not attempt to load_library the ROOT Pythonizations module
-
-It is not necessary here, since it is already loaded due to the
-from libROOTPythonizations import ...
-earlier in the file, and it fails when the python module is not in the
-library path (it is in the python path only)
-
-/usr/lib64/python3.9/site-packages/libROOTPythonizations3_9.cpython-39-x86_64-linux-gnu.so
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1900661
----
- bindings/pyroot/pythonizations/python/ROOT/_facade.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-index c028006c70..37365c36ca 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-@@ -5,7 +5,7 @@ from functools import partial
- 
- import libcppyy as cppyy_backend
- from cppyy import gbl as gbl_namespace
--from cppyy import cppdef, include, load_library
-+from cppyy import cppdef, include
- from libROOTPythonizations import gROOT, CreateBufferFromAddress
- 
- from ._application import PyROOTApplication
-@@ -291,8 +291,6 @@ class ROOTFacade(types.ModuleType):
-     @property
-     def TPyDispatcher(self):
-         include('ROOT/TPyDispatcher.h')
--        major, minor = sys.version_info[0:2]
--        load_library('libROOTPythonizations{}_{}'.format(major, minor))
-         tpd = gbl_namespace.TPyDispatcher
-         type(self).TPyDispatcher = tpd
-         return tpd
--- 
-2.28.0
-
diff --git a/root-doxygen-crash.patch b/root-doxygen-crash.patch
index b27f5ce..d69d7e7 100644
--- a/root-doxygen-crash.patch
+++ b/root-doxygen-crash.patch
@@ -1,6 +1,204 @@
-diff -ur root-6.22.00.orig/tutorials/tmva/tmva003_RReader.C root-6.22.00/tutorials/tmva/tmva003_RReader.C
---- root-6.22.00.orig/tutorials/tmva/tmva003_RReader.C	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tutorials/tmva/tmva003_RReader.C	2020-07-09 18:58:36.854733120 +0200
+diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C root-6.24.02/tutorials/dataframe/df002_dataModel.C
+--- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df002_dataModel.C	2021-08-11 03:55:11.021149115 +0200
+@@ -7,7 +7,6 @@
+ /// complex than flat ntuples with RDataFrame
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date December 2016
+ /// \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py root-6.24.02/tutorials/dataframe/df002_dataModel.py
+--- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df002_dataModel.py	2021-08-11 03:55:11.084149272 +0200
+@@ -7,7 +7,6 @@
+ ## complex than flat ntuples with RDataFrame
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date May 2017
+ ## \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.C root-6.24.02/tutorials/dataframe/df003_profiles.C
+--- root-6.24.02.orig/tutorials/dataframe/df003_profiles.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df003_profiles.C	2021-08-11 03:55:11.148149432 +0200
+@@ -7,7 +7,6 @@
+ /// RDataFrame. See the documentation of TProfile and TProfile2D to better
+ /// understand the analogy of this code with the example one.
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date February 2017
+diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.py root-6.24.02/tutorials/dataframe/df003_profiles.py
+--- root-6.24.02.orig/tutorials/dataframe/df003_profiles.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df003_profiles.py	2021-08-11 03:55:11.211149590 +0200
+@@ -8,7 +8,6 @@
+ ## understand the analogy of this code with the example one.
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date February 2017
+ ## \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C
+--- root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C	2021-08-11 03:55:11.275149750 +0200
+@@ -7,7 +7,6 @@
+ /// `Fill` method.
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date March 2017
+ /// \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C root-6.24.02/tutorials/dataframe/df007_snapshot.C
+--- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df007_snapshot.C	2021-08-11 03:55:11.338149907 +0200
+@@ -5,7 +5,6 @@
+ ///
+ /// This tutorial shows how to write out datasets in ROOT format using the RDataFrame
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date April 2017
+diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py root-6.24.02/tutorials/dataframe/df007_snapshot.py
+--- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df007_snapshot.py	2021-08-11 03:55:11.402150067 +0200
+@@ -5,7 +5,6 @@
+ ##
+ ## This tutorial shows how to write out datasets in ROOT format using the RDataFrame
+ ##
+-## \macro_image
+ ## \macro_code
+ ##
+ ## \date April 2017
+diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C
+--- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C	2021-08-11 03:55:11.465150225 +0200
+@@ -14,7 +14,6 @@
+ /// DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date October 2017
+ /// \author Enric Tejedor (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py
+--- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py	2021-08-11 03:55:11.529150385 +0200
+@@ -14,7 +14,6 @@
+ ## DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date October 2017
+ ## \author Enric Tejedor (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C
+--- root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C	2021-08-11 03:55:11.593150545 +0200
+@@ -14,7 +14,6 @@
+ /// From the ROOT website: https://root.cern.ch/files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date February 2018
+ /// \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C root-6.24.02/tutorials/dataframe/df016_vecOps.C
+--- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df016_vecOps.C	2021-08-11 03:55:11.656150702 +0200
+@@ -7,7 +7,6 @@
+ /// stored in datasets, a situation very common in HEP data analysis.
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date February 2018
+ /// \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py root-6.24.02/tutorials/dataframe/df016_vecOps.py
+--- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df016_vecOps.py	2021-08-11 03:55:11.720150862 +0200
+@@ -6,7 +6,6 @@
+ ## This tutorial shows the potential of the VecOps approach for treating collections
+ ## stored in datasets, a situation very common in HEP data analysis.
+ ##
+-## \macro_image
+ ## \macro_code
+ ##
+ ## \date February 2018
+diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C
+--- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C	2021-08-11 03:55:11.783151020 +0200
+@@ -11,7 +11,6 @@
+ /// greater than 100.
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date March 2018
+ /// \authors Danilo Piparo (CERN), Andre Vieira Silva
+diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py
+--- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py	2021-08-11 03:55:11.846151177 +0200
+@@ -7,7 +7,6 @@
+ ## model typically adopted in HEP for analysis.
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date March 2018
+ ## \authors Danilo Piparo (CERN), Andre Vieira Silva
+diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.C root-6.24.02/tutorials/dataframe/df019_Cache.C
+--- root-6.24.02.orig/tutorials/dataframe/df019_Cache.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df019_Cache.C	2021-08-11 03:55:11.910151337 +0200
+@@ -18,7 +18,6 @@
+ /// only when the event loop is triggered on it.
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date June 2018
+ /// \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.py root-6.24.02/tutorials/dataframe/df019_Cache.py
+--- root-6.24.02.orig/tutorials/dataframe/df019_Cache.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df019_Cache.py	2021-08-11 03:55:11.973151495 +0200
+@@ -18,7 +18,6 @@
+ ## only when the event loop is triggered on it.
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date June 2018
+ ## \author Danilo Piparo (CERN)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C root-6.24.02/tutorials/dataframe/df021_createTGraph.C
+--- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df021_createTGraph.C	2021-08-11 03:55:12.037151655 +0200
+@@ -4,7 +4,6 @@
+ /// Fill a TGraph using RDataFrame.
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date July 2018
+ /// \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
+diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py root-6.24.02/tutorials/dataframe/df021_createTGraph.py
+--- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/dataframe/df021_createTGraph.py	2021-08-11 03:55:12.100151813 +0200
+@@ -4,7 +4,6 @@
+ ## Fill a TGraph using RDataFrame.
+ ##
+ ## \macro_code
+-## \macro_image
+ ##
+ ## \date July 2018
+ ## \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
+diff -ur root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C root-6.24.02/tutorials/tmva/tmva003_RReader.C
+--- root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/tmva/tmva003_RReader.C	2021-08-11 04:16:33.833359421 +0200
 @@ -5,7 +5,6 @@
  /// TMVA XML files.
  ///
@@ -9,9 +207,9 @@ diff -ur root-6.22.00.orig/tutorials/tmva/tmva003_RReader.C root-6.22.00/tutoria
  ///
  /// \date July 2019
  /// \author Stefan Wunsch
-diff -ur root-6.22.00.orig/tutorials/tmva/tmva103_Application.C root-6.22.00/tutorials/tmva/tmva103_Application.C
---- root-6.22.00.orig/tutorials/tmva/tmva103_Application.C	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tutorials/tmva/tmva103_Application.C	2020-07-09 18:58:36.855733122 +0200
+diff -ur root-6.24.02.orig/tutorials/tmva/tmva103_Application.C root-6.24.02/tutorials/tmva/tmva103_Application.C
+--- root-6.24.02.orig/tutorials/tmva/tmva103_Application.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/tmva/tmva103_Application.C	2021-08-11 21:56:49.387390340 +0200
 @@ -6,7 +6,6 @@
  /// event-by-event inference, batch inference and pipelines with RDataFrame.
  ///
@@ -20,9 +218,42 @@ diff -ur root-6.22.00.orig/tutorials/tmva/tmva103_Application.C root-6.22.00/tut
  ///
  /// \date December 2018
  /// \author Stefan Wunsch
-diff -ur root-6.22.00.orig/tutorials/v7/line.cxx root-6.22.00/tutorials/v7/line.cxx
---- root-6.22.00.orig/tutorials/v7/line.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tutorials/v7/line.cxx	2020-07-09 18:58:42.202745047 +0200
+diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C
+--- root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C	2021-08-10 15:21:03.306171069 +0200
+@@ -6,7 +6,6 @@
+ /// This is an example of using a CNN in TMVA. We do classification using a toy image data set
+ /// that is generated when running the example macro
+ ///
+-/// \macro_image
+ /// \macro_output
+ /// \macro_code
+ ///
+diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C
+--- root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C	2021-08-10 15:21:33.974251559 +0200
+@@ -7,7 +7,6 @@
+ /// used in this paper: Baldi, P., P. Sadowski, and D. Whiteson. “Searching for Exotic Particles in High-energy Physics
+ ///                     with Deep Learning.” Nature Communications 5 (July 2, 2014).
+ ///
+-/// \macro_image
+ /// \macro_output
+ /// \macro_code
+ ///
+diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C
+--- root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C	2021-08-10 15:21:15.657203486 +0200
+@@ -6,7 +6,6 @@
+ /// This is an example of using a RNN in TMVA. We do classification using a toy time dependent data set
+ /// that is generated when running this example macro
+ ///
+-/// \macro_image
+ /// \macro_output
+ /// \macro_code
+ ///
+diff -ur root-6.24.02.orig/tutorials/v7/line.cxx root-6.24.02/tutorials/v7/line.cxx
+--- root-6.24.02.orig/tutorials/v7/line.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/v7/line.cxx	2021-08-16 14:25:32.528867781 +0200
 @@ -6,7 +6,6 @@
  /// "normal" coordinates' system and changing the line color linearly from black
  /// to red.
@@ -31,3 +262,14 @@ diff -ur root-6.22.00.orig/tutorials/v7/line.cxx root-6.22.00/tutorials/v7/line.
  /// \macro_code
  ///
  /// \date 2018-03-18
+diff -ur root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C
+--- root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C	2021-08-10 15:22:06.504336763 +0200
+@@ -4,7 +4,6 @@
+ /// Write and read an RNTuple from a user-defined class.  Adapted from tv3.C
+ /// Illustrates various RNTuple introspection methods.
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date April 2020
diff --git a/root-doxygen-endof-part2.patch b/root-doxygen-endof-part2.patch
deleted file mode 100644
index a32b39f..0000000
--- a/root-doxygen-endof-part2.patch
+++ /dev/null
@@ -1,978 +0,0 @@
-From 1198ee3e08c46d1edc9258dbe857f66340f53a20 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 8 Jul 2020 10:39:54 +0200
-Subject: [PATCH 2/5] Fix various "end of ..." warnings from doxygen.
-
-This addresses warnings like:
-
-- end of comment block while expecting command </b>
-- end of comment block while expecting command </em>
-- end of comment block while expecting command </pre>
-- end of comment block while expecting command </s>
-- end of comment block while expecting command </sup>
-- end of comment block while expecting command </tt>
-- end of comment block while expecting command </u>
-- end of list marker found without any preceding list items
-- found </em> tag without matching <em>
-- found </li> tag without matching <li>
-- found </pre> tag without matching <pre>
-- found </sub> tag while expecting </sup>
-- found </sup> tag without matching <sup>
-- found </tt> tag without matching <tt>
-- found </ul> tag without matching <ul>
-- illegal </br> tag found
-- reached end of file while inside a 'code' block!
-- reached end of file while still inside a (nested) comment.
-- unexpected end of comment while inside <a href=...> tag
-- unexpected end of comment while inside <ul> block
-- unexpected html tag <blockquote> found within <h1> context
-- unexpected tag </h2> found
-- unexpected tag </h3> found
-- unsupported xml/html tag <it> found
-- unsupported xml/html tag </it> found
----
- bindings/r/inc/TRDataFrame.h                  |   2 +-
- core/base/src/TEnv.cxx                        |   7 +-
- core/cont/src/TBits.cxx                       |   2 +-
- core/dictgen/res/DictSelectionReader.h        | 140 +++++++++---------
- core/foundation/inc/ROOT/TypeTraits.hxx       |   2 +-
- core/meta/src/TClass.cxx                      |   6 +-
- core/metacling/src/TCling.cxx                 |   8 +-
- graf2d/x11/src/TGX11.cxx                      |   6 +-
- gui/guihtml/src/TGHtmlSizer.cxx               |   4 +-
- hist/hist/src/TSVDUnfold.cxx                  |   8 +-
- hist/histpainter/src/THistPainter.cxx         |   2 +-
- hist/histv7/speed/histspeedtest.cxx           |   1 -
- hist/unfold/inc/TUnfold.h                     |   8 +-
- html/src/TDocDirective.cxx                    |   2 +-
- math/mathcore/inc/Math/ProbFuncMathCore.h     |   8 +-
- math/mathcore/inc/Math/QuantFuncMathCore.h    |   4 +-
- math/mathcore/src/TMath.cxx                   |   2 +-
- math/mathmore/inc/Math/GSLMultiRootFinder.h   |  16 +-
- math/matrix/doc/Matrix.md                     |   2 +-
- math/minuit/src/TMinuit.cxx                   |   4 +-
- montecarlo/eg/src/TDatabasePDG.cxx            |   2 +-
- montecarlo/vmc/README.md                      |   2 +-
- net/http/civetweb/LICENSE.md                  |   4 -
- proof/proof/src/TProofMgr.cxx                 |  50 ++++---
- proof/proof/src/TProofServ.cxx                |  10 +-
- roofit/histfactory/doc/index.md               |  11 +-
- .../src/MakeModelAndMeasurementsFast.cxx      |  11 +-
- roofit/roofitcore/inc/RooAbsCategory.h        |   2 +-
- roofit/roofitcore/src/RooSimPdfBuilder.cxx    |   4 +-
- tmva/tmva/src/Factory.cxx                     |   6 +-
- tmva/tmva/src/Reader.cxx                      |   4 +-
- tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx  |   2 +-
- tutorials/net/udpserver.c                     |   2 +-
- tutorials/tmva/TMVA_CNN_Classification.C      |   2 +-
- 34 files changed, 168 insertions(+), 178 deletions(-)
-
-diff --git a/bindings/r/inc/TRDataFrame.h b/bindings/r/inc/TRDataFrame.h
-index b7bb4ed89d..dbf48e1383 100644
---- a/bindings/r/inc/TRDataFrame.h
-+++ b/bindings/r/inc/TRDataFrame.h
-@@ -136,7 +136,7 @@ namespace ROOT {
-          2 |1
-       \endcode
- 
--      </h2>Working with colunms between dataframes</h2><br>
-+      <h2>Working with colunms between dataframes</h2><br>
-       \code{.cpp}
-       df2["v3"]<<df1["strings"];
- 
-diff --git a/core/base/src/TEnv.cxx b/core/base/src/TEnv.cxx
-index 39c07caf21..ab697df7b7 100644
---- a/core/base/src/TEnv.cxx
-+++ b/core/base/src/TEnv.cxx
-@@ -388,10 +388,9 @@ TString TEnvRec::ExpandValue(const char *value)
- ClassImp(TEnv);
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Create a resource table and read the (possibly) three resource files, i.e
--/// `$ROOTSYS/etc/system``<name>` (or `ROOTETCDIR/system``<name>`),
--/// `$HOME/``<name>` and
--/// `./``<name>`.
-+/// Create a resource table and read the (possibly) three resource files,
-+/// i.e.\ `$ROOTSYS/etc/system<name>` (or `ROOTETCDIR/system<name>`),
-+/// `$HOME/<name>` and `$PWD/<name>`.
- /// ROOT always reads ".rootrc" (in TROOT::InitSystem()). You can
- /// read additional user defined resource files by creating additional TEnv
- /// objects. By setting the shell variable ROOTENV_NO_HOME=1 the reading of
-diff --git a/core/cont/src/TBits.cxx b/core/cont/src/TBits.cxx
-index 155bfd4b4c..95167dd5b1 100644
---- a/core/cont/src/TBits.cxx
-+++ b/core/cont/src/TBits.cxx
-@@ -10,7 +10,7 @@ Container of bits.
- This class provides a simple container of bits.
- Each bit can be set and tested via the functions SetBitNumber and
- TestBitNumber.
--                                             .
-+
- The default value of all bits is kFALSE.
- The size of the container is automatically extended when a bit
- number is either set or tested.  To reduce the memory size of the
-diff --git a/core/dictgen/res/DictSelectionReader.h b/core/dictgen/res/DictSelectionReader.h
-index 52921d6237..b19135badd 100644
---- a/core/dictgen/res/DictSelectionReader.h
-+++ b/core/dictgen/res/DictSelectionReader.h
-@@ -60,34 +60,32 @@ namespace clang {
-  * By default, the Name of the selection class is then
-  * @c ROOT::Meta::Selection::C.  If you have such a class, it will be found
-  * automatically.  If @c C is in a namespace, @c NS::C, then
-- * the selection class should be in the same namespace: @c
--ROOT::Selection::NS::C.
-+ * the selection class should be in the same namespace:
-+ * @c ROOT::Meta::Selection::NS::C.
-+ *
-  * Examples:
-  *
--
--**/
--
--/**
-  * The DictSelectionReader is used to create selection rules starting from
-  * C++ the constructs of the @c ROOT::Meta::Selection namespace. All rules
-  * are matching by name.
-  * A brief description of the operations that lead to class selection:
-- *    1. If a class declaration is present in the selection namespace, a class
-- * with the same name is selected outside the selection namespace.
-- *    2. If a template class declaration and a template instantiation is present
-- * in the selection namespace, all the instances of the template are
-- * selected outside the namespace.
-+ * 1. If a class declaration is present in the selection namespace, a class
-+ *    with the same name is selected outside the selection namespace.
-+ * 2. If a template class declaration and a template instantiation is present
-+ *    in the selection namespace, all the instances of the template are
-+ *    selected outside the namespace.
-+ *
-  * For example:
-  * @code
-  * [...]
-  * class classVanilla{};
-  * template <class A> class classTemplateVanilla {};
-  * classTemplateVanilla<char> t0;
-- * namespace ROOT{
-+ * namespace ROOT {
-  *    namespace Meta {
-- *       namespace Selection{
-- *          class classVanilla{};
-- *          template <typename A> class classTemplateVanilla{};
-+ *       namespace Selection {
-+ *          class classVanilla {};
-+ *          template <typename A> class classTemplateVanilla {};
-  *          classTemplateVanilla<char> st0;
-  *       }
-  *    }
-@@ -98,14 +96,15 @@ ROOT::Selection::NS::C.
-  *
-  * A brief description of the properties that can be assigned to classes
-  * with the @c ROOT::Meta::Selection::ClassAttributes class.
-- *    1. @c kNonSplittable : Makes the class non splittable
-+ * 1. @c kNonSplittable : Makes the class non splittable
-+ *
-  * The class properties can be assigned via a traits mechanism. For example:
-  * @code
-  * [...]
-- * class classWithAttributes{};
-- * namespace ROOT{
-+ * class classWithAttributes {};
-+ * namespace ROOT {
-  *    namespace Meta {
-- *       namespace Selection{
-+ *       namespace Selection {
-  *          class classWithAttributes : ClassAttributes <kNonSplittable> {};
-  *       }
-  *    }
-@@ -116,9 +115,9 @@ ROOT::Selection::NS::C.
-  * properties can be assigned to a single class with this syntax:
-  * @code
-  * [...]
-- * namespace ROOT{
-+ * namespace ROOT {
-  *    namespace Meta {
-- *       namespace Selection{
-+ *       namespace Selection {
-  *          class classWithAttributes :
-  *             ClassAttributes <kProperty1 + kProperty2 + ... + kPropertyN> {};
-  *       }
-@@ -126,7 +125,6 @@ ROOT::Selection::NS::C.
-  * }
-  * @endcode
-  *
-- *
-  * The @c ROOT::Meta::Selection syntax allows to alter the number of template
-  * parameters of a certain template class within the ROOT type system, TClass.
-  * Technically it allows to alter the way in which the "normalized name" (in
-@@ -137,23 +135,21 @@ ROOT::Selection::NS::C.
-  * a long explaination in this case:
-  * @code
-  * [...]
-- * template <class T, class U=int, int V=3> class A{...};
-- * template <class T, class Alloc= myAllocator<T> > class myVector{...};
-+ * template <class T, class U = int, int V = 3> class A {...};
-+ * template <class T, class Alloc = myAllocator<T> > class myVector {...};
-  * A<char> a1;
-- * A<char,float> a2;
-+ * A<char, float> a2;
-  * myVector<float> v1;
-  * myVector<A<char>> v2;
-  *
-- * namespace ROOT{
-+ * namespace ROOT {
-  *    namespace Meta {
-- *       namespace Selection{
-- *          template <class T, class U=int, int V=3> class A
-- *            :KeepFirstTemplateArguments<1>{};
-- *
-- *          A<double> ;
-- *          template <class T, class Alloc= myAllocator<T> > class myVector
-- *            :KeepFirstTemplateArguments<1>{};
-- *
-+ *       namespace Selection {
-+ *          template <class T, class U = int, int V = 3> class A
-+ *            : KeepFirstTemplateArguments<1> {};
-+ *          A<double> a;
-+ *          template <class T, class Alloc = myAllocator<T> > class myVector
-+ *            : KeepFirstTemplateArguments<1> {};
-  *          myVector<double> vd;
-  *       }
-  *    }
-@@ -165,53 +161,55 @@ ROOT::Selection::NS::C.
-  * will be kept.
-  * In absence of any @c KeepFirstTemplateArguments trait, the normalization
-  * would be:
-- * @c A<char>           &rarr @c A<char,float,3>
-- * @c A<char,float>     &rarr @c A<char,int,3>
-- * @c myVector<float>   &rarr @c myVector<A<char,int,3>,myAllocator<A<char,int,3>>>
-- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
-+ * - @c A<char>           &rarr; @c A<char,float,3>
-+ * - @c A<char,float>     &rarr; @c A<char,int,3>
-+ * - @c myVector<float>   &rarr; @c myVector<A<char,int,3>,myAllocator<A<char,int,3>>>
-+ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
-  *
-  * Now, deciding to keep just one argument (@c KeepFirstTemplateArguments<1>):
-- * @c A<char>           &rarr @c A<char,float>
-- * @c A<char,float>     &rarr @c A<char>
-- * @c myVector<float>   &rarr @c myVector<A<char>,myAllocator<A<char>>>
-- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
-+ * - @c A<char>           &rarr; @c A<char,float>
-+ * - @c A<char,float>     &rarr; @c A<char>
-+ * - @c myVector<float>   &rarr; @c myVector<A<char>,myAllocator<A<char>>>
-+ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
-  *
-  * And deciding to keep two arguments (@c KeepFirstTemplateArguments<2>):
-- * @c A<char>           &rarr @c A<char,float>
-- * @c A<char,float>     &rarr @c A<char,int>
-- * @c myVector<float>   &rarr @c myVector<A<char,int>,myAllocator<A<char,int>>>
-- * @c myVector<A<char>> &rarr @c myVector<float,myAllocator<float>>
-+ * - @c A<char>           &rarr; @c A<char,float>
-+ * - @c A<char,float>     &rarr; @c A<char,int>
-+ * - @c myVector<float>   &rarr; @c myVector<A<char,int>,myAllocator<A<char,int>>>
-+ * - @c myVector<A<char>> &rarr; @c myVector<float,myAllocator<float>>
-  *
-  * A brief description of the properties that can be assigned to data members
-  * with the @c ROOT::Meta::Selection MemberAttributes class:
-- *    1. @c kTransient : the data member is transient, not persistified by the
-- * ROOT I/O.
-- *    2. @c kAutoSelected : the type of the data member is selected without the
-- * need of specifying its class explicitely.
-+ * 1. @c kTransient : the data member is transient, not persistified by the
-+ *    ROOT I/O.
-+ * 2. @c kAutoSelected : the type of the data member is selected without the
-+ *    need of specifying its class explicitely.
-+ *
-  * For example:
-  * @code
-  * [...]
-- * class classTransientMember{
-+ * class classTransientMember {
-  *  private:
-  *    int transientMember;
-  * };
-- * class classAutoselected{};
-- * class classTestAutoselect{
-+ * class classAutoselected {};
-+ * class classTestAutoselect {
-  *  private:
-  *    classAutoselected autoselected;
-  * };
-  *
-- * namespace ROOT{
-+ * namespace ROOT {
-  *    namespace Meta {
-- *       namespace Selection{
-- *          class classTestAutoselect{
-+ *       namespace Selection {
-+ *          class classTestAutoselect {
-  *             MemberAttributes<kAutoSelected> autoselected;
-  *          };
--
--    class classTransientMember{
--       MemberAttributes<kTransient> transientMember;
--       };
-- *
-+ *          class classTransientMember {
-+ *             MemberAttributes<kTransient> transientMember;
-+ *          };
-+ *       }
-+ *    }
-+ * }
-  * @endcode
-  * would lead to the creation of selection rules for @c classTransientMember
-  * specifying that @c transientMember is transient, @c classTestAutoselect and
-@@ -229,10 +227,10 @@ ROOT::Selection::NS::C.
-  * template< class T, class BASE >
-  * class MyDataVector : KeepFirstTemplateArguments< 1 >, SelectNoInstance {
-  *     MemberAttributes< kTransient + kAutoSelected > m_isMostDerived;
-- *     MemberAttributes< kNonSplittable+ kAutoSelected > m_isNonSplit;
-- *  };
-+ *     MemberAttributes< kNonSplittable + kAutoSelected > m_isNonSplit;
-+ * };
-  * [...]
-- *
-+ * @endcode
-  **/
- namespace ROOT {
- namespace Internal {
-@@ -265,12 +263,9 @@ private:
-    inline bool
-    InSelectionNamespace(const clang::RecordDecl &,
-                         const std::string &str =
--                           ""); ///< Check if in the ROOT::Selection namespace
-+                           ""); ///< Check if in the ROOT::Meta::Selection namespace
-    inline bool FirstPass(const clang::RecordDecl &); ///< First pass on the AST
--   inline bool SecondPass(const clang::RecordDecl &); ///< Second pass on the
--   ///AST, using the
--   ///information of the first
--   ///one
-+   inline bool SecondPass(const clang::RecordDecl &); ///< Second pass on the AST, using the information of the first one
-    inline void
-    ManageFields(const clang::RecordDecl &,
-                 const std::string &,
-@@ -285,8 +280,7 @@ private:
-    inline const clang::TemplateArgumentList *GetTmplArgList(
-       const clang::CXXRecordDecl &); ///< Get the template arguments list if any
- 
--   std::string PatternifyName(const std::string &className); ///< Transform instance
--   ///< name in pattern for selection
-+   std::string PatternifyName(const std::string &className); ///< Transform instance name in pattern for selection
-    void GetPointeeType(std::string &typeName); ///< Get name of the pointee type
- 
-    SelectionRules &fSelectionRules; ///< The selection rules to be filled
-@@ -300,9 +294,9 @@ private:
-    fNoAutoSelectedClassFieldNames; ///< Collect the autoexcluded classes
-    std::unordered_map<std::string, TemplateInfo> fTemplateInfoMap; ///< List template name - properties map
-    llvm::StringMap<ClassSelectionRule>
--   fClassNameSelectionRuleMap; /// < Map of the already built sel rules
-+   fClassNameSelectionRuleMap; ///< Map of the already built sel rules
-    bool fIsFirstPass; ///< Keep trance of the number of passes through the AST
--   ROOT::TMetaUtils::TNormalizedCtxt &fNormCtxt; /// < The reference to the normalized context
-+   ROOT::TMetaUtils::TNormalizedCtxt &fNormCtxt; ///< The reference to the normalized context
- };
- }
- }
-diff --git a/core/foundation/inc/ROOT/TypeTraits.hxx b/core/foundation/inc/ROOT/TypeTraits.hxx
-index 1abf64e73a..ab491c2504 100644
---- a/core/foundation/inc/ROOT/TypeTraits.hxx
-+++ b/core/foundation/inc/ROOT/TypeTraits.hxx
-@@ -155,7 +155,7 @@ template <typename T>
- using TakeFirstParameter_t = typename TakeFirstParameter<T>::type;
- 
- /// Remove first of possibly many template parameters.
--/// e.g. RemoveFirstParameter_t<U<A,B>> is U<B>
-+/// e.g. RemoveFirstParameter_t<U<A,B>> is U\<B\>
- template <typename>
- struct RemoveFirstParameter {
- };
-diff --git a/core/meta/src/TClass.cxx b/core/meta/src/TClass.cxx
-index 4eeec81dc1..f29ab7fd85 100644
---- a/core/meta/src/TClass.cxx
-+++ b/core/meta/src/TClass.cxx
-@@ -6780,7 +6780,7 @@ void TClass::SetDestructor(ROOT::DesFunc_t destructorFunc)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Install a new wrapper around the directory auto add function..
-+/// Install a new wrapper around the directory auto add function.
- /// The function autoAddFunc has the signature void (*)(void *obj, TDirectory dir)
- /// and should register 'obj' to the directory if dir is not null
- /// and unregister 'obj' from its current directory if dir is null
-@@ -7120,12 +7120,12 @@ Bool_t ROOT::Internal::HasConsistentHashMember(TClass &clRef)
- /// (public or not), use
- /// \code{.cpp}
- ///     cl->GetProperty() & kClassHasDefaultCtor
--/// \code
-+/// \endcode
- /// To know if the class described by this TClass has a public default
- /// constructor use:
- /// \code{.cpp}
- ///    gInterpreter->ClassInfo_HasDefaultConstructor(aClass->GetClassInfo());
--/// \code
-+/// \endcode
- 
- Bool_t TClass::HasDefaultConstructor(Bool_t testio) const
- {
-diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
-index db0da13620..279744834a 100644
---- a/core/metacling/src/TCling.cxx
-+++ b/core/metacling/src/TCling.cxx
-@@ -5388,10 +5388,10 @@ int TCling::ReadRootmapFile(const char *rootmapfile, TUniqueString *uniqueString
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Create a resource table and read the (possibly) three resource files, i.e
--/// $ROOTSYS/etc/system<name> (or ROOTETCDIR/system<name>), $HOME/<name> and
--/// ./<name>. ROOT always reads ".rootrc" (in TROOT::InitSystem()). You can
--/// read additional user defined resource files by creating additional TEnv
-+/// Create a resource table and read the (possibly) three resource files,
-+/// i.e.\ $ROOTSYS/etc/system<name> (or ROOTETCDIR/system<name>), $HOME/<name>
-+/// and $PWD/<name>. ROOT always reads ".rootrc" (in TROOT::InitSystem()). You
-+/// can read additional user defined resource files by creating additional TEnv
- /// objects. By setting the shell variable ROOTENV_NO_HOME=1 the reading of
- /// the $HOME/<name> resource file will be skipped. This might be useful in
- /// case the home directory resides on an automounted remote file system
-diff --git a/graf2d/x11/src/TGX11.cxx b/graf2d/x11/src/TGX11.cxx
-index 59e5260c92..26f88dd045 100644
---- a/graf2d/x11/src/TGX11.cxx
-+++ b/graf2d/x11/src/TGX11.cxx
-@@ -3599,9 +3599,9 @@ Pixmap_t TGX11::ReadGIF(int x0, int y0, const char *file, Window_t id)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Returns an array of pixels created from a part of drawable (defined by x, y, w, h)
--/// in format:
--/// `b1, g1, r1, 0,  b2, g2, r2, 0 ... bn, gn, rn, 0 ..`
-+/// Returns an array of pixels created from a part of drawable
-+/// (defined by x, y, w, h) in format:
-+/// `b1, g1, r1, 0,  b2, g2, r2, 0,  ...,  bn, gn, rn, 0`.
- ///
- /// Pixels are numbered from left to right and from top to bottom.
- /// By default all pixels from the whole drawable are returned.
-diff --git a/gui/guihtml/src/TGHtmlSizer.cxx b/gui/guihtml/src/TGHtmlSizer.cxx
-index c73eb581b5..8e6e71dcf7 100644
---- a/gui/guihtml/src/TGHtmlSizer.cxx
-+++ b/gui/guihtml/src/TGHtmlSizer.cxx
-@@ -60,7 +60,7 @@ SHtmlStyle_t TGHtml::GetCurrentStyle()
- ////////////////////////////////////////////////////////////////////////////////
- /// Push a new rendering style onto the stack.
- ///
--///  tag   - Tag for this style. Normally the end-tag such as </h3> or </em>.
-+///  tag   - Tag for this style. Normally the end-tag such as \</h3\> or \</em\>.
- ///  style - The style to push
- 
- void TGHtml::PushStyleStack(int tag, SHtmlStyle_t style)
-@@ -152,7 +152,7 @@ void TGHtml::MakeInvisible(TGHtmlElement *p_first, TGHtmlElement *p_last)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// For the markup <a href=XXX>, find out if the URL has been visited
-+/// For the markup \<a href=XXX\>, find out if the URL has been visited
- /// before or not.  Return COLOR_Visited or COLOR_Unvisited, as
- /// appropriate.
- 
-diff --git a/hist/hist/src/TSVDUnfold.cxx b/hist/hist/src/TSVDUnfold.cxx
-index 85cfa9f241..2b570bdb22 100644
---- a/hist/hist/src/TSVDUnfold.cxx
-+++ b/hist/hist/src/TSVDUnfold.cxx
-@@ -46,13 +46,11 @@
-  The measured distribution can be unfolded for any combination of resolution, efficiency and acceptance effects, provided an appropriate definition of <tt>xini</tt> and <tt>Adet</tt>.<br><br>
-  <p>
-  The unfolding can be performed by
-- <ul>
-- <pre>
-+ \code{.cpp}
-  TSVDUnfold *tsvdunf = new TSVDUnfold( bdat, Bcov, bini, xini, Adet );
-  TH1D* unfresult = tsvdunf->Unfold( kreg );
-- </pre>
-- </ul>
-- where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|<\tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
-+ \endcode
-+ where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|</tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
-  <p>
-  Covariance matrices on the measured spectrum (for either the total uncertainties or individual sources of uncertainties) can be propagated to covariance matrices using the <tt>GetUnfoldCovMatrix</tt> method, which uses pseudo experiments for the propagation. In addition, <tt>GetAdetCovMatrix</tt> allows for the propagation of the statistical uncertainties on the response matrix using pseudo experiments. The covariance matrix corresponding to <tt>Bcov</tt> is also computed as described in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> and can be obtained from <tt>tsvdunf->GetXtau()</tt> and its (regularisation independent) inverse from  <tt>tsvdunf->GetXinv()</tt>. The distribution of singular values can be retrieved using <tt>tsvdunf->GetSV()</tt>.
-  <p>
-diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
-index 0f80505570..20a944a545 100644
---- a/hist/histpainter/src/THistPainter.cxx
-+++ b/hist/histpainter/src/THistPainter.cxx
-@@ -418,7 +418,7 @@ some combinations must be use with care.
- - It does not work when combined with the `LEGO` and `SURF` options unless the
-   histogram plotted with the option `SAME` has exactly the same
-   ranges on the X, Y and Z axis as the currently drawn histogram. To superimpose
--  lego plots [histograms' stacks](#HP26) should be used.</li>
-+  lego plots [histograms' stacks](#HP26) should be used.
- 
- 
- ### <a name="HP061"></a> Colors automatically picked in palette
-diff --git a/hist/histv7/speed/histspeedtest.cxx b/hist/histv7/speed/histspeedtest.cxx
-index 55c0992bd5..065a10f0d7 100644
---- a/hist/histv7/speed/histspeedtest.cxx
-+++ b/hist/histv7/speed/histspeedtest.cxx
-@@ -35,7 +35,6 @@ and
-  /opt/build/root_builds/rootcling.cmake/include/ROOT/THistBinIter.h:53:50: error: no member named 'GetUncertainty' in
- 'ROOT::Experimental::THistDataContent<2, double, ROOT::Experimental::THistDataDefaultStorage>::TBinStat<double>' auto
- GetUncertainty() const { return GetStat().GetUncertainty(); }
-- ~~~~~~~~~ ^
- 
-  new ones (STATCLASSES)
- 
-diff --git a/hist/unfold/inc/TUnfold.h b/hist/unfold/inc/TUnfold.h
-index a69da26b4c..ce6e16fb4a 100644
---- a/hist/unfold/inc/TUnfold.h
-+++ b/hist/unfold/inc/TUnfold.h
-@@ -179,15 +179,15 @@ class TUnfold : public TObject {
-    TMatrixD *fX;
-    /// covariance matrix Vxx
-    TMatrixDSparse *fVxx;
--   /// inverse of covariance matrix Vxx<sup>-1</sub>
-+   /// inverse of covariance matrix Vxx<sup>-1</sup>
-    TMatrixDSparse *fVxxInv;
--   /// inverse of the input covariance matrix Vyy<sup>-1</sub>
-+   /// inverse of the input covariance matrix Vyy<sup>-1</sup>
-    TMatrixDSparse *fVyyInv;
-    /// result x folded back A*x
-    TMatrixDSparse *fAx;
--   /// chi**2 contribution from (y-Ax)Vyy<sup>-1</sub>(y-Ax)
-+   /// chi**2 contribution from (y-Ax)Vyy<sup>-1</sup>(y-Ax)
-    Double_t fChi2A;
--   /// chi**2 contribution from (x-s*x0)<sup>T</sub>L<sup>T</sub>L(x-s*x0)
-+   /// chi**2 contribution from (x-s*x0)<sup>T</sup>L<sup>T</sup>L(x-s*x0)
-    Double_t fLXsquared;
-    /// maximum global correlation coefficient
-    Double_t fRhoMax;
-diff --git a/html/src/TDocDirective.cxx b/html/src/TDocDirective.cxx
-index f7ffdc29c3..ab43d1ab38 100644
---- a/html/src/TDocDirective.cxx
-+++ b/html/src/TDocDirective.cxx
-@@ -215,7 +215,7 @@ void TDocHtmlDirective::AddLine(const TSubString& line)
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Set result to the HTML code that was passed in via AddLine().
--/// Prepend a closing </pre>, append an opening <pre>
-+/// Prepend a closing \</pre\>, append an opening \<pre\>
- 
- Bool_t TDocHtmlDirective::GetResult(TString& result)
- {
-diff --git a/math/mathcore/inc/Math/ProbFuncMathCore.h b/math/mathcore/inc/Math/ProbFuncMathCore.h
-index d751c47a36..16e205347c 100644
---- a/math/mathcore/inc/Math/ProbFuncMathCore.h
-+++ b/math/mathcore/inc/Math/ProbFuncMathCore.h
-@@ -41,8 +41,8 @@ namespace Math {
-    * These names are currently kept for backward compatibility, but
-    * their usage is deprecated.
-    *
--   *  These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
--   *  including all statistical functions <em>Math/DistFunc.h<em>
-+   *  These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
-+   *  including all statistical functions <em>Math/DistFunc.h</em>
-    *
-    */
- 
-@@ -727,8 +727,8 @@ namespace Math {
-    first or the second momentum of the truncated distribution.
-    In the case of the Landau, first and second momentum functions are provided for the Landau
-    distribution truncated only on the right side.
--   These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
--   including all statistical functions <em>Math/StatFunc.h<em>
-+   These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
-+   including all statistical functions <em>Math/StatFunc.h</em>
- 
-    */
- 
-diff --git a/math/mathcore/inc/Math/QuantFuncMathCore.h b/math/mathcore/inc/Math/QuantFuncMathCore.h
-index 7da5bd1178..1be023b33f 100644
---- a/math/mathcore/inc/Math/QuantFuncMathCore.h
-+++ b/math/mathcore/inc/Math/QuantFuncMathCore.h
-@@ -41,8 +41,8 @@ namespace Math {
-    *
-    *  \f[ D(x) = \int_{x}^{+\infty} p(x') dx' \f]
-    *
--   *  These functions are defined in the header file <em>Math/ProbFunc.h<em> or in the global one
--   *  including all statistical functions <em>Math/DistFunc.h<em>
-+   *  These functions are defined in the header file <em>Math/ProbFunc.h</em> or in the global one
-+   *  including all statistical functions <em>Math/DistFunc.h</em>
-    *
-    *
-    * <strong>NOTE:</strong> In the old releases (< 5.14) the <em>_quantile</em> functions were called
-diff --git a/math/mathcore/src/TMath.cxx b/math/mathcore/src/TMath.cxx
-index 49a81d56f7..ba8799b570 100644
---- a/math/mathcore/src/TMath.cxx
-+++ b/math/mathcore/src/TMath.cxx
-@@ -857,7 +857,7 @@ Double_t TMath::KolmogorovTest(Int_t na, const Double_t *a, Int_t nb, const Doub
- /// \f[
- /// lorentz(xx) = \frac{ \frac{1}{\pi} \frac{lg}{2} }{ (xx^{2} + \frac{lg^{2}}{4}) }
- /// \f]
--/// .
-+/// \.
- ///
- /// The Voigt function is known to be the real part of Faddeeva function also
- /// called complex error function [2].
-diff --git a/math/mathmore/inc/Math/GSLMultiRootFinder.h b/math/mathmore/inc/Math/GSLMultiRootFinder.h
-index 42069d2387..b7efe4157d 100644
---- a/math/mathmore/inc/Math/GSLMultiRootFinder.h
-+++ b/math/mathmore/inc/Math/GSLMultiRootFinder.h
-@@ -69,23 +69,23 @@ namespace Math {
-      <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Algorithms-using-Derivatives.html">documentation</A> )
-      are the followings:
-      <ul>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridSJ</tt>  with name <it>"HybridSJ"</it>: modified Powell's hybrid
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridSJ</tt>  with name <i>"HybridSJ"</i>: modified Powell's hybrid
-      method as implemented in HYBRJ in MINPACK
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridJ</tt>  with name <it>"HybridJ"</it>: unscaled version of the
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridJ</tt>  with name <i>"HybridJ"</i>: unscaled version of the
-      previous algorithm</li>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kNewton</tt>  with name <it>"Newton"</it>: Newton method </li>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kGNewton</tt>  with name <it>"GNewton"</it>: modified Newton method </li>
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kNewton</tt>  with name <i>"Newton"</i>: Newton method </li>
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kGNewton</tt>  with name <i>"GNewton"</i>: modified Newton method </li>
-      </ul>
-      The algorithms without derivatives (see also the GSL
-      <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Algorithms-without-Derivatives.html">documentation</A> )
-      are the followings:
-      <ul>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridS</tt>  with name <it>"HybridS"</it>: same as HybridSJ but using
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybridS</tt>  with name <i>"HybridS"</i>: same as HybridSJ but using
-      finate difference approximation for the derivatives</li>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybrid</tt>  with name <it>"Hybrid"</it>: unscaled version of the
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kHybrid</tt>  with name <i>"Hybrid"</i>: unscaled version of the
-      previous algorithm</li>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kDNewton</tt>  with name <it>"DNewton"</it>: discrete Newton algorithm </li>
--         <li><tt>ROOT::Math::GSLMultiRootFinder::kBroyden</tt>  with name <it>"Broyden"</it>: Broyden algorithm </li>
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kDNewton</tt>  with name <i>"DNewton"</i>: discrete Newton algorithm </li>
-+         <li><tt>ROOT::Math::GSLMultiRootFinder::kBroyden</tt>  with name <i>"Broyden"</i>: Broyden algorithm </li>
-      </ul>
- 
-      @ingroup MultiRoot
-diff --git a/math/matrix/doc/Matrix.md b/math/matrix/doc/Matrix.md
-index f53b29ca0b..c484c27c72 100644
---- a/math/matrix/doc/Matrix.md
-+++ b/math/matrix/doc/Matrix.md
-@@ -325,7 +325,7 @@ constructor</td>
-       <td>C=A*B<br>
- A*=B<br>
- C.Mult(A,B)<br>TMatrixD(A,TMatrixD::kMult,B)<br>TMatrixD(A, TMatrixD(A, TMatrixD::kTransposeMult,B)<br>TMatrixD(A, TMatrixD::kMultTranspose,B)</td>
--      <td>overwrites A<br>&nbsp;<br>&nbsp;<br>constructor of A.B<br>constructor of A<sup>T</sup> .B<br>constructor of A.B<sup>T</sup></td>
-+      <td>overwrites A<br>&nbsp;<br>&nbsp;<br>constructor of A·B<br>constructor of A<sup>T</sup>·B<br>constructor of A·B<sup>T</sup></td>
-     </tr>
-       <tr>
-       <td>Element wise multiplication</td>
-diff --git a/math/minuit/src/TMinuit.cxx b/math/minuit/src/TMinuit.cxx
-index df3e563a73..18a6437c68 100644
---- a/math/minuit/src/TMinuit.cxx
-+++ b/math/minuit/src/TMinuit.cxx
-@@ -187,11 +187,11 @@ the error matrix, or setting of exact confidence levels see:
- 
-   1. F.James.
-      Determining the statistical Significance of experimental Results.
--     Technical Report DD/81/02 and CERN Report 81-03, CERN, 1981.</li>
-+     Technical Report DD/81/02 and CERN Report 81-03, CERN, 1981.
- 
-   2. W.T.Eadie, D.Drijard, F.James, M.Roos, and B.Sadoulet.
-      Statistical Methods in Experimental Physics.
--     North-Holland, 1971.</li>
-+     North-Holland, 1971.
- 
- ### Reliability of MINUIT error estimates.
- 
-diff --git a/montecarlo/eg/src/TDatabasePDG.cxx b/montecarlo/eg/src/TDatabasePDG.cxx
-index 23c32e9668..85e9fe2a6d 100644
---- a/montecarlo/eg/src/TDatabasePDG.cxx
-+++ b/montecarlo/eg/src/TDatabasePDG.cxx
-@@ -46,7 +46,7 @@ Root.DatabasePDG: $(HOME)/my_pdg_table.txt
- See TParticlePDG for the description of a static particle properties.
- See TParticle    for the description of a dynamic particle particle.
- 
--<br>The current default pdg_table file displays lifetime 0 for some unstable particles.</br>
-+The current default pdg_table file displays lifetime 0 for some unstable particles.
- 
- */
- 
-diff --git a/montecarlo/vmc/README.md b/montecarlo/vmc/README.md
-index dc66ec401f..c731b26e92 100644
---- a/montecarlo/vmc/README.md
-+++ b/montecarlo/vmc/README.md
-@@ -43,7 +43,7 @@ See more detailed description in [the dedicated README](README.multiple.md).
- ## Authors
- 
- The concept of Virtual MonteCarlo has been developed by the [ALICE Software Project](http://aliceinfo.cern.ch/Offline/).<br>
--Authors: R.Brun<sup>1</sup>, F.Carminati<sup>1</sup>, A. Gheata<sup>1</sup>, I.Hrivnacova<sup>2</sup>, A.Morsch<sup>1</sup>, B.Volkel<sup>1</sup>;<br>
-+Authors: R. Brun<sup>1</sup>, F. Carminati<sup>1</sup>, A. Gheata<sup>1</sup>, I. Hrivnacova<sup>2</sup>, A. Morsch<sup>1</sup>, B. Volkel<sup>1</sup>;<br>
- <sup>1</sup>European Organization for Nuclear Research (CERN), Geneva, Switzerland;<br>
- <sup>2</sup>Institut de Physique Nucléaire dʼOrsay (IPNO), Université Paris-Sud, CNRS-IN2P3, Orsay, France 
- 
-diff --git a/net/http/civetweb/LICENSE.md b/net/http/civetweb/LICENSE.md
-index ab049e3e72..b6bb8ff037 100644
---- a/net/http/civetweb/LICENSE.md
-+++ b/net/http/civetweb/LICENSE.md
-@@ -180,10 +180,6 @@ Duktape License
- 
- https://github.com/svaarala/duktape/blob/master/LICENSE.txt
- 
--> ===============
--> Duktape license
--> ===============
--> 
- > (http://opensource.org/licenses/MIT)
- > 
- > Copyright (c) 2013-2017 by Duktape authors (see AUTHORS.rst)
-diff --git a/proof/proof/src/TProofMgr.cxx b/proof/proof/src/TProofMgr.cxx
-index 2a140e4e7a..e41b637a15 100644
---- a/proof/proof/src/TProofMgr.cxx
-+++ b/proof/proof/src/TProofMgr.cxx
-@@ -775,26 +775,29 @@ void TProofMgr::ReplaceSubdirs(const char *fn, TString &fdst, TList &dirph)
- /// Upload files provided via the list 'src' (as TFileInfo or TObjString)
- /// to 'mss'. The path under 'mss' is determined by 'dest'; the following
- /// place-holders can be used in 'dest':
--///      <d0>, <d1>, <d2>, ...         referring to the n-th sub-component
--///                                    of the src path
--///      <bn>                          basename in the source path
--///      <bs>                          basename sans extension
--///      <ex>                          Extension
--///      <sn>                          serial number of file in the list
--///      <s0>                          as <sn> but zero padded
--///      <fn>                          the full file path
--///      <us>, <gr>                    the local user and group names.
--///      <pg>                          the users PROOF group
--///      <pa>                          immediate parent directory
--///      <gp>                          next-to immediate parent directory
-+///
-+/// Place-holder                | Meaning          |
-+/// ----------------------------|------------------------------------
-+/// \<d0\>, \<d1\>, \<d2\>, ... | referring to the n-th sub-component of the src path
-+/// \<bn\>                      | basename in the source path
-+/// \<bs\>                      | basename sans extension
-+/// \<ex\>                      | Extension
-+/// \<sn\>                      | serial number of file in the list
-+/// \<s0\>                      | as \<sn\> but zero padded
-+/// \<fn\>                      | the full file path
-+/// \<us\>, \<gr\>              | the local user and group names.
-+/// \<pg\>                      | the users PROOF group
-+/// \<pa\>                      | immediate parent directory
-+/// \<gp\>                      | next-to immediate parent directory
-+///
- /// So, for example, if the source filename for the 99-th file is
- ///               protosrc://host//d0/d1/d2/d3/d4/d5/myfile
--/// then with dest = '/pool/user/<d3>/<d4>/<d5>/<s>/<bn>' and
-+/// then with dest = '/pool/user/\<d3\>/\<d4\>/\<d5\>/\<sn\>/\<bn\>' and
- ///           mss = 'protodst://hostdst//nm/
- /// the corresponding destination path is
- ///           protodst://hostdst//nm/pool/user/d3/d4/d5/99/myfile
- ///
--/// If 'dest' is empty, <fn> is used.
-+/// If 'dest' is empty, \<fn\> is used.
- ///
- /// Returns a TFileCollection with the destination files created; this
- /// TFileCollection is, for example, ready to be registered as dataset.
-@@ -966,20 +969,23 @@ TFileCollection *TProofMgr::UploadFiles(TList *src,
- /// line, with line beginning by '#' ignored (i.e. considered comments).
- /// The path under 'mss' is defined by 'dest'; the following
- /// place-holders can be used in 'dest':
--///      <d0>, <d1>, <d2>, ...         referring to the n-th sub-component
--///                                    of the src path
--///      <bn>                          basename in the source path
--///      <sn>                          serial number of file in the list
--///      <fn>                          the full file path
--///      <us>, <gr>                    the local user and group names.
-+///
-+/// Place-holder                | Meaning          |
-+/// ----------------------------|------------------------------------
-+/// \<d0\>, \<d1\>, \<d2\>, ... | referring to the n-th sub-component of the src path
-+/// \<bn\>                      | basename in the source path
-+/// \<sn\>                      | serial number of file in the list
-+/// \<fn\>                      | the full file path
-+/// \<us\>, \<gr\>              | the local user and group names.
-+///
- /// So, for example, if the source filename for the 99-th file is
- ///               protosrc://host//d0/d1/d2/d3/d4/d5/myfile
--/// then with dest = '/pool/user/<d3>/<d4>/<d5>/<s>/<bn>' and
-+/// then with dest = '/pool/user/\<d3\>/\<d4\>/\<d5\>/\<sn\>/\<bn\>' and
- ///           mss = 'protodst://hostdst//nm/
- /// the corresponding destination path is
- ///           protodst://hostdst//nm/pool/user/d3/d4/d5/99/myfile
- ///
--/// If 'dest' is empty, <fn> is used.
-+/// If 'dest' is empty, \<fn\> is used.
- ///
- /// Returns a TFileCollection with the destination files created; this
- /// TFileCollection is, for example, ready to be registered as dataset.
-diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx
-index 24c521743d..3697f257a0 100644
---- a/proof/proof/src/TProofServ.cxx
-+++ b/proof/proof/src/TProofServ.cxx
-@@ -6696,11 +6696,11 @@ Int_t TProofServ::Fork()
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Replace <ord>, <user>, <u>, <group>, <stag>, <qnum>, <file>, <rver> and
--/// <build> placeholders in fname.
--/// Here, <rver> is the root version in integer form, e.g. 53403, and <build> a
--/// string includign version, architecture and compiler version, e.g.
--/// '53403_linuxx8664gcc_gcc46' .
-+/// Replace \<ord\>, \<user\>, \<u\>, \<group\>, \<stag\>, \<qnum\>, \<file\>,
-+/// \<rver\> and \<build\> placeholders in fname.
-+/// Here, \<rver\> is the root version in integer form, e.g. 53403, and
-+/// \<build\> a string includign version, architecture and compiler version,
-+/// e.g. '53403_linuxx8664gcc_gcc46' .
- 
- void TProofServ::ResolveKeywords(TString &fname, const char *path)
- {
-diff --git a/roofit/histfactory/doc/index.md b/roofit/histfactory/doc/index.md
-index 32f1c551a4..9256a9cf11 100644
---- a/roofit/histfactory/doc/index.md
-+++ b/roofit/histfactory/doc/index.md
-@@ -41,12 +41,11 @@ it is organized as follows (see the examples in `${ROOTSYS}/tutorials/histfactor
- <li> several 'Measurements' (corresponding to a full fit of the model) each of which specifies</li>
- <ul>
- <li> a name for this fit to be used in tables and files</li>
--<ul>
--<li>      what is the luminosity associated to the measurement in picobarns</li>
--<li>      which bins of the histogram should be used</li>
--<li>      what is the relative uncertainty on the luminosity </li>
--<li>      what is (are) the parameter(s) of interest that will be measured</li>
--<li>      which parameters should be fixed/floating (eg. nuisance parameters)</li>
-+<li> what is the luminosity associated to the measurement in picobarns</li>
-+<li> which bins of the histogram should be used</li>
-+<li> what is the relative uncertainty on the luminosity </li>
-+<li> what is (are) the parameter(s) of interest that will be measured</li>
-+<li> which parameters should be fixed/floating (eg. nuisance parameters)</li>
- </ul>
- </ul>
- </ul>
-diff --git a/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx b/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
-index e14e63ec89..73a3f627ba 100644
---- a/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
-+++ b/roofit/histfactory/src/MakeModelAndMeasurementsFast.cxx
-@@ -92,12 +92,11 @@ using namespace RooFit;
-   <li> several 'Measurements' (corresponding to a full fit of the model) each of which specifies</li>
-   <ul>
-   <li> a name for this fit to be used in tables and files</li>
--  <ul>
--  <li>      what is the luminosity associated to the measurement in picobarns</li>
--  <li>      which bins of the histogram should be used</li>
--  <li>      what is the relative uncertainty on the luminosity </li>
--  <li>      what is (are) the parameter(s) of interest that will be measured</li>
--  <li>      which parameters should be fixed/floating (eg. nuisance parameters)</li>
-+  <li> what is the luminosity associated to the measurement in picobarns</li>
-+  <li> which bins of the histogram should be used</li>
-+  <li> what is the relative uncertainty on the luminosity </li>
-+  <li> what is (are) the parameter(s) of interest that will be measured</li>
-+  <li> which parameters should be fixed/floating (eg. nuisance parameters)</li>
-   </ul>
-   </ul>
-   </ul>
-diff --git a/roofit/roofitcore/inc/RooAbsCategory.h b/roofit/roofitcore/inc/RooAbsCategory.h
-index a7eaf8772a..4f0937a99d 100644
---- a/roofit/roofitcore/inc/RooAbsCategory.h
-+++ b/roofit/roofitcore/inc/RooAbsCategory.h
-@@ -199,7 +199,7 @@ protected:
-     return hasIndex(_currentIndex);
-   }
- 
--  /// If a category depends on the shape of others, *i.e.*, its state numbers or names depend
-+  /// If a category depends on the shape of others, i.e.\ its state numbers or names depend
-   /// on the states of other categories, this function has to be implemented to recompute
-   /// _stateNames and _insertionOrder.
-   /// If one of these two changes, setShapeDirty() has to be called to propagate this information
-diff --git a/roofit/roofitcore/src/RooSimPdfBuilder.cxx b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
-index 4c8289523d..57ea1e9196 100644
---- a/roofit/roofitcore/src/RooSimPdfBuilder.cxx
-+++ b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
-@@ -99,7 +99,7 @@
- ///    PDF for each state of the C index category.
- ///  </p>
- ///  <p>
--///    In the above example </tt>RooSimPdfBuilder</tt>
-+///    In the above example <tt>RooSimPdfBuilder</tt>
- ///    will first replicate <tt>k</tt> and <tt>s</tt> into
- ///    <tt>k_C1,k_C2</tt> and <tt>s_C1,s_C2</tt>, as prescribed in the
- ///    configuration. Then it will recursively replicate all PDF nodes that depend on
-@@ -383,7 +383,7 @@
- ///    <tt>pdfA(x;p,q)</tt> and <tt>pdfB(x;p,r)</tt> that have a common parameter <tt>p</tt>.
- ///    We want to build a <tt>RooSimultaneous</tt> for both <tt>pdfA</tt> and <tt>B</tt>,
- ///    which involves a split of parameter <tt>p</tt> and we would like to build the
--///    simultaneous pdfs </tt>simA</tt> and <tt>simB</tt> such that still share their (now split) parameters
-+///    simultaneous pdfs <tt>simA</tt> and <tt>simB</tt> such that still share their (now split) parameters
- ///    <tt>p_XXX</tt>. This is accomplished by letting a single instance of <tt>RooSimPdfBuilder</tt> handle
- ///    the builds of both <tt>pdfA</tt> and <tt>pdfB</tt>, as illustrated in this example:
- ///  </p>
-diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx
-index eda1b9ca1a..866aad0e18 100644
---- a/tmva/tmva/src/Factory.cxx
-+++ b/tmva/tmva/src/Factory.cxx
-@@ -683,9 +683,9 @@ void TMVA::Factory::WriteDataInformation(DataSetInfo&     fDataSetInfo)
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--/// Iterates through all booked methods and sees if they use parameter tuning and if so..
--/// does just that  i.e. calls "Method::Train()" for different parameter settings and
--/// keeps in mind the "optimal one"... and that's the one that will later on be used
-+/// Iterates through all booked methods and sees if they use parameter tuning and if so
-+/// does just that, i.e.\ calls "Method::Train()" for different parameter settings and
-+/// keeps in mind the "optimal one"...\ and that's the one that will later on be used
- /// in the main training loop.
- 
- std::map<TString,Double_t> TMVA::Factory::OptimizeAllMethods(TString fomType, TString fitType)
-diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx
-index 56d65bb9bf..b34ee9f1de 100644
---- a/tmva/tmva/src/Reader.cxx
-+++ b/tmva/tmva/src/Reader.cxx
-@@ -594,7 +594,7 @@ const std::vector< Float_t >& TMVA::Reader::EvaluateRegression( const TString& m
- ////////////////////////////////////////////////////////////////////////////////
- /// evaluates the regression MVA
- /// check for NaN in event data:  (note: in the factory, this check was done already at the creation of the datasets, hence
--/// it is not again checked in each of these subsequent calls..
-+/// it is not again checked in each of these subsequent calls.
- 
- const std::vector< Float_t >& TMVA::Reader::EvaluateRegression( MethodBase* method, Double_t /*aux*/ )
- {
-@@ -660,7 +660,7 @@ const std::vector< Float_t >& TMVA::Reader::EvaluateMulticlass( const TString& m
- ////////////////////////////////////////////////////////////////////////////////
- /// evaluates the multiclass MVA
- /// check for NaN in event data:  (note: in the factory, this check was done already at the creation of the datasets, hence
--/// it is not again checked in each of these subsequent calls..
-+/// it is not again checked in each of these subsequent calls.
- 
- const std::vector< Float_t >& TMVA::Reader::EvaluateMulticlass( MethodBase* method, Double_t /*aux*/ )
- {
-diff --git a/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx b/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
-index 17527ac16d..497dd3d5c6 100644
---- a/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
-+++ b/tree/dataframe/inc/ROOT/RDF/RColumnValue.hxx
-@@ -93,7 +93,7 @@ class R__CLING_PTRCHECK(off) RColumnValue {
-    /// Enumerator for the different properties of the branch storage in memory
-    enum class EStorageType : char { kContiguous, kUnknown, kSparse };
-    /// Signal whether we ever checked that the branch we are reading with a TTreeReaderArray stores array elements
--   /// in contiguous memory. Only used when T == RVec<U>.
-+   /// in contiguous memory. Only used when T == RVec\<U\>.
-    EStorageType fStorageType = EStorageType::kUnknown;
-    /// If MustUseRVec, i.e. we are reading an array, we return a reference to this RVec to clients
-    RVec<ColumnValue_t> fRVec;
-diff --git a/tutorials/net/udpserver.c b/tutorials/net/udpserver.c
-index c54685400e..a74f6f0a85 100644
---- a/tutorials/net/udpserver.c
-+++ b/tutorials/net/udpserver.c
-@@ -4,7 +4,7 @@
- 
- /* Converted to echo client/server with select() (timeout option).
-    See testTUDPSocket.C */
--/* Compile with: gcc udpserver.c -o udpserver
-+/* Compile with: gcc udpserver.c -o udpserver */
- /* on Windows: cl -nologo -Z7 -MD -GR -EHsc udpserver.c */
- /* 3/30/05 John Schultz */
- 
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index 47f26368d9..89373a8887 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.C
-+++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -22,7 +22,7 @@
- /// Helper function to create input images data
- /// we create a signal and background 2D histograms from 2d gaussians
- /// with a location (means in X and Y)  different for each event
--/// The difference between signal and background is in the gaussian width..
-+/// The difference between signal and background is in the gaussian width.
- /// The width for the bakground gaussian is slightly larger than the signal width by few % values
- ///
- ///
--- 
-2.26.2
-
diff --git a/root-doxygen-filenames.patch b/root-doxygen-filenames.patch
deleted file mode 100644
index d891a7f..0000000
--- a/root-doxygen-filenames.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-From 116be70d2786a3fecdfcd6445d06ad6f3768f5a6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 3 Jul 2020 08:08:33 +0200
-Subject: [PATCH 1/5] Fix \file references in doxygen markup
-
----
- core/base/v7/inc/ROOT/RDirectory.hxx         | 2 +-
- core/base/v7/inc/ROOT/RDirectoryEntry.hxx    | 2 +-
- core/base/v7/inc/ROOT/RError.hxx             | 2 +-
- core/base/v7/inc/ROOT/RIndexIter.hxx         | 2 +-
- core/base/v7/inc/ROOT/RLogger.hxx            | 2 +-
- core/base/v7/inc/ROOT/RTupleApply.hxx        | 2 +-
- core/base/v7/inc/ROOT/impl_tuple_apply.hxx   | 2 +-
- core/base/v7/src/RLogger.cxx                 | 2 +-
- core/clingutils/test/TClingUtilsTests.cxx    | 2 +-
- core/foundation/inc/ROOT/RNotFn.hxx          | 2 +-
- core/foundation/inc/ROOT/RSpan.hxx           | 2 +-
- core/foundation/inc/ROOT/span.hxx            | 2 +-
- core/foundation/src/FoundationUtils.cxx      | 2 +-
- gui/browsable/inc/ROOT/Browsable/RItem.hxx   | 2 +-
- gui/browsable/src/RHistDraw7Provider.cxx     | 2 +-
- gui/browsable/src/RSysFile.cxx               | 2 +-
- gui/browserv7/inc/ROOT/RBrowserReply.hxx     | 2 +-
- hist/hist/test/TFormulaGradientTests.cxx     | 2 +-
- hist/histdrawv7/inc/ROOT/RHistDrawable.hxx   | 2 +-
- hist/histv7/inc/ROOT/RAxis.hxx               | 2 +-
- hist/histv7/inc/ROOT/RAxisConfig.hxx         | 2 +-
- hist/histv7/inc/ROOT/RHist.hxx               | 2 +-
- hist/histv7/inc/ROOT/RHistBinIter.hxx        | 2 +-
- hist/histv7/inc/ROOT/RHistBufferedFill.hxx   | 2 +-
- hist/histv7/inc/ROOT/RHistConcurrentFill.hxx | 2 +-
- hist/histv7/inc/ROOT/RHistData.hxx           | 2 +-
- hist/histv7/inc/ROOT/RHistImpl.hxx           | 2 +-
- hist/histv7/inc/ROOT/RHistUtils.hxx          | 2 +-
- hist/histv7/inc/ROOT/RHistView.hxx           | 2 +-
- io/io/v7/inc/ROOT/RFile.hxx                  | 2 +-
- math/mathcore/test/CladDerivatorTests.cxx    | 2 +-
- math/mathcore/v7/inc/ROOT/RFit.hxx           | 2 +-
- tmva/tmva/inc/TMVA/NeuralNet.h               | 2 +-
- 33 files changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/core/base/v7/inc/ROOT/RDirectory.hxx b/core/base/v7/inc/ROOT/RDirectory.hxx
-index 5331f91144..6d1a4b0541 100644
---- a/core/base/v7/inc/ROOT/RDirectory.hxx
-+++ b/core/base/v7/inc/ROOT/RDirectory.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RDirectory.h
-+/// \file ROOT/RDirectory.hxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff --git a/core/base/v7/inc/ROOT/RDirectoryEntry.hxx b/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
-index a7258bc642..1a33e5003a 100644
---- a/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
-+++ b/core/base/v7/inc/ROOT/RDirectoryEntry.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RDirectoryEntry.h
-+/// \file ROOT/RDirectoryEntry.hxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff --git a/core/base/v7/inc/ROOT/RError.hxx b/core/base/v7/inc/ROOT/RError.hxx
-index 7a0d363e7f..6af7a38f01 100644
---- a/core/base/v7/inc/ROOT/RError.hxx
-+++ b/core/base/v7/inc/ROOT/RError.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RError.h
-+/// \file ROOT/RError.hxx
- /// \ingroup Base ROOT7
- /// \author Jakob Blomer <jblomer@cern.ch>
- /// \date 2019-12-11
-diff --git a/core/base/v7/inc/ROOT/RIndexIter.hxx b/core/base/v7/inc/ROOT/RIndexIter.hxx
-index 1e290d82c8..fc424fdb8d 100644
---- a/core/base/v7/inc/ROOT/RIndexIter.hxx
-+++ b/core/base/v7/inc/ROOT/RIndexIter.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RIndexIter.h
-+/// \file ROOT/RIndexIter.hxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2016-01-19
-diff --git a/core/base/v7/inc/ROOT/RLogger.hxx b/core/base/v7/inc/ROOT/RLogger.hxx
-index c1852656ee..d4e3e6e7bd 100644
---- a/core/base/v7/inc/ROOT/RLogger.hxx
-+++ b/core/base/v7/inc/ROOT/RLogger.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/TLogger.h
-+/// \file ROOT/RLogger.hxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-29
-diff --git a/core/base/v7/inc/ROOT/RTupleApply.hxx b/core/base/v7/inc/ROOT/RTupleApply.hxx
-index 9a80bfcd6f..995246505f 100644
---- a/core/base/v7/inc/ROOT/RTupleApply.hxx
-+++ b/core/base/v7/inc/ROOT/RTupleApply.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RTupleApply.h
-+/// \file ROOT/RTupleApply.hxx
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff --git a/core/base/v7/inc/ROOT/impl_tuple_apply.hxx b/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
-index dc12706906..68d6988f97 100644
---- a/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
-+++ b/core/base/v7/inc/ROOT/impl_tuple_apply.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/impl_tuple_apply.h
-+/// \file ROOT/impl_tuple_apply.hxx
- /// \ingroup Base StdExt ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff --git a/core/base/v7/src/RLogger.cxx b/core/base/v7/src/RLogger.cxx
-index 69aba0b05c..3ac8bb760f 100644
---- a/core/base/v7/src/RLogger.cxx
-+++ b/core/base/v7/src/RLogger.cxx
-@@ -1,4 +1,4 @@
--/// \file TLogger.cxx
-+/// \file RLogger.cxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-07
-diff --git a/core/clingutils/test/TClingUtilsTests.cxx b/core/clingutils/test/TClingUtilsTests.cxx
-index fca26705c3..fbc12cd352 100644
---- a/core/clingutils/test/TClingUtilsTests.cxx
-+++ b/core/clingutils/test/TClingUtilsTests.cxx
-@@ -1,4 +1,4 @@
--/// \file TClingUtilsTest.cxx
-+/// \file TClingUtilsTests.cxx
- ///
- /// \brief The file contain unit tests which test the TClingUtils.h
- ///
-diff --git a/core/foundation/inc/ROOT/RNotFn.hxx b/core/foundation/inc/ROOT/RNotFn.hxx
-index a6dd13679e..a3877797f3 100644
---- a/core/foundation/inc/ROOT/RNotFn.hxx
-+++ b/core/foundation/inc/ROOT/RNotFn.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RNotFn.h
-+/// \file ROOT/RNotFn.hxx
- /// \ingroup Base StdExt
- /// \author Danilo Piparo, Enrico Guiraud
- /// \date 2018-01-19
-diff --git a/core/foundation/inc/ROOT/RSpan.hxx b/core/foundation/inc/ROOT/RSpan.hxx
-index 9e356493e6..b7366d58e7 100644
---- a/core/foundation/inc/ROOT/RSpan.hxx
-+++ b/core/foundation/inc/ROOT/RSpan.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RSpan.h
-+/// \file ROOT/RSpan.hxx
- /// \ingroup Base StdExt
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff --git a/core/foundation/inc/ROOT/span.hxx b/core/foundation/inc/ROOT/span.hxx
-index ce1b0e1d96..185055bbe6 100644
---- a/core/foundation/inc/ROOT/span.hxx
-+++ b/core/foundation/inc/ROOT/span.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/rhysd_span.h
-+/// \file ROOT/span.hxx
- /// \ingroup Base StdExt
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff --git a/core/foundation/src/FoundationUtils.cxx b/core/foundation/src/FoundationUtils.cxx
-index 9de395698b..d70e196130 100644
---- a/core/foundation/src/FoundationUtils.cxx
-+++ b/core/foundation/src/FoundationUtils.cxx
-@@ -1,4 +1,4 @@
--/// \file FoundationUtils.hxx
-+/// \file FoundationUtils.cxx
- ///
- /// \brief The file contains utilities which are foundational and could be used
- /// across the core component of ROOT.
-diff --git a/gui/browsable/inc/ROOT/Browsable/RItem.hxx b/gui/browsable/inc/ROOT/Browsable/RItem.hxx
-index a07870a2cb..290587013e 100644
---- a/gui/browsable/inc/ROOT/Browsable/RItem.hxx
-+++ b/gui/browsable/inc/ROOT/Browsable/RItem.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RBrowser.hxx
-+/// \file ROOT/RItem.hxx
- /// \ingroup WebGui ROOT7
- /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
- /// \author Sergey Linev <S.Linev@gsi.de>
-diff --git a/gui/browsable/src/RHistDraw7Provider.cxx b/gui/browsable/src/RHistDraw7Provider.cxx
-index 416db22472..e2e15303c6 100644
---- a/gui/browsable/src/RHistDraw7Provider.cxx
-+++ b/gui/browsable/src/RHistDraw7Provider.cxx
-@@ -1,4 +1,4 @@
--/// \file RDrawableRHist.cxx
-+/// \file RHistDraw7Provider.cxx
- /// \ingroup rbrowser
- /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
- /// \author Sergey Linev <S.Linev@gsi.de>
-diff --git a/gui/browsable/src/RSysFile.cxx b/gui/browsable/src/RSysFile.cxx
-index d5f481cb83..4447164f52 100644
---- a/gui/browsable/src/RSysFile.cxx
-+++ b/gui/browsable/src/RSysFile.cxx
-@@ -6,7 +6,7 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
--/// \file ROOT/RFileBrowsable.cxx
-+/// \file ROOT/RSysFile.cxx
- /// \ingroup rbrowser
- /// \author Sergey Linev <S.Linev@gsi.de>
- /// \date 2019-10-15
-diff --git a/gui/browserv7/inc/ROOT/RBrowserReply.hxx b/gui/browserv7/inc/ROOT/RBrowserReply.hxx
-index bdb94f60ea..35a2f1f978 100644
---- a/gui/browserv7/inc/ROOT/RBrowserReply.hxx
-+++ b/gui/browserv7/inc/ROOT/RBrowserReply.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RBrowserRequest.hxx
-+/// \file ROOT/RBrowserReply.hxx
- /// \ingroup WebGui ROOT7
- /// \author Bertrand Bellenot <bertrand.bellenot@cern.ch>
- /// \author Sergey Linev <S.Linev@gsi.de>
-diff --git a/hist/hist/test/TFormulaGradientTests.cxx b/hist/hist/test/TFormulaGradientTests.cxx
-index 8c11a56077..74c0930f03 100644
---- a/hist/hist/test/TFormulaGradientTests.cxx
-+++ b/hist/hist/test/TFormulaGradientTests.cxx
-@@ -1,4 +1,4 @@
--/// \file TFormulaGradientTests.h
-+/// \file TFormulaGradientTests.cxx
- ///
- /// \brief The file contain unit tests which test the clad-based gradient
- ///        computations.
-diff --git a/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx b/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
-index ac56b9c8f3..0b3b635d92 100644
---- a/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
-+++ b/hist/histdrawv7/inc/ROOT/RHistDrawable.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistDrawable.h
-+/// \file ROOT/RHistDrawable.hxx
- /// \ingroup HistDraw ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-09
-diff --git a/hist/histv7/inc/ROOT/RAxis.hxx b/hist/histv7/inc/ROOT/RAxis.hxx
-index 1d35ed9b93..0371a06f97 100644
---- a/hist/histv7/inc/ROOT/RAxis.hxx
-+++ b/hist/histv7/inc/ROOT/RAxis.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RAxis.h
-+/// \file ROOT/RAxis.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-23
-diff --git a/hist/histv7/inc/ROOT/RAxisConfig.hxx b/hist/histv7/inc/ROOT/RAxisConfig.hxx
-index 1e100986f0..34bf2f6a4a 100644
---- a/hist/histv7/inc/ROOT/RAxisConfig.hxx
-+++ b/hist/histv7/inc/ROOT/RAxisConfig.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RAxisConfig.h
-+/// \file ROOT/RAxisConfig.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2020-02-05
-diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
-index ebb319f1ef..5567683b27 100644
---- a/hist/histv7/inc/ROOT/RHist.hxx
-+++ b/hist/histv7/inc/ROOT/RHist.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHist.h
-+/// \file ROOT/RHist.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-23
-diff --git a/hist/histv7/inc/ROOT/RHistBinIter.hxx b/hist/histv7/inc/ROOT/RHistBinIter.hxx
-index 60f57dd20e..ab77dfbeaa 100644
---- a/hist/histv7/inc/ROOT/RHistBinIter.hxx
-+++ b/hist/histv7/inc/ROOT/RHistBinIter.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistBinIter.h
-+/// \file ROOT/RHistBinIter.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-08-07
-diff --git a/hist/histv7/inc/ROOT/RHistBufferedFill.hxx b/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
-index bb1cade29b..8efe00e207 100644
---- a/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
-+++ b/hist/histv7/inc/ROOT/RHistBufferedFill.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistBufferedFill.h
-+/// \file ROOT/RHistBufferedFill.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-03
-diff --git a/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx b/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
-index a6b4b6a8e2..8ff76eb659 100644
---- a/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
-+++ b/hist/histv7/inc/ROOT/RHistConcurrentFill.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistConcurrentFill.h
-+/// \file ROOT/RHistConcurrentFill.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-03
-diff --git a/hist/histv7/inc/ROOT/RHistData.hxx b/hist/histv7/inc/ROOT/RHistData.hxx
-index 901bd5c33a..9757986ff4 100644
---- a/hist/histv7/inc/ROOT/RHistData.hxx
-+++ b/hist/histv7/inc/ROOT/RHistData.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistData.h
-+/// \file ROOT/RHistData.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-06-14
-diff --git a/hist/histv7/inc/ROOT/RHistImpl.hxx b/hist/histv7/inc/ROOT/RHistImpl.hxx
-index 483d879f0e..b6d4b2c6b5 100644
---- a/hist/histv7/inc/ROOT/RHistImpl.hxx
-+++ b/hist/histv7/inc/ROOT/RHistImpl.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistImpl.h
-+/// \file ROOT/RHistImpl.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-03-23
-diff --git a/hist/histv7/inc/ROOT/RHistUtils.hxx b/hist/histv7/inc/ROOT/RHistUtils.hxx
-index 3733113c2b..08a342bf61 100644
---- a/hist/histv7/inc/ROOT/RHistUtils.hxx
-+++ b/hist/histv7/inc/ROOT/RHistUtils.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistData.h
-+/// \file ROOT/RHistUtils.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2016-06-01
-diff --git a/hist/histv7/inc/ROOT/RHistView.hxx b/hist/histv7/inc/ROOT/RHistView.hxx
-index b65d3518dd..d2b40e0f35 100644
---- a/hist/histv7/inc/ROOT/RHistView.hxx
-+++ b/hist/histv7/inc/ROOT/RHistView.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RHistView.h
-+/// \file ROOT/RHistView.hxx
- /// \ingroup Hist ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-08-06
-diff --git a/io/io/v7/inc/ROOT/RFile.hxx b/io/io/v7/inc/ROOT/RFile.hxx
-index 6d3baaec05..c371a25875 100644
---- a/io/io/v7/inc/ROOT/RFile.hxx
-+++ b/io/io/v7/inc/ROOT/RFile.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RFile.h
-+/// \file ROOT/RFile.hxx
- /// \ingroup Base ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-07-31
-diff --git a/math/mathcore/test/CladDerivatorTests.cxx b/math/mathcore/test/CladDerivatorTests.cxx
-index e4289a7286..d1682094e0 100644
---- a/math/mathcore/test/CladDerivatorTests.cxx
-+++ b/math/mathcore/test/CladDerivatorTests.cxx
-@@ -1,4 +1,4 @@
--/// \file CladDerivator.h
-+/// \file CladDerivatorTests.cxx
- ///
- /// \brief The file contain unit tests which test the CladDerivator facility.
- ///
-diff --git a/math/mathcore/v7/inc/ROOT/RFit.hxx b/math/mathcore/v7/inc/ROOT/RFit.hxx
-index 4fae336242..5b92733152 100644
---- a/math/mathcore/v7/inc/ROOT/RFit.hxx
-+++ b/math/mathcore/v7/inc/ROOT/RFit.hxx
-@@ -1,4 +1,4 @@
--/// \file ROOT/RFit.h
-+/// \file ROOT/RFit.hxx
- /// \ingroup MathCore ROOT7
- /// \author Axel Naumann <axel@cern.ch>
- /// \date 2015-09-06
-diff --git a/tmva/tmva/inc/TMVA/NeuralNet.h b/tmva/tmva/inc/TMVA/NeuralNet.h
-index 31229cb1cf..bae98a48b2 100644
---- a/tmva/tmva/inc/TMVA/NeuralNet.h
-+++ b/tmva/tmva/inc/TMVA/NeuralNet.h
-@@ -1,5 +1,5 @@
- /**
-- * @file NeuralNet
-+ * @file TMVA/NeuralNet.h
-  * @author  Peter Speckmayer
-  * @version 1.0
-  *
--- 
-2.26.2
-
diff --git a/root-doxygen-macro-name.patch b/root-doxygen-macro-name.patch
deleted file mode 100644
index a97bdf0..0000000
--- a/root-doxygen-macro-name.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8266262f76eaef4dc72ffda38e1d315be2ce3ff0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 8 Jul 2020 19:41:34 +0200
-Subject: [PATCH 5/5] Make the name of macro match the filename
-
-Fixes:
-
-warning: Failed to call `rs302_JeffreysPriorDemo()` to execute the macro.
-Add this function or rename the macro. Falling back to `.L`.
----
- tutorials/roostats/rs302_JeffreysPriorDemo.C | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tutorials/roostats/rs302_JeffreysPriorDemo.C b/tutorials/roostats/rs302_JeffreysPriorDemo.C
-index c2f720a5f9..1c52e5dd83 100644
---- a/tutorials/roostats/rs302_JeffreysPriorDemo.C
-+++ b/tutorials/roostats/rs302_JeffreysPriorDemo.C
-@@ -49,7 +49,7 @@
- 
- using namespace RooFit;
- 
--void JeffreysPriorDemo()
-+void rs302_JeffreysPriorDemo()
- {
-    RooWorkspace w("w");
-    w.factory("Uniform::u(x[0,1])");
--- 
-2.26.2
-
diff --git a/root-doxygen-md-comments.patch b/root-doxygen-md-comments.patch
deleted file mode 100644
index c1f57e2..0000000
--- a/root-doxygen-md-comments.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 7336caccd3288a9164c82b78053e8f4f59eb1a9c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 12 Jul 2020 12:12:15 +0200
-Subject: [PATCH] Remove /** comments */ from md files
-
----
- math/genvector/doc/Genvector.md      | 7 -------
- math/genvector/doc/LorentzVector.md  | 6 +-----
- math/genvector/doc/Point3D.md        | 6 ------
- math/genvector/doc/Transformation.md | 6 ------
- math/genvector/doc/Vector3D.md       | 4 ----
- math/genvector/doc/VectorPoint2D.md  | 6 ------
- math/genvector/doc/externalUsage.md  | 6 ------
- math/mathcore/doc/MathCore.md        | 5 -----
- math/mathmore/doc/MathMore.md        | 5 -----
- math/matrix/doc/Matrix.md            | 3 ---
- math/unuran/doc/Unuran.md            | 8 ++------
- 11 files changed, 3 insertions(+), 59 deletions(-)
-
-diff --git a/math/genvector/doc/Genvector.md b/math/genvector/doc/Genvector.md
-index 12e4e47a93..50dc61b2ce 100644
---- a/math/genvector/doc/Genvector.md
-+++ b/math/genvector/doc/Genvector.md
-@@ -1,5 +1,3 @@
--/**
--
-   \page Vector  Generic Vector for 2, 3 and 4 Dimensions
- 
- 
-@@ -113,8 +111,3 @@ A more detailed description of all the GenVector classes is available in this [d
- 2.  [CLHEP Geometry package](http://www.hep.phy.cam.ac.uk/lhcb/doc/CLHEP/1.9.1.2/html/namespaceH)
- 3.  [%ROOT Physics Vector classes](http://root.cern.ch/root/html/PHYSICS_Index.html)
- 4.  [CMS Vector package](http://lcgapp.cern.ch/doxygen/SEAL/snapshot/html/dir_000007.html)
--
--* * *
--
--*/
--
-diff --git a/math/genvector/doc/LorentzVector.md b/math/genvector/doc/LorentzVector.md
-index b40ea8c69c..e01ed4a8ca 100644
---- a/math/genvector/doc/LorentzVector.md
-+++ b/math/genvector/doc/LorentzVector.md
-@@ -1,6 +1,4 @@
--// LorentzVector doxygen page
--
--/** \page LorentzVectorPage LorentzVector Classes
-+\page LorentzVectorPage LorentzVector Classes
- 
- To avoid exposing templated parameter to the users, typedefs are defined for all types of vectors based an double's and float's. To use them, one must include the header file _Math/Vector4D.h_. The following typedef's, defined in the header file _Math/Vector4Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::LorentzVector:
- 
-@@ -110,5 +108,3 @@ v.Beta();                                // return beta and gamma value
- v.Gamma()                                // (vector must be time-like otherwise result is meaningless)
- XYZVector b = v.BoostToCM()              // return boost vector which will bring the Vector in its mas frame (P=0)
- </pre>
--
--*/
-diff --git a/math/genvector/doc/Point3D.md b/math/genvector/doc/Point3D.md
-index a273b182d4..db55c68752 100644
---- a/math/genvector/doc/Point3D.md
-+++ b/math/genvector/doc/Point3D.md
-@@ -1,7 +1,3 @@
--// Point3d doxygen page
--
--/**
--
- \page Point3DPage Point3D Classes
- 
- To avoid exposing templated parameter to the users, typedefs are defined for all types of vectors based an double's and float's. To use them, one must include the header file _Math/Point3D.h_. The following typedef's, defined in the header file _Math/Point3Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::PositionVector3D:
-@@ -61,5 +57,3 @@ Exactly as for the 3D Vectors, the following operations are allowed:
- *   comparison of points
- *   scaling and division of points with a scalar
- *   dot and cross product with any type of vector
--
--*/
-diff --git a/math/genvector/doc/Transformation.md b/math/genvector/doc/Transformation.md
-index 7e66107f55..edc36778ed 100644
---- a/math/genvector/doc/Transformation.md
-+++ b/math/genvector/doc/Transformation.md
-@@ -1,7 +1,3 @@
--// Rotation and transformation doxygen page
--
--/**
--
- \page TransformPage Vector Transformations
- 
- Transformations classes are grouped in Rotations (in 3 dimensions), Lorentz transformations and Poincarre transformations, which are Translation/Rotation combinations. Each group has several members which may model physically equivalent trasformations but with different internal representations.   
-@@ -114,5 +110,3 @@ Transform3D t;  t.GetComponens(m);             // fill matrix of size 3x4 with c
- </pre>
- 
- For more detailed documentation on all methods see the reference doc for the specific transformation class.
--
--*/
-diff --git a/math/genvector/doc/Vector3D.md b/math/genvector/doc/Vector3D.md
-index 4f65f6b603..9d10ce7db2 100644
---- a/math/genvector/doc/Vector3D.md
-+++ b/math/genvector/doc/Vector3D.md
-@@ -1,5 +1,3 @@
--/**
--
-   \page Vector3DPage  Vector3D Classes
- 
- 
-@@ -120,5 +118,3 @@ Note that the multiplication between two vectors using the operator * is not sup
- 
- <pre>XYZVector u = v1.Unit();               //  return unit vector parallel to v1
- </pre>
--
--*/
-diff --git a/math/genvector/doc/VectorPoint2D.md b/math/genvector/doc/VectorPoint2D.md
-index 5c5e665088..287f3f8b73 100644
---- a/math/genvector/doc/VectorPoint2D.md
-+++ b/math/genvector/doc/VectorPoint2D.md
-@@ -1,7 +1,3 @@
--// Vector2d doxygen page
--
--/**
--
- \page Vector2DPage 2D Point and Vector Classes
- 
- Similar to the \ref Vector3DPage and \ref Point3DPage , typedefs are defined to avoid exposing templated parameter to the users, for all 2D vectors based an double's and float's. To use them, one must include the header file _Math/Vector2D.h_ or _Math/Point2D.h_. The following typedef's, defined in the header file _Math/Vector2Dfwd.h_, are available for the different instantiations of the template class ROOT::Math::DisplacementVector2D:
-@@ -19,5 +15,3 @@ The typedef's, defined in the header file _Math/Point2Dfwd.h_, available for the
- *   ROOT::Math::Polar2DPointF vector based on r,phi coordinates (polar) in float precision
- 
- Similar constructs, functions and operations available for the 3D vectors and points (see \ref Vector3DPage and \ref Point3DPage ) are available also for the 2D vector and points. No transformations or rotation classes are available for the 2D vectors.
--
--*/
-diff --git a/math/genvector/doc/externalUsage.md b/math/genvector/doc/externalUsage.md
-index f8580225a5..4413bbafca 100644
---- a/math/genvector/doc/externalUsage.md
-+++ b/math/genvector/doc/externalUsage.md
-@@ -1,7 +1,3 @@
--// example on using with exteral classes (doxygen page)
--
--/**
--
-   \page ExtUsagePage Examples with External Packages
- 
- ### Connection to Linear Algebra classes
-@@ -48,5 +44,3 @@ XYZPoint p1(hp);                            // create a 3D Point from CLHEP geom
- 
- CLHEP::HepLorentzVector  hq;
- XYZTVector    q(hq);                        // create a LorentzVector  from CLHEP L.V.</double> </pre>
--
--*/
-diff --git a/math/mathcore/doc/MathCore.md b/math/mathcore/doc/MathCore.md
-index 4efc043cab..8d38b4ae19 100644
---- a/math/mathcore/doc/MathCore.md
-+++ b/math/mathcore/doc/MathCore.md
-@@ -1,5 +1,3 @@
--/**
--
- \defgroup MathCore  MathCore
- 
- \brief The Core Mathematical Library of %ROOT. See the \ref MathCorePage "MathCore" description page.
-@@ -32,6 +30,3 @@ MathCore contains instead now classes which were originally part of _libCore_. T
- *   Other classes, such as
- 	*   TKDTree for partitioning the data using a kd-Tree and TKDTreeBinning for binning data using a kdTree
- 	*   ROOT::Math::GoFTest for goodness of fit tests
--
--
--*/
-diff --git a/math/mathmore/doc/MathMore.md b/math/mathmore/doc/MathMore.md
-index 28b3528a68..f30ef6d0be 100644
---- a/math/mathmore/doc/MathMore.md
-+++ b/math/mathmore/doc/MathMore.md
-@@ -1,6 +1,3 @@
--
--/** 
--
-   \defgroup MathMore  MathMore
- 
-     \brief The Mathematical library providing some advanced functionality and based on GSL. See the \ref MathMorePage "MathMore" Library page. 
-@@ -32,5 +29,3 @@ To build MathMore you need to have first GSL installed somewhere in your system.
- MathMore (and its %ROOT CINT dictionary) can be built within %ROOT whenever a GSL library is found in the system. Optionally the GSL library and header file location can be specified in the %ROOT configure script with _configure --with-gsl-incdir=... --with-gsl-libdir=..._
- MathMore links with the GSL static libraries. On some platform (like Linux x86-64)  GSL needs to be compiled with the option _--with-pic_.
- The source code of MathMore is distributed under the GNU General Public License
--
--*/
-diff --git a/math/matrix/doc/Matrix.md b/math/matrix/doc/Matrix.md
-index ed0d9fffe8..f0b9d7a06a 100644
---- a/math/matrix/doc/Matrix.md
-+++ b/math/matrix/doc/Matrix.md
-@@ -1,6 +1,3 @@
--/**
--
--
- \page MatrixPage The ROOT Matrix Linear Algebra classes.
- 
- 
-diff --git a/math/unuran/doc/Unuran.md b/math/unuran/doc/Unuran.md
-index d807c4e807..4c64e0d214 100644
---- a/math/unuran/doc/Unuran.md
-+++ b/math/unuran/doc/Unuran.md
-@@ -1,9 +1,7 @@
--/**
--
--Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers
--
- \defgroup Unuran Unuran
- 
-+\brief Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers.
-+
- \ingroup Math
- 
- UNU.RAN, (Universal Non Uniform Random number generator for generating non uniform pseudo-random numbers)
-@@ -120,5 +118,3 @@ TRandom pointer when constructing the TUnuran class (by default the ROOT gRandom
- 
- The (UNU.RAN documentation)[http://statistik.wu-wien.ac.at/unuran/doc/unuran.html#Top] provides a detailed
- description of all the available methods and the possible options which one can pass to UNU.RAN for the various distributions.
--*/
--
--- 
-2.26.2
-
diff --git a/root-doxygen-missing-underscore.patch b/root-doxygen-missing-underscore.patch
deleted file mode 100644
index 630d58f..0000000
--- a/root-doxygen-missing-underscore.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e6e6715a73fb8b65ee24c11ff08ca34e25db9ef1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 8 Jul 2020 19:41:10 +0200
-Subject: [PATCH 4/5] Add missing underscore
-
----
- tutorials/fit/vectorizedFit.C | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tutorials/fit/vectorizedFit.C b/tutorials/fit/vectorizedFit.C
-index d6b13e2fa7..1f6e317aa6 100644
---- a/tutorials/fit/vectorizedFit.C
-+++ b/tutorials/fit/vectorizedFit.C
-@@ -8,7 +8,7 @@
- /// TF1::SetVectorized
- ///
- /// \macro_image
--/// \macro output
-+/// \macro_output
- /// \macro_code
- ///
- /// \author Lorenzo Moneta
--- 
-2.26.2
-
diff --git a/root-doxygen-parameter-names.patch b/root-doxygen-parameter-names.patch
deleted file mode 100644
index 7cc7d2e..0000000
--- a/root-doxygen-parameter-names.patch
+++ /dev/null
@@ -1,1211 +0,0 @@
-From e65727913e435819a3fc26513d9892d179eab1f2 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 8 Jul 2020 19:32:51 +0200
-Subject: [PATCH 3/5] Adjust parameter names in doxygen markup so they match
- the code
-
-Addresses warnings:
-
-argument '<name>' of command @param is not found in the argument list
-of <function>.
----
- .../pythonizations/src/PyzPythonHelpers.cxx   |  2 +-
- bindings/r/inc/TRInterface.h                  |  4 +--
- hist/hist/src/TF1.cxx                         |  5 ++-
- hist/hist/src/TGraph.cxx                      |  6 ++--
- hist/histpainter/src/TPainter3dAlgorithms.cxx |  6 ++--
- hist/histv7/inc/ROOT/RAxis.hxx                | 11 +++----
- hist/histv7/inc/ROOT/RHist.hxx                |  2 +-
- hist/unfold/src/TUnfoldBinning.cxx            | 24 +++++++-------
- hist/unfold/src/TUnfoldBinningXML.cxx         |  2 +-
- hist/unfold/src/TUnfoldDensity.cxx            |  2 +-
- hist/unfold/src/TUnfoldSys.cxx                |  7 ++--
- io/io/inc/ROOT/TBufferMerger.hxx              |  2 +-
- math/mathcore/inc/Math/IntegratorMultiDim.h   |  2 +-
- math/minuit2/inc/Minuit2/FCNBase.h            |  4 +--
- math/minuit2/inc/Minuit2/FumiliChi2FCN.h      |  2 +-
- math/minuit2/inc/Minuit2/FumiliErrorUpdator.h |  2 +-
- .../inc/Minuit2/FumiliMaximumLikelihoodFCN.h  |  2 +-
- roofit/roofit/src/RooExponential.cxx          |  2 +-
- roofit/roofit/src/RooGExpModel.cxx            | 32 +++++++++----------
- roofit/roofit/src/RooGaussian.cxx             |  2 +-
- roofit/roofit/src/RooJohnson.cxx              |  2 +-
- roofit/roofit/src/RooLandau.cxx               |  2 +-
- roofit/roofitcore/src/BatchData.cxx           |  2 +-
- roofit/roofitcore/src/RooAbsPdf.cxx           |  4 +--
- roofit/roofitcore/src/RooAbsReal.cxx          |  2 +-
- roofit/roofitcore/src/RooCustomizer.cxx       |  4 +--
- roofit/roofitcore/src/RooDataHist.cxx         |  4 +--
- roofit/roofitcore/src/RooDataSet.cxx          | 10 +++---
- roofit/roofitcore/src/RooFormulaVar.cxx       |  2 +-
- roofit/roofitcore/src/RooSuperCategory.cxx    |  2 +-
- roofit/roofitmore/src/RooHypatia2.cxx         |  6 ++--
- tmva/tmva/inc/TMVA/BDTEventWrapper.h          |  4 +--
- tmva/tmva/inc/TMVA/NeuralNet.h                | 14 +++-----
- tmva/tmva/inc/TMVA/NeuralNet.icc              |  2 +-
- tmva/tmva/inc/TMVA/RTensor.hxx                |  2 +-
- .../inc/TMVA/TreeInference/BranchlessTree.hxx |  4 +--
- tmva/tmva/inc/TMVA/TreeInference/Forest.hxx   |  2 +-
- tmva/tmva/src/BDTEventWrapper.cxx             |  2 +-
- tmva/tmva/src/CrossValidation.cxx             |  2 +-
- tmva/tmva/src/CvSplit.cxx                     | 18 +++++------
- tmva/tmva/src/Envelope.cxx                    | 12 +++----
- tree/dataframe/inc/ROOT/RDF/RInterface.hxx    | 16 +++++-----
- tree/dataframe/inc/ROOT/RDFHelpers.hxx        |  2 +-
- tree/dataframe/inc/ROOT/RDataSource.hxx       |  8 ++---
- tree/dataframe/inc/ROOT/RResultPtr.hxx        |  2 +-
- tree/dataframe/src/RArrowDS.cxx               |  4 +--
- tree/tree/inc/TTree.h                         |  2 +-
- tree/tree/src/TIOFeatures.cxx                 | 14 ++++----
- 48 files changed, 131 insertions(+), 140 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx b/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
-index 059debcee4..c5e354f300 100644
---- a/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
-+++ b/bindings/pyroot/pythonizations/src/PyzPythonHelpers.cxx
-@@ -99,7 +99,7 @@ PyObject *PyROOT::GetDataPointer(PyObject * /*self*/, PyObject *args)
- /// \brief Get endianess of the system
- /// \param[in] self Always null, since this is a module function.
- /// \param[in] args Pointer to an empty Python tuple.
--/// \param[out] Endianess as Python string
-+/// \return Endianess as Python string
- ///
- /// This function returns endianess of the system as a Python integer. The
- /// return value is either '<' or '>' for little or big endian, respectively.
-diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h
-index bdb559bfb5..e097007429 100644
---- a/bindings/r/inc/TRInterface.h
-+++ b/bindings/r/inc/TRInterface.h
-@@ -206,7 +206,7 @@ namespace ROOT {
-          The command line arguments are by deafult argc=0 and argv=NULL,
-          The verbose mode is by default disabled but you can enable it to show procedures information in stdout/stderr         \note some time can produce so much noise in the output
-          \param argc default 0
--         \param args default null
-+         \param argv default null
-          \param loadRcpp default true
-          \param verbose default false
-          \param interactive default true
-@@ -226,7 +226,7 @@ namespace ROOT {
-          /**
-          Method to eval R code and you get the result in a reference to TRObject
-          \param code R code
--         \param ands reference to TRObject
-+         \param ans reference to TRObject
-          \return an true or false if the execution was sucessful or not.
-          */
-          Int_t Eval(const TString &code, TRObject  &ans); // parse line, returns in ans; error code rc
-diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx
-index a72b309c1e..0b7c0b5e45 100644
---- a/hist/hist/src/TF1.cxx
-+++ b/hist/hist/src/TF1.cxx
-@@ -1973,12 +1973,11 @@ Double_t TF1::GetProb() const
- ///        F(x_{\frac{1}{2}}) = \prod(x < x_{\frac{1}{2}}) = \frac{1}{2}
- /// \f]
- ///
--/// \param[in] this TF1 function
- /// \param[in] nprobSum maximum size of array q and size of array probSum
-+/// \param[out] q array filled with nq quantiles
- /// \param[in] probSum array of positions where quantiles will be computed.
- ///     It is assumed to contain at least nprobSum values.
--/// \param[out] return value nq (<=nprobSum) with the number of quantiles computed
--/// \param[out] array q filled with nq quantiles
-+/// \return value nq (<=nprobSum) with the number of quantiles computed
- ///
- ///  Getting quantiles from two histograms and storing results in a TGraph,
- ///  a so-called QQ-plot
-diff --git a/hist/hist/src/TGraph.cxx b/hist/hist/src/TGraph.cxx
-index b6e05a4a9c..614c63d697 100644
---- a/hist/hist/src/TGraph.cxx
-+++ b/hist/hist/src/TGraph.cxx
-@@ -1900,9 +1900,9 @@ Int_t TGraph::IsInside(Double_t x, Double_t y) const
- /// Least squares polynomial fitting without weights.
- ///
- /// \param [in] m     number of parameters
--/// \param [in] ma     array of parameters
--/// \param [in] mfirst 1st point number to fit (default =0)
--/// \param [in] mlast  last point number to fit (default=fNpoints-1)
-+/// \param [in] a     array of parameters
-+/// \param [in] xmin  1st point number to fit (default =0)
-+/// \param [in] xmax  last point number to fit (default=fNpoints-1)
- ///
- /// based on CERNLIB routine LSQ: Translated to C++ by Rene Brun
- 
-diff --git a/hist/histpainter/src/TPainter3dAlgorithms.cxx b/hist/histpainter/src/TPainter3dAlgorithms.cxx
-index e0dd1f28e4..a95ac36d2d 100644
---- a/hist/histpainter/src/TPainter3dAlgorithms.cxx
-+++ b/hist/histpainter/src/TPainter3dAlgorithms.cxx
-@@ -3122,8 +3122,8 @@ L500:
- /// Set light source
- ///
- /// \param[in] nl   source number: 1 off all light sources, 0 set diffused light
--/// \param[in] xl   intensity of the light source
--/// \param[in] xscr   `yscr` `zscr`  direction of the light (in respect of the screen)
-+/// \param[in] yl   intensity of the light source
-+/// \param[in] xscr, yscr, zscr  direction of the light (in respect of the screen)
- ///
- /// \param[out] irep   reply (0 - O.K, -1 error)
- 
-@@ -4074,7 +4074,7 @@ L500:
- /// \param[in] qqa   diffusion coefficient for diffused light  [0.,1.]
- /// \param[in] qqd   diffusion coefficient for direct light    [0.,1.]
- /// \param[in] qqs   diffusion coefficient for reflected light [0.,1.]
--/// \param[in] nncs   power coefficient for reflected light     (.GE.1)
-+/// \param[in] nnqs   power coefficient for reflected light     (.GE.1)
- ///
- ///    Lightness model formula: Y = YD*QA + > YLi*(QD*cosNi+QS*cosRi)
- ///
-diff --git a/hist/histv7/inc/ROOT/RAxis.hxx b/hist/histv7/inc/ROOT/RAxis.hxx
-index 0371a06f97..52ed88b9d8 100644
---- a/hist/histv7/inc/ROOT/RAxis.hxx
-+++ b/hist/histv7/inc/ROOT/RAxis.hxx
-@@ -68,7 +68,7 @@ protected:
-    /// determine the bin number taking into account how over/underflow
-    /// should be handled.
-    ///
--   /// \param[out] result status of the bin determination.
-+   /// \param[in] rawbin for which to determine the bin number.
-    /// \return Returns the bin number adjusted for potential over- and underflow
-    /// bins. Returns `kInvalidBin` if the axis cannot handle the over- / underflow.
-    ///
-@@ -390,7 +390,7 @@ protected:
-    /// Determine the inverse bin width.
-    /// \param nbinsNoOver - number of bins without unter-/overflow
-    /// \param lowOrHigh - first axis boundary
--   /// \param lighOrLow - second axis boundary
-+   /// \param highOrLow - second axis boundary
-    static double GetInvBinWidth(int nbinsNoOver, double lowOrHigh, double highOrLow)
-    {
-       return nbinsNoOver / std::fabs(highOrLow - lowOrHigh);
-@@ -413,7 +413,7 @@ public:
- 
-    /// Initialize a RAxisEquidistant.
-    /// \param[in] title - axis title used for graphics and text representation.
--   /// \param nbins - number of bins in the axis, excluding under- and overflow
-+   /// \param nbinsNoOver - number of bins in the axis, excluding under- and overflow
-    ///   bins.
-    /// \param low - the low axis range. Any coordinate below that is considered
-    ///   as underflow. The first bin's lower edge is at this value.
-@@ -427,13 +427,12 @@ public:
-    {}
- 
-    /// Initialize a RAxisEquidistant.
--   /// \param nbins - number of bins in the axis, excluding under- and overflow
-+   /// \param nbinsNoOver - number of bins in the axis, excluding under- and overflow
-    ///   bins.
-    /// \param low - the low axis range. Any coordinate below that is considered
-    ///   as underflow. The first bin's lower edge is at this value.
-    /// \param high - the high axis range. Any coordinate above that is considered
-    ///   as overflow. The last bin's higher edge is at this value.
--   /// \param canGrow - whether this axis can extend its range.
-    explicit RAxisEquidistant(int nbinsNoOver, double low, double high) noexcept
-       : RAxisEquidistant("", nbinsNoOver, low, high)
-    {}
-@@ -505,6 +504,7 @@ struct AxisConfigToType<RAxisConfig::kEquidistant> {
- class RAxisGrow: public RAxisEquidistant {
- public:
-    /// Initialize a RAxisGrow.
-+   /// \param[in] title - axis title used for graphics and text representation.
-    /// \param nbins - number of bins in the axis, excluding under- and overflow
-    ///   bins. This value is fixed over the lifetime of the object.
-    /// \param low - the initial value for the low axis range. Any coordinate
-@@ -518,7 +518,6 @@ public:
-    {}
- 
-    /// Initialize a RAxisGrow.
--   /// \param[in] title - axis title used for graphics and text representation.
-    /// \param nbins - number of bins in the axis, excluding under- and overflow
-    ///   bins. This value is fixed over the lifetime of the object.
-    /// \param low - the initial value for the low axis range. Any coordinate
-diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
-index 5567683b27..e2b7649975 100644
---- a/hist/histv7/inc/ROOT/RHist.hxx
-+++ b/hist/histv7/inc/ROOT/RHist.hxx
-@@ -219,9 +219,9 @@ struct RHistImplGen {
-    ///
-    /// Delegate to the appropriate MakeNextAxis instantiation, depending on the
-    /// axis type selected in the RAxisConfig.
-+   /// \param title - title of the derived object.
-    /// \param axes - `RAxisConfig` objects describing the axis of the resulting
-    ///   RHistImpl.
--   /// \param statConfig - the statConfig parameter to be passed to the RHistImpl
-    /// \param processedAxisArgs - the RAxisBase-derived axis objects describing the
-    ///   axes of the resulting RHistImpl. There are `IDIM` of those; in the end
-    /// (`IDIM` == `GetNDim()`), all `axes` have been converted to
-diff --git a/hist/unfold/src/TUnfoldBinning.cxx b/hist/unfold/src/TUnfoldBinning.cxx
-index 3aecbf53c2..2500230dca 100644
---- a/hist/unfold/src/TUnfoldBinning.cxx
-+++ b/hist/unfold/src/TUnfoldBinning.cxx
-@@ -205,7 +205,7 @@ Int_t TUnfoldBinning::UpdateFirstLastBin(Bool_t startWithRootNode)
- /// Create a new node without axis.
- ///
- /// \param[in] name identifier of the node
--/// \param[in] nBin number of unconnected bins (could be zero)
-+/// \param[in] nBins number of unconnected bins (could be zero)
- /// \param[in] binNames (optional) names of the bins separated by ';'
- 
- TUnfoldBinning::TUnfoldBinning
-@@ -241,7 +241,7 @@ TUnfoldBinning::TUnfoldBinning
- /// Add a new binning node as last last child of this node.
- ///
- /// \param[in] name name of the node
--/// \param[in] nBin number of extra bins
-+/// \param[in] nBins number of extra bins
- /// \param[in] binNames (optional) names of the bins separated by ';'
- ///
- /// this is a shortcut for AddBinning(new TUnfoldBinning(name,nBins,binNames))
-@@ -695,11 +695,11 @@ Int_t TUnfoldBinning::GetTH1xNumberOfBins
- ///
- /// \param[in] histogramName name of the histogram which is created
- /// \param[in] originalAxisBinning if true, try to preserve the axis binning
--/// \param[out] (default=0) binMap mapping of global bins to histogram bins.
-+/// \param[out] binMap (default=0) mapping of global bins to histogram bins.
- /// if(binMap==0), no binMap is created
--/// \param[in] (default=0) histogramTitle title of the histogram. If zero, a title
-+/// \param[in] histogramTitle (default=0) title of the histogram. If zero, a title
- /// is selected automatically
--/// \param[in] (default=0) axisSteering steer the handling of underflow/overflow
-+/// \param[in] axisSteering (default=0) steer the handling of underflow/overflow
- /// and projections
- ///
- /// returns a new histogram (TH1D, TH2D or TH3D)
-@@ -789,11 +789,11 @@ TH1 *TUnfoldBinning::CreateHistogram
- ///
- /// \param[in] histogramName name of the histogram which is created
- /// \param[in] originalAxisBinning if true, try to preserve the axis binning
--/// \param[out] (default=0) binMap mapping of global bins to histogram bins.
-+/// \param[out] binMap (default=0) mapping of global bins to histogram bins.
- /// if(binMap==0), no binMap is created
--/// \param[in] (default=0) histogramTitle title of the histogram. If zero, a title
-+/// \param[in] histogramTitle (default=0) title of the histogram. If zero, a title
- /// is selected automatically
--/// \param[in] (default=0) axisSteering steer the handling of underflow/overflow
-+/// \param[in] axisSteering (default=0) steer the handling of underflow/overflow
- /// and projections
- ///
- /// returns a new TH2D. The options are described in greater detail
-@@ -832,7 +832,7 @@ TH2D *TUnfoldBinning::CreateErrorMatrixHistogram
- /// Create a TH2D histogram capable to hold the bins of the two
- /// input binning schemes on the x and y axes, respectively.
- ///
--/// \paran[in] xAxis binning scheme for the x axis
-+/// \param[in] xAxis binning scheme for the x axis
- /// \param[in] yAxis binning scheme for the y axis
- /// \param[in] histogramName name of the histogram which is created
- /// \param[in] originalXAxisBinning preserve x-axis bin widths if possible
-@@ -1053,8 +1053,8 @@ Int_t *TUnfoldBinning::CreateEmptyBinMap(void) const {
- /// Set one entry in a bin map.
- ///
- /// \param[out] binMap to be used with TUnfoldSys::GetOutput() etc
--/// \param[in] source bin, global bin number in this binning scheme
--/// \param[in] destination bin in the output histogram
-+/// \param[in] globalBin source bin, global bin number in this binning scheme
-+/// \param[in] destBin destination bin in the output histogram
- 
- void TUnfoldBinning::SetBinMapEntry
- (Int_t *binMap,Int_t globalBin,Int_t destBin) const {
-@@ -2075,7 +2075,7 @@ Int_t TUnfoldBinning::ToGlobalBin
- /// and bin numbers on the corresponding axes.
- ///
- /// \param[in] globalBin global bin number
--/// \param[out] local bin numbers of the distribution's axes
-+/// \param[out] axisBins local bin numbers of the distribution's axes
- ///
- /// returns the distribution in which the globalBin is located
- ///  or 0 if the globalBin is outside this node and its children
-diff --git a/hist/unfold/src/TUnfoldBinningXML.cxx b/hist/unfold/src/TUnfoldBinningXML.cxx
-index 28ce408128..a1daf58215 100644
---- a/hist/unfold/src/TUnfoldBinningXML.cxx
-+++ b/hist/unfold/src/TUnfoldBinningXML.cxx
-@@ -472,7 +472,7 @@ void TUnfoldBinningXML::AddAxisXML(TXMLNode *node) {
- /// Export a binning scheme to a stream in XML format.
- ///
- /// \param[in] binning the binning scheme to export
--/// \param[out] stream to write to
-+/// \param[in] out stream to write to
- /// \param[in] writeHeader set true when writing the first binning
- /// scheme to this stream
- /// \param[in] writeFooter  set true when writing the last binning
-diff --git a/hist/unfold/src/TUnfoldDensity.cxx b/hist/unfold/src/TUnfoldDensity.cxx
-index 9b32da0961..78c7ddbf14 100644
---- a/hist/unfold/src/TUnfoldDensity.cxx
-+++ b/hist/unfold/src/TUnfoldDensity.cxx
-@@ -1311,7 +1311,7 @@ const TUnfoldBinning *TUnfoldDensity::GetOutputBinning
- /// \param[out] scanResult the scanned function wrt log(tau)
- /// \param[in] mode 1st parameter for the scan function
- /// \param[in] distribution 2nd parameter for the scan function
--/// \param[in] projectionMode 3rd parameter for the scan function
-+/// \param[in] axisSteering 3rd parameter for the scan function
- /// \param[out] lCurvePlot for monitoring, shows the L-curve
- /// \param[out] logTauXPlot for monitoring, L-curve(X) as a function of log(tau)
- /// \param[out] logTauYPlot for monitoring, L-curve(Y) as a function of log(tau)
-diff --git a/hist/unfold/src/TUnfoldSys.cxx b/hist/unfold/src/TUnfoldSys.cxx
-index 42bbc7751c..1e89445cde 100644
---- a/hist/unfold/src/TUnfoldSys.cxx
-+++ b/hist/unfold/src/TUnfoldSys.cxx
-@@ -463,7 +463,7 @@ Int_t TUnfoldSys::SetInput(const TH1 *hist_y,Double_t scaleBias,
- /// \param[in] bgr background distribution with uncorrelated errors
- /// \param[in] name identifier for this background source
- /// \param[in] scale normalisation factor applied to the background
--/// \param[in] scaleError normalisation uncertainty
-+/// \param[in] scale_error normalisation uncertainty
- ///
- /// The contribution <b>scale</b>*<b>bgr</b> is subtracted from the
- /// measurement prior to unfolding. The following contributions are
-@@ -1045,7 +1045,6 @@ Bool_t TUnfoldSys::GetDeltaSysBackgroundScale
- /// Correlated one-sigma shifts from shifting tau.
- ///
- /// \param[out] hist_delta histogram to store shifts
--/// \param[in] source  identifier of the background source
- /// \param[in] binMap (default=0) remapping of histogram bins
- ///
- /// returns true if the background source was found.
-@@ -1100,8 +1099,8 @@ void TUnfoldSys::GetEmatrixSysSource
- ////////////////////////////////////////////////////////////////////////////////
- /// Covariance contribution from background normalisation uncertainty.
- ///
--/// \param[inout] ematrix output histogram
--/// \param[in] source identifier of the background source
-+/// \param[in,out] ematrix output histogram
-+/// \param[in] name identifier of the background source
- /// \param[in] binMap (default=0) remapping of histogram bins
- /// \param[in] clearEmat (default=true) if true, clear the histogram
- /// prior to adding the covariance matrix contribution
-diff --git a/io/io/inc/ROOT/TBufferMerger.hxx b/io/io/inc/ROOT/TBufferMerger.hxx
-index 27fe36d399..5e4cfe52cb 100644
---- a/io/io/inc/ROOT/TBufferMerger.hxx
-+++ b/io/io/inc/ROOT/TBufferMerger.hxx
-@@ -43,7 +43,7 @@ public:
-    /** Constructor
-     * @param name Output file name
-     * @param option Output file creation options
--    * @param compression Output file compression level
-+    * @param compress Output file compression level
-     */
-    TBufferMerger(const char *name, Option_t *option = "RECREATE", Int_t compress = ROOT::RCompressionSetting::EDefaults::kUseCompiledDefault);
- 
-diff --git a/math/mathcore/inc/Math/IntegratorMultiDim.h b/math/mathcore/inc/Math/IntegratorMultiDim.h
-index 0d2d56396e..7b14f96d8e 100644
---- a/math/mathcore/inc/Math/IntegratorMultiDim.h
-+++ b/math/mathcore/inc/Math/IntegratorMultiDim.h
-@@ -60,7 +60,7 @@ public:
-        @param type   integration type (adaptive, MC methods, etc..)
-        @param absTol desired absolute Error
-        @param relTol desired relative Error
--       @param size maximum number of sub-intervals
-+       @param ncall  number of function calls (apply only to MC integratioon methods)
- 
-        In case no parameter  values are passed the default ones used in IntegratorMultiDimOptions are used
-     */
-diff --git a/math/minuit2/inc/Minuit2/FCNBase.h b/math/minuit2/inc/Minuit2/FCNBase.h
-index bf6c64bd9e..760df5b6f4 100644
---- a/math/minuit2/inc/Minuit2/FCNBase.h
-+++ b/math/minuit2/inc/Minuit2/FCNBase.h
-@@ -65,7 +65,7 @@ public:
-       as it searches for the Minimum or performs whatever analysis is requested by
-       the user.
- 
--      @param par function parameters as defined by the user.
-+      @param v function parameters as defined by the user.
- 
-       @return the Value of the function.
- 
-@@ -75,7 +75,7 @@ public:
- 
-    */
- 
--   virtual double operator()(const std::vector<double>& x) const = 0;
-+   virtual double operator()(const std::vector<double>& v) const = 0;
- 
- 
-    /**
-diff --git a/math/minuit2/inc/Minuit2/FumiliChi2FCN.h b/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
-index 6af985ef08..fac33baaf6 100644
---- a/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
-+++ b/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
-@@ -62,7 +62,7 @@ public:
- 
-   Sets the model function for the data (for example gaussian+linear for a peak)
- 
--  @param modelFunction a reference to the model function.
-+  @param modelFCN a reference to the model function.
- 
-   */
- 
-diff --git a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
-index 3eb5da9c36..4b620c57a8 100644
---- a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
-+++ b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
-@@ -67,7 +67,7 @@ public:
- 
-   @param fGradientCalculator the Gradient calculator used to retrieved the Parameter transformation
- 
--  @param fFumiliFCNBase the function calculating the figure of merit.
-+  @param lambda the Marquard lambda factor
- 
- 
-   \todo Some nice latex mathematical formuli...
-diff --git a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
-index c6725ae350..1661bee94a 100644
---- a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
-+++ b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
-@@ -61,7 +61,7 @@ public:
- 
-   Sets the model function for the data (for example gaussian+linear for a peak)
- 
--  @param modelFunction a reference to the model function.
-+  @param modelFCN a reference to the model function.
- 
-   */
- 
-diff --git a/roofit/roofit/src/RooExponential.cxx b/roofit/roofit/src/RooExponential.cxx
-index dc211f5275..e16871c5eb 100644
---- a/roofit/roofit/src/RooExponential.cxx
-+++ b/roofit/roofit/src/RooExponential.cxx
-@@ -102,7 +102,7 @@ void compute(size_t n, double* __restrict output, Tx x, Tc c) {
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Evaluate the exponential without normalising it on the given batch.
--/// \param[in] batchIndex Index of the batch to be computed.
-+/// \param[in] begin Index of the batch to be computed.
- /// \param[in] batchSize Size of each batch. The last batch may be smaller.
- /// \return A span with the computed values.
- 
-diff --git a/roofit/roofit/src/RooGExpModel.cxx b/roofit/roofit/src/RooGExpModel.cxx
-index 9c7f184b69..18f5688217 100644
---- a/roofit/roofit/src/RooGExpModel.cxx
-+++ b/roofit/roofit/src/RooGExpModel.cxx
-@@ -48,10 +48,10 @@ ClassImp(RooGExpModel);
- ///
- /// \param[in] name Name of this instance.
- /// \param[in] title Title (e.g. for plotting)
--/// \param[in] x The convolution observable.
--/// \param[in] mean The mean of the Gaussian.
--/// \param[in] sigma Width of the Gaussian.
--/// \param[in] rlife Lifetime constant \f$ \tau \f$.
-+/// \param[in] xIn The convolution observable.
-+/// \param[in] meanIn The mean of the Gaussian.
-+/// \param[in] sigmaIn Width of the Gaussian.
-+/// \param[in] rlifeIn Lifetime constant \f$ \tau \f$.
- /// \param[in] meanSF  Scale factor for mean.
- /// \param[in] sigmaSF Scale factor for sigma.
- /// \param[in] rlifeSF Scale factor for rlife.
-@@ -81,9 +81,9 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
- ///
- /// \param[in] name Name of this instance.
- /// \param[in] title Title (e.g. for plotting)
--/// \param[in] x The convolution observable.
--/// \param[in] sigma Width of the Gaussian.
--/// \param[in] rlife Lifetime constant \f$ \tau \f$.
-+/// \param[in] xIn The convolution observable.
-+/// \param[in] _sigma Width of the Gaussian.
-+/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
- /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
- /// \param[in] type  Switch between normal and flipped model.
- RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
-@@ -105,10 +105,10 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
- ///
- /// \param[in] name Name of this instance.
- /// \param[in] title Title (e.g. for plotting)
--/// \param[in] x The convolution observable.
--/// \param[in] sigma Width of the Gaussian.
--/// \param[in] rlife Lifetime constant \f$ \tau \f$.
--/// \param[in] srSF Scale factor for both sigma and tau.
-+/// \param[in] xIn The convolution observable.
-+/// \param[in] _sigma Width of the Gaussian.
-+/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
-+/// \param[in] _rsSF Scale factor for both sigma and tau.
- /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
- /// \param[in] type  Switch between normal and flipped model.
- RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
-@@ -134,11 +134,11 @@ RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue
- ///
- /// \param[in] name Name of this instance.
- /// \param[in] title Title (e.g. for plotting)
--/// \param[in] x The convolution observable.
--/// \param[in] sigma Width of the Gaussian.
--/// \param[in] rlife Lifetime constant \f$ \tau \f$.
--/// \param[in] sigmaSF Scale factor for sigma.
--/// \param[in] rlifeSF Scale factor for rlife.
-+/// \param[in] xIn The convolution observable.
-+/// \param[in] _sigma Width of the Gaussian.
-+/// \param[in] _rlife Lifetime constant \f$ \tau \f$.
-+/// \param[in] _sigmaSF Scale factor for sigma.
-+/// \param[in] _rlifeSF Scale factor for rlife.
- /// \param[in] nlo   Include next-to-leading order for higher accuracy of convolution.
- /// \param[in] type  Switch between normal and flipped model.
- RooGExpModel::RooGExpModel(const char *name, const char *title, RooAbsRealLValue& xIn,
-diff --git a/roofit/roofit/src/RooGaussian.cxx b/roofit/roofit/src/RooGaussian.cxx
-index 9d18be7354..aec93528ba 100644
---- a/roofit/roofit/src/RooGaussian.cxx
-+++ b/roofit/roofit/src/RooGaussian.cxx
-@@ -92,7 +92,7 @@ void compute(RooSpan<double> output, Tx x, TMean mean, TSig sigma) {
- /// and if found, the computation will be batched over their
- /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
- /// be constant over the batch.
--/// \param[in] batchIndex Index of the batch to be computed.
-+/// \param[in] begin Index of the batch to be computed.
- /// \param[in] batchSize Size of each batch. The last batch may be smaller.
- /// \return A span with the computed values.
- 
-diff --git a/roofit/roofit/src/RooJohnson.cxx b/roofit/roofit/src/RooJohnson.cxx
-index ba6686f698..1dd6de96b2 100644
---- a/roofit/roofit/src/RooJohnson.cxx
-+++ b/roofit/roofit/src/RooJohnson.cxx
-@@ -153,7 +153,7 @@ void compute(RooSpan<double> output, TMass mass, TMu mu, TLambda lambda, TGamma
- /// and if found, the computation will be batched over their
- /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
- /// be constant over the batch.
--/// \param[in] batchIndex Index of the batch to be computed.
-+/// \param[in] begin Index of the batch to be computed.
- /// \param[in] maxSize Maximal size of the batches. May return smaller batches depending on inputs.
- /// \return A span with the computed values.
- 
-diff --git a/roofit/roofit/src/RooLandau.cxx b/roofit/roofit/src/RooLandau.cxx
-index e59a923cf0..2dade45b3a 100644
---- a/roofit/roofit/src/RooLandau.cxx
-+++ b/roofit/roofit/src/RooLandau.cxx
-@@ -169,7 +169,7 @@ void compute(	size_t batchSize,
- /// and if found, the computation will be batched over their
- /// values. If batch data are not found for one of the proxies, the proxies value is assumed to
- /// be constant over the batch.
--/// \param[in] batchIndex Index of the batch to be computed.
-+/// \param[in] begin Index of the batch to be computed.
- /// \param[in] batchSize Size of each batch. The last batch may be smaller.
- /// \return A span with the computed values.
- 
-diff --git a/roofit/roofitcore/src/BatchData.cxx b/roofit/roofitcore/src/BatchData.cxx
-index fd05343076..5bbe34e20b 100644
---- a/roofit/roofitcore/src/BatchData.cxx
-+++ b/roofit/roofitcore/src/BatchData.cxx
-@@ -73,7 +73,7 @@ bool BatchData::setStatus(std::size_t begin, std::size_t size, Status_t stat,
- /// Retrieve an existing batch.
- ///
- /// \param[in] begin Begin index of the batch.
--/// \param[in] size  Requested size. Batch may come out smaller than this.
-+/// \param[in] maxSize  Requested size. Batch may come out smaller than this.
- /// \param[in] normSet Optional normSet pointer to distinguish differently normalised computations.
- /// \param[in] ownerTag Optional owner tag. This avoids reusing batch memory for e.g. getVal() and getLogVal().
- /// \return Non-mutable contiguous batch data.
-diff --git a/roofit/roofitcore/src/RooAbsPdf.cxx b/roofit/roofitcore/src/RooAbsPdf.cxx
-index 9f68b1cdb7..9e7eb69e09 100644
---- a/roofit/roofitcore/src/RooAbsPdf.cxx
-+++ b/roofit/roofitcore/src/RooAbsPdf.cxx
-@@ -711,7 +711,7 @@ bool checkInfNaNNeg(const T& inputs) {
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Scan through outputs and fix+log all nans and negative values.
--/// \param[in/out] outputs Array to be scanned & fixed.
-+/// \param[in,out] outputs Array to be scanned & fixed.
- /// \param[in] begin Begin of event range. Only needed to print the correct event number
- /// where the error occurred.
- void RooAbsPdf::logBatchComputationErrors(RooSpan<const double>& outputs, std::size_t begin) const {
-@@ -734,7 +734,7 @@ void RooAbsPdf::logBatchComputationErrors(RooSpan<const double>& outputs, std::s
- /// Compute the log-likelihoods for all events in the requested batch.
- /// The arguments are passed over to getValBatch().
- /// \param[in] begin Start of the batch.
--/// \param[in] size  Maximum size of the batch. Depending on data layout and memory, the batch
-+/// \param[in] maxSize  Maximum size of the batch. Depending on data layout and memory, the batch
- /// may come back smaller.
- /// \return    Returns a batch of doubles that contains the log probabilities.
- RooSpan<const double> RooAbsPdf::getLogValBatch(std::size_t begin, std::size_t maxSize,
-diff --git a/roofit/roofitcore/src/RooAbsReal.cxx b/roofit/roofitcore/src/RooAbsReal.cxx
-index 2d2ceeaf2d..6cac5f5897 100644
---- a/roofit/roofitcore/src/RooAbsReal.cxx
-+++ b/roofit/roofitcore/src/RooAbsReal.cxx
-@@ -4294,7 +4294,7 @@ RooAbsMoment* RooAbsReal::moment(RooRealVar& obs, Int_t order, Bool_t central, B
- /// \param[in] order Order of the moment
- /// \param[in] central If true, the central moment is given by \f$ \langle (x- \langle x \rangle )^2 \rangle \f$
- /// \param[in] takeRoot Calculate the square root
--/// \param[in] intNormOb If true, the moment of the function integrated over all normalization observables is returned.
-+/// \param[in] intNormObs If true, the moment of the function integrated over all normalization observables is returned.
- 
- RooAbsMoment* RooAbsReal::moment(RooRealVar& obs, const RooArgSet& normObs, Int_t order, Bool_t central, Bool_t takeRoot, Bool_t intNormObs)
- {
-diff --git a/roofit/roofitcore/src/RooCustomizer.cxx b/roofit/roofitcore/src/RooCustomizer.cxx
-index 97d6d3176c..818991873d 100644
---- a/roofit/roofitcore/src/RooCustomizer.cxx
-+++ b/roofit/roofitcore/src/RooCustomizer.cxx
-@@ -198,7 +198,7 @@ static Int_t init()
- /// replaceArg() and splitArg() functionality.
- /// \param[in] pdf Proto PDF to be customised.
- /// \param[in] masterCat Category to be used for splitting.
--/// \param[in/out] splitLeafs All nodes created in
-+/// \param[in,out] splitLeafs All nodes created in
- /// the customisation process are added to this set.
- /// The user can provide nodes that are *taken*
- /// from the set if they have a name that matches `<parameterNameToBeReplaced>_<category>`.
-@@ -209,7 +209,7 @@ static Int_t init()
- ///  auto yield1 = new RooFormulaVar("yieldSig_BBG1m2T","sigy1","M/3.360779",mass);
- ///  customisedLeafs.addOwned(*yield1);
- /// ```
--/// \param[in/out] splitLeafsAll All leafs that are used when customising are collected here.
-+/// \param[in,out] splitLeafsAll All leafs that are used when customising are collected here.
- /// If this set already contains leaves, they will be used for customising if the names match
- /// as above.
- /// 
-diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
-index 1c8b517b0d..8c90dd0ade 100644
---- a/roofit/roofitcore/src/RooDataHist.cxx
-+++ b/roofit/roofitcore/src/RooDataHist.cxx
-@@ -632,8 +632,8 @@ void RooDataHist::_adjustBinning(RooRealVar &theirVar, const TAxis &axis,
- /// observable to binning in given reference TH1. Used by constructors
- /// that import data from an external TH1.
- /// Both the variables in vars and in this RooDataHist are adjusted.
--/// @param List with variables that are supposed to have their binning adjusted.
--/// @param Reference histogram that dictates the binning
-+/// @param vars List with variables that are supposed to have their binning adjusted.
-+/// @param href Reference histogram that dictates the binning
- /// @param offset If not nullptr, a possible bin count offset for the axes x,y,z is saved here as Int_t[3]
- 
- void RooDataHist::adjustBinning(const RooArgList& vars, const TH1& href, Int_t* offset)
-diff --git a/roofit/roofitcore/src/RooDataSet.cxx b/roofit/roofitcore/src/RooDataSet.cxx
-index 1e54dfbde0..f03ec78a0d 100644
---- a/roofit/roofitcore/src/RooDataSet.cxx
-+++ b/roofit/roofitcore/src/RooDataSet.cxx
-@@ -765,7 +765,7 @@ RooDataSet::RooDataSet(const char *name, const char *title, TTree *theTree,
- ///
- /// \param[in] name Name of this dataset.
- /// \param[in] title Title for e.g. plotting.
--/// \param[in] tree Tree to be imported.
-+/// \param[in] theTree Tree to be imported.
- /// \param[in] vars Defines the columns of the data set. For each dimension
- /// specified, the TTree must have a branch with the same name. For category
- /// branches, this branch should contain the numeric index value. Real dimensions
-@@ -1205,11 +1205,11 @@ void RooDataSet::add(const RooArgSet& data, Double_t wgt, Double_t wgtError)
- ////////////////////////////////////////////////////////////////////////////////
- /// Add a data point, with its coordinates specified in the 'data' argset, to the data set. 
- /// Any variables present in 'data' but not in the dataset will be silently ignored.
--/// \param[in] data Data point.
--/// \param[in] wgt Event weight. The current value of the weight variable is ignored.
-+/// \param[in] indata Data point.
-+/// \param[in] inweight Event weight. The current value of the weight variable is ignored.
- /// \note To obtain weighted events, a variable must be designated `WeightVar` in the constructor.
--/// \param[in] wgtErrorLo Asymmetric weight error.
--/// \param[in] wgtErrorHi Asymmetric weight error.
-+/// \param[in] weightErrorLo Asymmetric weight error.
-+/// \param[in] weightErrorHi Asymmetric weight error.
- /// \note This requires including the weight variable in the set of `StoreAsymError` variables when constructing
- /// the dataset.
- 
-diff --git a/roofit/roofitcore/src/RooFormulaVar.cxx b/roofit/roofitcore/src/RooFormulaVar.cxx
-index 90ee32d619..947c505598 100644
---- a/roofit/roofitcore/src/RooFormulaVar.cxx
-+++ b/roofit/roofitcore/src/RooFormulaVar.cxx
-@@ -66,7 +66,7 @@ ClassImp(RooFormulaVar);
- /// Constructor with formula expression and list of input variables.
- /// \param[in] name Name of the formula.
- /// \param[in] title Title of the formula.
--/// \param[in] formula Expression to be evaluated.
-+/// \param[in] inFormula Expression to be evaluated.
- /// \param[in] dependents Variables that should be passed to the formula.
- /// \param[in] checkVariables Check that all variables from `dependents` are used in the expression.
- RooFormulaVar::RooFormulaVar(const char *name, const char *title, const char* inFormula, const RooArgList& dependents,
-diff --git a/roofit/roofitcore/src/RooSuperCategory.cxx b/roofit/roofitcore/src/RooSuperCategory.cxx
-index 4c0b705e50..e5668ffb98 100644
---- a/roofit/roofitcore/src/RooSuperCategory.cxx
-+++ b/roofit/roofitcore/src/RooSuperCategory.cxx
-@@ -54,7 +54,7 @@ RooSuperCategory::RooSuperCategory() :
- /// Construct a super category from other categories.
- /// \param[in] name Name of this object
- /// \param[in] title Title (for e.g. printing)
--/// \param[in] inputCatList RooArgSet with category objects. These all need to derive from RooAbsCategoryLValue, *i.e.*
-+/// \param[in] inputCategories RooArgSet with category objects. These all need to derive from RooAbsCategoryLValue, *i.e.*
- /// one needs to be able to assign to them.
- RooSuperCategory::RooSuperCategory(const char *name, const char *title, const RooArgSet& inputCategories) :
-   RooAbsCategoryLValue(name, title),
-diff --git a/roofit/roofitmore/src/RooHypatia2.cxx b/roofit/roofitmore/src/RooHypatia2.cxx
-index 691aa6073d..7d550b2753 100644
---- a/roofit/roofitmore/src/RooHypatia2.cxx
-+++ b/roofit/roofitmore/src/RooHypatia2.cxx
-@@ -119,21 +119,21 @@
- /// \param[in] a2 Start of right tail.
- /// \param[in] n2 Shape parameter of right tail (\f$ n2 \ge 0 \f$). With \f$ n2 = 0 \f$, the function is constant.
- RooHypatia2::RooHypatia2(const char *name, const char *title, RooAbsReal& x, RooAbsReal& lambda,
--    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigm, RooAbsReal& mu, RooAbsReal& a,
-+    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigma, RooAbsReal& mu, RooAbsReal& a,
-     RooAbsReal& n, RooAbsReal& a2, RooAbsReal& n2) :
-                 RooAbsPdf(name, title),
-                 _x("x", "x", this, x),
-                 _lambda("lambda", "Lambda", this, lambda),
-                 _zeta("zeta", "zeta", this, zeta),
-                 _beta("beta", "Asymmetry parameter beta", this, beta),
--                _sigma("sigma", "Width parameter sigma", this, sigm),
-+                _sigma("sigma", "Width parameter sigma", this, sigma),
-                 _mu("mu", "Location parameter mu", this, mu),
-                 _a("a", "Left tail location a", this, a),
-                 _n("n", "Left tail parameter n", this, n),
-                 _a2("a2", "Right tail location a2", this, a2),
-                 _n2("n2", "Right tail parameter n2", this, n2)
- {
--  RooHelpers::checkRangeOfParameters(this, {&sigm}, 0.);
-+  RooHelpers::checkRangeOfParameters(this, {&sigma}, 0.);
-   RooHelpers::checkRangeOfParameters(this, {&zeta, &n, &n2, &a, &a2}, 0., std::numeric_limits<double>::max(), true);
-   if (zeta.getVal() == 0. && zeta.isConstant()) {
-     RooHelpers::checkRangeOfParameters(this, {&lambda}, -std::numeric_limits<double>::max(), 0., false,
-diff --git a/tmva/tmva/inc/TMVA/BDTEventWrapper.h b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
-index 7d4c4f8dd6..2c99341dd9 100644
---- a/tmva/tmva/inc/TMVA/BDTEventWrapper.h
-+++ b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
-@@ -40,14 +40,14 @@ namespace TMVA {
- 
-       // Set the accumulated weight, for sorted signal/background events
-       /**
--       * @param fType - true for signal, false for background
-+       * @param type - true for signal, false for background
-        * @param weight - the total weight
-        */
-       void SetCumulativeWeight( Bool_t type, Double_t weight );
- 
-       // Get the accumulated weight
-       /**
--       * @param fType - true for signal, false for background
-+       * @param type - true for signal, false for background
-        * @return the cumulative weight for sorted signal/background events
-        */
-       Double_t GetCumulativeWeight( Bool_t type ) const;
-diff --git a/tmva/tmva/inc/TMVA/NeuralNet.h b/tmva/tmva/inc/TMVA/NeuralNet.h
-index bae98a48b2..a11b543b59 100644
---- a/tmva/tmva/inc/TMVA/NeuralNet.h
-+++ b/tmva/tmva/inc/TMVA/NeuralNet.h
-@@ -478,10 +478,8 @@ namespace TMVA
-           * \param size size of the layer
-           * \param itWeightBegin indicates the start of the weights for this layer on the weight vector
-           * \param itGradientBegin indicates the start of the gradients for this layer on the gradient vector
--          * \param itFunctionBegin indicates the start of the vector of activation functions for this layer on the 
--          *                        activation function vector
--          * \param itInverseFunctionBegin indicates the start of the vector of activation functions for this 
--          *                               layer on the activation function vector
-+          * \param activationFunction indicates activation functions for this layer
-+          * \param inverseActivationFunction indicates the inverse activation functions for this layer
-           * \param eModeOutput indicates a potential tranformation of the output values before further computation
-           *                    DIRECT does not further transformation; SIGMOID applies a sigmoid transformation to each
-           *                    output value (to create a probability); SOFTMAX applies a softmax transformation to all 
-@@ -500,8 +498,7 @@ namespace TMVA
-           * 
-           * \param size size of the layer
-           * \param itWeightBegin indicates the start of the weights for this layer on the weight vector
--          * \param itFunctionBegin indicates the start of the vector of activation functions for this layer on the 
--          *                        activation function vector
-+          * \param activationFunction indicates the activation function for this layer
-           * \param eModeOutput indicates a potential tranformation of the output values before further computation
-           *                    DIRECT does not further transformation; SIGMOID applies a sigmoid transformation to each
-           *                    output value (to create a probability); SOFTMAX applies a softmax transformation to all 
-@@ -679,9 +676,6 @@ namespace TMVA
-          /*! \brief c'tor for defining a Layer
-           *
-           * 
--          * \param itInputBegin indicates the start of the input node vector
--          * \param itInputEnd indicates the end of the input node vector
--          *
-           */
-          Layer (size_t numNodes, EnumFunction activationFunction, ModeOutputValues eModeOutputValues = ModeOutputValues::DIRECT);
- 
-@@ -1141,7 +1135,7 @@ namespace TMVA
-     
-          /*! \brief executes one training cycle
-           *
--          * \param minimizier the minimizer to be used
-+          * \param minimizer the minimizer to be used
-           * \param weights the weight vector to be used
-           * \param itPatternBegin the pattern to be trained with
-           * \param itPatternEnd the pattern to be trainied with
-diff --git a/tmva/tmva/inc/TMVA/NeuralNet.icc b/tmva/tmva/inc/TMVA/NeuralNet.icc
-index 95cad21e26..e511e49d43 100644
---- a/tmva/tmva/inc/TMVA/NeuralNet.icc
-+++ b/tmva/tmva/inc/TMVA/NeuralNet.icc
-@@ -933,7 +933,7 @@ template <typename LAYERDATA>
-  * \param minimizer the minimizer to be used (e.g. SGD)
-  * \param weights the weight container with all the synapse weights
-  * \param itPatternBegin begin of the pattern container
-- * \parama itPatternEnd the end of the pattern container
-+ * \param itPatternEnd the end of the pattern container
-  * \param settings the settings for this training (e.g. multithreading or not, regularization, etc.)
-  * \param dropContainer the data for dropping-out nodes (regularization technique)
-  */
-diff --git a/tmva/tmva/inc/TMVA/RTensor.hxx b/tmva/tmva/inc/TMVA/RTensor.hxx
-index c131384ae2..7d9773b457 100644
---- a/tmva/tmva/inc/TMVA/RTensor.hxx
-+++ b/tmva/tmva/inc/TMVA/RTensor.hxx
-@@ -73,7 +73,7 @@ inline std::vector<std::size_t> ComputeStridesFromShape(const T &shape, MemoryLa
- }
- 
- /// \brief Compute indices from global index
--/// \param[in] Shape vector
-+/// \param[in] shape Shape vector
- /// \param[in] idx Global index
- /// \param[in] layout Memory layout
- /// \return Indice vector
-diff --git a/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx b/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
-index 4ac460be64..a1c6fdf773 100644
---- a/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
-+++ b/tmva/tmva/inc/TMVA/TreeInference/BranchlessTree.hxx
-@@ -72,7 +72,7 @@ struct BranchlessTree {
- /// Perform inference on a single input vector
- /// \param[in] input Pointer to data containing the input values
- /// \param[in] stride Stride to go from one input variable to the next one
--/// \param[out] Tree score, result of the inference
-+/// \return Tree score, result of the inference
- template <typename T>
- inline T BranchlessTree<T>::Inference(const T *input, const int stride)
- {
-@@ -105,7 +105,7 @@ inline void BranchlessTree<T>::FillSparse()
- ///
- /// \param[in] funcName Name of the function
- /// \param[in] typeName Name of the type used for the computation
--/// \param[out] Code of the inference function as string
-+/// \return Code of the inference function as string
- template <typename T>
- inline std::string BranchlessTree<T>::GetInferenceCode(const std::string& funcName, const std::string& typeName)
- {
-diff --git a/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx b/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
-index 70d1e3eb68..18b385a8e0 100644
---- a/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
-+++ b/tmva/tmva/inc/TMVA/TreeInference/Forest.hxx
-@@ -195,7 +195,7 @@ struct BranchlessJittedForest : public ForestBase<T, std::function<void (const T
- /// \param[in] filename Filename of the ROOT file
- /// \param[in] output Load trees corresponding to the given output node of the forest
- /// \param[in] sortTrees Flag to indicate sorting the input trees by the cut value of the first node of each tree
--/// \param[out] Return jitted code as string
-+/// \return Return jitted code as string
- template <typename T>
- inline std::string
- BranchlessJittedForest<T>::Load(const std::string &key, const std::string &filename, const int output, const bool sortTrees)
-diff --git a/tmva/tmva/src/BDTEventWrapper.cxx b/tmva/tmva/src/BDTEventWrapper.cxx
-index 63171c886b..9702660936 100644
---- a/tmva/tmva/src/BDTEventWrapper.cxx
-+++ b/tmva/tmva/src/BDTEventWrapper.cxx
-@@ -48,7 +48,7 @@ BDTEventWrapper::~BDTEventWrapper() {
- ////////////////////////////////////////////////////////////////////////////////
- /// Set the accumulated weight, for sorted signal/background events
- ///
--/// @param fType - true for signal, false for background
-+/// @param type - true for signal, false for background
- /// @param weight - the total weight
- 
- void BDTEventWrapper::SetCumulativeWeight(Bool_t type, Double_t weight) {
-diff --git a/tmva/tmva/src/CrossValidation.cxx b/tmva/tmva/src/CrossValidation.cxx
-index 453927c5b7..58bd9130d1 100644
---- a/tmva/tmva/src/CrossValidation.cxx
-+++ b/tmva/tmva/src/CrossValidation.cxx
-@@ -99,7 +99,7 @@ TMultiGraph *TMVA::CrossValidationResult::GetROCCurves(Bool_t /*fLegend*/)
- ///
- /// \note You own the returned pointer.
- ///
--/// \param numSamples[in] Number of samples used for generating the average ROC
-+/// \param[in] numSamples Number of samples used for generating the average ROC
- ///                       Curve. Avg. curve will be evaluated only at these
- ///                       points (using interpolation if necessary).
- ///
-diff --git a/tmva/tmva/src/CvSplit.cxx b/tmva/tmva/src/CvSplit.cxx
-index d6d44ac1cc..9eedcf3d72 100644
---- a/tmva/tmva/src/CvSplit.cxx
-+++ b/tmva/tmva/src/CvSplit.cxx
-@@ -227,15 +227,15 @@ UInt_t TMVA::CvSplitKFoldsExpr::GetSpectatorIndexForName(DataSetInfo &dsi, TStri
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// \brief Splits a dataset into k folds, ready for use in cross validation.
--/// \param numFolds[in] Number of folds to split data into
--/// \param stratified[in] If true, use stratified splitting, balancing the
-+/// \param[in] numFolds Number of folds to split data into
-+/// \param[in] stratified If true, use stratified splitting, balancing the
- ///                       number of events across classes and folds. If false,
- ///                       no such balancing is done. For
--/// \param splitExpr[in] Expression used to split data into folds. If `""` a
-+/// \param[in] splitExpr Expression used to split data into folds. If `""` a
- ///                      random assignment will be done. Otherwise the
- ///                      expression is fed into a TFormula and evaluated per
- ///                      event. The resulting value is the the fold assignment.
--/// \param seed[in] Used only when using random splitting (i.e. when
-+/// \param[in] seed Used only when using random splitting (i.e. when
- ///                 `splitExpr` is `""`). Seed is used to initialise the random
- ///                 number generator when assigning events to folds.
- ///
-@@ -282,9 +282,9 @@ void TMVA::CvSplitKFolds::MakeKFoldDataSet(DataSetInfo &dsi)
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// \brief Generates a vector of fold assignments
--/// \param nEntires[in] Number of events in range
--/// \param numFolds[in] Number of folds to split data into
--/// \param seed[in] Random seed
-+/// \param[in] nEntries Number of events in range
-+/// \param[in] numFolds Number of folds to split data into
-+/// \param[in] seed Random seed
- ///
- /// Randomly assigns events to `numFolds` folds. Each fold will hold at most
- /// `nEntries / numFolds + 1` events.
-@@ -311,8 +311,8 @@ std::vector<UInt_t> TMVA::CvSplitKFolds::GetEventIndexToFoldMapping(UInt_t nEntr
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// \brief Split sets for into k-folds
--/// \param oldSet[in] Original, unsplit, events
--/// \param numFolds[in] Number of folds to split data into
-+/// \param[in] oldSet Original, unsplit, events
-+/// \param[in] numFolds Number of folds to split data into
- ///
- 
- std::vector<std::vector<TMVA::Event *>>
-diff --git a/tmva/tmva/src/Envelope.cxx b/tmva/tmva/src/Envelope.cxx
-index 5fab98c13b..8a0c6b23f4 100644
---- a/tmva/tmva/src/Envelope.cxx
-+++ b/tmva/tmva/src/Envelope.cxx
-@@ -37,8 +37,8 @@ this is a generic one protected.
- \param file optional file to save the results.
- \param options extra options for the algorithm.
- */
--Envelope::Envelope(const TString &name, DataLoader *dalaloader, TFile *file, const TString options)
--   : Configurable(options), fDataLoader(dalaloader), fFile(file), fModelPersistence(kTRUE), fVerbose(kFALSE),
-+Envelope::Envelope(const TString &name, DataLoader *dataloader, TFile *file, const TString options)
-+   : Configurable(options), fDataLoader(dataloader), fFile(file), fModelPersistence(kTRUE), fVerbose(kFALSE),
-      fTransformations("I"), fSilentFile(kFALSE), fJobs(1)
- {
-     SetName(name.Data());
-@@ -120,7 +120,7 @@ DataLoader *Envelope::GetDataLoader(){    return fDataLoader.get();}
- //_______________________________________________________________________
- /**
- Method to set the pointer to TMVA::DataLoader object.
--\param dalaloader pointer to TMVA::DataLoader object.
-+\param dataloader pointer to TMVA::DataLoader object.
- */
- 
- void Envelope::SetDataLoader(DataLoader *dataloader)
-@@ -146,7 +146,7 @@ void TMVA::Envelope::SetModelPersistence(Bool_t status){fModelPersistence=status
- /**
- Method to book the machine learning method to perform the algorithm.
- \param method enum TMVA::Types::EMVA with the type of the mva method
--\param methodtitle String with the method title.
-+\param methodTitle String with the method title.
- \param options String with the options for the method.
- */
- void TMVA::Envelope::BookMethod(Types::EMVA method, TString methodTitle, TString options){
-@@ -156,8 +156,8 @@ void TMVA::Envelope::BookMethod(Types::EMVA method, TString methodTitle, TString
- //_______________________________________________________________________
- /**
- Method to book the machine learning method to perform the algorithm.
--\param methodname String with the name of the mva method
--\param methodtitle String with the method title.
-+\param methodName String with the name of the mva method
-+\param methodTitle String with the method title.
- \param options String with the options for the method.
- */
- void TMVA::Envelope::BookMethod(TString methodName, TString methodTitle, TString options){
-diff --git a/tree/dataframe/inc/ROOT/RDF/RInterface.hxx b/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
-index b5e39251a8..da09c0be3c 100644
---- a/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
-+++ b/tree/dataframe/inc/ROOT/RDF/RInterface.hxx
-@@ -568,7 +568,7 @@ public:
-    ////////////////////////////////////////////////////////////////////////////
-    /// \brief Save selected columns in memory
-    /// \tparam ColumnTypes variadic list of branch/column types.
--   /// \param[in] columns to be cached in memory.
-+   /// \param[in] columnList columns to be cached in memory.
-    /// \return a `RDataFrame` that wraps the cached dataset.
-    ///
-    /// This action returns a new `RDataFrame` object, completely detached from
-@@ -603,7 +603,7 @@ public:
- 
-    ////////////////////////////////////////////////////////////////////////////
-    /// \brief Save selected columns in memory
--   /// \param[in] columns to be cached in memory
-+   /// \param[in] columnList columns to be cached in memory
-    /// \return a `RDataFrame` that wraps the cached dataset.
-    ///
-    /// See the previous overloads for more information.
-@@ -660,7 +660,7 @@ public:
- 
-    ////////////////////////////////////////////////////////////////////////////
-    /// \brief Save selected columns in memory
--   /// \param[in] columns to be cached in memory.
-+   /// \param[in] columnList columns to be cached in memory.
-    /// \return a `RDataFrame` that wraps the cached dataset.
-    ///
-    /// See the previous overloads for more information.
-@@ -1528,13 +1528,13 @@ public:
-    /// ~~~
-    ///
-    template <typename T>
--   RResultPtr<T> Fill(T &&model, const ColumnNames_t &bl)
-+   RResultPtr<T> Fill(T &&model, const ColumnNames_t &columnList)
-    {
-       auto h = std::make_shared<T>(std::forward<T>(model));
-       if (!RDFInternal::HistoUtils<T>::HasAxisLimits(*h)) {
-          throw std::runtime_error("The absence of axes limits is not supported yet.");
-       }
--      return CreateAction<RDFInternal::ActionTags::Fill, RDFDetail::RInferredType>(bl, h, bl.size());
-+      return CreateAction<RDFInternal::ActionTags::Fill, RDFDetail::RInferredType>(columnList, h, columnList.size());
-    }
- 
-    ////////////////////////////////////////////////////////////////////////////
-@@ -2134,7 +2134,7 @@ public:
-    /// \brief Provides a representation of the columns in the dataset
-    /// \tparam ColumnTypes variadic list of branch/column types.
-    /// \param[in] columnList Names of the columns to be displayed.
--   /// \param[in] rows Number of events for each column to be displayed.
-+   /// \param[in] nRows Number of events for each column to be displayed.
-    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
-    ///
-    /// This function returns a `RResultPtr<RDisplay>` containing all the entries to be displayed, organized in a tabular
-@@ -2165,7 +2165,7 @@ public:
-    ////////////////////////////////////////////////////////////////////////////
-    /// \brief Provides a representation of the columns in the dataset
-    /// \param[in] columnList Names of the columns to be displayed.
--   /// \param[in] rows Number of events for each column to be displayed.
-+   /// \param[in] nRows Number of events for each column to be displayed.
-    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
-    ///
-    /// This overload automatically infers the column types.
-@@ -2181,7 +2181,7 @@ public:
-    ////////////////////////////////////////////////////////////////////////////
-    /// \brief Provides a representation of the columns in the dataset
-    /// \param[in] columnNameRegexp A regular expression to select the columns.
--   /// \param[in] rows Number of events for each column to be displayed.
-+   /// \param[in] nRows Number of events for each column to be displayed.
-    /// \return the `RDisplay` instance wrapped in a `RResultPtr`.
-    ///
-    /// The existing columns are matched against the regular expression. If the string provided
-diff --git a/tree/dataframe/inc/ROOT/RDFHelpers.hxx b/tree/dataframe/inc/ROOT/RDFHelpers.hxx
-index 2193e1772e..63a0f90cab 100644
---- a/tree/dataframe/inc/ROOT/RDFHelpers.hxx
-+++ b/tree/dataframe/inc/ROOT/RDFHelpers.hxx
-@@ -138,7 +138,7 @@ void SaveGraph(NodeType node, const std::string &outputFile)
- 
- // clang-format off
- /// Cast a RDataFrame node to the common type ROOT::RDF::RNode
--/// \param[in] Any node of a RDataFrame graph
-+/// \param[in] node Any node of a RDataFrame graph
- // clang-format on
- template <typename NodeType>
- RNode AsRNode(NodeType node)
-diff --git a/tree/dataframe/inc/ROOT/RDataSource.hxx b/tree/dataframe/inc/ROOT/RDataSource.hxx
-index f4af9abded..04f7dc850c 100644
---- a/tree/dataframe/inc/ROOT/RDataSource.hxx
-+++ b/tree/dataframe/inc/ROOT/RDataSource.hxx
-@@ -126,14 +126,14 @@ public:
-    virtual const std::vector<std::string> &GetColumnNames() const = 0;
- 
-    /// \brief Checks if the dataset has a certain column
--   /// \param[in] columnName The name of the column
--   virtual bool HasColumn(std::string_view) const = 0;
-+   /// \param[in] colName The name of the column
-+   virtual bool HasColumn(std::string_view colName) const = 0;
- 
-    // clang-format off
-    /// \brief Type of a column as a string, e.g. `GetTypeName("x") == "double"`. Required for jitting e.g. `df.Filter("x>0")`.
--   /// \param[in] columnName The name of the column
-+   /// \param[in] colName The name of the column
-    // clang-format on
--   virtual std::string GetTypeName(std::string_view) const = 0;
-+   virtual std::string GetTypeName(std::string_view colName) const = 0;
- 
-    // clang-format off
-    /// Called at most once per column by RDF. Return vector of pointers to pointers to column values - one per slot.
-diff --git a/tree/dataframe/inc/ROOT/RResultPtr.hxx b/tree/dataframe/inc/ROOT/RResultPtr.hxx
-index 8358832b14..8acb2bfae6 100644
---- a/tree/dataframe/inc/ROOT/RResultPtr.hxx
-+++ b/tree/dataframe/inc/ROOT/RResultPtr.hxx
-@@ -262,7 +262,7 @@ public:
-    /// Register a callback that RDataFrame will execute in each worker thread concurrently on that thread's partial result.
-    ///
-    /// \param[in] everyNEvents Frequency at which the callback will be called by each thread, as a number of events processed
--   /// \param[in] a callable with signature `void(unsigned int, Value_t&)` where Value_t is the type of the value contained in this RResultPtr
-+   /// \param[in] callback A callable with signature `void(unsigned int, Value_t&)` where Value_t is the type of the value contained in this RResultPtr
-    /// \return this RResultPtr, to allow chaining of OnPartialResultSlot with other calls
-    ///
-    /// See `OnPartialResult` for a generic explanation of the callback mechanism.
-diff --git a/tree/dataframe/src/RArrowDS.cxx b/tree/dataframe/src/RArrowDS.cxx
-index d9e2fae32f..0152b9a813 100644
---- a/tree/dataframe/src/RArrowDS.cxx
-+++ b/tree/dataframe/src/RArrowDS.cxx
-@@ -382,8 +382,8 @@ public:
- 
- ////////////////////////////////////////////////////////////////////////
- /// Constructor to create an Arrow RDataSource for RDataFrame.
--/// \param[in] table the arrow Table to observe.
--/// \param[in] columns the name of the columns to use
-+/// \param[in] inTable the arrow Table to observe.
-+/// \param[in] inColumns the name of the columns to use
- /// In case columns is empty, we use all the columns found in the table
- RArrowDS::RArrowDS(std::shared_ptr<arrow::Table> inTable, std::vector<std::string> const &inColumns)
-    : fTable{inTable}, fColumnNames{inColumns}
-diff --git a/tree/tree/inc/TTree.h b/tree/tree/inc/TTree.h
-index 8560e28ab5..e95d4ce301 100644
---- a/tree/tree/inc/TTree.h
-+++ b/tree/tree/inc/TTree.h
-@@ -357,7 +357,7 @@ public:
-    /// possible, unless e.g. type conversions are needed.
-    ///
-    /// \param[in] name Name of the branch to be created.
--   /// \param[in] obj Array of the objects to be added. When calling Fill(), the current value of the type/object will be saved.
-+   /// \param[in] addobj Array of the objects to be added. When calling Fill(), the current value of the type/object will be saved.
-    /// \param[in] bufsize he buffer size in bytes for this branch. When the buffer is full, it is compressed and written to disc.
-    /// The default value of 32000 bytes and should be ok for most simple types. Larger buffers (e.g. 256000) if your Tree is not split and each entry is large (Megabytes).
-    /// A small value for bufsize is beneficial if entries in the Tree are accessed randomly and the Tree is in split mode.
-diff --git a/tree/tree/src/TIOFeatures.cxx b/tree/tree/src/TIOFeatures.cxx
-index 681f2172bd..ca292fb30a 100644
---- a/tree/tree/src/TIOFeatures.cxx
-+++ b/tree/tree/src/TIOFeatures.cxx
-@@ -51,7 +51,7 @@ using namespace ROOT;
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Clear a specific IO feature from this set.
--/// \param[in] enum_bits The specific feature to disable.
-+/// \param[in] input_bits The specific feature to disable.
- ///
- /// Removes a feature from the `TIOFeatures` object; emits an Error message if
- /// the IO feature is not supported by this version of ROOT.
-@@ -62,7 +62,7 @@ void TIOFeatures::Clear(Experimental::EIOFeatures input_bits)
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Clear a specific IO feature from this set.
--/// \param[in] enum_bits The specific feature to disable.
-+/// \param[in] input_bits The specific feature to disable.
- ///
- /// Removes a feature from the `TIOFeatures` object; emits an Error message if
- /// the IO feature is not supported by this version of ROOT.
-@@ -73,7 +73,7 @@ void TIOFeatures::Clear(Experimental::EIOUnsupportedFeatures input_bits)
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Clear a specific IO feature from this set.
--/// \param[in] enum_bits The specific feature to disable.
-+/// \param[in] input_bits The specific feature to disable.
- ///
- /// Removes a feature from the `TIOFeatures` object; emits an Error message if
- /// the IO feature is not supported by this version of ROOT.
-@@ -115,7 +115,7 @@ static std::string GetUnsupportedName(TBasket::EUnsupportedIOBits enum_flag)
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Set a specific IO feature.
--/// \param[in] enum_bits The specific feature to enable.
-+/// \param[in] input_bits The specific feature to enable.
- ///
- /// Sets a feature in the `TIOFeatures` object; emits an Error message if
- /// the IO feature is not supported by this version of ROOT.
-@@ -129,7 +129,7 @@ bool TIOFeatures::Set(Experimental::EIOFeatures input_bits)
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Set a specific IO feature.
--/// \param[in] enum_bits The specific feature to enable.
-+/// \param[in] input_bits The specific feature to enable.
- ///
- /// Sets a feature in the `TIOFeatures` object; emits an Error message if
- /// the IO feature is not supported by this version of ROOT.
-@@ -221,7 +221,7 @@ void TIOFeatures::Print() const
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Test to see if a given feature is set
--/// \param[in] enum_bits The specific feature to test.
-+/// \param[in] input_bits The specific feature to test.
- ///
- /// Returns kTRUE if the feature is enables in this object and supported by
- /// this version of ROOT.
-@@ -232,7 +232,7 @@ bool TIOFeatures::Test(Experimental::EIOFeatures input_bits) const
- 
- ////////////////////////////////////////////////////////////////////////////
- /// \brief Test to see if a given feature is set
--/// \param[in] enum_bits The specific feature to test.
-+/// \param[in] input_bits The specific feature to test.
- ///
- /// Returns kTRUE if the feature is enables in this object and supported by
- /// this version of ROOT.
--- 
-2.26.2
-
diff --git a/root-fix-a-shadow-warning.patch b/root-fix-a-shadow-warning.patch
deleted file mode 100644
index f0daaaf..0000000
--- a/root-fix-a-shadow-warning.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 00bbfddbf5c900923b284ddc540d2458bda15b7b Mon Sep 17 00:00:00 2001
-From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
-Date: Wed, 5 Aug 2020 13:22:46 +0200
-Subject: [PATCH] Fix a shadow warning.
-
----
- roofit/roofitmore/src/RooHypatia2.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/roofit/roofitmore/src/RooHypatia2.cxx b/roofit/roofitmore/src/RooHypatia2.cxx
-index 7d550b2753..fe80f414d0 100644
---- a/roofit/roofitmore/src/RooHypatia2.cxx
-+++ b/roofit/roofitmore/src/RooHypatia2.cxx
-@@ -119,21 +119,21 @@
- /// \param[in] a2 Start of right tail.
- /// \param[in] n2 Shape parameter of right tail (\f$ n2 \ge 0 \f$). With \f$ n2 = 0 \f$, the function is constant.
- RooHypatia2::RooHypatia2(const char *name, const char *title, RooAbsReal& x, RooAbsReal& lambda,
--    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigma, RooAbsReal& mu, RooAbsReal& a,
-+    RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& argSigma, RooAbsReal& mu, RooAbsReal& a,
-     RooAbsReal& n, RooAbsReal& a2, RooAbsReal& n2) :
-                 RooAbsPdf(name, title),
-                 _x("x", "x", this, x),
-                 _lambda("lambda", "Lambda", this, lambda),
-                 _zeta("zeta", "zeta", this, zeta),
-                 _beta("beta", "Asymmetry parameter beta", this, beta),
--                _sigma("sigma", "Width parameter sigma", this, sigma),
-+                _sigma("sigma", "Width parameter sigma", this, argSigma),
-                 _mu("mu", "Location parameter mu", this, mu),
-                 _a("a", "Left tail location a", this, a),
-                 _n("n", "Left tail parameter n", this, n),
-                 _a2("a2", "Right tail location a2", this, a2),
-                 _n2("n2", "Right tail parameter n2", this, n2)
- {
--  RooHelpers::checkRangeOfParameters(this, {&sigma}, 0.);
-+  RooHelpers::checkRangeOfParameters(this, {&argSigma}, 0.);
-   RooHelpers::checkRangeOfParameters(this, {&zeta, &n, &n2, &a, &a2}, 0., std::numeric_limits<double>::max(), true);
-   if (zeta.getVal() == 0. && zeta.isConstant()) {
-     RooHelpers::checkRangeOfParameters(this, {&lambda}, -std::numeric_limits<double>::max(), 0., false,
--- 
-2.26.2
-
diff --git a/root-fix-bad-regex.patch b/root-fix-bad-regex.patch
deleted file mode 100644
index e1e667e..0000000
--- a/root-fix-bad-regex.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7dc989f9a49ad31094331aa272859ff7480f943 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 9 Jul 2020 21:29:46 +0200
-Subject: [PATCH] Fix bad regex
-
----
- proof/proof/src/TProofMgr.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proof/proof/src/TProofMgr.cxx b/proof/proof/src/TProofMgr.cxx
-index 2a140e4e7a..35c91b77ac 100644
---- a/proof/proof/src/TProofMgr.cxx
-+++ b/proof/proof/src/TProofMgr.cxx
-@@ -820,7 +820,7 @@ TFileCollection *TProofMgr::UploadFiles(TList *src,
-    if (dest && strlen(dest) > 0) {
-       TString dst(dest), dt;
-       Ssiz_t from = 0;
--      TRegexp re("<d+[0-9]>");
-+      TRegexp re("<d[0-9]+>");
-       while (dst.Tokenize(dt, from, "/")) {
-          if (dt.Contains(re)) {
-             TParameter<Int_t> *pi = new TParameter<Int_t>(dt, -1);
--- 
-2.26.2
-
diff --git a/root-fix-multicore-tests-with-few-cores.patch b/root-fix-multicore-tests-with-few-cores.patch
index ada5a11..55ad56e 100644
--- a/root-fix-multicore-tests-with-few-cores.patch
+++ b/root-fix-multicore-tests-with-few-cores.patch
@@ -1,7 +1,25 @@
-diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx root-6.22.08/tree/dataframe/test/dataframe_concurrency.cxx
---- root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/tree/dataframe/test/dataframe_concurrency.cxx	2021-06-01 09:01:37.847751408 +0200
-@@ -46,33 +46,35 @@
+From 153f1c3de0e24f5678fd3a706f902ac12b11048e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 18 Apr 2021 07:28:41 +0200
+Subject: [PATCH] Fix multicore tests when running on machines with few cores
+
+When running on machines with few cores, enabling multithreading can
+give you fewer cores than requested. For most of the tests this does
+not matter. However, some tests verify the number of threads used.
+This commit adapts those tests for this situation.
+---
+ tree/dataframe/test/dataframe_concurrency.cxx | 18 +++++++++-------
+ tree/dataframe/test/dataframe_interface.cxx   |  7 +++++--
+ tree/dataframe/test/dataframe_simple.cxx      |  2 +-
+ tree/dataframe/test/dataframe_snapshot.cxx    |  6 ++++--
+ .../test/treeprocmt/treeprocessormt.cxx       | 21 +++++++++++++++----
+ 5 files changed, 37 insertions(+), 17 deletions(-)
+
+diff --git a/tree/dataframe/test/dataframe_concurrency.cxx b/tree/dataframe/test/dataframe_concurrency.cxx
+index d1b25493e5..a4bce595f8 100644
+--- a/tree/dataframe/test/dataframe_concurrency.cxx
++++ b/tree/dataframe/test/dataframe_concurrency.cxx
+@@ -57,33 +57,35 @@ TEST(RDFConcurrency, NestedParallelismBetweenDefineCalls)
  // [DF] Warn on mismatch between slot pool size and effective number of slots
  TEST(RDFSimpleTests, ThrowOnPoolSizeMismatch)
  {
@@ -16,7 +34,7 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx root-6.
        try {
           df.Count().GetValue();
        } catch (const std::runtime_error &e) {
-          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the size of the thread pool "
+          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the number of slots required "
 -                                   "was 1, but when starting the event loop it was 3. Maybe EnableImplicitMT() was "
 +                                   "was 1, but when starting the event loop it was " + std::to_string(nslots) + ". Maybe EnableImplicitMT() was "
                                     "called after the RDataFrame was constructed?";
@@ -36,19 +54,20 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_concurrency.cxx root-6.
        try {
           df.Count().GetValue();
        } catch (const std::runtime_error &e) {
-          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the size of the thread pool "
--                                   "was 3, but when starting the event loop it was 0. Maybe DisableImplicitMT() was "
-+                                   "was " + std::to_string(nslots) + ", but when starting the event loop it was 0. Maybe DisableImplicitMT() was "
+          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the number of slots required "
+-                                   "was 3, but when starting the event loop it was 1. Maybe DisableImplicitMT() was "
++                                   "was " + std::to_string(nslots) + ", but when starting the event loop it was 1. Maybe DisableImplicitMT() was "
                                     "called after the RDataFrame was constructed?";
 -         EXPECT_STREQ(e.what(), expected_msg);
 +         EXPECT_STREQ(e.what(), expected_msg.c_str());
        }
     }
  }
-diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx root-6.22.08/tree/dataframe/test/dataframe_interface.cxx
---- root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/tree/dataframe/test/dataframe_interface.cxx	2021-06-01 08:51:39.351355999 +0200
-@@ -6,6 +6,8 @@
+diff --git a/tree/dataframe/test/dataframe_interface.cxx b/tree/dataframe/test/dataframe_interface.cxx
+index afdd8360ef..90e052f1a7 100644
+--- a/tree/dataframe/test/dataframe_interface.cxx
++++ b/tree/dataframe/test/dataframe_interface.cxx
+@@ -7,6 +7,8 @@
  
  #include "gtest/gtest.h"
  
@@ -57,7 +76,7 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx root-6.22
  using namespace ROOT;
  using namespace ROOT::RDF;
  
-@@ -349,9 +351,10 @@
+@@ -351,9 +353,10 @@ TEST(RDataFrameInterface, GetNSlots)
     ROOT::RDataFrame df0(1);
     EXPECT_EQ(1U, df0.GetNSlots());
  #ifdef R__USE_IMT
@@ -70,10 +89,11 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_interface.cxx root-6.22
     ROOT::DisableImplicitMT();
     ROOT::RDataFrame df1(1);
     EXPECT_EQ(1U, df1.GetNSlots());
-diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.08/tree/dataframe/test/dataframe_simple.cxx
---- root-6.22.08.orig/tree/dataframe/test/dataframe_simple.cxx	2021-06-01 08:50:34.317205130 +0200
-+++ root-6.22.08/tree/dataframe/test/dataframe_simple.cxx	2021-06-01 08:51:39.351355999 +0200
-@@ -30,7 +30,7 @@
+diff --git a/tree/dataframe/test/dataframe_simple.cxx b/tree/dataframe/test/dataframe_simple.cxx
+index c6aba48b3e..e6b92be776 100644
+--- a/tree/dataframe/test/dataframe_simple.cxx
++++ b/tree/dataframe/test/dataframe_simple.cxx
+@@ -26,7 +26,7 @@ using namespace ROOT::VecOps;
  // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
  class RDFSimpleTests : public ::testing::TestWithParam<bool> {
  protected:
@@ -82,10 +102,11 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.08
     {
        if (GetParam())
           ROOT::EnableImplicitMT(NSLOTS);
-diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx root-6.22.08/tree/dataframe/test/dataframe_snapshot.cxx
---- root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/tree/dataframe/test/dataframe_snapshot.cxx	2021-06-01 08:51:39.351355999 +0200
-@@ -9,6 +9,7 @@
+diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
+index 3ce9254442..92444feff1 100644
+--- a/tree/dataframe/test/dataframe_snapshot.cxx
++++ b/tree/dataframe/test/dataframe_snapshot.cxx
+@@ -10,6 +10,7 @@
  #include "gtest/gtest.h"
  #include <limits>
  #include <memory>
@@ -93,7 +114,7 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx root-6.22.
  using namespace ROOT;         // RDataFrame
  using namespace ROOT::RDF;    // RInterface
  using namespace ROOT::VecOps; // RVec
-@@ -886,9 +887,10 @@
+@@ -1041,9 +1042,10 @@ TEST(RDFSnapshotMore, EmptyBuffersMT)
  {
     const auto fname = "emptybuffersmt.root";
     const auto treename = "t";
@@ -106,10 +127,11 @@ diff -ur root-6.22.08.orig/tree/dataframe/test/dataframe_snapshot.cxx root-6.22.
                 .Filter([](int x) { return x == 0; }, {"x"}, "f");
     auto r = dd.Report();
     dd.Snapshot<int>(treename, fname, {"x"});
-diff -ur root-6.22.08.orig/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx root-6.22.08/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
---- root-6.22.08.orig/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx	2021-06-01 08:51:39.352356002 +0200
-@@ -294,14 +294,27 @@
+diff --git a/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx b/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
+index 5d5b2cbf42..963ce8a1b1 100644
+--- a/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
++++ b/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
+@@ -294,14 +294,27 @@ TEST(TreeProcessorMT, LimitNTasks_CheckEntries)
        }
     };
  
@@ -141,3 +163,6 @@ diff -ur root-6.22.08.orig/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx r
  
     gSystem->Unlink(filename);
     ROOT::DisableImplicitMT();
+-- 
+2.30.2
+
diff --git a/root-fix-ppc64le-compilation-with-gcc-10.patch b/root-fix-ppc64le-compilation-with-gcc-10.patch
new file mode 100644
index 0000000..2624de8
--- /dev/null
+++ b/root-fix-ppc64le-compilation-with-gcc-10.patch
@@ -0,0 +1,29 @@
+From 5b8e969ca045aa238c685009e0aa48d74cbdbf22 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 17:09:03 +0100
+Subject: [PATCH 1/2] Fix ppc64le compilation with gcc 10
+
+Reapply fix lost in the LLVM 9 upgrade. This fix is in LLVM 10.
+
+Backported from llvm upstream
+https://reviews.llvm.org/D74129
+---
+ interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
+index c8ed42d266..16bb00d2e9 100644
+--- a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
++++ b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
+@@ -2546,7 +2546,7 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr,
+         '/', '/', '/', '/',  '/', '/', '/', '/'
+       };
+       while (CurPtr+16 <= BufferEnd &&
+-             !vec_any_eq(*(const vector unsigned char*)CurPtr, Slashes))
++             !vec_any_eq(*(const __vector unsigned char*)CurPtr, Slashes))
+         CurPtr += 16;
+ #else
+       // Scan for '/' quickly.  Many block comments are very large.
+-- 
+2.30.2
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 2a05c55..35705a4 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.22.02.orig/core/base/src/TApplication.cxx root-6.22.02/core/base/src/TApplication.cxx
---- root-6.22.02.orig/core/base/src/TApplication.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/core/base/src/TApplication.cxx	2020-08-18 09:50:12.739102596 +0200
-@@ -264,18 +264,11 @@
+diff -ur root-6.24.02.orig/core/base/src/TApplication.cxx root-6.24.02/core/base/src/TApplication.cxx
+--- root-6.24.02.orig/core/base/src/TApplication.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/core/base/src/TApplication.cxx	2021-08-11 10:49:08.583579248 +0200
+@@ -265,18 +265,11 @@
     LoadGraphicsLibs();
  
     // Try to load TrueType font renderer. Only try to load if not in batch
@@ -22,7 +22,7 @@ diff -ur root-6.22.02.orig/core/base/src/TApplication.cxx root-6.22.02/core/base
        if (gClassTable->GetDict("TGX11TTF")) {
           // in principle we should not have linked anything against libGX11TTF
           // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -289,7 +282,6 @@
+@@ -290,7 +283,6 @@
        }
     }
  #endif
@@ -30,9 +30,9 @@ diff -ur root-6.22.02.orig/core/base/src/TApplication.cxx root-6.22.02/core/base
  
     // Create WM dependent application environment
     if (fAppImp)
-diff -ur root-6.22.02.orig/graf2d/asimage/CMakeLists.txt root-6.22.02/graf2d/asimage/CMakeLists.txt
---- root-6.22.02.orig/graf2d/asimage/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/asimage/CMakeLists.txt	2020-08-18 09:50:12.761102650 +0200
+diff -ur root-6.24.02.orig/graf2d/asimage/CMakeLists.txt root-6.24.02/graf2d/asimage/CMakeLists.txt
+--- root-6.24.02.orig/graf2d/asimage/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/asimage/CMakeLists.txt	2021-08-11 10:49:08.583579248 +0200
 @@ -30,6 +30,7 @@
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
@@ -41,10 +41,10 @@ diff -ur root-6.22.02.orig/graf2d/asimage/CMakeLists.txt root-6.22.02/graf2d/asi
    DEPENDENCIES
      Core
      Graf
-diff -ur root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx root-6.22.02/graf2d/asimage/src/TASImage.cxx
---- root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/asimage/src/TASImage.cxx	2020-08-18 09:50:12.763102655 +0200
-@@ -111,6 +111,8 @@
+diff -ur root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx root-6.24.02/graf2d/asimage/src/TASImage.cxx
+--- root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/asimage/src/TASImage.cxx	2021-08-11 10:49:08.585579253 +0200
+@@ -112,6 +112,8 @@
  #   include <draw.h>
  }
  
@@ -53,7 +53,7 @@ diff -ur root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx root-6.22.02/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2594,14 +2596,120 @@
+@@ -2595,14 +2597,120 @@
     TString fn = font_name;
     fn.Strip();
  
@@ -181,7 +181,7 @@ diff -ur root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx root-6.22.02/graf2d/a
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2625,14 +2733,11 @@
+@@ -2626,14 +2734,11 @@
        return;
     }
  
@@ -199,9 +199,9 @@ diff -ur root-6.22.02.orig/graf2d/asimage/src/TASImage.cxx root-6.22.02/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.22.02.orig/graf2d/graf/CMakeLists.txt root-6.22.02/graf2d/graf/CMakeLists.txt
---- root-6.22.02.orig/graf2d/graf/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/graf/CMakeLists.txt	2020-08-18 09:50:12.763102655 +0200
+diff -ur root-6.24.02.orig/graf2d/graf/CMakeLists.txt root-6.24.02/graf2d/graf/CMakeLists.txt
+--- root-6.24.02.orig/graf2d/graf/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/graf/CMakeLists.txt	2021-08-11 10:49:08.586579256 +0200
 @@ -91,6 +91,7 @@
      ${FREETYPE_LIBRARIES}
      ZLIB::ZLIB
@@ -210,9 +210,9 @@ diff -ur root-6.22.02.orig/graf2d/graf/CMakeLists.txt root-6.22.02/graf2d/graf/C
    DEPENDENCIES
      Hist
      Matrix
-diff -ur root-6.22.02.orig/graf2d/graf/inc/TTF.h root-6.22.02/graf2d/graf/inc/TTF.h
---- root-6.22.02.orig/graf2d/graf/inc/TTF.h	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/graf/inc/TTF.h	2020-08-18 09:50:12.763102655 +0200
+diff -ur root-6.24.02.orig/graf2d/graf/inc/TTF.h root-6.24.02/graf2d/graf/inc/TTF.h
+--- root-6.24.02.orig/graf2d/graf/inc/TTF.h	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/graf/inc/TTF.h	2021-08-11 10:49:08.586579256 +0200
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -224,9 +224,9 @@ diff -ur root-6.22.02.orig/graf2d/graf/inc/TTF.h root-6.22.02/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.22.02.orig/graf2d/graf/src/TTF.cxx root-6.22.02/graf2d/graf/src/TTF.cxx
---- root-6.22.02.orig/graf2d/graf/src/TTF.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/graf/src/TTF.cxx	2020-08-18 09:54:27.734727819 +0200
+diff -ur root-6.24.02.orig/graf2d/graf/src/TTF.cxx root-6.24.02/graf2d/graf/src/TTF.cxx
+--- root-6.24.02.orig/graf2d/graf/src/TTF.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/graf/src/TTF.cxx	2021-08-11 10:49:08.587579259 +0200
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -787,9 +787,9 @@ diff -ur root-6.22.02.orig/graf2d/graf/src/TTF.cxx root-6.22.02/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.22.02.orig/graf2d/postscript/CMakeLists.txt root-6.22.02/graf2d/postscript/CMakeLists.txt
---- root-6.22.02.orig/graf2d/postscript/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/postscript/CMakeLists.txt	2020-08-18 09:50:12.764102658 +0200
+diff -ur root-6.24.02.orig/graf2d/postscript/CMakeLists.txt root-6.24.02/graf2d/postscript/CMakeLists.txt
+--- root-6.24.02.orig/graf2d/postscript/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/postscript/CMakeLists.txt	2021-08-11 10:49:08.587579259 +0200
 @@ -27,6 +27,7 @@
    LIBRARIES
      ZLIB::ZLIB
@@ -798,18 +798,18 @@ diff -ur root-6.22.02.orig/graf2d/postscript/CMakeLists.txt root-6.22.02/graf2d/
    DEPENDENCIES
      Graf
  )
-diff -ur root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf2d/postscript/src/TPostScript.cxx	2020-08-18 09:50:12.765102660 +0200
-@@ -233,6 +233,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <wchar.h>
+diff -ur root-6.24.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.24.02/graf2d/postscript/src/TPostScript.cxx
+--- root-6.24.02.orig/graf2d/postscript/src/TPostScript.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf2d/postscript/src/TPostScript.cxx	2021-08-11 10:49:08.588579261 +0200
+@@ -234,6 +234,7 @@
+ #include <cctype>
+ #include <cwchar>
+ #include <fstream>
 +#include <fontconfig/fontconfig.h>
  
- #include "Riostream.h"
- #include "Byteswap.h"
-@@ -1583,56 +1584,179 @@
+ #include "strlcpy.h"
+ #include "snprintf.h"
+@@ -1585,56 +1586,179 @@
  
  void TPostScript::FontEmbed(void)
  {
@@ -1034,7 +1034,7 @@ diff -ur root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.02/gr
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1641,9 +1765,8 @@
+@@ -1643,9 +1767,8 @@
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -1046,7 +1046,7 @@ diff -ur root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.02/gr
              }
              delete [] ttfont;
           }
-@@ -2835,10 +2958,10 @@
+@@ -2837,10 +2960,10 @@
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -1060,9 +1060,9 @@ diff -ur root-6.22.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.22.02/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.22.02.orig/graf3d/gl/CMakeLists.txt root-6.22.02/graf3d/gl/CMakeLists.txt
---- root-6.22.02.orig/graf3d/gl/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf3d/gl/CMakeLists.txt	2020-08-18 09:50:12.834102829 +0200
+diff -ur root-6.24.02.orig/graf3d/gl/CMakeLists.txt root-6.24.02/graf3d/gl/CMakeLists.txt
+--- root-6.24.02.orig/graf3d/gl/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf3d/gl/CMakeLists.txt	2021-08-11 10:49:08.589579264 +0200
 @@ -208,6 +208,7 @@
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
@@ -1071,10 +1071,10 @@ diff -ur root-6.22.02.orig/graf3d/gl/CMakeLists.txt root-6.22.02/graf3d/gl/CMake
    DEPENDENCIES
      Hist
      Gui
-diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf3d/gl/src/TGLFontManager.cxx	2020-08-18 09:50:12.854102878 +0200
-@@ -37,6 +37,7 @@
+diff -ur root-6.24.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.24.02/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.24.02.orig/graf3d/gl/src/TGLFontManager.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf3d/gl/src/TGLFontManager.cxx	2021-08-11 10:49:08.589579264 +0200
+@@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
  
@@ -1082,7 +1082,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
  
  /** \class TGLFont
  \ingroup opengl
-@@ -420,7 +421,7 @@
+@@ -419,7 +420,7 @@
  ClassImp(TGLFontManager);
  
  TObjArray   TGLFontManager::fgFontFileArray;
@@ -1091,7 +1091,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
  TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
  Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
  
-@@ -451,17 +452,175 @@
+@@ -450,17 +451,175 @@
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -1276,7 +1276,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
        FTFont* ftfont = 0;
        switch (mode)
        {
-@@ -485,10 +644,14 @@
+@@ -484,10 +643,14 @@
              ftfont = new FTGLTextureFont(file);
              break;
           default:
@@ -1291,7 +1291,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
        ftfont->FaceSize(size);
        const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
        out.CopyAttributes(mf);
-@@ -571,8 +734,6 @@
+@@ -570,8 +733,6 @@
  {
     if (fgStaticInitDone == kFALSE) InitStatics();
  
@@ -1300,7 +1300,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
     return fgExtendedFontStart;
  }
  
-@@ -642,28 +803,6 @@
+@@ -641,28 +802,6 @@
     fgFontFileArray.Add(new TObjString("wingding")); // 140
     fgFontFileArray.Add(new TObjString("symbol"));   // 150
  
@@ -1329,10 +1329,10 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.22.02/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.22.02.orig/graf3d/gl/src/TGLText.cxx root-6.22.02/graf3d/gl/src/TGLText.cxx
---- root-6.22.02.orig/graf3d/gl/src/TGLText.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/graf3d/gl/src/TGLText.cxx	2020-08-18 09:50:12.881102944 +0200
-@@ -34,6 +34,8 @@
+diff -ur root-6.24.02.orig/graf3d/gl/src/TGLText.cxx root-6.24.02/graf3d/gl/src/TGLText.cxx
+--- root-6.24.02.orig/graf3d/gl/src/TGLText.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/graf3d/gl/src/TGLText.cxx	2021-08-11 10:49:08.590579267 +0200
+@@ -32,6 +32,8 @@
  # include "FTGLBitmapFont.h"
  #endif
  
@@ -1341,7 +1341,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLText.cxx root-6.22.02/graf3d/gl/src/
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -178,27 +180,92 @@
+@@ -176,27 +178,92 @@
  {
     int fontid = fontnumber / 10;
  
@@ -1455,7 +1455,7 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLText.cxx root-6.22.02/graf3d/gl/src/
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -206,7 +273,9 @@
+@@ -204,7 +271,9 @@
  
     fGLTextFont = new FTGLPolygonFont(ttfont);
  
@@ -1466,9 +1466,9 @@ diff -ur root-6.22.02.orig/graf3d/gl/src/TGLText.cxx root-6.22.02/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.22.02.orig/gui/gui/src/TGApplication.cxx root-6.22.02/gui/gui/src/TGApplication.cxx
---- root-6.22.02.orig/gui/gui/src/TGApplication.cxx	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/gui/gui/src/TGApplication.cxx	2020-08-18 09:50:13.153103608 +0200
+diff -ur root-6.24.02.orig/gui/gui/src/TGApplication.cxx root-6.24.02/gui/gui/src/TGApplication.cxx
+--- root-6.24.02.orig/gui/gui/src/TGApplication.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/gui/gui/src/TGApplication.cxx	2021-08-11 10:49:08.590579267 +0200
 @@ -80,20 +80,12 @@
     gROOT->SetBatch(kFALSE);
  
diff --git a/root-histv7-bin-iterator.patch b/root-histv7-bin-iterator.patch
deleted file mode 100644
index 9e52725..0000000
--- a/root-histv7-bin-iterator.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From af2e5c8b1bf17a0a0e1c1492735395bdd49ffd65 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 29 Jun 2020 12:57:43 +0200
-Subject: [PATCH] Fix off-by-one error in the histogram v7 bin iterator
-
-The histogram bin iterator should start at 1 and end at N + 1, not
-start at 0 and end at N. (As for all iterators, the end element is the
-invalid element after the last one.)
-
-Fixes an assertion in the histhistv7testUnit test
-
-[----------] 2 tests from BinIterNBins
-[ RUN      ] BinIterNBins.NumBins
-/usr/include/c++/10/bits/stl_vector.h:1045: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = float; _Alloc = std::allocator<float>; std::vector<_Tp, _Alloc>::reference = float&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed.
----
- hist/histv7/inc/ROOT/RHist.hxx | 4 ++--
- hist/histv7/test/biniter.cxx   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hist/histv7/inc/ROOT/RHist.hxx b/hist/histv7/inc/ROOT/RHist.hxx
-index ebb319f1ef..9521fe182f 100644
---- a/hist/histv7/inc/ROOT/RHist.hxx
-+++ b/hist/histv7/inc/ROOT/RHist.hxx
-@@ -158,9 +158,9 @@ public:
-    /// Get the uncertainty on the content of the bin at `x`.
-    double GetBinUncertainty(const CoordArray_t &x) const { return fImpl->GetBinUncertainty(x); }
- 
--   const_iterator begin() const { return const_iterator(*fImpl); }
-+   const_iterator begin() const { return const_iterator(*fImpl, 1); }
- 
--   const_iterator end() const { return const_iterator(*fImpl, fImpl->GetNBinsNoOver()); }
-+   const_iterator end() const { return const_iterator(*fImpl, fImpl->GetNBinsNoOver() + 1); }
- 
-    /// Swap *this and other.
-    ///
-diff --git a/hist/histv7/test/biniter.cxx b/hist/histv7/test/biniter.cxx
-index aa1c2dfef9..1f940aa8e7 100644
---- a/hist/histv7/test/biniter.cxx
-+++ b/hist/histv7/test/biniter.cxx
-@@ -45,7 +45,7 @@ TEST(BinIterNBins, BinRef) {
-   double founduncert = -1.;
-   RH2F::CoordArray_t foundcoord{};
- 
--  int nBins = 0;
-+  int nBins = 1;
-   for (auto bin: h) {
-     auto binCenter = bin.GetCenter();
-     if (std::fabs(binCenter[0] - x) < 0.1 && std::fabs(binCenter[1] - y) < 0.1) {
--- 
-2.26.2
-
diff --git a/root-increase-timeout-for-ppc64le.patch b/root-increase-timeout-for-ppc64le.patch
deleted file mode 100644
index f4bbc79..0000000
--- a/root-increase-timeout-for-ppc64le.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4a4f661e80aa569a2fe2fcadeb2632db52371f79 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 21 Aug 2020 18:46:36 +0200
-Subject: [PATCH] Increase timeout for PPC64
-
----
- tutorials/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index b49bc68209..ef6e884658 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -462,7 +462,7 @@ foreach(t ${tutorials})
-   endif()
- 
-    # These tests on ARM64 need much more than 20 minutes - increase the timeout
--   if(ROOT_ARCHITECTURE MATCHES arm64)
-+   if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
-      set(thisTestTimeout 2400) # 40m
-    else()
-      set(thisTestTimeout 1200) # 20m
-@@ -489,7 +489,7 @@ foreach(t ${mpi_tutorials})
-   string(REPLACE "/" "-" tname ${tname})
- 
-    # These tests on ARM64 need much more than 20 minutes - increase the timeout
--   if(ROOT_ARCHITECTURE MATCHES arm64)
-+   if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
-      set(thisTestTimeout 2400) # 40m
-    else()
-      set(thisTestTimeout 1200) # 20m
--- 
-2.28.0
-
diff --git a/root-install-headers-with-COMPONENT-headers.patch b/root-install-headers-with-COMPONENT-headers.patch
deleted file mode 100644
index 8948c1e..0000000
--- a/root-install-headers-with-COMPONENT-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c6b03126690439f5137e4a1090e81e93fd09df9a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 19 Aug 2020 20:17:37 +0200
-Subject: [PATCH] Install headers with COMPONENT headers
-
----
- bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 4 +++-
- bindings/pyroot/pythonizations/CMakeLists.txt | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-index 00ce6c13b8..e23b439b3e 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-+++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-@@ -120,4 +120,6 @@ foreach(val RANGE ${how_many_pythons})
- endforeach()
- 
- file(COPY ${headers} DESTINATION ${CMAKE_BINARY_DIR}/include/CPyCppyy)
--install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy)
-+install(FILES ${headers}
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy
-+        COMPONENT headers)
-diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
-index 7827204396..377ec46916 100644
---- a/bindings/pyroot/pythonizations/CMakeLists.txt
-+++ b/bindings/pyroot/pythonizations/CMakeLists.txt
-@@ -159,6 +159,8 @@ install(DIRECTORY ${localruntimedir}/ROOT
-         COMPONENT libraries)
- 
- # Install headers required by pythonizations
--install(FILES ${PYROOT_EXTRA_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT)
-+install(FILES ${PYROOT_EXTRA_HEADERS}
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT
-+        COMPONENT headers)
- 
- ROOT_ADD_TEST_SUBDIRECTORY(test)
--- 
-2.26.2
-
diff --git a/root-jsmva-static.patch b/root-jsmva-static.patch
new file mode 100644
index 0000000..a81848a
--- /dev/null
+++ b/root-jsmva-static.patch
@@ -0,0 +1,36 @@
+diff -ur root-6.24.02.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.24.02/bindings/jsmva/python/JsMVA/JPyInterface.py
+--- root-6.24.02.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-08-11 09:06:21.894746090 +0200
+@@ -188,7 +188,7 @@
+ ## Class for creating the output scripts and inserting them to cell output
+ class JsDraw:
+     ## Base repository
+-    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
++    __jsMVARepo = "/static/JsMVA"
+ 
+     ## String containing the link to JavaScript files
+     __jsMVASourceDir = __jsMVARepo + "/js"
+diff -ur root-6.24.02.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.24.02/bindings/pyroot_legacy/JsMVA/JPyInterface.py
+--- root-6.24.02.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-08-11 09:06:21.925746168 +0200
+@@ -188,7 +188,7 @@
+ ## Class for creating the output scripts and inserting them to cell output
+ class JsDraw:
+     ## Base repository
+-    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
++    __jsMVARepo = "/static/JsMVA"
+  
+     ## String containing the link to JavaScript files
+     __jsMVASourceDir = __jsMVARepo + "/js"
+diff -ur root-6.24.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.24.02/etc/notebook/JsMVA/js/JsMVA.js
+--- root-6.24.02.orig/etc/notebook/JsMVA/js/JsMVA.js	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/etc/notebook/JsMVA/js/JsMVA.js	2021-08-11 09:10:45.638410266 +0200
+@@ -16,7 +16,7 @@
+ 
+ (function(factory){
+ 
+-    var JSROOT_source_dir = "https://root.cern.ch/js/notebook/scripts/";
++    var JSROOT_source_dir = "/static/scripts/";
+ 
+     var url = "";
+     if (requirejs.s.contexts.hasOwnProperty("_")) {
diff --git a/root-jupyroot-jupyterlab-compat.patch b/root-jupyroot-jupyterlab-compat.patch
deleted file mode 100644
index a7850c4..0000000
--- a/root-jupyroot-jupyterlab-compat.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -ur root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py
---- root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:39.457234887 +0200
-@@ -39,24 +39,31 @@
- 
- _jsNotDrawableClassesPatterns = ["TEve*","TF3","TPolyLine3D"]
- 
--
--_jsROOTSourceDir = "/static/"
- _jsCanvasWidth = 800
- _jsCanvasHeight = 600
--
- _jsCode = """
-+
- <div id="{jsDivId}"
-      style="width: {jsCanvasWidth}px; height: {jsCanvasHeight}px">
- </div>
- <script>
- if (typeof require !== 'undefined') {{
- 
--    // All requirements met (we are in jupyter notebooks or we loaded requirejs before).
--    display_{jsDivId}();
-+    // We are in jupyter notebooks, use require.js which should be configured already
-+    require(['scripts/JSRootCore'],
-+        function(Core) {{
-+           display_{jsDivId}(Core);
-+        }}
-+    );
-+
-+}} else if (typeof JSROOT !== 'undefined') {{
-+
-+   // JSROOT already loaded, just use it
-+   display_{jsDivId}(JSROOT);
- 
- }} else {{
- 
--    // We are in jupyterlab, we need to insert requirejs and configure it.
-+    // We are in jupyterlab without require.js, directly loading jsroot
-     // Jupyterlab might be installed in a different base_url so we need to know it.
-     try {{
-         var base_url = JSON.parse(document.getElementById('jupyter-config-data').innerHTML).baseUrl;
-@@ -65,14 +72,15 @@
-     }}
- 
-     // Try loading a local version of requirejs and fallback to cdn if not possible.
--    requirejs_load(base_url + 'static/components/requirejs/require.js', requirejs_success(base_url), function(){{
--        requirejs_load('https://cdnjs.cloudflare.com/ajax/libs/require.js/2.2.0/require.min.js', requirejs_success(base_url), function(){{
--            document.getElementById("{jsDivId}").innerHTML = "Failed to load requireJs";
-+    script_load(base_url + 'static/scripts/JSRootCore.js', script_success, function(){{
-+        console.error('Fail to load JSROOT locally, please check your jupyter_notebook_config.py file')
-+        script_load('https://root.cern/js/5.9.1/scripts/JSRootCore.min.js', script_success, function(){{
-+            document.getElementById("{jsDivId}").innerHTML = "Failed to load JSROOT";
-         }});
-     }});
- }}
- 
--function requirejs_load(src, on_load, on_error) {{
-+function script_load(src, on_load, on_error) {{
-     var script = document.createElement('script');
-     script.src = src;
-     script.onload = on_load;
-@@ -80,23 +88,14 @@
-     document.head.appendChild(script);
- }}
- 
--function requirejs_success(base_url) {{
--    return function() {{
--        require.config({{
--            baseUrl: base_url + 'static/'
--        }});
--        display_{jsDivId}();
--    }}
-+function script_success() {{
-+   display_{jsDivId}(JSROOT);
- }}
- 
--function display_{jsDivId}() {{
--    require(['scripts/JSRootCore'],
--        function(Core) {{
--            var obj = Core.JSONR_unref({jsonContent});
--            Core.key_handling = false;
--            Core.draw("{jsDivId}", obj, "{jsDrawOptions}");
--        }}
--    );
-+function display_{jsDivId}(Core) {{
-+   var obj = Core.JSONR_unref({jsonContent});
-+   Core.key_handling = false;
-+   Core.draw("{jsDivId}", obj, "{jsDrawOptions}");
- }}
- </script>
- """
-@@ -296,7 +295,7 @@
-    cnt = 0
-    for n in range(colors.GetLast()+1):
-       if colors.At(n): cnt = cnt+1
--        
-+
-    # add all colors if there are more than 598 colors defined
-    if cnt < 599 or prim.FindObject(colors):
-       colors = None
-@@ -312,14 +311,14 @@
-       prim.Add(palette)
- 
-    ROOT.TColor.DefinedColors()
--    
-+
-    canvas_json = ROOT.TBufferJSON.ConvertToJSON(canvas, 3)
- 
-    # Cleanup primitives after conversion
-    if style is not None: prim.Remove(style)
-    if colors is not None: prim.Remove(colors)
-    if palette is not None: prim.Remove(palette)
--     
-+
-    return canvas_json
- 
- transformers = []
-@@ -508,7 +507,6 @@
- 
-         thisJsCode = _jsCode.format(jsCanvasWidth = height,
-                                     jsCanvasHeight = width,
--                                    jsROOTSourceDir = _jsROOTSourceDir,
-                                     jsonContent = json.Data(),
-                                     jsDrawOptions = options,
-                                     jsDivId = divId)
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
deleted file mode 100644
index 717e203..0000000
--- a/root-jupyroot-static.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur root-6.22.08.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.22.08/bindings/jsmva/python/JsMVA/JPyInterface.py
---- root-6.22.08.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-06-17 19:32:12.018598877 +0200
-@@ -188,7 +188,7 @@
- ## Class for creating the output scripts and inserting them to cell output
- class JsDraw:
-     ## Base repository
--    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
-+    __jsMVARepo = "/static/JsMVA"
- 
-     ## String containing the link to JavaScript files
-     __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py
---- root-6.22.08.orig/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:39.457234887 +0200
-+++ root-6.22.08/bindings/jupyroot/python/JupyROOT/helpers/utils.py	2021-06-17 19:29:00.146141086 +0200
-@@ -72,7 +72,7 @@
-     }}
- 
-     // Try loading a local version of requirejs and fallback to cdn if not possible.
--    script_load(base_url + 'static/scripts/JSRootCore.js', script_success, function(){{
-+    script_load(base_url + 'static/jsroot/scripts/JSRootCore.js', script_success, function(){{
-         console.error('Fail to load JSROOT locally, please check your jupyter_notebook_config.py file')
-         script_load('https://root.cern/js/5.9.1/scripts/JSRootCore.min.js', script_success, function(){{
-             document.getElementById("{jsDivId}").innerHTML = "Failed to load JSROOT";
-diff -ur root-6.22.08.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.22.08/bindings/pyroot_legacy/JsMVA/JPyInterface.py
---- root-6.22.08.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-06-17 19:32:12.019598879 +0200
-@@ -188,7 +188,7 @@
- ## Class for creating the output scripts and inserting them to cell output
- class JsDraw:
-     ## Base repository
--    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
-+    __jsMVARepo = "/static/JsMVA"
-  
-     ## String containing the link to JavaScript files
-     __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.22.08.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py root-6.22.08/bindings/pyroot_legacy/JupyROOT/helpers/utils.py
---- root-6.22.08.orig/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/bindings/pyroot_legacy/JupyROOT/helpers/utils.py	2021-06-17 19:32:12.019598879 +0200
-@@ -82,7 +82,7 @@
- function requirejs_success(base_url) {{
-     return function() {{
-         require.config({{
--            baseUrl: base_url + 'static/'
-+            baseUrl: base_url + 'static/jsroot/'
-         }});
-         display_{jsDivId}();
-     }}
-diff -ur root-6.22.08.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.22.08/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.22.08.orig/etc/notebook/JsMVA/js/JsMVA.js	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/etc/notebook/JsMVA/js/JsMVA.js	2021-06-17 19:32:12.020598882 +0200
-@@ -16,7 +16,7 @@
- 
- (function(factory){
- 
--    var JSROOT_source_dir = "https://root.cern.ch/js/notebook/scripts/";
-+    var JSROOT_source_dir = "/static/jsroot/scripts/";
- 
-     var url = "";
-     if (requirejs.s.contexts.hasOwnProperty("_")) {
-diff -ur root-6.22.08.orig/etc/notebook/JsMVA/js/NetworkDesigner.js root-6.22.08/etc/notebook/JsMVA/js/NetworkDesigner.js
---- root-6.22.08.orig/etc/notebook/JsMVA/js/NetworkDesigner.js	2021-03-10 15:19:14.000000000 +0100
-+++ root-6.22.08/etc/notebook/JsMVA/js/NetworkDesigner.js	2021-06-17 19:32:12.020598882 +0200
-@@ -19,7 +19,7 @@
-         paths: {
-             "jquery-connections": baseURL + "jquery.connections.min",
-             "jquery-timing": baseURL + "jquery-timing.min",
--            "d3": "/static/scripts/d3.min"
-+            "d3": "/static/jsroot/scripts/d3.min"
-         },
-         shim: {
-             "jquery-ui": {
diff --git a/root-linux-vdso.patch b/root-linux-vdso.patch
deleted file mode 100644
index f749e9e..0000000
--- a/root-linux-vdso.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f7161d2612c035604146298809e628d806dbed3a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 29 Nov 2020 07:58:30 +0100
-Subject: [PATCH] Several new test failures on ppc64le with 6.22.06 due to:
- g++: error: linux-vdso64.so.1: No such file or directory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The list of names filtered out by TCling is incomplete.
-The vdso(7) man page gives the following list:
-
-       user ABI   vDSO name
-       ─────────────────────────────
-       aarch64    linux-vdso.so.1
-       arm        linux-vdso.so.1
-       ia64       linux-gate.so.1
-       mips       linux-vdso.so.1
-       ppc/32     linux-vdso32.so.1
-       ppc/64     linux-vdso64.so.1
-       riscv      linux-vdso.so.1
-       s390       linux-vdso32.so.1
-       s390x      linux-vdso64.so.1
-       sh         linux-gate.so.1
-       i386       linux-gate.so.1
-       x86-64     linux-vdso.so.1
-       x86/x32    linux-vdso.so.1
----
- core/metacling/src/TCling.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
-index 5078d7b93e..0e605a5388 100644
---- a/core/metacling/src/TCling.cxx
-+++ b/core/metacling/src/TCling.cxx
-@@ -3274,6 +3274,8 @@ static int callback_for_dl_iterate_phdr(struct dl_phdr_info *info, size_t size,
-       // Skip \0, "", and kernel pseudo-libs linux-vdso.so.1 or linux-gate.so.1
-       if (info->dlpi_name && info->dlpi_name[0]
-           && strncmp(info->dlpi_name, "linux-vdso.so", 13)
-+          && strncmp(info->dlpi_name, "linux-vdso32.so", 15)
-+          && strncmp(info->dlpi_name, "linux-vdso64.so", 15)
-           && strncmp(info->dlpi_name, "linux-gate.so", 13))
-          newLibs->emplace_back(info->dlpi_name);
-       sKnownLoadedLibBaseAddrs.insert(info->dlpi_addr);
--- 
-2.28.0
-
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index 21b1319..aa7604d 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,6 +1,6 @@
-diff -ur root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt root-6.22.02/bindings/jupyroot/CMakeLists.txt
---- root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/bindings/jupyroot/CMakeLists.txt	2020-08-19 09:49:12.094722642 +0200
+diff -ur root-6.24.02.orig/bindings/jupyroot/CMakeLists.txt root-6.24.02/bindings/jupyroot/CMakeLists.txt
+--- root-6.24.02.orig/bindings/jupyroot/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/bindings/jupyroot/CMakeLists.txt	2021-08-11 10:53:03.272202496 +0200
 @@ -70,8 +70,7 @@
    endforeach()
  
@@ -8,13 +8,13 @@ diff -ur root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt root-6.22.02/binding
 -  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
 -                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
 +  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-                              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
-                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+                              LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
+                              ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
  
-diff -ur root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt
---- root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-17 14:41:56.000000000 +0200
-+++ root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt	2020-08-19 10:36:10.390486171 +0200
-@@ -133,11 +133,10 @@
+diff -ur root-6.24.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.24.02/bindings/pyroot/pythonizations/CMakeLists.txt
+--- root-6.24.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/bindings/pyroot/pythonizations/CMakeLists.txt	2021-08-11 10:53:03.272202496 +0200
+@@ -137,11 +137,10 @@
    # Create meta-target PyROOT2 and PyROOT3 (INTERFACE library)
    # Export of targets are not supported for custom targets(add_custom_targets())
    add_library(PyROOT${python_major_version_string} INTERFACE)
@@ -25,6 +25,6 @@ diff -ur root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.
 -  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
 -                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
 +  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-                              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
-                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+                              LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
+                              ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
  
diff --git a/root-ntuple-largefile.patch b/root-ntuple-largefile.patch
deleted file mode 100644
index b4242f0..0000000
--- a/root-ntuple-largefile.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ur root-6.22.00.orig/io/io/src/RRawFileUnix.cxx root-6.22.00/io/io/src/RRawFileUnix.cxx
---- root-6.22.00.orig/io/io/src/RRawFileUnix.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/io/io/src/RRawFileUnix.cxx	2020-07-02 09:02:48.202677798 +0200
-@@ -9,6 +9,8 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
-+#include "ROOT/RConfig.hxx"
-+
- #include "ROOT/RRawFileUnix.hxx"
- #include "ROOT/RMakeUnique.hxx"
- 
-@@ -47,8 +49,13 @@
- 
- std::uint64_t ROOT::Internal::RRawFileUnix::GetSizeImpl()
- {
-+#ifdef R__SEEK64
-+   struct stat64 info;
-+   int res = fstat64(fFileDes, &info);
-+#else
-    struct stat info;
-    int res = fstat(fFileDes, &info);
-+#endif
-    if (res != 0)
-       throw std::runtime_error("Cannot call fstat on '" + fUrl + "', error: " + std::string(strerror(errno)));
-    return info.st_size;
-@@ -68,7 +75,11 @@
- 
- void ROOT::Internal::RRawFileUnix::OpenImpl()
- {
-+#ifdef R__SEEK64
-+   fFileDes = open64(GetLocation(fUrl).c_str(), O_RDONLY);
-+#else
-    fFileDes = open(GetLocation(fUrl).c_str(), O_RDONLY);
-+#endif
-    if (fFileDes < 0) {
-       throw std::runtime_error("Cannot open '" + fUrl + "', error: " + std::string(strerror(errno)));
-    }
-@@ -76,8 +87,13 @@
-    if (fOptions.fBlockSize >= 0)
-       return;
- 
-+#ifdef R__SEEK64
-+   struct stat64 info;
-+   int res = fstat64(fFileDes, &info);
-+#else
-    struct stat info;
-    int res = fstat(fFileDes, &info);
-+#endif
-    if (res != 0) {
-       throw std::runtime_error("Cannot call fstat on '" + fUrl + "', error: " + std::string(strerror(errno)));
-    }
-@@ -92,7 +108,11 @@
- {
-    size_t total_bytes = 0;
-    while (nbytes) {
-+#ifdef R__SEEK64
-+      ssize_t res = pread64(fFileDes, buffer, nbytes, offset);
-+#else
-       ssize_t res = pread(fFileDes, buffer, nbytes, offset);
-+#endif
-       if (res < 0) {
-          if (errno == EINTR)
-             continue;
-diff -ur root-6.22.00.orig/tree/ntuple/v7/src/RMiniFile.cxx root-6.22.00/tree/ntuple/v7/src/RMiniFile.cxx
---- root-6.22.00.orig/tree/ntuple/v7/src/RMiniFile.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/ntuple/v7/src/RMiniFile.cxx	2020-07-02 10:06:55.066204147 +0200
-@@ -13,6 +13,8 @@
-  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
-  *************************************************************************/
- 
-+#include <ROOT/RConfig.hxx>
-+
- #include "ROOT/RMiniFile.hxx"
- 
- #include <ROOT/RRawFile.hxx>
-@@ -999,7 +1001,11 @@
-    R__ASSERT(fFile);
-    size_t retval;
-    if ((offset >= 0) && (static_cast<std::uint64_t>(offset) != fFilePos)) {
-+#ifdef R__SEEK64
-+      retval = fseeko64(fFile, offset, SEEK_SET);
-+#else
-       retval = fseek(fFile, offset, SEEK_SET);
-+#endif
-       R__ASSERT(retval == 0);
-       fFilePos = offset;
-    }
-@@ -1099,7 +1105,11 @@
-    if (idxDirSep != std::string::npos) {
-       fileName.erase(0, idxDirSep + 1);
-    }
-+#ifdef R__SEEK64
-+   FILE *fileStream = fopen64(std::string(path.data(), path.size()).c_str(), "wb");
-+#else
-    FILE *fileStream = fopen(std::string(path.data(), path.size()).c_str(), "wb");
-+#endif
-    R__ASSERT(fileStream);
- 
-    auto writer = new RNTupleFileWriter(ntupleName);
-@@ -1319,7 +1329,11 @@
-    fFileSimple.Write(&strEmpty, strEmpty.GetSize());
-    fFileSimple.Write(&fileRoot, fileRoot.GetSize());
-    fFileSimple.fFilePos = tail;
-+#ifdef R__SEEK64
-+   auto retval = fseeko64(fFileSimple.fFile, tail, SEEK_SET);
-+#else
-    auto retval = fseek(fFileSimple.fFile, tail, SEEK_SET);
-+#endif
-    R__ASSERT(retval == 0);
-    fFileSimple.fFilePos = tail;
- }
-diff -ur root-6.22.00.orig/tree/ntuple/v7/test/ntuple.cxx root-6.22.00/tree/ntuple/v7/test/ntuple.cxx
---- root-6.22.00.orig/tree/ntuple/v7/test/ntuple.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/ntuple/v7/test/ntuple.cxx	2020-07-02 10:10:54.409737807 +0200
-@@ -1,3 +1,5 @@
-+#include <ROOT/RConfig.hxx>
-+
- #include <ROOT/RColumnModel.hxx>
- #include <ROOT/RDataFrame.hxx>
- #include <ROOT/RNTuple.hxx>
-@@ -891,10 +893,17 @@
-          ntuple->Fill();
-       }
-    }
-+#ifdef R__SEEK64
-+   FILE *file = fopen64(fileGuard.GetPath().c_str(), "rb");
-+   ASSERT_TRUE(file != nullptr);
-+   EXPECT_EQ(0, fseeko64(file, 0, SEEK_END));
-+   EXPECT_GT(ftello64(file), 2048LL * 1024LL * 1024LL);
-+#else
-    FILE *file = fopen(fileGuard.GetPath().c_str(), "rb");
-    ASSERT_TRUE(file != nullptr);
-    EXPECT_EQ(0, fseek(file, 0, SEEK_END));
-    EXPECT_GT(ftell(file), 2048LL * 1024LL * 1024LL);
-+#endif
-    fclose(file);
- 
-    auto ntuple = RNTupleReader::Open("myNTuple", fileGuard.GetPath());
diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
index a25a8e8..bcba732 100644
--- a/root-old-gtest-compat.patch
+++ b/root-old-gtest-compat.patch
@@ -1,6 +1,20 @@
-diff -ur root-6.22.00.orig/math/mathcore/test/stress/testGenVector.cxx root-6.22.00/math/mathcore/test/stress/testGenVector.cxx
---- root-6.22.00.orig/math/mathcore/test/stress/testGenVector.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/stress/testGenVector.cxx	2020-06-29 19:38:08.524050438 +0200
+diff -ur root-6.24.02.orig/hist/hist/test/test_THBinIterator.cxx root-6.24.02/hist/hist/test/test_THBinIterator.cxx
+--- root-6.24.02.orig/hist/hist/test/test_THBinIterator.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/hist/hist/test/test_THBinIterator.cxx	2021-08-06 22:59:45.039518775 +0200
+@@ -1,5 +1,10 @@
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define SetUpTestSuite SetUpTestCase
++#define TearDownTestSuite TearDownTestCase
++#endif
++
+ // test iterating histogram bins and using the new THistRange and
+ // THBinIterator classes
+ 
+diff -ur root-6.24.02.orig/math/mathcore/test/stress/testGenVector.cxx root-6.24.02/math/mathcore/test/stress/testGenVector.cxx
+--- root-6.24.02.orig/math/mathcore/test/stress/testGenVector.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/stress/testGenVector.cxx	2021-08-06 09:31:38.795835283 +0200
 @@ -4,6 +4,16 @@
  
  #include "gtest/gtest.h"
@@ -18,9 +32,9 @@ diff -ur root-6.22.00.orig/math/mathcore/test/stress/testGenVector.cxx root-6.22
  #include "StatFunction.h"
  #include "TestHelper.h"
  #include "VectorTest.h"
-diff -ur root-6.22.00.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.22.00/math/mathcore/test/stress/testSMatrix.cxx
---- root-6.22.00.orig/math/mathcore/test/stress/testSMatrix.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/stress/testSMatrix.cxx	2020-06-29 19:38:08.524050438 +0200
+diff -ur root-6.24.02.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.24.02/math/mathcore/test/stress/testSMatrix.cxx
+--- root-6.24.02.orig/math/mathcore/test/stress/testSMatrix.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/stress/testSMatrix.cxx	2021-08-06 09:31:38.796835286 +0200
 @@ -7,6 +7,16 @@
  #include "TestHelper.h"
  #include "gtest/gtest.h"
@@ -38,9 +52,9 @@ diff -ur root-6.22.00.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.22.0
  #include "VectorTest.h"
  #include "TROOT.h"
  #include "TSystem.h"
-diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector34.cxx root-6.22.00/math/mathcore/test/stress/testVector34.cxx
---- root-6.22.00.orig/math/mathcore/test/stress/testVector34.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/stress/testVector34.cxx	2020-06-29 19:38:08.525050440 +0200
+diff -ur root-6.24.02.orig/math/mathcore/test/stress/testVector34.cxx root-6.24.02/math/mathcore/test/stress/testVector34.cxx
+--- root-6.24.02.orig/math/mathcore/test/stress/testVector34.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/stress/testVector34.cxx	2021-08-06 09:31:38.796835286 +0200
 @@ -4,6 +4,16 @@
  
  #include "gtest/gtest.h"
@@ -58,9 +72,9 @@ diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector34.cxx root-6.22.
  #include "StatFunction.h"
  #include "VectorTest.h"
  
-diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector.cxx root-6.22.00/math/mathcore/test/stress/testVector.cxx
---- root-6.22.00.orig/math/mathcore/test/stress/testVector.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/stress/testVector.cxx	2020-06-29 19:38:08.525050440 +0200
+diff -ur root-6.24.02.orig/math/mathcore/test/stress/testVector.cxx root-6.24.02/math/mathcore/test/stress/testVector.cxx
+--- root-6.24.02.orig/math/mathcore/test/stress/testVector.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/stress/testVector.cxx	2021-08-06 09:31:38.796835286 +0200
 @@ -4,6 +4,16 @@
  
  #include "gtest/gtest.h"
@@ -78,9 +92,9 @@ diff -ur root-6.22.00.orig/math/mathcore/test/stress/testVector.cxx root-6.22.00
  #include "StatFunction.h"
  #include "TestHelper.h"
  #include "VectorTest.h"
-diff -ur root-6.22.00.orig/math/mathcore/test/testGradient.cxx root-6.22.00/math/mathcore/test/testGradient.cxx
---- root-6.22.00.orig/math/mathcore/test/testGradient.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/testGradient.cxx	2020-06-29 19:38:08.525050440 +0200
+diff -ur root-6.24.02.orig/math/mathcore/test/testGradient.cxx root-6.24.02/math/mathcore/test/testGradient.cxx
+--- root-6.24.02.orig/math/mathcore/test/testGradient.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/testGradient.cxx	2021-08-06 09:31:38.796835286 +0200
 @@ -22,6 +22,10 @@
  
  #include "gtest/gtest.h"
@@ -92,9 +106,9 @@ diff -ur root-6.22.00.orig/math/mathcore/test/testGradient.cxx root-6.22.00/math
  #include <chrono>
  #include <iostream>
  #include <string>
-diff -ur root-6.22.00.orig/math/mathcore/test/testGradientFitting.cxx root-6.22.00/math/mathcore/test/testGradientFitting.cxx
---- root-6.22.00.orig/math/mathcore/test/testGradientFitting.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathcore/test/testGradientFitting.cxx	2020-06-29 19:38:08.525050440 +0200
+diff -ur root-6.24.02.orig/math/mathcore/test/testGradientFitting.cxx root-6.24.02/math/mathcore/test/testGradientFitting.cxx
+--- root-6.24.02.orig/math/mathcore/test/testGradientFitting.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathcore/test/testGradientFitting.cxx	2021-08-06 09:31:38.797835288 +0200
 @@ -12,6 +12,16 @@
  
  #include "gtest/gtest.h"
@@ -112,10 +126,10 @@ diff -ur root-6.22.00.orig/math/mathcore/test/testGradientFitting.cxx root-6.22.
  #include <iostream>
  #include <string>
  
-diff -ur root-6.22.00.orig/math/mathmore/test/testStress.cxx root-6.22.00/math/mathmore/test/testStress.cxx
---- root-6.22.00.orig/math/mathmore/test/testStress.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/math/mathmore/test/testStress.cxx	2020-06-29 19:38:08.526050443 +0200
-@@ -28,6 +28,16 @@
+diff -ur root-6.24.02.orig/math/mathmore/test/testStress.cxx root-6.24.02/math/mathmore/test/testStress.cxx
+--- root-6.24.02.orig/math/mathmore/test/testStress.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/math/mathmore/test/testStress.cxx	2021-08-06 09:31:38.797835288 +0200
+@@ -26,6 +26,16 @@
  
  #include "gtest/gtest.h"
  
@@ -132,9 +146,9 @@ diff -ur root-6.22.00.orig/math/mathmore/test/testStress.cxx root-6.22.00/math/m
  using ::testing::TestWithParam;
  using ::testing::Values;
  
-diff -ur root-6.22.00.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx root-6.22.00/roofit/roofitcore/test/testProxiesAndCategories.cxx
---- root-6.22.00.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/roofit/roofitcore/test/testProxiesAndCategories.cxx	2020-06-29 19:38:08.526050443 +0200
+diff -ur root-6.24.02.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx root-6.24.02/roofit/roofitcore/test/testProxiesAndCategories.cxx
+--- root-6.24.02.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/roofit/roofitcore/test/testProxiesAndCategories.cxx	2021-08-06 09:31:38.798835290 +0200
 @@ -16,6 +16,9 @@
  
  #include "gtest/gtest.h"
@@ -145,9 +159,49 @@ diff -ur root-6.22.00.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx r
  
  TEST(RooCategory, CategoryDefineMultiState) {
    RooCategory myCat("myCat", "A category", { {"0Lep", 0}, {"1Lep", 1}, {"2Lep", 2}, {"3Lep", 3} });
-diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.00/tree/dataframe/test/dataframe_simple.cxx
---- root-6.22.00.orig/tree/dataframe/test/dataframe_simple.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/tree/dataframe/test/dataframe_simple.cxx	2020-06-29 19:38:45.667130468 +0200
+diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_datablockcallback.cxx root-6.24.02/tree/dataframe/test/dataframe_datablockcallback.cxx
+--- root-6.24.02.orig/tree/dataframe/test/dataframe_datablockcallback.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/dataframe_datablockcallback.cxx	2021-08-06 09:31:38.801835298 +0200
+@@ -11,6 +11,10 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <algorithm> // std::min
+ #include <thread> // std::hardware_concurrency
+ 
+diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_merge_results.cxx root-6.24.02/tree/dataframe/test/dataframe_merge_results.cxx
+--- root-6.24.02.orig/tree/dataframe/test/dataframe_merge_results.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/dataframe_merge_results.cxx	2021-08-06 09:31:38.802835300 +0200
+@@ -308,7 +308,7 @@
+    EXPECT_FALSE(mh3);
+    EXPECT_FALSE(mh4);
+    EXPECT_FALSE(mh5);
+-   EXPECT_TRUE(mergedptr);
++   EXPECT_TRUE(!!mergedptr);
+ 
+    const auto &mh = mergedptr->GetValue();
+ 
+diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_regression.cxx root-6.24.02/tree/dataframe/test/dataframe_regression.cxx
+--- root-6.24.02.orig/tree/dataframe/test/dataframe_regression.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/dataframe_regression.cxx	2021-08-06 09:31:38.802835300 +0200
+@@ -9,6 +9,10 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
+ class RDFRegressionTests : public ::testing::TestWithParam<bool> {
+ protected:
+diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_simple.cxx root-6.24.02/tree/dataframe/test/dataframe_simple.cxx
+--- root-6.24.02.orig/tree/dataframe/test/dataframe_simple.cxx	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/tree/dataframe/test/dataframe_simple.cxx	2021-08-06 09:31:38.803835303 +0200
 @@ -1,5 +1,10 @@
  /****** Run RDataFrame tests both with and without IMT enabled *******/
  #include <gtest/gtest.h>
@@ -156,6 +210,6 @@ diff -ur root-6.22.00.orig/tree/dataframe/test/dataframe_simple.cxx root-6.22.00
 +#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
 +#endif
 +
+ #include <ROOTUnitTestSupport.h>
  #include <ROOT/RDataFrame.hxx>
  #include <ROOT/TSeq.hxx>
- #include <TChain.h>
diff --git a/root-older-python.patch b/root-older-python.patch
new file mode 100644
index 0000000..fa6a05a
--- /dev/null
+++ b/root-older-python.patch
@@ -0,0 +1,46 @@
+From 61116151cce8fe5b397555a65f7b55001b8e416b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 23 Apr 2021 21:39:17 +0200
+Subject: [PATCH] Compat with no f-strings
+
+---
+ tutorials/tmva/PyTorch_Generate_CNN_Model.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tutorials/tmva/PyTorch_Generate_CNN_Model.py b/tutorials/tmva/PyTorch_Generate_CNN_Model.py
+index 7024112f03..5a314f86dd 100644
+--- a/tutorials/tmva/PyTorch_Generate_CNN_Model.py
++++ b/tutorials/tmva/PyTorch_Generate_CNN_Model.py
+@@ -56,7 +56,7 @@ def fit(model, train_loader, val_loader, num_epochs, batch_size, optimizer, crit
+             # print train statistics
+             running_train_loss += train_loss.item()
+             if i % 4 == 3:    # print every 4 mini-batches
+-                print(f"[{epoch+1}, {i+1}] train loss: {running_train_loss / 4 :.3f}")
++                print("[{}, {}] train loss: {:.3f}".format(epoch+1, i+1, running_train_loss / 4))
+                 running_train_loss = 0.0
+ 
+         if schedule:
+@@ -75,15 +75,15 @@ def fit(model, train_loader, val_loader, num_epochs, batch_size, optimizer, crit
+ 
+             curr_val = running_val_loss / len(val_loader)
+             if save_best:
+-               if best_val==None:
+-                   best_val = curr_val
+-               best_val = save_best(model, curr_val, best_val)
++                if best_val is None:
++                    best_val = curr_val
++                best_val = save_best(model, curr_val, best_val)
+ 
+             # print val statistics per epoch
+-            print(f"[{epoch+1}] val loss: {curr_val :.3f}")
++            print("[{}] val loss: {:.3f}".format(epoch+1, curr_val))
+             running_val_loss = 0.0
+ 
+-    print(f"Finished Training on {epoch+1} Epochs!")
++    print("Finished Training on {} Epochs!".format(epoch+1))
+ 
+     return model
+ 
+-- 
+2.30.2
+
diff --git a/root-ppc-codemodel.patch b/root-ppc-codemodel.patch
new file mode 100644
index 0000000..223dc7c
--- /dev/null
+++ b/root-ppc-codemodel.patch
@@ -0,0 +1,36 @@
+From 774ab9358d852e2c004564183de4a60eaaa5ac98 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 23 Apr 2021 21:40:14 +0200
+Subject: [PATCH 2/2] Actually request the use of the large code model for
+ ppc64/ppc64le
+
+Instead of erroring out with an assert.
+---
+ interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
+index 46771aa8c0..93a48f31f3 100644
+--- a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
++++ b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
+@@ -73,14 +73,14 @@ CreateHostTargetMachine(const clang::CompilerInstance& CI) {
+   JTMB->getOptions().EmulatedTLS = false;
+ #endif // _WIN32
+ 
+-  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
+-
+ #if defined(__powerpc64__) || defined(__PPC64__)
+   // We have to use large code model for PowerPC64 because TOC and text sections
+   // can be more than 2GB apart.
+-  assert(TM->getCodeModel() >= CodeModel::Large);
++  JTMB->setCodeModel(CodeModel::Large);
+ #endif
+ 
++  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
++
+   // Forcefully disable GlobalISel, it might be enabled on AArch64 without
+   // optimizations. In tests on an Apple M1 after the upgrade to LLVM 9, this
+   // new instruction selection framework emits branches / calls that expect all
+-- 
+2.30.2
+
diff --git a/root-ppc-no-codemodel.patch b/root-ppc-no-codemodel.patch
new file mode 100644
index 0000000..3429097
--- /dev/null
+++ b/root-ppc-no-codemodel.patch
@@ -0,0 +1,13 @@
+diff --git a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
+index c98a3be0ed..f77d4adec2 100644
+--- a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
++++ b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
+@@ -77,7 +77,7 @@ CreateHostTargetMachine(const clang::CompilerInstance& CI) {
+ #if defined(__powerpc64__) || defined(__PPC64__)
+   // We have to use large code model for PowerPC64 because TOC and text sections
+   // can be more than 2GB apart.
+-  JTMB->setCodeModel(CodeModel::Large);
++  //JTMB->setCodeModel(CodeModel::Large);
+ #endif
+ 
+   std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
diff --git a/root-ptr-is-null-RooFit-TMVA.patch b/root-ptr-is-null-RooFit-TMVA.patch
new file mode 100644
index 0000000..3aa3acd
--- /dev/null
+++ b/root-ptr-is-null-RooFit-TMVA.patch
@@ -0,0 +1,80 @@
+From c65f3d96f3f4433bff9d40fa9cf1dec100867a07 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 8 Jun 2021 10:12:37 +0200
+Subject: [PATCH] Fix 'this' pointer is null warnings
+
+.../roofit/roofitcore/src/RooDataHist.cxx: In member function 'void RooDataHist::_adjustBinning(RooRealVar&, const TAxis&, RooRealVar*, Int_t*)':
+.../roofit/roofitcore/src/RooDataHist.cxx:595:122: warning: 'this' pointer is null [-Wnonnull]
+  595 |     coutE(InputArguments) << "RooDataHist::adjustBinning(" << GetName() << ") ERROR: dimension " << ourVar->GetName() << " must be real" << endl ;
+      |                                                                                                                          ^~~~~~~~~~~~~~~
+
+.../roofit/roofitcore/src/RooRealSumFunc.cxx: In constructor 'RooRealSumFunc::RooRealSumFunc(const char*, const char*, const RooArgList&, const RooArgList&)':
+.../roofit/roofitcore/src/RooRealSumFunc.cxx:156:35: warning: 'this' pointer is null [-Wnonnull]
+  156 |                                << " is not of type RooAbsReal, fatal error" << endl;
+      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx: In member function 'void TMVA::DNN::TDataLoader<AData, TMVA::DNN::TReference<AReal> >::CopyInput(TMatrixT<AReal>&, TMVA::DNN::IndexIterator_t) [with AData = std::tuple<const std::vector<TMVA::Event*, std::allocator<TMVA::Event*> >&, const TMVA::DataSetInfo&>; AReal = float]':
+.../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx:131:34: warning: 'this' pointer is null [-Wnonnull]
+  131 |    Int_t n = event->GetNVariables();
+      |              ~~~~~~~~~~~~~~~~~~~~^~
+In file included from .../tmva/tmva/inc/TMVA/VariableTransformBase.h:48,
+                 from .../tmva/tmva/inc/TMVA/Tools.h:58,
+                 from .../tmva/tmva/inc/TMVA/DNN/GeneralLayer.h:36,
+                 from .../tmva/tmva/inc/TMVA/DNN/CNN/ConvLayer.h:32,
+                 from .../tmva/tmva/inc/TMVA/DNN/Architectures/Reference.h:24,
+                 from .../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx:17:
+.../tmva/tmva/inc/TMVA/Event.h:88:16: note: in a call to non-static member function 'UInt_t TMVA::Event::GetNVariables() const'
+   88 |       UInt_t   GetNVariables()        const;
+      |                ^~~~~~~~~~~~~
+---
+ roofit/roofitcore/src/RooDataHist.cxx                    | 2 +-
+ roofit/roofitcore/src/RooRealSumFunc.cxx                 | 4 ++--
+ tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
+index 84cf2c0f68..8dddb88e2b 100644
+--- a/roofit/roofitcore/src/RooDataHist.cxx
++++ b/roofit/roofitcore/src/RooDataHist.cxx
+@@ -591,7 +591,7 @@ void RooDataHist::importDHistSet(const RooArgList& /*vars*/, RooCategory& indexC
+ void RooDataHist::_adjustBinning(RooRealVar &theirVar, const TAxis &axis,
+     RooRealVar *ourVar, Int_t *offset)
+ {
+-  if (!dynamic_cast<RooRealVar*>(ourVar)) {
++  if (!dynamic_cast<RooRealVar*>(static_cast<RooAbsArg*>(ourVar))) {
+     coutE(InputArguments) << "RooDataHist::adjustBinning(" << GetName() << ") ERROR: dimension " << ourVar->GetName() << " must be real" << endl ;
+     assert(0) ;
+   }
+diff --git a/roofit/roofitcore/src/RooRealSumFunc.cxx b/roofit/roofitcore/src/RooRealSumFunc.cxx
+index 3f78020acd..a1625d7e35 100644
+--- a/roofit/roofitcore/src/RooRealSumFunc.cxx
++++ b/roofit/roofitcore/src/RooRealSumFunc.cxx
+@@ -149,10 +149,10 @@ RooRealSumFunc::RooRealSumFunc(const char *name, const char *title, const RooArg
+       _coefList.add(*coef);
+    }
+ 
+-   func = (RooAbsReal *)funcIter->Next();
++   func = (RooAbsArg *)funcIter->Next();
+    if (func) {
+       if (!dynamic_cast<RooAbsReal *>(func)) {
+-         coutE(InputArguments) << "RooRealSumFunc::RooRealSumFunc(" << GetName() << ") last func " << coef->GetName()
++         coutE(InputArguments) << "RooRealSumFunc::RooRealSumFunc(" << GetName() << ") last func " << func->GetName()
+                                << " is not of type RooAbsReal, fatal error" << endl;
+          assert(0);
+       }
+diff --git a/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx b/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
+index 2465abf308..24a09d1fc0 100644
+--- a/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
++++ b/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
+@@ -128,7 +128,7 @@ void TDataLoader<TMVAInput_t, TReference<Real_t>>::CopyInput(TMatrixT<Real_t> &m
+    Event *event = nullptr;
+ 
+    Int_t m = matrix.GetNrows();
+-   Int_t n = event->GetNVariables();
++   Int_t n = matrix.GetNcols();
+ 
+    // Copy input variables.
+ 
+-- 
+2.31.1
+
diff --git a/root-ptr-is-null-TStreamerInfo.patch b/root-ptr-is-null-TStreamerInfo.patch
new file mode 100644
index 0000000..869715c
--- /dev/null
+++ b/root-ptr-is-null-TStreamerInfo.patch
@@ -0,0 +1,32 @@
+From 1ca221f010fdcfb6249ae7b1cac77fbe29b86214 Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@cern.ch>
+Date: Mon, 7 Jun 2021 11:02:48 +0200
+Subject: [PATCH] [io] Avoid nullptr deref when printing warning in
+ TStreamerInfo
+
+---
+ io/io/src/TStreamerInfo.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
+index d545ab7be8..a026635890 100644
+--- a/io/io/src/TStreamerInfo.cxx
++++ b/io/io/src/TStreamerInfo.cxx
+@@ -1109,12 +1109,12 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
+                              fClassVersion, GetName(), GetName(), GetName(), fClassVersion);
+                   } else {
+                      Warning("BuildCheck", "\n\
+-   The StreamerInfo from %s does not match existing one (%s:%d)\n\
++   The StreamerInfo does not match existing one (%s:%d)\n\
+    The existing one has not been used yet and will be discarded.\n\
+    Reading should work properly, however writing object of\n\
+    type %s will not work properly.  Most likely the version number\n\
+    of the class was not properly updated [See ClassDef(%s,%d)].",
+-                             file->GetName(), GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
++                             GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
+                   }
+                }
+             }
+-- 
+2.31.1
+
diff --git a/root-python3.8-object.patch b/root-python3.8-object.patch
deleted file mode 100644
index 1cc6c7b..0000000
--- a/root-python3.8-object.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt	2020-06-21 20:54:24.848992803 +0200
-@@ -85,11 +85,6 @@
-     target_compile_options(${libname} PRIVATE -Wno-deprecated-register)
-   endif()
- 
--  # Disables warnings due to new field tp_vectorcall in Python 3.8
--  if(NOT MSVC AND ${python_version_string} VERSION_GREATER_EQUAL "3.8")
--    target_compile_options(${libname} PRIVATE -Wno-missing-field-initializers)
--  endif()
--
-   target_include_directories(${libname}
-      PRIVATE
-         ${CMAKE_SOURCE_DIR}/core/foundation/inc   # needed for string_view backport
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPDataMember.cxx	2020-06-21 20:53:49.651914431 +0200
-@@ -167,7 +167,8 @@
-     sizeof(CPPDataMember),         // tp_basicsize
-     0,                             // tp_itemsize
-     (destructor)pp_dealloc,        // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -216,6 +217,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPExcInstance.cxx	2020-06-21 20:53:49.651914431 +0200
-@@ -158,7 +158,8 @@
-     sizeof(CPPExcInstance),        // tp_basicsize
-     0,                             // tp_itemsize
-     (destructor)ep_dealloc,        // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -211,6 +212,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx	2020-06-21 20:53:49.651914431 +0200
-@@ -746,7 +746,8 @@
-     sizeof(CPPInstance),           // tp_basicsize
-     0,                             // tp_itemsize
-     (destructor)op_dealloc,        // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -798,6 +799,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx	2020-06-21 20:53:49.652914433 +0200
-@@ -866,7 +866,8 @@
-     sizeof(CPPOverload),           // tp_basicsize
-     0,                             // tp_itemsize
-     (destructor)mp_dealloc,        // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -915,6 +916,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx	2020-06-21 20:53:49.652914433 +0200
-@@ -616,7 +616,8 @@
-     sizeof(CPyCppyy::CPPScope),    // tp_basicsize
-     0,                             // tp_itemsize
-     0,                             // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -669,6 +670,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx	2020-06-21 20:53:49.652914433 +0200
-@@ -141,6 +141,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                  // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                  // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                  // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- namespace {
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx	2020-06-21 20:53:49.652914433 +0200
-@@ -34,6 +34,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- //= long type allowed for reference passing ==================================
-@@ -60,6 +66,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- //- custom type representing typedef to pointer of class ---------------------
-@@ -90,6 +102,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                           // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                           // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                           // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- //= instancemethod object with a more efficient call function ================
-@@ -255,6 +273,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- 
-@@ -305,6 +329,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                           // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                           // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                           // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- 
-@@ -364,6 +394,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                           // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                           // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                           // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/LowLevelViews.cxx	2020-06-21 20:53:49.653914436 +0200
-@@ -651,7 +651,8 @@
-     sizeof(CPyCppyy::LowLevelView),// tp_basicsize
-     0,                             // tp_itemsize
-     (destructor)ll_dealloc,        // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -701,6 +702,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx	2020-06-21 20:53:49.653914436 +0200
-@@ -730,7 +730,8 @@
-    sizeof(TemplateProxy),     // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)tpp_dealloc,   // tp_dealloc
--   0,                         // tp_print
-+   0,                         // tp_print (python < 3.8)
-+                              // tp_vectorcall_offset (python >= 3.8)
-    0,                         // tp_getattr
-    0,                         // tp_setattr
-    0,                         // tp_compare
-@@ -779,6 +780,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-    , 0                        // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+   , 0                        // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+   , 0                        // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
-diff -ur root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx
---- root-6.22.00.orig/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/bindings/pyroot/cppyy/CPyCppyy/src/TupleOfInstances.cxx	2020-06-21 20:53:49.653914436 +0200
-@@ -82,6 +82,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                           // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                           // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                           // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- 
-@@ -161,7 +167,8 @@
-     0,                             // tp_basicsize
-     0,                             // tp_itemsize
-     0,                             // tp_dealloc
--    0,                             // tp_print
-+    0,                             // tp_print (python < 3.8)
-+                                   // tp_vectorcall_offset (python >= 3.8)
-     0,                             // tp_getattr
-     0,                             // tp_setattr
-     0,                             // tp_compare
-@@ -211,6 +218,12 @@
- #if PY_VERSION_HEX >= 0x03040000
-     , 0                            // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+    , 0                            // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+    , 0                            // tp_print (python 3.8 only)
-+#endif
-+#endif
- };
- 
- } // namespace CPyCppyy
diff --git a/root-roostats-test-ppc64le-aarch64.patch b/root-roostats-test-ppc64le-aarch64.patch
deleted file mode 100644
index b88d052..0000000
--- a/root-roostats-test-ppc64le-aarch64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 357ac50a2420a4544c9c63594cccb994ee14f870 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 13 Jun 2020 14:23:15 +0200
-Subject: [PATCH] The roofit/roostats/test/testHypoTestInvResult.cxx test fails
- on aarch64 and ppc64le. This commit adjusts the allowed deviation from the
- expected value so that the test passes.
-
-The reported error is (with slight variations in the exact numbers):
-
-/builddir/build/BUILD/root-6.20.06/roofit/roostats/test/testHypoTestInvResult.cxx:24: Failure
-The difference between result->UpperLimitEstimatedError() and 0.059684301 is 1.1846561807221656e-07, which exceeds 1.E-8, where
-result->UpperLimitEstimatedError() evaluates to 0.05968418253438193,
-0.059684301 evaluates to 0.059684301000000002, and
-1.E-8 evaluates to 1e-08.
----
- roofit/roostats/test/testHypoTestInvResult.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/roofit/roostats/test/testHypoTestInvResult.cxx b/roofit/roostats/test/testHypoTestInvResult.cxx
-index 9c2896185a..b89eab9b69 100644
---- a/roofit/roostats/test/testHypoTestInvResult.cxx
-+++ b/roofit/roostats/test/testHypoTestInvResult.cxx
-@@ -21,7 +21,7 @@ TEST(HypoTestInvResult, ReadFromFile)
- 
-   // This just reads members
-   EXPECT_NEAR(result->UpperLimit(), 2.4613465, 1.E-7);
--  EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 1.E-8);
-+  EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 2.E-7);
- 
-   // This accesses the sampling distribution
-   EXPECT_DOUBLE_EQ(result->GetExpectedUpperLimit(0), 1.60988427028569);
--- 
-2.26.2
-
diff --git a/root-setcachefiledir.patch b/root-setcachefiledir.patch
deleted file mode 100644
index 1244734..0000000
--- a/root-setcachefiledir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 532e02a0e5373d26f73495183dc13055e7f13421 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 29 Jun 2020 12:08:15 +0200
-Subject: [PATCH] Add missing call to TFile::SetCacheFileDir(".")
-
-Without it the following TFile::Open call using the CACHEREAD option
-will not work as intended:
-inputFile = TFile::Open(inputFileLink, "CACHEREAD");
----
- tutorials/tmva/TMVA_Higgs_Classification.C | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tutorials/tmva/TMVA_Higgs_Classification.C b/tutorials/tmva/TMVA_Higgs_Classification.C
-index 6b4a8ed028..85dffc2790 100644
---- a/tutorials/tmva/TMVA_Higgs_Classification.C
-+++ b/tutorials/tmva/TMVA_Higgs_Classification.C
-@@ -72,9 +72,8 @@ Define now input data file and signal and background trees
-    if (!inputFile) {
-       // download file from Cernbox location
-       Info("TMVA_Higgs_Classification","Download Higgs_data.root file");
-+      TFile::SetCacheFileDir(".");
-       inputFile = TFile::Open(inputFileLink, "CACHEREAD");
--      //gSystem->Exec( TString::Format("wget -O %s %s",inputFileName.Data(), downloadLinkFile.Data() ) );
--      //inputFile = TFile::Open( inputFileName);
-       if (!inputFile) {
-          Error("TMVA_Higgs_Classification","Input file cannot be downloaded - exit");
-          return;
--- 
-2.26.2
-
diff --git a/root-srm-ifce-deps.patch b/root-srm-ifce-deps.patch
deleted file mode 100644
index 929d799..0000000
--- a/root-srm-ifce-deps.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7e8706b21dc62fc7b56709cf03c2650c715e5b64 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 19 Aug 2020 20:23:15 +0200
-Subject: [PATCH] When building ROOT's libGFAL using gfal2, srm-ifce is not a
- build dependency.
-
----
- cmake/modules/FindGFAL.cmake | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/modules/FindGFAL.cmake b/cmake/modules/FindGFAL.cmake
-index 71163a1714..74028ac5a7 100644
---- a/cmake/modules/FindGFAL.cmake
-+++ b/cmake/modules/FindGFAL.cmake
-@@ -17,22 +17,26 @@ find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h
-           HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
- find_library(GFAL_LIBRARY NAMES gfal gfal2
-              HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
--find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h 
--          HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
- 
- set(GFAL_LIBRARIES ${GFAL_LIBRARY})
--set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
-+set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR})
- 
- if(GFAL_LIBRARY MATCHES gfal2)
-   # use pkg-config to get the directories for glib and then use these values
-   find_package(PkgConfig)
-   pkg_check_modules(GLIB2 REQUIRED glib-2.0)
-   list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS})
-+  set(GFAL_DEP GLIB2_INCLUDE_DIRS)
-+else()
-+  find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h 
-+            HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
-+  list(APPEND GFAL_INCLUDE_DIRS ${SRM_IFCE_INCLUDE_DIR})
-+  set(GFAL_DEP SRM_IFCE_INCLUDE_DIR)
- endif()
- 
- # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
- # all listed variables are TRUE
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY)
-+find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR ${GFAL_DEP} GFAL_LIBRARY)
- 
--mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR)
-+mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS)
--- 
-2.26.2
-
diff --git a/root-stress-s390x.patch b/root-stress-s390x.patch
new file mode 100644
index 0000000..b1d9b9d
--- /dev/null
+++ b/root-stress-s390x.patch
@@ -0,0 +1,39 @@
+From 30cbc0d44364586ac64a3ac0fd6641e338549bbe Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 10 Aug 2021 06:33:17 +0200
+Subject: [PATCH] Adjust tests for s390x
+
+---
+ math/mathcore/test/stress/testGenVector.cxx | 2 +-
+ test/stressMathCore.cxx                     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/math/mathcore/test/stress/testGenVector.cxx b/math/mathcore/test/stress/testGenVector.cxx
+index 8da429c395..df9061c88e 100644
+--- a/math/mathcore/test/stress/testGenVector.cxx
++++ b/math/mathcore/test/stress/testGenVector.cxx
+@@ -79,7 +79,7 @@ TYPED_TEST_P(GenVectorTest, TestGenVectors)
+    scale = this->fDim * 20;
+    if (this->fDim == 3 && this->V2Name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
+    if (this->fDim == 4 && ( this->V2Name() == "PtEtaPhiMVector"  || this->V2Name() == "PxPyPzMVector")) {
+-#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__))
++#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(__s390x__))
+       scale *= 1.E7;
+ #else
+       scale *= 10;
+diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
+index 4d4695a8a0..b6d2d2c9e7 100644
+--- a/test/stressMathCore.cxx
++++ b/test/stressMathCore.cxx
+@@ -1120,7 +1120,7 @@ int testVector(int ngen, bool testio=false) {
+    scale = Dim*20;
+    if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
+    if (Dim==4 && ( VecType<V2>::name() == "PtEtaPhiMVector" || VecType<V2>::name() == "PxPyPzMVector")) {
+-#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__))
++#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(__s390x__))
+       scale *= 1.E7;
+ #else
+       scale *= 10;
+-- 
+2.31.1
+
diff --git a/root-stressGraphics.patch b/root-stressGraphics.patch
deleted file mode 100644
index c7ac170..0000000
--- a/root-stressGraphics.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 141dc7359fa890b081802532b97c25eeb5be5ee1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 29 Jun 2020 12:53:07 +0200
-Subject: [PATCH] Adjust stressGraphics.ref
-
----
- test/stressGraphics.ref | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 38474d0549..2aecf462e8 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -3,7 +3,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-     2      4627       600     14506       100      7608      1500     13368      7900      9208      3000      4690       600
-     3       452        50     12632        50      4797       350     11232      4200      3796     10700       492        50
-     4     23617      1500     19386       100     43077     12000    143320    123000     45665     11000     24908      1500
--    5      1025       150     12802       150     19715      2900     33468      9900     30846      5000      1072       200
-+    5      1025       150     12802       200     19715      2900     33468      9900     30846      5000      1072       200
-     6       430        50     12669        50      4041       400      9558       100      5325       700       471        50
-     7      4980        50     13893        50      8215       310     16143      1300     12230       500      5011        70
-     8      5442        80     13473        50      9599       150     18430       700     12398       300      5469        80
-@@ -41,7 +41,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   GIFRef#   GIFErr#   JPGRef#   JP
-    40     38312       200     56877       250     47205      3900     36524     11800    119641      8000     38121       200
-    41     15025      3000     29289       500     34091      1500     42525     11300     33336      3900     14787      4000
-    42    254604      5000    383258      7000     34608      5000     55666     30400     46534      6500    259594      7000
--   43      4846       150     14075       100     24281       200     33239       600     25303       300      4877       150
-+   43      4846       150     14075       150     24281       200     33239       600     25303       300      4877       150
-    44   1435879    150000     12837       100     96029      4000     25972       100    359846     15000   1085792    250000
-    45      5884       500     16577       200     30259      3500     40706     14000     30026      4000         0         0
-    46      5723       700     15720       200     14291      2600     32236     11000     16916      3200      5670       800
--- 
-2.26.2
-
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index 6821f22..ae180a2 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.22.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.22.00/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.22.00.orig/cmake/modules/SearchInstalledSoftware.cmake	2020-06-14 17:51:48.000000000 +0200
-+++ root-6.22.00/cmake/modules/SearchInstalledSoftware.cmake	2020-06-21 18:29:13.973655810 +0200
-@@ -1592,100 +1592,17 @@
+diff -ur root-6.24.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.24.02/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.24.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2021-06-28 11:17:14.000000000 +0200
++++ root-6.24.02/cmake/modules/SearchInstalledSoftware.cmake	2021-08-11 10:56:26.680731609 +0200
+@@ -1699,102 +1699,17 @@
  
  #---Download googletest--------------------------------------------------------------
  if (testing)
@@ -62,7 +62,9 @@ diff -ur root-6.22.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.22
 -    # Wrap download, configure and build steps in a script to log output
 -    LOG_DOWNLOAD ON
 -    LOG_CONFIGURE ON
--    LOG_BUILD ON)
+-    LOG_BUILD ON
+-    TIMEOUT 600
+-  )
 -
 -  # Specify include dirs for gtest and gmock
 -  ExternalProject_Get_Property(googletest source_dir)
diff --git a/root-uring.patch b/root-uring.patch
new file mode 100644
index 0000000..129c38e
--- /dev/null
+++ b/root-uring.patch
@@ -0,0 +1,55 @@
+diff --git a/io/io/src/RRawFileUnix.cxx b/io/io/src/RRawFileUnix.cxx
+index 829c5e4cb6..417c3adf30 100644
+--- a/io/io/src/RRawFileUnix.cxx
++++ b/io/io/src/RRawFileUnix.cxx
+@@ -115,26 +115,33 @@ void ROOT::Internal::RRawFileUnix::OpenImpl()
+ void ROOT::Internal::RRawFileUnix::ReadVImpl(RIOVec *ioVec, unsigned int nReq)
+ {
+ #ifdef R__HAS_URING
+-   if (RIoUring::IsAvailable()) {
+-      RIoUring ring;
+-      std::vector<RIoUring::RReadEvent> reads;
+-      reads.reserve(nReq);
+-      for (std::size_t i = 0; i < nReq; ++i) {
+-         RIoUring::RReadEvent ev;
+-         ev.fBuffer = ioVec[i].fBuffer;
+-         ev.fOffset = ioVec[i].fOffset;
+-         ev.fSize = ioVec[i].fSize;
+-         ev.fFileDes = fFileDes;
+-         reads.push_back(ev);
++   thread_local bool uring_failed = false;
++   if (!uring_failed) {
++      try {
++         RIoUring ring; // throws std::runtime_error
++         std::vector<RIoUring::RReadEvent> reads;
++         reads.reserve(nReq);
++         for (std::size_t i = 0; i < nReq; ++i) {
++            RIoUring::RReadEvent ev;
++            ev.fBuffer = ioVec[i].fBuffer;
++            ev.fOffset = ioVec[i].fOffset;
++            ev.fSize = ioVec[i].fSize;
++            ev.fFileDes = fFileDes;
++            reads.push_back(ev);
++         }
++         ring.SubmitReadsAndWait(reads.data(), nReq);
++         for (std::size_t i = 0; i < nReq; ++i) {
++            ioVec[i].fOutBytes = reads.at(i).fOutBytes;
++         }
++         return;
+       }
+-      ring.SubmitReadsAndWait(reads.data(), nReq);
+-      for (std::size_t i = 0; i < nReq; ++i) {
+-         ioVec[i].fOutBytes = reads.at(i).fOutBytes;
++      catch(const std::runtime_error &e) {
++         Warning("RIoUring", "io_uring is unexpectedly not available because:\n%s", e.what());
++         Warning("RRawFileUnix",
++              "io_uring setup failed, falling back to blocking I/O in ReadV");
++         uring_failed = true;
+       }
+-      return;
+    }
+-   Warning("RRawFileUnix",
+-           "io_uring setup failed, falling back to default ReadV implementation");
+ #endif
+    RRawFile::ReadVImpl(ioVec, nReq);
+ }
diff --git a/root-werror-fix.patch b/root-werror-fix.patch
deleted file mode 100644
index 341cca9..0000000
--- a/root-werror-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a5185f2cdf509314970c1b332c5926283f6962e2 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 22 Jun 2020 09:21:23 +0200
-Subject: [PATCH] Fix too aggressive -Werror replacements
-
-The replacements removes the -Werror option for externals, which is
-intended. However, it also replaces e.g. -Werror=format-security with
-=format-security, which results in compilation failures due to the
-unknown option =format-security.
----
- builtins/davix/CMakeLists.txt               | 2 +-
- cmake/modules/SearchInstalledSoftware.cmake | 2 +-
- interpreter/CMakeLists.txt                  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt
-index 52614ae2e0..c9b291ec45 100644
---- a/builtins/davix/CMakeLists.txt
-+++ b/builtins/davix/CMakeLists.txt
-@@ -21,7 +21,7 @@ foreach(lib davix neon)
-   list(APPEND DAVIX_LIBRARIES ${DAVIX_PREFIX}/lib/${libname})
- endforeach()
- 
--string(REPLACE "-Werror" "" DAVIX_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" DAVIX_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
- 
- ExternalProject_Add(DAVIX
-   URL ${DAVIX_URL}/davix-${DAVIX_VERSION}.tar.gz
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index ad63f08cd0..36aa88d8cf 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -9,7 +9,7 @@ include(ExternalProject)
- include(FindPackageHandleStandardArgs)
- 
- set(lcgpackages http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources)
--string(REPLACE "-Werror" "" ROOT_EXTERNAL_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" ROOT_EXTERNAL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
- 
- macro(find_package)
-   if(NOT "${ARGV0}" IN_LIST ROOT_BUILTINS)
-diff --git a/interpreter/CMakeLists.txt b/interpreter/CMakeLists.txt
-index 0f43893443..1274758410 100644
---- a/interpreter/CMakeLists.txt
-+++ b/interpreter/CMakeLists.txt
-@@ -140,7 +140,7 @@ if(gcctoolchain)
- endif()
- 
- # We will not fix llvm or clang.
--string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
- 
- if(LLVM_SHARED_LINKER_FLAGS)
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LLVM_SHARED_LINKER_FLAGS}")
--- 
-2.26.2
-
diff --git a/root-xproofd.patch b/root-xproofd.patch
deleted file mode 100644
index a62c8d7..0000000
--- a/root-xproofd.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0a752f33834a3520a7f18433f48bc9e1e9d32cea Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 30 Aug 2020 05:46:42 +0200
-Subject: [PATCH] Only install the xproofd script and man page if xproofd
- option is on
-
----
- CMakeLists.txt                        | 7 ++++++-
- cmake/modules/RootConfiguration.cmake | 4 ++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76f6ad93b3..b37a1bbe70 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -528,7 +528,12 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-   if(webgui)
-      install(DIRECTORY ui5/    DESTINATION ${CMAKE_INSTALL_OPENUI5DIR})
-   endif()
--  install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR})
-+  if(xproofd AND xrootd AND ssl)
-+     set(MAN_PATT_EXCL)
-+  else()
-+     set(MAN_PATT_EXCL PATTERN xproofd.1 EXCLUDE)
-+  endif()
-+  install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR} ${MAN_PATT_EXCL})
-   install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-   install(FILES
-     cmake/modules/RootMacros.cmake
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index 151235aa4e..a71ac72101 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -819,7 +819,7 @@ configure_file(${CMAKE_SOURCE_DIR}/config/setxrd.sh ${CMAKE_RUNTIME_OUTPUT_DIREC
- configure_file(${CMAKE_SOURCE_DIR}/config/proofserv.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/proofserv @ONLY NEWLINE_STYLE UNIX)
- configure_file(${CMAKE_SOURCE_DIR}/config/roots.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/roots @ONLY NEWLINE_STYLE UNIX)
- configure_file(${CMAKE_SOURCE_DIR}/config/root-help.el.in root-help.el @ONLY NEWLINE_STYLE UNIX)
--if (XROOTD_FOUND AND XROOTD_NOMAIN)
-+if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
-   configure_file(${CMAKE_SOURCE_DIR}/config/xproofd.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd @ONLY NEWLINE_STYLE UNIX)
- endif()
- if(WIN32)
-@@ -857,7 +857,7 @@ install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/memprobe
-                           WORLD_EXECUTE WORLD_READ
-               DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--if (XROOTD_FOUND AND XROOTD_NOMAIN)
-+if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
-    install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd
-                  PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-                              GROUP_EXECUTE GROUP_READ
--- 
-2.26.2
-
diff --git a/root.spec b/root.spec
index e61c683..26aeb7a 100644
--- a/root.spec
+++ b/root.spec
@@ -13,8 +13,6 @@
 %endif
 %global python3_version_uscore %(tr . _ <<< "%{python3_version}")
 
-%global py3_soabi %([ -x %{__python3} ] && %{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))")
-
 %if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
 # Building the experimental ROOT 7 classes requires c++-14.
 # This is the default for gcc 6.1 and later.
@@ -51,9 +49,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.22.08
+Version:	6.24.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	11%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -83,105 +81,64 @@ Patch0:		%{name}-fontconfig.patch
 Patch1:		%{name}-32bit-dataframe.patch
 #		Unbundle gtest
 Patch2:		%{name}-unbundle-gtest.patch
-#		Fix multicore tests when running on machines with few cores
-#		https://github.com/root-project/root/pull/8068
-Patch3:		%{name}-fix-multicore-tests-with-few-cores.patch
-#		Fedora's llvm patches
-Patch4:		%{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
-Patch5:		%{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
-Patch6:		%{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
 #		Reduce memory usage of build
 #		Do not link rootcling_stage1 and libCling in parallel
-Patch7:		%{name}-memory-usage.patch
+Patch3:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llmv libraries.
 #		Fedora builders run out of memory with the default setting.
-Patch8:		%{name}-memory-arm-x86.patch
+Patch4:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
-Patch9:		%{name}-dont-install-minicern.patch
+Patch5:		%{name}-dont-install-minicern.patch
 #		Do not export Python modules in CMake config
-Patch10:	%{name}-no-export-python-modules.patch
+Patch6:		%{name}-no-export-python-modules.patch
 #		Don't create documentation notebooks
-Patch11:	%{name}-doc-no-notebooks.patch
+Patch7:		%{name}-doc-no-notebooks.patch
 #		Don't run tutorials that crash during doc generation
-Patch12:	%{name}-doxygen-crash.patch
+Patch8:		%{name}-doxygen-crash.patch
 #		Compatibility with older gtest
-Patch13:	%{name}-old-gtest-compat.patch
-#		Fix -Wmissing-field-initializers in python bindings for
-#		Python 3.8 and 3.9
-#		https://github.com/root-project/root/pull/5158
-Patch14:	%{name}-python3.8-object.patch
+Patch9:		%{name}-old-gtest-compat.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch15:	%{name}-32bit-tests.patch
+Patch10:	%{name}-32bit-tests.patch
 #		Workaround for initialization problems for PyROOT on
 #		EPEL7 ppc64le
 #		https://sft.its.cern.ch/jira/browse/ROOT-10622
-Patch16:	%{name}-epel7-ppc64le-pyroot.patch
-#		Fix test failure on ppc64le and aarch64
-#		https://github.com/root-project/root/pull/5867
-Patch17:	%{name}-roostats-test-ppc64le-aarch64.patch
-#		Fix too aggressive -Werror replacements
-#		https://github.com/root-project/root/pull/5902
-Patch18:	%{name}-werror-fix.patch
-#		Add missing call to TFile::SetCacheFileDir in a TMVA tutorial
-#		https://github.com/root-project/root/pull/5944
-Patch19:	%{name}-setcachefiledir.patch
-#		Adjust stressGraphics.ref
-#		https://github.com/root-project/root/pull/5957
-Patch20:	%{name}-stressGraphics.patch
-#		Fix off-by-one error in histogram v7 bin iterator
-#		https://github.com/root-project/root/pull/5958
-Patch21:	%{name}-histv7-bin-iterator.patch
-#		Add back line accidentally removed in root-config
-#		https://github.com/root-project/root/pull/6236
-Patch22:	%{name}-config-restore.patch
-#		Fix the RNTuple.LargeFile test on 32bit (i386 and armv7hf)
-#		https://github.com/root-project/root/pull/5977
-Patch23:	%{name}-ntuple-largefile.patch
-#		Headers in new PyROOT are not installed with COMPONENT headers
-#		https://github.com/root-project/root/pull/6237
-Patch24:	%{name}-install-headers-with-COMPONENT-headers.patch
-#		Fix doxygen issues
-#		https://github.com/root-project/root/pull/6029
-Patch25:	%{name}-doxygen-filenames.patch
-Patch26:	%{name}-doxygen-endof-part2.patch
-Patch27:	%{name}-doxygen-parameter-names.patch
-Patch28:	%{name}-doxygen-macro-name.patch
-Patch29:	%{name}-doxygen-missing-underscore.patch
-Patch30:	%{name}-doxygen-md-comments.patch
-#		Fix bad regex in TProofMgr
-#		https://github.com/root-project/root/pull/6030
-Patch31:	%{name}-fix-bad-regex.patch
-#		Increase timeout for ppc64le
-#		https://github.com/root-project/root/pull/6246
-Patch32:	%{name}-increase-timeout-for-ppc64le.patch
-#		Only install the xproofd script and man page if option is on
-#		https://github.com/root-project/root/pull/6281
-Patch33:	%{name}-xproofd.patch
-#		Avoid unneeded build requirement on srm-ifce-devel
-#		https://github.com/root-project/root/pull/6233
-Patch34:	%{name}-srm-ifce-deps.patch
-#		Fix a shadow warning
-#		https://github.com/root-project/root/pull/6029
-Patch35:	%{name}-fix-a-shadow-warning.patch
-#		Do not attempt to load_library the ROOT Pythonizations module
-#		https://github.com/root-project/root/pull/6883
-Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
-#		Filter out additional vDSO names for ppc
-#		https://github.com/root-project/root/pull/6887
-Patch37:	%{name}-linux-vdso.patch
-#		JupyROOT has problems loading JSRootCore.js in jupyterlab
-#		Backported from upstream git
-#		https://github.com/root-project/root/issues/8459
-#		https://bugzilla.redhat.com/show_bug.cgi?id=1973189
-Patch38:	%{name}-jupyroot-jupyterlab-compat.patch
-#		Use local static script and style files for JupyROOT
-Patch39:	%{name}-jupyroot-static.patch
-
-#		s390x suffers from endian issues resulting in failing tests
-#		and broken documentation generation
-#		https://sft.its.cern.ch/jira/browse/ROOT-8703
-ExcludeArch:	s390x
+Patch11:	%{name}-epel7-ppc64le-pyroot.patch
+#		Use local static script and style files for JsMVA
+Patch12:	%{name}-jsmva-static.patch
+#		Compatibility with older python versions (no f-strings)
+Patch13:	%{name}-older-python.patch
+#		Fix multicore tests when running on machines with few cores
+#		https://github.com/root-project/root/pull/8068
+Patch14:	%{name}-fix-multicore-tests-with-few-cores.patch
+#		Reapply altivec fix lost in the LLVM 9 upgrade
+#		https://github.com/root-project/root/pull/8069
+Patch15:	%{name}-fix-ppc64le-compilation-with-gcc-10.patch
+#		Actually request the use of the large code model for ppc64le
+#		https://github.com/root-project/root/pull/8230
+Patch16:	%{name}-ppc-codemodel.patch
+#		Do not request the large code model for ppc64le
+#		It causes segmentation faults
+Patch17:	%{name}-ppc-no-codemodel.patch
+#		Fall back to blocking I/O if uring fails
+#		Backported
+#		- commit 691403b2cc504fd4e3e7227894023913014a61ff
+#		- commit 956951ee2af83426d73ad72b2d966f9f1acbea83
+#		- commit 16e64da11edf91fcf31c2fc474f573fca2ee863c
+#		- commit 311a6822f9b0fd438c4210ed60617b45f2ddbe74
+Patch18:	%{name}-uring.patch
+#		Add missing classes in LinkDef.h files
+#		Backported
+Patch19:	%{name}-add-TTreeProcessorMP-to-LinkDef-file.patch
+Patch20:	%{name}-add-RDisplay-to-LinkDef-file.patch
+Patch21:	%{name}-add-RCutFlowReport-to-LinkDef-file.patch
+#		Fix "pointer is null" warnings
+#		Backported
+Patch22:	%{name}-ptr-is-null-RooFit-TMVA.patch
+Patch23:	%{name}-ptr-is-null-TStreamerInfo.patch
+#		Fix two failing tests on s390x
+#		https://github.com/root-project/root/pull/8826
+Patch24:	%{name}-stress-s390x.patch
 
 BuildRequires:	make
 %if %{?rhel}%{!?rhel:0} == 7
@@ -275,6 +232,13 @@ BuildRequires:	cmake-data >= 3.18.3-1
 %else
 BuildRequires:	openblas-devel
 %endif
+BuildRequires:	json-devel
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	liburing-devel
+%endif
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires:	python%{python3_pkgversion}-pandas
+%endif
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
@@ -527,6 +491,17 @@ Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
 TMVA interface used by JupyROOT.
+
+%package -n python2-distrdf
+Summary:	Distributed RDataFrame
+BuildArch:	noarch
+%{?python_provide:%python_provide python2-distrdf}
+Requires:	python2-%{name} = %{version}-%{release}
+Requires:	%{name}-tree-dataframe = %{version}-%{release}
+
+%description -n python2-distrdf
+A layer on top of RDataFrame to enable distributed computations. It is
+a port of the previously known PyRDF python package.
 %endif
 
 %package -n python%{python3_pkgversion}-%{name}
@@ -573,6 +548,17 @@ Requires:	%{name}-tmva = %{version}-%{release}
 %description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
+%package -n python%{python3_pkgversion}-distrdf
+Summary:	Distributed RDataFrame
+BuildArch:	noarch
+%{?python_provide:%python_provide python%{python3_pkgversion}-distrdf}
+Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
+Requires:	%{name}-tree-dataframe = %{version}-%{release}
+
+%description -n python%{python3_pkgversion}-distrdf
+A layer on top of RDataFrame to enable distributed computations. It is
+a port of the previously known PyRDF python package.
+
 %package r
 Summary:	R interface for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -870,6 +856,7 @@ in ROOT.
 %package gui-recorder
 Summary:	Interface for recording and replaying events in ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -1298,7 +1285,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot
+Requires:	js-jsroot >= 6
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1423,6 +1410,7 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
@@ -1454,6 +1442,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1479,6 +1468,7 @@ License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1498,6 +1488,25 @@ suitable for adoption in different disciplines as well.
 
 This package contains RooFit classes that use the mathmore library.
 
+%package roofit-batchcompute
+Summary:	Optimized computation functions for PDFs
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+
+%description roofit-batchcompute
+While fitting, a significant amount of time and processing power is
+spent on computing the probability function for every event and PDF
+involved in the fitting model. To speed up this process, roofit can
+use the computation functions provided in this library. The functions
+provided here process whole data arrays (batches) instead of a single
+event at a time, as in the legacy evaluate() function in roofit. In
+addition, the code is written in a manner that allows for compiler
+optimizations, notably auto-vectorization. This library is compiled
+multiple times for different vector instuction set architectures and
+the optimal code is executed during runtime, as a result of an
+automatic hardware detection mechanism that this library contains.
+
 %package roostats
 Summary:	Statistical tools built on top of RooFit
 License:	BSD
@@ -1721,7 +1730,7 @@ written in python.
 Summary:	Static files for the Jupyter ROOT Notebook
 BuildArch:	noarch
 Requires:	%{name}-core = %{version}-%{release}
-Requires:	js-jsroot
+Requires:	js-jsroot >= 6
 %if %{?fedora}%{!?fedora:0} >= 26
 #		jupyter-notebook not available in
 #		Fedora <= 25 or RHEL/EPEL - some functionality missing
@@ -1754,6 +1763,7 @@ Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
@@ -1770,6 +1780,7 @@ Summary:	GUI browsable (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
@@ -1781,6 +1792,8 @@ Summary:	Browser (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-eve7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
@@ -1897,21 +1910,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1920,8 +1918,17 @@ rm -rf graf2d/asimage/src/libAfterImage
 rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 #  * freetype
 rm -rf graf2d/freetype/src
-#  * davix, glew, lz4, openssl, pcre, xxhash, zlib, zstd
-rm -rf builtins
+#  * davix, glew, lz4, nlohmann, openssl, pcre, tbb, xxhash, zlib, zstd
+rm -rf builtins/davix
+rm -rf builtins/glew
+rm -rf builtins/lz4
+rm -rf builtins/nlohmann
+rm -rf builtins/openssl
+rm -rf builtins/pcre
+rm -rf builtins/tbb
+rm -rf builtins/xxhash
+rm -rf builtins/zlib
+rm -rf builtins/zstd
 #  * lzma
 rm -rf core/lzma/src/*.tar.gz
 #  * gl2ps
@@ -1944,9 +1951,6 @@ sed /RWrap_libcpp_string_view.h/d -i build/unix/module.modulemap
 #  * jsroot
 rm -rf js/*
 
-# Fix file permissions
-chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp
-
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
@@ -1995,6 +1999,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_afterimage:BOOL=OFF \
        -Dbuiltin_cfitsio:BOOL=OFF \
        -Dbuiltin_clang:BOOL=ON \
+       -Dbuiltin_cling:BOOL=ON \
        -Dbuiltin_davix:BOOL=OFF \
        -Dbuiltin_fftw3:BOOL=OFF \
        -Dbuiltin_freetype:BOOL=OFF \
@@ -2005,7 +2010,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_llvm:BOOL=ON \
        -Dbuiltin_lz4:BOOL=OFF \
        -Dbuiltin_lzma:BOOL=OFF \
+       -Dbuiltin_nlohmannjson:BOOL=OFF \
        -Dbuiltin_openssl:BOOL=OFF \
+       -Dbuiltin_openui5:BOOL=ON \
        -Dbuiltin_pcre:BOOL=OFF \
        -Dbuiltin_tbb:BOOL=OFF \
        -Dbuiltin_unuran:BOOL=OFF \
@@ -2020,20 +2027,15 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Darrow:BOOL=OFF \
        -Dasimage:BOOL=ON \
        -Dccache:BOOL=OFF \
+       -Ddistcc:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
        -Dclad:BOOL=OFF \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
 %if %{root7}
-%if %{?fedora}%{!?fedora:0} >= 34
-       -DCMAKE_CXX_STANDARD=17 \
-%else
-       -DCMAKE_CXX_STANDARD=14 \
-%endif
        -Droot7:BOOL=ON \
        -Dwebgui:BOOL=ON \
 %else
-       -DCMAKE_CXX_STANDARD=11 \
        -Droot7:BOOL=OFF \
        -Dwebgui:BOOL=OFF \
 %endif
@@ -2107,6 +2109,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-pymva:BOOL=ON \
        -Dtmva-rmva:BOOL=ON \
        -Dunuran:BOOL=ON \
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+       -During:BOOL=ON \
+%else
+       -During:BOOL=OFF \
+%endif
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=OFF \
        -Dveccore:BOOL=OFF \
@@ -2203,6 +2210,7 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so
 
 mkdir -p %{buildroot}%{python2_sitelib}
 cp -pr %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
+cp -pr %{buildroot}%{_libdir}/%{name}/DistRDF %{buildroot}%{python2_sitelib}
 
 # Create .egg-info files so that rpm auto-generates provides
 echo 'Name: ROOT' > \
@@ -2217,6 +2225,10 @@ echo 'Name: JsMVA' > \
     %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 echo 'Version: %{version}' >> \
     %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
+echo 'Name: DistRDF' > \
+    %{buildroot}%{python2_sitelib}/DistRDF-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python2_sitelib}/DistRDF-%{version}.egg-info
 
 %endif
 
@@ -2225,7 +2237,7 @@ mkdir -p %{buildroot}%{python3_sitearch}
 
 mv %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python3_sitearch}
 ln -s ../../root/libcppyy%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libcppyy%{python3_version_uscore}.%{py3_soabi}.so
+   %{buildroot}%{python3_sitearch}/libcppyy%{python3_version_uscore}%{python3_ext_suffix}
 
 mv %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python3_sitearch}
 ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
@@ -2233,18 +2245,19 @@ ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
 
 mv %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python3_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.%{py3_soabi}.so
+   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
 rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{libversion}
 rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so
 
 mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
 mv %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.%{py3_soabi}.so
+   %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}%{python3_ext_suffix}
 rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{libversion}
 rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so
 
 mkdir -p %{buildroot}%{python3_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{_libdir}/%{name}/DistRDF %{buildroot}%{python3_sitelib}
 
 # Create .egg-info files so that rpm auto-generates provides
 echo 'Name: ROOT' > \
@@ -2259,6 +2272,10 @@ echo 'Name: JsMVA' > \
     %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 echo 'Version: %{version}' >> \
     %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
+echo 'Name: DistRDF' > \
+    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
+echo 'Version: %{version}' >> \
+    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
 
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
@@ -2284,8 +2301,7 @@ sed -e '/^\#!/d' \
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/kernels
-
-ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/notebook
+rm     %{buildroot}%{_datadir}/%{name}/notebook/jupyter_notebook_config.py
 
 # Replace the rootnb.exe wrapper with a simpler one
 cat > %{buildroot}%{_bindir}/rootnb.exe << EOF
@@ -2345,6 +2361,9 @@ rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
 pushd %{buildroot}%{_datadir}/%{name}/plugins
+%if ! %{root7}
+rm TBrowserImp/P030_RWebBrowserImp.C
+%endif
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P070_TAlienFile.C
 rm TGLManager/P020_TGWin32GLManager.C
@@ -2494,11 +2513,22 @@ popd
 #   http://root.cern.ch/files/root_download_stats.sqlite
 #
 # - gtest-tree-treeplayer-test-treeprocessormt-remotefiles
-# - tutorial-dataframe-df102_NanoAODDimuonAnalysis
-# - tutorial-dataframe-df103_NanoAODHiggsAnalysis
+# - tutorial-dataframe-df102_NanoAODDimuonAnalysis(-py)?
+# - tutorial-dataframe-df103_NanoAODHiggsAnalysis(-py)?
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
 #
+# - tutorial-dataframe-df104_HiggsToTwoPhotons-py
+# - tutorial-dataframe-df105_WBosonAnalysis-py
+# - tutorial-dataframe-df106_HiggsToFourLeptons-py
+# - tutorial-dataframe-df107_SingleTopAnalysis-py
+#   reads input data over network:
+#   root://eospublic.cern.ch//eos/opendata/atlas/OutreachDatasets/2020-01-22/
+#
+# - tutorial-v7-climate-global_temperatures
+#   reads input data over network
+#   http://root.cern./files/tutorials/GlobalLandTemperaturesByCity.csv
+#
 # - tutorial-v7-ntuple-ntpl003_lhcbOpenData
 #   reads input data over network
 #   http://root.cern.ch/files/LHCb/lhcb_B2HHH_MagnetUp.root (425 MB)
@@ -2525,9 +2555,32 @@ popd
 #   reads input data over network
 #   http://root.cern/files/tmva101.root
 #
+# - pyunittests-pyroot-dependency-versions
 # - pyunittests-pyroot-numbadeclare
+# - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
 #   these tests require the numba python module which is not available
+#
+# - tutorial-v7-concurrentfill.cxx
+# - tutorial-v7-draw.cxx
+# - tutorial-v7-draw_frame.cxx
+# - tutorial-v7-draw_legend.cxx
+# - tutorial-v7-draw_mt.cxx
+# - tutorial-v7-draw_rh1.cxx
+# - tutorial-v7-draw_rh1_large.cxx
+# - tutorial-v7-draw_rh2.cxx
+# - tutorial-v7-draw_rh2_colz.cxx
+# - tutorial-v7-draw_rh2_large.cxx
+# - tutorial-v7-draw_rh3.cxx
+# - tutorial-v7-draw_rh3_large.cxx
+# - tutorial-v7-draw_subpads.cxx
+# - tutorial-v7-histops.cxx
+# - tutorial-v7-perf.cxx
+# - tutorial-v7-perfcomp.cxx
+# - tutorial-v7-simple.cxx
+#   Fails with "already deserialized this template specialization"
+#   https://github.com/root-project/root/issues/8073
+
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2541,6 +2594,11 @@ tutorial-dataframe-df..._SQlite|\
 gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
 tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
+tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
+tutorial-dataframe-df105_WBosonAnalysis-py|\
+tutorial-dataframe-df106_HiggsToFourLeptons-py|\
+tutorial-dataframe-df107_SingleTopAnalysis-py|\
+tutorial-v7-climate-global_temperatures|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
 tutorial-v7-line.cxx|\
@@ -2550,8 +2608,48 @@ gtest-tmva-tmva-test-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
 tutorial-tmva-tmva004_RStandardScaler|\
 tutorial-tmva-tmva103_Application|\
+pyunittests-pyroot-dependency-versions|\
 pyunittests-pyroot-numbadeclare|\
-tutorial-pyroot-pyroot004_NumbaDeclare-py"
+test-import-numba|\
+tutorial-pyroot-pyroot004_NumbaDeclare-py|\
+tutorial-v7-concurrentfill.cxx|\
+tutorial-v7-draw.cxx|\
+tutorial-v7-draw_frame.cxx|\
+tutorial-v7-draw_legend.cxx|\
+tutorial-v7-draw_mt.cxx|\
+tutorial-v7-draw_rh1.cxx|\
+tutorial-v7-draw_rh1_large.cxx|\
+tutorial-v7-draw_rh2.cxx|\
+tutorial-v7-draw_rh2_colz.cxx|\
+tutorial-v7-draw_rh2_large.cxx|\
+tutorial-v7-draw_rh3.cxx|\
+tutorial-v7-draw_rh3_large.cxx|\
+tutorial-v7-draw_subpads.cxx|\
+tutorial-v7-histops.cxx|\
+tutorial-v7-perf.cxx|\
+tutorial-v7-perfcomp.cxx|\
+tutorial-v7-simple.cxx"
+
+%if %{?rhel}%{!?rhel:0} == 7
+# - test-import-pandas
+# - tutorial-dataframe-df026_AsNumpyArrays-py
+#   requires the pandas python module which is not available in EPEL 7
+#
+# - tutorial-multicore-mp001_fillHistos
+# - tutorial-multicore-mp101_fillNtuples
+# - tutorial-multicore-mp102_readNtuplesFillHistosAndFit
+# - tutorial-multicore-mp201_parallelHistoFill
+#   fails intermittently on EPEL 7 with the error
+#   symbol '_Z6MPRecvP7TSocket' unresolved while linking
+#   symbol '_Z6MPSendP7TSocketj' unresolved while linking
+excluded="${excluded}|\
+test-import-pandas|\
+tutorial-dataframe-df026_AsNumpyArrays-py|\
+tutorial-multicore-mp001_fillHistos|\
+tutorial-multicore-mp101_fillNtuples|\
+tutorial-multicore-mp102_readNtuplesFillHistosAndFit|\
+tutorial-multicore-mp201_parallelHistoFill"
+%endif
 
 %ifarch %{ix86} %{arm}
 # Tests failing on 32 bit architectures (dataframe)
@@ -2559,51 +2657,226 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py"
 # - gtest-tree-dataframe-test-dataframe-cache
 # - gtest-tree-dataframe-test-dataframe-callbacks
 # - gtest-tree-dataframe-test-dataframe-colnames
+# - gtest-tree-dataframe-test-dataframe-concurrency
 # - gtest-tree-dataframe-test-dataframe-display
 # - gtest-tree-dataframe-test-dataframe-friends
 # - gtest-tree-dataframe-test-dataframe-helpers
 # - gtest-tree-dataframe-test-dataframe-interface
+# - gtest-tree-dataframe-test-dataframe-leaves
 # - gtest-tree-dataframe-test-dataframe-ranges
+# - gtest-tree-dataframe-test-dataframe-regression
 # - gtest-tree-dataframe-test-dataframe-simple
 # - gtest-tree-dataframe-test-dataframe-snapshot
-# - gtest-tree-dataframe-test-datasource-root
+# - gtest-tree-dataframe-test-dataframe-vecops
+# - gtest-tree-dataframe-test-datasource-csv
+# - gtest-tree-dataframe-test-datasource-more
+# - gtest-tree-dataframe-test-datasource-sqlite
 # - gtest-tree-dataframe-test-datasource-trivial
 excluded="${excluded}|\
 gtest-tree-dataframe-test-dataframe-cache|\
 gtest-tree-dataframe-test-dataframe-callbacks|\
 gtest-tree-dataframe-test-dataframe-colnames|\
+gtest-tree-dataframe-test-dataframe-concurrency|\
 gtest-tree-dataframe-test-dataframe-display|\
 gtest-tree-dataframe-test-dataframe-friends|\
 gtest-tree-dataframe-test-dataframe-helpers|\
 gtest-tree-dataframe-test-dataframe-interface|\
+gtest-tree-dataframe-test-dataframe-leaves|\
 gtest-tree-dataframe-test-dataframe-ranges|\
+gtest-tree-dataframe-test-dataframe-regression|\
 gtest-tree-dataframe-test-dataframe-simple|\
 gtest-tree-dataframe-test-dataframe-snapshot|\
-gtest-tree-dataframe-test-datasource-root|\
+gtest-tree-dataframe-test-dataframe-vecops|\
+gtest-tree-dataframe-test-datasource-csv|\
+gtest-tree-dataframe-test-datasource-more|\
+gtest-tree-dataframe-test-datasource-sqlite|\
 gtest-tree-dataframe-test-datasource-trivial"
 %endif
 
 %ifarch %{arm}
-# This test fails on 32 bit arm
+# 32 bit arm specific failures
+#
+# - gtest-tree-tree-test-testBulkApi
 # - gtest-tree-tree-test-testBulkApiSillyStruct
-excluded="${excluded}|gtest-tree-tree-test-testBulkApiSillyStruct"
+#   segmentation fault - bus error
+#
+# - gtest-tree-dataframe-test-dataframe-histomodels
+# - gtest-tree-ntuple-v7-test-ntuple-rdf
+# - pyunittests-dataframe-cache
+# - pyunittests-dataframe-histograms
+# - pyunittests-dataframe-merge-results
+# - pyunittests-dataframe-misc
+# - pyunittests-pyroot-pyz-rdataframe-makenumpy
+# - pyunittests-pyroot-pyz-tf-pycallables
+# - test-stressiterators-interpreted
+# - tutorial-dataframe-df001_introduction(-py)
+# - tutorial-dataframe-df002_dataModel(-py)
+# - tutorial-dataframe-df003_profiles(-py)
+# - tutorial-dataframe-df005_fillAnyObject
+# - tutorial-dataframe-df006_ranges(-py)
+# - tutorial-dataframe-df007_snapshot(-py)
+# - tutorial-dataframe-df010_trivialDataSource(-py)
+# - tutorial-dataframe-df012_DefinesAndFiltersAsStrings(-py)
+# - tutorial-dataframe-df014_CSVDataSource(-py)
+# - tutorial-dataframe-df015_LazyDataSource
+# - tutorial-dataframe-df016_vecOps(-py)
+# - tutorial-dataframe-df017_vecOpsHEP(-py)
+# - tutorial-dataframe-df019_Cache(-py)
+# - tutorial-dataframe-df020_helpers
+# - tutorial-dataframe-df021_createTGraph(-py)
+# - tutorial-dataframe-df022_useKahan
+# - tutorial-dataframe-df025_RNode
+# - tutorial-dataframe-df031_Stats(-py)
+# - tutorial-hist-sparsehist
+# - tutorial-r-example
+# - tutorial-r-DataFrame
+# - tutorial-r-Function
+# - tutorial-r-Functor
+# - tutorial-r-GlobalMinimization
+# - tutorial-r-Integration
+# - tutorial-r-Minimization
+#   Not implemented relocation type!
+excluded="${excluded}|\
+gtest-tree-tree-test-testBulkApi\$\$|\
+gtest-tree-tree-test-testBulkApiSillyStruct|\
+gtest-tree-dataframe-test-dataframe-histomodels|\
+gtest-tree-ntuple-v7-test-ntuple-rdf|\
+pyunittests-dataframe-cache|\
+pyunittests-dataframe-histograms|\
+pyunittests-dataframe-merge-results|\
+pyunittests-dataframe-misc|\
+pyunittests-pyroot-pyz-rdataframe-makenumpy|\
+pyunittests-pyroot-pyz-tf-pycallables|\
+test-stressiterators-interpreted|\
+tutorial-dataframe-df001_introduction|\
+tutorial-dataframe-df002_dataModel|\
+tutorial-dataframe-df003_profiles|\
+tutorial-dataframe-df005_fillAnyObject|\
+tutorial-dataframe-df006_ranges|\
+tutorial-dataframe-df007_snapshot|\
+tutorial-dataframe-df010_trivialDataSource|\
+tutorial-dataframe-df012_DefinesAndFiltersAsStrings|\
+tutorial-dataframe-df014_CSVDataSource|\
+tutorial-dataframe-df015_LazyDataSource|\
+tutorial-dataframe-df016_vecOps|\
+tutorial-dataframe-df017_vecOpsHEP|\
+tutorial-dataframe-df019_Cache|\
+tutorial-dataframe-df020_helpers|\
+tutorial-dataframe-df021_createTGraph|\
+tutorial-dataframe-df022_useKahan|\
+tutorial-dataframe-df025_RNode|\
+tutorial-dataframe-df031_Stats|\
+tutorial-hist-sparsehist|\
+tutorial-r-example|\
+tutorial-r-DataFrame|\
+tutorial-r-Function|\
+tutorial-r-Functor|\
+tutorial-r-GlobalMinimization|\
+tutorial-r-Integration|\
+tutorial-r-Minimization"
 %endif
 
 %ifarch %{power64} aarch64
 # This test fails on ppc64le and aarch64 (but not on x86_64)
 # The interpreted version works though, only compiled version fails
 # - test-stresshistofit
-excluded="${excluded}|test-stresshistofit"
+excluded="${excluded}|test-stresshistofit\$\$"
 %endif
 
-%ifarch %{ix86}
-# This test fails with "symbol '__atomic_fetch_add_8' unresolved" on ix86
-# https://github.com/root-project/root/issues/6813
-excluded="${excluded}|pyunittests-pyroot-pyz-ttree-branch-attr"
+%ifarch %{power64}
+# PPC64LE specific failures
+#
+# - test-stressgraphics(-interpreted)
+excluded="${excluded}|test-stressgraphics"
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+# - pyunittests-pyroot-pyz-array-interface
+# - pyunittests-pyroot-pyz-rdataframe-asnumpy
+# - pyunittests-pyroot-pyz-rdataframe-makenumpy
+# - pyunittests-pyroot-pyz-rvec-asrvec
+# - pyunittests-pyroot-pyz-ttree-asmatrix
+# - tutorial-dataframe-df026_AsNumpyArrays-py
+# - tutorial-pyroot-pyroot001_arrayInterface-py
+# - tutorial-pyroot-pyroot002_TTreeAsMatrix-py
+excluded="${excluded}|\
+pyunittests-pyroot-pyz-array-interface|\
+pyunittests-pyroot-pyz-rdataframe-asnumpy|\
+pyunittests-pyroot-pyz-rdataframe-makenumpy|\
+pyunittests-pyroot-pyz-rvec-asrvec|\
+pyunittests-pyroot-pyz-ttree-asmatrix|\
+tutorial-dataframe-df026_AsNumpyArrays-py|\
+tutorial-pyroot-pyroot001_arrayInterface-py|\
+tutorial-pyroot-pyroot002_TTreeAsMatrix-py"
+%endif
+
+%if %{?fedora}%{!?fedora:0}
+# - pyunittests-pyroot-pyz-rtensor
+# - pyunittests-pyroot-pyz-ttree-branch
+# - pyunittests-pyroot-pyz-ttree-setbranchaddress
+# - tutorial-r-example
+# - tutorial-r-DataFrame
+# - tutorial-r-Function
+# - tutorial-r-Functor
+# - tutorial-r-GlobalMinimization
+# - tutorial-r-Integration
+# - tutorial-r-Interpolation
+# - tutorial-r-Minimization
+# - tutorial-r-SimpleFitting
+# - tutorial-tmva-envelope-classification
+# - tutorial-tmva-TMVA*
+#   Relocation R_PPC64_REL32 overflow
+excluded="${excluded}|\
+pyunittests-pyroot-pyz-rtensor|\
+pyunittests-pyroot-pyz-ttree-branch|\
+pyunittests-pyroot-pyz-ttree-setbranchaddress|\
+tutorial-r-example|\
+tutorial-r-DataFrame|\
+tutorial-r-Function|\
+tutorial-r-Functor|\
+tutorial-r-GlobalMinimization|\
+tutorial-r-Integration|\
+tutorial-r-Interpolation|\
+tutorial-r-Minimization|\
+tutorial-r-SimpleFitting|\
+tutorial-tmva-envelope-classification|\
+tutorial-tmva-TMVA"
+%endif
+%endif
+
+%ifarch s390x
+# s390x specific failures
+#
+# - gtest-roofit-roofitcore-test-testNaNPacker
+# - gtest-tree-ntuple-v7-test-ntuple-basics
+# - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-minifile
+# - gtest-tree-ntuple-v7-test-ntuple-storage
+# - pyunittests-pyroot-pyz-rtensor
+# - test-stresshistogram(-interpreted)
+# - test-stresshistofit(-interpreted)
+# - tutorial-dataframe-df006_ranges-py
+# - tutorial-roofit-rf203_ranges-py
+# - tutorial-roofit-rf612_recoverFromInvalidParameters
+# - tutorial-roofit-rf902_numgenconfig-py
+# - tutorial-v7-ntuple-ntpl005_introspection
+excluded="${excluded}|\
+gtest-roofit-roofitcore-test-testNaNPacker|\
+gtest-tree-ntuple-v7-test-ntuple-basics|\
+gtest-tree-ntuple-v7-test-ntuple-extended|\
+gtest-tree-ntuple-v7-test-ntuple-minifile|\
+gtest-tree-ntuple-v7-test-ntuple-storage|\
+pyunittests-pyroot-pyz-rtensor|\
+test-stresshistogram|\
+test-stresshistofit|\
+tutorial-dataframe-df006_ranges-py|\
+tutorial-roofit-rf203_ranges-py|\
+tutorial-roofit-rf612_recoverFromInvalidParameters|\
+tutorial-roofit-rf902_numgenconfig-py|\
+tutorial-v7-ntuple-ntpl005_introspection"
 %endif
 
 # Filter out parts of tests that require remote network access
-GTEST_FILTER=-RRawFile.Remote:RSqliteDS.Davix \
+GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix \
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
 popd
 
@@ -2652,6 +2925,7 @@ if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
 fi
 cat << EOF >> /etc/jupyter/jupyter_notebook_config.py
 # Extra static path for JupyROOT - start - do not remove this line
+c.NotebookApp.extra_static_paths.append('%{_datadir}/javascript/jsroot')
 c.NotebookApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
 # Extra static path for JupyROOT - end - do not remove this line
 EOF
@@ -2660,6 +2934,7 @@ if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
 fi
 cat << EOF >> /etc/jupyter/jupyter_server_config.py
 # Extra static path for JupyROOT - start - do not remove this line
+c.ServerApp.extra_static_paths.append('%{_datadir}/javascript/jsroot')
 c.ServerApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
 # Extra static path for JupyROOT - end - do not remove this line
 EOF
@@ -2768,6 +3043,7 @@ fi
 %ldconfig_scriptlets roofit
 %ldconfig_scriptlets roofit-core
 %ldconfig_scriptlets roofit-more
+%ldconfig_scriptlets roofit-batchcompute
 %ldconfig_scriptlets roostats
 %ldconfig_scriptlets sql-mysql
 %ldconfig_scriptlets sql-odbc
@@ -2886,13 +3162,12 @@ fi
 # They therefore should not be marked doc.
 %{_pkgdocdir}/CREDITS
 %{_pkgdocdir}/LICENSE
-%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/DEVELOPMENT.md
 %doc %{_pkgdocdir}/ReleaseNotes
 %license LICENSE LGPL2_1.txt
 
 %files multiproc -f includelist-core-multiproc
 %{_libdir}/%{name}/libMultiProc.*
-%{_libdir}/%{name}/libMultiProc_rdict.pcm
 
 %files cling
 %{_bindir}/genreflex
@@ -2936,6 +3211,10 @@ fi
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
 %{python2_sitelib}/JsMVA-*.egg-info
+
+%files -n python2-distrdf
+%{python2_sitelib}/DistRDF
+%{python2_sitelib}/DistRDF-*.egg-info
 %endif
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
@@ -2943,9 +3222,9 @@ fi
 %{python3_sitearch}/cppyy_backend
 %{python3_sitearch}/ROOT
 %{python3_sitearch}/ROOT-*.egg-info
-%{python3_sitearch}/libcppyy%{python3_version_uscore}.%{py3_soabi}.so
+%{python3_sitearch}/libcppyy%{python3_version_uscore}%{python3_ext_suffix}
 %{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
-%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.%{py3_soabi}.so
+%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
 %{_libdir}/%{name}/libcppyy%{python3_version_uscore}.*
 %{_libdir}/%{name}/libcppyy_backend%{python3_version_uscore}.*
 %dir %{_includedir}/%{name}/CPyCppyy
@@ -2953,7 +3232,7 @@ fi
 %files -n python%{python3_pkgversion}-jupyroot
 %{python3_sitearch}/JupyROOT
 %{python3_sitearch}/JupyROOT-*.egg-info
-%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.%{py3_soabi}.so
+%{python3_sitearch}/libJupyROOT%{python3_version_uscore}%{python3_ext_suffix}
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %doc bindings/jupyroot/README.md
 
@@ -2961,6 +3240,10 @@ fi
 %{python3_sitelib}/JsMVA
 %{python3_sitelib}/JsMVA-*.egg-info
 
+%files -n python%{python3_pkgversion}-distrdf
+%{python3_sitelib}/DistRDF
+%{python3_sitelib}/DistRDF-*.egg-info
+
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
 %{_libdir}/%{name}/libRInterface_rdict.pcm
@@ -3411,6 +3694,11 @@ fi
 %{_libdir}/%{name}/libRooFitMore.*
 %{_libdir}/%{name}/libRooFitMore_rdict.pcm
 
+%files roofit-batchcompute -f includelist-roofit-batchcompute
+%{_libdir}/%{name}/libRooBatchCompute.*
+%{_libdir}/%{name}/libRooBatchCompute_*
+%doc roofit/batchcompute/README.md
+
 %files roostats -f includelist-roofit-roostats
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
@@ -3519,6 +3807,7 @@ fi
 %files gui-browsable -f includelist-gui-browsable
 %{_libdir}/%{name}/libROOTBrowsable.*
 %{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
+%{_libdir}/%{name}/libROOTBranchBrowseProvider.*
 %{_libdir}/%{name}/libROOTHistDrawProvider.*
 %{_libdir}/%{name}/libROOTLeafDraw6Provider.*
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
@@ -3528,6 +3817,11 @@ fi
 %files gui-browserv7 -f includelist-gui-browserv7
 %{_libdir}/%{name}/libROOTBrowserv7.*
 %{_libdir}/%{name}/libROOTBrowserv7_rdict.pcm
+%{_libdir}/%{name}/libROOTBrowserGeomWidget.*
+%{_libdir}/%{name}/libROOTBrowserRCanvasWidget.*
+%{_libdir}/%{name}/libROOTBrowserTCanvasWidget.*
+%{_libdir}/%{name}/libROOTBrowserWidgets.*
+%{_datadir}/%{name}/plugins/TBrowserImp/P030_RWebBrowserImp.C
 
 %files gui-canvaspainter
 %{_libdir}/%{name}/libROOTCanvasPainter.*
@@ -3565,6 +3859,15 @@ fi
 %endif
 
 %changelog
+* Wed Aug 04 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.02-1
+- Update to 6.24.02
+- ROOT now uses llvm/clang version 9 (updated from version 5)
+- No longer exclude arch s390x (better supported in llvm/clang 9)
+- Drop patches accepted upstream or previously backported
+- Backport some fixes that make more tests work
+- New subpackages: python{2,3}-distrdf, root-roofit-batchcompute
+- Require js-jsroot >= 6
+
 * Mon Jul 26 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-11
 - Drop the memstat module for Fedora 35+
   The required __malloc_hook was removed from glibc 2.33.9000-48
diff --git a/sources b/sources
index 9b75929..af28a1d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.22.08.tar.xz) = 9080168116ffdd07cfce411dca77404177cd3ba57af498419432ca95169dbce581a7a2a667c22273685d659b3e0398d567b2d51d07ca767b076ee5196395d828
+SHA512 (root-6.24.02.tar.xz) = 2f2bc89b436c7bc703bc88290f5047fae941950f98bd549fdd43121f7742a4030e153cc12a52d81c9a76a32e8d7be197a85776b721fe1643439827fb5b49d1c0
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 19b1aedc980e8705d77d742b19b03a5be416a9b3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 28 Aug 2021 13:11:27 +0200
Subject: [PATCH 211/344] Update to 6.24.04 Add dependency on json-devel to
 root-core Disable uring in EPEL 8 (liburing is available, but uring not  
 supported by kernel)

---
 root.spec | 58 +++++++++++++++++++++++++++++++------------------------
 sources   |  2 +-
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/root.spec b/root.spec
index 26aeb7a..3c93d49 100644
--- a/root.spec
+++ b/root.spec
@@ -49,7 +49,7 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.24.02
+Version:	6.24.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -233,7 +233,7 @@ BuildRequires:	cmake-data >= 3.18.3-1
 BuildRequires:	openblas-devel
 %endif
 BuildRequires:	json-devel
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0}
 BuildRequires:	liburing-devel
 %endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
@@ -362,6 +362,8 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
+#		To resolve dependency in installed ROOTConfig.cmake
+Requires:	json-devel
 #		Fonts
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
@@ -2109,7 +2111,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-pymva:BOOL=ON \
        -Dtmva-rmva:BOOL=ON \
        -Dunuran:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+%if %{?fedora}%{!?fedora:0}
        -During:BOOL=ON \
 %else
        -During:BOOL=OFF \
@@ -2560,27 +2562,6 @@ popd
 # - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
 #   these tests require the numba python module which is not available
-#
-# - tutorial-v7-concurrentfill.cxx
-# - tutorial-v7-draw.cxx
-# - tutorial-v7-draw_frame.cxx
-# - tutorial-v7-draw_legend.cxx
-# - tutorial-v7-draw_mt.cxx
-# - tutorial-v7-draw_rh1.cxx
-# - tutorial-v7-draw_rh1_large.cxx
-# - tutorial-v7-draw_rh2.cxx
-# - tutorial-v7-draw_rh2_colz.cxx
-# - tutorial-v7-draw_rh2_large.cxx
-# - tutorial-v7-draw_rh3.cxx
-# - tutorial-v7-draw_rh3_large.cxx
-# - tutorial-v7-draw_subpads.cxx
-# - tutorial-v7-histops.cxx
-# - tutorial-v7-perf.cxx
-# - tutorial-v7-perfcomp.cxx
-# - tutorial-v7-simple.cxx
-#   Fails with "already deserialized this template specialization"
-#   https://github.com/root-project/root/issues/8073
-
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2611,7 +2592,28 @@ tutorial-tmva-tmva103_Application|\
 pyunittests-pyroot-dependency-versions|\
 pyunittests-pyroot-numbadeclare|\
 test-import-numba|\
-tutorial-pyroot-pyroot004_NumbaDeclare-py|\
+tutorial-pyroot-pyroot004_NumbaDeclare-py"
+
+# - tutorial-v7-concurrentfill.cxx
+# - tutorial-v7-draw.cxx
+# - tutorial-v7-draw_frame.cxx
+# - tutorial-v7-draw_legend.cxx
+# - tutorial-v7-draw_mt.cxx
+# - tutorial-v7-draw_rh1.cxx
+# - tutorial-v7-draw_rh1_large.cxx
+# - tutorial-v7-draw_rh2.cxx
+# - tutorial-v7-draw_rh2_colz.cxx
+# - tutorial-v7-draw_rh2_large.cxx
+# - tutorial-v7-draw_rh3.cxx
+# - tutorial-v7-draw_rh3_large.cxx
+# - tutorial-v7-draw_subpads.cxx
+# - tutorial-v7-histops.cxx
+# - tutorial-v7-perf.cxx
+# - tutorial-v7-perfcomp.cxx
+# - tutorial-v7-simple.cxx
+#   Fails with "already deserialized this template specialization"
+#   https://github.com/root-project/root/issues/8073
+excluded="${excluded}|\
 tutorial-v7-concurrentfill.cxx|\
 tutorial-v7-draw.cxx|\
 tutorial-v7-draw_frame.cxx|\
@@ -3859,6 +3861,12 @@ fi
 %endif
 
 %changelog
+* Fri Aug 27 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.04-1
+- Update to 6.24.04
+- Add dependency on json-devel to root-core
+- Disable uring in EPEL 8 (liburing is available, but uring not
+  supported by kernel)
+
 * Wed Aug 04 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.02-1
 - Update to 6.24.02
 - ROOT now uses llvm/clang version 9 (updated from version 5)
diff --git a/sources b/sources
index af28a1d..36cdb68 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.24.02.tar.xz) = 2f2bc89b436c7bc703bc88290f5047fae941950f98bd549fdd43121f7742a4030e153cc12a52d81c9a76a32e8d7be197a85776b721fe1643439827fb5b49d1c0
+SHA512 (root-6.24.04.tar.xz) = 2f91d54e4c5d03524ebeeafd9a4240c30dd4a1a8de38cec001b0ea8e84de4fd71aca9788296b9e0cb3031f901d9fb32b6848c73c08b0cf41c44096d4191025fd
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From a96b0b3132c9307388317f6f72545f2cf490cf4e Mon Sep 17 00:00:00 2001
From: Sahana Prasad <sahana@redhat.com>
Date: Tue, 14 Sep 2021 19:13:40 +0200
Subject: [PATCH 212/344] Rebuilt with OpenSSL 3.0.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 3c93d49..9bd1490 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.24.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3861,6 +3861,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 6.24.04-2
+- Rebuilt with OpenSSL 3.0.0
+
 * Fri Aug 27 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.04-1
 - Update to 6.24.04
 - Add dependency on json-devel to root-core

From 01b908fc8c059de47434d342793578a7da980daf Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 5 Nov 2021 13:14:04 +0100
Subject: [PATCH 213/344] Update to 6.24.06

---
 root.spec | 7 +++++--
 sources   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 9bd1490..26707c6 100644
--- a/root.spec
+++ b/root.spec
@@ -49,9 +49,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.24.04
+Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3861,6 +3861,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 04 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-1
+- Update to 6.24.06
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 6.24.04-2
 - Rebuilt with OpenSSL 3.0.0
 
diff --git a/sources b/sources
index 36cdb68..31dae3c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.24.04.tar.xz) = 2f91d54e4c5d03524ebeeafd9a4240c30dd4a1a8de38cec001b0ea8e84de4fd71aca9788296b9e0cb3031f901d9fb32b6848c73c08b0cf41c44096d4191025fd
+SHA512 (root-6.24.06.tar.xz) = fe316283503dae60acb26d2ae3e838e6f9c01e1f89ff9973aa2b666a30c00f99f5e0df02b54e3744cd14a45a49ca2fc7d1f19fbac6b69071b9c9e0c98f2e0645
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From f57d1d575ec6e885d4d17358f00b73b9df04192a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 9 Dec 2021 17:14:53 +0100
Subject: [PATCH 214/344] Fix segfaults on ppc64le when using the large code
 model

---
 root-doxygen-crash-el7.patch |  44 +++++++++++++
 root-doxygen-fix1.patch      |  87 +++++++++++++++++++++++++
 root-doxygen-fix2.patch      |  26 ++++++++
 root-ppc-no-codemodel.patch  |  13 ----
 root-ppc-segfault-fix.patch  |  49 +++++++++++++++
 root-symbol-rewrite.patch    |  31 +++++++++
 root.spec                    | 119 +++++++++++++++++------------------
 7 files changed, 296 insertions(+), 73 deletions(-)
 create mode 100644 root-doxygen-crash-el7.patch
 create mode 100644 root-doxygen-fix1.patch
 create mode 100644 root-doxygen-fix2.patch
 delete mode 100644 root-ppc-no-codemodel.patch
 create mode 100644 root-ppc-segfault-fix.patch
 create mode 100644 root-symbol-rewrite.patch

diff --git a/root-doxygen-crash-el7.patch b/root-doxygen-crash-el7.patch
new file mode 100644
index 0000000..28fb075
--- /dev/null
+++ b/root-doxygen-crash-el7.patch
@@ -0,0 +1,44 @@
+diff -ur root-6.24.06.orig/tutorials/multicore/mp201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mp201_parallelHistoFill.C
+--- root-6.24.06.orig/tutorials/multicore/mp201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
++++ root-6.24.06/tutorials/multicore/mp201_parallelHistoFill.C	2021-11-05 18:09:46.916687882 +0100
+@@ -5,7 +5,6 @@
+ /// This tutorial shows how a histogram can be filled in parallel
+ /// with a multiprocess approach.
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date January 2016
+diff -ur root-6.24.06.orig/tutorials/multicore/mt201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mt201_parallelHistoFill.C
+--- root-6.24.06.orig/tutorials/multicore/mt201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
++++ root-6.24.06/tutorials/multicore/mt201_parallelHistoFill.C	2021-12-06 18:19:08.498933048 +0100
+@@ -10,7 +10,6 @@
+ /// method. This method is not thread safe: in presence of ROOT histograms, the
+ /// system will not crash but the result is not uniquely defined.
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date January 2016
+diff -ur root-6.24.06.orig/tutorials/multicore/mt304_fillHistos.C root-6.24.06/tutorials/multicore/mt304_fillHistos.C
+--- root-6.24.06.orig/tutorials/multicore/mt304_fillHistos.C	2021-09-01 10:08:19.000000000 +0200
++++ root-6.24.06/tutorials/multicore/mt304_fillHistos.C	2021-12-06 19:54:20.634373797 +0100
+@@ -5,7 +5,6 @@
+ /// Illustrates use of power-of-two autobin algorithm
+ ///
+ /// \macro_code
+-/// \macro_image
+ ///
+ /// \date November 2017
+ /// \author Gerardo Ganis
+diff -ur root-6.24.06.orig/tutorials/multicore/mtbb201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mtbb201_parallelHistoFill.C
+--- root-6.24.06.orig/tutorials/multicore/mtbb201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
++++ root-6.24.06/tutorials/multicore/mtbb201_parallelHistoFill.C	2021-12-06 19:54:22.174377227 +0100
+@@ -5,7 +5,6 @@
+ /// This tutorial shows how a histogram can be filled in parallel
+ /// with a multiprocess approach.
+ ///
+-/// \macro_image
+ /// \macro_code
+ ///
+ /// \date January 2016
diff --git a/root-doxygen-fix1.patch b/root-doxygen-fix1.patch
new file mode 100644
index 0000000..9525bf4
--- /dev/null
+++ b/root-doxygen-fix1.patch
@@ -0,0 +1,87 @@
+From e303e0105b6f7bd7848a4385fcb62bedb847abb4 Mon Sep 17 00:00:00 2001
+From: Olivier Couet <olivier.couet@cern.ch>
+Date: Mon, 12 Apr 2021 16:22:49 +0200
+Subject: [PATCH] RLogScopedVerbosity doxygen doc fix (#7830)
+
+* RLogScopedVerbosity doxygen doc was not visible because source code was under ``` instead of ~~~
+
+* [foundation] RLogger doc (NFC) - thanks, Sergey!
+
+Co-authored-by: Axel Naumann <Axel.Naumann@cern.ch>
+---
+ core/foundation/inc/ROOT/RLogger.hxx | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/core/foundation/inc/ROOT/RLogger.hxx b/core/foundation/inc/ROOT/RLogger.hxx
+index d753bbc358..c1a1b22690 100644
+--- a/core/foundation/inc/ROOT/RLogger.hxx
++++ b/core/foundation/inc/ROOT/RLogger.hxx
+@@ -109,7 +109,7 @@ public:
+    /// Construct an anonymous channel.
+    RLogChannel() = default;
+ 
+-   /// Construct an anonymous channel with a default vebosity.
++   /// Construct an anonymous channel with a default verbosity.
+    explicit RLogChannel(ELogLevel verbosity) : fVerbosity(verbosity) {}
+ 
+    /// Construct a log channel given its name, which is part of the diagnostics.
+@@ -202,11 +202,11 @@ namespace Detail {
+ 
+  This builder can be used through the utility preprocessor macros R__LOG_ERROR,
+  R__LOG_WARNING etc like this:
+- ```c++
++~~~ {.cpp}
+      R__LOG_INFO(ROOT::Experimental::HistLog()) << "all we know is " << 42;
+      const int decreasedInfoLevel = 5;
+      R__LOG_XDEBUG(ROOT::Experimental::WebGUILog(), decreasedInfoLevel) << "nitty-gritty details";
+- ```
++~~~
+  This will automatically capture the current class and function name, the file and line number.
+  */
+ 
+@@ -235,10 +235,10 @@ public:
+  Change the verbosity level (global or specific to the RLogChannel passed to the
+  constructor) for the lifetime of this object.
+  Example:
+- ```c++
++~~~ {.cpp}
+  RLogScopedVerbosity debugThis(gFooLog, ELogLevel::kDebug);
+  Foo::SomethingToDebug();
+- ```
++~~~
+  */
+ class RLogScopedVerbosity {
+    RLogChannel *fChannel;
+@@ -331,10 +331,10 @@ inline ELogLevel RLogChannel::GetEffectiveVerbosity(const RLogManager &mgr) cons
+ 
+  - The conditional `RLogBuilder` use prevents stream operators from being called if
+  verbosity is too low, i.e.:
+- ````
++ ~~~
+  RLogScopedVerbosity silence(RLogLevel::kFatal);
+  R__LOG_DEBUG(7) << WillNotBeCalled();
+- ```
++ ~~~
+  - To update counts of warnings / errors / fatal errors, those RLogEntries must
+  always be created, even if in the end their emission will be silenced. This
+  should be fine, performance-wise, as they should not happen frequently.
+@@ -350,13 +350,13 @@ inline ELogLevel RLogChannel::GetEffectiveVerbosity(const RLogManager &mgr) cons
+ 
+ /// \name LogMacros
+ /// Macros to log diagnostics.
+-/// ```c++
++/// ~~~ {.cpp}
+ ///     R__LOG_INFO(ROOT::Experimental::HistLog()) << "all we know is " << 42;
+ ///
+ ///     RLogScopedVerbosity verbose(kDebug + 5);
+ ///     const int decreasedInfoLevel = 5;
+-///     R__LOG_DEBUG(decreasedInfoLevel, ROOT::Experimental::WebGUILog()) << "nitty-gritty details";
+-/// ```
++///     R__LOG_DEBUG(ROOT::Experimental::WebGUILog(), decreasedInfoLevel) << "nitty-gritty details";
++/// ~~~
+ ///\{
+ #define R__LOG_FATAL(...) R__LOG_TO_CHANNEL(ROOT::Experimental::ELogLevel::kFatal, __VA_ARGS__)
+ #define R__LOG_ERROR(...) R__LOG_TO_CHANNEL(ROOT::Experimental::ELogLevel::kError, __VA_ARGS__)
+-- 
+2.33.1
+
diff --git a/root-doxygen-fix2.patch b/root-doxygen-fix2.patch
new file mode 100644
index 0000000..1fa75e7
--- /dev/null
+++ b/root-doxygen-fix2.patch
@@ -0,0 +1,26 @@
+From 37a1a43347bc1ecb492b13e2f06d80c16779c84f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 5 Dec 2021 21:51:32 +0100
+Subject: [PATCH] Fix doxygen warning
+
+warning: reached end of file while inside a ~~~ block!
+---
+ gui/webdisplay/src/RWebDisplayHandle.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gui/webdisplay/src/RWebDisplayHandle.cxx b/gui/webdisplay/src/RWebDisplayHandle.cxx
+index 44a544bb51..84ff7a6990 100644
+--- a/gui/webdisplay/src/RWebDisplayHandle.cxx
++++ b/gui/webdisplay/src/RWebDisplayHandle.cxx
+@@ -608,7 +608,7 @@ std::unique_ptr<RWebDisplayHandle> RWebDisplayHandle::Display(const RWebDisplayA
+ /// Browser can specified when starting `root --web=firefox`
+ /// Returns true when browser started
+ /// It is convenience method, equivalent to:
+-///  ~~~
++/// ~~~
+ ///     RWebDisplayArgs args;
+ ///     args.SetUrl(url);
+ ///     args.SetStandalone(false);
+-- 
+2.33.1
+
diff --git a/root-ppc-no-codemodel.patch b/root-ppc-no-codemodel.patch
deleted file mode 100644
index 3429097..0000000
--- a/root-ppc-no-codemodel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-index c98a3be0ed..f77d4adec2 100644
---- a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-+++ b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-@@ -77,7 +77,7 @@ CreateHostTargetMachine(const clang::CompilerInstance& CI) {
- #if defined(__powerpc64__) || defined(__PPC64__)
-   // We have to use large code model for PowerPC64 because TOC and text sections
-   // can be more than 2GB apart.
--  JTMB->setCodeModel(CodeModel::Large);
-+  //JTMB->setCodeModel(CodeModel::Large);
- #endif
- 
-   std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
diff --git a/root-ppc-segfault-fix.patch b/root-ppc-segfault-fix.patch
new file mode 100644
index 0000000..b9cba0f
--- /dev/null
+++ b/root-ppc-segfault-fix.patch
@@ -0,0 +1,49 @@
+From 55ae047b70e927de5c84cfa5ad42905cbd58d499 Mon Sep 17 00:00:00 2001
+From: Vassil Vassilev <v.g.vassilev@gmail.com>
+Date: Sat, 4 Dec 2021 00:06:19 +0000
+Subject: [PATCH] [llvm] Restore the ppc64le support that we lost in llvm8.
+
+This patch is backported from https://reviews.llvm.org/D94183
+
+For more discussion see https://github.com/numba/numba/issues/4026
+
+Fixes root-project/root#8072 and root-project/root#9297
+---
+ .../src/lib/Target/PowerPC/PPCISelLowering.cpp  | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp b/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
+index 24d50074860d..a922b40aa902 100644
+--- a/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
++++ b/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -4463,7 +4463,15 @@ callsShareTOCBase(const Function *Caller, SDValue Callee,
+    if (!G)
+      return false;
+ 
+-   const GlobalValue *GV = G->getGlobal();
++  const GlobalValue *GV = G->getGlobal();
++
++  // If the GV is not a strong definition then we need to assume it can be
++  // replaced by another function at link time. The function that replaces
++  // it may not share the same TOC as the caller since the callee may be
++  // replaced by a PC Relative version of the same function.
++  if (!GV->isStrongDefinitionForLinker())
++    return false;
++
+   // The medium and large code models are expected to provide a sufficiently
+   // large TOC to provide all data addressing needs of a module with a
+   // single TOC. Since each module will be addressed with a single TOC then we
+@@ -4472,13 +4480,6 @@ callsShareTOCBase(const Function *Caller, SDValue Callee,
+       CodeModel::Large == TM.getCodeModel())
+     return TM.shouldAssumeDSOLocal(*Caller->getParent(), GV);
+ 
+-  // Otherwise we need to ensure callee and caller are in the same section,
+-  // since the linker may allocate multiple TOCs, and we don't know which
+-  // sections will belong to the same TOC base.
+-
+-  if (!GV->isStrongDefinitionForLinker())
+-    return false;
+-
+   // Any explicitly-specified sections and section prefixes must also match.
+   // Also, if we're using -ffunction-sections, then each function is always in
+   // a different section (the same is true for COMDAT functions).
diff --git a/root-symbol-rewrite.patch b/root-symbol-rewrite.patch
new file mode 100644
index 0000000..c91bbe6
--- /dev/null
+++ b/root-symbol-rewrite.patch
@@ -0,0 +1,31 @@
+From f99eedeb72644671cd584f48e4c136d47f6b0020 Mon Sep 17 00:00:00 2001
+From: Fangrui Song <maskray@google.com>
+Date: Thu, 12 Dec 2019 16:18:57 -0800
+Subject: [PATCH] [MC][PowerPC] Fix a crash when redefining a symbol after .set
+
+Fix PR44284. This is probably not valid assembly but we should not crash.
+
+Reviewed By: luporl, #powerpc, steven.zhang
+
+Differential Revision: https://reviews.llvm.org/D71443
+---
+ interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp b/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
+index 00df9e41fdae..5e91bdb2f8de 100644
+--- a/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
++++ b/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
+@@ -201,7 +201,8 @@ public:
+ 
+   void finish() override {
+     for (auto *Sym : UpdateOther)
+-      copyLocalEntry(Sym, Sym->getVariableValue());
++      if (Sym->isVariable())
++        copyLocalEntry(Sym, Sym->getVariableValue());
+   }
+ 
+ private:
+-- 
+2.33.1
+
diff --git a/root.spec b/root.spec
index 26707c6..4406bef 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -117,9 +117,11 @@ Patch15:	%{name}-fix-ppc64le-compilation-with-gcc-10.patch
 #		Actually request the use of the large code model for ppc64le
 #		https://github.com/root-project/root/pull/8230
 Patch16:	%{name}-ppc-codemodel.patch
-#		Do not request the large code model for ppc64le
-#		It causes segmentation faults
-Patch17:	%{name}-ppc-no-codemodel.patch
+#		Fix segfaults on ppc64le when using the large code model
+#		PR by Vassil Vassilev based on upstream fix
+#		https://reviews.llvm.org/D91983
+#		https://github.com/root-project/root/pull/9380
+Patch17:	%{name}-ppc-segfault-fix.patch
 #		Fall back to blocking I/O if uring fails
 #		Backported
 #		- commit 691403b2cc504fd4e3e7227894023913014a61ff
@@ -139,6 +141,17 @@ Patch23:	%{name}-ptr-is-null-TStreamerInfo.patch
 #		Fix two failing tests on s390x
 #		https://github.com/root-project/root/pull/8826
 Patch24:	%{name}-stress-s390x.patch
+#		Doxygen warning fixes
+#		Backported from upstream
+Patch25:	root-doxygen-fix1.patch
+#		Doxygen warning fixes
+#		https://github.com/root-project/root/pull/9388
+Patch26:	root-doxygen-fix2.patch
+#		Don't run tutorials that crash during doc generation
+#		EPEL 7 specific
+Patch27:	%{name}-doxygen-crash-el7.patch
+#		Backported fix from LLVM upstream
+Patch28:	%{name}-symbol-rewrite.patch
 
 BuildRequires:	make
 %if %{?rhel}%{!?rhel:0} == 7
@@ -1912,6 +1925,12 @@ This package contains an ntuple extension for ROOT 7.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%if %{?rhel}%{!?rhel:0} == 7
+%patch27 -p1
+%endif
+%patch28 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2788,60 +2807,30 @@ excluded="${excluded}|test-stresshistofit\$\$"
 %ifarch %{power64}
 # PPC64LE specific failures
 #
-# - test-stressgraphics(-interpreted)
-excluded="${excluded}|test-stressgraphics"
-
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-# - pyunittests-pyroot-pyz-array-interface
-# - pyunittests-pyroot-pyz-rdataframe-asnumpy
-# - pyunittests-pyroot-pyz-rdataframe-makenumpy
-# - pyunittests-pyroot-pyz-rvec-asrvec
-# - pyunittests-pyroot-pyz-ttree-asmatrix
-# - tutorial-dataframe-df026_AsNumpyArrays-py
-# - tutorial-pyroot-pyroot001_arrayInterface-py
-# - tutorial-pyroot-pyroot002_TTreeAsMatrix-py
+# - test-stresshistofit-interpreted
+# - test-stresshistogram-interpreted
+# - test-stressmathcore-interpreted
+# - test-stressroostats-interpreted
 excluded="${excluded}|\
-pyunittests-pyroot-pyz-array-interface|\
-pyunittests-pyroot-pyz-rdataframe-asnumpy|\
-pyunittests-pyroot-pyz-rdataframe-makenumpy|\
-pyunittests-pyroot-pyz-rvec-asrvec|\
-pyunittests-pyroot-pyz-ttree-asmatrix|\
-tutorial-dataframe-df026_AsNumpyArrays-py|\
-tutorial-pyroot-pyroot001_arrayInterface-py|\
-tutorial-pyroot-pyroot002_TTreeAsMatrix-py"
-%endif
+test-stresshistofit-interpreted|\
+test-stresshistogram-interpreted|\
+test-stressmathcore-interpreted|\
+test-stressroostats-interpreted"
 
-%if %{?fedora}%{!?fedora:0}
-# - pyunittests-pyroot-pyz-rtensor
-# - pyunittests-pyroot-pyz-ttree-branch
-# - pyunittests-pyroot-pyz-ttree-setbranchaddress
-# - tutorial-r-example
-# - tutorial-r-DataFrame
-# - tutorial-r-Function
-# - tutorial-r-Functor
-# - tutorial-r-GlobalMinimization
-# - tutorial-r-Integration
-# - tutorial-r-Interpolation
-# - tutorial-r-Minimization
-# - tutorial-r-SimpleFitting
-# - tutorial-tmva-envelope-classification
-# - tutorial-tmva-TMVA*
-#   Relocation R_PPC64_REL32 overflow
+%if %{?rhel}%{!?rhel:0} == 8
+# Random segmentation faults
+# - gtest-tree-dataframe-test-dataframe-snapshot
+#
+# Fails on ppc64le since RHEL 8.5 update
+# Exception: Found not whitelisted libraries after importing ROOT:
+#  - libpthread-2.28
+#  - libm-2.28
+#  - libc-2.28
+#  - librt-2.28
+# - pyunittests-pyroot-import-load-libs
 excluded="${excluded}|\
-pyunittests-pyroot-pyz-rtensor|\
-pyunittests-pyroot-pyz-ttree-branch|\
-pyunittests-pyroot-pyz-ttree-setbranchaddress|\
-tutorial-r-example|\
-tutorial-r-DataFrame|\
-tutorial-r-Function|\
-tutorial-r-Functor|\
-tutorial-r-GlobalMinimization|\
-tutorial-r-Integration|\
-tutorial-r-Interpolation|\
-tutorial-r-Minimization|\
-tutorial-r-SimpleFitting|\
-tutorial-tmva-envelope-classification|\
-tutorial-tmva-TMVA"
+gtest-tree-dataframe-test-dataframe-snapshot|\
+pyunittests-pyroot-import-load-libs"
 %endif
 %endif
 
@@ -2852,7 +2841,6 @@ tutorial-tmva-TMVA"
 # - gtest-tree-ntuple-v7-test-ntuple-basics
 # - gtest-tree-ntuple-v7-test-ntuple-extended
 # - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-storage
 # - pyunittests-pyroot-pyz-rtensor
 # - test-stresshistogram(-interpreted)
 # - test-stresshistofit(-interpreted)
@@ -2860,21 +2848,29 @@ tutorial-tmva-TMVA"
 # - tutorial-roofit-rf203_ranges-py
 # - tutorial-roofit-rf612_recoverFromInvalidParameters
 # - tutorial-roofit-rf902_numgenconfig-py
-# - tutorial-v7-ntuple-ntpl005_introspection
 excluded="${excluded}|\
 gtest-roofit-roofitcore-test-testNaNPacker|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
 gtest-tree-ntuple-v7-test-ntuple-extended|\
 gtest-tree-ntuple-v7-test-ntuple-minifile|\
-gtest-tree-ntuple-v7-test-ntuple-storage|\
 pyunittests-pyroot-pyz-rtensor|\
 test-stresshistogram|\
 test-stresshistofit|\
 tutorial-dataframe-df006_ranges-py|\
 tutorial-roofit-rf203_ranges-py|\
 tutorial-roofit-rf612_recoverFromInvalidParameters|\
-tutorial-roofit-rf902_numgenconfig-py|\
-tutorial-v7-ntuple-ntpl005_introspection"
+tutorial-roofit-rf902_numgenconfig-py"
+
+%if %{?rhel}%{!?rhel:0} == 8
+# Issues with file sizes on EPEL 8 s390x
+# - gtest-tree-tree-test-testTBranch
+# - test-stress
+# - test-stressgraphics(-interpreted)
+excluded="${excluded}|\
+gtest-tree-tree-test-testTBranch|\
+test-stress\$\$|\
+test-stressgraphics"
+%endif
 %endif
 
 # Filter out parts of tests that require remote network access
@@ -3861,6 +3857,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 07 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-2
+- Fix segfaults on ppc64le when using the large code model
+
 * Thu Nov 04 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-1
 - Update to 6.24.06
 

From 530bdfbe23276d5410c2d1b98a7a0d1d8f558ea6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 17 Jan 2022 19:28:30 +0100
Subject: [PATCH 215/344] Backport gcc 12 fix from LLVM

Fix test failure on ppc64le and aarch64 with gcc 12
---
 root-fix-compilation-with-gcc-12.patch        | 63 +++++++++++++++++++
 ...e-on-ppc64le-and-aarch64-with-gcc-12.patch | 43 +++++++++++++
 root.spec                                     | 14 ++++-
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 root-fix-compilation-with-gcc-12.patch
 create mode 100644 root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch

diff --git a/root-fix-compilation-with-gcc-12.patch b/root-fix-compilation-with-gcc-12.patch
new file mode 100644
index 0000000..2c34516
--- /dev/null
+++ b/root-fix-compilation-with-gcc-12.patch
@@ -0,0 +1,63 @@
+From 3bc55ece1db8b32c5e86fd6b85856addd67265fb Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 15 Jan 2022 06:35:58 +0100
+Subject: [PATCH] Fix compilation with gcc 12
+
+Fixes error: use of deleted function
+
+/builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp: In member function 'std::string llvm::NVPTXAsmPrinter::getPTXFundamentalTypeStr(llvm::Type*, bool) const':
+/builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp:1319:10: error: use of deleted function 'std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::basic_string(std::nullptr_t) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::nullptr_t = std::nullptr_t]'
+ 1319 |   return nullptr;
+      |          ^~~~~~~
+In file included from /usr/include/c++/12/string:53,
+                 from /usr/include/c++/12/bits/locale_classes.h:40,
+                 from /usr/include/c++/12/bits/ios_base.h:41,
+                 from /usr/include/c++/12/streambuf:41,
+                 from /usr/include/c++/12/bits/streambuf_iterator.h:35,
+                 from /usr/include/c++/12/iterator:66,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/iterator_range.h:21,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/SmallVector.h:16,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/STLExtras.h:20,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/StringRef.h:12,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/Pass.h:31,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTX.h:17,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.h:17,
+                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp:14:
+/usr/include/c++/12/bits/basic_string.h:732:7: note: declared here
+  732 |       basic_string(nullptr_t) = delete;
+      |       ^~~~~~~~~~~~
+
+Fix backported from LLVM upstrea https://reviews.llvm.org/D87697
+---
+ interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+index 5f38b4a3c4..bfa74bd98f 100644
+--- a/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
++++ b/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+@@ -1281,9 +1281,6 @@ void NVPTXAsmPrinter::emitPTXAddressSpace(unsigned int AddressSpace,
+ std::string
+ NVPTXAsmPrinter::getPTXFundamentalTypeStr(Type *Ty, bool useB4PTR) const {
+   switch (Ty->getTypeID()) {
+-  default:
+-    llvm_unreachable("unexpected type");
+-    break;
+   case Type::IntegerTyID: {
+     unsigned NumBits = cast<IntegerType>(Ty)->getBitWidth();
+     if (NumBits == 1)
+@@ -1314,9 +1311,10 @@ NVPTXAsmPrinter::getPTXFundamentalTypeStr(Type *Ty, bool useB4PTR) const {
+       return "b32";
+     else
+       return "u32";
++  default:
++    break;
+   }
+   llvm_unreachable("unexpected type");
+-  return nullptr;
+ }
+ 
+ void NVPTXAsmPrinter::emitPTXGlobalVariable(const GlobalVariable *GVar,
+-- 
+2.34.1
+
diff --git a/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch b/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
new file mode 100644
index 0000000..007c3cd
--- /dev/null
+++ b/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
@@ -0,0 +1,43 @@
+From ddc155795baa9d4690717c204e54a7fd4600c688 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 17 Jan 2022 18:49:30 +0100
+Subject: [PATCH] Fix test failure on ppc64le and aarch64 with gcc 12
+
+.../hist/hist/test/test_tprofile2poly.cxx:61: Failure
+The difference between cont1 and cont2 is 1.4551915228366852e-11, which exceeds delta, where
+cont1 evaluates to 54886.064319363642,
+cont2 evaluates to 54886.064319363628, and
+delta evaluates to 9.999999960041972e-12.
+.../hist/hist/test/test_tprofile2poly.cxx:61: Failure
+The difference between cont1 and cont2 is 1.4551915228366852e-11, where
+cont1 evaluates to 109868.61342004745,
+cont2 evaluates to 109868.61342004743.
+The abs_error parameter delta evaluates to 9.999999960041972e-12 which is smaller than the minimum distance between doubles for numbers of this magnitude which is 1.4551915228366852e-11, thus making this EXPECT_NEAR check equivalent to EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.
+---
+ hist/hist/test/test_tprofile2poly.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hist/hist/test/test_tprofile2poly.cxx b/hist/hist/test/test_tprofile2poly.cxx
+index 40cb3052a2..5150da0bea 100644
+--- a/hist/hist/test/test_tprofile2poly.cxx
++++ b/hist/hist/test/test_tprofile2poly.cxx
+@@ -58,14 +58,14 @@ void binEntriesCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
+       for(Double_t x=0.5; x<10; x+=2.0) {
+          cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(x,y));
+          cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(x,y));
+-         ASSERT_NEAR(cont1, cont2, delta);
++         ASSERT_NEAR(cont1, cont2, 2*delta);
+       }
+ 
+    }
+    // test overflow
+    cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(11,11));
+    cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(11,11));
+-   ASSERT_NEAR(cont1, cont2, delta);
++   ASSERT_NEAR(cont1, cont2, 2*delta);
+ 
+ }
+ 
+-- 
+2.34.1
+
diff --git a/root.spec b/root.spec
index 4406bef..3c01a6c 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -152,6 +152,12 @@ Patch26:	root-doxygen-fix2.patch
 Patch27:	%{name}-doxygen-crash-el7.patch
 #		Backported fix from LLVM upstream
 Patch28:	%{name}-symbol-rewrite.patch
+#		Backport gcc 12 fix from LLVM
+#		https://github.com/root-project/root/pull/9586
+Patch29:	%{name}-fix-compilation-with-gcc-12.patch
+#		Fix test failure on ppc64le and aarch64 with gcc 12
+#		https://github.com/root-project/root/pull/9601
+Patch30:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 
 BuildRequires:	make
 %if %{?rhel}%{!?rhel:0} == 7
@@ -1931,6 +1937,8 @@ This package contains an ntuple extension for ROOT 7.
 %patch27 -p1
 %endif
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3857,6 +3865,10 @@ fi
 %endif
 
 %changelog
+* Sun Jan 16 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-3
+- Backport gcc 12 fix from LLVM
+- Fix test failure on ppc64le and aarch64 with gcc 12
+
 * Tue Dec 07 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-2
 - Fix segfaults on ppc64le when using the large code model
 

From 79bc80ed33ef23cb412f65727b6a12e70b46ac55 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 17:57:47 +0000
Subject: [PATCH 216/344] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 3c01a6c..bd095b6 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3865,6 +3865,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.24.06-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sun Jan 16 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-3
 - Backport gcc 12 fix from LLVM
 - Fix test failure on ppc64le and aarch64 with gcc 12

From d28cfab6db23ba8129741cb9d378affbc249e264 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 28 Jan 2022 21:28:20 +0100
Subject: [PATCH 217/344] Exclude failing test on Fedora 36 ppc64le:

  test-stressHistFactory(-interpreted)
---
 root.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bd095b6..3fa4562 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
 Name:		root
 Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -2840,6 +2840,13 @@ excluded="${excluded}|\
 gtest-tree-dataframe-test-dataframe-snapshot|\
 pyunittests-pyroot-import-load-libs"
 %endif
+
+%if %{?fedora}%{!?fedora:0} >= 36
+# Fails on Fedora 36 ppc64le
+# - test-stressHistFactory(-interpreted)
+excluded="${excluded}|\
+test-stressHistFactory"
+%endif
 %endif
 
 %ifarch s390x
@@ -3865,6 +3872,10 @@ fi
 %endif
 
 %changelog
+* Fri Jan 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-5
+- Exclude failing test on Fedora 36 ppc64le:
+  test-stressHistFactory(-interpreted)
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.24.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 1ca8ad1517f21dca869c95afa310022f2b86fed0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 29 Jan 2022 00:30:44 +0100
Subject: [PATCH 218/344] Disable package note flags

---
 root.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/root.spec b/root.spec
index 3fa4562..4c8d449 100644
--- a/root.spec
+++ b/root.spec
@@ -1,6 +1,10 @@
 %undefine __cmake_in_source_build
 %undefine __cmake3_in_source_build
 
+# Disable package note flags, since root saves the compiler/linker flags
+# used during the build
+%undefine _package_note_flags
+
 %if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
 # Don't build python2-root for Fedora >= 31
 %global buildpy2 0
@@ -3875,6 +3879,7 @@ fi
 * Fri Jan 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-5
 - Exclude failing test on Fedora 36 ppc64le:
   test-stressHistFactory(-interpreted)
+# Disable package note flags
 
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.24.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

From 65aa8a70756160cf36ea5323a408673d44c78b3c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 9 Feb 2022 21:06:51 -0700
Subject: [PATCH 219/344] Rebuild for glew 2.2

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 4c8d449..3a305ae 100644
--- a/root.spec
+++ b/root.spec
@@ -55,7 +55,7 @@
 Name:		root
 Version:	6.24.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3876,6 +3876,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 6.24.06-6
+- Rebuild for glew 2.2
+
 * Fri Jan 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-5
 - Exclude failing test on Fedora 36 ppc64le:
   test-stressHistFactory(-interpreted)

From 2f8e3d96d1a2bbe2f9cd8a9a87d4ab147df9e60b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 5 Apr 2022 14:39:21 +0200
Subject: [PATCH 220/344] Update to 6.24.04

New subpackages: root-roofit-common, root-roofit-dataframe-helpers,
  root-roofit-hs3, root-tmva-sofie and root-tmva-sofie-parser
Removed subpackages: root-memstat and root-montecarlo-vmc
Drop the doxygen generated root-doc package (doxygen runs out of memory)
Dropped patches: 17
New patches: 22
Updated patches: 5
---
 root-32bit-dataframe.patch                    |  132 ++-
 root-add-RCutFlowReport-to-LinkDef-file.patch |   26 -
 root-add-RDisplay-to-LinkDef-file.patch       |   25 -
 ...add-TTreeProcessorMP-to-LinkDef-file.patch |   36 -
 root-avoid-deleting-TFormulas-twice.patch     |   37 +
 root-big-endian-byte-swap.patch               |   40 +
 root-blas-linking-and-ignore-prefix.patch     |   74 ++
 root-core-base-test.patch                     |   31 +
 root-dataframe-callback.patch                 |   45 +
 root-doc-no-notebooks.patch                   |   21 -
 root-doxygen-crash-el7.patch                  |   44 -
 root-doxygen-crash.patch                      |  275 -----
 root-doxygen-fix1.patch                       |   87 --
 root-doxygen-fix2.patch                       |   26 -
 root-endian-warn.patch                        |   33 +
 root-epel7-ppc64le-pyroot.patch               |   16 -
 ...MVA-tutorial-using-internally-python.patch |  177 +++
 root-fix-multicore-tests-with-few-cores.patch |  168 ---
 ...-fix-ppc64le-compilation-with-gcc-10.patch |   29 -
 root-get-src.sh                               |    6 +
 root-jsmva-static.patch                       |    2 +-
 root-longlong.patch                           |   52 +
 ...ased-library-search-behavior-default.patch |  147 +++
 root-memory-usage.patch                       |   43 +-
 root-missing-include.patch                    |   32 +
 root-move-private-decl.patch                  |  405 +++++++
 root-namespace-pymva.patch                    |   31 +
 root-namespace-roofit.patch                   |   43 +
 root-namespace-sofie.patch                    |   30 +
 root-ntuplewait.patch                         |   39 +
 root-old-gtest-compat.patch                   |  325 ++++-
 root-ppc-codemodel.patch                      |   36 -
 root-ppc-segfault-fix.patch                   |   49 -
 root-ptr-is-null-RooFit-TMVA.patch            |   80 --
 root-ptr-is-null-TStreamerInfo.patch          |   32 -
 root-rcolor-static-init.patch                 |   42 +
 root-roofit-overflow.patch                    |   59 +
 root-roofit-tutorial.patch                    |   74 ++
 root-stress-s390x.patch                       |   39 -
 ...-threadsh1-avoid-heap-use-after-free.patch |   48 +
 root-tmva-threads.patch                       |   62 +
 root-unbundle-gtest.patch                     |  305 +++--
 root-uring-warn.patch                         |   43 +
 root-uring.patch                              |   55 -
 ...ue-filenames-in-fillrandom-tutorials.patch |   25 +
 root.spec                                     | 1052 +++++++++--------
 sources                                       |    2 +-
 47 files changed, 2698 insertions(+), 1782 deletions(-)
 delete mode 100644 root-add-RCutFlowReport-to-LinkDef-file.patch
 delete mode 100644 root-add-RDisplay-to-LinkDef-file.patch
 delete mode 100644 root-add-TTreeProcessorMP-to-LinkDef-file.patch
 create mode 100644 root-avoid-deleting-TFormulas-twice.patch
 create mode 100644 root-big-endian-byte-swap.patch
 create mode 100644 root-blas-linking-and-ignore-prefix.patch
 create mode 100644 root-core-base-test.patch
 create mode 100644 root-dataframe-callback.patch
 delete mode 100644 root-doc-no-notebooks.patch
 delete mode 100644 root-doxygen-crash-el7.patch
 delete mode 100644 root-doxygen-crash.patch
 delete mode 100644 root-doxygen-fix1.patch
 delete mode 100644 root-doxygen-fix2.patch
 create mode 100644 root-endian-warn.patch
 delete mode 100644 root-epel7-ppc64le-pyroot.patch
 create mode 100644 root-fix-TMVA-tutorial-using-internally-python.patch
 delete mode 100644 root-fix-multicore-tests-with-few-cores.patch
 delete mode 100644 root-fix-ppc64le-compilation-with-gcc-10.patch
 create mode 100755 root-get-src.sh
 create mode 100644 root-longlong.patch
 create mode 100644 root-make-dyld-based-library-search-behavior-default.patch
 create mode 100644 root-missing-include.patch
 create mode 100644 root-move-private-decl.patch
 create mode 100644 root-namespace-pymva.patch
 create mode 100644 root-namespace-roofit.patch
 create mode 100644 root-namespace-sofie.patch
 create mode 100644 root-ntuplewait.patch
 delete mode 100644 root-ppc-codemodel.patch
 delete mode 100644 root-ppc-segfault-fix.patch
 delete mode 100644 root-ptr-is-null-RooFit-TMVA.patch
 delete mode 100644 root-ptr-is-null-TStreamerInfo.patch
 create mode 100644 root-rcolor-static-init.patch
 create mode 100644 root-roofit-overflow.patch
 create mode 100644 root-roofit-tutorial.patch
 delete mode 100644 root-stress-s390x.patch
 create mode 100644 root-threadsh1-avoid-heap-use-after-free.patch
 create mode 100644 root-tmva-threads.patch
 create mode 100644 root-uring-warn.patch
 delete mode 100644 root-uring.patch
 create mode 100644 root-use-unique-filenames-in-fillrandom-tutorials.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
index f9ff85f..89e3c95 100644
--- a/root-32bit-dataframe.patch
+++ b/root-32bit-dataframe.patch
@@ -1,21 +1,24 @@
-diff -ur root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py root-6.24.02/bindings/pyroot_legacy/ROOT.py
---- root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/bindings/pyroot_legacy/ROOT.py	2021-08-11 10:44:16.895804556 +0200
-@@ -438,9 +438,7 @@
- # This function is injected as method to the respective classes in Pythonize.cxx.
- _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
- 
--# This Pythonisation is there only for 64 bits builds
--if (sys.maxsize > 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
--    _root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
-+_root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
- 
- 
- ### RINT command emulation ------------------------------------------------------
-diff -ur root-6.24.02.orig/build/unix/makepchinput.py root-6.24.02/build/unix/makepchinput.py
---- root-6.24.02.orig/build/unix/makepchinput.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/build/unix/makepchinput.py	2021-08-11 10:44:16.926804638 +0200
-@@ -252,9 +252,6 @@
+From 686d5011df607fde2a42c729d6bd446486163784 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2020 16:20:17 +0100
+Subject: [PATCH] Restore 32-bit dataframe
+
+---
+ build/unix/makepchinput.py                 | 3 ---
+ cmake/modules/RootBuildOptions.cmake       | 5 -----
+ tree/dataframe/test/dataframe_cache.cxx    | 4 ----
+ tree/dataframe/test/datasource_arrow.cxx   | 4 ----
+ tree/dataframe/test/datasource_csv.cxx     | 4 ----
+ tree/dataframe/test/datasource_root.cxx    | 4 ----
+ tree/dataframe/test/datasource_trivial.cxx | 4 ----
+ tutorials/CMakeLists.txt                   | 5 -----
+ 8 files changed, 33 deletions(-)
+
+diff --git a/build/unix/makepchinput.py b/build/unix/makepchinput.py
+index 1adff487de..eec73f946d 100755
+--- a/build/unix/makepchinput.py
++++ b/build/unix/makepchinput.py
+@@ -252,9 +252,6 @@ def isDirForPCH(dirName, legacyPyROOT):
                             "math/vdt",
                             "tmva/rmva"]
  
@@ -25,10 +28,27 @@ diff -ur root-6.24.02.orig/build/unix/makepchinput.py root-6.24.02/build/unix/ma
     accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                 not isAnyPatternInString(PCHPatternsBlacklist,dirName)
  
-diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.24.02/tree/dataframe/test/dataframe_cache.cxx
---- root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/dataframe_cache.cxx	2021-08-11 10:44:16.927804641 +0200
-@@ -224,8 +224,6 @@
+diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
+index 7886c5f3e9..6fbd8873f1 100644
+--- a/cmake/modules/RootBuildOptions.cmake
++++ b/cmake/modules/RootBuildOptions.cmake
+@@ -344,11 +344,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
+   set(runtime_cxxmodules_defvalue OFF)
+ endif()
+ 
+-# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
+-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    set(dataframe_defvalue OFF)
+-endif()
+-
+ # MultiProcess is not possible on Windows, so fail if it is manually set:
+ if(roofit_multiprocess AND WIN32)
+     message(FATAL_ERROR ">>> Option 'roofit_multiprocess' is not supported on Windows.")
+diff --git a/tree/dataframe/test/dataframe_cache.cxx b/tree/dataframe/test/dataframe_cache.cxx
+index 77be488052..8475b98acb 100644
+--- a/tree/dataframe/test/dataframe_cache.cxx
++++ b/tree/dataframe/test/dataframe_cache.cxx
+@@ -224,8 +224,6 @@ TEST(Cache, evtCounter)
  
  }
  
@@ -37,7 +57,7 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.24.02/
  TEST(Cache, Regex)
  {
  
-@@ -335,8 +333,6 @@
+@@ -329,8 +327,6 @@ TEST(Cache, Carrays)
     gSystem->Unlink(fileName);
  }
  
@@ -46,10 +66,11 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.24.02/
  // ROOT-10563
  TEST(Cache, Alias)
  {
-diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.24.02/tree/dataframe/test/datasource_arrow.cxx
---- root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/datasource_arrow.cxx	2021-08-11 10:44:16.927804641 +0200
-@@ -177,8 +177,6 @@
+diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
+index 5ac9fcf09a..5f5f94a666 100644
+--- a/tree/dataframe/test/datasource_arrow.cxx
++++ b/tree/dataframe/test/datasource_arrow.cxx
+@@ -177,8 +177,6 @@ TEST(RArrowDS, SetNSlotsTwice)
  }
  #endif
  
@@ -58,16 +79,17 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.24.02
  TEST(RArrowDS, FromARDF)
  {
     std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
-@@ -250,5 +248,3 @@
+@@ -250,5 +248,3 @@ TEST(RArrowDS, FromARDFWithJittingMT)
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.24.02/tree/dataframe/test/datasource_csv.cxx
---- root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/datasource_csv.cxx	2021-08-11 10:44:16.927804641 +0200
-@@ -207,8 +207,6 @@
+diff --git a/tree/dataframe/test/datasource_csv.cxx b/tree/dataframe/test/datasource_csv.cxx
+index 6554719f98..d93117b67a 100644
+--- a/tree/dataframe/test/datasource_csv.cxx
++++ b/tree/dataframe/test/datasource_csv.cxx
+@@ -210,8 +210,6 @@ TEST(RCsvDS, SetNSlotsTwice)
  }
  #endif
  
@@ -76,16 +98,17 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.24.02/t
  TEST(RCsvDS, FromARDF)
  {
     std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
-@@ -321,5 +319,3 @@
+@@ -324,5 +322,3 @@ TEST(RCsvDS, ProgressiveReadingRDFMT)
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx root-6.24.02/tree/dataframe/test/datasource_root.cxx
---- root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/datasource_root.cxx	2021-08-11 10:44:16.928804644 +0200
-@@ -117,8 +117,6 @@
+diff --git a/tree/dataframe/test/datasource_root.cxx b/tree/dataframe/test/datasource_root.cxx
+index 79840d9fff..4c795fee6f 100644
+--- a/tree/dataframe/test/datasource_root.cxx
++++ b/tree/dataframe/test/datasource_root.cxx
+@@ -117,8 +117,6 @@ TEST(TRootTDS, SetNSlotsTwice)
  }
  #endif
  
@@ -93,17 +116,18 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx root-6.24.02/
 -
  TEST(TRootTDS, FromARDF)
  {
-    std::unique_ptr<RDataSource> tds(new RRootDS(treeName, fileGlob));
-@@ -190,5 +188,3 @@
+    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
+@@ -190,5 +188,3 @@ TEST(TRootTDS, FromARDFWithJittingMT)
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.24.02/tree/dataframe/test/datasource_trivial.cxx
---- root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/datasource_trivial.cxx	2021-08-11 10:44:16.928804644 +0200
-@@ -141,8 +141,6 @@
+diff --git a/tree/dataframe/test/datasource_trivial.cxx b/tree/dataframe/test/datasource_trivial.cxx
+index 7da675c83b..deb89301c7 100644
+--- a/tree/dataframe/test/datasource_trivial.cxx
++++ b/tree/dataframe/test/datasource_trivial.cxx
+@@ -141,8 +141,6 @@ TEST(RTrivialDS, EarlyQuitWithRange)
     EXPECT_EQ(df.Range(10).Count().GetValue(), 10);
  }
  
@@ -112,16 +136,17 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.24.
  TEST(RTrivialDS, FromARDFWithJitting)
  {
     std::unique_ptr<RDataSource> tds(new RTrivialDS(32));
-@@ -245,5 +243,3 @@
+@@ -245,5 +243,3 @@ TEST(RTrivialDS, SkipEntriesMT)
  }
  
  #endif // R__USE_IMT
 -
 -#endif // R__B64
-diff -ur root-6.24.02.orig/tutorials/CMakeLists.txt root-6.24.02/tutorials/CMakeLists.txt
---- root-6.24.02.orig/tutorials/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/CMakeLists.txt	2021-08-11 10:44:16.974804766 +0200
-@@ -279,10 +279,6 @@
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index a6e5c97703..12bb610d67 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -332,10 +332,6 @@ else()
    list(APPEND root7_veto ${v7_veto_files})
  endif()
  
@@ -129,10 +154,10 @@ diff -ur root-6.24.02.orig/tutorials/CMakeLists.txt root-6.24.02/tutorials/CMake
 -  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C v7/ntuple/ntpl004_dimuon.C)
 -endif()
 -
- #---These ones are disabled !!! ------------------------------------
- set(extra_veto
-   legacy/benchmarks.C
-@@ -335,7 +331,6 @@
+ if (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64)
+    set(macm1_veto dataframe/df107_SingleTopAnalysis.py)
+ endif()
+@@ -391,7 +387,6 @@ set(all_veto hsimple.C
               ${classic_veto}
               ${pythia_veto}
               ${root7_veto}
@@ -140,3 +165,6 @@ diff -ur root-6.24.02.orig/tutorials/CMakeLists.txt root-6.24.02/tutorials/CMake
               ${xrootd_veto}
               ${mlp_veto}
               ${spectrum_veto}
+-- 
+2.35.1
+
diff --git a/root-add-RCutFlowReport-to-LinkDef-file.patch b/root-add-RCutFlowReport-to-LinkDef-file.patch
deleted file mode 100644
index 9ec99a1..0000000
--- a/root-add-RCutFlowReport-to-LinkDef-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2e3fabbe5423f50ee98ce848d8e85ec7a2a2106d Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@cern.ch>
-Date: Thu, 15 Jul 2021 12:17:56 +0200
-Subject: [PATCH] [DF] Add RCutFlowReport to LinkDef
-
-This should fix some sporadic failures in cling's symbol resolution
-in builds without runtime cxx modules.
----
- tree/dataframe/inc/LinkDef.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tree/dataframe/inc/LinkDef.h b/tree/dataframe/inc/LinkDef.h
-index 8103468082..684fc3b6f1 100644
---- a/tree/dataframe/inc/LinkDef.h
-+++ b/tree/dataframe/inc/LinkDef.h
-@@ -58,6 +58,7 @@
- #pragma link C++ class ROOT::Detail::RDF::RMergeableValue<TProfile>+;
- #pragma link C++ class ROOT::Detail::RDF::RMergeableValue<TProfile2D>+;
- #pragma link C++ class TNotifyLink<ROOT::Internal::RDF::RDataBlockFlag>;
-+#pragma link C++ class ROOT::RDF::RCutFlowReport;
- 
- #endif
- 
--- 
-2.31.1
-
diff --git a/root-add-RDisplay-to-LinkDef-file.patch b/root-add-RDisplay-to-LinkDef-file.patch
deleted file mode 100644
index e86880c..0000000
--- a/root-add-RDisplay-to-LinkDef-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d9e15857c189edcfa75af5c6244ff68fac74f06f Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@cern.ch>
-Date: Thu, 10 Jun 2021 10:00:32 +0200
-Subject: [PATCH] [DF] Add RDisplay to LinkDef
-
-To help cling autoloading.
----
- tree/dataframe/inc/LinkDef.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tree/dataframe/inc/LinkDef.h b/tree/dataframe/inc/LinkDef.h
-index 3879ac8d5d..8103468082 100644
---- a/tree/dataframe/inc/LinkDef.h
-+++ b/tree/dataframe/inc/LinkDef.h
-@@ -20,6 +20,7 @@
- #pragma link C++ namespace ROOT::Internal::RDF::GraphDrawing;
- #pragma link C++ namespace ROOT::Detail::RDF;
- #pragma link C++ namespace ROOT::RDF;
-+#pragma link C++ class ROOT::RDF::RDisplay-;
- #pragma link C++ class ROOT::Internal::RDF::RActionBase-;
- #pragma link C++ class ROOT::Internal::RDF::RJittedAction-;
- #pragma link C++ class ROOT::Detail::RDF::RFilterBase-;
--- 
-2.31.1
-
diff --git a/root-add-TTreeProcessorMP-to-LinkDef-file.patch b/root-add-TTreeProcessorMP-to-LinkDef-file.patch
deleted file mode 100644
index c8a0b1f..0000000
--- a/root-add-TTreeProcessorMP-to-LinkDef-file.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 56d52ccf2fad2736e49d3cfc4c9df22492e1dbfc Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 8 Jun 2021 02:46:18 +0200
-Subject: [PATCH] Add TTreeProcessorMP to LinkDef
-
-This fixes test failure:
-
- 745/1157 Test  #729: tutorial-multicore-mp102_readNtuplesFillHistosAndFit ................***Failed    1.55 sec
-Processing /builddir/build/BUILD/root-6.25.01/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C...
-IncrementalExecutor::executeFunction: symbol '_ZN4ROOT16TTreeProcessorMPC1Ej' unresolved while linking [cling interface function]!
-You are probably missing the definition of ROOT::TTreeProcessorMP::TTreeProcessorMP(unsigned int)
-Maybe you need to load the corresponding shared library?
-IncrementalExecutor::executeFunction: symbol '_ZN4ROOT16TTreeProcessorMP11ReplyToIdleEP7TSocket' unresolved while linking [cling interface function]!
-You are probably missing the definition of ROOT::TTreeProcessorMP::ReplyToIdle(TSocket*)
-Maybe you need to load the corresponding shared library?
-CMake Error at /builddir/build/BUILD/root-6.25.01/x86_64-redhat-linux-gnu/RootTestDriver.cmake:237 (message):
-  error code: 1
----
- tree/treeplayer/inc/LinkDef.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tree/treeplayer/inc/LinkDef.h b/tree/treeplayer/inc/LinkDef.h
-index e7fdd7c9bf..d195536a40 100644
---- a/tree/treeplayer/inc/LinkDef.h
-+++ b/tree/treeplayer/inc/LinkDef.h
-@@ -30,6 +30,7 @@
- #pragma link C++ class TSimpleAnalysis+;
- #ifndef _MSC_VER
- #pragma link C++ class TMPWorkerTree+;
-+#pragma link C++ class ROOT::TTreeProcessorMP-;
- #endif
- #ifdef R__USE_IMT
- #pragma link C++ class ROOT::TTreeProcessorMT-;
--- 
-2.31.1
-
diff --git a/root-avoid-deleting-TFormulas-twice.patch b/root-avoid-deleting-TFormulas-twice.patch
new file mode 100644
index 0000000..af758ed
--- /dev/null
+++ b/root-avoid-deleting-TFormulas-twice.patch
@@ -0,0 +1,37 @@
+From c7dd58f3bc012690bab16763b1d73a4b7106ced9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 29 Mar 2022 15:40:35 +0200
+Subject: [PATCH] Avoid deleting TFormulas twice
+
+Example failure:
+
+ 562/1224 Test  #541: tutorial-gl-gltf3 ...................................................***Failed  Error regular expression found in output. Regex=[Error in <]  1.36 sec
+Processing /builddir/build/BUILD/root-6.26.00/tutorials/gl/gltf3.C...
+Error in <TList::Delete>: A list is accessing an object (0x7fffd1c959a0) already deleted (list name = Functions)
+Error in <TList::Delete>: A list is accessing an object (0x7fffd1c95750) already deleted (list name = Functions)
+
+The commit also changes the filename used in
+tutorials/hist/fillrandom.py to be different form the one used in
+tutorials/hist/fillrandom.C (and tutorials/pyroot/fillrandom.py)
+---
+ tutorials/gl/gltf3.C | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tutorials/gl/gltf3.C b/tutorials/gl/gltf3.C
+index 3697e69b7a..4089f0d2b7 100644
+--- a/tutorials/gl/gltf3.C
++++ b/tutorials/gl/gltf3.C
+@@ -27,8 +27,8 @@ void gltf3()
+    TPad *tf3Pad  = new TPad("box", "box", 0.04, 0.04, 0.96, 0.8);
+    tf3Pad->Draw();
+ 
+-   TFormula f1 = TFormula("f1", "x*x + y*y + z*z + 2*y - 1");
+-   TFormula f2 = TFormula("f2", "x*x + y*y + z*z - 2*y - 1");
++   TFormula *f1 = new TFormula("f1", "x*x + y*y + z*z + 2*y - 1");
++   TFormula *f2 = new TFormula("f2", "x*x + y*y + z*z - 2*y - 1");
+ 
+    // Klein bottle with cut top&bottom parts
+    // The Klein bottle is a closed non-orientable surface that has no
+-- 
+2.35.1
+
diff --git a/root-big-endian-byte-swap.patch b/root-big-endian-byte-swap.patch
new file mode 100644
index 0000000..0d9f41a
--- /dev/null
+++ b/root-big-endian-byte-swap.patch
@@ -0,0 +1,40 @@
+From d9e03aad7a5132fe9db9992eecb47ee4e91c354c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 25 Mar 2022 11:13:12 +0100
+Subject: [PATCH] Byte swap values read from the protobuf raw data stream on
+ big endian
+
+---
+ tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+index 3b0a30cdb0..23e41d746f 100644
+--- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
++++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+@@ -1,3 +1,4 @@
++#include "Byteswap.h"
+ #include "TMVA/RModelParser_ONNX.hxx"
+ #include "TMVA/OperatorList.hxx"
+ #include "onnx_proto3.pb.h"
+@@ -980,9 +981,14 @@ RModel RModelParser_ONNX::Parse(std::string filename){
+             //void* data = malloc (fLength * sizeof(float));
+             std::shared_ptr<void> data(malloc(fLength * sizeof(float)), free);
+ 
+-            if (tensorproto->raw_data().empty() == false){
+-               auto raw_data_ptr = reinterpret_cast<float*>(const_cast<char*>(tensorproto->raw_data().c_str()));
+-               std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(float));
++            if (!tensorproto->raw_data().empty()) {
++#ifdef R__BYTESWAP
++               std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(float));
++#else
++               for (std::size_t k = 0; k < fLength; ++k)
++                  (reinterpret_cast<UInt_t*>(data.get()))[k] =
++                     R__bswap_32((reinterpret_cast<const UInt_t*>(tensorproto->raw_data().c_str()))[k]);
++#endif
+             }else{
+                tensorproto->mutable_float_data()->ExtractSubrange(0, tensorproto->float_data_size(), static_cast<float*>(data.get()));
+             }
+-- 
+2.35.1
+
diff --git a/root-blas-linking-and-ignore-prefix.patch b/root-blas-linking-and-ignore-prefix.patch
new file mode 100644
index 0000000..abe53f7
--- /dev/null
+++ b/root-blas-linking-and-ignore-prefix.patch
@@ -0,0 +1,74 @@
+From 1aa9231becda09a89ec576e4a17ca4d9b6e2f310 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 15 Mar 2022 14:55:37 +0100
+Subject: [PATCH] Link to the blas library found by cmake, not hardcoded
+ "blas". Set ROOTIGNOREPREFIX=1 when running built binaries during build. Make
+ sure PCH is created before running emitters.
+
+---
+ tmva/sofie/test/CMakeLists.txt | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tmva/sofie/test/CMakeLists.txt b/tmva/sofie/test/CMakeLists.txt
+index e4f9d28748..a3a2c9ae16 100644
+--- a/tmva/sofie/test/CMakeLists.txt
++++ b/tmva/sofie/test/CMakeLists.txt
+@@ -43,7 +43,7 @@ target_compile_options(emitFromONNX PRIVATE -Wno-unused-parameter -Wno-array-bou
+ 
+ # Automatic compilation of headers from onnx files
+ add_custom_target(SofieCompileModels_ONNX)
+-add_dependencies(SofieCompileModels_ONNX emitFromONNX)
++add_dependencies(SofieCompileModels_ONNX emitFromONNX onepcm)
+ 
+ # Finding .onnx files to be compiled and creating the appropriate command
+ file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
+@@ -51,7 +51,7 @@ foreach(onnx_file ${ONNX_FILES})
+ 	get_filename_component(fname ${onnx_file} NAME_WE)
+ 	get_filename_component(fdir ${onnx_file} DIRECTORY)
+ 	add_custom_command(TARGET SofieCompileModels_ONNX POST_BUILD
+-		COMMAND ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
++		COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
+ 		USES_TERMINAL
+ 	)
+ endforeach()
+@@ -60,7 +60,8 @@ endforeach()
+ ROOT_ADD_GTEST(TestCustomModelsFromONNX TestCustomModelsFromONNX.cxx
+   LIBRARIES
+     ROOTTMVASofie
+-    blas
++    ${BLAS_LINKER_FLAGS}
++    ${BLAS_LIBRARIES}
+   INCLUDE_DIRS
+     ${CMAKE_CURRENT_BINARY_DIR}
+ )
+@@ -92,7 +93,7 @@ target_compile_options(emitFromROOT PRIVATE -Wno-unused-parameter -Wno-array-bou
+ 
+ # Automatic compilation of headers from root files
+ add_custom_target(SofieCompileModels_ROOT)
+-add_dependencies(SofieCompileModels_ROOT emitFromROOT)
++add_dependencies(SofieCompileModels_ROOT emitFromROOT onepcm)
+ 
+ # Finding .onnx files to be parsed and creating the appropriate command
+ file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
+@@ -100,7 +101,7 @@ foreach(onnx_file ${ONNX_FILES})
+ 	get_filename_component(fname ${onnx_file} NAME_WE)
+ 	get_filename_component(fdir ${onnx_file} DIRECTORY)
+ 	add_custom_command(TARGET SofieCompileModels_ROOT POST_BUILD
+-		COMMAND ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
++		COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
+ 		USES_TERMINAL
+ 	)
+ endforeach()
+@@ -109,7 +110,8 @@ endforeach()
+ ROOT_ADD_GTEST(TestCustomModelsFromROOT TestCustomModelsFromROOT.cxx
+   LIBRARIES
+     ROOTTMVASofie
+-    blas
++    ${BLAS_LINKER_FLAGS}
++    ${BLAS_LIBRARIES}
+   INCLUDE_DIRS
+     ${CMAKE_CURRENT_BINARY_DIR}
+ )
+-- 
+2.35.1
+
diff --git a/root-core-base-test.patch b/root-core-base-test.patch
new file mode 100644
index 0000000..c268390
--- /dev/null
+++ b/root-core-base-test.patch
@@ -0,0 +1,31 @@
+From 12d52a60629e1639ced23a1919bd85628d9135ea Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 3 Apr 2022 23:23:00 +0200
+Subject: [PATCH] Fix library link order
+
+Fixes undefined references when linking CoreBaseTests
+
+../../../lib/libCling.so.6.26.00: undefined reference to `TMemFile::TMemFile(char const*, TMemFile::ZeroCopyView_t const&)'
+../../../lib/libCling.so.6.26.00: undefined reference to `TFile::TFile(char const*, char const*, char const*, int)'
+../../../lib/libCling.so.6.26.00: undefined reference to `TFile::~TFile()'
+../../../lib/libCling.so.6.26.00: undefined reference to `TStreamerInfo::TStreamerInfo()'
+../../../lib/libCling.so.6.26.00: undefined reference to `TMemFile::~TMemFile()'
+---
+ core/base/test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/base/test/CMakeLists.txt b/core/base/test/CMakeLists.txt
+index 4b08cb0390..9b52e83405 100644
+--- a/core/base/test/CMakeLists.txt
++++ b/core/base/test/CMakeLists.txt
+@@ -22,6 +22,6 @@ ROOT_ADD_GTEST(CoreBaseTests
+   TExceptionHandlerTests.cxx
+   TStringTest.cxx
+   TBitsTests.cxx
+-  LIBRARIES Core RIO ${extralibs})
++  LIBRARIES ${extralibs} RIO Core)
+ 
+ ROOT_ADD_GTEST(CoreErrorTests TErrorTests.cxx LIBRARIES Core)
+-- 
+2.35.1
+
diff --git a/root-dataframe-callback.patch b/root-dataframe-callback.patch
new file mode 100644
index 0000000..57ffc08
--- /dev/null
+++ b/root-dataframe-callback.patch
@@ -0,0 +1,45 @@
+From d849bc502eec4ec95d15ca41319ba0467ab22759 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 15:55:29 +0100
+Subject: [PATCH] =?UTF-8?q?NENTRIES=20is=20not=20always=20a=20multiple=20o?=
+ =?UTF-8?q?f=20the=20expected=20size.=20NENTRIES=20is=2010.=20On=20a=204?=
+ =?UTF-8?q?=20core=20machine=20the=20expected=20size=20in=202=20=C3=97=204?=
+ =?UTF-8?q?=20=3D=208.=20Looping=20over=20the=208=20IDs,=202=20have=202=20?=
+ =?UTF-8?q?entries=20the=20remaining=206=20have=201=20entry=20for=20a=20to?=
+ =?UTF-8?q?tal=20of=2010=20(NENTRIES)=20entries.=20The=20test=20checked=20?=
+ =?UTF-8?q?that=20each=20ID=20had=20NENTRIES/(expected=20size)=20entries,?=
+ =?UTF-8?q?=20which=20in=20this=20case=20with=20integer=20division=20equal?=
+ =?UTF-8?q?s=201=20entry,=20which=20was=20not=20the=20correct=20test.=20Th?=
+ =?UTF-8?q?is=20commit=20chenges=20to=20test=20to=20check=20that=20the=20t?=
+ =?UTF-8?q?otal=20number=20of=20entries=20summed=20for=20all=20IDs=20equal?=
+ =?UTF-8?q?s=20NENTRIES.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ tree/dataframe/test/dataframe_samplecallback.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tree/dataframe/test/dataframe_samplecallback.cxx b/tree/dataframe/test/dataframe_samplecallback.cxx
+index 188d58dd31..d387ea5f86 100644
+--- a/tree/dataframe/test/dataframe_samplecallback.cxx
++++ b/tree/dataframe/test/dataframe_samplecallback.cxx
+@@ -125,11 +125,13 @@ TEST_P(RDFSampleCallback, EmptySourceSampleID) {
+       // RDF with empty sources tries to produce 2 tasks per slot when MT is enabled
+       const auto expectedSize = std::min(NENTRIES, df.GetNSlots() * 2ull);
+       ASSERT_EQ(result->size(), expectedSize);
++      ULong64_t entries = 0;
+       for (auto &id : *result) {
+          // check that all entries start with the expected string
+          EXPECT_TRUE(id.AsString().rfind("Empty source, range: {", 0) == 0);
+-         EXPECT_EQ(id.NEntries(), NENTRIES / expectedSize);
++         entries += id.NEntries();
+       }
++      EXPECT_EQ(entries, NENTRIES);
+    } else {
+       ASSERT_EQ(result->size(), 1);
+       const auto &id = result->at(0);
+-- 
+2.35.1
+
diff --git a/root-doc-no-notebooks.patch b/root-doc-no-notebooks.patch
deleted file mode 100644
index f94d31f..0000000
--- a/root-doc-no-notebooks.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur root-6.20.02.orig/documentation/doxygen/filter.cxx root-6.20.02/documentation/doxygen/filter.cxx
---- root-6.20.02.orig/documentation/doxygen/filter.cxx	2020-03-15 16:21:25.000000000 +0100
-+++ root-6.20.02/documentation/doxygen/filter.cxx	2020-03-15 20:05:59.047270429 +0100
-@@ -378,16 +378,7 @@
- 
-       // notebook found
-       if (gLineString.find("\\notebook") != string::npos) {
--         ExecuteCommand(StringFormat("%s converttonotebook.py %s %s/notebooks/",
--                                          gPythonExec.c_str(),
--                                          gFileName.c_str(), gOutDir.c_str()));
--         if (gPython){
--             gLineString = "## ";
--         }
--         else{
--             gLineString = "/// ";
--         }
--         gLineString += StringFormat( "\\htmlonly <a href=\"https://nbviewer.jupyter.org/url/root.cern/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src= notebook.gif alt=\"View in nbviewer\" style=\"height:1em\" ></a> <a href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern/doc/master/notebooks/%s.nbconvert.ipynb\" target=\"_blank\"><img src=\"https://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"  alt=\"Open in SWAN\" style=\"height:1em\" ></a> \\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
-+         gLineString = "";
-       }
- 
-       // \macro_output found
diff --git a/root-doxygen-crash-el7.patch b/root-doxygen-crash-el7.patch
deleted file mode 100644
index 28fb075..0000000
--- a/root-doxygen-crash-el7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur root-6.24.06.orig/tutorials/multicore/mp201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mp201_parallelHistoFill.C
---- root-6.24.06.orig/tutorials/multicore/mp201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
-+++ root-6.24.06/tutorials/multicore/mp201_parallelHistoFill.C	2021-11-05 18:09:46.916687882 +0100
-@@ -5,7 +5,6 @@
- /// This tutorial shows how a histogram can be filled in parallel
- /// with a multiprocess approach.
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date January 2016
-diff -ur root-6.24.06.orig/tutorials/multicore/mt201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mt201_parallelHistoFill.C
---- root-6.24.06.orig/tutorials/multicore/mt201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
-+++ root-6.24.06/tutorials/multicore/mt201_parallelHistoFill.C	2021-12-06 18:19:08.498933048 +0100
-@@ -10,7 +10,6 @@
- /// method. This method is not thread safe: in presence of ROOT histograms, the
- /// system will not crash but the result is not uniquely defined.
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date January 2016
-diff -ur root-6.24.06.orig/tutorials/multicore/mt304_fillHistos.C root-6.24.06/tutorials/multicore/mt304_fillHistos.C
---- root-6.24.06.orig/tutorials/multicore/mt304_fillHistos.C	2021-09-01 10:08:19.000000000 +0200
-+++ root-6.24.06/tutorials/multicore/mt304_fillHistos.C	2021-12-06 19:54:20.634373797 +0100
-@@ -5,7 +5,6 @@
- /// Illustrates use of power-of-two autobin algorithm
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date November 2017
- /// \author Gerardo Ganis
-diff -ur root-6.24.06.orig/tutorials/multicore/mtbb201_parallelHistoFill.C root-6.24.06/tutorials/multicore/mtbb201_parallelHistoFill.C
---- root-6.24.06.orig/tutorials/multicore/mtbb201_parallelHistoFill.C	2021-09-01 10:08:19.000000000 +0200
-+++ root-6.24.06/tutorials/multicore/mtbb201_parallelHistoFill.C	2021-12-06 19:54:22.174377227 +0100
-@@ -5,7 +5,6 @@
- /// This tutorial shows how a histogram can be filled in parallel
- /// with a multiprocess approach.
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date January 2016
diff --git a/root-doxygen-crash.patch b/root-doxygen-crash.patch
deleted file mode 100644
index d69d7e7..0000000
--- a/root-doxygen-crash.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C root-6.24.02/tutorials/dataframe/df002_dataModel.C
---- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df002_dataModel.C	2021-08-11 03:55:11.021149115 +0200
-@@ -7,7 +7,6 @@
- /// complex than flat ntuples with RDataFrame
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date December 2016
- /// \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py root-6.24.02/tutorials/dataframe/df002_dataModel.py
---- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df002_dataModel.py	2021-08-11 03:55:11.084149272 +0200
-@@ -7,7 +7,6 @@
- ## complex than flat ntuples with RDataFrame
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date May 2017
- ## \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.C root-6.24.02/tutorials/dataframe/df003_profiles.C
---- root-6.24.02.orig/tutorials/dataframe/df003_profiles.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df003_profiles.C	2021-08-11 03:55:11.148149432 +0200
-@@ -7,7 +7,6 @@
- /// RDataFrame. See the documentation of TProfile and TProfile2D to better
- /// understand the analogy of this code with the example one.
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date February 2017
-diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.py root-6.24.02/tutorials/dataframe/df003_profiles.py
---- root-6.24.02.orig/tutorials/dataframe/df003_profiles.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df003_profiles.py	2021-08-11 03:55:11.211149590 +0200
-@@ -8,7 +8,6 @@
- ## understand the analogy of this code with the example one.
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date February 2017
- ## \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C
---- root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C	2021-08-11 03:55:11.275149750 +0200
-@@ -7,7 +7,6 @@
- /// `Fill` method.
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date March 2017
- /// \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C root-6.24.02/tutorials/dataframe/df007_snapshot.C
---- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df007_snapshot.C	2021-08-11 03:55:11.338149907 +0200
-@@ -5,7 +5,6 @@
- ///
- /// This tutorial shows how to write out datasets in ROOT format using the RDataFrame
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date April 2017
-diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py root-6.24.02/tutorials/dataframe/df007_snapshot.py
---- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df007_snapshot.py	2021-08-11 03:55:11.402150067 +0200
-@@ -5,7 +5,6 @@
- ##
- ## This tutorial shows how to write out datasets in ROOT format using the RDataFrame
- ##
--## \macro_image
- ## \macro_code
- ##
- ## \date April 2017
-diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C
---- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C	2021-08-11 03:55:11.465150225 +0200
-@@ -14,7 +14,6 @@
- /// DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date October 2017
- /// \author Enric Tejedor (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py
---- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py	2021-08-11 03:55:11.529150385 +0200
-@@ -14,7 +14,6 @@
- ## DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date October 2017
- ## \author Enric Tejedor (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C
---- root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C	2021-08-11 03:55:11.593150545 +0200
-@@ -14,7 +14,6 @@
- /// From the ROOT website: https://root.cern.ch/files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date February 2018
- /// \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C root-6.24.02/tutorials/dataframe/df016_vecOps.C
---- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df016_vecOps.C	2021-08-11 03:55:11.656150702 +0200
-@@ -7,7 +7,6 @@
- /// stored in datasets, a situation very common in HEP data analysis.
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date February 2018
- /// \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py root-6.24.02/tutorials/dataframe/df016_vecOps.py
---- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df016_vecOps.py	2021-08-11 03:55:11.720150862 +0200
-@@ -6,7 +6,6 @@
- ## This tutorial shows the potential of the VecOps approach for treating collections
- ## stored in datasets, a situation very common in HEP data analysis.
- ##
--## \macro_image
- ## \macro_code
- ##
- ## \date February 2018
-diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C
---- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C	2021-08-11 03:55:11.783151020 +0200
-@@ -11,7 +11,6 @@
- /// greater than 100.
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date March 2018
- /// \authors Danilo Piparo (CERN), Andre Vieira Silva
-diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py
---- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py	2021-08-11 03:55:11.846151177 +0200
-@@ -7,7 +7,6 @@
- ## model typically adopted in HEP for analysis.
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date March 2018
- ## \authors Danilo Piparo (CERN), Andre Vieira Silva
-diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.C root-6.24.02/tutorials/dataframe/df019_Cache.C
---- root-6.24.02.orig/tutorials/dataframe/df019_Cache.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df019_Cache.C	2021-08-11 03:55:11.910151337 +0200
-@@ -18,7 +18,6 @@
- /// only when the event loop is triggered on it.
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date June 2018
- /// \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.py root-6.24.02/tutorials/dataframe/df019_Cache.py
---- root-6.24.02.orig/tutorials/dataframe/df019_Cache.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df019_Cache.py	2021-08-11 03:55:11.973151495 +0200
-@@ -18,7 +18,6 @@
- ## only when the event loop is triggered on it.
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date June 2018
- ## \author Danilo Piparo (CERN)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C root-6.24.02/tutorials/dataframe/df021_createTGraph.C
---- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df021_createTGraph.C	2021-08-11 03:55:12.037151655 +0200
-@@ -4,7 +4,6 @@
- /// Fill a TGraph using RDataFrame.
- ///
- /// \macro_code
--/// \macro_image
- ///
- /// \date July 2018
- /// \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
-diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py root-6.24.02/tutorials/dataframe/df021_createTGraph.py
---- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/dataframe/df021_createTGraph.py	2021-08-11 03:55:12.100151813 +0200
-@@ -4,7 +4,6 @@
- ## Fill a TGraph using RDataFrame.
- ##
- ## \macro_code
--## \macro_image
- ##
- ## \date July 2018
- ## \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
-diff -ur root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C root-6.24.02/tutorials/tmva/tmva003_RReader.C
---- root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/tmva/tmva003_RReader.C	2021-08-11 04:16:33.833359421 +0200
-@@ -5,7 +5,6 @@
- /// TMVA XML files.
- ///
- /// \macro_code
--/// \macro_output
- ///
- /// \date July 2019
- /// \author Stefan Wunsch
-diff -ur root-6.24.02.orig/tutorials/tmva/tmva103_Application.C root-6.24.02/tutorials/tmva/tmva103_Application.C
---- root-6.24.02.orig/tutorials/tmva/tmva103_Application.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/tmva/tmva103_Application.C	2021-08-11 21:56:49.387390340 +0200
-@@ -6,7 +6,6 @@
- /// event-by-event inference, batch inference and pipelines with RDataFrame.
- ///
- /// \macro_code
--/// \macro_output
- ///
- /// \date December 2018
- /// \author Stefan Wunsch
-diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C
---- root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C	2021-08-10 15:21:03.306171069 +0200
-@@ -6,7 +6,6 @@
- /// This is an example of using a CNN in TMVA. We do classification using a toy image data set
- /// that is generated when running the example macro
- ///
--/// \macro_image
- /// \macro_output
- /// \macro_code
- ///
-diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C
---- root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C	2021-08-10 15:21:33.974251559 +0200
-@@ -7,7 +7,6 @@
- /// used in this paper: Baldi, P., P. Sadowski, and D. Whiteson. “Searching for Exotic Particles in High-energy Physics
- ///                     with Deep Learning.” Nature Communications 5 (July 2, 2014).
- ///
--/// \macro_image
- /// \macro_output
- /// \macro_code
- ///
-diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C
---- root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C	2021-08-10 15:21:15.657203486 +0200
-@@ -6,7 +6,6 @@
- /// This is an example of using a RNN in TMVA. We do classification using a toy time dependent data set
- /// that is generated when running this example macro
- ///
--/// \macro_image
- /// \macro_output
- /// \macro_code
- ///
-diff -ur root-6.24.02.orig/tutorials/v7/line.cxx root-6.24.02/tutorials/v7/line.cxx
---- root-6.24.02.orig/tutorials/v7/line.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/v7/line.cxx	2021-08-16 14:25:32.528867781 +0200
-@@ -6,7 +6,6 @@
- /// "normal" coordinates' system and changing the line color linearly from black
- /// to red.
- ///
--/// \macro_image (line.png)
- /// \macro_code
- ///
- /// \date 2018-03-18
-diff -ur root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C
---- root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C	2021-08-10 15:22:06.504336763 +0200
-@@ -4,7 +4,6 @@
- /// Write and read an RNTuple from a user-defined class.  Adapted from tv3.C
- /// Illustrates various RNTuple introspection methods.
- ///
--/// \macro_image
- /// \macro_code
- ///
- /// \date April 2020
diff --git a/root-doxygen-fix1.patch b/root-doxygen-fix1.patch
deleted file mode 100644
index 9525bf4..0000000
--- a/root-doxygen-fix1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e303e0105b6f7bd7848a4385fcb62bedb847abb4 Mon Sep 17 00:00:00 2001
-From: Olivier Couet <olivier.couet@cern.ch>
-Date: Mon, 12 Apr 2021 16:22:49 +0200
-Subject: [PATCH] RLogScopedVerbosity doxygen doc fix (#7830)
-
-* RLogScopedVerbosity doxygen doc was not visible because source code was under ``` instead of ~~~
-
-* [foundation] RLogger doc (NFC) - thanks, Sergey!
-
-Co-authored-by: Axel Naumann <Axel.Naumann@cern.ch>
----
- core/foundation/inc/ROOT/RLogger.hxx | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/core/foundation/inc/ROOT/RLogger.hxx b/core/foundation/inc/ROOT/RLogger.hxx
-index d753bbc358..c1a1b22690 100644
---- a/core/foundation/inc/ROOT/RLogger.hxx
-+++ b/core/foundation/inc/ROOT/RLogger.hxx
-@@ -109,7 +109,7 @@ public:
-    /// Construct an anonymous channel.
-    RLogChannel() = default;
- 
--   /// Construct an anonymous channel with a default vebosity.
-+   /// Construct an anonymous channel with a default verbosity.
-    explicit RLogChannel(ELogLevel verbosity) : fVerbosity(verbosity) {}
- 
-    /// Construct a log channel given its name, which is part of the diagnostics.
-@@ -202,11 +202,11 @@ namespace Detail {
- 
-  This builder can be used through the utility preprocessor macros R__LOG_ERROR,
-  R__LOG_WARNING etc like this:
-- ```c++
-+~~~ {.cpp}
-      R__LOG_INFO(ROOT::Experimental::HistLog()) << "all we know is " << 42;
-      const int decreasedInfoLevel = 5;
-      R__LOG_XDEBUG(ROOT::Experimental::WebGUILog(), decreasedInfoLevel) << "nitty-gritty details";
-- ```
-+~~~
-  This will automatically capture the current class and function name, the file and line number.
-  */
- 
-@@ -235,10 +235,10 @@ public:
-  Change the verbosity level (global or specific to the RLogChannel passed to the
-  constructor) for the lifetime of this object.
-  Example:
-- ```c++
-+~~~ {.cpp}
-  RLogScopedVerbosity debugThis(gFooLog, ELogLevel::kDebug);
-  Foo::SomethingToDebug();
-- ```
-+~~~
-  */
- class RLogScopedVerbosity {
-    RLogChannel *fChannel;
-@@ -331,10 +331,10 @@ inline ELogLevel RLogChannel::GetEffectiveVerbosity(const RLogManager &mgr) cons
- 
-  - The conditional `RLogBuilder` use prevents stream operators from being called if
-  verbosity is too low, i.e.:
-- ````
-+ ~~~
-  RLogScopedVerbosity silence(RLogLevel::kFatal);
-  R__LOG_DEBUG(7) << WillNotBeCalled();
-- ```
-+ ~~~
-  - To update counts of warnings / errors / fatal errors, those RLogEntries must
-  always be created, even if in the end their emission will be silenced. This
-  should be fine, performance-wise, as they should not happen frequently.
-@@ -350,13 +350,13 @@ inline ELogLevel RLogChannel::GetEffectiveVerbosity(const RLogManager &mgr) cons
- 
- /// \name LogMacros
- /// Macros to log diagnostics.
--/// ```c++
-+/// ~~~ {.cpp}
- ///     R__LOG_INFO(ROOT::Experimental::HistLog()) << "all we know is " << 42;
- ///
- ///     RLogScopedVerbosity verbose(kDebug + 5);
- ///     const int decreasedInfoLevel = 5;
--///     R__LOG_DEBUG(decreasedInfoLevel, ROOT::Experimental::WebGUILog()) << "nitty-gritty details";
--/// ```
-+///     R__LOG_DEBUG(ROOT::Experimental::WebGUILog(), decreasedInfoLevel) << "nitty-gritty details";
-+/// ~~~
- ///\{
- #define R__LOG_FATAL(...) R__LOG_TO_CHANNEL(ROOT::Experimental::ELogLevel::kFatal, __VA_ARGS__)
- #define R__LOG_ERROR(...) R__LOG_TO_CHANNEL(ROOT::Experimental::ELogLevel::kError, __VA_ARGS__)
--- 
-2.33.1
-
diff --git a/root-doxygen-fix2.patch b/root-doxygen-fix2.patch
deleted file mode 100644
index 1fa75e7..0000000
--- a/root-doxygen-fix2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 37a1a43347bc1ecb492b13e2f06d80c16779c84f Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 5 Dec 2021 21:51:32 +0100
-Subject: [PATCH] Fix doxygen warning
-
-warning: reached end of file while inside a ~~~ block!
----
- gui/webdisplay/src/RWebDisplayHandle.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gui/webdisplay/src/RWebDisplayHandle.cxx b/gui/webdisplay/src/RWebDisplayHandle.cxx
-index 44a544bb51..84ff7a6990 100644
---- a/gui/webdisplay/src/RWebDisplayHandle.cxx
-+++ b/gui/webdisplay/src/RWebDisplayHandle.cxx
-@@ -608,7 +608,7 @@ std::unique_ptr<RWebDisplayHandle> RWebDisplayHandle::Display(const RWebDisplayA
- /// Browser can specified when starting `root --web=firefox`
- /// Returns true when browser started
- /// It is convenience method, equivalent to:
--///  ~~~
-+/// ~~~
- ///     RWebDisplayArgs args;
- ///     args.SetUrl(url);
- ///     args.SetStandalone(false);
--- 
-2.33.1
-
diff --git a/root-endian-warn.patch b/root-endian-warn.patch
new file mode 100644
index 0000000..77cd6b9
--- /dev/null
+++ b/root-endian-warn.patch
@@ -0,0 +1,33 @@
+From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 28 Mar 2022 09:20:18 +0200
+Subject: [PATCH 2/2] Ignore warnings about RooNaNPacker not being implemented
+ for big endian
+
+This warning is triggered in many tests, so it makes sense to put it
+in the default ignored set.
+---
+ test/unit_testing_support/ROOTUnitTestSupport.cxx | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/test/unit_testing_support/ROOTUnitTestSupport.cxx b/test/unit_testing_support/ROOTUnitTestSupport.cxx
+index 259ab4e09c..79cd476950 100644
+--- a/test/unit_testing_support/ROOTUnitTestSupport.cxx
++++ b/test/unit_testing_support/ROOTUnitTestSupport.cxx
+@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
+         return;
+       }
+ 
++      // FIXME: RooNaNPacker warns about not being implemented for big endian
++      if (level == kWarning
++	  && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
++        std::cerr << "Warning in " << location << " " << msg << std::endl;
++        return;
++      }
++
+       FAIL() << "Received unexpected diagnostic of severity "
+          << level
+          << " at '" << location << "' reading '" << msg << "'.\n"
+-- 
+2.35.1
+
diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch
deleted file mode 100644
index 4619bf0..0000000
--- a/root-epel7-ppc64le-pyroot.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur root-6.22.04.orig/bindings/pyroot/pythonizations/python/ROOT/__init__.py root-6.22.04/bindings/pyroot/pythonizations/python/ROOT/__init__.py
---- root-6.22.04.orig/bindings/pyroot/pythonizations/python/ROOT/__init__.py	2020-11-13 11:42:09.000000000 +0100
-+++ root-6.22.04/bindings/pyroot/pythonizations/python/ROOT/__init__.py	2020-11-14 15:38:24.462463625 +0100
-@@ -19,6 +19,12 @@
- # Prevent cppyy from filtering ROOT libraries
- environ['CPPYY_NO_ROOT_FILTER'] = '1'
- 
-+try:
-+    from ctypes import cdll
-+    libCore = cdll.LoadLibrary("libCore.so")
-+except:
-+    print("An exception occurred while loading libCore.so with ctypes")
-+
- import cppyy
- if not 'ROOTSYS' in environ:
-     # Revert setting made by cppyy
diff --git a/root-fix-TMVA-tutorial-using-internally-python.patch b/root-fix-TMVA-tutorial-using-internally-python.patch
new file mode 100644
index 0000000..e1cae2a
--- /dev/null
+++ b/root-fix-TMVA-tutorial-using-internally-python.patch
@@ -0,0 +1,177 @@
+From db974bbe72b97c798b7db52d2481aa24c2ce2b76 Mon Sep 17 00:00:00 2001
+From: moneta <lorenzo.moneta@cern.ch>
+Date: Thu, 17 Mar 2022 16:28:42 +0100
+Subject: [PATCH] Fix TMVA tutorial using internally pyton for MacOS 12.3
+
+With the new MacOS update python (and python2) is not existing anymore, only python3.
+Add then a new function TMVA::Python_executable() using ROOT config to determine if ROOT is using python version 2 or 3. In case of 3 returns as executable "python3".
+
+Fix also the correct location of the input ONNX file for TMVA_SOFIE_ONNX.C (copying the file at configure time)
+---
+ tmva/pymva/inc/TMVA/PyMethodBase.h       |  6 ++++++
+ tmva/pymva/src/PyMethodBase.cxx          | 20 ++++++++++++++++++++
+ tutorials/CMakeLists.txt                 |  5 ++++-
+ tutorials/tmva/TMVA_CNN_Classification.C |  5 +++--
+ tutorials/tmva/TMVA_RNN_Classification.C |  2 +-
+ tutorials/tmva/TMVA_SOFIE_Keras.C        |  2 +-
+ tutorials/tmva/TMVA_SOFIE_ONNX.C         |  2 +-
+ tutorials/tmva/TMVA_SOFIE_PyTorch.C      |  2 +-
+ 8 files changed, 37 insertions(+), 7 deletions(-)
+
+diff --git a/tmva/pymva/inc/TMVA/PyMethodBase.h b/tmva/pymva/inc/TMVA/PyMethodBase.h
+index 31a5caada9..a213c3fbad 100644
+--- a/tmva/pymva/inc/TMVA/PyMethodBase.h
++++ b/tmva/pymva/inc/TMVA/PyMethodBase.h
+@@ -53,6 +53,12 @@ namespace TMVA {
+    class MethodBoost;
+    class DataSetInfo;
+ 
++   /// Function to find current Python executable
++   /// used by ROOT
++   /// If Python2 is installed return "python"
++   /// Instead if "Python3" return "python3"
++   TString Python_Executable();
++
+    class PyMethodBase : public MethodBase {
+ 
+       friend class Factory;
+diff --git a/tmva/pymva/src/PyMethodBase.cxx b/tmva/pymva/src/PyMethodBase.cxx
+index 86f979e006..26b0f31135 100644
+--- a/tmva/pymva/src/PyMethodBase.cxx
++++ b/tmva/pymva/src/PyMethodBase.cxx
+@@ -19,6 +19,9 @@
+ #include "TMVA/MsgLogger.h"
+ #include "TMVA/Results.h"
+ #include "TMVA/Timer.h"
++#include "TMVA/Tools.h"
++
++#include "TSystem.h"
+ 
+ #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+ #include <numpy/arrayobject.h>
+@@ -37,6 +40,23 @@ public:
+    ~PyGILRAII() { PyGILState_Release(m_GILState); }
+ };
+ } // namespace Internal
++
++/// get current Python executable used by ROOT
++TString Python_Executable() {
++   TString python_version = gSystem->GetFromPipe("root-config --python-version");
++   if (python_version.IsNull()) {
++      TMVA::gTools().Log() << kFATAL << "Can't find a valid Python version used to build ROOT" << Endl;
++      return nullptr;
++   }
++   if(python_version[0] == '2')
++      return "python";
++   else if (python_version[0] == '3')
++      return "python3";
++
++   TMVA::gTools().Log() << kFATAL << "Invalid Python version used to build ROOT : " << python_version << Endl;
++   return nullptr;
++}
++
+ } // namespace TMVA
+ 
+ ClassImp(PyMethodBase);
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index de77aaa787..f1f1abda71 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -281,8 +281,11 @@ else()
+   endif()
+   if (NOT tmva-sofie)
+     list(APPEND tmva_veto tmva/TMVA_SOFIE_ONNX.C)
++  else()
++    #copy ONNX file needed for the tutorial
++    configure_file(${CMAKE_SOURCE_DIR}/tmva/sofie/test/input_models/Linear_16.onnx ${CMAKE_BINARY_DIR}/tutorials/tmva/Linear_16.onnx COPYONLY)
+   endif()
+-  
++
+ endif()
+ 
+ if (NOT ROOT_pythia6_FOUND)
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
+index fa03562a8f..31172bb729 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.C
++++ b/tutorials/tmva/TMVA_CNN_Classification.C
+@@ -145,6 +145,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+    TMVA::PyMethodBase::PyInitialize();
+ #else
+    useKerasCNN = false;
++   usePyTorchCNN = false;
+ #endif
+ 
+    TFile *outputFile = nullptr;
+@@ -445,7 +446,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+ 
+       m.SaveSource("make_cnn_model.py");
+       // execute
+-      gSystem->Exec("python make_cnn_model.py");
++      gSystem->Exec(TMVA::Python_Executable() + " make_cnn_model.py");
+ 
+       if (gSystem->AccessPathName("model_cnn.h5")) {
+          Warning("TMVA_CNN_Classification", "Error creating Keras model file - skip using Keras");
+@@ -465,7 +466,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+       Info("TMVA_CNN_Classification", "Using Convolutional PyTorch Model");
+       TString pyTorchFileName = gROOT->GetTutorialDir() + TString("/tmva/PyTorch_Generate_CNN_Model.py");
+       // check that pytorch can be imported and file defining the model and used later when booking the method is existing
+-      if (gSystem->Exec("python -c 'import torch'")  || gSystem->AccessPathName(pyTorchFileName) ) {
++      if (gSystem->Exec(TMVA::Python_Executable() + " -c 'import torch'")  || gSystem->AccessPathName(pyTorchFileName) ) {
+          Warning("TMVA_CNN_Classification", "PyTorch is not installed or model building file is not existing - skip using PyTorch");
+       }
+       else {
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
+index eb26d03a2f..b49e4d91c4 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.C
++++ b/tutorials/tmva/TMVA_RNN_Classification.C
+@@ -431,7 +431,7 @@ the option string
+ 
+             m.SaveSource("make_rnn_model.py");
+             // execute
+-            gSystem->Exec("python make_rnn_model.py");
++            gSystem->Exec(TMVA::Python_Executable() + " make_rnn_model.py");
+ 
+             if (gSystem->AccessPathName(modelName)) {
+                Warning("TMVA_RNN_Classification", "Error creating Keras recurrent model file - Skip using Keras");
+diff --git a/tutorials/tmva/TMVA_SOFIE_Keras.C b/tutorials/tmva/TMVA_SOFIE_Keras.C
+index e9fdbba21a..a87269f7f4 100644
+--- a/tutorials/tmva/TMVA_SOFIE_Keras.C
++++ b/tutorials/tmva/TMVA_SOFIE_Keras.C
+@@ -45,7 +45,7 @@ void TMVA_SOFIE_Keras(){
+     TMacro m;
+     m.AddLine(pythonSrc);
+     m.SaveSource("make_keras_model.py");
+-    gSystem->Exec("python make_keras_model.py");
++    gSystem->Exec(TMVA::Python_Executable() + " make_keras_model.py");
+ 
+     //Parsing the saved Keras .h5 file into RModel object
+     SOFIE::RModel model = SOFIE::PyKeras::Parse("KerasModel.h5");
+diff --git a/tutorials/tmva/TMVA_SOFIE_ONNX.C b/tutorials/tmva/TMVA_SOFIE_ONNX.C
+index 30148db4fa..bf66c38896 100644
+--- a/tutorials/tmva/TMVA_SOFIE_ONNX.C
++++ b/tutorials/tmva/TMVA_SOFIE_ONNX.C
+@@ -13,7 +13,7 @@ using namespace TMVA::Experimental;
+ void TMVA_SOFIE_ONNX(){
+     //Creating parser object to parse ONNX files
+     SOFIE::RModelParser_ONNX Parser;
+-    SOFIE::RModel model = Parser.Parse("../../tmva/sofie/test/input_models/Linear_16.onnx");
++    SOFIE::RModel model = Parser.Parse(std::string(gROOT->GetTutorialsDir()) + "/tmva/Linear_16.onnx");
+ 
+     //Generating inference code
+     model.Generate();
+diff --git a/tutorials/tmva/TMVA_SOFIE_PyTorch.C b/tutorials/tmva/TMVA_SOFIE_PyTorch.C
+index b208b042d7..580787cae1 100644
+--- a/tutorials/tmva/TMVA_SOFIE_PyTorch.C
++++ b/tutorials/tmva/TMVA_SOFIE_PyTorch.C
+@@ -47,7 +47,7 @@ void TMVA_SOFIE_PyTorch(){
+     TMacro m;
+     m.AddLine(pythonSrc);
+     m.SaveSource("make_pytorch_model.py");
+-    gSystem->Exec("python make_pytorch_model.py");
++    gSystem->Exec(TMVA::Python_Executable() + " make_pytorch_model.py");
+ 
+     //Parsing a PyTorch model requires the shape and data-type of input tensor
+     //Data-type of input tensor defaults to Float if not specified
+-- 
+2.35.1
+
diff --git a/root-fix-multicore-tests-with-few-cores.patch b/root-fix-multicore-tests-with-few-cores.patch
deleted file mode 100644
index 55ad56e..0000000
--- a/root-fix-multicore-tests-with-few-cores.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 153f1c3de0e24f5678fd3a706f902ac12b11048e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 18 Apr 2021 07:28:41 +0200
-Subject: [PATCH] Fix multicore tests when running on machines with few cores
-
-When running on machines with few cores, enabling multithreading can
-give you fewer cores than requested. For most of the tests this does
-not matter. However, some tests verify the number of threads used.
-This commit adapts those tests for this situation.
----
- tree/dataframe/test/dataframe_concurrency.cxx | 18 +++++++++-------
- tree/dataframe/test/dataframe_interface.cxx   |  7 +++++--
- tree/dataframe/test/dataframe_simple.cxx      |  2 +-
- tree/dataframe/test/dataframe_snapshot.cxx    |  6 ++++--
- .../test/treeprocmt/treeprocessormt.cxx       | 21 +++++++++++++++----
- 5 files changed, 37 insertions(+), 17 deletions(-)
-
-diff --git a/tree/dataframe/test/dataframe_concurrency.cxx b/tree/dataframe/test/dataframe_concurrency.cxx
-index d1b25493e5..a4bce595f8 100644
---- a/tree/dataframe/test/dataframe_concurrency.cxx
-+++ b/tree/dataframe/test/dataframe_concurrency.cxx
-@@ -57,33 +57,35 @@ TEST(RDFConcurrency, NestedParallelismBetweenDefineCalls)
- // [DF] Warn on mismatch between slot pool size and effective number of slots
- TEST(RDFSimpleTests, ThrowOnPoolSizeMismatch)
- {
-+   const unsigned int nslots = std::min(3u, std::thread::hardware_concurrency());
-+
-    // pool created after RDF
--   {
-+   if (nslots > 1) {
-       ROOT::RDataFrame df(1);
--      ROOT::EnableImplicitMT(3);
-+      ROOT::EnableImplicitMT(nslots);
-       try {
-          df.Count().GetValue();
-       } catch (const std::runtime_error &e) {
-          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the number of slots required "
--                                   "was 1, but when starting the event loop it was 3. Maybe EnableImplicitMT() was "
-+                                   "was 1, but when starting the event loop it was " + std::to_string(nslots) + ". Maybe EnableImplicitMT() was "
-                                    "called after the RDataFrame was constructed?";
--         EXPECT_STREQ(e.what(), expected_msg);
-+         EXPECT_STREQ(e.what(), expected_msg.c_str());
-       }
-       ROOT::DisableImplicitMT();
-    }
- 
-    // pool deleted after RDF creation
--   {
--      ROOT::EnableImplicitMT(3);
-+   if (nslots > 1) {
-+      ROOT::EnableImplicitMT(nslots);
-       ROOT::RDataFrame df(1);
-       ROOT::DisableImplicitMT();
-       try {
-          df.Count().GetValue();
-       } catch (const std::runtime_error &e) {
-          const auto expected_msg = "RLoopManager::Run: when the RDataFrame was constructed the number of slots required "
--                                   "was 3, but when starting the event loop it was 1. Maybe DisableImplicitMT() was "
-+                                   "was " + std::to_string(nslots) + ", but when starting the event loop it was 1. Maybe DisableImplicitMT() was "
-                                    "called after the RDataFrame was constructed?";
--         EXPECT_STREQ(e.what(), expected_msg);
-+         EXPECT_STREQ(e.what(), expected_msg.c_str());
-       }
-    }
- }
-diff --git a/tree/dataframe/test/dataframe_interface.cxx b/tree/dataframe/test/dataframe_interface.cxx
-index afdd8360ef..90e052f1a7 100644
---- a/tree/dataframe/test/dataframe_interface.cxx
-+++ b/tree/dataframe/test/dataframe_interface.cxx
-@@ -7,6 +7,8 @@
- 
- #include "gtest/gtest.h"
- 
-+#include <thread>
-+
- using namespace ROOT;
- using namespace ROOT::RDF;
- 
-@@ -351,9 +353,10 @@ TEST(RDataFrameInterface, GetNSlots)
-    ROOT::RDataFrame df0(1);
-    EXPECT_EQ(1U, df0.GetNSlots());
- #ifdef R__USE_IMT
--   ROOT::EnableImplicitMT(3);
-+   unsigned int nslots = std::min(3U, std::thread::hardware_concurrency());
-+   ROOT::EnableImplicitMT(nslots);
-    ROOT::RDataFrame df3(1);
--   EXPECT_EQ(3U, df3.GetNSlots());
-+   EXPECT_EQ(nslots, df3.GetNSlots());
-    ROOT::DisableImplicitMT();
-    ROOT::RDataFrame df1(1);
-    EXPECT_EQ(1U, df1.GetNSlots());
-diff --git a/tree/dataframe/test/dataframe_simple.cxx b/tree/dataframe/test/dataframe_simple.cxx
-index c6aba48b3e..e6b92be776 100644
---- a/tree/dataframe/test/dataframe_simple.cxx
-+++ b/tree/dataframe/test/dataframe_simple.cxx
-@@ -26,7 +26,7 @@ using namespace ROOT::VecOps;
- // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
- class RDFSimpleTests : public ::testing::TestWithParam<bool> {
- protected:
--   RDFSimpleTests() : NSLOTS(GetParam() ? 4u : 1u)
-+   RDFSimpleTests() : NSLOTS(GetParam() ? std::min(4u, std::thread::hardware_concurrency()) : 1u)
-    {
-       if (GetParam())
-          ROOT::EnableImplicitMT(NSLOTS);
-diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
-index 3ce9254442..92444feff1 100644
---- a/tree/dataframe/test/dataframe_snapshot.cxx
-+++ b/tree/dataframe/test/dataframe_snapshot.cxx
-@@ -10,6 +10,7 @@
- #include "gtest/gtest.h"
- #include <limits>
- #include <memory>
-+#include <thread>
- using namespace ROOT;         // RDataFrame
- using namespace ROOT::RDF;    // RInterface
- using namespace ROOT::VecOps; // RVec
-@@ -1041,9 +1042,10 @@ TEST(RDFSnapshotMore, EmptyBuffersMT)
- {
-    const auto fname = "emptybuffersmt.root";
-    const auto treename = "t";
--   ROOT::EnableImplicitMT(4);
-+   const unsigned int nslots = std::min(4U, std::thread::hardware_concurrency());
-+   ROOT::EnableImplicitMT(nslots);
-    ROOT::RDataFrame d(10);
--   auto dd = d.DefineSlot("x", [](unsigned int s) { return s == 3 ? 0 : 1; })
-+   auto dd = d.DefineSlot("x", [&](unsigned int s) { return s == nslots - 1 ? 0 : 1; })
-                .Filter([](int x) { return x == 0; }, {"x"}, "f");
-    auto r = dd.Report();
-    dd.Snapshot<int>(treename, fname, {"x"});
-diff --git a/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx b/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
-index 5d5b2cbf42..963ce8a1b1 100644
---- a/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
-+++ b/tree/treeplayer/test/treeprocmt/treeprocessormt.cxx
-@@ -294,14 +294,27 @@ TEST(TreeProcessorMT, LimitNTasks_CheckEntries)
-       }
-    };
- 
--   ROOT::EnableImplicitMT(4);
-+   const unsigned int nslots = std::min(4U, std::thread::hardware_concurrency());
-+   ROOT::EnableImplicitMT(nslots);
- 
-    ROOT::TTreeProcessorMT p(filename, treename);
-    p.Process(f);
- 
--   EXPECT_EQ(nTasks, 96U) << "Wrong number of tasks generated!\n";
--   EXPECT_EQ(nEntriesCountsMap[10], 65U) << "Wrong number of tasks with 10 clusters each!\n";
--   EXPECT_EQ(nEntriesCountsMap[11], 31U) << "Wrong number of tasks with 11 clusters each!\n";
-+   if (nslots == 4) {
-+      EXPECT_EQ(nTasks, 96U) << "Wrong number of tasks generated!\n";
-+      EXPECT_EQ(nEntriesCountsMap[10], 65U) << "Wrong number of tasks with 10 clusters each!\n";
-+      EXPECT_EQ(nEntriesCountsMap[11], 31U) << "Wrong number of tasks with 11 clusters each!\n";
-+   }
-+   else if (nslots == 2) {
-+      EXPECT_EQ(nTasks, 48U) << "Wrong number of tasks generated!\n";
-+      EXPECT_EQ(nEntriesCountsMap[20], 17U) << "Wrong number of tasks with 20 clusters each!\n";
-+      EXPECT_EQ(nEntriesCountsMap[21], 31U) << "Wrong number of tasks with 21 clusters each!\n";
-+   }
-+   else if (nslots == 1) {
-+      EXPECT_EQ(nTasks, 24U) << "Wrong number of tasks generated!\n";
-+      EXPECT_EQ(nEntriesCountsMap[41], 17U) << "Wrong number of tasks with 41 clusters each!\n";
-+      EXPECT_EQ(nEntriesCountsMap[42], 7U) << "Wrong number of tasks with 42 clusters each!\n";
-+   }
- 
-    gSystem->Unlink(filename);
-    ROOT::DisableImplicitMT();
--- 
-2.30.2
-
diff --git a/root-fix-ppc64le-compilation-with-gcc-10.patch b/root-fix-ppc64le-compilation-with-gcc-10.patch
deleted file mode 100644
index 2624de8..0000000
--- a/root-fix-ppc64le-compilation-with-gcc-10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5b8e969ca045aa238c685009e0aa48d74cbdbf22 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 17:09:03 +0100
-Subject: [PATCH 1/2] Fix ppc64le compilation with gcc 10
-
-Reapply fix lost in the LLVM 9 upgrade. This fix is in LLVM 10.
-
-Backported from llvm upstream
-https://reviews.llvm.org/D74129
----
- interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-index c8ed42d266..16bb00d2e9 100644
---- a/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-+++ b/interpreter/llvm/src/tools/clang/lib/Lex/Lexer.cpp
-@@ -2546,7 +2546,7 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr,
-         '/', '/', '/', '/',  '/', '/', '/', '/'
-       };
-       while (CurPtr+16 <= BufferEnd &&
--             !vec_any_eq(*(const vector unsigned char*)CurPtr, Slashes))
-+             !vec_any_eq(*(const __vector unsigned char*)CurPtr, Slashes))
-         CurPtr += 16;
- #else
-       // Scan for '/' quickly.  Many block comments are very large.
--- 
-2.30.2
-
diff --git a/root-get-src.sh b/root-get-src.sh
new file mode 100755
index 0000000..d83c34a
--- /dev/null
+++ b/root-get-src.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+VERSION=$1
+wget -N https://root.cern/download/root_v${VERSION}.source.tar.gz
+tar -z -x -f root_v${VERSION}.source.tar.gz
+find root-${VERSION}/fonts -type f -a '!' -name 'STIX*' -exec rm {} ';'
+tar -J -c --group root --owner root -f root-${VERSION}.tar.xz root-${VERSION}
diff --git a/root-jsmva-static.patch b/root-jsmva-static.patch
index a81848a..2550f4d 100644
--- a/root-jsmva-static.patch
+++ b/root-jsmva-static.patch
@@ -29,7 +29,7 @@ diff -ur root-6.24.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.24.02/etc/noteb
  
  (function(factory){
  
--    var JSROOT_source_dir = "https://root.cern.ch/js/notebook/scripts/";
+-    var JSROOT_source_dir = "https://root.cern/js/5.9.1/scripts/";
 +    var JSROOT_source_dir = "/static/scripts/";
  
      var url = "";
diff --git a/root-longlong.patch b/root-longlong.patch
new file mode 100644
index 0000000..856e015
--- /dev/null
+++ b/root-longlong.patch
@@ -0,0 +1,52 @@
+From 7fe5ef049baf614626d985b05cb0b335f9764a3c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 16:15:00 +0100
+Subject: [PATCH] Fix test when long is 32 bits
+
+This test tests support for 64 bit values. But it uses a long type,
+which fails on platforme where a long is 32 bits.
+
+This commit changes the test to use a long long type instead.
+---
+ tree/dataframe/test/dataframe_snapshot.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
+index 05354e83d5..a30440558e 100644
+--- a/tree/dataframe/test/dataframe_snapshot.cxx
++++ b/tree/dataframe/test/dataframe_snapshot.cxx
+@@ -470,11 +470,11 @@ void ReadWriteCarray(const char *outFileNameBase)
+    auto size = 0;
+    int v[maxArraySize];
+    bool vb[maxArraySize];
+-   long int vl[maxArraySize];
++   long long int vl[maxArraySize];
+    t.Branch("size", &size, "size/I");
+    t.Branch("v", v, "v[size]/I");
+    t.Branch("vb", vb, "vb[size]/O");
+-   t.Branch("vl", vl, "vl[size]/G");
++   t.Branch("vl", vl, "vl[size]/L");
+ 
+    // Size 1
+    size = 1;
+@@ -518,7 +518,7 @@ void ReadWriteCarray(const char *outFileNameBase)
+       TTreeReader r(treename, &f2);
+       TTreeReaderArray<int> rv(r, "v");
+       TTreeReaderArray<bool> rvb(r, "vb");
+-      TTreeReaderArray<long int> rvl(r, "vl");
++      TTreeReaderArray<long long int> rvl(r, "vl");
+ 
+       // Size 1
+       EXPECT_TRUE(r.Next());
+@@ -571,7 +571,7 @@ void ReadWriteCarray(const char *outFileNameBase)
+ 
+    const auto outfname2 = outFileNameBaseStr + "_out2.root";
+    RDataFrame(treename, fname)
+-      .Snapshot<int, RVec<int>, RVec<bool>, RVec<long int>>(treename, outfname2, {"size", "v", "vb", "vl"});
++      .Snapshot<int, RVec<int>, RVec<bool>, RVec<long long int>>(treename, outfname2, {"size", "v", "vb", "vl"});
+    outputChecker(outfname2.c_str());
+ 
+    gSystem->Unlink(fname.c_str());
+-- 
+2.35.1
+
diff --git a/root-make-dyld-based-library-search-behavior-default.patch b/root-make-dyld-based-library-search-behavior-default.patch
new file mode 100644
index 0000000..9b88576
--- /dev/null
+++ b/root-make-dyld-based-library-search-behavior-default.patch
@@ -0,0 +1,147 @@
+From 6ae602bba7d33c900a117c9de0187ab5a28e14b8 Mon Sep 17 00:00:00 2001
+From: Vassil Vassilev <v.g.vassilev@gmail.com>
+Date: Mon, 21 Mar 2022 22:16:54 +0000
+Subject: [PATCH] Make the dyld-based library search behavior default for
+ non-modules.
+
+The dyld-based system was developed in the context on C++ modules but it turned
+into a modules-agnostic feature. Instead of having to maintain more code, we
+should rely on it even for non-modules build of ROOT.
+---
+ core/metacling/src/TCling.cxx | 109 +++-------------------------------
+ 1 file changed, 8 insertions(+), 101 deletions(-)
+
+diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
+index dec399cf2b..3eae1c8570 100644
+--- a/core/metacling/src/TCling.cxx
++++ b/core/metacling/src/TCling.cxx
+@@ -6501,14 +6501,18 @@ bool TCling::LibraryLoadingFailed(const std::string& errmessage, const std::stri
+    return false;
+ }
+ 
+-static void* LazyFunctionCreatorAutoloadForModule(const std::string &mangled_name,
+-                                                  const cling::DynamicLibraryManager &DLM) {
++////////////////////////////////////////////////////////////////////////////////
++/// Autoload a library based on a missing symbol.
++
++void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
++
++   const cling::DynamicLibraryManager &DLM = *GetInterpreterImpl()->getDynamicLibraryManager();
+    R__LOCKGUARD(gInterpreterMutex);
+ 
+    auto LibLoader = [](const std::string& LibName) -> bool {
+      if (gSystem->Load(LibName.c_str(), "", false) < 0) {
+-       Error("TCling__LazyFunctionCreatorAutoloadForModule",
+-             "Failed to load library %s", LibName.c_str());
++        ::Error("TCling__LazyFunctionCreatorAutoloadForModule",
++                "Failed to load library %s", LibName.c_str());
+        return false;
+      }
+      return true; //success.
+@@ -6536,103 +6540,6 @@ static void* LazyFunctionCreatorAutoloadForModule(const std::string &mangled_nam
+       return nullptr;
+ 
+    return llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(mangled_name);
+-
+-}
+-
+-////////////////////////////////////////////////////////////////////////////////
+-/// Autoload a library based on a missing symbol.
+-
+-void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
+-   if (fCxxModulesEnabled)
+-      return LazyFunctionCreatorAutoloadForModule(mangled_name,
+-                                                  *GetInterpreterImpl()->getDynamicLibraryManager());
+-
+-   // First see whether the symbol is in the library that we are currently
+-   // loading. It will have access to the symbols of its dependent libraries,
+-   // thus checking "back()" is sufficient.
+-   if (!fRegisterModuleDyLibs.empty()) {
+-      if (void* addr = dlsym(fRegisterModuleDyLibs.back(),
+-                             mangled_name.c_str())) {
+-         return addr;
+-      }
+-   }
+-
+-   int err = 0;
+-   char* demangled_name_c = TClassEdit::DemangleName(mangled_name.c_str(), err);
+-   if (err) {
+-      return 0;
+-   }
+-
+-   std::string name(demangled_name_c);
+-   free(demangled_name_c);
+-
+-   //fprintf(stderr, "demangled name: '%s'\n", demangled_name);
+-   //
+-   //  Separate out the class or namespace part of the
+-   //  function name.
+-   //
+-
+-   std::string::size_type pos = name.find("__thiscall ");
+-   if (pos != std::string::npos) {
+-      name.erase(0, pos + sizeof("__thiscall ")-1);
+-   }
+-   pos = name.find("__cdecl ");
+-   if (pos != std::string::npos) {
+-      name.erase(0, pos + sizeof("__cdecl ")-1);
+-   }
+-   if (!strncmp(name.c_str(), "typeinfo for ", sizeof("typeinfo for ")-1)) {
+-      name.erase(0, sizeof("typeinfo for ")-1);
+-   } else if (!strncmp(name.c_str(), "vtable for ", sizeof("vtable for ")-1)) {
+-      name.erase(0, sizeof("vtable for ")-1);
+-   } else if (!strncmp(name.c_str(), "operator", sizeof("operator")-1)
+-              && !isalnum(name[sizeof("operator")])) {
+-     // operator...(A, B) - let's try with A!
+-     name.erase(0, sizeof("operator")-1);
+-     pos = name.rfind('(');
+-     if (pos != std::string::npos) {
+-       name.erase(0, pos + 1);
+-       pos = name.find(",");
+-       if (pos != std::string::npos) {
+-         // remove next arg up to end, leaving only the first argument type.
+-         name.erase(pos);
+-       }
+-       pos = name.rfind(" const");
+-       if (pos != std::string::npos) {
+-         name.erase(pos, strlen(" const"));
+-       }
+-       while (!name.empty() && strchr("&*", name.back()))
+-         name.erase(name.length() - 1);
+-     }
+-   } else {
+-      TClassEdit::FunctionSplitInfo fsi;
+-      TClassEdit::SplitFunction(name, fsi);
+-      name = fsi.fScopeName;
+-   }
+-   //fprintf(stderr, "name: '%s'\n", name.c_str());
+-   // Now we have the class or namespace name, so do the lookup.
+-   TString libs = GetClassSharedLibs(name.c_str());
+-   if (libs.IsNull()) {
+-      // Not found in the map, all done.
+-      return 0;
+-   }
+-   //fprintf(stderr, "library: %s\n", iter->second.c_str());
+-   // Now we have the name of the libraries to load, so load them.
+-
+-   TString lib;
+-   Ssiz_t posLib = 0;
+-   while (libs.Tokenize(lib, posLib)) {
+-      if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) {
+-         // The library load failed, all done.
+-         //fprintf(stderr, "load failed: %s\n", errmsg.c_str());
+-         return 0;
+-      }
+-   }
+-
+-   //fprintf(stderr, "load succeeded.\n");
+-   // Get the address of the function being called.
+-   void* addr = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(mangled_name.c_str());
+-   //fprintf(stderr, "addr: %016lx\n", reinterpret_cast<unsigned long>(addr));
+-   return addr;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-- 
+2.35.1
+
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index aad7f1c..713d565 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -1,43 +1,30 @@
-From 21395b23947df7e2b5e0c93626453aeacdee026c Mon Sep 17 00:00:00 2001
+From 5618a02bd7ca4107f545e07a19b8a0762f31e45a Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 16 Jan 2018 10:25:50 +0100
-Subject: [PATCH] Reduce the needed memory for compilation
+Date: Mon, 16 Aug 2021 19:45:00 +0200
+Subject: [PATCH] Reduce memory usage for all builds - not only debug builds
 
-The linking of rootcling_stage1 and libCling requires a lot of memory.
-Since these are linked from mostly the same objects, the build is
-ready to link them at the same time. If you make a parallel build this
-means that the two targets that require the most amount of memory are
-being linked in parallel. This exhausts the available memory, and the
-computer starts swapping.
-
-This commit adds a dependency of one of the targets to the other. The
-dependency is not really there since it is not needed for building,
-but it prevents the two memory consuming targets to be built in
-parallel.
-
-A similar dependency existed before the latest code changes (see
-commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
-rootcling and libCling.
 ---
- core/metacling/src/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
+ core/metacling/src/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index 2923345f7c..b44a4d4115 100644
+index 8cbbe4ba08..f205b24602 100644
 --- a/core/metacling/src/CMakeLists.txt
 +++ b/core/metacling/src/CMakeLists.txt
-@@ -114,6 +114,11 @@ ROOT_LINKER_LIBRARY(Cling
+@@ -107,11 +107,8 @@ ROOT_LINKER_LIBRARY(Cling
          $<TARGET_OBJECTS:MetaCling>
          LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
  
-+# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
-+# rootcling_stage1 from being linked in parallel.
-+# This avoids doing two memory consuming operations in parallel.
+-string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
+-if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
+-  # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
+-  add_dependencies(Cling rootcling_stage1)
+-endif()
++# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
 +add_dependencies(Cling rootcling_stage1)
-+
+ 
  if(MSVC)
    set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-   set(cling_exports
 -- 
-2.26.2
+2.35.1
 
diff --git a/root-missing-include.patch b/root-missing-include.patch
new file mode 100644
index 0000000..8c6bc17
--- /dev/null
+++ b/root-missing-include.patch
@@ -0,0 +1,32 @@
+From 235e446b0ac14170e49c15d5725fbe6dd315351f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 15 Mar 2022 09:08:39 +0100
+Subject: [PATCH] Add #include <cstring> for std::memcpy
+
+In file included from /builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/RModel.hxx:14,
+                 from /builddir/build/BUILD/root-6.26.00/tmva/sofie/src/RModel.cxx:3:
+/builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/SOFIE_common.hxx: In member function 'void TMVA::Experimental::SOFIE::InitializedTensor::CastPersistentToShared()':
+/builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/SOFIE_common.hxx:75:12: error: 'memcpy' is not a member of 'std'; did you mean 'wmemcpy'?
+   75 |       std::memcpy(tData.get(), fPersistentData,fSize * sizeof(float));
+      |            ^~~~~~
+      |            wmemcpy
+gmake[2]: *** [tmva/sofie/CMakeFiles/ROOTTMVASofie.dir/build.make:79: tmva/sofie/CMakeFiles/ROOTTMVASofie.dir/src/RModel.cxx.o] Error 1
+---
+ tmva/sofie/inc/TMVA/SOFIE_common.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tmva/sofie/inc/TMVA/SOFIE_common.hxx b/tmva/sofie/inc/TMVA/SOFIE_common.hxx
+index a663855004..7876727eef 100644
+--- a/tmva/sofie/inc/TMVA/SOFIE_common.hxx
++++ b/tmva/sofie/inc/TMVA/SOFIE_common.hxx
+@@ -6,6 +6,7 @@
+ 
+ #include <type_traits>
+ #include <cstdint>
++#include <cstring>
+ #include <string>
+ #include <vector>
+ #include <memory>
+-- 
+2.35.1
+
diff --git a/root-move-private-decl.patch b/root-move-private-decl.patch
new file mode 100644
index 0000000..aa81617
--- /dev/null
+++ b/root-move-private-decl.patch
@@ -0,0 +1,405 @@
+From 9cdd51029f54aba874608f34580ea0ba94b670c7 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 17 Mar 2022 07:40:28 +0100
+Subject: [PATCH] Move private declarations away from the public header file
+
+This fixes warnings such as these:
+
+IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE8INTERNAL19make_ROperator_SeluERKN4onnx9NodeProtoERKNS3_10GraphProtoERSt13unordered_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_11ETensorTypeESt4hashISG_ESt8equal_toISG_ESaISt4pairIKSG_SH_EEE' unresolved while linking function '_GLOBAL__sub_I_cling_module_0'!
+You are probably missing the definition of TMVA::Experimental::SOFIE::INTERNAL::make_ROperator_Selu(onnx::NodeProto const&, onnx::GraphProto const&, std::unordered_map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, TMVA::Experimental::SOFIE::ETensorType, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, TMVA::Experimental::SOFIE::ETensorType> > >&)
+Maybe you need to load the corresponding shared library?
+---
+ .../inc/TMVA/RModelParser_ONNX.hxx            |  61 -------
+ tmva/sofie_parsers/src/RModelParser_ONNX.cxx  | 164 +++++++++++++++---
+ 2 files changed, 139 insertions(+), 86 deletions(-)
+
+diff --git a/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx b/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
+index 9e9764c0b6..09bcd34fe1 100644
+--- a/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
++++ b/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
+@@ -1,81 +1,20 @@
+ #ifndef TMVA_SOFIE_RMODELPARSER_ONNX
+ #define TMVA_SOFIE_RMODELPARSER_ONNX
+ 
+-
+-
+ #include "TMVA/SOFIE_common.hxx"
+ #include "TMVA/RModel.hxx"
+-#include "TMVA/OperatorList.hxx"
+ 
+ #include <string>
+-#include <fstream>
+-#include <memory>
+-#include <ctime>
+-
+-//forward delcaration
+-namespace onnx{
+-   class NodeProto;
+-   class GraphProto;
+-}
+ 
+ namespace TMVA{
+ namespace Experimental{
+ namespace SOFIE{
+ 
+-namespace INTERNAL{
+-
+-std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
+-std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-
+-
+-using factoryMethodMap = std::unordered_map<std::string, std::unique_ptr<ROperator> (*)(const onnx::NodeProto&, const onnx::GraphProto&, std::unordered_map<std::string, ETensorType>&)>;
+-const factoryMethodMap mapOptypeOperator = {
+-   {"Gemm", &make_ROperator_Gemm},
+-   {"Transpose", &make_ROperator_Transpose},
+-   {"Relu", &make_ROperator_Relu},
+-   {"Conv", &make_ROperator_Conv},
+-   {"RNN", &make_ROperator_RNN},
+-   {"Selu", &make_ROperator_Selu},
+-   {"Sigmoid", &make_ROperator_Sigmoid},
+-   {"LSTM", &make_ROperator_LSTM},
+-   {"GRU", &make_ROperator_GRU},
+-   {"BatchNormalization", &make_ROperator_BatchNormalization},
+-   {"AveragePool", &make_ROperator_Pool},
+-   {"GlobalAveragePool", &make_ROperator_Pool},
+-   {"MaxPool", &make_ROperator_Pool},
+-   {"Add", &make_ROperator_Add},
+-   {"Reshape", &make_ROperator_Reshape},
+-   {"Flatten", &make_ROperator_Reshape},
+-   {"Slice", &make_ROperator_Slice},
+-   {"Squeeze", &make_ROperator_Reshape},
+-   {"Unsqueeze", &make_ROperator_Reshape},
+-   {"Flatten", &make_ROperator_Reshape}
+-};
+-
+-std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
+-}//INTERNAL
+-
+-
+-
+ class RModelParser_ONNX{
+ public:
+    RModel Parse(std::string filename);
+ };
+ 
+-
+-
+ }//SOFIE
+ }//Experimental
+ }//TMVA
+diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+index 3b0a30cdb0..5f89bf66bd 100644
+--- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
++++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+@@ -1,9 +1,12 @@
+ #include "TMVA/RModelParser_ONNX.hxx"
++#include "TMVA/OperatorList.hxx"
+ #include "onnx_proto3.pb.h"
+ 
+ #include <string>
++#include <fstream>
+ #include <memory>
+ #include <cassert>
++#include <ctime>
+ 
+ namespace TMVA{
+ namespace Experimental{
+@@ -11,7 +14,84 @@ namespace SOFIE{
+ 
+ namespace INTERNAL{
+ 
+-std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto &nodeproto,
++                                                           const onnx::GraphProto &graphproto,
++                                                           std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto &nodeproto,
++                                                         const onnx::GraphProto &graphproto,
++                                                         std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto &graphproto,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_BatchNorm(const onnx::NodeProto &nodeproto,
++                                                           const onnx::GraphProto &graphproto,
++                                                           std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto &graphproto,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto &graphproto,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
++                                                         const onnx::GraphProto &graphproto,
++                                                         std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
++                                                       const onnx::GraphProto &graphproto,
++                                                       std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto &graphproto,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
++
++using factoryMethodMap =
++   std::unordered_map<std::string, std::unique_ptr<ROperator> (*)(const onnx::NodeProto &, const onnx::GraphProto &,
++                                                                  std::unordered_map<std::string, ETensorType> &)>;
++
++static const factoryMethodMap mapOptypeOperator = {
++   {"Gemm", &make_ROperator_Gemm},         {"Transpose", &make_ROperator_Transpose},
++   {"Relu", &make_ROperator_Relu},         {"Conv", &make_ROperator_Conv},
++   {"RNN", &make_ROperator_RNN},           {"Selu", &make_ROperator_Selu},
++   {"Sigmoid", &make_ROperator_Sigmoid},   {"LSTM", &make_ROperator_LSTM},
++   {"GRU", &make_ROperator_GRU},           {"BatchNormalization", &make_ROperator_BatchNorm},
++   {"AveragePool", &make_ROperator_Pool},  {"GlobalAveragePool", &make_ROperator_Pool},
++   {"MaxPool", &make_ROperator_Pool},      {"Add", &make_ROperator_Add},
++   {"Reshape", &make_ROperator_Reshape},   {"Flatten", &make_ROperator_Reshape},
++   {"Slice", &make_ROperator_Slice},       {"Squeeze", &make_ROperator_Reshape},
++   {"Unsqueeze", &make_ROperator_Reshape}, {"Flatten", &make_ROperator_Reshape}};
++
++static std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto &graphproto,
++                                                 std::unordered_map<std::string, ETensorType> &tensor_type);
++
++static std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto &graphproto,
++                                                 std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+    const auto& nodeproto = graphproto.node(idx);
+    auto find = mapOptypeOperator.find(nodeproto.op_type());
+    if (find == mapOptypeOperator.end()){
+@@ -24,7 +104,10 @@ std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& gr
+    }
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto & /*graphproto */,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type = ETensorType::UNDEFINED;
+ 
+@@ -59,7 +142,11 @@ std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto& nodeproto,
+ 
+    return op;
+ }
+-std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto*/, std::unordered_map<std::string, ETensorType>& tensor_type){
++
++static std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto &nodeproto,
++                                                           const onnx::GraphProto & /*graphproto*/,
++                                                           std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -99,7 +186,10 @@ std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodep
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /*graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -131,7 +221,10 @@ std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /*graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -163,7 +256,10 @@ std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto &nodeproto,
++                                                         const onnx::GraphProto & /*graphproto */,
++                                                         std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -195,7 +291,10 @@ std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodepro
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
++static std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /* graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -252,7 +351,11 @@ std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto,
+ 
+    return op;
+ }
+-std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
++
++static std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto & /* graphproto */,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -344,7 +447,10 @@ std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
++static std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /* graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -408,7 +514,10 @@ std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
++static std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /* graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -485,14 +594,13 @@ std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
+-                                                  const onnx::GraphProto & /*graphproto */,
+-                                                  std::unordered_map<std::string, ETensorType> &tensor_type)
++static std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
++                                                         const onnx::GraphProto & /*graphproto */,
++                                                         std::unordered_map<std::string, ETensorType> &tensor_type)
+ {
+    // make Reshape operator
+    ETensorType input_type = ETensorType::UNDEFINED;
+ 
+-   
+    ReshapeOpMode opMode = Reshape;
+    if (nodeproto.op_type() == "Flatten") 
+       opMode = Flatten;
+@@ -501,7 +609,6 @@ std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodepro
+    else if (nodeproto.op_type() == "Unsqueeze")
+       opMode = Unsqueeze;
+ 
+-  
+    //bool hasShapeInput = (opMode == Reshape) ? true : false;
+ 
+    // reshape has as extra input shape tensor (int64) but 
+@@ -553,9 +660,9 @@ std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodepro
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
+-                                                  const onnx::GraphProto & /*graphproto */,
+-                                                  std::unordered_map<std::string, ETensorType> &tensor_type)
++static std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
++                                                       const onnx::GraphProto & /*graphproto */,
++                                                       std::unordered_map<std::string, ETensorType> &tensor_type)
+ {
+    // make Slice operator
+    ETensorType input_type = ETensorType::UNDEFINED;
+@@ -634,7 +741,10 @@ std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
++static std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto &nodeproto,
++                                                     const onnx::GraphProto & /* graphproto */,
++                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -722,7 +832,10 @@ std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto,
+    return op;
+ }
+ 
+-std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
++static std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto &nodeproto,
++                                                      const onnx::GraphProto & /* graphproto */,
++                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
++{
+ 
+    ETensorType input_type;
+ 
+@@ -825,9 +938,10 @@ std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto,
+ 
+    return op;
+ }
+-std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodeProto &nodeproto,
+-                                                             const onnx::GraphProto &/*graphproto*/,
+-                                                             std::unordered_map<std::string, ETensorType> &tensor_type)
++
++static std::unique_ptr<ROperator> make_ROperator_BatchNorm(const onnx::NodeProto &nodeproto,
++                                                           const onnx::GraphProto & /*graphproto*/,
++                                                           std::unordered_map<std::string, ETensorType> &tensor_type)
+ {
+ 
+    ETensorType input_type;
+@@ -843,8 +957,8 @@ std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodePro
+ 
+    std::unique_ptr<ROperator> op;
+    float fepsilon = 1e-05;
+-	float fmomentum = 0.9;
+-	std::size_t ftraining_mode = 0;
++   float fmomentum = 0.9;
++   std::size_t ftraining_mode = 0;
+ 
+    switch(input_type) {
+       case ETensorType::FLOAT:
+-- 
+2.35.1
+
diff --git a/root-namespace-pymva.patch b/root-namespace-pymva.patch
new file mode 100644
index 0000000..cd2fa57
--- /dev/null
+++ b/root-namespace-pymva.patch
@@ -0,0 +1,31 @@
+From 0a969f5376af248e76cbcee45c9bdb6463e18c05 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 21:20:07 +0100
+Subject: [PATCH 3/3] Add namespaces to LinkDef
+
+Fixes error:
+
+IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE7PyTorch5ParseENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS9_ImSaImEESaISB_EE' unresolved while linking function '_GLOBAL__sub_I_cling_module_8'!
+You are probably missing the definition of TMVA::Experimental::SOFIE::PyTorch::Parse(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::vector<unsigned long, std::allocator<unsigned long> >, std::allocator<std::vector<unsigned long, std::allocator<unsigned long> > > >)
+Maybe you need to load the corresponding shared library?
+Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libPyMVA.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libPyMVA.so.6.26.00'?
+---
+ tmva/pymva/inc/LinkDef.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tmva/pymva/inc/LinkDef.h b/tmva/pymva/inc/LinkDef.h
+index 92da99a4f7..83145077dd 100644
+--- a/tmva/pymva/inc/LinkDef.h
++++ b/tmva/pymva/inc/LinkDef.h
+@@ -15,6 +15,8 @@
+ #pragma link C++ class TMVA::MethodPyGTB+;
+ #pragma link C++ class TMVA::MethodPyKeras+;
+ #pragma link C++ class TMVA::MethodPyTorch+;
++#pragma link C++ namespace TMVA::Experimental::SOFIE::PyKeras;
+ #pragma link C++ function TMVA::Experimental::SOFIE::PyKeras::Parse+;
++#pragma link C++ namespace TMVA::Experimental::SOFIE::PyTorch;
+ #pragma link C++ function TMVA::Experimental::SOFIE::PyTorch::Parse+;
+ #endif
+-- 
+2.35.1
+
diff --git a/root-namespace-roofit.patch b/root-namespace-roofit.patch
new file mode 100644
index 0000000..c8aa92e
--- /dev/null
+++ b/root-namespace-roofit.patch
@@ -0,0 +1,43 @@
+From 4a4df0190ad24c0a3636994c2c23cb6c22e04589 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 15:41:33 +0100
+Subject: [PATCH 2/3] Remove namespace RooFit from libRooFitCore's LinkDef
+
+The namespace is listed in the LinkDef's for both libRooFit and libRooFitCore.
+
+ROOT only autoloads one of the libraries, for some reason usually
+libRooFitCore. After this only symbols in the namespace from that
+library are present. By removing the namespace from liRooFitCore's
+LinkDef, only libRooFit can be chosen when autoloading. Since
+libRooFit depends on libRooFitCore, both libraries are loaded, and the
+symbols from the namespace in both libraries are available.
+
+Fixes error:
+
+IncrementalExecutor::executeFunction: symbol '_ZN6RooFit12bindFunctionEPKcPFddER10RooAbsReal' unresolved while linking function '_GLOBAL__sub_I_cling_module_217'!
+You are probably missing the definition of RooFit::bindFunction(char const*, double (*)(double), RooAbsReal&)
+Maybe you need to load the corresponding shared library?
+Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libRooFit.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libRooFit.so.6.26.00'?
+---
+ roofit/roofitcore/inc/LinkDef.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/roofit/roofitcore/inc/LinkDef.h b/roofit/roofitcore/inc/LinkDef.h
+index d421fd95cd..72c66db33b 100644
+--- a/roofit/roofitcore/inc/LinkDef.h
++++ b/roofit/roofitcore/inc/LinkDef.h
+@@ -105,7 +105,10 @@
+ 
+ 
+ // Old LinkDef2.h
+-#pragma link C++ namespace RooFit ;
++
++// "namespace RooFit" is in roofit/roofit/inc/Linkdef1.h
++// should not be in the dictionary for two different libraries
++// #pragma link C++ namespace RooFit ;
+ #pragma link C++ namespace RooFitShortHand ;
+ #pragma link C++ class RooDouble+ ;
+ #pragma link C++ class RooEffGenContext+ ;
+-- 
+2.35.1
+
diff --git a/root-namespace-sofie.patch b/root-namespace-sofie.patch
new file mode 100644
index 0000000..a011634
--- /dev/null
+++ b/root-namespace-sofie.patch
@@ -0,0 +1,30 @@
+From c66ae9d9c035090584f465a41ce2e438e502be81 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 15:23:59 +0100
+Subject: [PATCH 1/3] Add namespace TMVA::Experimental::SOFIE to LinkDef
+
+Fixes error:
+
+IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE19ConvertTypeToStringB5cxx11ENS1_11ETensorTypeE' unresolved while linking function '_GLOBAL__sub_I_cling_module_8'!
+You are probably missing the definition of TMVA::Experimental::SOFIE::ConvertTypeToString[abi:cxx11](TMVA::Experimental::SOFIE::ETensorType)
+Maybe you need to load the corresponding shared library?
+Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libROOTTMVASofie.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libROOTTMVASofie.so.6.26.00'?
+---
+ tmva/sofie/inc/LinkDef.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tmva/sofie/inc/LinkDef.h b/tmva/sofie/inc/LinkDef.h
+index 715cf35560..3282ff22c1 100644
+--- a/tmva/sofie/inc/LinkDef.h
++++ b/tmva/sofie/inc/LinkDef.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma link C++ nestedclass;
+ 
++#pragma link C++ namespace TMVA::Experimental::SOFIE;
+ #pragma link C++ class TMVA::Experimental::SOFIE::RModel-;
+ #pragma link C++ class TMVA::Experimental::SOFIE::ROperator+;
+ #pragma link C++ struct TMVA::Experimental::SOFIE::InitializedTensor+;
+-- 
+2.35.1
+
diff --git a/root-ntuplewait.patch b/root-ntuplewait.patch
new file mode 100644
index 0000000..b464b69
--- /dev/null
+++ b/root-ntuplewait.patch
@@ -0,0 +1,39 @@
+From ad043f8e3304aab4f0ee3ad9e0cf8480c4bbadf0 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 16:10:22 +0100
+Subject: [PATCH] Always call WaitForInFlightClusters before checking cluster
+ IDs
+
+---
+ tree/ntuple/v7/test/ntuple_cluster.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tree/ntuple/v7/test/ntuple_cluster.cxx b/tree/ntuple/v7/test/ntuple_cluster.cxx
+index afc2fc32e9..0c299d97de 100644
+--- a/tree/ntuple/v7/test/ntuple_cluster.cxx
++++ b/tree/ntuple/v7/test/ntuple_cluster.cxx
+@@ -213,6 +213,7 @@ TEST(ClusterPool, GetClusterBasics)
+    RPageSourceMock p1;
+    RClusterPool c1(p1, 1);
+    c1.GetCluster(3, {0});
++   c1.WaitForInFlightClusters();
+    ASSERT_EQ(2U, p1.fReqsClusterIds.size());
+    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
+    EXPECT_EQ(4U, p1.fReqsClusterIds[1]);
+@@ -267,11 +268,13 @@ TEST(ClusterPool, GetClusterIncrementally)
+    RPageSourceMock p1;
+    RClusterPool c1(p1, 1);
+    c1.GetCluster(3, {0});
++   c1.WaitForInFlightClusters();
+    ASSERT_EQ(2U, p1.fReqsClusterIds.size());
+    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
+    EXPECT_EQ(RCluster::ColumnSet_t({0}), p1.fReqsColumns[0]);
+ 
+    c1.GetCluster(3, {1});
++   c1.WaitForInFlightClusters();
+    ASSERT_EQ(4U, p1.fReqsClusterIds.size());
+    EXPECT_EQ(3U, p1.fReqsClusterIds[2]);
+    EXPECT_EQ(RCluster::ColumnSet_t({1}), p1.fReqsColumns[2]);
+-- 
+2.35.1
+
diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
index bcba732..078a5f9 100644
--- a/root-old-gtest-compat.patch
+++ b/root-old-gtest-compat.patch
@@ -1,6 +1,39 @@
-diff -ur root-6.24.02.orig/hist/hist/test/test_THBinIterator.cxx root-6.24.02/hist/hist/test/test_THBinIterator.cxx
---- root-6.24.02.orig/hist/hist/test/test_THBinIterator.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/hist/hist/test/test_THBinIterator.cxx	2021-08-06 22:59:45.039518775 +0200
+From 99e9ad9ea54369296537ceb012ccdcb333b5f513 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 26 Mar 2022 10:55:38 +0100
+Subject: [PATCH 2/2] Backward compatibility with older googletest versions in
+ EPEL
+
+---
+ hist/hist/test/test_THBinIterator.cxx                  |  5 +++++
+ math/mathcore/test/stress/testGenVector.cxx            | 10 ++++++++++
+ math/mathcore/test/stress/testSMatrix.cxx              | 10 ++++++++++
+ math/mathcore/test/stress/testVector.cxx               | 10 ++++++++++
+ math/mathcore/test/stress/testVector34.cxx             | 10 ++++++++++
+ math/mathcore/test/testGradient.cxx                    |  4 ++++
+ math/mathcore/test/testGradientFitting.cxx             | 10 ++++++++++
+ math/mathmore/test/testStress.cxx                      | 10 ++++++++++
+ roofit/histfactory/test/testHistFactory.cxx            |  4 ++++
+ roofit/multiprocess/test/test_Job.cxx                  |  5 +++++
+ roofit/roofitZMQ/test/test_ZMQ.cpp                     |  4 ++++
+ roofit/roofitcore/test/TestStatistics/RooRealL.cpp     |  4 ++++
+ .../test/TestStatistics/testLikelihoodGradientJob.cpp  |  5 +++++
+ roofit/roofitcore/test/testProxiesAndCategories.cxx    |  3 +++
+ roofit/roofitcore/test/testRooDataHist.cxx             |  4 ++++
+ roofit/roofitcore/test/testRooGradMinimizerFcn.cxx     |  5 +++++
+ tree/dataframe/test/dataframe_definepersample.cxx      |  4 ++++
+ tree/dataframe/test/dataframe_merge_results.cxx        |  2 +-
+ tree/dataframe/test/dataframe_regression.cxx           |  4 ++++
+ tree/dataframe/test/dataframe_samplecallback.cxx       |  4 ++++
+ tree/dataframe/test/dataframe_simple.cxx               |  5 +++++
+ tree/dataframe/test/dataframe_vary.cxx                 |  4 ++++
+ tree/tree/test/TOffsetGeneration.cxx                   |  4 ++++
+ 23 files changed, 129 insertions(+), 1 deletion(-)
+
+diff --git a/hist/hist/test/test_THBinIterator.cxx b/hist/hist/test/test_THBinIterator.cxx
+index e30585b8cb..04f1e1487b 100644
+--- a/hist/hist/test/test_THBinIterator.cxx
++++ b/hist/hist/test/test_THBinIterator.cxx
 @@ -1,5 +1,10 @@
  #include "gtest/gtest.h"
  
@@ -12,9 +45,10 @@ diff -ur root-6.24.02.orig/hist/hist/test/test_THBinIterator.cxx root-6.24.02/hi
  // test iterating histogram bins and using the new THistRange and
  // THBinIterator classes
  
-diff -ur root-6.24.02.orig/math/mathcore/test/stress/testGenVector.cxx root-6.24.02/math/mathcore/test/stress/testGenVector.cxx
---- root-6.24.02.orig/math/mathcore/test/stress/testGenVector.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/stress/testGenVector.cxx	2021-08-06 09:31:38.795835283 +0200
+diff --git a/math/mathcore/test/stress/testGenVector.cxx b/math/mathcore/test/stress/testGenVector.cxx
+index 93c0bb6aec..b3259158da 100644
+--- a/math/mathcore/test/stress/testGenVector.cxx
++++ b/math/mathcore/test/stress/testGenVector.cxx
 @@ -4,6 +4,16 @@
  
  #include "gtest/gtest.h"
@@ -32,9 +66,10 @@ diff -ur root-6.24.02.orig/math/mathcore/test/stress/testGenVector.cxx root-6.24
  #include "StatFunction.h"
  #include "TestHelper.h"
  #include "VectorTest.h"
-diff -ur root-6.24.02.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.24.02/math/mathcore/test/stress/testSMatrix.cxx
---- root-6.24.02.orig/math/mathcore/test/stress/testSMatrix.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/stress/testSMatrix.cxx	2021-08-06 09:31:38.796835286 +0200
+diff --git a/math/mathcore/test/stress/testSMatrix.cxx b/math/mathcore/test/stress/testSMatrix.cxx
+index a4d7fc4cd5..a35d88b7c2 100644
+--- a/math/mathcore/test/stress/testSMatrix.cxx
++++ b/math/mathcore/test/stress/testSMatrix.cxx
 @@ -7,6 +7,16 @@
  #include "TestHelper.h"
  #include "gtest/gtest.h"
@@ -52,29 +87,10 @@ diff -ur root-6.24.02.orig/math/mathcore/test/stress/testSMatrix.cxx root-6.24.0
  #include "VectorTest.h"
  #include "TROOT.h"
  #include "TSystem.h"
-diff -ur root-6.24.02.orig/math/mathcore/test/stress/testVector34.cxx root-6.24.02/math/mathcore/test/stress/testVector34.cxx
---- root-6.24.02.orig/math/mathcore/test/stress/testVector34.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/stress/testVector34.cxx	2021-08-06 09:31:38.796835286 +0200
-@@ -4,6 +4,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include "StatFunction.h"
- #include "VectorTest.h"
- 
-diff -ur root-6.24.02.orig/math/mathcore/test/stress/testVector.cxx root-6.24.02/math/mathcore/test/stress/testVector.cxx
---- root-6.24.02.orig/math/mathcore/test/stress/testVector.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/stress/testVector.cxx	2021-08-06 09:31:38.796835286 +0200
+diff --git a/math/mathcore/test/stress/testVector.cxx b/math/mathcore/test/stress/testVector.cxx
+index 72e933f0d5..938e27d83c 100644
+--- a/math/mathcore/test/stress/testVector.cxx
++++ b/math/mathcore/test/stress/testVector.cxx
 @@ -4,6 +4,16 @@
  
  #include "gtest/gtest.h"
@@ -92,9 +108,31 @@ diff -ur root-6.24.02.orig/math/mathcore/test/stress/testVector.cxx root-6.24.02
  #include "StatFunction.h"
  #include "TestHelper.h"
  #include "VectorTest.h"
-diff -ur root-6.24.02.orig/math/mathcore/test/testGradient.cxx root-6.24.02/math/mathcore/test/testGradient.cxx
---- root-6.24.02.orig/math/mathcore/test/testGradient.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/testGradient.cxx	2021-08-06 09:31:38.796835286 +0200
+diff --git a/math/mathcore/test/stress/testVector34.cxx b/math/mathcore/test/stress/testVector34.cxx
+index 4b31184559..80d6dd6314 100644
+--- a/math/mathcore/test/stress/testVector34.cxx
++++ b/math/mathcore/test/stress/testVector34.cxx
+@@ -4,6 +4,16 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef TYPED_TEST_SUITE_P
++#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
++#endif
++#ifndef REGISTER_TYPED_TEST_SUITE_P
++#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
++#endif
++#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
++#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
++#endif
++
+ #include "StatFunction.h"
+ #include "VectorTest.h"
+ 
+diff --git a/math/mathcore/test/testGradient.cxx b/math/mathcore/test/testGradient.cxx
+index 49a5391b7b..271e89e43c 100644
+--- a/math/mathcore/test/testGradient.cxx
++++ b/math/mathcore/test/testGradient.cxx
 @@ -22,6 +22,10 @@
  
  #include "gtest/gtest.h"
@@ -106,10 +144,11 @@ diff -ur root-6.24.02.orig/math/mathcore/test/testGradient.cxx root-6.24.02/math
  #include <chrono>
  #include <iostream>
  #include <string>
-diff -ur root-6.24.02.orig/math/mathcore/test/testGradientFitting.cxx root-6.24.02/math/mathcore/test/testGradientFitting.cxx
---- root-6.24.02.orig/math/mathcore/test/testGradientFitting.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathcore/test/testGradientFitting.cxx	2021-08-06 09:31:38.797835288 +0200
-@@ -12,6 +12,16 @@
+diff --git a/math/mathcore/test/testGradientFitting.cxx b/math/mathcore/test/testGradientFitting.cxx
+index f85f826d9f..1818d1c22f 100644
+--- a/math/mathcore/test/testGradientFitting.cxx
++++ b/math/mathcore/test/testGradientFitting.cxx
+@@ -13,6 +13,16 @@
  
  #include "gtest/gtest.h"
  
@@ -126,9 +165,10 @@ diff -ur root-6.24.02.orig/math/mathcore/test/testGradientFitting.cxx root-6.24.
  #include <iostream>
  #include <string>
  
-diff -ur root-6.24.02.orig/math/mathmore/test/testStress.cxx root-6.24.02/math/mathmore/test/testStress.cxx
---- root-6.24.02.orig/math/mathmore/test/testStress.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/math/mathmore/test/testStress.cxx	2021-08-06 09:31:38.797835288 +0200
+diff --git a/math/mathmore/test/testStress.cxx b/math/mathmore/test/testStress.cxx
+index 47bcdd250f..5cf20e69a1 100644
+--- a/math/mathmore/test/testStress.cxx
++++ b/math/mathmore/test/testStress.cxx
 @@ -26,6 +26,16 @@
  
  #include "gtest/gtest.h"
@@ -146,9 +186,87 @@ diff -ur root-6.24.02.orig/math/mathmore/test/testStress.cxx root-6.24.02/math/m
  using ::testing::TestWithParam;
  using ::testing::Values;
  
-diff -ur root-6.24.02.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx root-6.24.02/roofit/roofitcore/test/testProxiesAndCategories.cxx
---- root-6.24.02.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/roofit/roofitcore/test/testProxiesAndCategories.cxx	2021-08-06 09:31:38.798835290 +0200
+diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
+index 71d7b632d2..9063e51070 100644
+--- a/roofit/histfactory/test/testHistFactory.cxx
++++ b/roofit/histfactory/test/testHistFactory.cxx
+@@ -22,6 +22,10 @@
+ #include "TCanvas.h"
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <set>
+ 
+ using namespace RooStats;
+diff --git a/roofit/multiprocess/test/test_Job.cxx b/roofit/multiprocess/test/test_Job.cxx
+index 22e66fc73c..61cc11771d 100644
+--- a/roofit/multiprocess/test/test_Job.cxx
++++ b/roofit/multiprocess/test/test_Job.cxx
+@@ -24,6 +24,11 @@
+ #include "RooFit/MultiProcess/Queue.h"          // ... JobManager::queue()
+ 
+ #include "gtest/gtest.h"
++
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include "utils.h"
+ 
+ class xSquaredPlusBVectorSerial {
+diff --git a/roofit/roofitZMQ/test/test_ZMQ.cpp b/roofit/roofitZMQ/test/test_ZMQ.cpp
+index 6dcceaff08..73e75be147 100644
+--- a/roofit/roofitZMQ/test/test_ZMQ.cpp
++++ b/roofit/roofitZMQ/test/test_ZMQ.cpp
+@@ -16,6 +16,10 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <unistd.h> // fork, usleep
+ 
+ #include <sstream>
+diff --git a/roofit/roofitcore/test/TestStatistics/RooRealL.cpp b/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
+index f8421613ac..3ae6285a12 100644
+--- a/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
++++ b/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
+@@ -34,6 +34,10 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ class RooRealL
+    : public ::testing::TestWithParam<std::tuple<std::size_t>> {
+ };
+diff --git a/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp b/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
+index f4adf63eec..05164277f0 100644
+--- a/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
++++ b/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
+@@ -33,6 +33,11 @@
+ #include <stdexcept> // runtime_error
+ 
+ #include "gtest/gtest.h"
++
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include "../test_lib.h" // generate_1D_gaussian_pdf_nll
+ 
+ using RooFit::TestStatistics::LikelihoodWrapper;
+diff --git a/roofit/roofitcore/test/testProxiesAndCategories.cxx b/roofit/roofitcore/test/testProxiesAndCategories.cxx
+index bed3c399bb..550e0c5ac9 100644
+--- a/roofit/roofitcore/test/testProxiesAndCategories.cxx
++++ b/roofit/roofitcore/test/testProxiesAndCategories.cxx
 @@ -16,6 +16,9 @@
  
  #include "gtest/gtest.h"
@@ -159,10 +277,42 @@ diff -ur root-6.24.02.orig/roofit/roofitcore/test/testProxiesAndCategories.cxx r
  
  TEST(RooCategory, CategoryDefineMultiState) {
    RooCategory myCat("myCat", "A category", { {"0Lep", 0}, {"1Lep", 1}, {"2Lep", 2}, {"3Lep", 3} });
-diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_datablockcallback.cxx root-6.24.02/tree/dataframe/test/dataframe_datablockcallback.cxx
---- root-6.24.02.orig/tree/dataframe/test/dataframe_datablockcallback.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/dataframe_datablockcallback.cxx	2021-08-06 09:31:38.801835298 +0200
-@@ -11,6 +11,10 @@
+diff --git a/roofit/roofitcore/test/testRooDataHist.cxx b/roofit/roofitcore/test/testRooDataHist.cxx
+index 90782e0749..f6b5e087ae 100644
+--- a/roofit/roofitcore/test/testRooDataHist.cxx
++++ b/roofit/roofitcore/test/testRooDataHist.cxx
+@@ -18,6 +18,10 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <algorithm>
+ #include <memory>
+ 
+diff --git a/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx b/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
+index c1978ae47e..877ab1525f 100644
+--- a/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
++++ b/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
+@@ -22,6 +22,11 @@
+ #include <stdio.h> // remove redundant workspace files
+ 
+ #include "gtest/gtest.h"
++
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include "test_lib.h"
+ 
+ #include <RooMsgService.h>
+diff --git a/tree/dataframe/test/dataframe_definepersample.cxx b/tree/dataframe/test/dataframe_definepersample.cxx
+index 772b8baa70..37da9f3f95 100644
+--- a/tree/dataframe/test/dataframe_definepersample.cxx
++++ b/tree/dataframe/test/dataframe_definepersample.cxx
+@@ -6,6 +6,10 @@
  
  #include <gtest/gtest.h>
  
@@ -170,13 +320,14 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_datablockcallback.cxx r
 +#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
 +#endif
 +
- #include <algorithm> // std::min
- #include <thread> // std::hardware_concurrency
- 
-diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_merge_results.cxx root-6.24.02/tree/dataframe/test/dataframe_merge_results.cxx
---- root-6.24.02.orig/tree/dataframe/test/dataframe_merge_results.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/dataframe_merge_results.cxx	2021-08-06 09:31:38.802835300 +0200
-@@ -308,7 +308,7 @@
+ #include <atomic>
+ #include <memory>
+ #include <thread> // std::thread::hardware_concurrency
+diff --git a/tree/dataframe/test/dataframe_merge_results.cxx b/tree/dataframe/test/dataframe_merge_results.cxx
+index 9354b75a39..ea439ea006 100644
+--- a/tree/dataframe/test/dataframe_merge_results.cxx
++++ b/tree/dataframe/test/dataframe_merge_results.cxx
+@@ -340,7 +340,7 @@ TEST(RDataFrameMergeResults, Merge5Hists)
     EXPECT_FALSE(mh3);
     EXPECT_FALSE(mh4);
     EXPECT_FALSE(mh5);
@@ -185,9 +336,10 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_merge_results.cxx root-
  
     const auto &mh = mergedptr->GetValue();
  
-diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_regression.cxx root-6.24.02/tree/dataframe/test/dataframe_regression.cxx
---- root-6.24.02.orig/tree/dataframe/test/dataframe_regression.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/dataframe_regression.cxx	2021-08-06 09:31:38.802835300 +0200
+diff --git a/tree/dataframe/test/dataframe_regression.cxx b/tree/dataframe/test/dataframe_regression.cxx
+index 9801067cf4..8a991f40c5 100644
+--- a/tree/dataframe/test/dataframe_regression.cxx
++++ b/tree/dataframe/test/dataframe_regression.cxx
 @@ -9,6 +9,10 @@
  
  #include "gtest/gtest.h"
@@ -199,9 +351,25 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_regression.cxx root-6.2
  // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
  class RDFRegressionTests : public ::testing::TestWithParam<bool> {
  protected:
-diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_simple.cxx root-6.24.02/tree/dataframe/test/dataframe_simple.cxx
---- root-6.24.02.orig/tree/dataframe/test/dataframe_simple.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/tree/dataframe/test/dataframe_simple.cxx	2021-08-06 09:31:38.803835303 +0200
+diff --git a/tree/dataframe/test/dataframe_samplecallback.cxx b/tree/dataframe/test/dataframe_samplecallback.cxx
+index 188d58dd31..7734586eb3 100644
+--- a/tree/dataframe/test/dataframe_samplecallback.cxx
++++ b/tree/dataframe/test/dataframe_samplecallback.cxx
+@@ -11,6 +11,10 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <algorithm> // std::min
+ #include <memory>
+ #include <mutex>
+diff --git a/tree/dataframe/test/dataframe_simple.cxx b/tree/dataframe/test/dataframe_simple.cxx
+index 6006f99017..b507edc13f 100644
+--- a/tree/dataframe/test/dataframe_simple.cxx
++++ b/tree/dataframe/test/dataframe_simple.cxx
 @@ -1,5 +1,10 @@
  /****** Run RDataFrame tests both with and without IMT enabled *******/
  #include <gtest/gtest.h>
@@ -213,3 +381,36 @@ diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_simple.cxx root-6.24.02
  #include <ROOTUnitTestSupport.h>
  #include <ROOT/RDataFrame.hxx>
  #include <ROOT/TSeq.hxx>
+diff --git a/tree/dataframe/test/dataframe_vary.cxx b/tree/dataframe/test/dataframe_vary.cxx
+index 2284b21f53..5a26c43cdc 100644
+--- a/tree/dataframe/test/dataframe_vary.cxx
++++ b/tree/dataframe/test/dataframe_vary.cxx
+@@ -7,6 +7,10 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ using ROOT::RDF::Experimental::VariationsFor;
+ 
+ class RDFVary : public ::testing::TestWithParam<bool> {
+diff --git a/tree/tree/test/TOffsetGeneration.cxx b/tree/tree/test/TOffsetGeneration.cxx
+index 7b6b7647aa..77f125ca60 100644
+--- a/tree/tree/test/TOffsetGeneration.cxx
++++ b/tree/tree/test/TOffsetGeneration.cxx
+@@ -9,6 +9,10 @@
+ #include "ROOTUnitTestSupport.h"
+ #include "gtest/gtest.h"
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define SetUpTestSuite SetUpTestCase
++#endif
++
+ #include "ElementStruct.h"
+ 
+ class TOffsetGeneration : public ::testing::Test {
+-- 
+2.35.1
+
diff --git a/root-ppc-codemodel.patch b/root-ppc-codemodel.patch
deleted file mode 100644
index 223dc7c..0000000
--- a/root-ppc-codemodel.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 774ab9358d852e2c004564183de4a60eaaa5ac98 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 23 Apr 2021 21:40:14 +0200
-Subject: [PATCH 2/2] Actually request the use of the large code model for
- ppc64/ppc64le
-
-Instead of erroring out with an assert.
----
- interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-index 46771aa8c0..93a48f31f3 100644
---- a/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-+++ b/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp
-@@ -73,14 +73,14 @@ CreateHostTargetMachine(const clang::CompilerInstance& CI) {
-   JTMB->getOptions().EmulatedTLS = false;
- #endif // _WIN32
- 
--  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
--
- #if defined(__powerpc64__) || defined(__PPC64__)
-   // We have to use large code model for PowerPC64 because TOC and text sections
-   // can be more than 2GB apart.
--  assert(TM->getCodeModel() >= CodeModel::Large);
-+  JTMB->setCodeModel(CodeModel::Large);
- #endif
- 
-+  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
-+
-   // Forcefully disable GlobalISel, it might be enabled on AArch64 without
-   // optimizations. In tests on an Apple M1 after the upgrade to LLVM 9, this
-   // new instruction selection framework emits branches / calls that expect all
--- 
-2.30.2
-
diff --git a/root-ppc-segfault-fix.patch b/root-ppc-segfault-fix.patch
deleted file mode 100644
index b9cba0f..0000000
--- a/root-ppc-segfault-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 55ae047b70e927de5c84cfa5ad42905cbd58d499 Mon Sep 17 00:00:00 2001
-From: Vassil Vassilev <v.g.vassilev@gmail.com>
-Date: Sat, 4 Dec 2021 00:06:19 +0000
-Subject: [PATCH] [llvm] Restore the ppc64le support that we lost in llvm8.
-
-This patch is backported from https://reviews.llvm.org/D94183
-
-For more discussion see https://github.com/numba/numba/issues/4026
-
-Fixes root-project/root#8072 and root-project/root#9297
----
- .../src/lib/Target/PowerPC/PPCISelLowering.cpp  | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp b/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
-index 24d50074860d..a922b40aa902 100644
---- a/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ b/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -4463,7 +4463,15 @@ callsShareTOCBase(const Function *Caller, SDValue Callee,
-    if (!G)
-      return false;
- 
--   const GlobalValue *GV = G->getGlobal();
-+  const GlobalValue *GV = G->getGlobal();
-+
-+  // If the GV is not a strong definition then we need to assume it can be
-+  // replaced by another function at link time. The function that replaces
-+  // it may not share the same TOC as the caller since the callee may be
-+  // replaced by a PC Relative version of the same function.
-+  if (!GV->isStrongDefinitionForLinker())
-+    return false;
-+
-   // The medium and large code models are expected to provide a sufficiently
-   // large TOC to provide all data addressing needs of a module with a
-   // single TOC. Since each module will be addressed with a single TOC then we
-@@ -4472,13 +4480,6 @@ callsShareTOCBase(const Function *Caller, SDValue Callee,
-       CodeModel::Large == TM.getCodeModel())
-     return TM.shouldAssumeDSOLocal(*Caller->getParent(), GV);
- 
--  // Otherwise we need to ensure callee and caller are in the same section,
--  // since the linker may allocate multiple TOCs, and we don't know which
--  // sections will belong to the same TOC base.
--
--  if (!GV->isStrongDefinitionForLinker())
--    return false;
--
-   // Any explicitly-specified sections and section prefixes must also match.
-   // Also, if we're using -ffunction-sections, then each function is always in
-   // a different section (the same is true for COMDAT functions).
diff --git a/root-ptr-is-null-RooFit-TMVA.patch b/root-ptr-is-null-RooFit-TMVA.patch
deleted file mode 100644
index 3aa3acd..0000000
--- a/root-ptr-is-null-RooFit-TMVA.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c65f3d96f3f4433bff9d40fa9cf1dec100867a07 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 8 Jun 2021 10:12:37 +0200
-Subject: [PATCH] Fix 'this' pointer is null warnings
-
-.../roofit/roofitcore/src/RooDataHist.cxx: In member function 'void RooDataHist::_adjustBinning(RooRealVar&, const TAxis&, RooRealVar*, Int_t*)':
-.../roofit/roofitcore/src/RooDataHist.cxx:595:122: warning: 'this' pointer is null [-Wnonnull]
-  595 |     coutE(InputArguments) << "RooDataHist::adjustBinning(" << GetName() << ") ERROR: dimension " << ourVar->GetName() << " must be real" << endl ;
-      |                                                                                                                          ^~~~~~~~~~~~~~~
-
-.../roofit/roofitcore/src/RooRealSumFunc.cxx: In constructor 'RooRealSumFunc::RooRealSumFunc(const char*, const char*, const RooArgList&, const RooArgList&)':
-.../roofit/roofitcore/src/RooRealSumFunc.cxx:156:35: warning: 'this' pointer is null [-Wnonnull]
-  156 |                                << " is not of type RooAbsReal, fatal error" << endl;
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx: In member function 'void TMVA::DNN::TDataLoader<AData, TMVA::DNN::TReference<AReal> >::CopyInput(TMatrixT<AReal>&, TMVA::DNN::IndexIterator_t) [with AData = std::tuple<const std::vector<TMVA::Event*, std::allocator<TMVA::Event*> >&, const TMVA::DataSetInfo&>; AReal = float]':
-.../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx:131:34: warning: 'this' pointer is null [-Wnonnull]
-  131 |    Int_t n = event->GetNVariables();
-      |              ~~~~~~~~~~~~~~~~~~~~^~
-In file included from .../tmva/tmva/inc/TMVA/VariableTransformBase.h:48,
-                 from .../tmva/tmva/inc/TMVA/Tools.h:58,
-                 from .../tmva/tmva/inc/TMVA/DNN/GeneralLayer.h:36,
-                 from .../tmva/tmva/inc/TMVA/DNN/CNN/ConvLayer.h:32,
-                 from .../tmva/tmva/inc/TMVA/DNN/Architectures/Reference.h:24,
-                 from .../tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx:17:
-.../tmva/tmva/inc/TMVA/Event.h:88:16: note: in a call to non-static member function 'UInt_t TMVA::Event::GetNVariables() const'
-   88 |       UInt_t   GetNVariables()        const;
-      |                ^~~~~~~~~~~~~
----
- roofit/roofitcore/src/RooDataHist.cxx                    | 2 +-
- roofit/roofitcore/src/RooRealSumFunc.cxx                 | 4 ++--
- tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
-index 84cf2c0f68..8dddb88e2b 100644
---- a/roofit/roofitcore/src/RooDataHist.cxx
-+++ b/roofit/roofitcore/src/RooDataHist.cxx
-@@ -591,7 +591,7 @@ void RooDataHist::importDHistSet(const RooArgList& /*vars*/, RooCategory& indexC
- void RooDataHist::_adjustBinning(RooRealVar &theirVar, const TAxis &axis,
-     RooRealVar *ourVar, Int_t *offset)
- {
--  if (!dynamic_cast<RooRealVar*>(ourVar)) {
-+  if (!dynamic_cast<RooRealVar*>(static_cast<RooAbsArg*>(ourVar))) {
-     coutE(InputArguments) << "RooDataHist::adjustBinning(" << GetName() << ") ERROR: dimension " << ourVar->GetName() << " must be real" << endl ;
-     assert(0) ;
-   }
-diff --git a/roofit/roofitcore/src/RooRealSumFunc.cxx b/roofit/roofitcore/src/RooRealSumFunc.cxx
-index 3f78020acd..a1625d7e35 100644
---- a/roofit/roofitcore/src/RooRealSumFunc.cxx
-+++ b/roofit/roofitcore/src/RooRealSumFunc.cxx
-@@ -149,10 +149,10 @@ RooRealSumFunc::RooRealSumFunc(const char *name, const char *title, const RooArg
-       _coefList.add(*coef);
-    }
- 
--   func = (RooAbsReal *)funcIter->Next();
-+   func = (RooAbsArg *)funcIter->Next();
-    if (func) {
-       if (!dynamic_cast<RooAbsReal *>(func)) {
--         coutE(InputArguments) << "RooRealSumFunc::RooRealSumFunc(" << GetName() << ") last func " << coef->GetName()
-+         coutE(InputArguments) << "RooRealSumFunc::RooRealSumFunc(" << GetName() << ") last func " << func->GetName()
-                                << " is not of type RooAbsReal, fatal error" << endl;
-          assert(0);
-       }
-diff --git a/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx b/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
-index 2465abf308..24a09d1fc0 100644
---- a/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
-+++ b/tmva/tmva/src/DNN/Architectures/Reference/DataLoader.cxx
-@@ -128,7 +128,7 @@ void TDataLoader<TMVAInput_t, TReference<Real_t>>::CopyInput(TMatrixT<Real_t> &m
-    Event *event = nullptr;
- 
-    Int_t m = matrix.GetNrows();
--   Int_t n = event->GetNVariables();
-+   Int_t n = matrix.GetNcols();
- 
-    // Copy input variables.
- 
--- 
-2.31.1
-
diff --git a/root-ptr-is-null-TStreamerInfo.patch b/root-ptr-is-null-TStreamerInfo.patch
deleted file mode 100644
index 869715c..0000000
--- a/root-ptr-is-null-TStreamerInfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1ca221f010fdcfb6249ae7b1cac77fbe29b86214 Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@cern.ch>
-Date: Mon, 7 Jun 2021 11:02:48 +0200
-Subject: [PATCH] [io] Avoid nullptr deref when printing warning in
- TStreamerInfo
-
----
- io/io/src/TStreamerInfo.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
-index d545ab7be8..a026635890 100644
---- a/io/io/src/TStreamerInfo.cxx
-+++ b/io/io/src/TStreamerInfo.cxx
-@@ -1109,12 +1109,12 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
-                              fClassVersion, GetName(), GetName(), GetName(), fClassVersion);
-                   } else {
-                      Warning("BuildCheck", "\n\
--   The StreamerInfo from %s does not match existing one (%s:%d)\n\
-+   The StreamerInfo does not match existing one (%s:%d)\n\
-    The existing one has not been used yet and will be discarded.\n\
-    Reading should work properly, however writing object of\n\
-    type %s will not work properly.  Most likely the version number\n\
-    of the class was not properly updated [See ClassDef(%s,%d)].",
--                             file->GetName(), GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
-+                             GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
-                   }
-                }
-             }
--- 
-2.31.1
-
diff --git a/root-rcolor-static-init.patch b/root-rcolor-static-init.patch
new file mode 100644
index 0000000..18e4299
--- /dev/null
+++ b/root-rcolor-static-init.patch
@@ -0,0 +1,42 @@
+From c4df90861879f45b281c2a8e55212b711cfdbfa0 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 29 Mar 2022 15:30:20 +0200
+Subject: [PATCH] Avoid crashes due to static initialization order
+
+Most commonly seen on ppc64le. Backtrace:
+
+===========================================================
+The lines below might hint at the cause of the crash.
+You may get help by asking at the ROOT forum https://root.cern/forum
+Only if you are really convinced it is a bug in ROOT then please submit a
+report at https://root.cern/bugs Please post the ENTIRE stack trace
+from above as an attachment in addition to anything else
+that might help us fixing this issue.
+===========================================================
+ #11 ROOT::Experimental::RColor::toHex[abi:cxx11](unsigned char) (v=<optimized out>) at /usr/include/c++/11/ext/new_allocator.h:82
+ #12 0x00007fff90c220ec in ROOT::Experimental::RColor::SetRGB (this=0x7fffeadf5d10, r=<optimized out>, g=<optimized out>, b=<optimized out>) at /usr/include/c++/11/ext/new_allocator.h:89
+---
+ graf2d/gpadv7/src/RColor.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/graf2d/gpadv7/src/RColor.cxx b/graf2d/gpadv7/src/RColor.cxx
+index de325f1ea3..6878360073 100644
+--- a/graf2d/gpadv7/src/RColor.cxx
++++ b/graf2d/gpadv7/src/RColor.cxx
+@@ -232,10 +232,10 @@ std::vector<uint8_t> RColor::AsRGBA() const
+ 
+ std::string RColor::toHex(uint8_t v)
+ {
+-   static const char *digits = "0123456789ABCDEF";
++   auto digits = [](auto d) { return d < 10 ? '0' + d : 'A' - 10 + d; };
+    std::string res(2,'0');
+-   res[0] = digits[v >> 4];
+-   res[1] = digits[v & 0xf];
++   res[0] = digits(v >> 4);
++   res[1] = digits(v & 0xf);
+    return res;
+ }
+ 
+-- 
+2.35.1
+
diff --git a/root-roofit-overflow.patch b/root-roofit-overflow.patch
new file mode 100644
index 0000000..e368aa9
--- /dev/null
+++ b/root-roofit-overflow.patch
@@ -0,0 +1,59 @@
+From 8b6a10aefa5ae660e9d13a8e55933125b257ab6c Mon Sep 17 00:00:00 2001
+From: moneta <lorenzo.moneta@cern.ch>
+Date: Fri, 25 Feb 2022 09:54:40 +0100
+Subject: [PATCH] Fix an array overflow in interpolating RooHistPdf when the
+ interpolation order is >= 10.
+
+---
+ roofit/roofitcore/src/RooDataHist.cxx | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
+index c293a8fbb1..2159f73093 100644
+--- a/roofit/roofitcore/src/RooDataHist.cxx
++++ b/roofit/roofitcore/src/RooDataHist.cxx
+@@ -1206,9 +1206,9 @@ double RooDataHist::weightInterpolated(const RooArgSet& bin, int intOrder, bool
+ 
+     auto idxMultY = _idxMult[varInfo.realVarIdx2];
+     auto offsetIdx = centralIdx - idxMultY * ybinC;
+-    
+-    double yarr[10] = {} ;
+-    double xarr[10] = {} ;
++
++    std::vector<double> yarr(intOrder+1);
++    std::vector<double> xarr(intOrder+1);
+     for (int i=ybinLo ; i<=intOrder+ybinLo ; i++) {
+       int ibin ;
+       if (i>=0 && i<ybinM) {
+@@ -1236,7 +1236,7 @@ double RooDataHist::weightInterpolated(const RooArgSet& bin, int intOrder, bool
+       for (int q=0; q<=intOrder ; q++) cout << yarr[q] << " " ;
+       cout << endl ;
+     }
+-    wInt = RooMath::interpolate(xarr,yarr,intOrder+1,yval) ;
++    wInt = RooMath::interpolate(xarr.data(),yarr.data(),intOrder+1,yval) ;
+ 
+   } else {
+ 
+@@ -1344,8 +1344,8 @@ double RooDataHist::interpolateDim(int iDim, double xval, size_t centralIdx, int
+   auto idxMult = _idxMult[iDim];
+   auto offsetIdx = centralIdx - idxMult * fbinC;
+ 
+-  double yarr[10] ;
+-  double xarr[10] ;
++  std::vector<double> yarr(intOrder+1) ;
++  std::vector<double> xarr(intOrder+1);
+   for (int i=fbinLo ; i<=intOrder+fbinLo ; i++) {
+     int ibin ;
+     if (i>=0 && i<fbinM) {
+@@ -1383,7 +1383,7 @@ double RooDataHist::interpolateDim(int iDim, double xval, size_t centralIdx, int
+       }
+     }
+   }
+-  return RooMath::interpolate(xarr,yarr,intOrder+1,xval) ;
++  return RooMath::interpolate(xarr.data(),yarr.data(),intOrder+1,xval) ;
+ }
+ 
+ 
+-- 
+2.35.1
+
diff --git a/root-roofit-tutorial.patch b/root-roofit-tutorial.patch
new file mode 100644
index 0000000..9d73e11
--- /dev/null
+++ b/root-roofit-tutorial.patch
@@ -0,0 +1,74 @@
+From 914e46f1c591f8b9b34115863ff31e42e19bfb97 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 28 Mar 2022 09:32:24 +0200
+Subject: [PATCH] Use calls from Python directly
+
+The rf105_funcbinding.py tutorial used to trigger errors due to unknown
+symbols. In particular the custum new and delete operators used in RooFit
+were not autoloaded when needed.
+
+In the tutorial there was a workaround implemented to call ProcessLine
+instead of making calls directly form Python, to make the autoloading
+from the C++ side of ROOT instead. This did not quite fix the problem,
+and the tutorial still randomly failed due to missing symbols.
+
+After changing the algorthm used for autoloading in commit
+6ae602bba7d33c900a117c9de0187ab5a28e14b8 these problems were solved.
+
+After this fix using the direct calls from Python also works, so this
+PR suggests updating the tutorial to do that.
+---
+ tutorials/roofit/rf105_funcbinding.py | 30 ++++++---------------------
+ 1 file changed, 6 insertions(+), 24 deletions(-)
+
+diff --git a/tutorials/roofit/rf105_funcbinding.py b/tutorials/roofit/rf105_funcbinding.py
+index 72d9cf62fc..b9de2a095a 100644
+--- a/tutorials/roofit/rf105_funcbinding.py
++++ b/tutorials/roofit/rf105_funcbinding.py
+@@ -17,15 +17,8 @@ import ROOT
+ # ---------------------------------------------------
+ 
+ # Bind one-dimensional ROOT.TMath.Erf function as ROOT.RooAbsReal function
+-# Directly trying this in python doesn't work:
+-# x = ROOT.RooRealVar("x", "x", -3, 3)
+-# erf = ROOT.RooFit.bindFunction("erf", ROOT.TMath.Erf, x)
+-# Need to go through C interface
+-ROOT.gInterpreter.ProcessLine(
+-    'auto x = RooRealVar("x", "x", -3, 3); auto myerf = RooFit::bindFunction("erf", TMath::Erf, x)'
+-)
+-x = ROOT.x
+-erf = ROOT.myerf
++x = ROOT.RooRealVar("x", "x", -3, 3)
++erf = ROOT.RooFit.bindFunction("erf", ROOT.TMath.Erf, x)
+ 
+ # Print erf definition
+ erf.Print()
+@@ -38,21 +31,10 @@ erf.plotOn(frame1)
+ # -----------------------------------------------------------------------
+ 
+ # Bind pdf ROOT.Math.Beta with three variables as ROOT.RooAbsPdf function
+-# As above, this does not work directly in python
+-# x2 = ROOT.RooRealVar("x2", "x2", 0, 0.999)
+-# a = ROOT.RooRealVar("a", "a", 5, 0, 10)
+-# b = ROOT.RooRealVar("b", "b", 2, 0, 10)
+-# beta = ROOT.RooFit.bindPdf("beta", ROOT.Math.beta_pdf, x2, a, b)
+-ROOT.gInterpreter.ProcessLine(
+-    'auto x2 = RooRealVar("x2", "x2", 0, 0.999);\
+-    auto a = RooRealVar("a", "a", 5, 0, 10);\
+-    auto b = RooRealVar("b", "b", 5, 0, 10);\
+-    auto beta = RooFit::bindPdf("beta", ROOT::Math::beta_pdf, x2, a, b)'
+-)
+-x2 = ROOT.x2
+-a = ROOT.a
+-b = ROOT.b
+-beta = ROOT.beta
++x2 = ROOT.RooRealVar("x2", "x2", 0, 0.999)
++a = ROOT.RooRealVar("a", "a", 5, 0, 10)
++b = ROOT.RooRealVar("b", "b", 2, 0, 10)
++beta = ROOT.RooFit.bindPdf("beta", ROOT.Math.beta_pdf, x2, a, b)
+ 
+ # Perf beta definition
+ beta.Print()
+-- 
+2.35.1
+
diff --git a/root-stress-s390x.patch b/root-stress-s390x.patch
deleted file mode 100644
index b1d9b9d..0000000
--- a/root-stress-s390x.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 30cbc0d44364586ac64a3ac0fd6641e338549bbe Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 10 Aug 2021 06:33:17 +0200
-Subject: [PATCH] Adjust tests for s390x
-
----
- math/mathcore/test/stress/testGenVector.cxx | 2 +-
- test/stressMathCore.cxx                     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/math/mathcore/test/stress/testGenVector.cxx b/math/mathcore/test/stress/testGenVector.cxx
-index 8da429c395..df9061c88e 100644
---- a/math/mathcore/test/stress/testGenVector.cxx
-+++ b/math/mathcore/test/stress/testGenVector.cxx
-@@ -79,7 +79,7 @@ TYPED_TEST_P(GenVectorTest, TestGenVectors)
-    scale = this->fDim * 20;
-    if (this->fDim == 3 && this->V2Name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
-    if (this->fDim == 4 && ( this->V2Name() == "PtEtaPhiMVector"  || this->V2Name() == "PxPyPzMVector")) {
--#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__))
-+#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(__s390x__))
-       scale *= 1.E7;
- #else
-       scale *= 10;
-diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
-index 4d4695a8a0..b6d2d2c9e7 100644
---- a/test/stressMathCore.cxx
-+++ b/test/stressMathCore.cxx
-@@ -1120,7 +1120,7 @@ int testVector(int ngen, bool testio=false) {
-    scale = Dim*20;
-    if (Dim==3 && VecType<V2>::name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi
-    if (Dim==4 && ( VecType<V2>::name() == "PtEtaPhiMVector" || VecType<V2>::name() == "PxPyPzMVector")) {
--#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__))
-+#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(__s390x__))
-       scale *= 1.E7;
- #else
-       scale *= 10;
--- 
-2.31.1
-
diff --git a/root-threadsh1-avoid-heap-use-after-free.patch b/root-threadsh1-avoid-heap-use-after-free.patch
new file mode 100644
index 0000000..6111f2b
--- /dev/null
+++ b/root-threadsh1-avoid-heap-use-after-free.patch
@@ -0,0 +1,48 @@
+From 493c4210168fa475aa4130c12e8fdff3b7d85c09 Mon Sep 17 00:00:00 2001
+From: Philippe Canal <pcanal@fnal.gov>
+Date: Mon, 7 Mar 2022 13:32:37 -0600
+Subject: [PATCH] threadsh1: Avoid heap-use-after-free.
+
+Previously, the Canvas `Close` signal which triggers a call to the local function `close` which
+was unconditionally call `Kill` on its associated thread would call it on an already deleted
+object if the `TThread` was deleted before the `TCanvas`.
+
+This fix #10015 (detected by using ASAN).
+---
+ tutorials/legacy/thread/threadsh1.C | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/tutorials/legacy/thread/threadsh1.C b/tutorials/legacy/thread/threadsh1.C
+index b819f5d020..d6abc67e36 100644
+--- a/tutorials/legacy/thread/threadsh1.C
++++ b/tutorials/legacy/thread/threadsh1.C
+@@ -67,7 +67,8 @@ void *joiner(void *)
+ void closed(Int_t id)
+ {
+    // kill the thread matching the canvas being closed
+-   t[id]->Kill();
++   if (t[id])
++      t[id]->Kill();
+    // and set the canvas pointer to 0
+    c[id] = 0;
+ }
+@@ -142,11 +143,11 @@ void threadsh1()
+    t[4]->Join();
+    TThread::Ps();
+ 
+-   delete t[0];
+-   delete t[1];
+-   delete t[2];
+-   delete t[3];
+-   delete t[4];
++   delete t[0]; t[0] = nullptr; // Prevents after deletion access.
++   delete t[1]; t[1] = nullptr;
++   delete t[2]; t[2] = nullptr;
++   delete t[3]; t[3] = nullptr;
++   delete t[4]; t[4] = nullptr;
+ 
+    delete rng[0];
+    delete rng[1];
+-- 
+2.35.1
+
diff --git a/root-tmva-threads.patch b/root-tmva-threads.patch
new file mode 100644
index 0000000..459062d
--- /dev/null
+++ b/root-tmva-threads.patch
@@ -0,0 +1,62 @@
+From f525fe375840cda2bf5b51e018eab8ad74dcd736 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 30 Mar 2022 15:51:07 +0200
+Subject: [PATCH] Limit the number of threads in TMVA CNN/DNN test to save
+ memory
+
+Processing /builddir/build/BUILD/root-6.26.00/tutorials/tmva/TMVA_CNN_Classification.C...
+Running with nthreads  = 224
+
+[ ... ]
+
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
+ *** Break *** segmentation violation
+ *** Break *** segmentation violation
+ *** Break *** segmentation violation
+ *** Break *** segmentation violation
+ *** Break *** segmentation violation
+ *** Break *** segmentation violation
+---
+ tutorials/tmva/TMVA_CNN_Classification.C | 2 +-
+ tutorials/tmva/TMVA_RNN_Classification.C | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
+index 3e590c5958..4abfc6a4d1 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.C
++++ b/tutorials/tmva/TMVA_CNN_Classification.C
+@@ -125,7 +125,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+ 
+    bool writeOutputFile = true;
+ 
+-   int num_threads = 0;  // use default threads
++   int num_threads = 32;
+ 
+    TMVA::Tools::Instance();
+ 
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
+index 5be80824f9..791b9aecf5 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.C
++++ b/tutorials/tmva/TMVA_RNN_Classification.C
+@@ -190,7 +190,7 @@ void TMVA_RNN_Classification(int use_type = 1)
+    useKeras = false;
+ #endif
+ 
+-   int num_threads = 0;   // use by default all threads
++   int num_threads = 32;
+    // do enable MT running
+    if (num_threads >= 0) {
+       ROOT::EnableImplicitMT(num_threads);
+-- 
+2.35.1
+
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index ae180a2..1bdf869 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,111 +1,202 @@
-diff -ur root-6.24.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.24.02/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.24.02.orig/cmake/modules/SearchInstalledSoftware.cmake	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/cmake/modules/SearchInstalledSoftware.cmake	2021-08-11 10:56:26.680731609 +0200
-@@ -1699,102 +1699,17 @@
+From 29884ae01fde27204d92f554da4e92227a2ed1e6 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 26 Mar 2022 10:22:07 +0100
+Subject: [PATCH 1/2] Implement builtin_gtest option
+
+By setting the option to OFF the system gtest and gmock are used.
+This allows doing tests without network available, e.g. during a
+package build for Fedora/EPEL.
+---
+ cmake/modules/FindGTest.cmake               | 81 +++++++++++++++++++++
+ cmake/modules/RootBuildOptions.cmake        |  2 +
+ cmake/modules/RootMacros.cmake              |  2 +-
+ cmake/modules/SearchInstalledSoftware.cmake | 44 ++++++++---
+ 4 files changed, 118 insertions(+), 11 deletions(-)
+ create mode 100644 cmake/modules/FindGTest.cmake
+
+diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
+new file mode 100644
+index 0000000000..438ec501c2
+--- /dev/null
++++ b/cmake/modules/FindGTest.cmake
+@@ -0,0 +1,81 @@
++# Find the gtest and gmock includes and library.
++#
++# This module defines
++# GTEST_LIBRARIES
++# GTEST_MAIN_LIBRARIES
++# GTEST_INCLUDE_DIRS
++# GMOCK_LIBRARIES
++# GMOCK_MAIN_LIBRARIES
++# GMOCK_INCLUDE_DIRS
++#
++# GTEST_FOUND           true if all libraries present
++
++find_package(Threads QUIET)
++
++find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
++find_library(GTEST_LIBRARIES NAMES gtest)
++find_library(GTEST_MAIN_LIBRARIES NAMES gtest_main)
++
++find_path(GMOCK_INCLUDE_DIRS NAMES gmock/gmock.h)
++find_library(GMOCK_LIBRARIES NAMES gmock)
++find_library(GMOCK_MAIN_LIBRARIES NAMES gmock_main)
++
++# Special for EPEL 7's gmock
++if(NOT GMOCK_LIBRARIES)
++  find_path(GMOCK_SRC_DIR NAMES gmock-all.cc PATHS /usr/src/gmock)
++endif()
++
++if(NOT GMOCK_MAIN_LIBRARIES)
++  find_path(GMOCK_MAIN_SRC_DIR NAMES gmock_main.cc PATHS /usr/src/gmock)
++endif()
++
++if (GTEST_INCLUDE_DIRS AND
++    GTEST_LIBRARIES AND
++    GTEST_MAIN_LIBRARIES AND
++    GMOCK_INCLUDE_DIRS AND
++    (GMOCK_LIBRARIES OR GMOCK_SRC_DIR) AND
++    (GMOCK_MAIN_LIBRARIES OR GMOCK_MAIN_SRC_DIR))
++
++  add_library(gtest UNKNOWN IMPORTED)
++  set_target_properties(gtest PROPERTIES
++    IMPORTED_LOCATION ${GTEST_LIBRARIES}
++    INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS})
++  target_link_libraries(gtest INTERFACE Threads::Threads)
++
++  add_library(gtest_main UNKNOWN IMPORTED)
++  set_target_properties(gtest_main PROPERTIES
++    IMPORTED_LOCATION ${GTEST_MAIN_LIBRARIES})
++  target_link_libraries(gtest_main INTERFACE gtest Threads::Threads)
++
++  if(GMOCK_LIBRARIES)
++    add_library(gmock UNKNOWN IMPORTED)
++    set_target_properties(gmock PROPERTIES
++      IMPORTED_LOCATION ${GMOCK_LIBRARIES}
++      INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIRS})
++  else()
++    add_library(gmock STATIC ${GMOCK_SRC_DIR}/gmock-all.cc)
++    target_include_directories(gmock PUBLIC ${GMOCK_INCLUDE_DIRS})
++    set(GMOCK_LIBRARIES gmock)
++  endif()
++  target_link_libraries(gmock INTERFACE gtest Threads::Threads)
++
++  if(GMOCK_MAIN_LIBRARIES)
++    add_library(gmock_main UNKNOWN IMPORTED)
++    set_target_properties(gmock_main PROPERTIES
++      IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARIES})
++  else()
++    add_library(gmock_main STATIC ${GMOCK_MAIN_SRC_DIR}/gmock_main.cc)
++    set(GMOCK_MAIN_LIBRARIES gmock_main)
++  endif()
++  target_link_libraries(gmock_main INTERFACE gmock Threads::Threads)
++
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(GTest DEFAULT_MSG
++  GTEST_LIBRARIES
++  GTEST_MAIN_LIBRARIES
++  GTEST_INCLUDE_DIRS
++  GMOCK_LIBRARIES
++  GMOCK_MAIN_LIBRARIES
++  GMOCK_INCLUDE_DIRS)
+diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
+index 7886c5f3e9..01108a18c9 100644
+--- a/cmake/modules/RootBuildOptions.cmake
++++ b/cmake/modules/RootBuildOptions.cmake
+@@ -94,6 +94,7 @@ ROOT_BUILD_OPTION(builtin_ftgl OFF "Build bundled copy of FTGL")
+ ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build bundled copy of gl2ps")
+ ROOT_BUILD_OPTION(builtin_glew OFF "Build bundled copy of GLEW")
+ ROOT_BUILD_OPTION(builtin_gsl OFF "Build GSL internally (requires network)")
++ROOT_BUILD_OPTION(builtin_gtest OFF "Build googletest internally (requires network)")
+ ROOT_BUILD_OPTION(builtin_llvm ON "Build bundled copy of LLVM")
+ ROOT_BUILD_OPTION(builtin_lz4 OFF "Build bundled copy of lz4")
+ ROOT_BUILD_OPTION(builtin_lzma OFF "Build bundled copy of lzma")
+@@ -293,6 +294,7 @@ if(builtin_all)
+   set(builtin_gl2ps_defvalue ON)
+   set(builtin_glew_defvalue ON)
+   set(builtin_gsl_defvalue ON)
++  set(builtin_gtest_defvalue ON)
+   set(builtin_llvm_defvalue ON)
+   set(builtin_lz4_defvalue ON)
+   set(builtin_lzma_defvalue ON)
+diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
+index cb75c0b1da..38fd5d6baf 100644
+--- a/cmake/modules/RootMacros.cmake
++++ b/cmake/modules/RootMacros.cmake
+@@ -1671,7 +1671,7 @@ function(ROOT_ADD_TEST test)
  
- #---Download googletest--------------------------------------------------------------
- if (testing)
--  # FIXME: Remove our version of gtest in roottest. We can reuse this one.
--  # Add googletest
--  # http://stackoverflow.com/questions/9689183/cmake-googletest
-+ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0
-+ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock)
-+  set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
+   set_property(TEST ${test} APPEND PROPERTY ENVIRONMENT ROOT_HIST=0)
  
--  set(_gtest_byproduct_binary_dir
--    ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build)
--  set(_gtest_byproducts
--    ${_gtest_byproduct_binary_dir}/lib/libgtest.a
--    ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a
--    ${_gtest_byproduct_binary_dir}/lib/libgmock.a
--    ${_gtest_byproduct_binary_dir}/lib/libgmock_main.a
--    )
--
--  if(MSVC)
--    set(EXTRA_GTEST_OPTS
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${_gtest_byproduct_binary_dir}/lib/
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL:PATH=${_gtest_byproduct_binary_dir}/lib/
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${_gtest_byproduct_binary_dir}/lib/
--      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=${_gtest_byproduct_binary_dir}/lib/
--      -Dgtest_force_shared_crt=ON
--      BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release)
--  endif()
--  if(APPLE)
--    set(EXTRA_GTEST_OPTS
--      -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
--  endif()
--
--  ExternalProject_Add(
--    googletest
--    GIT_REPOSITORY https://github.com/google/googletest.git
--    GIT_SHALLOW 1
--    GIT_TAG release-1.10.0
--    UPDATE_COMMAND ""
--    # TIMEOUT 10
--    # # Force separate output paths for debug and release builds to allow easy
--    # # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
--    # CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
--    #            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
--    #            -Dgtest_force_shared_crt=ON
--    CMAKE_ARGS -G ${CMAKE_GENERATOR}
--                  -DCMAKE_BUILD_TYPE=Release
--                  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
--                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
--                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--                  -DCMAKE_CXX_FLAGS=${ROOT_EXTERNAL_CXX_FLAGS}
--                  -DCMAKE_AR=${CMAKE_AR}
--                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
--                  ${EXTRA_GTEST_OPTS}
--    # Disable install step
--    INSTALL_COMMAND ""
--    BUILD_BYPRODUCTS ${_gtest_byproducts}
--    # Wrap download, configure and build steps in a script to log output
--    LOG_DOWNLOAD ON
--    LOG_CONFIGURE ON
--    LOG_BUILD ON
--    TIMEOUT 600
--  )
--
--  # Specify include dirs for gtest and gmock
--  ExternalProject_Get_Property(googletest source_dir)
--  set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
--  set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include)
--  # Create the directories. Prevents bug https://gitlab.kitware.com/cmake/cmake/issues/15052
--  file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
--
--  # Libraries
--  ExternalProject_Get_Property(googletest binary_dir)
--  set(_G_LIBRARY_PATH ${binary_dir}/lib/)
--
--  # Use gmock_main instead of gtest_main because it initializes gtest as well.
--  # Note: The libraries are listed in reverse order of their dependancies.
--  foreach(lib gtest gtest_main gmock gmock_main)
-+  foreach(lib gmock gmock_main)
-     add_library(${lib} IMPORTED STATIC GLOBAL)
--    set_target_properties(${lib} PROPERTIES
--      IMPORTED_LOCATION "${_G_LIBRARY_PATH}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}"
--      INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
--    )
--    add_dependencies(${lib} googletest)
--    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
--        ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 9)
--      target_compile_options(${lib} INTERFACE -Wno-deprecated-copy)
--    endif()
-   endforeach()
--  # Once we require at least cmake 3.11, target_include_directories will work for imported targets
--  # Because of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/1264
--  # We need this workaround:
--  SET_PROPERTY(TARGET gtest APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR})
--  SET_PROPERTY(TARGET gmock APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR})
--  #target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIR})
--  #target_include_directories(gmock INTERFACE ${GMOCK_INCLUDE_DIR})
--
--  set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
--  set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
-   set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
-   set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX})
- 
-+ endif()
+-  #- Handle TIMOUT and DEPENDS arguments
++  #- Handle TIMEOUT and DEPENDS arguments
+   if(ARG_TIMEOUT)
+     set_property(TEST ${test} PROPERTY TIMEOUT ${ARG_TIMEOUT})
+   endif()
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index fe40898d12..b6a3cc4c76 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -1860,15 +1860,6 @@ if (mpi)
+   endif()
  endif()
  
- #------------------------------------------------------------------------------------
+-if(testing AND NO_CONNECTION)
+-  if(fail-on-missing)
+-    message(FATAL_ERROR "No internet connection. Please check your connection, or either disable the 'testing' option or the 'fail-on-missing' to automatically disable options requiring internet access")
+-  else()
+-    message(STATUS "No internet connection, disabling 'testing' option")
+-    set(testing OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
+-  endif()
+-endif()
+-
+ #---Check for ZeroMQ when building RooFit::MultiProcess--------------------------------------------
+ 
+ if (roofit_multiprocess)
+@@ -1942,8 +1933,41 @@ if (roofit_multiprocess)
+   target_compile_definitions(cppzmq INTERFACE ZMQ_NO_EXPORT)
+ endif (roofit_multiprocess)
+ 
+-#---Download googletest--------------------------------------------------------------
++#---Check for googletest---------------------------------------------------------------
+ if (testing)
++  if (NOT builtin_gtest)
++    if(fail-on-missing)
++      find_package(GTest REQUIRED)
++    else()
++      find_package(GTest)
++      if(NOT GTEST_FOUND)
++        if(NO_CONNECTION)
++          if(fail-on-missing)
++            message(FATAL_ERROR "No internet connection and GTest was not found. Please check your connection, or either disable the 'testing' option or the 'fail-on-missing' to automatically disable options requiring internet access")
++          else()
++            message(STATUS "GTest not found, and no internet connection. Disabing the 'testing' option.")
++            set(testing OFF CACHE BOOL "Disabled because testing requested and GTest not found (${builtin_gtest_description}) and there is no internet connection" FORCE)
++          endif()
++        else()
++          message(STATUS "GTest not found, switching ON 'builtin_gtest' option.")
++          set(builtin_gtest ON CACHE BOOL "Enabled because testing requested and GTest not found (${builtin_gtest_description})" FORCE)
++        endif()
++      endif()
++    endif()
++  else()
++    if(NO_CONNECTION)
++      if(fail-on-missing)
++        message(FATAL_ERROR "No internet connection. Please check your connection, or either disable the 'testing' option or the 'builtin_gtest' option or the 'fail-on-missing' option to automatically disable options requiring internet access")
++      else()
++        message(STATUS "No internet connection, disabling the 'testing' and 'builtin_gtest' options")
++        set(testing OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
++        set(builtin_gtest OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
++      endif()
++    endif()
++  endif()
++endif()
++
++if (builtin_gtest)
+   # FIXME: Remove our version of gtest in roottest. We can reuse this one.
+   # Add googletest
+   # http://stackoverflow.com/questions/9689183/cmake-googletest
+-- 
+2.35.1
+
diff --git a/root-uring-warn.patch b/root-uring-warn.patch
new file mode 100644
index 0000000..05cfd56
--- /dev/null
+++ b/root-uring-warn.patch
@@ -0,0 +1,43 @@
+From 580fcf8fe95c45e337d222a7fd2338fdef2f52c5 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 24 Mar 2022 16:18:57 +0100
+Subject: [PATCH 1/2] Ignore warnings about uring failing during test
+
+---
+ tree/ntuple/v7/test/ntuple_extended.cxx | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
+index 8e3998996c..98d65ef319 100644
+--- a/tree/ntuple/v7/test/ntuple_extended.cxx
++++ b/tree/ntuple/v7/test/ntuple_extended.cxx
+@@ -4,6 +4,8 @@
+ 
+ #include "TROOT.h"
+ 
++#include "ROOTUnitTestSupport.h"
++
+ TEST(RNTuple, RealWorld1)
+ {
+    ROOT::EnableImplicitMT();
+@@ -111,6 +113,17 @@ TEST(RNTuple, RandomAccess)
+ #if !defined(_MSC_VER) || defined(R__ENABLE_BROKEN_WIN_TESTS)
+ TEST(RNTuple, LargeFile)
+ {
++   ROOTUnitTestSupport::CheckDiagsRAII raii;
++   raii.optionalDiag(kWarning, "RIoUring",
++                     "io_uring is unexpectedly not available because:", false);
++   raii.optionalDiag(kWarning, "RRawFileUnix",
++                     "io_uring setup failed, falling back to blocking I/O in ReadV", true);
++
++   raii.optionalDiag(kWarning, "ROOT.NTuple",
++                     "The RNTuple file format will change. Do not store real data with this version of RNTuple!", true);
++   raii.optionalDiag(kWarning, "ROOT.NTuple",
++                     "Pre-release format version: ", false);
++
+    ROOT::EnableImplicitMT();
+    FileRaii fileGuard("test_large_file.root");
+ 
+-- 
+2.35.1
+
diff --git a/root-uring.patch b/root-uring.patch
deleted file mode 100644
index 129c38e..0000000
--- a/root-uring.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/io/io/src/RRawFileUnix.cxx b/io/io/src/RRawFileUnix.cxx
-index 829c5e4cb6..417c3adf30 100644
---- a/io/io/src/RRawFileUnix.cxx
-+++ b/io/io/src/RRawFileUnix.cxx
-@@ -115,26 +115,33 @@ void ROOT::Internal::RRawFileUnix::OpenImpl()
- void ROOT::Internal::RRawFileUnix::ReadVImpl(RIOVec *ioVec, unsigned int nReq)
- {
- #ifdef R__HAS_URING
--   if (RIoUring::IsAvailable()) {
--      RIoUring ring;
--      std::vector<RIoUring::RReadEvent> reads;
--      reads.reserve(nReq);
--      for (std::size_t i = 0; i < nReq; ++i) {
--         RIoUring::RReadEvent ev;
--         ev.fBuffer = ioVec[i].fBuffer;
--         ev.fOffset = ioVec[i].fOffset;
--         ev.fSize = ioVec[i].fSize;
--         ev.fFileDes = fFileDes;
--         reads.push_back(ev);
-+   thread_local bool uring_failed = false;
-+   if (!uring_failed) {
-+      try {
-+         RIoUring ring; // throws std::runtime_error
-+         std::vector<RIoUring::RReadEvent> reads;
-+         reads.reserve(nReq);
-+         for (std::size_t i = 0; i < nReq; ++i) {
-+            RIoUring::RReadEvent ev;
-+            ev.fBuffer = ioVec[i].fBuffer;
-+            ev.fOffset = ioVec[i].fOffset;
-+            ev.fSize = ioVec[i].fSize;
-+            ev.fFileDes = fFileDes;
-+            reads.push_back(ev);
-+         }
-+         ring.SubmitReadsAndWait(reads.data(), nReq);
-+         for (std::size_t i = 0; i < nReq; ++i) {
-+            ioVec[i].fOutBytes = reads.at(i).fOutBytes;
-+         }
-+         return;
-       }
--      ring.SubmitReadsAndWait(reads.data(), nReq);
--      for (std::size_t i = 0; i < nReq; ++i) {
--         ioVec[i].fOutBytes = reads.at(i).fOutBytes;
-+      catch(const std::runtime_error &e) {
-+         Warning("RIoUring", "io_uring is unexpectedly not available because:\n%s", e.what());
-+         Warning("RRawFileUnix",
-+              "io_uring setup failed, falling back to blocking I/O in ReadV");
-+         uring_failed = true;
-       }
--      return;
-    }
--   Warning("RRawFileUnix",
--           "io_uring setup failed, falling back to default ReadV implementation");
- #endif
-    RRawFile::ReadVImpl(ioVec, nReq);
- }
diff --git a/root-use-unique-filenames-in-fillrandom-tutorials.patch b/root-use-unique-filenames-in-fillrandom-tutorials.patch
new file mode 100644
index 0000000..724eb79
--- /dev/null
+++ b/root-use-unique-filenames-in-fillrandom-tutorials.patch
@@ -0,0 +1,25 @@
+From b781f954ac80cc227777992dcb4fbe1837c7e351 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 29 Mar 2022 15:44:17 +0200
+Subject: [PATCH] Use unique filenames in fillrandom.py and fillrandom.C
+
+---
+ tutorials/hist/fillrandom.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tutorials/hist/fillrandom.py b/tutorials/hist/fillrandom.py
+index d5eb3f6f38..4b1a94a37e 100644
+--- a/tutorials/hist/fillrandom.py
++++ b/tutorials/hist/fillrandom.py
+@@ -41,7 +41,7 @@ h1f.FillRandom("sqroot",10000)
+ h1f.Draw()
+ c1.Update()
+ 
+-f = ROOT.TFile("fillrandom.root","RECREATE")
++f = ROOT.TFile("fillrandom-py.root","RECREATE")
+ form1.Write()
+ sqroot.Write()
+ h1f.Write()
+-- 
+2.35.1
+
diff --git a/root.spec b/root.spec
index 3a305ae..4fbd388 100644
--- a/root.spec
+++ b/root.spec
@@ -17,9 +17,9 @@
 %endif
 %global python3_version_uscore %(tr . _ <<< "%{python3_version}")
 
-%if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0} >= 8
-# Building the experimental ROOT 7 classes requires c++-14.
-# This is the default for gcc 6.1 and later.
+%if %{?fedora}%{!?fedora:0} >= 34 || %{?rhel}%{!?rhel:0} >= 9
+# Building the experimental ROOT 7 classes requires c++-17.
+# This is the default for gcc 11 and later.
 %global root7 1
 %else
 %global root7 0
@@ -31,12 +31,27 @@
 %global xrootd5 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 35
-# The required __malloc_hook was removed from glibc 2.33.9000-48
-# The memstat module is deprecated and will be removed in root 6.26
-%global memstat 0
+%global webgui 1
+
+%if %{?rhel}%{!?rhel:0} == 9
+# GFAL2 not available in EPEL 9
+%global gfal2 0
 %else
-%global memstat 1
+%global gfal2 1
+%endif
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+# The SOFIE parser requires protobuf 3.0
+%global tmvasofieparser 1
+%else
+%global tmvasofieparser 0
+%endif
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+# DistRDF requires Python 3.7+
+%global distrdf 1
+%else
+%global distrdf 0
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
@@ -53,18 +68,15 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.24.06
+Version:	6.26.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
 URL:		https://root.cern/
-#		The upstream source is modified to exclude proprietary fonts:
-#		wget -N https://root.cern/download/root_v%%{version}.source.tar.gz
-#		tar -z -x -f root_v%%{version}.source.tar.gz
-#		find root-%%{version}/fonts -type f -a '!' -name 'STIX*' -exec rm {} ';'
-#		tar -J -c --group root --owner root -f root-%%{version}.tar.xz root-%%{version}
+#		The upstream source is modified to exclude proprietary fonts
+#		See Source8 for how to create Source0
 Source0:	%{name}-%{version}.tar.xz
 #		Input data for the tests
 Source1:	%{name}-testfiles.tar.xz
@@ -79,94 +91,107 @@ Source6:	application-x-root.png
 #		Instructions for setting up a python virtual environment
 #		for running the JupyROOT notebook on EPEL
 Source7:	JupyROOT-on-EPEL
+#		Script to generate Source0
+Source8:	%{name}-get-src.sh
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Revert the removal of DataFrame for 32 bit architectures
+#		https://github.com/root-project/root/pull/10300
 Patch1:		%{name}-32bit-dataframe.patch
 #		Unbundle gtest
+#		Add builtin_gtest cmake option
+#		Compatibility with older gtest
+#		https://github.com/root-project/root/pull/10301
 Patch2:		%{name}-unbundle-gtest.patch
+Patch3:		%{name}-old-gtest-compat.patch
 #		Reduce memory usage of build
 #		Do not link rootcling_stage1 and libCling in parallel
-Patch3:		%{name}-memory-usage.patch
+Patch4:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
-#		smaller debuginfo for the llmv libraries.
-#		Fedora builders run out of memory with the default setting.
-Patch4:		%{name}-memory-arm-x86.patch
+#		smaller debuginfo for the llvm libraries
+#		Fedora builders run out of memory with the default setting
+Patch5:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
-Patch5:		%{name}-dont-install-minicern.patch
+Patch6:		%{name}-dont-install-minicern.patch
 #		Do not export Python modules in CMake config
-Patch6:		%{name}-no-export-python-modules.patch
-#		Don't create documentation notebooks
-Patch7:		%{name}-doc-no-notebooks.patch
-#		Don't run tutorials that crash during doc generation
-Patch8:		%{name}-doxygen-crash.patch
-#		Compatibility with older gtest
-Patch9:		%{name}-old-gtest-compat.patch
+Patch7:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch10:	%{name}-32bit-tests.patch
-#		Workaround for initialization problems for PyROOT on
-#		EPEL7 ppc64le
-#		https://sft.its.cern.ch/jira/browse/ROOT-10622
-Patch11:	%{name}-epel7-ppc64le-pyroot.patch
+Patch8:		%{name}-32bit-tests.patch
 #		Use local static script and style files for JsMVA
-Patch12:	%{name}-jsmva-static.patch
+Patch9:		%{name}-jsmva-static.patch
+#		Fix python bytecode compilation on EPEL 7
 #		Compatibility with older python versions (no f-strings)
-Patch13:	%{name}-older-python.patch
-#		Fix multicore tests when running on machines with few cores
-#		https://github.com/root-project/root/pull/8068
-Patch14:	%{name}-fix-multicore-tests-with-few-cores.patch
-#		Reapply altivec fix lost in the LLVM 9 upgrade
-#		https://github.com/root-project/root/pull/8069
-Patch15:	%{name}-fix-ppc64le-compilation-with-gcc-10.patch
-#		Actually request the use of the large code model for ppc64le
-#		https://github.com/root-project/root/pull/8230
-Patch16:	%{name}-ppc-codemodel.patch
-#		Fix segfaults on ppc64le when using the large code model
-#		PR by Vassil Vassilev based on upstream fix
-#		https://reviews.llvm.org/D91983
-#		https://github.com/root-project/root/pull/9380
-Patch17:	%{name}-ppc-segfault-fix.patch
-#		Fall back to blocking I/O if uring fails
-#		Backported
-#		- commit 691403b2cc504fd4e3e7227894023913014a61ff
-#		- commit 956951ee2af83426d73ad72b2d966f9f1acbea83
-#		- commit 16e64da11edf91fcf31c2fc474f573fca2ee863c
-#		- commit 311a6822f9b0fd438c4210ed60617b45f2ddbe74
-Patch18:	%{name}-uring.patch
-#		Add missing classes in LinkDef.h files
-#		Backported
-Patch19:	%{name}-add-TTreeProcessorMP-to-LinkDef-file.patch
-Patch20:	%{name}-add-RDisplay-to-LinkDef-file.patch
-Patch21:	%{name}-add-RCutFlowReport-to-LinkDef-file.patch
-#		Fix "pointer is null" warnings
-#		Backported
-Patch22:	%{name}-ptr-is-null-RooFit-TMVA.patch
-Patch23:	%{name}-ptr-is-null-TStreamerInfo.patch
-#		Fix two failing tests on s390x
-#		https://github.com/root-project/root/pull/8826
-Patch24:	%{name}-stress-s390x.patch
-#		Doxygen warning fixes
-#		Backported from upstream
-Patch25:	root-doxygen-fix1.patch
-#		Doxygen warning fixes
-#		https://github.com/root-project/root/pull/9388
-Patch26:	root-doxygen-fix2.patch
-#		Don't run tutorials that crash during doc generation
-#		EPEL 7 specific
-Patch27:	%{name}-doxygen-crash-el7.patch
+Patch10:	%{name}-older-python.patch
 #		Backported fix from LLVM upstream
-Patch28:	%{name}-symbol-rewrite.patch
+Patch11:	%{name}-symbol-rewrite.patch
 #		Backport gcc 12 fix from LLVM
 #		https://github.com/root-project/root/pull/9586
-Patch29:	%{name}-fix-compilation-with-gcc-12.patch
+Patch12:	%{name}-fix-compilation-with-gcc-12.patch
 #		Fix test failure on ppc64le and aarch64 with gcc 12
 #		https://github.com/root-project/root/pull/9601
-Patch30:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+Patch13:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+#		Add #include <cstring> for std::memcpy
+#		https://github.com/root-project/root/pull/10116
+Patch14:	%{name}-missing-include.patch
+#		Fixes for tmva-sofie test compilation
+#		https://github.com/root-project/root/pull/10117
+Patch15:	%{name}-blas-linking-and-ignore-prefix.patch
+#		Move private declarations away from the public header file
+#		https://github.com/root-project/root/pull/10145
+Patch16:	%{name}-move-private-decl.patch
+#		Fix test when long is 32 bits
+#		https://github.com/root-project/root/pull/10302
+Patch17:	%{name}-longlong.patch
+#		Ignore warnings (uring and RooNaNPacker)
+#		https://github.com/root-project/root/pull/10303
+Patch18:	%{name}-uring-warn.patch
+Patch19:	%{name}-endian-warn.patch
+#		Always call WaitForInFlightClusters before checking cluster IDs
+#		https://github.com/root-project/root/pull/10304
+Patch20:	%{name}-ntuplewait.patch
+#		NENTRIES is not always a multiple of the expected size
+#		https://github.com/root-project/root/pull/10305
+Patch21:	%{name}-dataframe-callback.patch
+#		Add/remove namespaces from Linkdef
+#		https://github.com/root-project/root/pull/10306
+Patch22:	%{name}-namespace-sofie.patch
+Patch23:	%{name}-namespace-roofit.patch
+Patch24:	%{name}-namespace-pymva.patch
+#		Use calls from Python directly in tutorial
+#		https://github.com/root-project/root/pull/10307
+Patch25:	%{name}-roofit-tutorial.patch
+#		Byte swap values read from the protobuf raw data stream on
+#		big endian architectures
+#		https://github.com/root-project/root/pull/10308
+Patch26:	%{name}-big-endian-byte-swap.patch
+#		Avoid crashes due to static initialization order
+#		https://github.com/root-project/root/pull/10309
+Patch27:	%{name}-rcolor-static-init.patch
+#		Avoid deleting TFormulas twice
+#		https://github.com/root-project/root/pull/10310
+Patch28:	%{name}-avoid-deleting-TFormulas-twice.patch
+#		Use unique filenames in fillrandom.py and fillrandom.C
+#		https://github.com/root-project/root/pull/10311
+Patch29:	%{name}-use-unique-filenames-in-fillrandom-tutorials.patch
+#		Limit the number of threads in TMVA CNN/DNN test to save memory
+#		https://github.com/root-project/root/pull/10312
+Patch30:	%{name}-tmva-threads.patch
+#		Fix library link order
+#		https://github.com/root-project/root/pull/10313
+Patch31:	%{name}-core-base-test.patch
+#		Backports
+Patch32:	%{name}-roofit-overflow.patch
+Patch33:	%{name}-make-dyld-based-library-search-behavior-default.patch
+Patch34:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
+Patch35:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 
-BuildRequires:	make
 %if %{?rhel}%{!?rhel:0} == 7
+BuildRequires:	devtoolset-8-toolchain
 BuildRequires:	cmake3 >= 3.9
 %else
+BuildRequires:	gcc-c++
+BuildRequires:	gcc-gfortran
+BuildRequires:	make
 BuildRequires:	cmake >= 3.9
 %endif
 BuildRequires:	libX11-devel
@@ -177,8 +202,8 @@ BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel
 BuildRequires:	fcgi-devel
 BuildRequires:	ftgl-devel
-BuildRequires:	glew-devel
 BuildRequires:	gl2ps-devel
+BuildRequires:	glew-devel
 BuildRequires:	pcre-devel
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
@@ -200,8 +225,8 @@ BuildRequires:	mysql-devel
 %endif
 BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libGLU-devel
+BuildRequires:	libGL-devel
+BuildRequires:	libGLU-devel
 %if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	libpq-devel
 %else
@@ -215,7 +240,7 @@ BuildRequires:	python2-numpy
 BuildRequires:	python%{python3_pkgversion}-devel
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
-%if %{root7}
+%if %{webgui}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtwebengine-devel
@@ -232,22 +257,23 @@ BuildRequires:	xrootd-client-devel >= 1:3.3.5
 BuildRequires:	xrootd-private-devel >= 1:3.3.5
 %endif
 BuildRequires:	cfitsio-devel
-BuildRequires:	davix-devel >= 0.2.8
+BuildRequires:	davix-devel >= 0.6.4
+%if %{gfal2}
 BuildRequires:	gfal2-devel
+%endif
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
 %if %{tbb}
 BuildRequires:	tbb-devel >= 2018
 %endif
+BuildRequires:	libuuid-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
-BuildRequires:	gcc-c++
-BuildRequires:	gcc-gfortran
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
-%if %{?fedora}%{!?fedora:0} >= 33
+%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 9
 BuildRequires:	flexiblas-devel
 #		Required for FlexiBLAS support in FindBLAS.cmake
 #		(in cmake 3.19.0, backported to cmake 3.18.3-1 in Fedora)
@@ -259,17 +285,16 @@ BuildRequires:	json-devel
 %if %{?fedora}%{!?fedora:0}
 BuildRequires:	liburing-devel
 %endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
+%if %{tmvasofieparser}
+BuildRequires:	protobuf-devel >= 3.0
+%endif
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
-BuildRequires:	doxygen
-BuildRequires:	graphviz
 BuildRequires:	yuicompressor
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
 BuildRequires:	gmock-devel
-#		Some of the tests call lsb_release
-BuildRequires:	redhat-lsb-core
 #		Fonts
 BuildRequires:	font(freesans)
 BuildRequires:	font(freeserif)
@@ -340,16 +365,6 @@ Requires:	%{name}-core = %{version}-%{release}
 This package contains fonts used by ROOT that are not available in Fedora.
 In particular it contains STIX version 0.9 that is used by TMathText.
 
-%package doc
-Summary:	Documentation for the ROOT system
-BuildArch:	noarch
-License:	LGPLv2+ and GPLv2+ and BSD
-Requires:	mathjax
-
-%description doc
-This package contains the automatically generated ROOT class
-documentation.
-
 %package tutorial
 Summary:	ROOT tutorial scripts and test suite
 BuildArch:	noarch
@@ -422,8 +437,28 @@ Obsoletes:	python%{?python3_other_pkgversion}-%{name} < 6.22.00
 Obsoletes:	python%{?python3_other_pkgversion}-jupyroot < 6.22.00
 Obsoletes:	python%{?python3_other_pkgversion}-jsmva < 6.22.00
 %endif
-%if ! %{memstat}
-Obsoletes:	%{name}-memstat < %{version}-%{release}
+Obsoletes:	%{name}-memstat < 6.26.00
+Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
+Obsoletes:	%{name}-doc < 6.26.00
+%if %{?rhel}%{!?rhel:0} == 8
+#		Obsolete the ROOT 7 packages in EPEL 8
+#		Minimum C++ version changed from 14 to 17
+Obsoletes:	%{name}-graf-gpadv7 < 6.26.00
+Obsoletes:	%{name}-graf-primitives < 6.26.00
+Obsoletes:	%{name}-graf3d-eve7 < 6.26.00
+Obsoletes:	%{name}-gui-browsable < 6.26.00
+Obsoletes:	%{name}-gui-browserv7 < 6.26.00
+Obsoletes:	%{name}-gui-canvaspainter < 6.26.00
+Obsoletes:	%{name}-gui-fitpanelv7 < 6.26.00
+Obsoletes:	%{name}-histv7 < 6.26.00
+Obsoletes:	%{name}-hist-draw < 6.26.00
+Obsoletes:	%{name}-tree-ntuple < 6.26.00
+%endif
+%if %{buildpy2}
+Obsoletes:	python2-distrdf < 6.26.00
+%endif
+%if ! %{distrdf}
+Obsoletes:	python%{python3_pkgversion}-distrdf < 6.26.00
 %endif
 
 %description core
@@ -449,10 +484,14 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 #		not work with the system libraries. The bundled llvm and
 #		clang are compiled using -fvisibility=hidden, and are not
 #		visible outside of the libCling module.
-Requires:	gcc-c++
-Requires:	redhat-rpm-config
 Provides:	bundled(clang-libs)
 Provides:	bundled(llvm-libs)
+%if %{?rhel}%{!?rhel:0} == 7
+Requires:	devtoolset-8-toolchain
+%else
+Requires:	gcc-c++
+%endif
+Requires:	redhat-rpm-config
 Obsoletes:	%{name}-cint7 < 5.26.00c
 Obsoletes:	%{name}-cint < 6.00.00
 Obsoletes:	%{name}-cintex < 6.00.00
@@ -516,17 +555,6 @@ Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
 TMVA interface used by JupyROOT.
-
-%package -n python2-distrdf
-Summary:	Distributed RDataFrame
-BuildArch:	noarch
-%{?python_provide:%python_provide python2-distrdf}
-Requires:	python2-%{name} = %{version}-%{release}
-Requires:	%{name}-tree-dataframe = %{version}-%{release}
-
-%description -n python2-distrdf
-A layer on top of RDataFrame to enable distributed computations. It is
-a port of the previously known PyRDF python package.
 %endif
 
 %package -n python%{python3_pkgversion}-%{name}
@@ -573,6 +601,7 @@ Requires:	%{name}-tmva = %{version}-%{release}
 %description -n python%{python3_pkgversion}-jsmva
 TMVA interface used by JupyROOT.
 
+%if %{distrdf}
 %package -n python%{python3_pkgversion}-distrdf
 Summary:	Distributed RDataFrame
 BuildArch:	noarch
@@ -583,6 +612,7 @@ Requires:	%{name}-tree-dataframe = %{version}-%{release}
 %description -n python%{python3_pkgversion}-distrdf
 A layer on top of RDataFrame to enable distributed computations. It is
 a port of the previously known PyRDF python package.
+%endif
 
 %package r
 Summary:	R interface for ROOT
@@ -956,6 +986,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -988,6 +1019,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
+%if %{gfal2}
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -995,6 +1027,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
+%endif
 
 %package io-sql
 Summary:	SQL input/output library for ROOT
@@ -1226,19 +1259,6 @@ Obsoletes:	%{name}-tree-player < 6.14.00
 %description vecops
 This package contains a vector operation extension for ROOT.
 
-%if %{memstat}
-%package memstat
-Summary:	Memory statistics tool for use with ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description memstat
-This package contains the memory statistics tool for debugging memory
-leaks and such.
-%endif
-
 %package montecarlo-eg
 Summary:	Event generator library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1261,17 +1281,6 @@ package provide the ROOT user with transparent interface to the Pythia
 (version 8) event generators for hadronic interactions. If the term
 "hadronic" does not ring any bells, this package is not for you.
 
-%package montecarlo-vmc
-Summary:	Virtual Monte-Carlo (simulation) library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
-Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
-
-%description montecarlo-vmc
-This package contains the VMC library for ROOT.
-
 %package net
 Summary:	Net library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1298,7 +1307,7 @@ This package contains the basic authentication algorithms used by ROOT.
 
 %package net-davix
 Summary:	Davix extension for ROOT
-Requires:	davix-libs%{?_isa} >= 0.2.8
+Requires:	davix-libs%{?_isa} >= 0.6.4
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -1456,6 +1465,26 @@ suitable for adoption in different disciplines as well.
 
 This package contains the RooFit toolkit classes.
 
+%package roofit-common
+Summary:	ROOT extension for modeling expected distributions - common
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description roofit-common
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains the RooFit common classes.
+
 %package roofit-core
 Summary:	ROOT extension for modeling expected distributions - core
 License:	BSD
@@ -1467,7 +1496,9 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-common%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1516,8 +1547,9 @@ This package contains RooFit classes that use the mathmore library.
 %package roofit-batchcompute
 Summary:	Optimized computation functions for PDFs
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description roofit-batchcompute
 While fitting, a significant amount of time and processing power is
@@ -1532,6 +1564,43 @@ multiple times for different vector instuction set architectures and
 the optimal code is executed during runtime, as a result of an
 automatic hardware detection mechanism that this library contains.
 
+%package roofit-dataframe-helpers
+Summary:	RooFit DaraFrame helpers
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description roofit-dataframe-helpers
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains DaraFrame helper classes for RooFit
+
+%package roofit-hs3
+Summary:	RooFit HS3
+License:	BSD
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description roofit-hs3
+When using RooFit, statistical models can be conveniently handled and
+stored as a RooWorkspace. However, for the sake of interoperability
+with other statistical frameworks, and also ease of manipulation, it
+may be useful to store statistical models in text form. This library
+sets out to achieve exactly that, exporting to and importing from JSON
+and YML.
+
 %package roostats
 Summary:	Statistical tools built on top of RooFit
 License:	BSD
@@ -1639,6 +1708,7 @@ Summary:	Toolkit for multivariate data analysis (Python)
 License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-numpy
 
 %description tmva-python
@@ -1655,6 +1725,27 @@ Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 %description tmva-r
 R integration with TMVA.
 
+%package tmva-sofie
+Summary:	ROOT/TMVA SOFIE (System for Optimized Fast Inference code Emit)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description tmva-sofie
+ROOT/TMVA SOFIE (System for Optimized Fast Inference code Emit)
+generates C++ functions easily invokable for the fast inference of
+trained neural network models. It takes ONNX model files as inputs and
+produces C++ header files that can be included and utilized in a
+"plug-and-go" style.
+
+%if %{tmvasofieparser}
+%package tmva-sofie-parser
+Summary:	ROOT/TMVA SOFIE Parsers
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
+
+%description tmva-sofie-parser
+Parsers for ROOT/TMVA SOFIE
+%endif
+
 %package tmva-gui
 Summary:	Toolkit for multivariate data analysis GUI
 License:	BSD
@@ -1692,6 +1783,7 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 %endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		Library split (tree-dataframe and vecops from tree-player)
 Obsoletes:	%{name}-tree-player < 6.14.00
 
@@ -1765,6 +1857,41 @@ Requires:	jupyter-notebook
 %description notebook
 Javascript and style files for the Jupyter ROOT Notebook.
 
+%if %{webgui}
+%package gui-webdisplay
+Summary:	Web display (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-webdisplay
+This package contains a web display extension for ROOT 7.
+
+%ifarch %{qt5_qtwebengine_arches}
+%package gui-qt5webdisplay
+Summary:	Qt5 Web display (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-qt5webdisplay
+This package contains a Qt5 web display extension for ROOT 7.
+%endif
+
+%package gui-webgui6
+Summary:	Web based GUI for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-webgui6
+This package provides a Web based GUI for ROOT.
+%endif
+
 %if %{root7}
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
@@ -1787,6 +1914,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-browserv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1808,6 +1936,7 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 
 %description gui-browsable
 This package contains GUI browsable components for ROOT 7.
@@ -1815,9 +1944,9 @@ This package contains GUI browsable components for ROOT 7.
 %package gui-browserv7
 Summary:	Browser (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-eve7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
@@ -1850,39 +1979,6 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This package contains a library to show a pop-up dialog when fitting
 various kinds of data.
 
-%ifarch %{qt5_qtwebengine_arches}
-%package gui-qt5webdisplay
-Summary:	Qt5 Web display (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
-
-%description gui-qt5webdisplay
-This package contains a Qt5 web display extension for ROOT 7.
-%endif
-
-%package gui-webdisplay
-Summary:	Web display (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
-
-%description gui-webdisplay
-This package contains a web display extension for ROOT 7.
-
-%package gui-webgui6
-Summary:	Web based GUI for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description gui-webgui6
-This package provides a Web based GUI for ROOT.
-
 %package histv7
 Summary:	Histogram library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1902,6 +1998,7 @@ This package contains an histogram drawing extension for ROOT 7.
 Summary:	Ntuple (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 
 %description tree-ntuple
 This package contains an ntuple extension for ROOT 7.
@@ -1937,12 +2034,15 @@ This package contains an ntuple extension for ROOT 7.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%if %{?rhel}%{!?rhel:0} == 7
 %patch27 -p1
-%endif
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1959,7 +2059,9 @@ rm -rf builtins/nlohmann
 rm -rf builtins/openssl
 rm -rf builtins/pcre
 rm -rf builtins/tbb
+rm -rf builtins/xrootd
 rm -rf builtins/xxhash
+rm -rf builtins/zeromq
 rm -rf builtins/zlib
 rm -rf builtins/zstd
 #  * lzma
@@ -1969,40 +2071,26 @@ rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
 #  * unuran
 rm -rf math/unuran/src/*.tar.gz
 #  * xrootd-private-devel headers
-rm -rf proof/xrdinc
+rm -rf proof/xrdinc/*
 #  * x11 extension headers
 rm -rf graf2d/x11/inc/X11
 #  * mathjax
 rm -rf documentation/doxygen/mathjax.tar.gz
-sed /mathjax.tar.gz/d -i documentation/doxygen/Makefile
-%if %{root7}
-#  * string_view (<experimental/string_view> requires c++-14)
-rm core/foundation/inc/ROOT/libcpp_string_view.h \
-   core/foundation/inc/ROOT/RWrap_libcpp_string_view.h
-sed /RWrap_libcpp_string_view.h/d -i build/unix/module.modulemap
-%endif
 #  * jsroot
-rm -rf js/*
+rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 
-# Work around missing libraries in Fedora's gmock packaging < 1.8.0
-if [ ! -r %{_libdir}/libgmock.so ] ; then
-mkdir googlemock
-pushd googlemock
-g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock-all.o /usr/src/gmock/gmock-all.cc
-ar rv libgmock.a gmock-all.o
-g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock_main.o /usr/src/gmock/gmock_main.cc
-ar rv libgmock_main.a gmock_main.o
-popd
-fi
-
 # Remove pre-minified script and style files
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
 %build
+%if %{?rhel}%{!?rhel:0} == 7
+. /opt/rh/devtoolset-8/enable
+%endif
+
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
 %define _lto_cflags %{nil}
@@ -2033,6 +2121,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_cfitsio:BOOL=OFF \
        -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_cling:BOOL=ON \
+       -Dbuiltin_cppzmq:BOOL=OFF \
        -Dbuiltin_davix:BOOL=OFF \
        -Dbuiltin_fftw3:BOOL=OFF \
        -Dbuiltin_freetype:BOOL=OFF \
@@ -2040,6 +2129,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_gl2ps:BOOL=OFF \
        -Dbuiltin_glew:BOOL=OFF \
        -Dbuiltin_gsl:BOOL=OFF \
+       -Dbuiltin_gtest:BOOL=OFF \
        -Dbuiltin_llvm:BOOL=ON \
        -Dbuiltin_lz4:BOOL=OFF \
        -Dbuiltin_lzma:BOOL=OFF \
@@ -2054,6 +2144,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_veccore:BOOL=OFF \
        -Dbuiltin_xrootd:BOOL=OFF \
        -Dbuiltin_xxhash:BOOL=OFF \
+       -Dbuiltin_zeromq:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dbuiltin_zstd:BOOL=OFF \
        -Dalien:BOOL=OFF \
@@ -2065,14 +2156,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dclad:BOOL=OFF \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
-%if %{root7}
-       -Droot7:BOOL=ON \
-       -Dwebgui:BOOL=ON \
-%else
-       -Droot7:BOOL=OFF \
-       -Dwebgui:BOOL=OFF \
-%endif
        -Dcxxmodules:BOOL=OFF \
+       -Ddaos:BOOL=OFF \
        -Ddataframe:BOOL=ON \
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
@@ -2084,7 +2169,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
+%if %{gfal2}
        -Dgfal:BOOL=ON \
+%else
+       -Dgfal:BOOL=OFF \
+%endif
        -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
        -Dhttp:BOOL=ON \
@@ -2097,11 +2186,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
-%if %{memstat}
-       -Dmemstat:BOOL=ON \
-%else
-       -Dmemstat:BOOL=OFF \
-%endif
        -Dminuit2:BOOL=ON \
        -Dmlp:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
@@ -2120,8 +2204,16 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %else
        -Dqt5web:BOOL=OFF \
 %endif
+       -Dqt6web:BOOL=OFF \
        -Dr:BOOL=ON \
        -Droofit:BOOL=ON \
+       -Droofit_multiprocess:BOOL=OFF \
+       -Droofit_hs3_ryml:BOOL=OFF \
+%if %{root7}
+       -Droot7:BOOL=ON \
+%else
+       -Droot7:BOOL=OFF \
+%endif
        -Drpath:BOOL=OFF \
        -Druby:BOOL=OFF \
        -Druntime_cxxmodules:BOOL=OFF \
@@ -2141,6 +2233,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-gpu:BOOL=OFF \
        -Dtmva-pymva:BOOL=ON \
        -Dtmva-rmva:BOOL=ON \
+%if %{tmvasofieparser}
+       -Dtmva-sofie:BOOL=ON \
+%else
+       -Dtmva-sofie:BOOL=OFF \
+%endif
        -Dunuran:BOOL=ON \
 %if %{?fedora}%{!?fedora:0}
        -During:BOOL=ON \
@@ -2151,7 +2248,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dvdt:BOOL=OFF \
        -Dveccore:BOOL=OFF \
        -Dvecgeom:BOOL=OFF \
-       -Dvmc:BOOL=ON \
+%if %{webgui}
+       -Dwebgui:BOOL=ON \
+%else
+       -Dwebgui:BOOL=OFF \
+%endif
        -Dx11:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
@@ -2162,6 +2263,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %endif
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
+       -Dtest_distrdf_pyspark:BOOL=OFF \
+       -Dtest_distrdf_dask:BOOL=OFF \
        -Dclingtest:BOOL=OFF \
        -Dcoverage:BOOL=OFF \
        -Droottest:BOOL=OFF \
@@ -2243,7 +2346,6 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so
 
 mkdir -p %{buildroot}%{python2_sitelib}
 cp -pr %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
-cp -pr %{buildroot}%{_libdir}/%{name}/DistRDF %{buildroot}%{python2_sitelib}
 
 # Create .egg-info files so that rpm auto-generates provides
 echo 'Name: ROOT' > \
@@ -2258,10 +2360,6 @@ echo 'Name: JsMVA' > \
     %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
 echo 'Version: %{version}' >> \
     %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
-echo 'Name: DistRDF' > \
-    %{buildroot}%{python2_sitelib}/DistRDF-%{version}.egg-info
-echo 'Version: %{version}' >> \
-    %{buildroot}%{python2_sitelib}/DistRDF-%{version}.egg-info
 
 %endif
 
@@ -2290,7 +2388,9 @@ rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so
 
 mkdir -p %{buildroot}%{python3_sitelib}
 mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
+%if %{distrdf}
 mv %{buildroot}%{_libdir}/%{name}/DistRDF %{buildroot}%{python3_sitelib}
+%endif
 
 # Create .egg-info files so that rpm auto-generates provides
 echo 'Name: ROOT' > \
@@ -2305,10 +2405,12 @@ echo 'Name: JsMVA' > \
     %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
 echo 'Version: %{version}' >> \
     %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
+%if %{distrdf}
 echo 'Name: DistRDF' > \
     %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
 echo 'Version: %{version}' >> \
     %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
+%endif
 
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
@@ -2398,11 +2500,14 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 rm TBrowserImp/P030_RWebBrowserImp.C
 %endif
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
+%if ! %{gfal2}
+rm TFile/P050_TGFALFile.C
+%endif
 rm TFile/P070_TAlienFile.C
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
-%if ! %{root7}
+%if ! %{webgui}
 rm TGuiFactory/P030_TWebGuiFactory.C
 %endif
 %if %{xrootd5}
@@ -2429,9 +2534,10 @@ rmdir TSlave
 rmdir TVirtualGeoConverter
 popd
 
-# Replace bundled jsroot with symlink to system version
-rmdir %{buildroot}%{_datadir}/%{name}/js
-ln -s /usr/share/javascript/jsroot %{buildroot}%{_datadir}/%{name}/js
+# Replace bundled jsroot with symlinks to system version
+for x in img libs scripts style files/draw.htm files/online.htm ; do
+    ln -s /usr/share/javascript/jsroot/$x %{buildroot}%{_datadir}/%{name}/js/$x
+done
 
 # Create ldconfig configuration
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -2458,30 +2564,6 @@ cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
 cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
 cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
 
-# Generate documentation
-pushd documentation/doxygen
-mkdir -p doc/html
-ln -s /usr/share/javascript/mathjax doc/html/mathjax
-ln -s ../../files files
-for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
-	 df014_CsvDataSource_MuRun2010B_py.csv \
-	 df015_CsvDataSource_MuRun2010B.csv ; do
-    ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
-done
-# Create the py-hsimple.root file in advance (needed as input)
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
-    ROOTSYS=${PWD}/../../%{_vpath_builddir} \
-    LD_LIBRARY_PATH=${PWD}/../../%{_vpath_builddir}/lib \
-    PYTHONPATH=${PWD}/../../%{_vpath_builddir}/lib \
-    %{__python3} ../../tutorials/pyroot/hsimple.py
-ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \
-    ROOTSYS=${PWD}/../../%{_vpath_builddir} \
-    LD_LIBRARY_PATH=${PWD}/../../%{_vpath_builddir}/lib \
-    PYTHONPATH=${PWD}/../../%{_vpath_builddir}/lib \
-    make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc PYTHON_EXECUTABLE=%{__python3}
-mv doc/html %{buildroot}%{_pkgdocdir}/html
-popd
-
 # Create includelist files ...
 for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
@@ -2507,6 +2589,10 @@ cat includelist-net-netx >> includelist-netx
 %endif
 
 %check
+%if %{?rhel}%{!?rhel:0} == 7
+. /opt/rh/devtoolset-8/enable
+%endif
+
 pushd %{_vpath_builddir}
 pushd test
 ln -s ../../files files
@@ -2525,6 +2611,15 @@ popd
 pushd tmva/tmva/test/envelope
 ln -s ../../../../../files files
 popd
+
+# Some of the tests call lsb_release -d -s
+# Provide a replacement script instead of build requiring redhat-lsb-core
+cat > bin/lsb_release << EOF
+#! /bin/sh
+cat /etc/redhat-release
+EOF
+chmod +x bin/lsb_release
+
 # Exclude some tests that can not be run
 #
 # - test-stressIOPlugins-*
@@ -2545,8 +2640,13 @@ popd
 #   reads sqlite data over network:
 #   http://root.cern.ch/files/root_download_stats.sqlite
 #
-# - gtest-tree-treeplayer-test-treeprocessormt-remotefiles
+# - tutorial-dataframe-df033_Describe-py
 # - tutorial-dataframe-df102_NanoAODDimuonAnalysis(-py)?
+#   reads input data over network:
+#   root://eospublic.cern.ch//eos/opendata/cms/derived-data/
+#   AOD2NanoAODOutreachTool/Run2012BC_DoubleMuParked_Muons.root
+#
+# - gtest-tree-treeplayer-test-treeprocessormt-remotefiles
 # - tutorial-dataframe-df103_NanoAODHiggsAnalysis(-py)?
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
@@ -2555,12 +2655,14 @@ popd
 # - tutorial-dataframe-df105_WBosonAnalysis-py
 # - tutorial-dataframe-df106_HiggsToFourLeptons-py
 # - tutorial-dataframe-df107_SingleTopAnalysis-py
+# - tutorial-rcanvas-df104-py
+# - tutorial-rcanvas-df105-py
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/opendata/atlas/OutreachDatasets/2020-01-22/
 #
-# - tutorial-v7-climate-global_temperatures
+# - tutorial-v7-global_temperatures.cxx
 #   reads input data over network
-#   http://root.cern./files/tutorials/GlobalLandTemperaturesByCity.csv
+#   http://root.cern.ch/files/tutorials/GlobalLandTemperaturesByCity.csv
 #
 # - tutorial-v7-ntuple-ntpl003_lhcbOpenData
 #   reads input data over network
@@ -2570,13 +2672,13 @@ popd
 #   reads input data over network
 #   http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
 #
-# - tutorial-v7-line.cxx
-#   requires a web browser (and js-jsroot) to render javascript graphics
-#
 # - gtest-net-davix-test-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
 #
+# - gtest-net-netxng-test-RRawFileNetXNG
+#   root://eospublic.cern.ch/eos/root-eos/xrootd.test
+#
 # - gtest-tmva-tmva-test-rreader
 # - gtest-tmva-tmva-test-rstandardscaler
 # - tutorial-tmva-tmva003_RReader
@@ -2593,6 +2695,9 @@ popd
 # - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
 #   these tests require the numba python module which is not available
+#
+# - test-webgui-ping
+#   error: Cannot display window in native
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2603,18 +2708,21 @@ tutorial-multicore-mp104_processH1|\
 tutorial-multicore-mp105_processEntryList|\
 tutorial-multicore-imt101_parTreeProcessing|\
 tutorial-dataframe-df..._SQlite|\
-gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
+tutorial-dataframe-df033_Describe-py|\
 tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
+gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
 tutorial-dataframe-df105_WBosonAnalysis-py|\
 tutorial-dataframe-df106_HiggsToFourLeptons-py|\
 tutorial-dataframe-df107_SingleTopAnalysis-py|\
-tutorial-v7-climate-global_temperatures|\
+tutorial-rcanvas-df104-py|\
+tutorial-rcanvas-df105-py|\
+tutorial-v7-global_temperatures.cxx|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
-tutorial-v7-line.cxx|\
 gtest-net-davix-test-RRawFileDavix|\
+gtest-net-netxng-test-RRawFileNetXNG|\
 gtest-tmva-tmva-test-rreader|\
 gtest-tmva-tmva-test-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
@@ -2623,107 +2731,31 @@ tutorial-tmva-tmva103_Application|\
 pyunittests-pyroot-dependency-versions|\
 pyunittests-pyroot-numbadeclare|\
 test-import-numba|\
-tutorial-pyroot-pyroot004_NumbaDeclare-py"
+tutorial-pyroot-pyroot004_NumbaDeclare-py|\
+test-webgui-ping"
 
-# - tutorial-v7-concurrentfill.cxx
-# - tutorial-v7-draw.cxx
-# - tutorial-v7-draw_frame.cxx
-# - tutorial-v7-draw_legend.cxx
-# - tutorial-v7-draw_mt.cxx
-# - tutorial-v7-draw_rh1.cxx
-# - tutorial-v7-draw_rh1_large.cxx
-# - tutorial-v7-draw_rh2.cxx
-# - tutorial-v7-draw_rh2_colz.cxx
-# - tutorial-v7-draw_rh2_large.cxx
-# - tutorial-v7-draw_rh3.cxx
-# - tutorial-v7-draw_rh3_large.cxx
-# - tutorial-v7-draw_subpads.cxx
-# - tutorial-v7-histops.cxx
-# - tutorial-v7-perf.cxx
-# - tutorial-v7-perfcomp.cxx
-# - tutorial-v7-simple.cxx
-#   Fails with "already deserialized this template specialization"
-#   https://github.com/root-project/root/issues/8073
-excluded="${excluded}|\
-tutorial-v7-concurrentfill.cxx|\
-tutorial-v7-draw.cxx|\
-tutorial-v7-draw_frame.cxx|\
-tutorial-v7-draw_legend.cxx|\
-tutorial-v7-draw_mt.cxx|\
-tutorial-v7-draw_rh1.cxx|\
-tutorial-v7-draw_rh1_large.cxx|\
-tutorial-v7-draw_rh2.cxx|\
-tutorial-v7-draw_rh2_colz.cxx|\
-tutorial-v7-draw_rh2_large.cxx|\
-tutorial-v7-draw_rh3.cxx|\
-tutorial-v7-draw_rh3_large.cxx|\
-tutorial-v7-draw_subpads.cxx|\
-tutorial-v7-histops.cxx|\
-tutorial-v7-perf.cxx|\
-tutorial-v7-perfcomp.cxx|\
-tutorial-v7-simple.cxx"
-
-%if %{?rhel}%{!?rhel:0} == 7
+%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
+# - tutorial-roofit-rf409_NumPyPandasToRooFit-py
 #   requires the pandas python module which is not available in EPEL 7
-#
-# - tutorial-multicore-mp001_fillHistos
-# - tutorial-multicore-mp101_fillNtuples
-# - tutorial-multicore-mp102_readNtuplesFillHistosAndFit
-# - tutorial-multicore-mp201_parallelHistoFill
-#   fails intermittently on EPEL 7 with the error
-#   symbol '_Z6MPRecvP7TSocket' unresolved while linking
-#   symbol '_Z6MPSendP7TSocketj' unresolved while linking
+#   or EPEL 9
 excluded="${excluded}|\
 test-import-pandas|\
 tutorial-dataframe-df026_AsNumpyArrays-py|\
-tutorial-multicore-mp001_fillHistos|\
-tutorial-multicore-mp101_fillNtuples|\
-tutorial-multicore-mp102_readNtuplesFillHistosAndFit|\
-tutorial-multicore-mp201_parallelHistoFill"
+tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
 %ifarch %{ix86} %{arm}
+%if %{?fedora}%{!?fedora:0} <= 35
 # Tests failing on 32 bit architectures (dataframe)
-# A bit random - not all the tests fail every time...
-# - gtest-tree-dataframe-test-dataframe-cache
-# - gtest-tree-dataframe-test-dataframe-callbacks
-# - gtest-tree-dataframe-test-dataframe-colnames
-# - gtest-tree-dataframe-test-dataframe-concurrency
-# - gtest-tree-dataframe-test-dataframe-display
-# - gtest-tree-dataframe-test-dataframe-friends
-# - gtest-tree-dataframe-test-dataframe-helpers
-# - gtest-tree-dataframe-test-dataframe-interface
-# - gtest-tree-dataframe-test-dataframe-leaves
-# - gtest-tree-dataframe-test-dataframe-ranges
-# - gtest-tree-dataframe-test-dataframe-regression
-# - gtest-tree-dataframe-test-dataframe-simple
-# - gtest-tree-dataframe-test-dataframe-snapshot
-# - gtest-tree-dataframe-test-dataframe-vecops
-# - gtest-tree-dataframe-test-datasource-csv
-# - gtest-tree-dataframe-test-datasource-more
-# - gtest-tree-dataframe-test-datasource-sqlite
-# - gtest-tree-dataframe-test-datasource-trivial
+#
+# - gtest-tree-dataframe-test-dataframe-*
+# - gtest-tree-dataframe-test-datasource-*
 excluded="${excluded}|\
-gtest-tree-dataframe-test-dataframe-cache|\
-gtest-tree-dataframe-test-dataframe-callbacks|\
-gtest-tree-dataframe-test-dataframe-colnames|\
-gtest-tree-dataframe-test-dataframe-concurrency|\
-gtest-tree-dataframe-test-dataframe-display|\
-gtest-tree-dataframe-test-dataframe-friends|\
-gtest-tree-dataframe-test-dataframe-helpers|\
-gtest-tree-dataframe-test-dataframe-interface|\
-gtest-tree-dataframe-test-dataframe-leaves|\
-gtest-tree-dataframe-test-dataframe-ranges|\
-gtest-tree-dataframe-test-dataframe-regression|\
-gtest-tree-dataframe-test-dataframe-simple|\
-gtest-tree-dataframe-test-dataframe-snapshot|\
-gtest-tree-dataframe-test-dataframe-vecops|\
-gtest-tree-dataframe-test-datasource-csv|\
-gtest-tree-dataframe-test-datasource-more|\
-gtest-tree-dataframe-test-datasource-sqlite|\
-gtest-tree-dataframe-test-datasource-trivial"
+gtest-tree-dataframe-test-dataframe|\
+gtest-tree-dataframe-test-datasource"
+%endif
 %endif
 
 %ifarch %{arm}
@@ -2731,82 +2763,17 @@ gtest-tree-dataframe-test-datasource-trivial"
 #
 # - gtest-tree-tree-test-testBulkApi
 # - gtest-tree-tree-test-testBulkApiSillyStruct
-#   segmentation fault - bus error
-#
-# - gtest-tree-dataframe-test-dataframe-histomodels
-# - gtest-tree-ntuple-v7-test-ntuple-rdf
-# - pyunittests-dataframe-cache
-# - pyunittests-dataframe-histograms
+# - gtest-tree-dataframe-test-dataframe-snapshot
+# - gtest-tree-dataframe-test-dataframe-vary
 # - pyunittests-dataframe-merge-results
-# - pyunittests-dataframe-misc
-# - pyunittests-pyroot-pyz-rdataframe-makenumpy
-# - pyunittests-pyroot-pyz-tf-pycallables
-# - test-stressiterators-interpreted
-# - tutorial-dataframe-df001_introduction(-py)
-# - tutorial-dataframe-df002_dataModel(-py)
-# - tutorial-dataframe-df003_profiles(-py)
-# - tutorial-dataframe-df005_fillAnyObject
-# - tutorial-dataframe-df006_ranges(-py)
-# - tutorial-dataframe-df007_snapshot(-py)
-# - tutorial-dataframe-df010_trivialDataSource(-py)
-# - tutorial-dataframe-df012_DefinesAndFiltersAsStrings(-py)
-# - tutorial-dataframe-df014_CSVDataSource(-py)
-# - tutorial-dataframe-df015_LazyDataSource
-# - tutorial-dataframe-df016_vecOps(-py)
-# - tutorial-dataframe-df017_vecOpsHEP(-py)
-# - tutorial-dataframe-df019_Cache(-py)
-# - tutorial-dataframe-df020_helpers
-# - tutorial-dataframe-df021_createTGraph(-py)
-# - tutorial-dataframe-df022_useKahan
-# - tutorial-dataframe-df025_RNode
-# - tutorial-dataframe-df031_Stats(-py)
-# - tutorial-hist-sparsehist
-# - tutorial-r-example
-# - tutorial-r-DataFrame
-# - tutorial-r-Function
-# - tutorial-r-Functor
-# - tutorial-r-GlobalMinimization
-# - tutorial-r-Integration
-# - tutorial-r-Minimization
-#   Not implemented relocation type!
+# - pyunittests-distrdf-unit-test-headnode
 excluded="${excluded}|\
 gtest-tree-tree-test-testBulkApi\$\$|\
 gtest-tree-tree-test-testBulkApiSillyStruct|\
-gtest-tree-dataframe-test-dataframe-histomodels|\
-gtest-tree-ntuple-v7-test-ntuple-rdf|\
-pyunittests-dataframe-cache|\
-pyunittests-dataframe-histograms|\
+gtest-tree-dataframe-test-dataframe-snapshot|\
+gtest-tree-dataframe-test-dataframe-vary|\
 pyunittests-dataframe-merge-results|\
-pyunittests-dataframe-misc|\
-pyunittests-pyroot-pyz-rdataframe-makenumpy|\
-pyunittests-pyroot-pyz-tf-pycallables|\
-test-stressiterators-interpreted|\
-tutorial-dataframe-df001_introduction|\
-tutorial-dataframe-df002_dataModel|\
-tutorial-dataframe-df003_profiles|\
-tutorial-dataframe-df005_fillAnyObject|\
-tutorial-dataframe-df006_ranges|\
-tutorial-dataframe-df007_snapshot|\
-tutorial-dataframe-df010_trivialDataSource|\
-tutorial-dataframe-df012_DefinesAndFiltersAsStrings|\
-tutorial-dataframe-df014_CSVDataSource|\
-tutorial-dataframe-df015_LazyDataSource|\
-tutorial-dataframe-df016_vecOps|\
-tutorial-dataframe-df017_vecOpsHEP|\
-tutorial-dataframe-df019_Cache|\
-tutorial-dataframe-df020_helpers|\
-tutorial-dataframe-df021_createTGraph|\
-tutorial-dataframe-df022_useKahan|\
-tutorial-dataframe-df025_RNode|\
-tutorial-dataframe-df031_Stats|\
-tutorial-hist-sparsehist|\
-tutorial-r-example|\
-tutorial-r-DataFrame|\
-tutorial-r-Function|\
-tutorial-r-Functor|\
-tutorial-r-GlobalMinimization|\
-tutorial-r-Integration|\
-tutorial-r-Minimization"
+pyunittests-distrdf-unit-test-headnode"
 %endif
 
 %ifarch %{power64} aarch64
@@ -2823,16 +2790,66 @@ excluded="${excluded}|test-stresshistofit\$\$"
 # - test-stresshistogram-interpreted
 # - test-stressmathcore-interpreted
 # - test-stressroostats-interpreted
+#
+# Always timeout (hang?)
+# - pyunittests-pyroot-pyz-rdataframe-makenumpy
+# - tutorial-dataframe-df032_MakeNumpyDataFrame-py
 excluded="${excluded}|\
 test-stresshistofit-interpreted|\
 test-stresshistogram-interpreted|\
 test-stressmathcore-interpreted|\
-test-stressroostats-interpreted"
+test-stressroostats-interpreted|\
+pyunittests-pyroot-pyz-rdataframe-makenumpy|\
+tutorial-dataframe-df032_MakeNumpyDataFrame-py"
+
+%if %{?fedora}%{!?fedora:0} == 34 || %{?fedora}%{!?fedora:0} == 35 || %{?rhel}%{!?rhel:0} == 9
+# tmva/tmva/test/branchlessForest.cxx:215: Failure
+# Expected equality of these values:
+#   predictions[1]
+#     Which is: -1
+#   -1.0 + 2.0
+#     Which is: 1
+# - gtest-tmva-tmva-test-branchlessForest
+#
+# Error in <TAxis::TAxis::Set>: bins must be in increasing order
+# Error in <TGraphPainter::PaintGrapHist>: X must be in increasing order
+# - tutorial-math-kdTreeBinning
+#
+# Segmentation violation - malloc(): unaligned tcache chunk detected
+# - tutorial-unfold-testUnfold7c
+#
+# TFormula double free in Python
+# - tutorial-hist-fillrandom-py
+# - tutorial-pyroot-fillrandom-py
+# - tutorial-pyroot-fit1-py (uses output of tutorial-pyroot-fillrandom-py)
+# - tutorial-pyroot-formula1-py
+excluded="${excluded}|\
+gtest-tmva-tmva-test-branchlessForest|\
+tutorial-gl-gltf3|\
+tutorial-math-kdTreeBinning|\
+tutorial-unfold-testUnfold7c|\
+tutorial-hist-fillrandom-py|\
+tutorial-pyroot-fillrandom-py|\
+tutorial-pyroot-fit1-py|\
+tutorial-pyroot-formula1-py"
+%endif
+
+%if %{?rhel}%{!?rhel:0} == 7 || %{?rhel}%{!?rhel:0} == 8
+# crash - free(): corrupted unsorted chunks
+# - gtest-roofit-RDataFrameHelpers-test-testActionHelpers
+# - gtest-tmva-tmva-test-rtensor-utils
+# - gtest-tree-dataframe-test-dataframe-*
+# - gtest-tree-dataframe-test-datasource-*
+# - tutorial-dataframe-df004_cutFlowReport
+excluded="${excluded}|\
+gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
+gtest-tmva-tmva-test-rtensor-utils|\
+gtest-tree-dataframe-test-dataframe|\
+gtest-tree-dataframe-test-datasource|\
+tutorial-dataframe-df004_cutFlowReport"
+%endif
 
 %if %{?rhel}%{!?rhel:0} == 8
-# Random segmentation faults
-# - gtest-tree-dataframe-test-dataframe-snapshot
-#
 # Fails on ppc64le since RHEL 8.5 update
 # Exception: Found not whitelisted libraries after importing ROOT:
 #  - libpthread-2.28
@@ -2840,16 +2857,16 @@ test-stressroostats-interpreted"
 #  - libc-2.28
 #  - librt-2.28
 # - pyunittests-pyroot-import-load-libs
+#
+# crash - double free or corruption (out)
+# - tutorial-multicore-mt201_parallelHistoFill
+#
+# segmentation violation
+# - tutorial-multicore-mt304_fillHistos
 excluded="${excluded}|\
-gtest-tree-dataframe-test-dataframe-snapshot|\
-pyunittests-pyroot-import-load-libs"
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 36
-# Fails on Fedora 36 ppc64le
-# - test-stressHistFactory(-interpreted)
-excluded="${excluded}|\
-test-stressHistFactory"
+pyunittests-pyroot-import-load-libs|\
+tutorial-multicore-mt201_parallelHistoFill|\
+tutorial-multicore-mt304_fillHistos"
 %endif
 %endif
 
@@ -2857,28 +2874,36 @@ test-stressHistFactory"
 # s390x specific failures
 #
 # - gtest-roofit-roofitcore-test-testNaNPacker
+# - gtest-roofit-roofitcore-test-testRooProdPdf
+# - gtest-tree-dataframe-test-datasource-ntuple
 # - gtest-tree-ntuple-v7-test-ntuple-basics
 # - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-merger
 # - gtest-tree-ntuple-v7-test-ntuple-minifile
+# - gtest-tree-ntuple-v7-test-ntuple-serialize
 # - pyunittests-pyroot-pyz-rtensor
-# - test-stresshistogram(-interpreted)
+# - pyunittests-pyroot-pyz-stl-vector
 # - test-stresshistofit(-interpreted)
+# - test-stresshistogram(-interpreted)
 # - tutorial-dataframe-df006_ranges-py
-# - tutorial-roofit-rf203_ranges-py
+# - tutorial-math-exampleFunction-py
 # - tutorial-roofit-rf612_recoverFromInvalidParameters
-# - tutorial-roofit-rf902_numgenconfig-py
 excluded="${excluded}|\
 gtest-roofit-roofitcore-test-testNaNPacker|\
+gtest-roofit-roofitcore-test-testRooProdPdf|\
+gtest-tree-dataframe-test-datasource-ntuple|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
 gtest-tree-ntuple-v7-test-ntuple-extended|\
+gtest-tree-ntuple-v7-test-ntuple-merger|\
 gtest-tree-ntuple-v7-test-ntuple-minifile|\
+gtest-tree-ntuple-v7-test-ntuple-serialize|\
 pyunittests-pyroot-pyz-rtensor|\
-test-stresshistogram|\
+pyunittests-pyroot-pyz-stl-vector|\
 test-stresshistofit|\
+test-stresshistogram|\
 tutorial-dataframe-df006_ranges-py|\
-tutorial-roofit-rf203_ranges-py|\
-tutorial-roofit-rf612_recoverFromInvalidParameters|\
-tutorial-roofit-rf902_numgenconfig-py"
+tutorial-math-exampleFunction-py|\
+tutorial-roofit-rf612_recoverFromInvalidParameters"
 
 %if %{?rhel}%{!?rhel:0} == 8
 # Issues with file sizes on EPEL 8 s390x
@@ -2915,6 +2940,22 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %endif
 
+%pretrans net-http -p <lua>
+path = "%{_datadir}/%{name}/js"
+st = posix.stat(path)
+if st and st.type == "link" then
+    os.remove(path)
+end
+
+%post net-http
+# Replace bundled jsroot with symlinks to system version
+for x in img libs scripts style files/draw.htm files/online.htm ; do
+    ln -fs /usr/share/javascript/jsroot/$x %{_datadir}/%{name}/js/$x
+done
+%{?ldconfig}
+
+%ldconfig_postun net-http
+
 %if %{buildpy2}
 %pre -n python2-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2926,11 +2967,7 @@ fi
 
 %pre -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-%if %{?rhel}%{!?rhel:0} == 7
-    for alt in `grep python%{python3_version}/.*.so /var/lib/alternatives/libPyROOT.so` ; do
-%else
     for alt in `grep python3.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
-%endif
 	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
     done
 fi
@@ -3017,7 +3054,9 @@ fi
 %ldconfig_scriptlets html
 %ldconfig_scriptlets io
 %ldconfig_scriptlets io-dcache
+%if %{gfal2}
 %ldconfig_scriptlets io-gfal
+%endif
 %ldconfig_scriptlets io-sql
 %ldconfig_scriptlets io-xml
 %ldconfig_scriptlets io-xmlparser
@@ -3037,17 +3076,12 @@ fi
 %ldconfig_scriptlets splot
 %ldconfig_scriptlets unuran
 %ldconfig_scriptlets vecops
-%if %{memstat}
-%ldconfig_scriptlets memstat
-%endif
 %ldconfig_scriptlets montecarlo-eg
 %ldconfig_scriptlets montecarlo-pythia8
-%ldconfig_scriptlets montecarlo-vmc
 %ldconfig_scriptlets net
 %ldconfig_scriptlets net-rpdutils
 %ldconfig_scriptlets net-auth
 %ldconfig_scriptlets net-davix
-%ldconfig_scriptlets net-http
 %ldconfig_scriptlets net-httpsniff
 %ldconfig_scriptlets netx
 %ldconfig_scriptlets proof
@@ -3058,9 +3092,12 @@ fi
 %ldconfig_scriptlets xproof
 %endif
 %ldconfig_scriptlets roofit
+%ldconfig_scriptlets roofit-common
 %ldconfig_scriptlets roofit-core
 %ldconfig_scriptlets roofit-more
 %ldconfig_scriptlets roofit-batchcompute
+%ldconfig_scriptlets roofit-dataframe-helpers
+%ldconfig_scriptlets roofit-hs3
 %ldconfig_scriptlets roostats
 %ldconfig_scriptlets sql-mysql
 %ldconfig_scriptlets sql-odbc
@@ -3069,12 +3106,23 @@ fi
 %ldconfig_scriptlets tmva
 %ldconfig_scriptlets tmva-python
 %ldconfig_scriptlets tmva-r
+%ldconfig_scriptlets tmva-sofie
+%if %{tmvasofieparser}
+%ldconfig_scriptlets tmva-sofie-parser
+%endif
 %ldconfig_scriptlets tmva-gui
 %ldconfig_scriptlets tree
 %ldconfig_scriptlets tree-dataframe
 %ldconfig_scriptlets tree-player
 %ldconfig_scriptlets tree-viewer
 %ldconfig_scriptlets unfold
+%if %{webgui}
+%ldconfig_scriptlets gui-webdisplay
+%ifarch %{qt5_qtwebengine_arches}
+%ldconfig_scriptlets gui-qt5webdisplay
+%endif
+%ldconfig_scriptlets gui-webgui6
+%endif
 %if %{root7}
 %ldconfig_scriptlets graf-gpadv7
 %ldconfig_scriptlets graf-primitives
@@ -3083,11 +3131,6 @@ fi
 %ldconfig_scriptlets gui-browserv7
 %ldconfig_scriptlets gui-canvaspainter
 %ldconfig_scriptlets gui-fitpanelv7
-%ifarch %{qt5_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt5webdisplay
-%endif
-%ldconfig_scriptlets gui-webdisplay
-%ldconfig_scriptlets gui-webgui6
 %ldconfig_scriptlets histv7
 %ldconfig_scriptlets hist-draw
 %ldconfig_scriptlets tree-ntuple
@@ -3119,17 +3162,12 @@ fi
 %files fonts
 %{_datadir}/%{name}/fonts
 
-%files doc
-%doc %{_pkgdocdir}/html
-
 %files tutorial
 %doc %{_pkgdocdir}/tutorials
 
 %files core -f includelist-core
-%{_bindir}/memprobe
 %{_bindir}/rmkdepend
 %{_bindir}/root-config
-%{_mandir}/man1/memprobe.1*
 %{_mandir}/man1/rmkdepend.1*
 %{_mandir}/man1/root-config.1*
 %dir %{_libdir}/%{name}
@@ -3228,10 +3266,6 @@ fi
 %files -n python2-jsmva
 %{python2_sitelib}/JsMVA
 %{python2_sitelib}/JsMVA-*.egg-info
-
-%files -n python2-distrdf
-%{python2_sitelib}/DistRDF
-%{python2_sitelib}/DistRDF-*.egg-info
 %endif
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
@@ -3257,9 +3291,11 @@ fi
 %{python3_sitelib}/JsMVA
 %{python3_sitelib}/JsMVA-*.egg-info
 
+%if %{distrdf}
 %files -n python%{python3_pkgversion}-distrdf
 %{python3_sitelib}/DistRDF
 %{python3_sitelib}/DistRDF-*.egg-info
+%endif
 
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
@@ -3454,10 +3490,12 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
+%if %{gfal2}
 %files io-gfal -f includelist-io-gfal
 %{_libdir}/%{name}/libGFAL.*
 %{_libdir}/%{name}/libGFAL_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
+%endif
 
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
@@ -3569,12 +3607,6 @@ fi
 %{_libdir}/%{name}/libROOTVecOps.*
 %{_libdir}/%{name}/libROOTVecOps_rdict.pcm
 
-%if %{memstat}
-%files memstat -f includelist-misc-memstat
-%{_libdir}/%{name}/libMemStat.*
-%{_libdir}/%{name}/libMemStat_rdict.pcm
-%endif
-
 %files montecarlo-eg -f includelist-montecarlo-eg
 %{_libdir}/%{name}/libEG.*
 %{_libdir}/%{name}/libEG_rdict.pcm
@@ -3585,11 +3617,6 @@ fi
 %{_libdir}/%{name}/libEGPythia8.*
 %{_libdir}/%{name}/libEGPythia8_rdict.pcm
 
-%files montecarlo-vmc -f includelist-montecarlo-vmc
-%{_libdir}/%{name}/libVMC.*
-%{_libdir}/%{name}/libVMC_rdict.pcm
-%{_datadir}/%{name}/vmc
-
 %files net -f includelist-net-net
 %{_libdir}/%{name}/libNet.*
 %{_libdir}/%{name}/libNet_rdict.pcm
@@ -3622,7 +3649,17 @@ fi
 %files net-http -f includelist-net-http
 %{_libdir}/%{name}/libRHTTP.*
 %{_libdir}/%{name}/libRHTTP_rdict.pcm
-%{_datadir}/%{name}/js
+%dir %{_datadir}/%{name}/js
+%dir %{_datadir}/%{name}/js/files
+%{_datadir}/%{name}/js/files/canv_batch.htm
+%{_datadir}/%{name}/js/files/web.config
+%{_datadir}/%{name}/js/files/wslist.htm
+%ghost %{_datadir}/%{name}/js/img
+%ghost %{_datadir}/%{name}/js/libs
+%ghost %{_datadir}/%{name}/js/scripts
+%ghost %{_datadir}/%{name}/js/style
+%ghost %{_datadir}/%{name}/js/files/draw.htm
+%ghost %{_datadir}/%{name}/js/files/online.htm
 %doc net/http/README.txt net/http/civetweb/*.md
 
 %files net-httpsniff -f includelist-net-httpsniff
@@ -3639,6 +3676,7 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
+%{_datadir}/%{name}/plugins/ROOT@@Internal@@RRawFile/P020_RRawFileNetXNG.C
 
 %files proof -f includelist-proof-proof
 %{_bindir}/proofserv
@@ -3699,6 +3737,9 @@ fi
 %{_libdir}/%{name}/libRooFit.*
 %{_libdir}/%{name}/libRooFit_rdict.pcm
 
+%files roofit-common
+%{_libdir}/%{name}/libRooFitCommon.*
+
 %files roofit-core -f includelist-roofit-roofitcore
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooFitCore_rdict.pcm
@@ -3716,6 +3757,17 @@ fi
 %{_libdir}/%{name}/libRooBatchCompute_*
 %doc roofit/batchcompute/README.md
 
+%files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
+%{_libdir}/%{name}/libRooFitRDataFrameHelpers.*
+%{_libdir}/%{name}/libRooFitRDataFrameHelpers_rdict.pcm
+
+%files roofit-hs3 -f includelist-roofit-hs3
+%{_libdir}/%{name}/libRooFitHS3.*
+%{_libdir}/%{name}/libRooFitHS3_rdict.pcm
+%{_datadir}/%{name}/RooFitHS3_wsexportkeys.json
+%{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
+%doc roofit/hs3/README.md
+
 %files roostats -f includelist-roofit-roostats
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
@@ -3761,6 +3813,17 @@ fi
 %{_libdir}/%{name}/libRMVA.*
 %{_libdir}/%{name}/libRMVA_rdict.pcm
 
+%files tmva-sofie -f includelist-tmva-sofie
+%{_libdir}/%{name}/libROOTTMVASofie.*
+%{_libdir}/%{name}/libROOTTMVASofie_rdict.pcm
+%doc tmva/sofie/README.md
+
+%if %{tmvasofieparser}
+%files tmva-sofie-parser -f includelist-tmva-sofie_parsers
+%{_libdir}/%{name}/libROOTTMVASofieParser.*
+%{_libdir}/%{name}/libROOTTMVASofieParser_rdict.pcm
+%endif
+
 %files tmva-gui -f includelist-tmva-tmvagui
 %{_libdir}/%{name}/libTMVAGui.*
 %{_libdir}/%{name}/libTMVAGui_rdict.pcm
@@ -3807,6 +3870,23 @@ fi
 %{_datadir}/%{name}/notebook
 %doc %{_pkgdocdir}/JupyROOT-on-EPEL
 
+%if %{webgui}
+%files gui-webdisplay -f includelist-gui-webdisplay
+%{_libdir}/%{name}/libROOTWebDisplay.*
+%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+%{_datadir}/%{name}/ui5
+
+%ifarch %{qt5_qtwebengine_arches}
+%files gui-qt5webdisplay
+%{_libdir}/%{name}/libROOTQt5WebDisplay.*
+%endif
+
+%files gui-webgui6 -f includelist-gui-webgui6
+%{_libdir}/%{name}/libWebGui6.*
+%{_libdir}/%{name}/libWebGui6_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
+%endif
+
 %if %{root7}
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
 %{_libdir}/%{name}/libROOTGpadv7.*
@@ -3828,6 +3908,9 @@ fi
 %{_libdir}/%{name}/libROOTHistDrawProvider.*
 %{_libdir}/%{name}/libROOTLeafDraw6Provider.*
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
+%{_libdir}/%{name}/libROOTNTupleBrowseProvider.*
+%{_libdir}/%{name}/libROOTNTupleDraw6Provider.*
+%{_libdir}/%{name}/libROOTNTupleDraw7Provider.*
 %{_libdir}/%{name}/libROOTObjectDraw6Provider.*
 %{_libdir}/%{name}/libROOTObjectDraw7Provider.*
 
@@ -3847,21 +3930,6 @@ fi
 %{_libdir}/%{name}/libROOTFitPanelv7.*
 %{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm
 
-%ifarch %{qt5_qtwebengine_arches}
-%files gui-qt5webdisplay
-%{_libdir}/%{name}/libROOTQt5WebDisplay.*
-%endif
-
-%files gui-webdisplay -f includelist-gui-webdisplay
-%{_libdir}/%{name}/libROOTWebDisplay.*
-%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
-%{_datadir}/%{name}/ui5
-
-%files gui-webgui6 -f includelist-gui-webgui6
-%{_libdir}/%{name}/libWebGui6.*
-%{_libdir}/%{name}/libWebGui6_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
-
 %files histv7 -f includelist-hist-histv7
 %{_libdir}/%{name}/libROOTHist.*
 %{_libdir}/%{name}/libROOTHist_rdict.pcm
@@ -3876,13 +3944,23 @@ fi
 %endif
 
 %changelog
+* Sat Mar 26 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.00-1
+- Update to 6.24.04
+- New subpackages: root-roofit-common, root-roofit-dataframe-helpers,
+  root-roofit-hs3, root-tmva-sofie and root-tmva-sofie-parser
+- Removed subpackages: root-memstat and root-montecarlo-vmc
+- Drop the doxygen generated root-doc package (doxygen runs out of memory)
+- Dropped patches: 17
+- New patches: 22
+- Updated patches: 5
+
 * Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 6.24.06-6
 - Rebuild for glew 2.2
 
 * Fri Jan 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.24.06-5
 - Exclude failing test on Fedora 36 ppc64le:
   test-stressHistFactory(-interpreted)
-# Disable package note flags
+- Disable package note flags
 
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.24.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 31dae3c..31ddb3c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.24.06.tar.xz) = fe316283503dae60acb26d2ae3e838e6f9c01e1f89ff9973aa2b666a30c00f99f5e0df02b54e3744cd14a45a49ca2fc7d1f19fbac6b69071b9c9e0c98f2e0645
+SHA512 (root-6.26.00.tar.xz) = 0a98e973eeda98550200635d5d566fe4191aba953d3f993af750761a23e2b86caa5eb9674837bf1b070b9056b3a8ce7ee2d43295c56d22d120ca78edb97ea1c8
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 4a99ec915cc6fa5180a59dfd68402fd60d25f03a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 18 Apr 2022 04:04:24 +0200
Subject: [PATCH 221/344] Update to 6.26.02

Drop patch root-roofit-overflow.patch (previously backported)
---
 root-old-gtest-compat.patch | 27 +++++++++++++++++++++++++++
 root.spec                   | 16 +++++++++-------
 sources                     |  2 +-
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
index 078a5f9..e9f4140 100644
--- a/root-old-gtest-compat.patch
+++ b/root-old-gtest-compat.patch
@@ -414,3 +414,30 @@ index 7b6b7647aa..77f125ca60 100644
 -- 
 2.35.1
 
+From 33e5da8c1f678382ab2fd65d000d388bb0dbf3ab Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 17 Apr 2022 22:17:56 +0200
+Subject: [PATCH] Backward compatibility with older googletest versions in EPEL
+
+---
+ math/vecops/test/vecops_rvec.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
+index 7b513a858b..bea39636ce 100644
+--- a/math/vecops/test/vecops_rvec.cxx
++++ b/math/vecops/test/vecops_rvec.cxx
+@@ -13,6 +13,10 @@
+ #include <sstream>
+ #include <cmath>
+ 
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ using namespace ROOT;
+ using namespace ROOT::VecOps;
+ using namespace ROOT::Detail::VecOps; // for `IsSmall` and `IsAdopting`
+-- 
+2.35.1
+
diff --git a/root.spec b/root.spec
index 4fbd388..54db8be 100644
--- a/root.spec
+++ b/root.spec
@@ -68,7 +68,7 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.26.00
+Version:	6.26.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -180,10 +180,9 @@ Patch30:	%{name}-tmva-threads.patch
 #		https://github.com/root-project/root/pull/10313
 Patch31:	%{name}-core-base-test.patch
 #		Backports
-Patch32:	%{name}-roofit-overflow.patch
-Patch33:	%{name}-make-dyld-based-library-search-behavior-default.patch
-Patch34:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
-Patch35:	%{name}-threadsh1-avoid-heap-use-after-free.patch
+Patch32:	%{name}-make-dyld-based-library-search-behavior-default.patch
+Patch33:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
+Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2042,7 +2041,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%patch35 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3944,8 +3942,12 @@ fi
 %endif
 
 %changelog
+* Thu Apr 14 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-1
+- Update to 6.26.02
+- Drop patch root-roofit-overflow.patch (previously backported)
+
 * Sat Mar 26 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.00-1
-- Update to 6.24.04
+- Update to 6.26.00
 - New subpackages: root-roofit-common, root-roofit-dataframe-helpers,
   root-roofit-hs3, root-tmva-sofie and root-tmva-sofie-parser
 - Removed subpackages: root-memstat and root-montecarlo-vmc
diff --git a/sources b/sources
index 31ddb3c..053a299 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.00.tar.xz) = 0a98e973eeda98550200635d5d566fe4191aba953d3f993af750761a23e2b86caa5eb9674837bf1b070b9056b3a8ce7ee2d43295c56d22d120ca78edb97ea1c8
+SHA512 (root-6.26.02.tar.xz) = 016b1176564ba31f9ac22c9b62cdd11ba9dda2e6d656c587d0b77e57c8a34d52343ba5da8ecf185c0a73ded80109a5cd28438611441ba5ee6ab14ba986ed3b94
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 51dd64e00251deee776c69216335a7d58672d71a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 29 Apr 2022 14:26:18 +0200
Subject: [PATCH 222/344] Rebuild for gcc 11.3 (Fedora 35)

Use upstream's version of the dataframe-snapshot on 32 bit patch
---
 root-longlong.patch | 64 +++++++++++++++++++--------------------------
 root.spec           |  6 ++++-
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/root-longlong.patch b/root-longlong.patch
index 856e015..3c43542 100644
--- a/root-longlong.patch
+++ b/root-longlong.patch
@@ -1,52 +1,42 @@
-From 7fe5ef049baf614626d985b05cb0b335f9764a3c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 16:15:00 +0100
-Subject: [PATCH] Fix test when long is 32 bits
+From 2aa02353663674a338c92fa4e72a0c0e529c410e Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@cern.ch>
+Date: Fri, 8 Apr 2022 17:52:18 +0200
+Subject: [PATCH] [DF] Fix long int + Snapshot test on 32 bit platforms
 
-This test tests support for 64 bit values. But it uses a long type,
-which fails on platforme where a long is 32 bits.
-
-This commit changes the test to use a long long type instead.
+Co-authored-by: Mattias Ellert <mattias.ellert@physics.uu.se>
 ---
- tree/dataframe/test/dataframe_snapshot.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ tree/dataframe/test/dataframe_snapshot.cxx | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
-index 05354e83d5..a30440558e 100644
+index f41848e96a..ddbacaba0f 100644
 --- a/tree/dataframe/test/dataframe_snapshot.cxx
 +++ b/tree/dataframe/test/dataframe_snapshot.cxx
-@@ -470,11 +470,11 @@ void ReadWriteCarray(const char *outFileNameBase)
-    auto size = 0;
-    int v[maxArraySize];
-    bool vb[maxArraySize];
--   long int vl[maxArraySize];
-+   long long int vl[maxArraySize];
-    t.Branch("size", &size, "size/I");
-    t.Branch("v", v, "v[size]/I");
+@@ -495,11 +495,14 @@ void ReadWriteCarray(const char *outFileNameBase)
     t.Branch("vb", vb, "vb[size]/O");
--   t.Branch("vl", vl, "vl[size]/G");
-+   t.Branch("vl", vl, "vl[size]/L");
+    t.Branch("vl", vl, "vl[size]/G");
  
++   // use 2**33 as a larger-than-int value on 64 bits, otherwise just something larger than short (2**30)
++   static constexpr long int longintTestValue = sizeof(long int) == 8 ? 8589934592 : 1073741824;
++
     // Size 1
     size = 1;
-@@ -518,7 +518,7 @@ void ReadWriteCarray(const char *outFileNameBase)
-       TTreeReader r(treename, &f2);
-       TTreeReaderArray<int> rv(r, "v");
-       TTreeReaderArray<bool> rvb(r, "vb");
--      TTreeReaderArray<long int> rvl(r, "vl");
-+      TTreeReaderArray<long long int> rvl(r, "vl");
+    v[0] = 12;
+    vb[0] = true;
+-   vl[0] = 8589934592; // 2**33
++   vl[0] = longintTestValue;
+    t.Fill();
  
-       // Size 1
+    // Size 0 (see ROOT-9860)
+@@ -546,7 +549,7 @@ void ReadWriteCarray(const char *outFileNameBase)
+       EXPECT_EQ(rvb.GetSize(), 1u);
+       EXPECT_TRUE(rvb[0]);
+       EXPECT_EQ(rvl.GetSize(), 1u);
+-      EXPECT_EQ(rvl[0], 8589934592);
++      EXPECT_EQ(rvl[0], longintTestValue);
+ 
+       // Size 0
        EXPECT_TRUE(r.Next());
-@@ -571,7 +571,7 @@ void ReadWriteCarray(const char *outFileNameBase)
- 
-    const auto outfname2 = outFileNameBaseStr + "_out2.root";
-    RDataFrame(treename, fname)
--      .Snapshot<int, RVec<int>, RVec<bool>, RVec<long int>>(treename, outfname2, {"size", "v", "vb", "vl"});
-+      .Snapshot<int, RVec<int>, RVec<bool>, RVec<long long int>>(treename, outfname2, {"size", "v", "vb", "vl"});
-    outputChecker(outfname2.c_str());
- 
-    gSystem->Unlink(fname.c_str());
 -- 
 2.35.1
 
diff --git a/root.spec b/root.spec
index 54db8be..5e7704d 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3942,6 +3942,10 @@ fi
 %endif
 
 %changelog
+* Fri Apr 29 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-2
+- Rebuild for gcc 11.3 (Fedora 35)
+- Use upstream's version of the dataframe-snapshot on 32 bit patch
+
 * Thu Apr 14 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-1
 - Update to 6.26.02
 - Drop patch root-roofit-overflow.patch (previously backported)

From 44203f1d1dd61c551b95fc241932681076e36c98 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 20 May 2022 14:43:55 +0200
Subject: [PATCH 223/344] Rebuild for gcc 12.1 (Fedora 36)

Update the root-tmva-threads patch
---
 root-tmva-threads.patch | 33 +++++++++++++++++++++++++--------
 root.spec               |  6 +++++-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/root-tmva-threads.patch b/root-tmva-threads.patch
index 459062d..7506abc 100644
--- a/root-tmva-threads.patch
+++ b/root-tmva-threads.patch
@@ -1,4 +1,4 @@
-From f525fe375840cda2bf5b51e018eab8ad74dcd736 Mon Sep 17 00:00:00 2001
+From 589ac491519446191b7d480a476ab831dc09b5f9 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Wed, 30 Mar 2022 15:51:07 +0200
 Subject: [PATCH] Limit the number of threads in TMVA CNN/DNN test to save
@@ -27,15 +27,15 @@ OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for t
  *** Break *** segmentation violation
  *** Break *** segmentation violation
 ---
- tutorials/tmva/TMVA_CNN_Classification.C | 2 +-
- tutorials/tmva/TMVA_RNN_Classification.C | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ tutorials/tmva/TMVA_CNN_Classification.C | 6 ++++--
+ tutorials/tmva/TMVA_RNN_Classification.C | 6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index 3e590c5958..4abfc6a4d1 100644
+index 3e590c5958..b748fcee6c 100644
 --- a/tutorials/tmva/TMVA_CNN_Classification.C
 +++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -125,7 +125,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+@@ -125,14 +125,16 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
  
     bool writeOutputFile = true;
  
@@ -44,11 +44,21 @@ index 3e590c5958..4abfc6a4d1 100644
  
     TMVA::Tools::Instance();
  
+    // do enable MT running
+    if (num_threads >= 0) {
+       ROOT::EnableImplicitMT(num_threads);
+-      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
++      if (ROOT::GetThreadPoolSize() > 0)
++         gSystem->Setenv("OMP_NUM_THREADS",
++                         TString::Format("%u", ROOT::GetThreadPoolSize()));
+    }
+    else
+       gSystem->Setenv("OMP_NUM_THREADS", "1");
 diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
-index 5be80824f9..791b9aecf5 100644
+index 5be80824f9..f902025875 100644
 --- a/tutorials/tmva/TMVA_RNN_Classification.C
 +++ b/tutorials/tmva/TMVA_RNN_Classification.C
-@@ -190,7 +190,7 @@ void TMVA_RNN_Classification(int use_type = 1)
+@@ -190,11 +190,13 @@ void TMVA_RNN_Classification(int use_type = 1)
     useKeras = false;
  #endif
  
@@ -57,6 +67,13 @@ index 5be80824f9..791b9aecf5 100644
     // do enable MT running
     if (num_threads >= 0) {
        ROOT::EnableImplicitMT(num_threads);
+-      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
++      if (ROOT::GetThreadPoolSize() > 0)
++         gSystem->Setenv("OMP_NUM_THREADS",
++                         TString::Format("%u", ROOT::GetThreadPoolSize()));
+    }
+    else
+       gSystem->Setenv("OMP_NUM_THREADS", "1");
 -- 
 2.35.1
 
diff --git a/root.spec b/root.spec
index 5e7704d..ce65428 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3942,6 +3942,10 @@ fi
 %endif
 
 %changelog
+* Fri May 20 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-3
+- Rebuild for gcc 12.1 (Fedora 36)
+- Update the root-tmva-threads patch
+
 * Fri Apr 29 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-2
 - Rebuild for gcc 11.3 (Fedora 35)
 - Use upstream's version of the dataframe-snapshot on 32 bit patch

From a9b86f482f2392f4bfd413d08f24e2df52aeeb16 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 14 Jun 2022 16:02:47 +0200
Subject: [PATCH 224/344] Update to 6.26.04

Drop patch root-missing-include.patch (accepted upstream)
---
 root-missing-include.patch | 32 --------------------------------
 root.spec                  | 12 ++++++------
 sources                    |  2 +-
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 root-missing-include.patch

diff --git a/root-missing-include.patch b/root-missing-include.patch
deleted file mode 100644
index 8c6bc17..0000000
--- a/root-missing-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 235e446b0ac14170e49c15d5725fbe6dd315351f Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 15 Mar 2022 09:08:39 +0100
-Subject: [PATCH] Add #include <cstring> for std::memcpy
-
-In file included from /builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/RModel.hxx:14,
-                 from /builddir/build/BUILD/root-6.26.00/tmva/sofie/src/RModel.cxx:3:
-/builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/SOFIE_common.hxx: In member function 'void TMVA::Experimental::SOFIE::InitializedTensor::CastPersistentToShared()':
-/builddir/build/BUILD/root-6.26.00/tmva/sofie/inc/TMVA/SOFIE_common.hxx:75:12: error: 'memcpy' is not a member of 'std'; did you mean 'wmemcpy'?
-   75 |       std::memcpy(tData.get(), fPersistentData,fSize * sizeof(float));
-      |            ^~~~~~
-      |            wmemcpy
-gmake[2]: *** [tmva/sofie/CMakeFiles/ROOTTMVASofie.dir/build.make:79: tmva/sofie/CMakeFiles/ROOTTMVASofie.dir/src/RModel.cxx.o] Error 1
----
- tmva/sofie/inc/TMVA/SOFIE_common.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tmva/sofie/inc/TMVA/SOFIE_common.hxx b/tmva/sofie/inc/TMVA/SOFIE_common.hxx
-index a663855004..7876727eef 100644
---- a/tmva/sofie/inc/TMVA/SOFIE_common.hxx
-+++ b/tmva/sofie/inc/TMVA/SOFIE_common.hxx
-@@ -6,6 +6,7 @@
- 
- #include <type_traits>
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <vector>
- #include <memory>
--- 
-2.35.1
-
diff --git a/root.spec b/root.spec
index ce65428..2130700 100644
--- a/root.spec
+++ b/root.spec
@@ -68,9 +68,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.26.02
+Version:	6.26.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -130,9 +130,6 @@ Patch12:	%{name}-fix-compilation-with-gcc-12.patch
 #		Fix test failure on ppc64le and aarch64 with gcc 12
 #		https://github.com/root-project/root/pull/9601
 Patch13:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
-#		Add #include <cstring> for std::memcpy
-#		https://github.com/root-project/root/pull/10116
-Patch14:	%{name}-missing-include.patch
 #		Fixes for tmva-sofie test compilation
 #		https://github.com/root-project/root/pull/10117
 Patch15:	%{name}-blas-linking-and-ignore-prefix.patch
@@ -2020,7 +2017,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -3942,6 +3938,10 @@ fi
 %endif
 
 %changelog
+* Tue Jun 14 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-1
+- Update to 6.26.04
+- Drop patch root-missing-include.patch (accepted upstream)
+
 * Fri May 20 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-3
 - Rebuild for gcc 12.1 (Fedora 36)
 - Update the root-tmva-threads patch
diff --git a/sources b/sources
index 053a299..0ac5ec5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.02.tar.xz) = 016b1176564ba31f9ac22c9b62cdd11ba9dda2e6d656c587d0b77e57c8a34d52343ba5da8ecf185c0a73ded80109a5cd28438611441ba5ee6ab14ba986ed3b94
+SHA512 (root-6.26.04.tar.xz) = 0ca0efa082cedce8017293d06ec92c76948f70b6b565efbc6cf4cc78da54017b5022d249dd69abd3588fb874942437318f9a136ed4b144adc820ff41fc1154ee
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 9505e4b28aa7d2da3dbeda88ccb75d33ae77503a Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Wed, 15 Jun 2022 14:00:40 +0200
Subject: [PATCH 225/344] Rebuilt for Python 3.11

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 2130700..ff143a3 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3938,6 +3938,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 6.26.04-2
+- Rebuilt for Python 3.11
+
 * Tue Jun 14 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-1
 - Update to 6.26.04
 - Drop patch root-missing-include.patch (accepted upstream)

From dacf8d779ae7ee3db6d1ea09327963f857946c94 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 3 Jul 2022 10:21:52 +0200
Subject: [PATCH 226/344] Backport python 3.11 fixes from upstream Backport
 additional python 3.11 fixes from CPyCppyy upstream Exclude some failing
 tests on Fedora 37+   (segfaults during Python garbage collection with Python
 3.11) Adjust some test timeouts

---
 ...ast-error-when-calling-PyTuple_SET_I.patch |  29 +++
 ...ust-not-be-included-directly-in-3.11.patch |  34 +++
 ....11-support-backported-from-CPyCppyy.patch | 220 ++++++++++++++++++
 root-test-timeout.patch                       |  48 ++++
 root.spec                                     |  44 +++-
 5 files changed, 374 insertions(+), 1 deletion(-)
 create mode 100644 root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 create mode 100644 root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 create mode 100644 root-Python-3.11-support-backported-from-CPyCppyy.patch
 create mode 100644 root-test-timeout.patch

diff --git a/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch b/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
new file mode 100644
index 0000000..ca908b8
--- /dev/null
+++ b/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
@@ -0,0 +1,29 @@
+From a12f3b736a9c69e0d69e7f483e50e7cdf59d9fd2 Mon Sep 17 00:00:00 2001
+From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
+Date: Fri, 10 Jun 2022 16:42:49 +0200
+Subject: [PATCH] [PyROOT] Prevent cast error when calling PyTuple_SET_ITEM in
+ 3.11
+
+PyTuple_SET_ITEM ends up calling _PyObject_CAST(nullptr) which
+causes "error: invalid cast from type 'std::nullptr_t' to type
+'const PyObject*' {aka 'const _object*'}
+---
+ bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
+index 685ad3dc60..2189348594 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
+@@ -580,7 +580,7 @@ PyObject* CPyCppyy::CPPMethod::ProcessKeywords(PyObject* self, PyObject* args, P
+ // set all values to zero to be able to check them later (this also guarantees normal
+ // cleanup by the tuple deallocation)
+     for (Py_ssize_t i = 0; i < nArgs+nKeys; ++i)
+-        PyTuple_SET_ITEM(newArgs, i, nullptr);
++        PyTuple_SET_ITEM(newArgs, i, static_cast<PyObject*>(nullptr));
+ 
+ // next, insert the keyword values
+     PyObject *key, *value;
+-- 
+2.36.1
+
diff --git a/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch b/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
new file mode 100644
index 0000000..a845fa4
--- /dev/null
+++ b/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
@@ -0,0 +1,34 @@
+From 484deb056dacf768aba4954073b41105c431bffc Mon Sep 17 00:00:00 2001
+From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
+Date: Thu, 9 Jun 2022 12:24:07 +0200
+Subject: [PATCH] [PyROOT] code.h must not be included directly in 3.11
+
+It has been moved to Include/cpython, and it is included by Python.h.
+
+See:
+https://docs.python.org/3.11/whatsnew/3.11.html
+---
+ bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
+index 59997e390d..28bbd635c2 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
+@@ -1,10 +1,10 @@
+ // Bindings
+ #include "CPyCppyy.h"
+ #include "structmember.h"    // from Python
+-#if PY_VERSION_HEX >= 0x02050000
+-#include "code.h"            // from Python
+-#else
++#if PY_VERSION_HEX < 0x02050000
+ #include "compile.h"         // from Python
++#elif PY_VERSION_HEX < 0x030b0000
++#include "code.h"            // from Python
+ #endif
+ #ifndef CO_NOFREE
+ // python2.2 does not have CO_NOFREE defined
+-- 
+2.36.1
+
diff --git a/root-Python-3.11-support-backported-from-CPyCppyy.patch b/root-Python-3.11-support-backported-from-CPyCppyy.patch
new file mode 100644
index 0000000..734e22e
--- /dev/null
+++ b/root-Python-3.11-support-backported-from-CPyCppyy.patch
@@ -0,0 +1,220 @@
+From 07693d05ad785d495a9c1d5af27399481b43c3f5 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 1 Jul 2022 06:50:31 +0200
+Subject: [PATCH] Python 3.11 support - backported from CPyCppyy
+
+---
+ bindings/pyroot/cppyy/CPyCppyy/src/API.cxx    | 11 ++++++++++-
+ .../pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx |  1 -
+ .../pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx |  8 +++++---
+ bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h |  5 ++++-
+ .../cppyy/CPyCppyy/src/CPyCppyyModule.cxx     | 19 +++++++++++++++++++
+ .../cppyy/CPyCppyy/src/MemoryRegulator.cxx    |  2 +-
+ .../pyroot/cppyy/CPyCppyy/src/Utility.cxx     |  2 ++
+ bindings/pyroot/cppyy/CPyCppyy/src/Utility.h  |  2 ++
+ 8 files changed, 43 insertions(+), 7 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
+index 0cc4c8247b..4c17f54bb0 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
+@@ -49,7 +49,14 @@ static bool Initialize()
+ #if PY_VERSION_HEX < 0x03020000
+         PyEval_InitThreads();
+ #endif
++#if PY_VERSION_HEX < 0x03080000
+         Py_Initialize();
++#else
++        PyConfig config;
++        PyConfig_InitPythonConfig(&config);
++        PyConfig_SetString(&config, &config.program_name, L"cppyy");
++        Py_InitializeFromConfig(&config);
++#endif
+ #if PY_VERSION_HEX >= 0x03020000
+ #if PY_VERSION_HEX < 0x03090000
+ 	PyEval_InitThreads();
+@@ -66,10 +73,12 @@ static bool Initialize()
+    // set the command line arguments on python's sys.argv
+ #if PY_VERSION_HEX < 0x03000000
+         char* argv[] = {const_cast<char*>("cppyy")};
+-#else
++#elif PY_VERSION_HEX < 0x03080000
+         wchar_t* argv[] = {const_cast<wchar_t*>(L"cppyy")};
+ #endif
++#if PY_VERSION_HEX < 0x03080000
+         PySys_SetArgv(sizeof(argv)/sizeof(argv[0]), argv);
++#endif
+ 
+     // force loading of the cppyy module
+         PyRun_SimpleString(const_cast<char*>("import cppyy"));
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
+index 73fb8099b5..f2eea396af 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
+@@ -764,7 +764,6 @@ PyTypeObject CPPInstance_Type = {
+     0,                             // tp_as_buffer
+     Py_TPFLAGS_DEFAULT |
+         Py_TPFLAGS_BASETYPE |
+-        Py_TPFLAGS_HAVE_GC |
+         Py_TPFLAGS_CHECKTYPES,     // tp_flags
+     (char*)"cppyy object proxy (internal)", // tp_doc
+     0,                             // tp_traverse
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
+index 28bbd635c2..7eb2de8b01 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
+@@ -1,11 +1,13 @@
+ // Bindings
+ #include "CPyCppyy.h"
+ #include "structmember.h"    // from Python
+-#if PY_VERSION_HEX < 0x02050000
+-#include "compile.h"         // from Python
+-#elif PY_VERSION_HEX < 0x030b0000
++#if PY_VERSION_HEX >= 0x02050000
++#if PY_VERSION_HEX <  0x030b0000
+ #include "code.h"            // from Python
+ #endif
++#else
++#include "compile.h"         // from Python
++#endif
+ #ifndef CO_NOFREE
+ // python2.2 does not have CO_NOFREE defined
+ #define CO_NOFREE       0x0040
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
+index 11221cd7ef..35af3c8a56 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
+@@ -68,7 +68,10 @@ typedef dim_t* dims_t;
+ #if PY_VERSION_HEX < 0x03030000
+    typedef PyDictEntry* (*dict_lookup_func)(PyDictObject*, PyObject*, long);
+ #else
+-#if PY_VERSION_HEX >= 0x03060000
++#if PY_VERSION_HEX >= 0x030b0000
++   typedef Py_ssize_t (*dict_lookup_func)(
++       PyDictObject*, PyObject*, Py_hash_t, PyObject**);
++#elif PY_VERSION_HEX >= 0x03060000
+    typedef Py_ssize_t (*dict_lookup_func)(
+        PyDictObject*, PyObject*, Py_hash_t, PyObject***, Py_ssize_t*);
+ #else
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
+index 411a57a862..7a32ab365f 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
+@@ -26,6 +26,11 @@
+ #include <vector>
+ 
+ 
++// Note: as of py3.11, dictionary objects no longer carry a function pointer for
++// the lookup, so it can no longer be shimmed and "from cppyy.interactive import *"
++// thus no longer works.
++#if PY_VERSION_HEX < 0x030b0000
++
+ //- from Python's dictobject.c -------------------------------------------------
+ #if PY_VERSION_HEX >= 0x03030000
+     typedef struct PyDictKeyEntry {
+@@ -65,6 +70,8 @@
+ 
+ #endif
+ 
++#endif // PY_VERSION_HEX < 0x030b0000
++
+ //- data -----------------------------------------------------------------------
+ static PyObject* nullptr_repr(PyObject*)
+ {
+@@ -177,7 +184,9 @@ namespace {
+ 
+ using namespace CPyCppyy;
+ 
++
+ //----------------------------------------------------------------------------
++#if PY_VERSION_HEX < 0x030b0000
+ namespace {
+ 
+ class GblGetter {
+@@ -330,9 +339,12 @@ PyDictEntry* CPyCppyyLookDictString(PyDictObject* mp, PyObject* key, long hash)
+     return ep;
+ }
+ 
++#endif // PY_VERSION_HEX < 0x030b0000
++
+ //----------------------------------------------------------------------------
+ static PyObject* SetCppLazyLookup(PyObject*, PyObject* args)
+ {
++#if PY_VERSION_HEX < 0x030b0000
+ // Modify the given dictionary to install the lookup function that also
+ // tries the global C++ namespace before failing. Called on a module's dictionary,
+ // this allows for lazy lookups. This works fine for p3.2 and earlier, but should
+@@ -343,6 +355,11 @@ static PyObject* SetCppLazyLookup(PyObject*, PyObject* args)
+         return nullptr;
+ 
+     CPYCPPYY_GET_DICT_LOOKUP(dict) = CPyCppyyLookDictString;
++#else
++// As of py3.11, there is no longer a lookup function pointer in the dict object
++// to replace. Since this feature is not widely advertised, it's simply droped
++    PyErr_Warn(PyExc_RuntimeWarning, (char*)"lazy lookup is no longer supported");
++#endif
+ 
+     Py_RETURN_NONE;
+ }
+@@ -813,6 +830,7 @@ LIBCPPYY_INIT_FUNCTION(extern "C" void initlibcppyy, PY_MAJOR_VERSION, _, PY_MIN
+     PyEval_InitThreads();
+ #endif
+ 
++#if PY_VERSION_HEX < 0x030b0000
+ // prepare for lazyness (the insert is needed to capture the most generic lookup
+ // function, just in case ...)
+     PyObject* dict = PyDict_New();
+@@ -825,6 +843,7 @@ LIBCPPYY_INIT_FUNCTION(extern "C" void initlibcppyy, PY_MAJOR_VERSION, _, PY_MIN
+     gDictLookupOrg = (dict_lookup_func)((PyDictObject*)dict)->ma_lookup;
+ #endif
+     Py_DECREF(dict);
++#endif // PY_VERSION_HEX < 0x030b0000
+ 
+ // setup this module
+ #if PY_VERSION_HEX >= 0x03000000
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
+index f9e92f9c8c..5da48364ac 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
+@@ -45,7 +45,7 @@ struct InitCPyCppyy_NoneType_t {
+         ((PyVarObject&)CPyCppyy_NoneType).ob_size = 0;
+ 
+         CPyCppyy_NoneType.tp_name        = const_cast<char*>("CPyCppyy_NoneType");
+-        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE | Py_TPFLAGS_HAVE_GC;
++        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE;
+ 
+         CPyCppyy_NoneType.tp_traverse    = (traverseproc)0;
+         CPyCppyy_NoneType.tp_clear       = (inquiry)0;
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
+index 14ea1b83e8..1cf8f89bd2 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
+@@ -24,8 +24,10 @@
+ 
+ 
+ //- data _____________________________________________________________________
++#if PY_VERSION_HEX < 0x030b0000
+ dict_lookup_func CPyCppyy::gDictLookupOrg = 0;
+ bool CPyCppyy::gDictLookupActive = false;
++#endif
+ 
+ typedef std::map<std::string, std::string> TC2POperatorMapping_t;
+ static TC2POperatorMapping_t gC2POperatorMapping;
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
+index 6bc9314b99..2db76b31b0 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
+@@ -10,8 +10,10 @@ namespace CPyCppyy {
+ 
+ class PyCallable;
+ 
++#if PY_VERSION_HEX < 0x030b0000
+ extern dict_lookup_func gDictLookupOrg;
+ extern bool gDictLookupActive;
++#endif
+ 
+ // additional converter functions
+ unsigned long PyLongOrInt_AsULong(PyObject* pyobject);
+-- 
+2.36.1
+
diff --git a/root-test-timeout.patch b/root-test-timeout.patch
new file mode 100644
index 0000000..acbedcc
--- /dev/null
+++ b/root-test-timeout.patch
@@ -0,0 +1,48 @@
+From bfa7b7e59c3bcee4d6a5501c800b49334af326e5 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 3 Jul 2022 08:18:57 +0200
+Subject: [PATCH] Increase test timeout
+
+---
+ tmva/tmva/test/DNN/CMakeLists.txt | 2 +-
+ tutorials/CMakeLists.txt          | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tmva/tmva/test/DNN/CMakeLists.txt b/tmva/tmva/test/DNN/CMakeLists.txt
+index a9233682f6..653540e9e3 100644
+--- a/tmva/tmva/test/DNN/CMakeLists.txt
++++ b/tmva/tmva/test/DNN/CMakeLists.txt
+@@ -144,7 +144,7 @@ ROOT_ADD_TEST(TMVA-DNN-MethodDL-SGD-Optimization-Cpu COMMAND testMethodDLSGDOpti
+ 
+ # DNN - MethodDL Adam Optimization CPU
+ ROOT_EXECUTABLE(testMethodDLAdamOptimizationCpu TestMethodDLAdamOptimizationCpu.cxx LIBRARIES ${Libraries})
+-ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu)
++ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu TIMEOUT 1800)
+ 
+ # DNN - MethodDL Adagrad Optimization CPU
+ ROOT_EXECUTABLE(testMethodDLAdagradOptimizationCpu TestMethodDLAdagradOptimizationCpu.cxx LIBRARIES ${Libraries})
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index 520d682d2d..a846e7552f 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -532,7 +532,7 @@ foreach(t ${tutorials})
+ 
+    # These tests on ARM64 need much more than 20 minutes - increase the timeout
+    if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
+-     set(thisTestTimeout 2400) # 40m
++     set(thisTestTimeout 3000) # 50m
+    else()
+      set(thisTestTimeout 1200) # 20m
+    endif()
+@@ -566,7 +566,7 @@ foreach(t ${mpi_tutorials})
+ 
+    # These tests on ARM64 need much more than 20 minutes - increase the timeout
+    if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
+-     set(thisTestTimeout 2400) # 40m
++     set(thisTestTimeout 3000) # 50m
+    else()
+      set(thisTestTimeout 1200) # 20m
+    endif()
+-- 
+2.36.1
+
diff --git a/root.spec b/root.spec
index ff143a3..b92f433 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -130,6 +130,9 @@ Patch12:	%{name}-fix-compilation-with-gcc-12.patch
 #		Fix test failure on ppc64le and aarch64 with gcc 12
 #		https://github.com/root-project/root/pull/9601
 Patch13:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+#		Adjust some test timeouts
+#		https://github.com/root-project/root/pull/10886
+Patch14:	%{name}-test-timeout.patch
 #		Fixes for tmva-sofie test compilation
 #		https://github.com/root-project/root/pull/10117
 Patch15:	%{name}-blas-linking-and-ignore-prefix.patch
@@ -180,6 +183,10 @@ Patch31:	%{name}-core-base-test.patch
 Patch32:	%{name}-make-dyld-based-library-search-behavior-default.patch
 Patch33:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
 Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
+Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
+Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
+#		Backport additional python 3.11 fixes from CPyCppyy upstream
+Patch37:	%{name}-Python-3.11-support-backported-from-CPyCppyy.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2017,6 +2024,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -2037,6 +2045,9 @@ This package contains an ntuple extension for ROOT 7.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2911,6 +2922,30 @@ test-stressgraphics"
 %endif
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 37
+# Fails during garbage collection with Python 3.11
+# See: https://github.com/root-project/root/issues/10799
+excluded="${excluded}|\
+pyunittests-dataframe-histograms|\
+pyunittests-distrdf-unit-backend-test-dist|\
+pyunittests-distrdf-unit-test-buildranges|\
+pyunittests-distrdf-unit-test-friendinfo|\
+pyunittests-distrdf-unit-test-headnode|\
+pyunittests-pyroot-pyz-tfile-attrsyntax-get-writeobject-open|\
+pyunittests-pyroot-pyz-ttree-branch|\
+pyunittests-pyroot-pyz-ttree-branch-attr|\
+pyunittests-pyroot-pyz-ttree-iterable|\
+pyunittests-pyroot-pyz-ttree-setbranchaddress|\
+tutorial-dataframe-df014_CSVDataSource-py|\
+tutorial-dataframe-df017_vecOpsHEP-py|\
+tutorial-pyroot-h1ReadAndDraw-py|\
+tutorial-pyroot-hsimple-py|\
+tutorial-pyroot-ntuple1-py|\
+tutorial-pyroot-staff-py|\
+tutorial-pyroot-tornado-py|\
+tutorial-roofit-rf503_wspaceread-py"
+%endif
+
 # Filter out parts of tests that require remote network access
 GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix \
 make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
@@ -3938,6 +3973,13 @@ fi
 %endif
 
 %changelog
+* Sun Jul 03 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-3
+- Backport python 3.11 fixes from upstream
+- Backport additional python 3.11 fixes from CPyCppyy upstream
+- Exclude some failing tests on Fedora 37+
+  (segfaults during Python garbage collection with Python 3.11)
+- Adjust some test timeouts
+
 * Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 6.26.04-2
 - Rebuilt for Python 3.11
 

From b2e4c897d28dee2ecfb4e35c14b58889dd699206 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 18 Jul 2022 23:37:13 +0200
Subject: [PATCH 227/344] Don't use yuicompressor on Fedora (Java no longer
 available on ix86)

---
 root.spec | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b92f433..7f2fc8f 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -294,7 +294,12 @@ BuildRequires:	protobuf-devel >= 3.0
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
+%if %{?fedora}%{!?fedora:0}
+BuildRequires:	python3-rcssmin
+BuildRequires:	uglify-js
+%else
 BuildRequires:	yuicompressor
+%endif
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
 BuildRequires:	gmock-devel
@@ -2106,10 +2111,18 @@ unset QTINC
 
 # Minify script and style files
 for s in etc/notebook/JsMVA/js/*.js ; do
+%if %{?fedora}%{!?fedora:0}
+    uglifyjs ${s} -c -m -o ${s%.js}.min.js
+%else
     yuicompressor ${s} -o ${s%.js}.min.js
+%endif
 done
 for s in etc/notebook/JsMVA/css/*.css ; do
+%if %{?fedora}%{!?fedora:0}
+    python3 -m rcssmin < ${s} > ${s%.css}.min.css
+%else
     yuicompressor ${s} -o ${s%.css}.min.css
+%endif
 done
 
 # Avoid overlinking (this used to be the default with the old configure script)
@@ -3973,6 +3986,9 @@ fi
 %endif
 
 %changelog
+* Mon Jul 18 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-4
+- Don't use yuicompressor on Fedora (Java no longer available on ix86)
+
 * Sun Jul 03 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-3
 - Backport python 3.11 fixes from upstream
 - Backport additional python 3.11 fixes from CPyCppyy upstream

From ddfa4e1c9bb29155f99efc17c568eebde31eb026 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 00:57:28 +0000
Subject: [PATCH 228/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 7f2fc8f..e548c21 100644
--- a/root.spec
+++ b/root.spec
@@ -70,7 +70,7 @@
 Name:		root
 Version:	6.26.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3986,6 +3986,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.26.04-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon Jul 18 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.04-4
 - Don't use yuicompressor on Fedora (Java no longer available on ix86)
 

From 4a05ecac340abced89d52c6f4b54cc37e41f05ae Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 4 Aug 2022 05:35:58 +0200
Subject: [PATCH 229/344] Update to 6.26.06

---
 root-get-rid-of-lsb_release.patch | 245 ++++++++++++++++++++++++++++++
 root-old-gtest-compat.patch       |  34 +++++
 root.spec                         |  44 ++++--
 sources                           |   2 +-
 4 files changed, 311 insertions(+), 14 deletions(-)
 create mode 100644 root-get-rid-of-lsb_release.patch

diff --git a/root-get-rid-of-lsb_release.patch b/root-get-rid-of-lsb_release.patch
new file mode 100644
index 0000000..8dca2cc
--- /dev/null
+++ b/root-get-rid-of-lsb_release.patch
@@ -0,0 +1,245 @@
+From 2dde3d060aa21ff9d4a0612b991bd300b7704bdc Mon Sep 17 00:00:00 2001
+From: Axel Naumann <Axel.Naumann@cern.ch>
+Date: Fri, 22 Jul 2022 15:54:03 +0200
+Subject: [PATCH] [cmake,test] Get rid of `lsb_release`:
+
+It is available less and less often, and we do not actually
+benefit a lot from printing the distro (stress) or we can get
+the same info from /etc/os-release (cmake).
+---
+ cmake/modules/RootCPack.cmake        | 11 +++++++++--
+ math/mathcore/test/stressGoFTest.cxx |  4 ----
+ test/bench.cxx                       |  4 ----
+ test/stress.cxx                      |  4 ----
+ test/stressFit.cxx                   |  4 ----
+ test/stressGUI.cxx                   |  4 ----
+ test/stressGeometry.cxx              |  4 ----
+ test/stressGraphics.cxx              |  4 ----
+ test/stressHepix.cxx                 |  4 ----
+ test/stressHistFactory.cxx           |  4 ----
+ test/stressLinear.cxx                |  4 ----
+ test/stressRooFit.cxx                |  4 ----
+ test/stressRooStats.cxx              |  4 ----
+ test/stressTMVA.cxx                  |  4 ----
+ 14 files changed, 9 insertions(+), 54 deletions(-)
+
+diff --git a/cmake/modules/RootCPack.cmake b/cmake/modules/RootCPack.cmake
+index a960eb81fd..807eac6ef2 100644
+--- a/cmake/modules/RootCPack.cmake
++++ b/cmake/modules/RootCPack.cmake
+@@ -107,8 +107,15 @@ elseif(WIN32)
+     set(OS_NAME_VERSION win32)
+   endif()
+ else()
+-  execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE osid OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE)
++  if(EXISTS "/etc/os-release")
++    file(STRINGS /etc/os-release osid REGEX "^NAME=")
++    string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" osid "${osid}")
++    file(STRINGS /etc/os-release osvers REGEX "^VERSION_ID=")
++    string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" osvers "${osvers}")
++  else()
++    execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE osid OUTPUT_STRIP_TRAILING_WHITESPACE)
++    execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE)
++  endif()
+   if(osid MATCHES Ubuntu)
+     string(REGEX REPLACE "([0-9]+)[.].*" "\\1" osvers "${osvers}")
+     set(OS_NAME_VERSION Linux-ubuntu${osvers}-${arch})
+diff --git a/math/mathcore/test/stressGoFTest.cxx b/math/mathcore/test/stressGoFTest.cxx
+index a78ca99c90..5aa1b4ef70 100644
+--- a/math/mathcore/test/stressGoFTest.cxx
++++ b/math/mathcore/test/stressGoFTest.cxx
+@@ -56,10 +56,6 @@ struct GoFTStress {
+          TString sp = gSystem->GetFromPipe("uname -a");
+          sp.Resize(60);
+          printf("*  SYS: %s\n",sp.Data());
+-         if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-            sp = gSystem->GetFromPipe("lsb_release -d -s");
+-            printf("*  SYS: %s\n",sp.Data());
+-         }
+          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+             sp += " Mac OS X ";
+diff --git a/test/bench.cxx b/test/bench.cxx
+index 82bc537e05..e89024e9d9 100644
+--- a/test/bench.cxx
++++ b/test/bench.cxx
+@@ -295,10 +295,6 @@ int main(int argc, char **argv)
+       TString sp = gSystem->GetFromPipe("uname -a");
+       sp.Resize(60);
+       printf("*  SYS: %s\n",sp.Data());
+-      if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         printf("*  SYS: %s\n",sp.Data());
+-      }
+       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+diff --git a/test/stress.cxx b/test/stress.cxx
+index d3087fdd56..29dba1625d 100644
+--- a/test/stress.cxx
++++ b/test/stress.cxx
+@@ -200,10 +200,6 @@ void stress(Int_t nevent, Int_t style = 1,
+       TString sp = gSystem->GetFromPipe("uname -a");
+       sp.Resize(60);
+       printf("*  SYS: %s\n",sp.Data());
+-      if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         printf("*  SYS: %s\n",sp.Data());
+-      }
+       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+diff --git a/test/stressFit.cxx b/test/stressFit.cxx
+index 667142eff9..80bbd0200f 100644
+--- a/test/stressFit.cxx
++++ b/test/stressFit.cxx
+@@ -646,10 +646,6 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
+      TString sp = gSystem->GetFromPipe("uname -a");
+      sp.Resize(60);
+      printf("*  SYS: %s\n",sp.Data());
+-     if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-        sp = gSystem->GetFromPipe("lsb_release -d -s");
+-        printf("*  SYS: %s\n",sp.Data());
+-     }
+      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+         sp += " Mac OS X ";
+diff --git a/test/stressGUI.cxx b/test/stressGUI.cxx
+index 1a92df5341..9daae5f5fe 100644
+--- a/test/stressGUI.cxx
++++ b/test/stressGUI.cxx
+@@ -307,10 +307,6 @@ void stressGUI()
+          TString sp = gSystem->GetFromPipe("uname -a");
+          sp.Resize(60);
+          printf("*  SYS: %s\n",sp.Data());
+-         if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-            sp = gSystem->GetFromPipe("lsb_release -d -s");
+-            printf("*  SYS: %s\n",sp.Data());
+-         }
+          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+             sp += " Mac OS X ";
+diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
+index 5e81f5f2ca..2dc366cbf8 100644
+--- a/test/stressGeometry.cxx
++++ b/test/stressGeometry.cxx
+@@ -295,10 +295,6 @@ void stressGeometry(const char *exp="*", Bool_t generate_ref=kFALSE, Bool_t vecg
+          TString sp = gSystem->GetFromPipe("uname -a");
+          sp.Resize(60);
+          printf("*  SYS: %s\n",sp.Data());
+-         if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-            sp = gSystem->GetFromPipe("lsb_release -d -s");
+-            printf("*  SYS: %s\n",sp.Data());
+-         }
+          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+             sp += " Mac OS X ";
+diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
+index 5fe958774d..8b6aa9af9a 100644
+--- a/test/stressGraphics.cxx
++++ b/test/stressGraphics.cxx
+@@ -419,10 +419,6 @@ void stressGraphics(Int_t verbose = 0)
+          TString sp = gSystem->GetFromPipe("uname -a");
+          sp.Resize(60);
+          printf("*  SYS: %s\n",sp.Data());
+-         if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-            sp = gSystem->GetFromPipe("lsb_release -d -s");
+-            printf("*  SYS: %s\n",sp.Data());
+-         }
+          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+             sp += " Mac OS X ";
+diff --git a/test/stressHepix.cxx b/test/stressHepix.cxx
+index d8d2a65a64..01dfc67a54 100644
+--- a/test/stressHepix.cxx
++++ b/test/stressHepix.cxx
+@@ -143,10 +143,6 @@ int main(int argc, char **argv)
+       TString sp = gSystem->GetFromPipe("uname -a");
+       sp.Resize(60);
+       printf("*  SYS: %s\n",sp.Data());
+-      if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         printf("*  SYS: %s\n",sp.Data());
+-      }
+       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+diff --git a/test/stressHistFactory.cxx b/test/stressHistFactory.cxx
+index b84fa70f86..ec6deac031 100644
+--- a/test/stressHistFactory.cxx
++++ b/test/stressHistFactory.cxx
+@@ -139,10 +139,6 @@ Int_t stressHistFactory(const char* refFile, Bool_t writeRef, Int_t verbose, Boo
+    if (UNIX) {
+       TString sp = gSystem->GetFromPipe("uname -a");
+       cout << "* SYS: " << sp << endl;
+-      if (strstr(gSystem->GetBuildNode(), "Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         cout << "* SYS: " << sp << endl;
+-      }
+       if (strstr(gSystem->GetBuildNode(), "Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
+index ce2e1af23d..e34ddf85a2 100644
+--- a/test/stressLinear.cxx
++++ b/test/stressLinear.cxx
+@@ -296,10 +296,6 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
+      TString sp = gSystem->GetFromPipe("uname -a");
+      sp.Resize(60);
+      printf("*  SYS: %s\n",sp.Data());
+-     if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-        sp = gSystem->GetFromPipe("lsb_release -d -s");
+-        printf("*  SYS: %s\n",sp.Data());
+-     }
+      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+         sp += " Mac OS X ";
+diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
+index 18e214ec0c..4f7c5a3d83 100644
+--- a/test/stressRooFit.cxx
++++ b/test/stressRooFit.cxx
+@@ -197,10 +197,6 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
+      TString sp = gSystem->GetFromPipe("uname -a");
+      sp.Resize(60);
+      printf("*  SYS: %s\n",sp.Data());
+-     if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-        sp = gSystem->GetFromPipe("lsb_release -d -s");
+-        printf("*  SYS: %s\n",sp.Data());
+-     }
+      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+         sp += " Mac OS X ";
+diff --git a/test/stressRooStats.cxx b/test/stressRooStats.cxx
+index 35598b5919..adb3dc4cd8 100644
+--- a/test/stressRooStats.cxx
++++ b/test/stressRooStats.cxx
+@@ -232,10 +232,6 @@ Int_t stressRooStats(const char* refFile, Bool_t writeRef, Int_t verbose, Bool_t
+    if (UNIX) {
+       TString sp = gSystem->GetFromPipe("uname -a");
+       cout << "* SYS: " << sp << endl;
+-      if (strstr(gSystem->GetBuildNode(), "Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         cout << "* SYS: " << sp << endl;
+-      }
+       if (strstr(gSystem->GetBuildNode(), "Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
+index f7638a73f6..22e3feaf65 100644
+--- a/test/stressTMVA.cxx
++++ b/test/stressTMVA.cxx
+@@ -3193,10 +3193,6 @@ int main(int argc, char **argv)
+       TString sp = gSystem->GetFromPipe("uname -a");
+       sp.Resize(60);
+       printf("*  SYS: %s\n",sp.Data());
+-      if (strstr(gSystem->GetBuildNode(),"Linux")) {
+-         sp = gSystem->GetFromPipe("lsb_release -d -s");
+-         printf("*  SYS: %s\n",sp.Data());
+-      }
+       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
+          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
+          sp += " Mac OS X ";
+-- 
+2.37.1
+
diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
index e9f4140..7bce796 100644
--- a/root-old-gtest-compat.patch
+++ b/root-old-gtest-compat.patch
@@ -441,3 +441,37 @@ index 7b513a858b..bea39636ce 100644
 -- 
 2.35.1
 
+From cae450e0210fe584ef30d155a4217cfe2f5aa358 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 30 Jul 2022 17:05:31 +0200
+Subject: [PATCH] Backward compatibility with older googletest versions in EPEL
+
+---
+ tree/dataframe/test/dataframe_datasetspec.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tree/dataframe/test/dataframe_datasetspec.cxx b/tree/dataframe/test/dataframe_datasetspec.cxx
+index b422dcf28b..14329102af 100644
+--- a/tree/dataframe/test/dataframe_datasetspec.cxx
++++ b/tree/dataframe/test/dataframe_datasetspec.cxx
+@@ -1,4 +1,9 @@
+ #include <gtest/gtest.h>
++
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <ROOT/RDataFrame.hxx>
+ #include <ROOT/RVec.hxx>
+ #include <ROOT/RDFHelpers.hxx>
+@@ -36,6 +41,7 @@ protected:
+ 
+    ~RDatasetSpecTest() {}
+ 
++public:
+    static void SetUpTestCase()
+    {
+       auto dfWriter0 = RDataFrame(5).Define("z", [](ULong64_t e) { return e + 100; }, {"rdfentry_"});
+-- 
+2.37.1
+
diff --git a/root.spec b/root.spec
index e548c21..89a6c6e 100644
--- a/root.spec
+++ b/root.spec
@@ -68,9 +68,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.26.04
+Version:	6.26.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -187,6 +187,8 @@ Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 #		Backport additional python 3.11 fixes from CPyCppyy upstream
 Patch37:	%{name}-Python-3.11-support-backported-from-CPyCppyy.patch
+#		Backport
+Patch38:	%{name}-get-rid-of-lsb_release.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2053,6 +2055,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2096,6 +2099,17 @@ sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
+%if %{?rhel}%{!?rhel:0} == 7 || %{?rhel}%{!?rhel:0} == 8
+# Allow older json on EPEL 7/8
+sed 's!nlohmann_json 3.9! nlohmann_json 3.6!' \
+    -i cmake/modules/SearchInstalledSoftware.cmake
+%endif
+
+%if %{?rhel}%{!?rhel:0} == 7
+# On EPEL 7 disable test that fails to compile
+sed 's!.*dataframe_datasetspec!### &!' -i tree/dataframe/test/CMakeLists.txt
+%endif
+
 %build
 %if %{?rhel}%{!?rhel:0} == 7
 . /opt/rh/devtoolset-8/enable
@@ -2630,14 +2644,6 @@ pushd tmva/tmva/test/envelope
 ln -s ../../../../../files files
 popd
 
-# Some of the tests call lsb_release -d -s
-# Provide a replacement script instead of build requiring redhat-lsb-core
-cat > bin/lsb_release << EOF
-#! /bin/sh
-cat /etc/redhat-release
-EOF
-chmod +x bin/lsb_release
-
 # Exclude some tests that can not be run
 #
 # - test-stressIOPlugins-*
@@ -2764,13 +2770,20 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
+%ifarch %{ix86}
+# Test failing on ix86 only
+# - gtest-tree-dataframe-test-dataframe-snapshot
+excluded="${excluded}|gtest-tree-dataframe-test-dataframe-snapshot"
+%endif
+
 %ifarch %{ix86} %{arm}
 %if %{?fedora}%{!?fedora:0} <= 35
 # Tests failing on 32 bit architectures (dataframe)
-#
+# - gtest-roofit-RDataFrameHelpers-test-testActionHelpers
 # - gtest-tree-dataframe-test-dataframe-*
 # - gtest-tree-dataframe-test-datasource-*
 excluded="${excluded}|\
+gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
 gtest-tree-dataframe-test-dataframe|\
 gtest-tree-dataframe-test-datasource"
 %endif
@@ -2843,7 +2856,6 @@ tutorial-dataframe-df032_MakeNumpyDataFrame-py"
 # - tutorial-pyroot-formula1-py
 excluded="${excluded}|\
 gtest-tmva-tmva-test-branchlessForest|\
-tutorial-gl-gltf3|\
 tutorial-math-kdTreeBinning|\
 tutorial-unfold-testUnfold7c|\
 tutorial-hist-fillrandom-py|\
@@ -2951,12 +2963,15 @@ pyunittests-pyroot-pyz-ttree-iterable|\
 pyunittests-pyroot-pyz-ttree-setbranchaddress|\
 tutorial-dataframe-df014_CSVDataSource-py|\
 tutorial-dataframe-df017_vecOpsHEP-py|\
+tutorial-pyroot-fit1-py|\
 tutorial-pyroot-h1ReadAndDraw-py|\
 tutorial-pyroot-hsimple-py|\
+tutorial-pyroot-hsum-py|\
 tutorial-pyroot-ntuple1-py|\
 tutorial-pyroot-staff-py|\
 tutorial-pyroot-tornado-py|\
-tutorial-roofit-rf503_wspaceread-py"
+tutorial-roofit-rf503_wspaceread-py|\
+tutorial-roofit-rf512_wsfactory_oper-py"
 %endif
 
 # Filter out parts of tests that require remote network access
@@ -3986,6 +4001,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 30 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-1
+- Update to 6.26.06
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.26.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 0ac5ec5..bd0e6ae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.04.tar.xz) = 0ca0efa082cedce8017293d06ec92c76948f70b6b565efbc6cf4cc78da54017b5022d249dd69abd3588fb874942437318f9a136ed4b144adc820ff41fc1154ee
+SHA512 (root-6.26.06.tar.xz) = 6002de6c8b1f43647356d008ca4ed369107ed67ba129271f01180544ad38120f0a26180cd297065fab3669e55671b7ceb53a5ead0c4f61b2ed31b68753bc8adb
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From ee45de2db7a5920c94903a76db4b879cba983b12 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 17 Aug 2022 23:19:25 +0200
Subject: [PATCH 230/344] Compatibility with nlohmann json 3.11+ Enable gfal
 support in EPEL 9 (gfal2 now available)

---
 root-json-3.11.patch                          | 181 ++++++++++++++++++
 ...ct-against-empty-COMPILE_DEFINITIONS.patch |  63 ++++++
 root-roofit-overflow.patch                    |  59 ------
 root.spec                                     |  17 +-
 4 files changed, 255 insertions(+), 65 deletions(-)
 create mode 100644 root-json-3.11.patch
 create mode 100644 root-protect-against-empty-COMPILE_DEFINITIONS.patch
 delete mode 100644 root-roofit-overflow.patch

diff --git a/root-json-3.11.patch b/root-json-3.11.patch
new file mode 100644
index 0000000..359de6d
--- /dev/null
+++ b/root-json-3.11.patch
@@ -0,0 +1,181 @@
+From 154f930e1f4f05a268782f67bb77c5fb327fd408 Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Wed, 17 Aug 2022 12:15:12 +0200
+Subject: [PATCH 1/4] [tmva][sofie] Add missing cassert includes
+
+---
+ tmva/sofie/inc/TMVA/ROperator_Reshape.hxx | 1 +
+ tmva/sofie/inc/TMVA/ROperator_Slice.hxx   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx b/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
+index ab24d5bc169f..9ad9eff72189 100644
+--- a/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
++++ b/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
+@@ -5,6 +5,7 @@
+ #include "TMVA/ROperator.hxx"
+ #include "TMVA/RModel.hxx"
+ 
++#include <cassert>
+ #include <sstream>
+ 
+ namespace TMVA{
+diff --git a/tmva/sofie/inc/TMVA/ROperator_Slice.hxx b/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
+index c6496f291c2c..946523e0832f 100644
+--- a/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
++++ b/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
+@@ -5,6 +5,7 @@
+ #include "TMVA/ROperator.hxx"
+ #include "TMVA/RModel.hxx"
+ 
++#include <cassert>
+ #include <sstream>
+ 
+ namespace TMVA{
+
+From 6fc3c85be94f9fe117c07301302dccd8b7554744 Mon Sep 17 00:00:00 2001
+From: Vassil Vassilev <v.g.vassilev@gmail.com>
+Date: Fri, 5 Nov 2021 19:46:49 +0000
+Subject: [PATCH 2/4] [cxxmodules] Enable a module if json is present.
+
+(cherry picked from commit 0cdfa69f216854d7319a6a31a61021a1e5ac45de)
+---
+ core/clingutils/CMakeLists.txt                  | 4 +++-
+ graf3d/eve7/CMakeLists.txt                      | 2 ++
+ interpreter/cling/include/cling/json.modulemap  | 4 ++++
+ interpreter/cling/lib/Interpreter/CIFactory.cpp | 6 ++++++
+ 4 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 interpreter/cling/include/cling/json.modulemap
+
+diff --git a/core/clingutils/CMakeLists.txt b/core/clingutils/CMakeLists.txt
+index f1573f31dfa7..13632a09dd3a 100644
+--- a/core/clingutils/CMakeLists.txt
++++ b/core/clingutils/CMakeLists.txt
+@@ -108,7 +108,9 @@ set(clinginclude ${CMAKE_SOURCE_DIR}/interpreter/cling/include)
+ 
+ set(custom_modulemaps)
+ if (runtime_cxxmodules)
+-  set(custom_modulemaps boost.modulemap tinyxml2.modulemap cuda.modulemap module.modulemap.build)
++  set(custom_modulemaps boost.modulemap tinyxml2.modulemap cuda.modulemap
++                        module.modulemap.build
++                        json.modulemap)
+   # FIXME: We should install vc.modulemap only when Vc is found (Vc_FOUND) but
+   # some systems install it under /usr/include/Vc/Vc which allows rootcling to
+   # discover it and assert that the modulemap is not found.
+diff --git a/graf3d/eve7/CMakeLists.txt b/graf3d/eve7/CMakeLists.txt
+index 0a87d4ecca62..332ce77eb8ae 100644
+--- a/graf3d/eve7/CMakeLists.txt
++++ b/graf3d/eve7/CMakeLists.txt
+@@ -125,6 +125,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve
+     src/REveViewer.cxx
+     src/REveVSD.cxx
+     src/REveVSDStructs.cxx
++  DICTIONARY_OPTIONS
++    -mByproduct Json
+   DEPENDENCIES
+     Core
+     Geom
+diff --git a/interpreter/cling/include/cling/json.modulemap b/interpreter/cling/include/cling/json.modulemap
+new file mode 100644
+index 000000000000..758cf2d779e2
+--- /dev/null
++++ b/interpreter/cling/include/cling/json.modulemap
+@@ -0,0 +1,4 @@
++module Json {
++  header "nlohmann/json.hpp"
++  export *
++}
+diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
+index 4ce0d75c92ed..a5cbea75fb57 100644
+--- a/interpreter/cling/lib/Interpreter/CIFactory.cpp
++++ b/interpreter/cling/lib/Interpreter/CIFactory.cpp
+@@ -581,6 +581,7 @@ namespace {
+     llvm::SmallString<256> tinyxml2IncLoc(getIncludePathForHeader(HS, "tinyxml2.h"));
+     llvm::SmallString<256> cudaIncLoc(getIncludePathForHeader(HS, "cuda.h"));
+     llvm::SmallString<256> vcVcIncLoc(getIncludePathForHeader(HS, "Vc/Vc"));
++    llvm::SmallString<256> jsonIncLoc(getIncludePathForHeader(HS, "nlohmann/json.hpp"));
+     llvm::SmallString<256> clingIncLoc(getIncludePathForHeader(HS,
+                                         "cling/Interpreter/RuntimeUniverse.h"));
+ 
+@@ -706,6 +707,11 @@ namespace {
+                               clingIncLoc.str(), MOverlay,
+                               /*RegisterModuleMap=*/ true,
+                               /*AllowModulemapOverride=*/ false);
++    if (!jsonIncLoc.empty())
++      maybeAppendOverlayEntry(jsonIncLoc.str(), "json.modulemap",
++                              clingIncLoc.str(), MOverlay,
++                              /*RegisterModuleMap=*/ true,
++                              /*AllowModulemapOverride=*/ false);
+     if (!boostIncLoc.empty()) {
+       // Add the modulemap in the include/boost folder not in include.
+       llvm::sys::path::append(boostIncLoc, "boost");
+
+From 853eab0c8acf6c689ed413bb02bc8492d95916dc Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Wed, 17 Aug 2022 11:39:56 +0200
+Subject: [PATCH 3/4] [eve7] Properly include nlohmann/json.hpp
+
+Now that we have a module, this should work.
+
+Fixes #11130
+---
+ graf3d/eve7/inc/ROOT/REveElement.hxx | 18 ++----------------
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
+index 2a127888a2c5..4163129c77ce 100644
+--- a/graf3d/eve7/inc/ROOT/REveElement.hxx
++++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
+@@ -16,26 +16,12 @@
+ #include <ROOT/REveVector.hxx>
+ #include <ROOT/REveProjectionBases.hxx>
+ 
+-#include <map>
++#include <nlohmann/json.hpp>
++
+ #include <memory>
+ 
+ class TGeoMatrix;
+ 
+-namespace nlohmann {
+-template<typename T, typename SFINAE>
+-struct adl_serializer;
+-
+-template <template <typename U, typename V, typename... Args> class ObjectType,
+-          template <typename U, typename... Args> class ArrayType, class StringType, class BooleanType,
+-          class NumberIntegerType, class NumberUnsignedType, class NumberFloatType,
+-          template <typename U> class AllocatorType, template <typename T, typename SFINAE = void> class JSONSerializer,
+-          class BinaryType>
+-class basic_json;
+-
+-using json = basic_json<std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t, double, std::allocator,
+-                        adl_serializer, std::vector<std::uint8_t>>;
+-} // namespace nlohmann
+-
+ namespace ROOT {
+ namespace Experimental {
+ 
+
+From a301bc2cb01e17e242174fadffcb1bffe83f22db Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Wed, 17 Aug 2022 11:41:10 +0200
+Subject: [PATCH 4/4] [eve7] Add missing includes to REveElement.hxx
+
+---
+ graf3d/eve7/inc/ROOT/REveElement.hxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
+index 4163129c77ce..369489bb17ac 100644
+--- a/graf3d/eve7/inc/ROOT/REveElement.hxx
++++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
+@@ -19,6 +19,9 @@
+ #include <nlohmann/json.hpp>
+ 
+ #include <memory>
++#include <list>
++#include <set>
++#include <string>
+ 
+ class TGeoMatrix;
+ 
diff --git a/root-protect-against-empty-COMPILE_DEFINITIONS.patch b/root-protect-against-empty-COMPILE_DEFINITIONS.patch
new file mode 100644
index 0000000..7b7fd89
--- /dev/null
+++ b/root-protect-against-empty-COMPILE_DEFINITIONS.patch
@@ -0,0 +1,63 @@
+From 08ab7e03061e551647d707637957252d121f9c39 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Tue, 21 Sep 2021 15:15:17 +0200
+Subject: [PATCH] [cmake] Protect against empty `COMPILE_DEFINITIONS` in
+ rootcint command
+
+In the `rootcint` command defined in `RootMacros.cmake`, the
+`COMPILE_DEFINITIONS` from the target are forwarded as compiler flags.
+
+The `COMPILE_DEFINITIONS` are stored in the `module_defs` variable with
+a generator expression:
+
+```
+set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
+```
+
+Then, the definitions are added to the rootcint command with this
+expression:
+
+```
+"$<$<BOOL:${module_defs}>:-D$<JOIN:${module_defs},;-D>>"
+```
+
+This code was almost copied exactly from the CMake documentation
+example:
+
+https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
+
+In particular, the `BOOL` check makes sure that the if the target
+property is empty, we will not get a bare `-D` with nothing after it,
+corrupting the rootcint command.
+
+However, there is no protextion against the case where the
+`COMPILE_DEFINITIONS` target property is not empty, but its elements are
+empty strings! This happened to me in my recent build.
+
+Instead of trying to figure out where the empty strings are added to the
+`COMPILE_DEFINITIONS`, it is better to also protect against empty target
+property elements in the CMake generator expressions, which is
+implemented in this commit.
+---
+ cmake/modules/RootMacros.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
+index c52c23d29a..c62ffc2152 100644
+--- a/cmake/modules/RootMacros.cmake
++++ b/cmake/modules/RootMacros.cmake
+@@ -628,7 +628,10 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
+       # and list exclusion for generator expressions is too complex.
+       set(module_incs $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INCLUDE_DIRECTORIES>>)
+       set(module_sysincs $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>>)
+-      set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
++      # The COMPILE_DEFINITIONS list might contain empty elements. These are
++      # removed with the FILTER generator expression, excluding elements that
++      # match the ^$ regexp (only matches empty strings).
++      set(module_defs "$<FILTER:$<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>,EXCLUDE,^$>")
+     endif()
+   endif()
+ 
+-- 
+2.37.2
+
diff --git a/root-roofit-overflow.patch b/root-roofit-overflow.patch
deleted file mode 100644
index e368aa9..0000000
--- a/root-roofit-overflow.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8b6a10aefa5ae660e9d13a8e55933125b257ab6c Mon Sep 17 00:00:00 2001
-From: moneta <lorenzo.moneta@cern.ch>
-Date: Fri, 25 Feb 2022 09:54:40 +0100
-Subject: [PATCH] Fix an array overflow in interpolating RooHistPdf when the
- interpolation order is >= 10.
-
----
- roofit/roofitcore/src/RooDataHist.cxx | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
-index c293a8fbb1..2159f73093 100644
---- a/roofit/roofitcore/src/RooDataHist.cxx
-+++ b/roofit/roofitcore/src/RooDataHist.cxx
-@@ -1206,9 +1206,9 @@ double RooDataHist::weightInterpolated(const RooArgSet& bin, int intOrder, bool
- 
-     auto idxMultY = _idxMult[varInfo.realVarIdx2];
-     auto offsetIdx = centralIdx - idxMultY * ybinC;
--    
--    double yarr[10] = {} ;
--    double xarr[10] = {} ;
-+
-+    std::vector<double> yarr(intOrder+1);
-+    std::vector<double> xarr(intOrder+1);
-     for (int i=ybinLo ; i<=intOrder+ybinLo ; i++) {
-       int ibin ;
-       if (i>=0 && i<ybinM) {
-@@ -1236,7 +1236,7 @@ double RooDataHist::weightInterpolated(const RooArgSet& bin, int intOrder, bool
-       for (int q=0; q<=intOrder ; q++) cout << yarr[q] << " " ;
-       cout << endl ;
-     }
--    wInt = RooMath::interpolate(xarr,yarr,intOrder+1,yval) ;
-+    wInt = RooMath::interpolate(xarr.data(),yarr.data(),intOrder+1,yval) ;
- 
-   } else {
- 
-@@ -1344,8 +1344,8 @@ double RooDataHist::interpolateDim(int iDim, double xval, size_t centralIdx, int
-   auto idxMult = _idxMult[iDim];
-   auto offsetIdx = centralIdx - idxMult * fbinC;
- 
--  double yarr[10] ;
--  double xarr[10] ;
-+  std::vector<double> yarr(intOrder+1) ;
-+  std::vector<double> xarr(intOrder+1);
-   for (int i=fbinLo ; i<=intOrder+fbinLo ; i++) {
-     int ibin ;
-     if (i>=0 && i<fbinM) {
-@@ -1383,7 +1383,7 @@ double RooDataHist::interpolateDim(int iDim, double xval, size_t centralIdx, int
-       }
-     }
-   }
--  return RooMath::interpolate(xarr,yarr,intOrder+1,xval) ;
-+  return RooMath::interpolate(xarr.data(),yarr.data(),intOrder+1,xval) ;
- }
- 
- 
--- 
-2.35.1
-
diff --git a/root.spec b/root.spec
index 89a6c6e..b26ff29 100644
--- a/root.spec
+++ b/root.spec
@@ -33,12 +33,7 @@
 
 %global webgui 1
 
-%if %{?rhel}%{!?rhel:0} == 9
-# GFAL2 not available in EPEL 9
-%global gfal2 0
-%else
 %global gfal2 1
-%endif
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
 # The SOFIE parser requires protobuf 3.0
@@ -70,7 +65,7 @@
 Name:		root
 Version:	6.26.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -189,6 +184,10 @@ Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 Patch37:	%{name}-Python-3.11-support-backported-from-CPyCppyy.patch
 #		Backport
 Patch38:	%{name}-get-rid-of-lsb_release.patch
+Patch39:	%{name}-protect-against-empty-COMPILE_DEFINITIONS.patch
+#		Compatibility with nlohmann json 3.11+
+#		https://github.com/root-project/root/pull/11202
+Patch40:	root-json-3.11.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2056,6 +2055,8 @@ This package contains an ntuple extension for ROOT 7.
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
+%patch40 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -4001,6 +4002,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 17 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-2
+- Compatibility with nlohmann json 3.11+
+- Enable gfal support in EPEL 9 (gfal2 now available)
+
 * Sat Jul 30 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-1
 - Update to 6.26.06
 

From 7fb47abbc9ccaf733453afd4fd9ec8edf16a2d4f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 19 Aug 2022 14:16:54 +0200
Subject: [PATCH 231/344] Use the json 3.11 fix upstream settled on

---
 root-json-3.11.patch | 250 ++++++++++++++++++-------------------------
 root.spec            |   7 +-
 2 files changed, 109 insertions(+), 148 deletions(-)

diff --git a/root-json-3.11.patch b/root-json-3.11.patch
index 359de6d..d5c35be 100644
--- a/root-json-3.11.patch
+++ b/root-json-3.11.patch
@@ -1,181 +1,139 @@
-From 154f930e1f4f05a268782f67bb77c5fb327fd408 Mon Sep 17 00:00:00 2001
+From aa68881d612060a131b103ffcadc4b0f2185c49e Mon Sep 17 00:00:00 2001
 From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Wed, 17 Aug 2022 12:15:12 +0200
-Subject: [PATCH 1/4] [tmva][sofie] Add missing cassert includes
+Date: Thu, 18 Aug 2022 08:57:44 +0200
+Subject: [PATCH 1/3] [eve7] Add missing includes to REveElement.hxx
 
 ---
- tmva/sofie/inc/TMVA/ROperator_Reshape.hxx | 1 +
- tmva/sofie/inc/TMVA/ROperator_Slice.hxx   | 1 +
- 2 files changed, 2 insertions(+)
+ graf3d/eve7/inc/ROOT/REveElement.hxx | 5 +++++
+ 1 file changed, 5 insertions(+)
 
-diff --git a/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx b/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
-index ab24d5bc169f..9ad9eff72189 100644
---- a/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
-+++ b/tmva/sofie/inc/TMVA/ROperator_Reshape.hxx
-@@ -5,6 +5,7 @@
- #include "TMVA/ROperator.hxx"
- #include "TMVA/RModel.hxx"
+diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
+index 2a127888a2c5..19fad1ec4f77 100644
+--- a/graf3d/eve7/inc/ROOT/REveElement.hxx
++++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
+@@ -18,6 +18,11 @@
  
-+#include <cassert>
- #include <sstream>
+ #include <map>
+ #include <memory>
++#include <list>
++#include <ostream>
++#include <set>
++#include <string>
++#include <vector>
  
- namespace TMVA{
-diff --git a/tmva/sofie/inc/TMVA/ROperator_Slice.hxx b/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
-index c6496f291c2c..946523e0832f 100644
---- a/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
-+++ b/tmva/sofie/inc/TMVA/ROperator_Slice.hxx
-@@ -5,6 +5,7 @@
- #include "TMVA/ROperator.hxx"
- #include "TMVA/RModel.hxx"
+ class TGeoMatrix;
  
-+#include <cassert>
- #include <sstream>
- 
- namespace TMVA{
 
-From 6fc3c85be94f9fe117c07301302dccd8b7554744 Mon Sep 17 00:00:00 2001
-From: Vassil Vassilev <v.g.vassilev@gmail.com>
-Date: Fri, 5 Nov 2021 19:46:49 +0000
-Subject: [PATCH 2/4] [cxxmodules] Enable a module if json is present.
-
-(cherry picked from commit 0cdfa69f216854d7319a6a31a61021a1e5ac45de)
----
- core/clingutils/CMakeLists.txt                  | 4 +++-
- graf3d/eve7/CMakeLists.txt                      | 2 ++
- interpreter/cling/include/cling/json.modulemap  | 4 ++++
- interpreter/cling/lib/Interpreter/CIFactory.cpp | 6 ++++++
- 4 files changed, 15 insertions(+), 1 deletion(-)
- create mode 100644 interpreter/cling/include/cling/json.modulemap
-
-diff --git a/core/clingutils/CMakeLists.txt b/core/clingutils/CMakeLists.txt
-index f1573f31dfa7..13632a09dd3a 100644
---- a/core/clingutils/CMakeLists.txt
-+++ b/core/clingutils/CMakeLists.txt
-@@ -108,7 +108,9 @@ set(clinginclude ${CMAKE_SOURCE_DIR}/interpreter/cling/include)
- 
- set(custom_modulemaps)
- if (runtime_cxxmodules)
--  set(custom_modulemaps boost.modulemap tinyxml2.modulemap cuda.modulemap module.modulemap.build)
-+  set(custom_modulemaps boost.modulemap tinyxml2.modulemap cuda.modulemap
-+                        module.modulemap.build
-+                        json.modulemap)
-   # FIXME: We should install vc.modulemap only when Vc is found (Vc_FOUND) but
-   # some systems install it under /usr/include/Vc/Vc which allows rootcling to
-   # discover it and assert that the modulemap is not found.
-diff --git a/graf3d/eve7/CMakeLists.txt b/graf3d/eve7/CMakeLists.txt
-index 0a87d4ecca62..332ce77eb8ae 100644
---- a/graf3d/eve7/CMakeLists.txt
-+++ b/graf3d/eve7/CMakeLists.txt
-@@ -125,6 +125,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve
-     src/REveViewer.cxx
-     src/REveVSD.cxx
-     src/REveVSDStructs.cxx
-+  DICTIONARY_OPTIONS
-+    -mByproduct Json
-   DEPENDENCIES
-     Core
-     Geom
-diff --git a/interpreter/cling/include/cling/json.modulemap b/interpreter/cling/include/cling/json.modulemap
-new file mode 100644
-index 000000000000..758cf2d779e2
---- /dev/null
-+++ b/interpreter/cling/include/cling/json.modulemap
-@@ -0,0 +1,4 @@
-+module Json {
-+  header "nlohmann/json.hpp"
-+  export *
-+}
-diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
-index 4ce0d75c92ed..a5cbea75fb57 100644
---- a/interpreter/cling/lib/Interpreter/CIFactory.cpp
-+++ b/interpreter/cling/lib/Interpreter/CIFactory.cpp
-@@ -581,6 +581,7 @@ namespace {
-     llvm::SmallString<256> tinyxml2IncLoc(getIncludePathForHeader(HS, "tinyxml2.h"));
-     llvm::SmallString<256> cudaIncLoc(getIncludePathForHeader(HS, "cuda.h"));
-     llvm::SmallString<256> vcVcIncLoc(getIncludePathForHeader(HS, "Vc/Vc"));
-+    llvm::SmallString<256> jsonIncLoc(getIncludePathForHeader(HS, "nlohmann/json.hpp"));
-     llvm::SmallString<256> clingIncLoc(getIncludePathForHeader(HS,
-                                         "cling/Interpreter/RuntimeUniverse.h"));
- 
-@@ -706,6 +707,11 @@ namespace {
-                               clingIncLoc.str(), MOverlay,
-                               /*RegisterModuleMap=*/ true,
-                               /*AllowModulemapOverride=*/ false);
-+    if (!jsonIncLoc.empty())
-+      maybeAppendOverlayEntry(jsonIncLoc.str(), "json.modulemap",
-+                              clingIncLoc.str(), MOverlay,
-+                              /*RegisterModuleMap=*/ true,
-+                              /*AllowModulemapOverride=*/ false);
-     if (!boostIncLoc.empty()) {
-       // Add the modulemap in the include/boost folder not in include.
-       llvm::sys::path::append(boostIncLoc, "boost");
-
-From 853eab0c8acf6c689ed413bb02bc8492d95916dc Mon Sep 17 00:00:00 2001
+From 395d387b115249a1cab38dbe2fde77ff308a29a5 Mon Sep 17 00:00:00 2001
 From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Wed, 17 Aug 2022 11:39:56 +0200
-Subject: [PATCH 3/4] [eve7] Properly include nlohmann/json.hpp
+Date: Thu, 18 Aug 2022 09:13:14 +0200
+Subject: [PATCH 2/3] [eve7] Include json_fwd.hpp if available
 
-Now that we have a module, this should work.
+Version 3.11 of nlohmann/json introduced "versioned, ABI-tagged inline
+namespace"s, which breaks our forward declaration. Fortunately, we can
+assume the json_fwd.hpp header to be present starting from that same
+version because the JSON_MultipleHeaders option now defaults to ON and
+even if not, json_fwd.hpp is installed since patch version 3.11.2. For
+earlier versions, both methods work but json_fwd.hpp isn't guaranteed
+to be installed. Still use it if available.
 
 Fixes #11130
 ---
- graf3d/eve7/inc/ROOT/REveElement.hxx | 18 ++----------------
- 1 file changed, 2 insertions(+), 16 deletions(-)
+ graf3d/eve7/inc/ROOT/REveElement.hxx | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
-index 2a127888a2c5..4163129c77ce 100644
+index 19fad1ec4f77..4a1a463befa4 100644
 --- a/graf3d/eve7/inc/ROOT/REveElement.hxx
 +++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
-@@ -16,26 +16,12 @@
+@@ -16,15 +16,22 @@
  #include <ROOT/REveVector.hxx>
  #include <ROOT/REveProjectionBases.hxx>
  
 -#include <map>
-+#include <nlohmann/json.hpp>
-+
  #include <memory>
+ #include <list>
+ #include <ostream>
+ #include <set>
+ #include <string>
+-#include <vector>
  
- class TGeoMatrix;
+-class TGeoMatrix;
++#if __has_include(<nlohmann/json_fwd.hpp>)
++#include <nlohmann/json_fwd.hpp>
++#else
++// This forward declaration works for versions before 3.11.0, which introduced
++// a "versioned, ABI-tagged inline namespace". The json_fwd.hpp header is
++// present in multi-header installations (the default as of version 3.11.0), and
++// single-header installations of version 3.11.2+.
++
++#include <map>
++#include <vector>
  
--namespace nlohmann {
--template<typename T, typename SFINAE>
--struct adl_serializer;
--
--template <template <typename U, typename V, typename... Args> class ObjectType,
--          template <typename U, typename... Args> class ArrayType, class StringType, class BooleanType,
--          class NumberIntegerType, class NumberUnsignedType, class NumberFloatType,
--          template <typename U> class AllocatorType, template <typename T, typename SFINAE = void> class JSONSerializer,
--          class BinaryType>
--class basic_json;
--
--using json = basic_json<std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t, double, std::allocator,
--                        adl_serializer, std::vector<std::uint8_t>>;
--} // namespace nlohmann
--
+ namespace nlohmann {
+ template<typename T, typename SFINAE>
+@@ -41,6 +48,10 @@ using json = basic_json<std::map, std::vector, std::string, bool, std::int64_t,
+                         adl_serializer, std::vector<std::uint8_t>>;
+ } // namespace nlohmann
+ 
++#endif
++
++class TGeoMatrix;
++
  namespace ROOT {
  namespace Experimental {
  
 
-From a301bc2cb01e17e242174fadffcb1bffe83f22db Mon Sep 17 00:00:00 2001
+From 7f699ad7249d85d989a0e01525e3ad359e936fd7 Mon Sep 17 00:00:00 2001
 From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Wed, 17 Aug 2022 11:41:10 +0200
-Subject: [PATCH 4/4] [eve7] Add missing includes to REveElement.hxx
+Date: Thu, 18 Aug 2022 10:09:28 +0200
+Subject: [PATCH 3/3] [cmake] Check for json_fwd.hpp in versions > 3.11
 
+Our forward declaration in REveElement.hxx breaks with the versioned
+namespaces in 3.11, so we require the json_fwd.hpp header.
 ---
- graf3d/eve7/inc/ROOT/REveElement.hxx | 3 +++
- 1 file changed, 3 insertions(+)
+ cmake/modules/SearchInstalledSoftware.cmake | 24 +++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
 
-diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
-index 4163129c77ce..369489bb17ac 100644
---- a/graf3d/eve7/inc/ROOT/REveElement.hxx
-+++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
-@@ -19,6 +19,9 @@
- #include <nlohmann/json.hpp>
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index 7da7ce8a46dd..9e871da42a26 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -6,6 +6,7 @@
  
- #include <memory>
-+#include <list>
-+#include <set>
-+#include <string>
+ #---Check for installed packages depending on the build options/components enabled --
+ include(CheckCXXSourceCompiles)
++include(CheckIncludeFileCXX)
+ include(ExternalProject)
+ include(FindPackageHandleStandardArgs)
  
- class TGeoMatrix;
+@@ -80,6 +81,29 @@ if(NOT builtin_nlohmannjson)
+       message(STATUS "nlohmann/json.hpp not found. Switching on builtin_nlohmannjson option")
+       set(builtin_nlohmannjson ON CACHE BOOL "Enabled because nlohmann/json.hpp not found" FORCE)
+     endif()
++
++    # If we found an external nlohmann_json with a version greater than 3.11,
++    # check that it has the json_fwd.hpp header.
++    if(nlohmann_json_FOUND AND nlohmann_json_VERSION VERSION_GREATER_EQUAL 3.11)
++      set(_old_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++      set(_old_CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET})
++
++      set(CMAKE_REQUIRED_LIBRARIES nlohmann_json::nlohmann_json)
++      set(CMAKE_REQUIRED_QUIET TRUE)
++      check_include_file_cxx("nlohmann/json_fwd.hpp" _nlohmann_json_fwd_hpp)
++      if(NOT _nlohmann_json_fwd_hpp)
++        set(_msg "Could not find nlohmann/json_fwd.hpp, which is required for versions greater than 3.11.")
++        if(nlohmann_json_VERSION VERSION_LESS 3.11.2)
++          set(_msg "${_msg} Please upgrade to at least version 3.11.2.")
++        else()
++          set(_msg "${_msg} It is installed by default, so your installation is incomplete!")
++        endif()
++        message(FATAL_ERROR "${_msg}")
++      endif()
++
++      set(CMAKE_REQUIRED_LIBRARIES ${_old_CMAKE_REQUIRED_LIBRARIES})
++      set(CMAKE_REQUIRED_QUIET ${_old_CMAKE_REQUIRED_QUIET})
++    endif()
+   endif()
+ endif()
  
diff --git a/root.spec b/root.spec
index b26ff29..30c360a 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -186,7 +186,7 @@ Patch37:	%{name}-Python-3.11-support-backported-from-CPyCppyy.patch
 Patch38:	%{name}-get-rid-of-lsb_release.patch
 Patch39:	%{name}-protect-against-empty-COMPILE_DEFINITIONS.patch
 #		Compatibility with nlohmann json 3.11+
-#		https://github.com/root-project/root/pull/11202
+#		https://github.com/root-project/root/pull/11205
 Patch40:	root-json-3.11.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
@@ -4002,6 +4002,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 19 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-3
+- Use the json 3.11 fix upstream settled on
+
 * Wed Aug 17 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-2
 - Compatibility with nlohmann json 3.11+
 - Enable gfal support in EPEL 9 (gfal2 now available)

From 21a93fdb3289709f5919bcf583242d45a68add37 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 23 Aug 2022 17:37:01 +0900
Subject: [PATCH 232/344] Rebuild for gsl-2.7.1

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 30c360a..6788134 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -4002,6 +4002,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.26.06-4
+- Rebuild for gsl-2.7.1
+
 * Fri Aug 19 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-3
 - Use the json 3.11 fix upstream settled on
 

From 521c5af35f03663e8314137944a89b812df71420 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 1 Oct 2022 19:05:05 +0200
Subject: [PATCH 233/344] Use upstream's proposed change for the Python garbage
 collection issue

---
 ...or-garbage-collection-in-Python-3.11.patch |  72 ++++++
 ....11-support-backported-from-CPyCppyy.patch | 220 ------------------
 root.spec                                     |  49 ++--
 3 files changed, 93 insertions(+), 248 deletions(-)
 create mode 100644 root-Fixes-for-garbage-collection-in-Python-3.11.patch
 delete mode 100644 root-Python-3.11-support-backported-from-CPyCppyy.patch

diff --git a/root-Fixes-for-garbage-collection-in-Python-3.11.patch b/root-Fixes-for-garbage-collection-in-Python-3.11.patch
new file mode 100644
index 0000000..a5c8752
--- /dev/null
+++ b/root-Fixes-for-garbage-collection-in-Python-3.11.patch
@@ -0,0 +1,72 @@
+From e77bcb0fdd0bc622213c33ad7094d28737fe51e7 Mon Sep 17 00:00:00 2001
+From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
+Date: Wed, 28 Sep 2022 14:20:46 +0200
+Subject: [PATCH] [PyROOT] Fixes for garbage collection in Python 3.11
+
+According to the list of changes in Python 3.11:
+
+https://docs.python.org/3.11/whatsnew/3.11.html
+
+types defined with the Py_TPFLAGS_HAVE_GC flag set but with no
+traverse function (PyTypeObject.tp_traverse) will cause an error.
+
+The above is true for a few types that are defined in cppyy.
+This commit removes the aforementioned flag from those type
+definitions with no traverse function. It also sets the right
+flags for the nonified object type; this fixes the teardown GC
+crashes observed when the internal memory management of ROOT
+was involved (e.g. the garbage collection of a tree that belongs
+to a file).
+---
+ .../pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx |  1 -
+ .../cppyy/CPyCppyy/src/CustomPyTypes.cxx      |  3 +--
+ .../cppyy/CPyCppyy/src/MemoryRegulator.cxx    |  3 ++-
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
+index 73fb8099b5dd..f2eea396af1b 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
+@@ -764,7 +764,6 @@ PyTypeObject CPPInstance_Type = {
+     0,                             // tp_as_buffer
+     Py_TPFLAGS_DEFAULT |
+         Py_TPFLAGS_BASETYPE |
+-        Py_TPFLAGS_HAVE_GC |
+         Py_TPFLAGS_CHECKTYPES,     // tp_flags
+     (char*)"cppyy object proxy (internal)", // tp_doc
+     0,                             // tp_traverse
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
+index 97ce06daa717..ed41b1637c67 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
+@@ -78,8 +78,7 @@ PyTypeObject TypedefPointerToClass_Type = {
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     (ternaryfunc)tpc_call,        // tp_call
+     0, 0, 0, 0,
+-    Py_TPFLAGS_DEFAULT |
+-        Py_TPFLAGS_HAVE_GC,       // tp_flags
++    Py_TPFLAGS_DEFAULT,           // tp_flags
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ #if PY_VERSION_HEX >= 0x02030000
+     , 0                           // tp_del
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
+index f9e92f9c8c1b..510d65f88a8d 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
+@@ -45,7 +45,7 @@ struct InitCPyCppyy_NoneType_t {
+         ((PyVarObject&)CPyCppyy_NoneType).ob_size = 0;
+ 
+         CPyCppyy_NoneType.tp_name        = const_cast<char*>("CPyCppyy_NoneType");
+-        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE | Py_TPFLAGS_HAVE_GC;
++        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE;
+ 
+         CPyCppyy_NoneType.tp_traverse    = (traverseproc)0;
+         CPyCppyy_NoneType.tp_clear       = (inquiry)0;
+@@ -135,6 +135,7 @@ bool CPyCppyy::MemoryRegulator::RecursiveRemove(
+             CPyCppyy_NoneType.tp_traverse   = Py_TYPE(pyobj)->tp_traverse;
+             CPyCppyy_NoneType.tp_clear      = Py_TYPE(pyobj)->tp_clear;
+             CPyCppyy_NoneType.tp_free       = Py_TYPE(pyobj)->tp_free;
++            CPyCppyy_NoneType.tp_flags      = Py_TYPE(pyobj)->tp_flags;
+         } else if (CPyCppyy_NoneType.tp_traverse != Py_TYPE(pyobj)->tp_traverse) {
+         // TODO: SystemError?
+             std::cerr << "in CPyCppyy::MemoryRegulater, unexpected object of type: "
diff --git a/root-Python-3.11-support-backported-from-CPyCppyy.patch b/root-Python-3.11-support-backported-from-CPyCppyy.patch
deleted file mode 100644
index 734e22e..0000000
--- a/root-Python-3.11-support-backported-from-CPyCppyy.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 07693d05ad785d495a9c1d5af27399481b43c3f5 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 1 Jul 2022 06:50:31 +0200
-Subject: [PATCH] Python 3.11 support - backported from CPyCppyy
-
----
- bindings/pyroot/cppyy/CPyCppyy/src/API.cxx    | 11 ++++++++++-
- .../pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx |  1 -
- .../pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx |  8 +++++---
- bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h |  5 ++++-
- .../cppyy/CPyCppyy/src/CPyCppyyModule.cxx     | 19 +++++++++++++++++++
- .../cppyy/CPyCppyy/src/MemoryRegulator.cxx    |  2 +-
- .../pyroot/cppyy/CPyCppyy/src/Utility.cxx     |  2 ++
- bindings/pyroot/cppyy/CPyCppyy/src/Utility.h  |  2 ++
- 8 files changed, 43 insertions(+), 7 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
-index 0cc4c8247b..4c17f54bb0 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/API.cxx
-@@ -49,7 +49,14 @@ static bool Initialize()
- #if PY_VERSION_HEX < 0x03020000
-         PyEval_InitThreads();
- #endif
-+#if PY_VERSION_HEX < 0x03080000
-         Py_Initialize();
-+#else
-+        PyConfig config;
-+        PyConfig_InitPythonConfig(&config);
-+        PyConfig_SetString(&config, &config.program_name, L"cppyy");
-+        Py_InitializeFromConfig(&config);
-+#endif
- #if PY_VERSION_HEX >= 0x03020000
- #if PY_VERSION_HEX < 0x03090000
- 	PyEval_InitThreads();
-@@ -66,10 +73,12 @@ static bool Initialize()
-    // set the command line arguments on python's sys.argv
- #if PY_VERSION_HEX < 0x03000000
-         char* argv[] = {const_cast<char*>("cppyy")};
--#else
-+#elif PY_VERSION_HEX < 0x03080000
-         wchar_t* argv[] = {const_cast<wchar_t*>(L"cppyy")};
- #endif
-+#if PY_VERSION_HEX < 0x03080000
-         PySys_SetArgv(sizeof(argv)/sizeof(argv[0]), argv);
-+#endif
- 
-     // force loading of the cppyy module
-         PyRun_SimpleString(const_cast<char*>("import cppyy"));
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-index 73fb8099b5..f2eea396af 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-@@ -764,7 +764,6 @@ PyTypeObject CPPInstance_Type = {
-     0,                             // tp_as_buffer
-     Py_TPFLAGS_DEFAULT |
-         Py_TPFLAGS_BASETYPE |
--        Py_TPFLAGS_HAVE_GC |
-         Py_TPFLAGS_CHECKTYPES,     // tp_flags
-     (char*)"cppyy object proxy (internal)", // tp_doc
-     0,                             // tp_traverse
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-index 28bbd635c2..7eb2de8b01 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-@@ -1,11 +1,13 @@
- // Bindings
- #include "CPyCppyy.h"
- #include "structmember.h"    // from Python
--#if PY_VERSION_HEX < 0x02050000
--#include "compile.h"         // from Python
--#elif PY_VERSION_HEX < 0x030b0000
-+#if PY_VERSION_HEX >= 0x02050000
-+#if PY_VERSION_HEX <  0x030b0000
- #include "code.h"            // from Python
- #endif
-+#else
-+#include "compile.h"         // from Python
-+#endif
- #ifndef CO_NOFREE
- // python2.2 does not have CO_NOFREE defined
- #define CO_NOFREE       0x0040
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
-index 11221cd7ef..35af3c8a56 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyy.h
-@@ -68,7 +68,10 @@ typedef dim_t* dims_t;
- #if PY_VERSION_HEX < 0x03030000
-    typedef PyDictEntry* (*dict_lookup_func)(PyDictObject*, PyObject*, long);
- #else
--#if PY_VERSION_HEX >= 0x03060000
-+#if PY_VERSION_HEX >= 0x030b0000
-+   typedef Py_ssize_t (*dict_lookup_func)(
-+       PyDictObject*, PyObject*, Py_hash_t, PyObject**);
-+#elif PY_VERSION_HEX >= 0x03060000
-    typedef Py_ssize_t (*dict_lookup_func)(
-        PyDictObject*, PyObject*, Py_hash_t, PyObject***, Py_ssize_t*);
- #else
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
-index 411a57a862..7a32ab365f 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
-@@ -26,6 +26,11 @@
- #include <vector>
- 
- 
-+// Note: as of py3.11, dictionary objects no longer carry a function pointer for
-+// the lookup, so it can no longer be shimmed and "from cppyy.interactive import *"
-+// thus no longer works.
-+#if PY_VERSION_HEX < 0x030b0000
-+
- //- from Python's dictobject.c -------------------------------------------------
- #if PY_VERSION_HEX >= 0x03030000
-     typedef struct PyDictKeyEntry {
-@@ -65,6 +70,8 @@
- 
- #endif
- 
-+#endif // PY_VERSION_HEX < 0x030b0000
-+
- //- data -----------------------------------------------------------------------
- static PyObject* nullptr_repr(PyObject*)
- {
-@@ -177,7 +184,9 @@ namespace {
- 
- using namespace CPyCppyy;
- 
-+
- //----------------------------------------------------------------------------
-+#if PY_VERSION_HEX < 0x030b0000
- namespace {
- 
- class GblGetter {
-@@ -330,9 +339,12 @@ PyDictEntry* CPyCppyyLookDictString(PyDictObject* mp, PyObject* key, long hash)
-     return ep;
- }
- 
-+#endif // PY_VERSION_HEX < 0x030b0000
-+
- //----------------------------------------------------------------------------
- static PyObject* SetCppLazyLookup(PyObject*, PyObject* args)
- {
-+#if PY_VERSION_HEX < 0x030b0000
- // Modify the given dictionary to install the lookup function that also
- // tries the global C++ namespace before failing. Called on a module's dictionary,
- // this allows for lazy lookups. This works fine for p3.2 and earlier, but should
-@@ -343,6 +355,11 @@ static PyObject* SetCppLazyLookup(PyObject*, PyObject* args)
-         return nullptr;
- 
-     CPYCPPYY_GET_DICT_LOOKUP(dict) = CPyCppyyLookDictString;
-+#else
-+// As of py3.11, there is no longer a lookup function pointer in the dict object
-+// to replace. Since this feature is not widely advertised, it's simply droped
-+    PyErr_Warn(PyExc_RuntimeWarning, (char*)"lazy lookup is no longer supported");
-+#endif
- 
-     Py_RETURN_NONE;
- }
-@@ -813,6 +830,7 @@ LIBCPPYY_INIT_FUNCTION(extern "C" void initlibcppyy, PY_MAJOR_VERSION, _, PY_MIN
-     PyEval_InitThreads();
- #endif
- 
-+#if PY_VERSION_HEX < 0x030b0000
- // prepare for lazyness (the insert is needed to capture the most generic lookup
- // function, just in case ...)
-     PyObject* dict = PyDict_New();
-@@ -825,6 +843,7 @@ LIBCPPYY_INIT_FUNCTION(extern "C" void initlibcppyy, PY_MAJOR_VERSION, _, PY_MIN
-     gDictLookupOrg = (dict_lookup_func)((PyDictObject*)dict)->ma_lookup;
- #endif
-     Py_DECREF(dict);
-+#endif // PY_VERSION_HEX < 0x030b0000
- 
- // setup this module
- #if PY_VERSION_HEX >= 0x03000000
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-index f9e92f9c8c..5da48364ac 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-@@ -45,7 +45,7 @@ struct InitCPyCppyy_NoneType_t {
-         ((PyVarObject&)CPyCppyy_NoneType).ob_size = 0;
- 
-         CPyCppyy_NoneType.tp_name        = const_cast<char*>("CPyCppyy_NoneType");
--        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE | Py_TPFLAGS_HAVE_GC;
-+        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE;
- 
-         CPyCppyy_NoneType.tp_traverse    = (traverseproc)0;
-         CPyCppyy_NoneType.tp_clear       = (inquiry)0;
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-index 14ea1b83e8..1cf8f89bd2 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-@@ -24,8 +24,10 @@
- 
- 
- //- data _____________________________________________________________________
-+#if PY_VERSION_HEX < 0x030b0000
- dict_lookup_func CPyCppyy::gDictLookupOrg = 0;
- bool CPyCppyy::gDictLookupActive = false;
-+#endif
- 
- typedef std::map<std::string, std::string> TC2POperatorMapping_t;
- static TC2POperatorMapping_t gC2POperatorMapping;
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
-index 6bc9314b99..2db76b31b0 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.h
-@@ -10,8 +10,10 @@ namespace CPyCppyy {
- 
- class PyCallable;
- 
-+#if PY_VERSION_HEX < 0x030b0000
- extern dict_lookup_func gDictLookupOrg;
- extern bool gDictLookupActive;
-+#endif
- 
- // additional converter functions
- unsigned long PyLongOrInt_AsULong(PyObject* pyobject);
--- 
-2.36.1
-
diff --git a/root.spec b/root.spec
index 6788134..5b135f6 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -180,8 +180,9 @@ Patch33:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
 Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
-#		Backport additional python 3.11 fixes from CPyCppyy upstream
-Patch37:	%{name}-Python-3.11-support-backported-from-CPyCppyy.patch
+#		Fixes for garbage collection in Python 3.11
+#		https://github.com/root-project/root/pull/11457
+Patch37:	%{name}-Fixes-for-garbage-collection-in-Python-3.11.patch
 #		Backport
 Patch38:	%{name}-get-rid-of-lsb_release.patch
 Patch39:	%{name}-protect-against-empty-COMPILE_DEFINITIONS.patch
@@ -2946,33 +2947,22 @@ gtest-tree-tree-test-testTBranch|\
 test-stress\$\$|\
 test-stressgraphics"
 %endif
-%endif
 
-%if %{?fedora}%{!?fedora:0} >= 37
-# Fails during garbage collection with Python 3.11
-# See: https://github.com/root-project/root/issues/10799
+%if %{?fedora}%{!?fedora:0} >= 38
+# - pyunittests-pyroot-pyz-rdataframe-asnumpy
+# - pyunittests-pyroot-pyz-rdataframe-makenumpy
+# - tutorial-dataframe-df024_Display(-py)
+# - tutorial-dataframe-df026_AsNumpyArrays-py
+# - tutorial-dataframe-df032_MakeNumpyDataFrame-py
+# - tutorial-tmva-tmva002_RDataFrameAsTensor
 excluded="${excluded}|\
-pyunittests-dataframe-histograms|\
-pyunittests-distrdf-unit-backend-test-dist|\
-pyunittests-distrdf-unit-test-buildranges|\
-pyunittests-distrdf-unit-test-friendinfo|\
-pyunittests-distrdf-unit-test-headnode|\
-pyunittests-pyroot-pyz-tfile-attrsyntax-get-writeobject-open|\
-pyunittests-pyroot-pyz-ttree-branch|\
-pyunittests-pyroot-pyz-ttree-branch-attr|\
-pyunittests-pyroot-pyz-ttree-iterable|\
-pyunittests-pyroot-pyz-ttree-setbranchaddress|\
-tutorial-dataframe-df014_CSVDataSource-py|\
-tutorial-dataframe-df017_vecOpsHEP-py|\
-tutorial-pyroot-fit1-py|\
-tutorial-pyroot-h1ReadAndDraw-py|\
-tutorial-pyroot-hsimple-py|\
-tutorial-pyroot-hsum-py|\
-tutorial-pyroot-ntuple1-py|\
-tutorial-pyroot-staff-py|\
-tutorial-pyroot-tornado-py|\
-tutorial-roofit-rf503_wspaceread-py|\
-tutorial-roofit-rf512_wsfactory_oper-py"
+pyunittests-pyroot-pyz-rdataframe-asnumpy|\
+pyunittests-pyroot-pyz-rdataframe-makenumpy|\
+tutorial-dataframe-df024_Display|\
+tutorial-dataframe-df026_AsNumpyArrays-py|\
+tutorial-dataframe-df032_MakeNumpyDataFrame-py|\
+tutorial-tmva-tmva002_RDataFrameAsTensor"
+%endif
 %endif
 
 # Filter out parts of tests that require remote network access
@@ -4002,6 +3992,9 @@ fi
 %endif
 
 %changelog
+* Sat Oct 01 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-5
+- Use upstream's proposed change for the Python garbage collection issue
+
 * Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.26.06-4
 - Rebuild for gsl-2.7.1
 

From 78faffb6b86080e66ae21914ffd655f9ab0ccc81 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 21 Oct 2022 05:11:01 +0200
Subject: [PATCH 234/344] Update to 6.26.08

Drop patch root-move-private-decl.patch (fixed upstream)
Drop some previously backported patches
Rename patch root-blas-linking-and-ignore-prefix.patch (partially fixed)
Backport locking of gInterpreterMutex in TClingClassInfo::IsEnum
---
 ...reterMutex-in-TClingClassInfo-IsEnum.patch |  30 ++
 root-big-endian-byte-swap.patch               |   2 +-
 ...MVA-tutorial-using-internally-python.patch | 177 --------
 ...e-prefix.patch => root-ignore-prefix.patch |  38 --
 root-json-3.11.patch                          | 139 ------
 root-move-private-decl.patch                  | 405 ------------------
 ...ct-against-empty-COMPILE_DEFINITIONS.patch |  63 ---
 root.spec                                     |  46 +-
 sources                                       |   2 +-
 9 files changed, 54 insertions(+), 848 deletions(-)
 create mode 100644 root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
 delete mode 100644 root-fix-TMVA-tutorial-using-internally-python.patch
 rename root-blas-linking-and-ignore-prefix.patch => root-ignore-prefix.patch (53%)
 delete mode 100644 root-json-3.11.patch
 delete mode 100644 root-move-private-decl.patch
 delete mode 100644 root-protect-against-empty-COMPILE_DEFINITIONS.patch

diff --git a/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch b/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
new file mode 100644
index 0000000..d407f38
--- /dev/null
+++ b/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
@@ -0,0 +1,30 @@
+From 25fcf69c0662b09fbd9dc1c0446b7679ae020ed5 Mon Sep 17 00:00:00 2001
+From: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
+Date: Sat, 8 Oct 2022 03:12:06 +0200
+Subject: [PATCH] [core] Guard gInterpreterMutex in TClingClassInfo::IsEnum
+
+Fixes https://github.com/root-project/root/issues/11515
+
+This method leads to contention in some specific scenarios (see linked
+issue).
+
+Co-authored-by: Philippe Canal <pcanal@fnal.gov>
+---
+ core/metacling/src/TClingClassInfo.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/core/metacling/src/TClingClassInfo.cxx b/core/metacling/src/TClingClassInfo.cxx
+index c0c061dfca..ce6e82d388 100644
+--- a/core/metacling/src/TClingClassInfo.cxx
++++ b/core/metacling/src/TClingClassInfo.cxx
+@@ -815,6 +815,7 @@ bool TClingClassInfo::IsBase(const char *name) const
+ 
+ bool TClingClassInfo::IsEnum(cling::Interpreter *interp, const char *name)
+ {
++   R__LOCKGUARD(gInterpreterMutex);
+    // Note: This is a static member function.
+    TClingClassInfo info(interp, name);
+    if (info.IsValid() && (info.Property() & kIsEnum)) {
+-- 
+2.37.3
+
diff --git a/root-big-endian-byte-swap.patch b/root-big-endian-byte-swap.patch
index 0d9f41a..63490b5 100644
--- a/root-big-endian-byte-swap.patch
+++ b/root-big-endian-byte-swap.patch
@@ -15,8 +15,8 @@ index 3b0a30cdb0..23e41d746f 100644
 @@ -1,3 +1,4 @@
 +#include "Byteswap.h"
  #include "TMVA/RModelParser_ONNX.hxx"
- #include "TMVA/OperatorList.hxx"
  #include "onnx_proto3.pb.h"
+ 
 @@ -980,9 +981,14 @@ RModel RModelParser_ONNX::Parse(std::string filename){
              //void* data = malloc (fLength * sizeof(float));
              std::shared_ptr<void> data(malloc(fLength * sizeof(float)), free);
diff --git a/root-fix-TMVA-tutorial-using-internally-python.patch b/root-fix-TMVA-tutorial-using-internally-python.patch
deleted file mode 100644
index e1cae2a..0000000
--- a/root-fix-TMVA-tutorial-using-internally-python.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From db974bbe72b97c798b7db52d2481aa24c2ce2b76 Mon Sep 17 00:00:00 2001
-From: moneta <lorenzo.moneta@cern.ch>
-Date: Thu, 17 Mar 2022 16:28:42 +0100
-Subject: [PATCH] Fix TMVA tutorial using internally pyton for MacOS 12.3
-
-With the new MacOS update python (and python2) is not existing anymore, only python3.
-Add then a new function TMVA::Python_executable() using ROOT config to determine if ROOT is using python version 2 or 3. In case of 3 returns as executable "python3".
-
-Fix also the correct location of the input ONNX file for TMVA_SOFIE_ONNX.C (copying the file at configure time)
----
- tmva/pymva/inc/TMVA/PyMethodBase.h       |  6 ++++++
- tmva/pymva/src/PyMethodBase.cxx          | 20 ++++++++++++++++++++
- tutorials/CMakeLists.txt                 |  5 ++++-
- tutorials/tmva/TMVA_CNN_Classification.C |  5 +++--
- tutorials/tmva/TMVA_RNN_Classification.C |  2 +-
- tutorials/tmva/TMVA_SOFIE_Keras.C        |  2 +-
- tutorials/tmva/TMVA_SOFIE_ONNX.C         |  2 +-
- tutorials/tmva/TMVA_SOFIE_PyTorch.C      |  2 +-
- 8 files changed, 37 insertions(+), 7 deletions(-)
-
-diff --git a/tmva/pymva/inc/TMVA/PyMethodBase.h b/tmva/pymva/inc/TMVA/PyMethodBase.h
-index 31a5caada9..a213c3fbad 100644
---- a/tmva/pymva/inc/TMVA/PyMethodBase.h
-+++ b/tmva/pymva/inc/TMVA/PyMethodBase.h
-@@ -53,6 +53,12 @@ namespace TMVA {
-    class MethodBoost;
-    class DataSetInfo;
- 
-+   /// Function to find current Python executable
-+   /// used by ROOT
-+   /// If Python2 is installed return "python"
-+   /// Instead if "Python3" return "python3"
-+   TString Python_Executable();
-+
-    class PyMethodBase : public MethodBase {
- 
-       friend class Factory;
-diff --git a/tmva/pymva/src/PyMethodBase.cxx b/tmva/pymva/src/PyMethodBase.cxx
-index 86f979e006..26b0f31135 100644
---- a/tmva/pymva/src/PyMethodBase.cxx
-+++ b/tmva/pymva/src/PyMethodBase.cxx
-@@ -19,6 +19,9 @@
- #include "TMVA/MsgLogger.h"
- #include "TMVA/Results.h"
- #include "TMVA/Timer.h"
-+#include "TMVA/Tools.h"
-+
-+#include "TSystem.h"
- 
- #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
- #include <numpy/arrayobject.h>
-@@ -37,6 +40,23 @@ public:
-    ~PyGILRAII() { PyGILState_Release(m_GILState); }
- };
- } // namespace Internal
-+
-+/// get current Python executable used by ROOT
-+TString Python_Executable() {
-+   TString python_version = gSystem->GetFromPipe("root-config --python-version");
-+   if (python_version.IsNull()) {
-+      TMVA::gTools().Log() << kFATAL << "Can't find a valid Python version used to build ROOT" << Endl;
-+      return nullptr;
-+   }
-+   if(python_version[0] == '2')
-+      return "python";
-+   else if (python_version[0] == '3')
-+      return "python3";
-+
-+   TMVA::gTools().Log() << kFATAL << "Invalid Python version used to build ROOT : " << python_version << Endl;
-+   return nullptr;
-+}
-+
- } // namespace TMVA
- 
- ClassImp(PyMethodBase);
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index de77aaa787..f1f1abda71 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -281,8 +281,11 @@ else()
-   endif()
-   if (NOT tmva-sofie)
-     list(APPEND tmva_veto tmva/TMVA_SOFIE_ONNX.C)
-+  else()
-+    #copy ONNX file needed for the tutorial
-+    configure_file(${CMAKE_SOURCE_DIR}/tmva/sofie/test/input_models/Linear_16.onnx ${CMAKE_BINARY_DIR}/tutorials/tmva/Linear_16.onnx COPYONLY)
-   endif()
--  
-+
- endif()
- 
- if (NOT ROOT_pythia6_FOUND)
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index fa03562a8f..31172bb729 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.C
-+++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -145,6 +145,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
-    TMVA::PyMethodBase::PyInitialize();
- #else
-    useKerasCNN = false;
-+   usePyTorchCNN = false;
- #endif
- 
-    TFile *outputFile = nullptr;
-@@ -445,7 +446,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
- 
-       m.SaveSource("make_cnn_model.py");
-       // execute
--      gSystem->Exec("python make_cnn_model.py");
-+      gSystem->Exec(TMVA::Python_Executable() + " make_cnn_model.py");
- 
-       if (gSystem->AccessPathName("model_cnn.h5")) {
-          Warning("TMVA_CNN_Classification", "Error creating Keras model file - skip using Keras");
-@@ -465,7 +466,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
-       Info("TMVA_CNN_Classification", "Using Convolutional PyTorch Model");
-       TString pyTorchFileName = gROOT->GetTutorialDir() + TString("/tmva/PyTorch_Generate_CNN_Model.py");
-       // check that pytorch can be imported and file defining the model and used later when booking the method is existing
--      if (gSystem->Exec("python -c 'import torch'")  || gSystem->AccessPathName(pyTorchFileName) ) {
-+      if (gSystem->Exec(TMVA::Python_Executable() + " -c 'import torch'")  || gSystem->AccessPathName(pyTorchFileName) ) {
-          Warning("TMVA_CNN_Classification", "PyTorch is not installed or model building file is not existing - skip using PyTorch");
-       }
-       else {
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
-index eb26d03a2f..b49e4d91c4 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.C
-+++ b/tutorials/tmva/TMVA_RNN_Classification.C
-@@ -431,7 +431,7 @@ the option string
- 
-             m.SaveSource("make_rnn_model.py");
-             // execute
--            gSystem->Exec("python make_rnn_model.py");
-+            gSystem->Exec(TMVA::Python_Executable() + " make_rnn_model.py");
- 
-             if (gSystem->AccessPathName(modelName)) {
-                Warning("TMVA_RNN_Classification", "Error creating Keras recurrent model file - Skip using Keras");
-diff --git a/tutorials/tmva/TMVA_SOFIE_Keras.C b/tutorials/tmva/TMVA_SOFIE_Keras.C
-index e9fdbba21a..a87269f7f4 100644
---- a/tutorials/tmva/TMVA_SOFIE_Keras.C
-+++ b/tutorials/tmva/TMVA_SOFIE_Keras.C
-@@ -45,7 +45,7 @@ void TMVA_SOFIE_Keras(){
-     TMacro m;
-     m.AddLine(pythonSrc);
-     m.SaveSource("make_keras_model.py");
--    gSystem->Exec("python make_keras_model.py");
-+    gSystem->Exec(TMVA::Python_Executable() + " make_keras_model.py");
- 
-     //Parsing the saved Keras .h5 file into RModel object
-     SOFIE::RModel model = SOFIE::PyKeras::Parse("KerasModel.h5");
-diff --git a/tutorials/tmva/TMVA_SOFIE_ONNX.C b/tutorials/tmva/TMVA_SOFIE_ONNX.C
-index 30148db4fa..bf66c38896 100644
---- a/tutorials/tmva/TMVA_SOFIE_ONNX.C
-+++ b/tutorials/tmva/TMVA_SOFIE_ONNX.C
-@@ -13,7 +13,7 @@ using namespace TMVA::Experimental;
- void TMVA_SOFIE_ONNX(){
-     //Creating parser object to parse ONNX files
-     SOFIE::RModelParser_ONNX Parser;
--    SOFIE::RModel model = Parser.Parse("../../tmva/sofie/test/input_models/Linear_16.onnx");
-+    SOFIE::RModel model = Parser.Parse(std::string(gROOT->GetTutorialsDir()) + "/tmva/Linear_16.onnx");
- 
-     //Generating inference code
-     model.Generate();
-diff --git a/tutorials/tmva/TMVA_SOFIE_PyTorch.C b/tutorials/tmva/TMVA_SOFIE_PyTorch.C
-index b208b042d7..580787cae1 100644
---- a/tutorials/tmva/TMVA_SOFIE_PyTorch.C
-+++ b/tutorials/tmva/TMVA_SOFIE_PyTorch.C
-@@ -47,7 +47,7 @@ void TMVA_SOFIE_PyTorch(){
-     TMacro m;
-     m.AddLine(pythonSrc);
-     m.SaveSource("make_pytorch_model.py");
--    gSystem->Exec("python make_pytorch_model.py");
-+    gSystem->Exec(TMVA::Python_Executable() + " make_pytorch_model.py");
- 
-     //Parsing a PyTorch model requires the shape and data-type of input tensor
-     //Data-type of input tensor defaults to Float if not specified
--- 
-2.35.1
-
diff --git a/root-blas-linking-and-ignore-prefix.patch b/root-ignore-prefix.patch
similarity index 53%
rename from root-blas-linking-and-ignore-prefix.patch
rename to root-ignore-prefix.patch
index abe53f7..5b9918a 100644
--- a/root-blas-linking-and-ignore-prefix.patch
+++ b/root-ignore-prefix.patch
@@ -13,15 +13,6 @@ diff --git a/tmva/sofie/test/CMakeLists.txt b/tmva/sofie/test/CMakeLists.txt
 index e4f9d28748..a3a2c9ae16 100644
 --- a/tmva/sofie/test/CMakeLists.txt
 +++ b/tmva/sofie/test/CMakeLists.txt
-@@ -43,7 +43,7 @@ target_compile_options(emitFromONNX PRIVATE -Wno-unused-parameter -Wno-array-bou
- 
- # Automatic compilation of headers from onnx files
- add_custom_target(SofieCompileModels_ONNX)
--add_dependencies(SofieCompileModels_ONNX emitFromONNX)
-+add_dependencies(SofieCompileModels_ONNX emitFromONNX onepcm)
- 
- # Finding .onnx files to be compiled and creating the appropriate command
- file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
 @@ -51,7 +51,7 @@ foreach(onnx_file ${ONNX_FILES})
  	get_filename_component(fname ${onnx_file} NAME_WE)
  	get_filename_component(fdir ${onnx_file} DIRECTORY)
@@ -31,25 +22,6 @@ index e4f9d28748..a3a2c9ae16 100644
  		USES_TERMINAL
  	)
  endforeach()
-@@ -60,7 +60,8 @@ endforeach()
- ROOT_ADD_GTEST(TestCustomModelsFromONNX TestCustomModelsFromONNX.cxx
-   LIBRARIES
-     ROOTTMVASofie
--    blas
-+    ${BLAS_LINKER_FLAGS}
-+    ${BLAS_LIBRARIES}
-   INCLUDE_DIRS
-     ${CMAKE_CURRENT_BINARY_DIR}
- )
-@@ -92,7 +93,7 @@ target_compile_options(emitFromROOT PRIVATE -Wno-unused-parameter -Wno-array-bou
- 
- # Automatic compilation of headers from root files
- add_custom_target(SofieCompileModels_ROOT)
--add_dependencies(SofieCompileModels_ROOT emitFromROOT)
-+add_dependencies(SofieCompileModels_ROOT emitFromROOT onepcm)
- 
- # Finding .onnx files to be parsed and creating the appropriate command
- file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
 @@ -100,7 +101,7 @@ foreach(onnx_file ${ONNX_FILES})
  	get_filename_component(fname ${onnx_file} NAME_WE)
  	get_filename_component(fdir ${onnx_file} DIRECTORY)
@@ -59,16 +31,6 @@ index e4f9d28748..a3a2c9ae16 100644
  		USES_TERMINAL
  	)
  endforeach()
-@@ -109,7 +110,8 @@ endforeach()
- ROOT_ADD_GTEST(TestCustomModelsFromROOT TestCustomModelsFromROOT.cxx
-   LIBRARIES
-     ROOTTMVASofie
--    blas
-+    ${BLAS_LINKER_FLAGS}
-+    ${BLAS_LIBRARIES}
-   INCLUDE_DIRS
-     ${CMAKE_CURRENT_BINARY_DIR}
- )
 -- 
 2.35.1
 
diff --git a/root-json-3.11.patch b/root-json-3.11.patch
deleted file mode 100644
index d5c35be..0000000
--- a/root-json-3.11.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From aa68881d612060a131b103ffcadc4b0f2185c49e Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Thu, 18 Aug 2022 08:57:44 +0200
-Subject: [PATCH 1/3] [eve7] Add missing includes to REveElement.hxx
-
----
- graf3d/eve7/inc/ROOT/REveElement.hxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
-index 2a127888a2c5..19fad1ec4f77 100644
---- a/graf3d/eve7/inc/ROOT/REveElement.hxx
-+++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
-@@ -18,6 +18,11 @@
- 
- #include <map>
- #include <memory>
-+#include <list>
-+#include <ostream>
-+#include <set>
-+#include <string>
-+#include <vector>
- 
- class TGeoMatrix;
- 
-
-From 395d387b115249a1cab38dbe2fde77ff308a29a5 Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Thu, 18 Aug 2022 09:13:14 +0200
-Subject: [PATCH 2/3] [eve7] Include json_fwd.hpp if available
-
-Version 3.11 of nlohmann/json introduced "versioned, ABI-tagged inline
-namespace"s, which breaks our forward declaration. Fortunately, we can
-assume the json_fwd.hpp header to be present starting from that same
-version because the JSON_MultipleHeaders option now defaults to ON and
-even if not, json_fwd.hpp is installed since patch version 3.11.2. For
-earlier versions, both methods work but json_fwd.hpp isn't guaranteed
-to be installed. Still use it if available.
-
-Fixes #11130
----
- graf3d/eve7/inc/ROOT/REveElement.hxx | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx b/graf3d/eve7/inc/ROOT/REveElement.hxx
-index 19fad1ec4f77..4a1a463befa4 100644
---- a/graf3d/eve7/inc/ROOT/REveElement.hxx
-+++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
-@@ -16,15 +16,22 @@
- #include <ROOT/REveVector.hxx>
- #include <ROOT/REveProjectionBases.hxx>
- 
--#include <map>
- #include <memory>
- #include <list>
- #include <ostream>
- #include <set>
- #include <string>
--#include <vector>
- 
--class TGeoMatrix;
-+#if __has_include(<nlohmann/json_fwd.hpp>)
-+#include <nlohmann/json_fwd.hpp>
-+#else
-+// This forward declaration works for versions before 3.11.0, which introduced
-+// a "versioned, ABI-tagged inline namespace". The json_fwd.hpp header is
-+// present in multi-header installations (the default as of version 3.11.0), and
-+// single-header installations of version 3.11.2+.
-+
-+#include <map>
-+#include <vector>
- 
- namespace nlohmann {
- template<typename T, typename SFINAE>
-@@ -41,6 +48,10 @@ using json = basic_json<std::map, std::vector, std::string, bool, std::int64_t,
-                         adl_serializer, std::vector<std::uint8_t>>;
- } // namespace nlohmann
- 
-+#endif
-+
-+class TGeoMatrix;
-+
- namespace ROOT {
- namespace Experimental {
- 
-
-From 7f699ad7249d85d989a0e01525e3ad359e936fd7 Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Thu, 18 Aug 2022 10:09:28 +0200
-Subject: [PATCH 3/3] [cmake] Check for json_fwd.hpp in versions > 3.11
-
-Our forward declaration in REveElement.hxx breaks with the versioned
-namespaces in 3.11, so we require the json_fwd.hpp header.
----
- cmake/modules/SearchInstalledSoftware.cmake | 24 +++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 7da7ce8a46dd..9e871da42a26 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -6,6 +6,7 @@
- 
- #---Check for installed packages depending on the build options/components enabled --
- include(CheckCXXSourceCompiles)
-+include(CheckIncludeFileCXX)
- include(ExternalProject)
- include(FindPackageHandleStandardArgs)
- 
-@@ -80,6 +81,29 @@ if(NOT builtin_nlohmannjson)
-       message(STATUS "nlohmann/json.hpp not found. Switching on builtin_nlohmannjson option")
-       set(builtin_nlohmannjson ON CACHE BOOL "Enabled because nlohmann/json.hpp not found" FORCE)
-     endif()
-+
-+    # If we found an external nlohmann_json with a version greater than 3.11,
-+    # check that it has the json_fwd.hpp header.
-+    if(nlohmann_json_FOUND AND nlohmann_json_VERSION VERSION_GREATER_EQUAL 3.11)
-+      set(_old_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+      set(_old_CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET})
-+
-+      set(CMAKE_REQUIRED_LIBRARIES nlohmann_json::nlohmann_json)
-+      set(CMAKE_REQUIRED_QUIET TRUE)
-+      check_include_file_cxx("nlohmann/json_fwd.hpp" _nlohmann_json_fwd_hpp)
-+      if(NOT _nlohmann_json_fwd_hpp)
-+        set(_msg "Could not find nlohmann/json_fwd.hpp, which is required for versions greater than 3.11.")
-+        if(nlohmann_json_VERSION VERSION_LESS 3.11.2)
-+          set(_msg "${_msg} Please upgrade to at least version 3.11.2.")
-+        else()
-+          set(_msg "${_msg} It is installed by default, so your installation is incomplete!")
-+        endif()
-+        message(FATAL_ERROR "${_msg}")
-+      endif()
-+
-+      set(CMAKE_REQUIRED_LIBRARIES ${_old_CMAKE_REQUIRED_LIBRARIES})
-+      set(CMAKE_REQUIRED_QUIET ${_old_CMAKE_REQUIRED_QUIET})
-+    endif()
-   endif()
- endif()
- 
diff --git a/root-move-private-decl.patch b/root-move-private-decl.patch
deleted file mode 100644
index aa81617..0000000
--- a/root-move-private-decl.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-From 9cdd51029f54aba874608f34580ea0ba94b670c7 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 17 Mar 2022 07:40:28 +0100
-Subject: [PATCH] Move private declarations away from the public header file
-
-This fixes warnings such as these:
-
-IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE8INTERNAL19make_ROperator_SeluERKN4onnx9NodeProtoERKNS3_10GraphProtoERSt13unordered_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_11ETensorTypeESt4hashISG_ESt8equal_toISG_ESaISt4pairIKSG_SH_EEE' unresolved while linking function '_GLOBAL__sub_I_cling_module_0'!
-You are probably missing the definition of TMVA::Experimental::SOFIE::INTERNAL::make_ROperator_Selu(onnx::NodeProto const&, onnx::GraphProto const&, std::unordered_map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, TMVA::Experimental::SOFIE::ETensorType, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, TMVA::Experimental::SOFIE::ETensorType> > >&)
-Maybe you need to load the corresponding shared library?
----
- .../inc/TMVA/RModelParser_ONNX.hxx            |  61 -------
- tmva/sofie_parsers/src/RModelParser_ONNX.cxx  | 164 +++++++++++++++---
- 2 files changed, 139 insertions(+), 86 deletions(-)
-
-diff --git a/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx b/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
-index 9e9764c0b6..09bcd34fe1 100644
---- a/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
-+++ b/tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx
-@@ -1,81 +1,20 @@
- #ifndef TMVA_SOFIE_RMODELPARSER_ONNX
- #define TMVA_SOFIE_RMODELPARSER_ONNX
- 
--
--
- #include "TMVA/SOFIE_common.hxx"
- #include "TMVA/RModel.hxx"
--#include "TMVA/OperatorList.hxx"
- 
- #include <string>
--#include <fstream>
--#include <memory>
--#include <ctime>
--
--//forward delcaration
--namespace onnx{
--   class NodeProto;
--   class GraphProto;
--}
- 
- namespace TMVA{
- namespace Experimental{
- namespace SOFIE{
- 
--namespace INTERNAL{
--
--std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
--std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
--std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--
--
--using factoryMethodMap = std::unordered_map<std::string, std::unique_ptr<ROperator> (*)(const onnx::NodeProto&, const onnx::GraphProto&, std::unordered_map<std::string, ETensorType>&)>;
--const factoryMethodMap mapOptypeOperator = {
--   {"Gemm", &make_ROperator_Gemm},
--   {"Transpose", &make_ROperator_Transpose},
--   {"Relu", &make_ROperator_Relu},
--   {"Conv", &make_ROperator_Conv},
--   {"RNN", &make_ROperator_RNN},
--   {"Selu", &make_ROperator_Selu},
--   {"Sigmoid", &make_ROperator_Sigmoid},
--   {"LSTM", &make_ROperator_LSTM},
--   {"GRU", &make_ROperator_GRU},
--   {"BatchNormalization", &make_ROperator_BatchNormalization},
--   {"AveragePool", &make_ROperator_Pool},
--   {"GlobalAveragePool", &make_ROperator_Pool},
--   {"MaxPool", &make_ROperator_Pool},
--   {"Add", &make_ROperator_Add},
--   {"Reshape", &make_ROperator_Reshape},
--   {"Flatten", &make_ROperator_Reshape},
--   {"Slice", &make_ROperator_Slice},
--   {"Squeeze", &make_ROperator_Reshape},
--   {"Unsqueeze", &make_ROperator_Reshape},
--   {"Flatten", &make_ROperator_Reshape}
--};
--
--std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
--}//INTERNAL
--
--
--
- class RModelParser_ONNX{
- public:
-    RModel Parse(std::string filename);
- };
- 
--
--
- }//SOFIE
- }//Experimental
- }//TMVA
-diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-index 3b0a30cdb0..5f89bf66bd 100644
---- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-+++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-@@ -1,9 +1,12 @@
- #include "TMVA/RModelParser_ONNX.hxx"
-+#include "TMVA/OperatorList.hxx"
- #include "onnx_proto3.pb.h"
- 
- #include <string>
-+#include <fstream>
- #include <memory>
- #include <cassert>
-+#include <ctime>
- 
- namespace TMVA{
- namespace Experimental{
-@@ -11,7 +14,84 @@ namespace SOFIE{
- 
- namespace INTERNAL{
- 
--std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto &nodeproto,
-+                                                           const onnx::GraphProto &graphproto,
-+                                                           std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto &nodeproto,
-+                                                         const onnx::GraphProto &graphproto,
-+                                                         std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto &graphproto,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_BatchNorm(const onnx::NodeProto &nodeproto,
-+                                                           const onnx::GraphProto &graphproto,
-+                                                           std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto &graphproto,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto &graphproto,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
-+                                                         const onnx::GraphProto &graphproto,
-+                                                         std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
-+                                                       const onnx::GraphProto &graphproto,
-+                                                       std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto &graphproto,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+using factoryMethodMap =
-+   std::unordered_map<std::string, std::unique_ptr<ROperator> (*)(const onnx::NodeProto &, const onnx::GraphProto &,
-+                                                                  std::unordered_map<std::string, ETensorType> &)>;
-+
-+static const factoryMethodMap mapOptypeOperator = {
-+   {"Gemm", &make_ROperator_Gemm},         {"Transpose", &make_ROperator_Transpose},
-+   {"Relu", &make_ROperator_Relu},         {"Conv", &make_ROperator_Conv},
-+   {"RNN", &make_ROperator_RNN},           {"Selu", &make_ROperator_Selu},
-+   {"Sigmoid", &make_ROperator_Sigmoid},   {"LSTM", &make_ROperator_LSTM},
-+   {"GRU", &make_ROperator_GRU},           {"BatchNormalization", &make_ROperator_BatchNorm},
-+   {"AveragePool", &make_ROperator_Pool},  {"GlobalAveragePool", &make_ROperator_Pool},
-+   {"MaxPool", &make_ROperator_Pool},      {"Add", &make_ROperator_Add},
-+   {"Reshape", &make_ROperator_Reshape},   {"Flatten", &make_ROperator_Reshape},
-+   {"Slice", &make_ROperator_Slice},       {"Squeeze", &make_ROperator_Reshape},
-+   {"Unsqueeze", &make_ROperator_Reshape}, {"Flatten", &make_ROperator_Reshape}};
-+
-+static std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto &graphproto,
-+                                                 std::unordered_map<std::string, ETensorType> &tensor_type);
-+
-+static std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto &graphproto,
-+                                                 std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
-    const auto& nodeproto = graphproto.node(idx);
-    auto find = mapOptypeOperator.find(nodeproto.op_type());
-    if (find == mapOptypeOperator.end()){
-@@ -24,7 +104,10 @@ std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& gr
-    }
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto & /*graphproto */,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type = ETensorType::UNDEFINED;
- 
-@@ -59,7 +142,11 @@ std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto& nodeproto,
- 
-    return op;
- }
--std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto*/, std::unordered_map<std::string, ETensorType>& tensor_type){
-+
-+static std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto &nodeproto,
-+                                                           const onnx::GraphProto & /*graphproto*/,
-+                                                           std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -99,7 +186,10 @@ std::unique_ptr<ROperator> make_ROperator_Transpose(const onnx::NodeProto& nodep
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /*graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -131,7 +221,10 @@ std::unique_ptr<ROperator> make_ROperator_Relu(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /*graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -163,7 +256,10 @@ std::unique_ptr<ROperator> make_ROperator_Selu(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto &nodeproto,
-+                                                         const onnx::GraphProto & /*graphproto */,
-+                                                         std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -195,7 +291,10 @@ std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodepro
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
-+static std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /* graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -252,7 +351,11 @@ std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto,
- 
-    return op;
- }
--std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
-+
-+static std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto & /* graphproto */,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -344,7 +447,10 @@ std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
-+static std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /* graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -408,7 +514,10 @@ std::unique_ptr<ROperator> make_ROperator_Conv(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
-+static std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /* graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -485,14 +594,13 @@ std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
--                                                  const onnx::GraphProto & /*graphproto */,
--                                                  std::unordered_map<std::string, ETensorType> &tensor_type)
-+static std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto,
-+                                                         const onnx::GraphProto & /*graphproto */,
-+                                                         std::unordered_map<std::string, ETensorType> &tensor_type)
- {
-    // make Reshape operator
-    ETensorType input_type = ETensorType::UNDEFINED;
- 
--   
-    ReshapeOpMode opMode = Reshape;
-    if (nodeproto.op_type() == "Flatten") 
-       opMode = Flatten;
-@@ -501,7 +609,6 @@ std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodepro
-    else if (nodeproto.op_type() == "Unsqueeze")
-       opMode = Unsqueeze;
- 
--  
-    //bool hasShapeInput = (opMode == Reshape) ? true : false;
- 
-    // reshape has as extra input shape tensor (int64) but 
-@@ -553,9 +660,9 @@ std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodepro
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
--                                                  const onnx::GraphProto & /*graphproto */,
--                                                  std::unordered_map<std::string, ETensorType> &tensor_type)
-+static std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto,
-+                                                       const onnx::GraphProto & /*graphproto */,
-+                                                       std::unordered_map<std::string, ETensorType> &tensor_type)
- {
-    // make Slice operator
-    ETensorType input_type = ETensorType::UNDEFINED;
-@@ -634,7 +741,10 @@ std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
-+static std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto &nodeproto,
-+                                                     const onnx::GraphProto & /* graphproto */,
-+                                                     std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -722,7 +832,10 @@ std::unique_ptr<ROperator> make_ROperator_RNN(const onnx::NodeProto& nodeproto,
-    return op;
- }
- 
--std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type) {
-+static std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto &nodeproto,
-+                                                      const onnx::GraphProto & /* graphproto */,
-+                                                      std::unordered_map<std::string, ETensorType> &tensor_type)
-+{
- 
-    ETensorType input_type;
- 
-@@ -825,9 +938,10 @@ std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto,
- 
-    return op;
- }
--std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodeProto &nodeproto,
--                                                             const onnx::GraphProto &/*graphproto*/,
--                                                             std::unordered_map<std::string, ETensorType> &tensor_type)
-+
-+static std::unique_ptr<ROperator> make_ROperator_BatchNorm(const onnx::NodeProto &nodeproto,
-+                                                           const onnx::GraphProto & /*graphproto*/,
-+                                                           std::unordered_map<std::string, ETensorType> &tensor_type)
- {
- 
-    ETensorType input_type;
-@@ -843,8 +957,8 @@ std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodePro
- 
-    std::unique_ptr<ROperator> op;
-    float fepsilon = 1e-05;
--	float fmomentum = 0.9;
--	std::size_t ftraining_mode = 0;
-+   float fmomentum = 0.9;
-+   std::size_t ftraining_mode = 0;
- 
-    switch(input_type) {
-       case ETensorType::FLOAT:
--- 
-2.35.1
-
diff --git a/root-protect-against-empty-COMPILE_DEFINITIONS.patch b/root-protect-against-empty-COMPILE_DEFINITIONS.patch
deleted file mode 100644
index 7b7fd89..0000000
--- a/root-protect-against-empty-COMPILE_DEFINITIONS.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 08ab7e03061e551647d707637957252d121f9c39 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Tue, 21 Sep 2021 15:15:17 +0200
-Subject: [PATCH] [cmake] Protect against empty `COMPILE_DEFINITIONS` in
- rootcint command
-
-In the `rootcint` command defined in `RootMacros.cmake`, the
-`COMPILE_DEFINITIONS` from the target are forwarded as compiler flags.
-
-The `COMPILE_DEFINITIONS` are stored in the `module_defs` variable with
-a generator expression:
-
-```
-set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
-```
-
-Then, the definitions are added to the rootcint command with this
-expression:
-
-```
-"$<$<BOOL:${module_defs}>:-D$<JOIN:${module_defs},;-D>>"
-```
-
-This code was almost copied exactly from the CMake documentation
-example:
-
-https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
-
-In particular, the `BOOL` check makes sure that the if the target
-property is empty, we will not get a bare `-D` with nothing after it,
-corrupting the rootcint command.
-
-However, there is no protextion against the case where the
-`COMPILE_DEFINITIONS` target property is not empty, but its elements are
-empty strings! This happened to me in my recent build.
-
-Instead of trying to figure out where the empty strings are added to the
-`COMPILE_DEFINITIONS`, it is better to also protect against empty target
-property elements in the CMake generator expressions, which is
-implemented in this commit.
----
- cmake/modules/RootMacros.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
-index c52c23d29a..c62ffc2152 100644
---- a/cmake/modules/RootMacros.cmake
-+++ b/cmake/modules/RootMacros.cmake
-@@ -628,7 +628,10 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
-       # and list exclusion for generator expressions is too complex.
-       set(module_incs $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INCLUDE_DIRECTORIES>>)
-       set(module_sysincs $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>>)
--      set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
-+      # The COMPILE_DEFINITIONS list might contain empty elements. These are
-+      # removed with the FILTER generator expression, excluding elements that
-+      # match the ^$ regexp (only matches empty strings).
-+      set(module_defs "$<FILTER:$<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>,EXCLUDE,^$>")
-     endif()
-   endif()
- 
--- 
-2.37.2
-
diff --git a/root.spec b/root.spec
index 5b135f6..85e9a9b 100644
--- a/root.spec
+++ b/root.spec
@@ -63,9 +63,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.26.06
+Version:	6.26.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -130,10 +130,10 @@ Patch13:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 Patch14:	%{name}-test-timeout.patch
 #		Fixes for tmva-sofie test compilation
 #		https://github.com/root-project/root/pull/10117
-Patch15:	%{name}-blas-linking-and-ignore-prefix.patch
-#		Move private declarations away from the public header file
-#		https://github.com/root-project/root/pull/10145
-Patch16:	%{name}-move-private-decl.patch
+Patch15:	%{name}-ignore-prefix.patch
+#		Fixes for garbage collection in Python 3.11
+#		https://github.com/root-project/root/pull/11457
+Patch16:	%{name}-Fixes-for-garbage-collection-in-Python-3.11.patch
 #		Fix test when long is 32 bits
 #		https://github.com/root-project/root/pull/10302
 Patch17:	%{name}-longlong.patch
@@ -176,19 +176,11 @@ Patch30:	%{name}-tmva-threads.patch
 Patch31:	%{name}-core-base-test.patch
 #		Backports
 Patch32:	%{name}-make-dyld-based-library-search-behavior-default.patch
-Patch33:	%{name}-fix-TMVA-tutorial-using-internally-python.patch
+Patch33:	%{name}-get-rid-of-lsb_release.patch
 Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
-#		Fixes for garbage collection in Python 3.11
-#		https://github.com/root-project/root/pull/11457
-Patch37:	%{name}-Fixes-for-garbage-collection-in-Python-3.11.patch
-#		Backport
-Patch38:	%{name}-get-rid-of-lsb_release.patch
-Patch39:	%{name}-protect-against-empty-COMPILE_DEFINITIONS.patch
-#		Compatibility with nlohmann json 3.11+
-#		https://github.com/root-project/root/pull/11205
-Patch40:	root-json-3.11.patch
+Patch37:	%{name}-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2055,9 +2047,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2103,12 +2092,13 @@ rm etc/notebook/JsMVA/css/*.min.css
 
 %if %{?rhel}%{!?rhel:0} == 7 || %{?rhel}%{!?rhel:0} == 8
 # Allow older json on EPEL 7/8
-sed 's!nlohmann_json 3.9! nlohmann_json 3.6!' \
+sed 's!nlohmann_json 3.9!nlohmann_json 3.6!' \
     -i cmake/modules/SearchInstalledSoftware.cmake
 %endif
 
 %if %{?rhel}%{!?rhel:0} == 7
 # On EPEL 7 disable test that fails to compile
+# Brace initialization list is ambiguous with old compiler
 sed 's!.*dataframe_datasetspec!### &!' -i tree/dataframe/test/CMakeLists.txt
 %endif
 
@@ -2772,10 +2762,11 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
-%ifarch %{ix86}
-# Test failing on ix86 only
-# - gtest-tree-dataframe-test-dataframe-snapshot
-excluded="${excluded}|gtest-tree-dataframe-test-dataframe-snapshot"
+%if %{?rhel}%{!?rhel:0} == 7
+# - pyunittests-pyroot-roofit-roodataset-numpy
+#   AttributeError: module 'numpy' has no attribute 'isin'
+excluded="${excluded}|\
+pyunittests-pyroot-roofit-roodataset-numpy"
 %endif
 
 %ifarch %{ix86} %{arm}
@@ -3992,6 +3983,13 @@ fi
 %endif
 
 %changelog
+* Wed Oct 19 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.08-1
+- Update to 6.26.08
+- Drop patch root-move-private-decl.patch (fixed upstream)
+- Drop some previously backported patches
+- Rename patch root-blas-linking-and-ignore-prefix.patch (partially fixed)
+- Backport locking of gInterpreterMutex in TClingClassInfo::IsEnum
+
 * Sat Oct 01 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.06-5
 - Use upstream's proposed change for the Python garbage collection issue
 
diff --git a/sources b/sources
index bd0e6ae..b16c003 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.06.tar.xz) = 6002de6c8b1f43647356d008ca4ed369107ed67ba129271f01180544ad38120f0a26180cd297065fab3669e55671b7ceb53a5ead0c4f61b2ed31b68753bc8adb
+SHA512 (root-6.26.08.tar.xz) = 02a8f8463c49275624e704e41240a9250b6d0b72803f48983656df2bcff685423b5b015096ae797a294b7bf0223aa02ec601d084934e3c7218bf4beaa305c615
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 75d8984496ea06499fec0f6954719280fe74a8bd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 28 Oct 2022 10:16:32 +0200
Subject: [PATCH 235/344] Avoid race condition between C++ and Python version
 of a roofit test

---
 ...race-condition-tutorial-roofit-rf512.patch | 50 +++++++++++++++++++
 root.spec                                     |  9 +++-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 root-avoid-race-condition-tutorial-roofit-rf512.patch

diff --git a/root-avoid-race-condition-tutorial-roofit-rf512.patch b/root-avoid-race-condition-tutorial-roofit-rf512.patch
new file mode 100644
index 0000000..d0c40e8
--- /dev/null
+++ b/root-avoid-race-condition-tutorial-roofit-rf512.patch
@@ -0,0 +1,50 @@
+From 91de99623d0e945610be46d46e84b54985415aeb Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 28 Oct 2022 06:27:10 +0200
+Subject: [PATCH] Avoid race condition between
+ tutorial/roofit/rf512_wsfactory_oper.C and
+ tutorial/roofit/rf512_wsfactory_oper.py
+
+When run in parallel they delete eachother's files:
+
+cc1plus: fatal error: /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.cxx: No such file or directory
+compilation terminated.
+/usr/bin/ld: cannot find /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.o: No such file or directory
+collect2: error: ld returned 1 exit status
+---
+ tutorials/CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index cfba4d3ed9..6ae9be5869 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -483,7 +483,7 @@ set(hist-hbars-depends  tutorial-tree-cernbuild)
+ set(benchmarks-depends tutorial-hsimple
+                        tutorial-fit-fit1
+                        tutorial-fit-myfit
+-					   tutorial-hist-h1ReadAndDraw
++                       tutorial-hist-h1ReadAndDraw
+                        tutorial-hist-FirstContour
+                        tutorial-geom-na49view
+                        tutorial-tree-ntuple1
+@@ -731,7 +731,7 @@ if(ROOT_pyroot_FOUND)
+   set(pyroot-benchmarks-depends tutorial-pyroot-hsimple-py
+                                 tutorial-pyroot-fit1-py
+                                 tutorial-pyroot-na49view-py
+-								tutorial-pyroot-h1ReadAndDraw-py
++                                tutorial-pyroot-h1ReadAndDraw-py
+                                 tutorial-pyroot-ntuple1-py)
+   set(pyroot-fit1-depends tutorial-pyroot-fillrandom-py)
+   set(pyroot-na49view-depends tutorial-pyroot-geometry-py)
+@@ -739,6 +739,7 @@ if(ROOT_pyroot_FOUND)
+ 
+   # Avoid a race condition: make sure Python tutorial is ran after C++ tutorial
+   set(roofit-rf104_classfactory-depends tutorial-roofit-rf104_classfactory)
++  set(roofit-rf512_wsfactory_oper-depends tutorial-roofit-rf512_wsfactory_oper)
+ 
+   #----------------------------------------------------------------------
+   # List requirements for python tutorials.
+-- 
+2.37.3
+
diff --git a/root.spec b/root.spec
index 85e9a9b..26a7f25 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -181,6 +181,9 @@ Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 Patch37:	%{name}-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
+#		Avoid race condition between C++ an Python version of test
+#		https://github.com/root-project/root/pull/11643
+Patch38:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2047,6 +2050,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3983,6 +3987,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.08-2
+- Avoid race condition between C++ and Python version of a roofit test
+
 * Wed Oct 19 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.08-1
 - Update to 6.26.08
 - Drop patch root-move-private-decl.patch (fixed upstream)

From ab5d41c627de5f1bf689f34314fdad3f19b6cb82 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 17 Nov 2022 13:06:43 +0100
Subject: [PATCH 236/344] Update to 6.26.10

Drop patches root-Fixes-for-garbage-collection-in-Python-3.11.patch
  and root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
  (fixed upstream)
Use different filenames in io/loopdir tests
Update root-test-timeout.patch to address one more issue
---
 ...or-garbage-collection-in-Python-3.11.patch | 72 ------------------
 ...reterMutex-in-TClingClassInfo-IsEnum.patch | 30 --------
 root-different-filename.patch                 | 48 ++++++++++++
 root-test-timeout.patch                       | 74 +++++++++++++++++--
 root.spec                                     | 22 ++++--
 sources                                       |  2 +-
 6 files changed, 131 insertions(+), 117 deletions(-)
 delete mode 100644 root-Fixes-for-garbage-collection-in-Python-3.11.patch
 delete mode 100644 root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
 create mode 100644 root-different-filename.patch

diff --git a/root-Fixes-for-garbage-collection-in-Python-3.11.patch b/root-Fixes-for-garbage-collection-in-Python-3.11.patch
deleted file mode 100644
index a5c8752..0000000
--- a/root-Fixes-for-garbage-collection-in-Python-3.11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e77bcb0fdd0bc622213c33ad7094d28737fe51e7 Mon Sep 17 00:00:00 2001
-From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
-Date: Wed, 28 Sep 2022 14:20:46 +0200
-Subject: [PATCH] [PyROOT] Fixes for garbage collection in Python 3.11
-
-According to the list of changes in Python 3.11:
-
-https://docs.python.org/3.11/whatsnew/3.11.html
-
-types defined with the Py_TPFLAGS_HAVE_GC flag set but with no
-traverse function (PyTypeObject.tp_traverse) will cause an error.
-
-The above is true for a few types that are defined in cppyy.
-This commit removes the aforementioned flag from those type
-definitions with no traverse function. It also sets the right
-flags for the nonified object type; this fixes the teardown GC
-crashes observed when the internal memory management of ROOT
-was involved (e.g. the garbage collection of a tree that belongs
-to a file).
----
- .../pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx |  1 -
- .../cppyy/CPyCppyy/src/CustomPyTypes.cxx      |  3 +--
- .../cppyy/CPyCppyy/src/MemoryRegulator.cxx    |  3 ++-
- 4 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-index 73fb8099b5dd..f2eea396af1b 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-@@ -764,7 +764,6 @@ PyTypeObject CPPInstance_Type = {
-     0,                             // tp_as_buffer
-     Py_TPFLAGS_DEFAULT |
-         Py_TPFLAGS_BASETYPE |
--        Py_TPFLAGS_HAVE_GC |
-         Py_TPFLAGS_CHECKTYPES,     // tp_flags
-     (char*)"cppyy object proxy (internal)", // tp_doc
-     0,                             // tp_traverse
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-index 97ce06daa717..ed41b1637c67 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-@@ -78,8 +78,7 @@ PyTypeObject TypedefPointerToClass_Type = {
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-     (ternaryfunc)tpc_call,        // tp_call
-     0, 0, 0, 0,
--    Py_TPFLAGS_DEFAULT |
--        Py_TPFLAGS_HAVE_GC,       // tp_flags
-+    Py_TPFLAGS_DEFAULT,           // tp_flags
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- #if PY_VERSION_HEX >= 0x02030000
-     , 0                           // tp_del
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-index f9e92f9c8c1b..510d65f88a8d 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-@@ -45,7 +45,7 @@ struct InitCPyCppyy_NoneType_t {
-         ((PyVarObject&)CPyCppyy_NoneType).ob_size = 0;
- 
-         CPyCppyy_NoneType.tp_name        = const_cast<char*>("CPyCppyy_NoneType");
--        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE | Py_TPFLAGS_HAVE_GC;
-+        CPyCppyy_NoneType.tp_flags       = Py_TPFLAGS_HAVE_RICHCOMPARE;
- 
-         CPyCppyy_NoneType.tp_traverse    = (traverseproc)0;
-         CPyCppyy_NoneType.tp_clear       = (inquiry)0;
-@@ -135,6 +135,7 @@ bool CPyCppyy::MemoryRegulator::RecursiveRemove(
-             CPyCppyy_NoneType.tp_traverse   = Py_TYPE(pyobj)->tp_traverse;
-             CPyCppyy_NoneType.tp_clear      = Py_TYPE(pyobj)->tp_clear;
-             CPyCppyy_NoneType.tp_free       = Py_TYPE(pyobj)->tp_free;
-+            CPyCppyy_NoneType.tp_flags      = Py_TYPE(pyobj)->tp_flags;
-         } else if (CPyCppyy_NoneType.tp_traverse != Py_TYPE(pyobj)->tp_traverse) {
-         // TODO: SystemError?
-             std::cerr << "in CPyCppyy::MemoryRegulater, unexpected object of type: "
diff --git a/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch b/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
deleted file mode 100644
index d407f38..0000000
--- a/root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 25fcf69c0662b09fbd9dc1c0446b7679ae020ed5 Mon Sep 17 00:00:00 2001
-From: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
-Date: Sat, 8 Oct 2022 03:12:06 +0200
-Subject: [PATCH] [core] Guard gInterpreterMutex in TClingClassInfo::IsEnum
-
-Fixes https://github.com/root-project/root/issues/11515
-
-This method leads to contention in some specific scenarios (see linked
-issue).
-
-Co-authored-by: Philippe Canal <pcanal@fnal.gov>
----
- core/metacling/src/TClingClassInfo.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/metacling/src/TClingClassInfo.cxx b/core/metacling/src/TClingClassInfo.cxx
-index c0c061dfca..ce6e82d388 100644
---- a/core/metacling/src/TClingClassInfo.cxx
-+++ b/core/metacling/src/TClingClassInfo.cxx
-@@ -815,6 +815,7 @@ bool TClingClassInfo::IsBase(const char *name) const
- 
- bool TClingClassInfo::IsEnum(cling::Interpreter *interp, const char *name)
- {
-+   R__LOCKGUARD(gInterpreterMutex);
-    // Note: This is a static member function.
-    TClingClassInfo info(interp, name);
-    if (info.IsValid() && (info.Property() & kIsEnum)) {
--- 
-2.37.3
-
diff --git a/root-different-filename.patch b/root-different-filename.patch
new file mode 100644
index 0000000..ef42c3d
--- /dev/null
+++ b/root-different-filename.patch
@@ -0,0 +1,48 @@
+From a486081a8065154308b23381c3a77f3fdb73de97 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 16 Nov 2022 20:44:48 +0100
+Subject: [PATCH] Use different filename in loopdir.C and loopdir11.C to avoid
+ race condition
+
+          Start  672: tutorial-io-loopdir
+ 690/1156 Test  #666: tutorial-io-double32 ................................................   Passed    2.42 sec
+          Start  673: tutorial-io-loopdir11
+ 691/1156 Test  #673: tutorial-io-loopdir11 ...............................................   Passed    0.76 sec
+          Start  674: tutorial-io-mergeSelective
+ 692/1156 Test  #672: tutorial-io-loopdir .................................................***Failed  Error regular expression found in output. Regex=[Error in <]  1.23 sec
+Processing /builddir/build/BUILD/root-6.26.10/tutorials/io/loopdir.C...
+Info in <TCanvas::Print>: ps file hsimple.ps has been created
+Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
+Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
+Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
+Info in <TCanvas::Print>: ps file hsimple.ps has been closed
+Error in <TPostScript::Text>: Cannot open temporary file: hsimple.ps_tmp_2089748
+---
+ tutorials/io/loopdir11.C | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tutorials/io/loopdir11.C b/tutorials/io/loopdir11.C
+index b5f9f4719c..bf8c33b442 100644
+--- a/tutorials/io/loopdir11.C
++++ b/tutorials/io/loopdir11.C
+@@ -12,14 +12,14 @@
+ void loopdir11() {
+    TFile *f1 = TFile::Open("hsimple.root");
+    TCanvas c1;
+-   c1.Print("hsimple.ps[");
++   c1.Print("hsimple11.ps[");
+    for(auto k : *f1->GetListOfKeys()) {
+       TKey *key = static_cast<TKey*>(k);
+       TClass *cl = gROOT->GetClass(key->GetClassName());
+       if (!cl->InheritsFrom("TH1")) continue;
+       TH1 *h = key->ReadObject<TH1>();
+       h->Draw();
+-      c1.Print("hsimple.ps");
++      c1.Print("hsimple11.ps");
+    }
+-   c1.Print("hsimple.ps]");
++   c1.Print("hsimple11.ps]");
+ }
+-- 
+2.38.1
+
diff --git a/root-test-timeout.patch b/root-test-timeout.patch
index acbedcc..1943318 100644
--- a/root-test-timeout.patch
+++ b/root-test-timeout.patch
@@ -1,13 +1,62 @@
-From bfa7b7e59c3bcee4d6a5501c800b49334af326e5 Mon Sep 17 00:00:00 2001
+From 4d09235937ea29913cbf9a9b5bcd002b52557c0e Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Sun, 3 Jul 2022 08:18:57 +0200
 Subject: [PATCH] Increase test timeout
 
 ---
- tmva/tmva/test/DNN/CMakeLists.txt | 2 +-
- tutorials/CMakeLists.txt          | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ cmake/modules/RootMacros.cmake    | 14 +++++++-------
+ tmva/tmva/test/DNN/CMakeLists.txt |  2 +-
+ tree/tree/test/CMakeLists.txt     |  2 +-
+ tutorials/CMakeLists.txt          |  4 ++--
+ 4 files changed, 11 insertions(+), 11 deletions(-)
 
+diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
+index cc61f4bbad..3e4559fc19 100644
+--- a/cmake/modules/RootMacros.cmake
++++ b/cmake/modules/RootMacros.cmake
+@@ -1779,6 +1779,7 @@ endfunction()
+ #----------------------------------------------------------------------------
+ # function ROOT_ADD_GTEST(<testsuite> source1 source2...
+ #                        [WILLFAIL] Negate output of test
++#                        [TIMEOUT seconds]
+ #                        [COPY_TO_BUILDDIR file1 file2] Copy listed files when ctest invokes the test.
+ #                        [LIBRARIES lib1 lib2...] -- Libraries to link against
+ #                        [LABELS label1 label2...] -- Labels to annotate the test
+@@ -1790,7 +1791,7 @@ endfunction()
+ function(ROOT_ADD_GTEST test_suite)
+   cmake_parse_arguments(ARG
+     "WILLFAIL"
+-    "REPEATS;FAILREGEX"
++    "TIMEOUT;REPEATS;FAILREGEX"
+     "COPY_TO_BUILDDIR;LIBRARIES;LABELS;INCLUDE_DIRS" ${ARGN})
+ 
+   ROOT_GET_SOURCES(source_files . ${ARG_UNPARSED_ARGUMENTS})
+@@ -1821,9 +1822,7 @@ function(ROOT_ADD_GTEST test_suite)
+   if(ARG_WILLFAIL)
+     set(willfail WILLFAIL)
+   endif()
+-  if(ARG_LABELS)
+-    set(labels "LABELS ${ARG_LABELS}")
+-  endif()
++
+   if(ARG_REPEATS)
+     set(extra_command --gtest_repeat=${ARG_REPEATS} --gtest_break_on_failure)
+   endif()
+@@ -1833,10 +1832,11 @@ function(ROOT_ADD_GTEST test_suite)
+     gtest${mangled_name}
+     COMMAND ${test_suite} ${extra_command}
+     WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}
+-    COPY_TO_BUILDDIR ${ARG_COPY_TO_BUILDDIR}
++    COPY_TO_BUILDDIR "${ARG_COPY_TO_BUILDDIR}"
+     ${willfail}
+-    ${labels}
+-    FAILREGEX ${ARG_FAILREGEX}
++    TIMEOUT "${ARG_TIMEOUT}"
++    LABELS "${ARG_LABELS}"
++    FAILREGEX "${ARG_FAILREGEX}"
+   )
+ endfunction()
+ 
 diff --git a/tmva/tmva/test/DNN/CMakeLists.txt b/tmva/tmva/test/DNN/CMakeLists.txt
 index a9233682f6..653540e9e3 100644
 --- a/tmva/tmva/test/DNN/CMakeLists.txt
@@ -21,8 +70,21 @@ index a9233682f6..653540e9e3 100644
  
  # DNN - MethodDL Adagrad Optimization CPU
  ROOT_EXECUTABLE(testMethodDLAdagradOptimizationCpu TestMethodDLAdagradOptimizationCpu.cxx LIBRARIES ${Libraries})
+diff --git a/tree/tree/test/CMakeLists.txt b/tree/tree/test/CMakeLists.txt
+index dbe664f8a0..6284e3c4c5 100644
+--- a/tree/tree/test/CMakeLists.txt
++++ b/tree/tree/test/CMakeLists.txt
+@@ -20,7 +20,7 @@ ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
+ target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+ ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
+ ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
+-ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
++ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 2400)
+ ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
+ ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
+ ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
 diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index 520d682d2d..a846e7552f 100644
+index 6ae9be5869..982432fe15 100644
 --- a/tutorials/CMakeLists.txt
 +++ b/tutorials/CMakeLists.txt
 @@ -532,7 +532,7 @@ foreach(t ${tutorials})
@@ -44,5 +106,5 @@ index 520d682d2d..a846e7552f 100644
       set(thisTestTimeout 1200) # 20m
     endif()
 -- 
-2.36.1
+2.38.1
 
diff --git a/root.spec b/root.spec
index 26a7f25..bead5ca 100644
--- a/root.spec
+++ b/root.spec
@@ -63,9 +63,9 @@
 %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
 
 Name:		root
-Version:	6.26.08
+Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -131,9 +131,9 @@ Patch14:	%{name}-test-timeout.patch
 #		Fixes for tmva-sofie test compilation
 #		https://github.com/root-project/root/pull/10117
 Patch15:	%{name}-ignore-prefix.patch
-#		Fixes for garbage collection in Python 3.11
-#		https://github.com/root-project/root/pull/11457
-Patch16:	%{name}-Fixes-for-garbage-collection-in-Python-3.11.patch
+#		Use different filenames in io/loopdir tests
+#		https://github.com/root-project/root/pull/11725
+Patch16:	%{name}-different-filename.patch
 #		Fix test when long is 32 bits
 #		https://github.com/root-project/root/pull/10302
 Patch17:	%{name}-longlong.patch
@@ -180,10 +180,9 @@ Patch33:	%{name}-get-rid-of-lsb_release.patch
 Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
 Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
-Patch37:	%{name}-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
 #		Avoid race condition between C++ an Python version of test
 #		https://github.com/root-project/root/pull/11643
-Patch38:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
+Patch37:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -2050,7 +2049,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3987,6 +3985,14 @@ fi
 %endif
 
 %changelog
+* Wed Nov 16 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-1
+- Update to 6.26.10
+- Drop patches root-Fixes-for-garbage-collection-in-Python-3.11.patch
+  and root-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch
+  (fixed upstream)
+- Use different filenames in io/loopdir tests
+- Update root-test-timeout.patch to address one more issue
+
 * Fri Oct 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.08-2
 - Avoid race condition between C++ and Python version of a roofit test
 
diff --git a/sources b/sources
index b16c003..ef0a91f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.08.tar.xz) = 02a8f8463c49275624e704e41240a9250b6d0b72803f48983656df2bcff685423b5b015096ae797a294b7bf0223aa02ec601d084934e3c7218bf4beaa305c615
+SHA512 (root-6.26.10.tar.xz) = 896727ce6da68871a52894a0a3c1b749fece9f08c8cefe62f5beac505710d579c41b84832a727a2ba39dab09e4456773c05b5b23a0fd859ace8062470653bbdb
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From bcb1ddcccf7115e8e31efead61522aaf674c8ad2 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Thu, 29 Dec 2022 09:45:29 -1000
Subject: [PATCH 237/344] Rebuild for cfitsio 4.2

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bead5ca..b40be96 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3985,6 +3985,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 6.26.10-2
+- Rebuild for cfitsio 4.2
+
 * Wed Nov 16 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-1
 - Update to 6.26.10
 - Drop patches root-Fixes-for-garbage-collection-in-Python-3.11.patch

From 6d31b558eef8167f0d09704df669da1de6e1a4ef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 19:53:22 +0000
Subject: [PATCH 238/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b40be96..11e148a 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3985,6 +3985,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.26.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 6.26.10-2
 - Rebuild for cfitsio 4.2
 

From 635da91690ffdb72e0fb1b401d970c663b0eedfb Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 21 Jan 2023 08:32:07 +0100
Subject: [PATCH 239/344] Add missing #include <cstdint>

---
 root-add-missing-include-cstdint.patch | 38 +++++++++++++
 root-fix-compilation-with-gcc13.patch  | 25 +++++++++
 root-test-timeout.patch                |  2 +-
 root.spec                              | 78 +++++++++++++++-----------
 4 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 root-add-missing-include-cstdint.patch
 create mode 100644 root-fix-compilation-with-gcc13.patch

diff --git a/root-add-missing-include-cstdint.patch b/root-add-missing-include-cstdint.patch
new file mode 100644
index 0000000..f86f0ee
--- /dev/null
+++ b/root-add-missing-include-cstdint.patch
@@ -0,0 +1,38 @@
+From cf6a925dfda2411b979da368e4cea769dbe6238a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 20 Jan 2023 06:34:11 +0100
+Subject: [PATCH] Add missing #include <cstdint>
+
+Fixes compilation error with gcc 13
+---
+ tree/ntuple/v7/inc/ROOT/RDaos.hxx    | 1 +
+ tree/ntuple/v7/test/CustomStruct.hxx | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tree/ntuple/v7/inc/ROOT/RDaos.hxx b/tree/ntuple/v7/inc/ROOT/RDaos.hxx
+index 69ee9ba99d..6367dfa93f 100644
+--- a/tree/ntuple/v7/inc/ROOT/RDaos.hxx
++++ b/tree/ntuple/v7/inc/ROOT/RDaos.hxx
+@@ -22,6 +22,7 @@
+ // Also, this header file is known to provide macros that conflict with std::min()/std::max().
+ extern "C" void d_rank_list_free(d_rank_list_t *rank_list);
+ 
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/tree/ntuple/v7/test/CustomStruct.hxx b/tree/ntuple/v7/test/CustomStruct.hxx
+index a975b5ce5d..be08eba924 100644
+--- a/tree/ntuple/v7/test/CustomStruct.hxx
++++ b/tree/ntuple/v7/test/CustomStruct.hxx
+@@ -1,6 +1,7 @@
+ #ifndef ROOT7_RNTuple_Test_CustomStruct
+ #define ROOT7_RNTuple_Test_CustomStruct
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.39.0
+
diff --git a/root-fix-compilation-with-gcc13.patch b/root-fix-compilation-with-gcc13.patch
new file mode 100644
index 0000000..bf411a8
--- /dev/null
+++ b/root-fix-compilation-with-gcc13.patch
@@ -0,0 +1,25 @@
+From 37ac6654194f90db625e760dcb2d48fd7938ba6d Mon Sep 17 00:00:00 2001
+From: scott snyder <sss@karma>
+Date: Tue, 29 Nov 2022 22:05:39 -0500
+Subject: [PATCH] Fix compilation with gcc13.
+
+Missing #include <cstdint>.
+---
+ math/mathcore/inc/Math/Random.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/math/mathcore/inc/Math/Random.h b/math/mathcore/inc/Math/Random.h
+index 87eaaee5af..23bfabc4a1 100644
+--- a/math/mathcore/inc/Math/Random.h
++++ b/math/mathcore/inc/Math/Random.h
+@@ -25,6 +25,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ 
+ namespace ROOT {
+-- 
+2.39.0
+
diff --git a/root-test-timeout.patch b/root-test-timeout.patch
index 1943318..a07aa39 100644
--- a/root-test-timeout.patch
+++ b/root-test-timeout.patch
@@ -79,7 +79,7 @@ index dbe664f8a0..6284e3c4c5 100644
  ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
  ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
 -ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
-+ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 2400)
++ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 3000)
  ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
  ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
  ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
diff --git a/root.spec b/root.spec
index 11e148a..6df3ae4 100644
--- a/root.spec
+++ b/root.spec
@@ -25,11 +25,7 @@
 %global root7 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 7
 %global xrootd5 1
-%else
-%global xrootd5 0
-%endif
 
 %global webgui 1
 
@@ -65,7 +61,7 @@
 Name:		root
 Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -183,6 +179,11 @@ Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 #		Avoid race condition between C++ an Python version of test
 #		https://github.com/root-project/root/pull/11643
 Patch37:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
+#		Add missing #include <cstdint>
+#		https://github.com/root-project/root/pull/12065
+Patch38:	%{name}-add-missing-include-cstdint.patch
+#		Backport from upstream
+Patch39:	%{name}-fix-compilation-with-gcc13.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -519,7 +520,7 @@ to call Python from ROOT.
 %if %{buildpy2}
 %package -n python2-%{name}
 Summary:	Python extension for ROOT
-%{?python_provide:%python_provide python2-%{name}}
+%py_provides	python2-%{name}
 Provides:	%{name}-python = %{version}-%{release}
 Obsoletes:	%{name}-python < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -532,7 +533,7 @@ possible to use ROOT classes in Python.
 
 %package -n python2-jupyroot
 Summary:	ROOT Jupyter kernel
-%{?python_provide:%python_provide python2-jupyroot}
+%py_provides	python2-jupyroot
 Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python2-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -554,7 +555,7 @@ The Jupyter kernel for the ROOT notebook.
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
-%{?python_provide:%python_provide python2-jsmva}
+%py_provides	python2-jsmva
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
@@ -563,7 +564,7 @@ TMVA interface used by JupyROOT.
 
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+%py_provides	python%{python3_pkgversion}-%{name}
 Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -578,7 +579,7 @@ possible to use ROOT classes in Python.
 
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
-%{?python_provide:%python_provide python%{python3_pkgversion}-jupyroot}
+%py_provides	python%{python3_pkgversion}-jupyroot
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -599,7 +600,7 @@ The Jupyter kernel for the ROOT notebook.
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
 BuildArch:	noarch
-%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
+%py_provides	python%{python3_pkgversion}-jsmva
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-jsmva
@@ -609,7 +610,7 @@ TMVA interface used by JupyROOT.
 %package -n python%{python3_pkgversion}-distrdf
 Summary:	Distributed RDataFrame
 BuildArch:	noarch
-%{?python_provide:%python_provide python%{python3_pkgversion}-distrdf}
+%py_provides	python%{python3_pkgversion}-distrdf
 Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
 Requires:	%{name}-tree-dataframe = %{version}-%{release}
 
@@ -2049,6 +2050,8 @@ This package contains an ntuple extension for ROOT 7.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2771,17 +2774,11 @@ excluded="${excluded}|\
 pyunittests-pyroot-roofit-roodataset-numpy"
 %endif
 
-%ifarch %{ix86} %{arm}
-%if %{?fedora}%{!?fedora:0} <= 35
-# Tests failing on 32 bit architectures (dataframe)
-# - gtest-roofit-RDataFrameHelpers-test-testActionHelpers
-# - gtest-tree-dataframe-test-dataframe-*
-# - gtest-tree-dataframe-test-datasource-*
+%if %{?fedora}%{!?fedora:0} >= 38
+# Failures with Fedora 38 (GCC 13 related?)
 excluded="${excluded}|\
-gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
-gtest-tree-dataframe-test-dataframe|\
-gtest-tree-dataframe-test-datasource"
-%endif
+pyunittests-dataframe-histograms|\
+tutorial-legacy-rootenv"
 %endif
 
 %ifarch %{arm}
@@ -2828,7 +2825,7 @@ test-stressroostats-interpreted|\
 pyunittests-pyroot-pyz-rdataframe-makenumpy|\
 tutorial-dataframe-df032_MakeNumpyDataFrame-py"
 
-%if %{?fedora}%{!?fedora:0} == 34 || %{?fedora}%{!?fedora:0} == 35 || %{?rhel}%{!?rhel:0} == 9
+%if %{?rhel}%{!?rhel:0} == 9
 # tmva/tmva/test/branchlessForest.cxx:215: Failure
 # Expected equality of these values:
 #   predictions[1]
@@ -2942,19 +2939,31 @@ test-stressgraphics"
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 38
-# - pyunittests-pyroot-pyz-rdataframe-asnumpy
-# - pyunittests-pyroot-pyz-rdataframe-makenumpy
-# - tutorial-dataframe-df024_Display(-py)
-# - tutorial-dataframe-df026_AsNumpyArrays-py
-# - tutorial-dataframe-df032_MakeNumpyDataFrame-py
-# - tutorial-tmva-tmva002_RDataFrameAsTensor
+# Segmentation faults and invalid pointers
+# Mainly related to DataFrame
 excluded="${excluded}|\
+pyunittests-dataframe|\
+pyunittests-distrdf-unit-backend-test-dist|\
+pyunittests-distrdf-unit-test-headnode|\
 pyunittests-pyroot-pyz-rdataframe-asnumpy|\
 pyunittests-pyroot-pyz-rdataframe-makenumpy|\
-tutorial-dataframe-df024_Display|\
-tutorial-dataframe-df026_AsNumpyArrays-py|\
-tutorial-dataframe-df032_MakeNumpyDataFrame-py|\
-tutorial-tmva-tmva002_RDataFrameAsTensor"
+pyunittests-pyroot-rdfdescription|\
+gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
+gtest-tree-dataframe-test-dataframe|\
+gtest-tree-dataframe-test-datasource|\
+gtest-tree-ntuple-v7-test-ntuple-rdf|\
+tutorial-dataframe-df|\
+tutorial-graphs-timeSeriesFromCSV_TDF|\
+tutorial-multicore-mt304_fillHistos|\
+tutorial-rcanvas|\
+tutorial-roofit-rf408_RDataFrameToRooFit-py|\
+tutorial-roofit-rf508_listsetmanip-py|\
+tutorial-tmva-tmva002_RDataFrameAsTensor|\
+tutorial-v7-concurrentfill.cxx|\
+tutorial-v7-histops.cxx|\
+tutorial-v7-perf.cxx|\
+tutorial-v7-perfcomp.cxx|\
+tutorial-v7-simple.cxx"
 %endif
 %endif
 
@@ -3985,6 +3994,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 20 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-4
+- Add missing #include <cstdint>
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.26.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 1801745923d911ad2b2b0d529a86e2bdd8836fb3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 30 Jan 2023 19:16:25 +0100
Subject: [PATCH 240/344] Adapt to numpy 1.24

---
 root-avoid-deprecated-numpy.object.patch | 22 ++++++++++++++++
 root.spec                                | 32 +++++++++++++-----------
 2 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 root-avoid-deprecated-numpy.object.patch

diff --git a/root-avoid-deprecated-numpy.object.patch b/root-avoid-deprecated-numpy.object.patch
new file mode 100644
index 0000000..9330bac
--- /dev/null
+++ b/root-avoid-deprecated-numpy.object.patch
@@ -0,0 +1,22 @@
+From 1e7dc9fcd60133375c3b725d8317fab339c2bf38 Mon Sep 17 00:00:00 2001
+From: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
+Date: Mon, 30 Jan 2023 10:31:29 +0100
+Subject: [PATCH] [DF][PyROOT] Avoid deprecated numpy.object
+
+---
+ .../pythonizations/python/ROOT/_pythonization/_rdataframe.py    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
+index 59cb0cd260dd..01cb08b0365f 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
+@@ -287,7 +287,7 @@ def GetValue(self):
+                     tmp = numpy.asarray(cpp_reference) # This adopts the memory of the C++ object.
+                     self._py_arrays[column] = ndarray(tmp, self._result_ptrs[column])
+                 else:
+-                    tmp = numpy.empty(len(cpp_reference), dtype=numpy.object)
++                    tmp = numpy.empty(len(cpp_reference), dtype=object)
+                     for i, x in enumerate(cpp_reference):
+                         tmp[i] = x # This creates only the wrapping of the objects and does not copy.
+                     self._py_arrays[column] = ndarray(tmp, self._result_ptrs[column])
diff --git a/root.spec b/root.spec
index 6df3ae4..7b8e3be 100644
--- a/root.spec
+++ b/root.spec
@@ -61,7 +61,7 @@
 Name:		root
 Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -184,6 +184,10 @@ Patch37:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
 Patch38:	%{name}-add-missing-include-cstdint.patch
 #		Backport from upstream
 Patch39:	%{name}-fix-compilation-with-gcc13.patch
+#		numpy.object obsolete since numpy 1.20 and removed since 1.24
+#		https://github.com/root-project/root/issues/12148
+#		https://github.com/root-project/root/pull/12159
+Patch40:	%{name}-avoid-deprecated-numpy.object.patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	devtoolset-8-toolchain
@@ -291,12 +295,8 @@ BuildRequires:	protobuf-devel >= 3.0
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
-%if %{?fedora}%{!?fedora:0}
 BuildRequires:	python3-rcssmin
-BuildRequires:	uglify-js
-%else
-BuildRequires:	yuicompressor
-%endif
+BuildRequires:	uglify-js3
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
 BuildRequires:	gmock-devel
@@ -2052,6 +2052,7 @@ This package contains an ntuple extension for ROOT 7.
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2122,18 +2123,10 @@ unset QTINC
 
 # Minify script and style files
 for s in etc/notebook/JsMVA/js/*.js ; do
-%if %{?fedora}%{!?fedora:0}
-    uglifyjs ${s} -c -m -o ${s%.js}.min.js
-%else
-    yuicompressor ${s} -o ${s%.js}.min.js
-%endif
+    uglifyjs-3 ${s} -c -m -o ${s%.js}.min.js
 done
 for s in etc/notebook/JsMVA/css/*.css ; do
-%if %{?fedora}%{!?fedora:0}
     python3 -m rcssmin < ${s} > ${s%.css}.min.css
-%else
-    yuicompressor ${s} -o ${s%.css}.min.css
-%endif
 done
 
 # Avoid overlinking (this used to be the default with the old configure script)
@@ -2779,6 +2772,12 @@ pyunittests-pyroot-roofit-roodataset-numpy"
 excluded="${excluded}|\
 pyunittests-dataframe-histograms|\
 tutorial-legacy-rootenv"
+
+%ifarch %{ix86}
+# Failures with Fedora 38 i686 (after numpy 1.24 update)
+excluded="${excluded}|\
+pyunittests-pyroot-roofit-roodataset-numpy"
+%endif
 %endif
 
 %ifarch %{arm}
@@ -3994,6 +3993,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 30 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-5
+- Adapt to numpy 1.24
+
 * Fri Jan 20 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-4
 - Add missing #include <cstdint>
 

From e41288dd187d613cfcbd4760a6bb92e33b0f1797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 30 Jan 2023 22:16:05 +0100
Subject: [PATCH 241/344] Rebuilt to change Python shebangs to
 /usr/bin/python3.6 on EPEL 8

See https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/thread/RE3PG72B5AX7NTACPDSBGOWCMN7I3OQJ/
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bead5ca..0cb36c8 100644
--- a/root.spec
+++ b/root.spec
@@ -65,7 +65,7 @@
 Name:		root
 Version:	6.26.10
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -3985,6 +3985,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 30 2023 Miro Hrončok <mhroncok@redhat.com> - 6.26.10-2
+- Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8
+
 * Wed Nov 16 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-1
 - Update to 6.26.10
 - Drop patches root-Fixes-for-garbage-collection-in-Python-3.11.patch

From a08fcbc5ad2eb7bbf4e170ffe106d439909c9867 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 19 Mar 2023 07:53:00 +0100
Subject: [PATCH 242/344] Update to 6.28.00

ROOT now uses llvm/clang version 13 (updated from version 9)
Clean up specfile by removing EPEL 7 conditionals
Drop dataframe, roofit and tmva-sofieparser on EPEL 8 ppc64le due to
  "pure virtual method called" errors
Split the root-geom sub-package into three separate sub-packages:
  root-geom, root-geom-builder and root-geom-painter
Enable uring support in EPEL 9 (liburing now available)
New sub-packages: root-geom-webviewer, root-roofit-jsoninterface,
  root-testsupport, root-tree-ntuple-utils, root-tree-webviewer,
  root-xroofit
Dropped patches: 31
New patches: 17
Updated patches: 4
---
 root-32bit-dataframe.patch                    |  170 ---
 ...ast-error-when-calling-PyTuple_SET_I.patch |   29 -
 ...ust-not-be-included-directly-in-3.11.patch |   34 -
 ...t-and-TMVA-pythonizations-if-enabled.patch |  117 ++
 ...ProdPdf.TestGetPartIntList-unit-test.patch |  168 +++
 ...et-DataLayout-from-our-TargetMachine.patch |   32 +
 root-Simplify-creation-of-TargetMachine.patch |   94 ++
 root-add-missing-include-cstdint.patch        |   10 +-
 root-avoid-deleting-TFormulas-twice.patch     |   37 -
 root-avoid-deprecated-numpy.object.patch      |   22 -
 ...race-condition-tutorial-roofit-rf512.patch |   50 -
 root-big-endian-byte-swap.patch               |   56 +-
 ...g-Disable-outline-atomics-on-AArch64.patch |   35 +
 root-core-base-test.patch                     |   31 -
 root-dataframe-callback.patch                 |   45 -
 root-different-filename.patch                 |   48 -
 root-do-not-remove-Wp-before-D-and-U.patch    |   44 +
 root-dont-install-roofit-files-fix.patch      |   26 +
 ...roofit-files-when-roofit-is-disabled.patch |   75 +
 root-endian-warn.patch                        |   33 -
 root-fix-compilation-with-gcc-12.patch        |   63 -
 root-fix-compilation-with-gcc13.patch         |   25 -
 ...e-on-ppc64le-and-aarch64-with-gcc-12.patch |   21 +-
 root-fixes-for-32bit-builds.patch             |  185 +++
 root-fontconfig.patch                         |  132 +-
 root-get-rid-of-lsb_release.patch             |  245 ----
 root-gtest-compat.patch                       |   85 ++
 root-ignore-prefix.patch                      |   36 -
 root-longlong.patch                           |   42 -
 root-make-DistRDF-optional.patch              |   32 +
 ...ased-library-search-behavior-default.patch |  147 --
 root-namespace-pymva.patch                    |   31 -
 root-namespace-roofit.patch                   |   43 -
 root-namespace-sofie.patch                    |   30 -
 ...kBuf-add-missing-call-to-ReleasePage.patch |   30 +
 root-ntuplewait.patch                         |   39 -
 root-old-gtest-compat.patch                   |  477 -------
 root-older-python.patch                       |   46 -
 root-rcolor-static-init.patch                 |   42 -
 root-roofit-tutorial.patch                    |   74 -
 root-stressvector-test-fails-on-ix86.patch    |   37 +
 root-symbol-rewrite.patch                     |   31 -
 root-test-timeout.patch                       |  110 --
 ...-test-compares-two-doubles-and-fails.patch |   49 +
 ...-threadsh1-avoid-heap-use-after-free.patch |   48 -
 ...-Speed-up-TMVA-CNN-and-RNN-tutorials.patch |  239 ++++
 root-tmva-threads.patch                       |   79 --
 root-unbundle-gtest.patch                     |  202 ---
 root-uring-warn.patch                         |   43 -
 ...t-minimum-python-version-for-DistRDF.patch |   27 +
 ...ue-filenames-in-fillrandom-tutorials.patch |   25 -
 ...sts-using-clad-when-clad-is-disabled.patch |   66 +
 root.spec                                     | 1240 +++++++----------
 sources                                       |    2 +-
 54 files changed, 1982 insertions(+), 3197 deletions(-)
 delete mode 100644 root-32bit-dataframe.patch
 delete mode 100644 root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
 delete mode 100644 root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
 create mode 100644 root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
 create mode 100644 root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
 create mode 100644 root-Set-DataLayout-from-our-TargetMachine.patch
 create mode 100644 root-Simplify-creation-of-TargetMachine.patch
 delete mode 100644 root-avoid-deleting-TFormulas-twice.patch
 delete mode 100644 root-avoid-deprecated-numpy.object.patch
 delete mode 100644 root-avoid-race-condition-tutorial-roofit-rf512.patch
 create mode 100644 root-cling-Disable-outline-atomics-on-AArch64.patch
 delete mode 100644 root-core-base-test.patch
 delete mode 100644 root-dataframe-callback.patch
 delete mode 100644 root-different-filename.patch
 create mode 100644 root-do-not-remove-Wp-before-D-and-U.patch
 create mode 100644 root-dont-install-roofit-files-fix.patch
 create mode 100644 root-dont-install-roofit-files-when-roofit-is-disabled.patch
 delete mode 100644 root-endian-warn.patch
 delete mode 100644 root-fix-compilation-with-gcc-12.patch
 delete mode 100644 root-fix-compilation-with-gcc13.patch
 create mode 100644 root-fixes-for-32bit-builds.patch
 delete mode 100644 root-get-rid-of-lsb_release.patch
 create mode 100644 root-gtest-compat.patch
 delete mode 100644 root-ignore-prefix.patch
 delete mode 100644 root-longlong.patch
 create mode 100644 root-make-DistRDF-optional.patch
 delete mode 100644 root-make-dyld-based-library-search-behavior-default.patch
 delete mode 100644 root-namespace-pymva.patch
 delete mode 100644 root-namespace-roofit.patch
 delete mode 100644 root-namespace-sofie.patch
 create mode 100644 root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
 delete mode 100644 root-ntuplewait.patch
 delete mode 100644 root-old-gtest-compat.patch
 delete mode 100644 root-older-python.patch
 delete mode 100644 root-rcolor-static-init.patch
 delete mode 100644 root-roofit-tutorial.patch
 create mode 100644 root-stressvector-test-fails-on-ix86.patch
 delete mode 100644 root-symbol-rewrite.patch
 delete mode 100644 root-test-timeout.patch
 create mode 100644 root-testRooAbsL-test-compares-two-doubles-and-fails.patch
 delete mode 100644 root-threadsh1-avoid-heap-use-after-free.patch
 create mode 100644 root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
 delete mode 100644 root-tmva-threads.patch
 delete mode 100644 root-unbundle-gtest.patch
 delete mode 100644 root-uring-warn.patch
 create mode 100644 root-use-consistent-minimum-python-version-for-DistRDF.patch
 delete mode 100644 root-use-unique-filenames-in-fillrandom-tutorials.patch
 create mode 100644 root-veto-tests-using-clad-when-clad-is-disabled.patch

diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
deleted file mode 100644
index 89e3c95..0000000
--- a/root-32bit-dataframe.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 686d5011df607fde2a42c729d6bd446486163784 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 13 Mar 2020 16:20:17 +0100
-Subject: [PATCH] Restore 32-bit dataframe
-
----
- build/unix/makepchinput.py                 | 3 ---
- cmake/modules/RootBuildOptions.cmake       | 5 -----
- tree/dataframe/test/dataframe_cache.cxx    | 4 ----
- tree/dataframe/test/datasource_arrow.cxx   | 4 ----
- tree/dataframe/test/datasource_csv.cxx     | 4 ----
- tree/dataframe/test/datasource_root.cxx    | 4 ----
- tree/dataframe/test/datasource_trivial.cxx | 4 ----
- tutorials/CMakeLists.txt                   | 5 -----
- 8 files changed, 33 deletions(-)
-
-diff --git a/build/unix/makepchinput.py b/build/unix/makepchinput.py
-index 1adff487de..eec73f946d 100755
---- a/build/unix/makepchinput.py
-+++ b/build/unix/makepchinput.py
-@@ -252,9 +252,6 @@ def isDirForPCH(dirName, legacyPyROOT):
-                            "math/vdt",
-                            "tmva/rmva"]
- 
--   if (sys.platform != 'win32' and sys.maxsize <= 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
--      PCHPatternsBlacklist.append("tree/dataframe")
--
-    accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
-                not isAnyPatternInString(PCHPatternsBlacklist,dirName)
- 
-diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
-index 7886c5f3e9..6fbd8873f1 100644
---- a/cmake/modules/RootBuildOptions.cmake
-+++ b/cmake/modules/RootBuildOptions.cmake
-@@ -344,11 +344,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
-   set(runtime_cxxmodules_defvalue OFF)
- endif()
- 
--# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
--if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
--    set(dataframe_defvalue OFF)
--endif()
--
- # MultiProcess is not possible on Windows, so fail if it is manually set:
- if(roofit_multiprocess AND WIN32)
-     message(FATAL_ERROR ">>> Option 'roofit_multiprocess' is not supported on Windows.")
-diff --git a/tree/dataframe/test/dataframe_cache.cxx b/tree/dataframe/test/dataframe_cache.cxx
-index 77be488052..8475b98acb 100644
---- a/tree/dataframe/test/dataframe_cache.cxx
-+++ b/tree/dataframe/test/dataframe_cache.cxx
-@@ -224,8 +224,6 @@ TEST(Cache, evtCounter)
- 
- }
- 
--#ifdef R__B64
--
- TEST(Cache, Regex)
- {
- 
-@@ -329,8 +327,6 @@ TEST(Cache, Carrays)
-    gSystem->Unlink(fileName);
- }
- 
--#endif // R__B64
--
- // ROOT-10563
- TEST(Cache, Alias)
- {
-diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
-index 5ac9fcf09a..5f5f94a666 100644
---- a/tree/dataframe/test/datasource_arrow.cxx
-+++ b/tree/dataframe/test/datasource_arrow.cxx
-@@ -177,8 +177,6 @@ TEST(RArrowDS, SetNSlotsTwice)
- }
- #endif
- 
--#ifdef R__B64
--
- TEST(RArrowDS, FromARDF)
- {
-    std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
-@@ -250,5 +248,3 @@ TEST(RArrowDS, FromARDFWithJittingMT)
- }
- 
- #endif // R__USE_IMT
--
--#endif // R__B64
-diff --git a/tree/dataframe/test/datasource_csv.cxx b/tree/dataframe/test/datasource_csv.cxx
-index 6554719f98..d93117b67a 100644
---- a/tree/dataframe/test/datasource_csv.cxx
-+++ b/tree/dataframe/test/datasource_csv.cxx
-@@ -210,8 +210,6 @@ TEST(RCsvDS, SetNSlotsTwice)
- }
- #endif
- 
--#ifdef R__B64
--
- TEST(RCsvDS, FromARDF)
- {
-    std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
-@@ -324,5 +322,3 @@ TEST(RCsvDS, ProgressiveReadingRDFMT)
- }
- 
- #endif // R__USE_IMT
--
--#endif // R__B64
-diff --git a/tree/dataframe/test/datasource_root.cxx b/tree/dataframe/test/datasource_root.cxx
-index 79840d9fff..4c795fee6f 100644
---- a/tree/dataframe/test/datasource_root.cxx
-+++ b/tree/dataframe/test/datasource_root.cxx
-@@ -117,8 +117,6 @@ TEST(TRootTDS, SetNSlotsTwice)
- }
- #endif
- 
--#ifdef R__B64
--
- TEST(TRootTDS, FromARDF)
- {
-    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
-@@ -190,5 +188,3 @@ TEST(TRootTDS, FromARDFWithJittingMT)
- }
- 
- #endif // R__USE_IMT
--
--#endif // R__B64
-diff --git a/tree/dataframe/test/datasource_trivial.cxx b/tree/dataframe/test/datasource_trivial.cxx
-index 7da675c83b..deb89301c7 100644
---- a/tree/dataframe/test/datasource_trivial.cxx
-+++ b/tree/dataframe/test/datasource_trivial.cxx
-@@ -141,8 +141,6 @@ TEST(RTrivialDS, EarlyQuitWithRange)
-    EXPECT_EQ(df.Range(10).Count().GetValue(), 10);
- }
- 
--#ifdef R__B64
--
- TEST(RTrivialDS, FromARDFWithJitting)
- {
-    std::unique_ptr<RDataSource> tds(new RTrivialDS(32));
-@@ -245,5 +243,3 @@ TEST(RTrivialDS, SkipEntriesMT)
- }
- 
- #endif // R__USE_IMT
--
--#endif // R__B64
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index a6e5c97703..12bb610d67 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -332,10 +332,6 @@ else()
-   list(APPEND root7_veto ${v7_veto_files})
- endif()
- 
--if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
--  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C v7/ntuple/ntpl004_dimuon.C)
--endif()
--
- if (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64)
-    set(macm1_veto dataframe/df107_SingleTopAnalysis.py)
- endif()
-@@ -391,7 +387,6 @@ set(all_veto hsimple.C
-              ${classic_veto}
-              ${pythia_veto}
-              ${root7_veto}
--             ${bits32_veto}
-              ${xrootd_veto}
-              ${mlp_veto}
-              ${spectrum_veto}
--- 
-2.35.1
-
diff --git a/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch b/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
deleted file mode 100644
index ca908b8..0000000
--- a/root-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a12f3b736a9c69e0d69e7f483e50e7cdf59d9fd2 Mon Sep 17 00:00:00 2001
-From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
-Date: Fri, 10 Jun 2022 16:42:49 +0200
-Subject: [PATCH] [PyROOT] Prevent cast error when calling PyTuple_SET_ITEM in
- 3.11
-
-PyTuple_SET_ITEM ends up calling _PyObject_CAST(nullptr) which
-causes "error: invalid cast from type 'std::nullptr_t' to type
-'const PyObject*' {aka 'const _object*'}
----
- bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
-index 685ad3dc60..2189348594 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPMethod.cxx
-@@ -580,7 +580,7 @@ PyObject* CPyCppyy::CPPMethod::ProcessKeywords(PyObject* self, PyObject* args, P
- // set all values to zero to be able to check them later (this also guarantees normal
- // cleanup by the tuple deallocation)
-     for (Py_ssize_t i = 0; i < nArgs+nKeys; ++i)
--        PyTuple_SET_ITEM(newArgs, i, nullptr);
-+        PyTuple_SET_ITEM(newArgs, i, static_cast<PyObject*>(nullptr));
- 
- // next, insert the keyword values
-     PyObject *key, *value;
--- 
-2.36.1
-
diff --git a/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch b/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
deleted file mode 100644
index a845fa4..0000000
--- a/root-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 484deb056dacf768aba4954073b41105c431bffc Mon Sep 17 00:00:00 2001
-From: Enric Tejedor Saavedra <enric.tejedor.saavedra@cern.ch>
-Date: Thu, 9 Jun 2022 12:24:07 +0200
-Subject: [PATCH] [PyROOT] code.h must not be included directly in 3.11
-
-It has been moved to Include/cpython, and it is included by Python.h.
-
-See:
-https://docs.python.org/3.11/whatsnew/3.11.html
----
- bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-index 59997e390d..28bbd635c2 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-@@ -1,10 +1,10 @@
- // Bindings
- #include "CPyCppyy.h"
- #include "structmember.h"    // from Python
--#if PY_VERSION_HEX >= 0x02050000
--#include "code.h"            // from Python
--#else
-+#if PY_VERSION_HEX < 0x02050000
- #include "compile.h"         // from Python
-+#elif PY_VERSION_HEX < 0x030b0000
-+#include "code.h"            // from Python
- #endif
- #ifndef CO_NOFREE
- // python2.2 does not have CO_NOFREE defined
--- 
-2.36.1
-
diff --git a/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch b/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
new file mode 100644
index 0000000..0ca4387
--- /dev/null
+++ b/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
@@ -0,0 +1,117 @@
+From d759a42a33fe6a9195c3c79275fe05e4da2b4195 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Sat, 14 Jan 2023 12:25:20 +0100
+Subject: [PATCH] [PyROOT] Only build RooFit and TMVA pythonizations if needed
+
+Like this, we are polluting the build and install directories less with
+unneeded files and it also speeds up the build process a bit if RooFit
+and/or TMVA are disabled. Their pythonization files don't need to be
+compiled to `.pyc` files.
+---
+ bindings/pyroot/pythonizations/CMakeLists.txt | 76 ++++++++++---------
+ 1 file changed, 42 insertions(+), 34 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
+index 9e853d1885..8395785b24 100644
+--- a/bindings/pyroot/pythonizations/CMakeLists.txt
++++ b/bindings/pyroot/pythonizations/CMakeLists.txt
+@@ -25,6 +25,48 @@ if(dataframe)
+         inc/RNumpyDS.hxx)
+ endif()
+ 
++if(roofit)
++    list(APPEND PYROOT_EXTRA_PY2_PY3_SOURCE
++        ROOT/_pythonization/_roofit/__init__.py
++        ROOT/_pythonization/_roofit/_rooabscollection.py
++        ROOT/_pythonization/_roofit/_rooabsdata.py
++        ROOT/_pythonization/_roofit/_rooabspdf.py
++        ROOT/_pythonization/_roofit/_rooabsreallvalue.py
++        ROOT/_pythonization/_roofit/_rooabsreal.py
++        ROOT/_pythonization/_roofit/_rooarglist.py
++        ROOT/_pythonization/_roofit/_rooargset.py
++        ROOT/_pythonization/_roofit/_roocategory.py
++        ROOT/_pythonization/_roofit/_roochi2var.py
++        ROOT/_pythonization/_roofit/_roodatahist.py
++        ROOT/_pythonization/_roofit/_roodataset.py
++        ROOT/_pythonization/_roofit/_roodecays.py
++        ROOT/_pythonization/_roofit/_roogenfitstudy.py
++        ROOT/_pythonization/_roofit/_rooglobalfunc.py
++        ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
++        ROOT/_pythonization/_roofit/_roomcstudy.py
++        ROOT/_pythonization/_roofit/_roomsgservice.py
++        ROOT/_pythonization/_roofit/_roonllvar.py
++        ROOT/_pythonization/_roofit/_rooprodpdf.py
++        ROOT/_pythonization/_roofit/_roorealvar.py
++        ROOT/_pythonization/_roofit/_roosimultaneous.py
++        ROOT/_pythonization/_roofit/_roosimwstool.py
++        ROOT/_pythonization/_roofit/_roovectordatastore.py
++        ROOT/_pythonization/_roofit/_rooworkspace.py
++        ROOT/_pythonization/_roofit/_utils.py)
++endif()
++
++if(tmva)
++    list(APPEND PYROOT_EXTRA_PY2_PY3_SOURCE
++        ROOT/_pythonization/_tmva/_crossvalidation.py
++        ROOT/_pythonization/_tmva/_dataloader.py
++        ROOT/_pythonization/_tmva/_factory.py
++        ROOT/_pythonization/_tmva/__init__.py
++        ROOT/_pythonization/_tmva/_rbdt.py
++        ROOT/_pythonization/_tmva/_rtensor.py
++        ROOT/_pythonization/_tmva/_tree_inference.py
++        ROOT/_pythonization/_tmva/_utils.py)
++endif()
++
+ list(APPEND PYROOT_EXTRA_HEADERS
+      inc/TPyDispatcher.h)
+ 
+@@ -39,32 +81,6 @@ set(py2_py3_sources
+   ROOT/_pythonization/_generic.py
+   ROOT/_pythonization/__init__.py
+   ROOT/_pythonization/_pyz_utils.py
+-  ROOT/_pythonization/_roofit/__init__.py
+-  ROOT/_pythonization/_roofit/_rooabscollection.py
+-  ROOT/_pythonization/_roofit/_rooabsdata.py
+-  ROOT/_pythonization/_roofit/_rooabspdf.py
+-  ROOT/_pythonization/_roofit/_rooabsreallvalue.py
+-  ROOT/_pythonization/_roofit/_rooabsreal.py
+-  ROOT/_pythonization/_roofit/_rooarglist.py
+-  ROOT/_pythonization/_roofit/_rooargset.py
+-  ROOT/_pythonization/_roofit/_roocategory.py
+-  ROOT/_pythonization/_roofit/_roochi2var.py
+-  ROOT/_pythonization/_roofit/_roodatahist.py
+-  ROOT/_pythonization/_roofit/_roodataset.py
+-  ROOT/_pythonization/_roofit/_roodecays.py
+-  ROOT/_pythonization/_roofit/_roogenfitstudy.py
+-  ROOT/_pythonization/_roofit/_rooglobalfunc.py
+-  ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
+-  ROOT/_pythonization/_roofit/_roomcstudy.py
+-  ROOT/_pythonization/_roofit/_roomsgservice.py
+-  ROOT/_pythonization/_roofit/_roonllvar.py
+-  ROOT/_pythonization/_roofit/_rooprodpdf.py
+-  ROOT/_pythonization/_roofit/_roorealvar.py
+-  ROOT/_pythonization/_roofit/_roosimultaneous.py
+-  ROOT/_pythonization/_roofit/_roosimwstool.py
+-  ROOT/_pythonization/_roofit/_roovectordatastore.py
+-  ROOT/_pythonization/_roofit/_rooworkspace.py
+-  ROOT/_pythonization/_roofit/_utils.py
+   ROOT/_pythonization/_rvec.py
+   ROOT/_pythonization/_stl_vector.py
+   ROOT/_pythonization/_tarray.py
+@@ -79,14 +95,6 @@ set(py2_py3_sources
+   ROOT/_pythonization/_tgraph.py
+   ROOT/_pythonization/_th1.py
+   ROOT/_pythonization/_titer.py
+-  ROOT/_pythonization/_tmva/_crossvalidation.py
+-  ROOT/_pythonization/_tmva/_dataloader.py
+-  ROOT/_pythonization/_tmva/_factory.py
+-  ROOT/_pythonization/_tmva/__init__.py
+-  ROOT/_pythonization/_tmva/_rbdt.py
+-  ROOT/_pythonization/_tmva/_rtensor.py
+-  ROOT/_pythonization/_tmva/_tree_inference.py
+-  ROOT/_pythonization/_tmva/_utils.py
+   ROOT/_pythonization/_tobject.py
+   ROOT/_pythonization/_tobjstring.py
+   ROOT/_pythonization/_tseqcollection.py
+-- 
+2.39.2
+
diff --git a/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch b/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
new file mode 100644
index 0000000..d295c53
--- /dev/null
+++ b/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
@@ -0,0 +1,168 @@
+From c20004230608a5679ee6c0a7648af5f190c415c9 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Tue, 7 Mar 2023 11:53:01 +0100
+Subject: [PATCH] [RF] Rewrite `RooProdPdf.TestGetPartIntList` unit test
+
+In the ROOT 6.26 development cycle, the RooProdPdf was partially
+rewritten in moden C++ with less manual memory allocation to improve
+performance (PR #7907).
+
+In that PR, a unit test that verifies the RooProdPdf can correctly deal
+with factorizing PDFs was implemented. However, that test used an
+arbitrary PDF where the correct factorization was checked in a rather
+crude way: check by hashing the content of the RooProdPdf cache element
+for a given normalization set that said PR doesn't change any behavior
+(the reference hash was hardcoded in the unit test).
+
+This commit suggests a better alternative for the unit test, checking
+for a multidimensional product pdf of factorizing uniform pdfs that the
+pdf values for differenc normalization sets is as expected. This should
+cover the same functionality and is less fragile and implementation
+dependend than hashing the cache elements.
+
+This closes GitHub issue #12430, as the rewritten test is not affected
+anymore by the problem reported in that issue.
+---
+ roofit/roofitcore/inc/RooProdPdf.h        |  2 -
+ roofit/roofitcore/src/RooProdPdf.cxx      |  4 --
+ roofit/roofitcore/test/testRooProdPdf.cxx | 88 +++++++----------------
+ 3 files changed, 26 insertions(+), 68 deletions(-)
+
+diff --git a/roofit/roofitcore/inc/RooProdPdf.h b/roofit/roofitcore/inc/RooProdPdf.h
+index 3d779a4901..0a76c839aa 100644
+--- a/roofit/roofitcore/inc/RooProdPdf.h
++++ b/roofit/roofitcore/inc/RooProdPdf.h
+@@ -96,8 +96,6 @@ public:
+ 
+   RooArgSet* findPdfNSet(RooAbsPdf const& pdf) const ;
+ 
+-  void writeCacheToStream(std::ostream& os, RooArgSet const* nset) const;
+-
+   std::unique_ptr<RooAbsArg> compileForNormSet(RooArgSet const &normSet, RooFit::Detail::CompileContext & ctx) const override;
+ 
+ private:
+diff --git a/roofit/roofitcore/src/RooProdPdf.cxx b/roofit/roofitcore/src/RooProdPdf.cxx
+index 8c8c7e01c6..6af7279603 100644
+--- a/roofit/roofitcore/src/RooProdPdf.cxx
++++ b/roofit/roofitcore/src/RooProdPdf.cxx
+@@ -2324,10 +2324,6 @@ void RooProdPdf::CacheElem::writeToStream(std::ostream& os) const {
+   }
+ }
+ 
+-void RooProdPdf::writeCacheToStream(std::ostream& os, RooArgSet const* nset) const {
+-  getCacheElem(nset)->writeToStream(os);
+-}
+-
+ std::unique_ptr<RooArgSet> RooProdPdf::fillNormSetForServer(RooArgSet const &normSet, RooAbsArg const &server) const
+ {
+    if (normSet.empty())
+diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
+index d794fb415a..ff334211d2 100644
+--- a/roofit/roofitcore/test/testRooProdPdf.cxx
++++ b/roofit/roofitcore/test/testRooProdPdf.cxx
+@@ -74,76 +74,40 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+                             return ss.str();
+                          });
+ 
+-std::vector<std::vector<RooAbsArg *>> allPossibleSubset(RooAbsCollection const &arr)
++TEST(RooProdPdf, TestGetPartIntList)
+ {
+-   std::vector<std::vector<RooAbsArg *>> out;
+-   std::size_t n = arr.size();
+-
+-   std::size_t count = std::pow(2, n);
+-   for (std::size_t i = 0; i < count; i++) {
+-      out.emplace_back();
+-      auto &back = out.back();
+-      for (std::size_t j = 0; j < n; j++) {
+-         if ((i & (1 << j)) != 0) {
+-            back.push_back(arr[j]);
+-         }
+-      }
+-   }
+-   return out;
+-}
++   RooHelpers::LocalChangeMsgLevel chmsglvl1{RooFit::ERROR, 0u, RooFit::InputArguments, true};
++   RooHelpers::LocalChangeMsgLevel chmsglvl2{RooFit::WARNING, 0u, RooFit::NumIntegration, true};
+ 
+-// Hash the integral configuration for all possible normalization sets.
+-unsigned int hashRooProduct(RooProdPdf const &prod)
+-{
+-   RooArgSet params;
+-   prod.getParameters(nullptr, params);
+-   auto subsets = allPossibleSubset(params);
++   // This test checks if RooProdPdf::getPartIntList factorizes the integrals
++   // as expected, for the example of a three dimensional RooProdPdf.
+ 
+-   std::stringstream ss;
++   RooWorkspace ws;
+ 
+-   for (auto const &subset : subsets) {
+-      // this can't be on the stack, otherwise we will always get the same
+-      // address and therefore get wrong cache hits!
+-      auto nset = std::make_unique<RooArgSet>(subset.begin(), subset.end());
+-      prod.writeCacheToStream(ss, nset.get());
+-   }
++   double a = 10.;
++   double b = 4.;
++   double c = 2.5;
+ 
+-   std::string s = ss.str();
+-   return TString::Hash(s.c_str(), s.size());
+-}
++   auto &x = static_cast<RooRealVar &>(*ws.factory("x[0, 0, " + std::to_string(a) + "]"));
++   auto &y = static_cast<RooRealVar &>(*ws.factory("y[0, 0, " + std::to_string(b) + "]"));
++   auto &z = static_cast<RooRealVar &>(*ws.factory("z[0, 0, " + std::to_string(c) + "]"));
+ 
+-TEST(RooProdPdf, TestGetPartIntList)
+-{
+-   // This test checks if RooProdPdf::getPartIntList factorizes the integrals
+-   // as expected.
+-   // Instead of trying to construct tests for all possible cases by hand,
+-   // this test creates a product where the factors have different patters of
+-   // overlapping parameters. To make sure all possible cases are covered, we
+-   // are using all possible subsets of the parameters one after the other to
+-   // create the reference test result.
+-
+-   RooRealVar x{"x", "x", 1., 0, 10};
+-   RooRealVar y{"y", "y", 1., 0, 10};
+-   RooRealVar z{"z", "z", 1., 0, 10};
+-
+-   RooRealVar m1{"m1", "m1", 1., 0, 10};
+-   RooRealVar m2{"m2", "m2", 1., 0, 10};
+-   RooRealVar m3{"m3", "m3", 1., 0, 10};
+-
+-   RooGenericPdf gauss1{"gauss1", "gauss1", "x+m1", {x, m1}};
+-   RooGenericPdf gauss2{"gauss2", "gauss2", "x+m2", {x, m2}};
+-   RooGenericPdf gauss3{"gauss3", "gauss3", "y+m3", {y, m3}};
+-   RooGenericPdf gauss4{"gauss4", "gauss4", "z+m1", {z, m1}};
+-   RooGenericPdf gauss5{"gauss5", "gauss5", "x+m1", {x, m1}};
++   // Factorize the product in one 1D and one 2D pdf to get a more complicated
++   // and complete test case.
++   ws.factory("Uniform::pdf1({x})");
++   ws.factory("Uniform::pdf2({y, z})");
+ 
+    // Product of all the pdfs.
+-   RooProdPdf prod{"prod", "prod", RooArgList{gauss1, gauss2, gauss3, gauss4, gauss5}};
+-
+-   // We hash the string serializations of caches for all possible
+-   // normalization sets and compare it to the expected hash.
+-   // This value must be updated if the convention for integral names in
+-   // RooProdPdf changes.
+-   EXPECT_EQ(hashRooProduct(prod), 2448666198);
++   auto &prod = static_cast<RooProdPdf &>(*ws.factory("PROD::prod(pdf1, pdf2)"));
++
++   EXPECT_DOUBLE_EQ(prod.getVal({}), 1.0);
++   EXPECT_DOUBLE_EQ(prod.getVal({x}), 1. / a);
++   EXPECT_DOUBLE_EQ(prod.getVal({y}), 1. / b);
++   EXPECT_DOUBLE_EQ(prod.getVal({z}), 1. / c);
++   EXPECT_DOUBLE_EQ(prod.getVal({x, y}), 1. / a / b);
++   EXPECT_DOUBLE_EQ(prod.getVal({x, z}), 1. / a / c);
++   EXPECT_DOUBLE_EQ(prod.getVal({y, z}), 1. / b / c);
++   EXPECT_DOUBLE_EQ(prod.getVal({x, y, z}), 1. / a / b / c);
+ }
+ 
+ TEST(RooProdPdf, TestDepsAreCond)
+-- 
+2.39.2
+
diff --git a/root-Set-DataLayout-from-our-TargetMachine.patch b/root-Set-DataLayout-from-our-TargetMachine.patch
new file mode 100644
index 0000000..d936302
--- /dev/null
+++ b/root-Set-DataLayout-from-our-TargetMachine.patch
@@ -0,0 +1,32 @@
+From d4c66a41ae50ecfb905ebe66eb296de4e5c146d7 Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Thu, 16 Feb 2023 16:40:16 +0100
+Subject: [PATCH 2/2] [cling] Set DataLayout from our TargetMachine
+
+Otherwise LLJIT's constructor will ask the LLJITBuilder's JTMB to
+create a DataLayout. As we don't propagate the JTMB (yet -- we
+probably should!), this will be wrong if target features influence
+the DataLayout.
+
+This should fix #12293.
+
+(cherry picked from commit 254bac6cfad78ed671ec3af3d2001c52487b4c86)
+---
+ interpreter/cling/lib/Interpreter/IncrementalJIT.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
+index 80b6761491..e1721a4d45 100644
+--- a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
++++ b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
+@@ -358,6 +358,7 @@ IncrementalJIT::IncrementalJIT(
+   ErrorAsOutParameter _(&Err);
+ 
+   LLJITBuilder Builder;
++  Builder.setDataLayout(TM->createDataLayout());
+   Builder.setExecutorProcessControl(std::move(EPC));
+ 
+   // Create ObjectLinkingLayer with our own MemoryManager.
+-- 
+2.39.2
+
diff --git a/root-Simplify-creation-of-TargetMachine.patch b/root-Simplify-creation-of-TargetMachine.patch
new file mode 100644
index 0000000..8eaa5d8
--- /dev/null
+++ b/root-Simplify-creation-of-TargetMachine.patch
@@ -0,0 +1,94 @@
+From 63d16de24e695a847274fa3044127cefffc7b0b6 Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Fri, 3 Feb 2023 11:52:22 +0100
+Subject: [PATCH 1/2] [cling] Simplify creation of TargetMachine
+
+We know exactly which target triple and features the CompilerInstance
+wants, we don't need to (and probably must not) second-guess that. This
+brings us closer to upstream clang-repl and also includes the change of
+https://reviews.llvm.org/D128853 which is crucial for RISC-V.
+
+(cherry picked from commit df0905c499a541eaac3be63c0455a07946022983)
+---
+ .../cling/lib/Interpreter/IncrementalJIT.cpp  | 34 ++++++-------------
+ 1 file changed, 11 insertions(+), 23 deletions(-)
+
+diff --git a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
+index 5342945ed1..80b6761491 100644
+--- a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
++++ b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
+@@ -15,6 +15,7 @@
+ #include "cling/Utils/Output.h"
+ #include "cling/Utils/Utils.h"
+ 
++#include <clang/Basic/TargetInfo.h>
+ #include <clang/Basic/TargetOptions.h>
+ #include <clang/Frontend/CompilerInstance.h>
+ 
+@@ -292,45 +293,32 @@ Error RTDynamicLibrarySearchGenerator::tryToGenerate(
+ }
+ 
+ static std::unique_ptr<TargetMachine>
+-CreateHostTargetMachine(const clang::CompilerInstance& CI) {
+-  const clang::TargetOptions& TargetOpts = CI.getTargetOpts();
+-  const clang::CodeGenOptions& CGOpt = CI.getCodeGenOpts();
+-  const std::string& Triple = TargetOpts.Triple;
+-
+-  std::string Error;
+-  const Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error);
+-  if (!TheTarget) {
+-    cling::errs() << "cling::IncrementalExecutor: unable to find target:\n"
+-                  << Error;
+-    return std::unique_ptr<TargetMachine>();
+-  }
+-
++CreateTargetMachine(const clang::CompilerInstance& CI) {
+   CodeGenOpt::Level OptLevel = CodeGenOpt::Default;
+-  switch (CGOpt.OptimizationLevel) {
++  switch (CI.getCodeGenOpts().OptimizationLevel) {
+     case 0: OptLevel = CodeGenOpt::None; break;
+     case 1: OptLevel = CodeGenOpt::Less; break;
+     case 2: OptLevel = CodeGenOpt::Default; break;
+     case 3: OptLevel = CodeGenOpt::Aggressive; break;
+     default: OptLevel = CodeGenOpt::Default;
+   }
++
+   using namespace llvm::orc;
+-  auto JTMB = JITTargetMachineBuilder::detectHost();
+-  if (!JTMB)
+-    logAllUnhandledErrors(JTMB.takeError(), llvm::errs(),
+-                          "Error detecting host");
++  auto JTMB = JITTargetMachineBuilder(CI.getTarget().getTriple());
++  JTMB.addFeatures(CI.getTargetOpts().Features);
+ 
+-  JTMB->setCodeGenOptLevel(OptLevel);
++  JTMB.setCodeGenOptLevel(OptLevel);
+ #ifdef _WIN32
+-  JTMB->getOptions().EmulatedTLS = false;
++  JTMB.getOptions().EmulatedTLS = false;
+ #endif // _WIN32
+ 
+ #if defined(__powerpc64__) || defined(__PPC64__)
+   // We have to use large code model for PowerPC64 because TOC and text sections
+   // can be more than 2GB apart.
+-  JTMB->setCodeModel(CodeModel::Large);
++  JTMB.setCodeModel(CodeModel::Large);
+ #endif
+ 
+-  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
++  std::unique_ptr<TargetMachine> TM = cantFail(JTMB.createTargetMachine());
+ 
+   // Forcefully disable GlobalISel, it might be enabled on AArch64 without
+   // optimizations. In tests on an Apple M1 after the upgrade to LLVM 9, this
+@@ -365,7 +353,7 @@ IncrementalJIT::IncrementalJIT(
+     std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC, Error& Err,
+     void *ExtraLibHandle, bool Verbose)
+     : SkipHostProcessLookup(false),
+-      TM(CreateHostTargetMachine(CI)),
++      TM(CreateTargetMachine(CI)),
+       SingleThreadedContext(std::make_unique<LLVMContext>()) {
+   ErrorAsOutParameter _(&Err);
+ 
+-- 
+2.39.2
+
diff --git a/root-add-missing-include-cstdint.patch b/root-add-missing-include-cstdint.patch
index f86f0ee..0572ac3 100644
--- a/root-add-missing-include-cstdint.patch
+++ b/root-add-missing-include-cstdint.patch
@@ -1,4 +1,4 @@
-From cf6a925dfda2411b979da368e4cea769dbe6238a Mon Sep 17 00:00:00 2001
+From 87d302b9192538e18645f4c3efadc70e9a20a913 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Fri, 20 Jan 2023 06:34:11 +0100
 Subject: [PATCH] Add missing #include <cstdint>
@@ -14,8 +14,8 @@ index 69ee9ba99d..6367dfa93f 100644
 --- a/tree/ntuple/v7/inc/ROOT/RDaos.hxx
 +++ b/tree/ntuple/v7/inc/ROOT/RDaos.hxx
 @@ -22,6 +22,7 @@
- // Also, this header file is known to provide macros that conflict with std::min()/std::max().
- extern "C" void d_rank_list_free(d_rank_list_t *rank_list);
+ 
+ #include <daos.h>
  
 +#include <cstdint>
  #include <functional>
@@ -31,8 +31,8 @@ index a975b5ce5d..be08eba924 100644
  
 +#include <cstdint>
  #include <string>
+ #include <variant>
  #include <vector>
- 
 -- 
-2.39.0
+2.39.1
 
diff --git a/root-avoid-deleting-TFormulas-twice.patch b/root-avoid-deleting-TFormulas-twice.patch
deleted file mode 100644
index af758ed..0000000
--- a/root-avoid-deleting-TFormulas-twice.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c7dd58f3bc012690bab16763b1d73a4b7106ced9 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 29 Mar 2022 15:40:35 +0200
-Subject: [PATCH] Avoid deleting TFormulas twice
-
-Example failure:
-
- 562/1224 Test  #541: tutorial-gl-gltf3 ...................................................***Failed  Error regular expression found in output. Regex=[Error in <]  1.36 sec
-Processing /builddir/build/BUILD/root-6.26.00/tutorials/gl/gltf3.C...
-Error in <TList::Delete>: A list is accessing an object (0x7fffd1c959a0) already deleted (list name = Functions)
-Error in <TList::Delete>: A list is accessing an object (0x7fffd1c95750) already deleted (list name = Functions)
-
-The commit also changes the filename used in
-tutorials/hist/fillrandom.py to be different form the one used in
-tutorials/hist/fillrandom.C (and tutorials/pyroot/fillrandom.py)
----
- tutorials/gl/gltf3.C | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tutorials/gl/gltf3.C b/tutorials/gl/gltf3.C
-index 3697e69b7a..4089f0d2b7 100644
---- a/tutorials/gl/gltf3.C
-+++ b/tutorials/gl/gltf3.C
-@@ -27,8 +27,8 @@ void gltf3()
-    TPad *tf3Pad  = new TPad("box", "box", 0.04, 0.04, 0.96, 0.8);
-    tf3Pad->Draw();
- 
--   TFormula f1 = TFormula("f1", "x*x + y*y + z*z + 2*y - 1");
--   TFormula f2 = TFormula("f2", "x*x + y*y + z*z - 2*y - 1");
-+   TFormula *f1 = new TFormula("f1", "x*x + y*y + z*z + 2*y - 1");
-+   TFormula *f2 = new TFormula("f2", "x*x + y*y + z*z - 2*y - 1");
- 
-    // Klein bottle with cut top&bottom parts
-    // The Klein bottle is a closed non-orientable surface that has no
--- 
-2.35.1
-
diff --git a/root-avoid-deprecated-numpy.object.patch b/root-avoid-deprecated-numpy.object.patch
deleted file mode 100644
index 9330bac..0000000
--- a/root-avoid-deprecated-numpy.object.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1e7dc9fcd60133375c3b725d8317fab339c2bf38 Mon Sep 17 00:00:00 2001
-From: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
-Date: Mon, 30 Jan 2023 10:31:29 +0100
-Subject: [PATCH] [DF][PyROOT] Avoid deprecated numpy.object
-
----
- .../pythonizations/python/ROOT/_pythonization/_rdataframe.py    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-index 59cb0cd260dd..01cb08b0365f 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-@@ -287,7 +287,7 @@ def GetValue(self):
-                     tmp = numpy.asarray(cpp_reference) # This adopts the memory of the C++ object.
-                     self._py_arrays[column] = ndarray(tmp, self._result_ptrs[column])
-                 else:
--                    tmp = numpy.empty(len(cpp_reference), dtype=numpy.object)
-+                    tmp = numpy.empty(len(cpp_reference), dtype=object)
-                     for i, x in enumerate(cpp_reference):
-                         tmp[i] = x # This creates only the wrapping of the objects and does not copy.
-                     self._py_arrays[column] = ndarray(tmp, self._result_ptrs[column])
diff --git a/root-avoid-race-condition-tutorial-roofit-rf512.patch b/root-avoid-race-condition-tutorial-roofit-rf512.patch
deleted file mode 100644
index d0c40e8..0000000
--- a/root-avoid-race-condition-tutorial-roofit-rf512.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 91de99623d0e945610be46d46e84b54985415aeb Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 28 Oct 2022 06:27:10 +0200
-Subject: [PATCH] Avoid race condition between
- tutorial/roofit/rf512_wsfactory_oper.C and
- tutorial/roofit/rf512_wsfactory_oper.py
-
-When run in parallel they delete eachother's files:
-
-cc1plus: fatal error: /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.cxx: No such file or directory
-compilation terminated.
-/usr/bin/ld: cannot find /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.o: No such file or directory
-collect2: error: ld returned 1 exit status
----
- tutorials/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index cfba4d3ed9..6ae9be5869 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -483,7 +483,7 @@ set(hist-hbars-depends  tutorial-tree-cernbuild)
- set(benchmarks-depends tutorial-hsimple
-                        tutorial-fit-fit1
-                        tutorial-fit-myfit
--					   tutorial-hist-h1ReadAndDraw
-+                       tutorial-hist-h1ReadAndDraw
-                        tutorial-hist-FirstContour
-                        tutorial-geom-na49view
-                        tutorial-tree-ntuple1
-@@ -731,7 +731,7 @@ if(ROOT_pyroot_FOUND)
-   set(pyroot-benchmarks-depends tutorial-pyroot-hsimple-py
-                                 tutorial-pyroot-fit1-py
-                                 tutorial-pyroot-na49view-py
--								tutorial-pyroot-h1ReadAndDraw-py
-+                                tutorial-pyroot-h1ReadAndDraw-py
-                                 tutorial-pyroot-ntuple1-py)
-   set(pyroot-fit1-depends tutorial-pyroot-fillrandom-py)
-   set(pyroot-na49view-depends tutorial-pyroot-geometry-py)
-@@ -739,6 +739,7 @@ if(ROOT_pyroot_FOUND)
- 
-   # Avoid a race condition: make sure Python tutorial is ran after C++ tutorial
-   set(roofit-rf104_classfactory-depends tutorial-roofit-rf104_classfactory)
-+  set(roofit-rf512_wsfactory_oper-depends tutorial-roofit-rf512_wsfactory_oper)
- 
-   #----------------------------------------------------------------------
-   # List requirements for python tutorials.
--- 
-2.37.3
-
diff --git a/root-big-endian-byte-swap.patch b/root-big-endian-byte-swap.patch
index 63490b5..caa3076 100644
--- a/root-big-endian-byte-swap.patch
+++ b/root-big-endian-byte-swap.patch
@@ -1,15 +1,15 @@
-From d9e03aad7a5132fe9db9992eecb47ee4e91c354c Mon Sep 17 00:00:00 2001
+From b32c7a1b080cb5d14f242070bf906ea6929d604d Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Fri, 25 Mar 2022 11:13:12 +0100
 Subject: [PATCH] Byte swap values read from the protobuf raw data stream on
  big endian
 
 ---
- tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
+ tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 23 +++++++++++++++-----
+ 1 file changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-index 3b0a30cdb0..23e41d746f 100644
+index ab457dcddc..d701fb3299 100644
 --- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
 +++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
 @@ -1,3 +1,4 @@
@@ -17,24 +17,42 @@ index 3b0a30cdb0..23e41d746f 100644
  #include "TMVA/RModelParser_ONNX.hxx"
  #include "onnx_proto3.pb.h"
  
-@@ -980,9 +981,14 @@ RModel RModelParser_ONNX::Parse(std::string filename){
-             //void* data = malloc (fLength * sizeof(float));
-             std::shared_ptr<void> data(malloc(fLength * sizeof(float)), free);
+@@ -335,9 +336,14 @@ RModel RModelParser_ONNX::Parse(std::string filename, bool verbose)
+       case ETensorType::FLOAT: {
+          std::shared_ptr<void> data(malloc(fLength * sizeof(float)), free);
  
--            if (tensorproto->raw_data().empty() == false){
--               auto raw_data_ptr = reinterpret_cast<float*>(const_cast<char*>(tensorproto->raw_data().c_str()));
--               std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(float));
-+            if (!tensorproto->raw_data().empty()) {
+-         if (tensorproto->raw_data().empty() == false) {
+-            auto raw_data_ptr = reinterpret_cast<float *>(const_cast<char *>(tensorproto->raw_data().c_str()));
+-            std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(float));
++         if (!tensorproto->raw_data().empty()) {
 +#ifdef R__BYTESWAP
-+               std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(float));
++            std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(float));
 +#else
-+               for (std::size_t k = 0; k < fLength; ++k)
-+                  (reinterpret_cast<UInt_t*>(data.get()))[k] =
-+                     R__bswap_32((reinterpret_cast<const UInt_t*>(tensorproto->raw_data().c_str()))[k]);
++            for (std::size_t k = 0; k < fLength; ++k)
++               (reinterpret_cast<uint32_t *>(data.get()))[k] =
++                  Rbswap_32((reinterpret_cast<const uint32_t *>(tensorproto->raw_data().c_str()))[k]);
 +#endif
-             }else{
-                tensorproto->mutable_float_data()->ExtractSubrange(0, tensorproto->float_data_size(), static_cast<float*>(data.get()));
-             }
+          } else {
+             tensorproto->mutable_float_data()->ExtractSubrange(0, tensorproto->float_data_size(),
+                                                                static_cast<float *>(data.get()));
+@@ -350,9 +356,14 @@ RModel RModelParser_ONNX::Parse(std::string filename, bool verbose)
+       case ETensorType::INT64: {
+          std::shared_ptr<void> data(malloc(fLength * sizeof(int64_t)), free);
+ 
+-         if (tensorproto->raw_data().empty() == false) {
+-            auto raw_data_ptr = reinterpret_cast<int64_t *>(const_cast<char *>(tensorproto->raw_data().c_str()));
+-            std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(int64_t));
++         if (!tensorproto->raw_data().empty()) {
++#ifdef R__BYTESWAP
++            std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(int64_t));
++#else
++            for (std::size_t k = 0; k < fLength; ++k)
++               (reinterpret_cast<uint64_t *>(data.get()))[k] =
++                  Rbswap_64((reinterpret_cast<const uint64_t *>(tensorproto->raw_data().c_str()))[k]);
++#endif
+          } else {
+             tensorproto->mutable_int64_data()->ExtractSubrange(0, tensorproto->int64_data_size(),
+                                                                static_cast<int64_t *>(data.get()));
 -- 
-2.35.1
+2.39.2
 
diff --git a/root-cling-Disable-outline-atomics-on-AArch64.patch b/root-cling-Disable-outline-atomics-on-AArch64.patch
new file mode 100644
index 0000000..ca00e5f
--- /dev/null
+++ b/root-cling-Disable-outline-atomics-on-AArch64.patch
@@ -0,0 +1,35 @@
+From ddf9a8c3d113e3a3d48dbe13b6b4a6bf2338fb7a Mon Sep 17 00:00:00 2001
+From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
+Date: Mon, 20 Feb 2023 10:08:00 +0100
+Subject: [PATCH] [cling] Disable outline-atomics on AArch64
+
+The routines __aarch64_* are defined in the static library libgcc.a
+and not necessarily included in libCling or otherwise present in the
+process, so the interpreter has a hard time finding them.
+
+Fixes #12294
+---
+ interpreter/cling/lib/Interpreter/CIFactory.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
+index b135bf21aa..b5b5df2e8e 100644
+--- a/interpreter/cling/lib/Interpreter/CIFactory.cpp
++++ b/interpreter/cling/lib/Interpreter/CIFactory.cpp
+@@ -1254,6 +1254,13 @@ namespace {
+ #if __APPLE__ && __arm64__
+     argvCompile.push_back("--target=arm64-apple-darwin20.3.0");
+ #endif
++#if __aarch64__
++    // Disable outline-atomics on AArch64; the routines __aarch64_* are defined
++    // in the static library libgcc.a and not necessarily included in libCling
++    // or otherwise present in the process, so the interpreter has a hard time
++    // finding them.
++    argvCompile.push_back("-mno-outline-atomics");
++#endif
+ 
+     // Variables for storing the memory of the C-string arguments.
+     // FIXME: We shouldn't use C-strings in the first place, but just use
+-- 
+2.39.2
+
diff --git a/root-core-base-test.patch b/root-core-base-test.patch
deleted file mode 100644
index c268390..0000000
--- a/root-core-base-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12d52a60629e1639ced23a1919bd85628d9135ea Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 3 Apr 2022 23:23:00 +0200
-Subject: [PATCH] Fix library link order
-
-Fixes undefined references when linking CoreBaseTests
-
-../../../lib/libCling.so.6.26.00: undefined reference to `TMemFile::TMemFile(char const*, TMemFile::ZeroCopyView_t const&)'
-../../../lib/libCling.so.6.26.00: undefined reference to `TFile::TFile(char const*, char const*, char const*, int)'
-../../../lib/libCling.so.6.26.00: undefined reference to `TFile::~TFile()'
-../../../lib/libCling.so.6.26.00: undefined reference to `TStreamerInfo::TStreamerInfo()'
-../../../lib/libCling.so.6.26.00: undefined reference to `TMemFile::~TMemFile()'
----
- core/base/test/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/base/test/CMakeLists.txt b/core/base/test/CMakeLists.txt
-index 4b08cb0390..9b52e83405 100644
---- a/core/base/test/CMakeLists.txt
-+++ b/core/base/test/CMakeLists.txt
-@@ -22,6 +22,6 @@ ROOT_ADD_GTEST(CoreBaseTests
-   TExceptionHandlerTests.cxx
-   TStringTest.cxx
-   TBitsTests.cxx
--  LIBRARIES Core RIO ${extralibs})
-+  LIBRARIES ${extralibs} RIO Core)
- 
- ROOT_ADD_GTEST(CoreErrorTests TErrorTests.cxx LIBRARIES Core)
--- 
-2.35.1
-
diff --git a/root-dataframe-callback.patch b/root-dataframe-callback.patch
deleted file mode 100644
index 57ffc08..0000000
--- a/root-dataframe-callback.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d849bc502eec4ec95d15ca41319ba0467ab22759 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 15:55:29 +0100
-Subject: [PATCH] =?UTF-8?q?NENTRIES=20is=20not=20always=20a=20multiple=20o?=
- =?UTF-8?q?f=20the=20expected=20size.=20NENTRIES=20is=2010.=20On=20a=204?=
- =?UTF-8?q?=20core=20machine=20the=20expected=20size=20in=202=20=C3=97=204?=
- =?UTF-8?q?=20=3D=208.=20Looping=20over=20the=208=20IDs,=202=20have=202=20?=
- =?UTF-8?q?entries=20the=20remaining=206=20have=201=20entry=20for=20a=20to?=
- =?UTF-8?q?tal=20of=2010=20(NENTRIES)=20entries.=20The=20test=20checked=20?=
- =?UTF-8?q?that=20each=20ID=20had=20NENTRIES/(expected=20size)=20entries,?=
- =?UTF-8?q?=20which=20in=20this=20case=20with=20integer=20division=20equal?=
- =?UTF-8?q?s=201=20entry,=20which=20was=20not=20the=20correct=20test.=20Th?=
- =?UTF-8?q?is=20commit=20chenges=20to=20test=20to=20check=20that=20the=20t?=
- =?UTF-8?q?otal=20number=20of=20entries=20summed=20for=20all=20IDs=20equal?=
- =?UTF-8?q?s=20NENTRIES.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- tree/dataframe/test/dataframe_samplecallback.cxx | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tree/dataframe/test/dataframe_samplecallback.cxx b/tree/dataframe/test/dataframe_samplecallback.cxx
-index 188d58dd31..d387ea5f86 100644
---- a/tree/dataframe/test/dataframe_samplecallback.cxx
-+++ b/tree/dataframe/test/dataframe_samplecallback.cxx
-@@ -125,11 +125,13 @@ TEST_P(RDFSampleCallback, EmptySourceSampleID) {
-       // RDF with empty sources tries to produce 2 tasks per slot when MT is enabled
-       const auto expectedSize = std::min(NENTRIES, df.GetNSlots() * 2ull);
-       ASSERT_EQ(result->size(), expectedSize);
-+      ULong64_t entries = 0;
-       for (auto &id : *result) {
-          // check that all entries start with the expected string
-          EXPECT_TRUE(id.AsString().rfind("Empty source, range: {", 0) == 0);
--         EXPECT_EQ(id.NEntries(), NENTRIES / expectedSize);
-+         entries += id.NEntries();
-       }
-+      EXPECT_EQ(entries, NENTRIES);
-    } else {
-       ASSERT_EQ(result->size(), 1);
-       const auto &id = result->at(0);
--- 
-2.35.1
-
diff --git a/root-different-filename.patch b/root-different-filename.patch
deleted file mode 100644
index ef42c3d..0000000
--- a/root-different-filename.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a486081a8065154308b23381c3a77f3fdb73de97 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 16 Nov 2022 20:44:48 +0100
-Subject: [PATCH] Use different filename in loopdir.C and loopdir11.C to avoid
- race condition
-
-          Start  672: tutorial-io-loopdir
- 690/1156 Test  #666: tutorial-io-double32 ................................................   Passed    2.42 sec
-          Start  673: tutorial-io-loopdir11
- 691/1156 Test  #673: tutorial-io-loopdir11 ...............................................   Passed    0.76 sec
-          Start  674: tutorial-io-mergeSelective
- 692/1156 Test  #672: tutorial-io-loopdir .................................................***Failed  Error regular expression found in output. Regex=[Error in <]  1.23 sec
-Processing /builddir/build/BUILD/root-6.26.10/tutorials/io/loopdir.C...
-Info in <TCanvas::Print>: ps file hsimple.ps has been created
-Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
-Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
-Info in <TCanvas::Print>: Current canvas added to ps file hsimple.ps
-Info in <TCanvas::Print>: ps file hsimple.ps has been closed
-Error in <TPostScript::Text>: Cannot open temporary file: hsimple.ps_tmp_2089748
----
- tutorials/io/loopdir11.C | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tutorials/io/loopdir11.C b/tutorials/io/loopdir11.C
-index b5f9f4719c..bf8c33b442 100644
---- a/tutorials/io/loopdir11.C
-+++ b/tutorials/io/loopdir11.C
-@@ -12,14 +12,14 @@
- void loopdir11() {
-    TFile *f1 = TFile::Open("hsimple.root");
-    TCanvas c1;
--   c1.Print("hsimple.ps[");
-+   c1.Print("hsimple11.ps[");
-    for(auto k : *f1->GetListOfKeys()) {
-       TKey *key = static_cast<TKey*>(k);
-       TClass *cl = gROOT->GetClass(key->GetClassName());
-       if (!cl->InheritsFrom("TH1")) continue;
-       TH1 *h = key->ReadObject<TH1>();
-       h->Draw();
--      c1.Print("hsimple.ps");
-+      c1.Print("hsimple11.ps");
-    }
--   c1.Print("hsimple.ps]");
-+   c1.Print("hsimple11.ps]");
- }
--- 
-2.38.1
-
diff --git a/root-do-not-remove-Wp-before-D-and-U.patch b/root-do-not-remove-Wp-before-D-and-U.patch
new file mode 100644
index 0000000..820b7af
--- /dev/null
+++ b/root-do-not-remove-Wp-before-D-and-U.patch
@@ -0,0 +1,44 @@
+From 0191a987b7583c2aa84b1293105db353fee40b1d Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 10 Mar 2023 20:49:02 +0100
+Subject: [PATCH] Do not remove -Wp, before -D and -U when recording used
+ compiler flags
+
+This breaks the pattern used when undefining and then defining a
+variable in the same flag:
+
+$ echo | g++ -Wp,-UVAR,-DVAR=1 -c -x c++ -
+
+Here -Wp,-UVAR,-DVAR=1 will first undefine VAR and then define it to 1
+
+If the -Wp, is dropped, this fails:
+$ echo | g++ -UVAR,-DVAR=1 -c -x c++ -
+<command-line>: warning: extra tokens at end of #undef directive
+
+Now it will only undefine VAR, but not defin it. I.e.
+
+insted of
+
+you get
+
+which explains the rather cryptic warning about extra token after #undef.
+---
+ cmake/modules/RootConfiguration.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index 3d1ae9be53..042b43f039 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -729,7 +729,7 @@ if (cxxmodules)
+ endif()
+ 
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+-string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
++string(REGEX MATCHALL "(-Wp,)?-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
+ set(ROOT_COMPILER_FLAG_HINTS "#
+ set(ROOT_DEFINITIONS \"${__defs}\")
+ set(ROOT_CXX_FLAGS \"${__cxxflags}\")
+-- 
+2.39.2
+
diff --git a/root-dont-install-roofit-files-fix.patch b/root-dont-install-roofit-files-fix.patch
new file mode 100644
index 0000000..295a4b7
--- /dev/null
+++ b/root-dont-install-roofit-files-fix.patch
@@ -0,0 +1,26 @@
+From 74aaf99530443a712f9b0577d8edde615ea8902d Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 4 Mar 2023 21:27:35 +0100
+Subject: [PATCH] Use FILTER instead of REMOVE_ITEM since GLOB returns absolute
+ paths
+
+---
+ build/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index e964b5e255..2b24b1d6e6 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -30,7 +30,7 @@ ROOT_EXECUTABLE(rmkdepend
+ if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
+   file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
+   if(NOT roofit)
+-    list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
++    list(FILTER PRETTY_PRINTERS EXCLUDE REGEX libRooFitCore.so-gdb.py)
+   endif()
+   set(PRETTY_PRINTER_DESTS)
+   foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
+-- 
+2.39.2
+
diff --git a/root-dont-install-roofit-files-when-roofit-is-disabled.patch b/root-dont-install-roofit-files-when-roofit-is-disabled.patch
new file mode 100644
index 0000000..7b4881d
--- /dev/null
+++ b/root-dont-install-roofit-files-when-roofit-is-disabled.patch
@@ -0,0 +1,75 @@
+From df636dcc05d0284f39427ea5be1d72e7faca90d8 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 1 Mar 2023 18:30:35 +0100
+Subject: [PATCH] Don't install roofit files when roofit is disabled
+
+---
+ CMakeLists.txt           | 14 ++++++++++++--
+ build/CMakeLists.txt     |  3 +++
+ core/base/CMakeLists.txt |  2 ++
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1d998fde2..7992e27b64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -591,7 +591,14 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+   else()
+     install(DIRECTORY README DESTINATION ${CMAKE_INSTALL_DOCDIR})
+   endif()
++  set(ETC_PATT_EXCL)
++  if(NOT roofit)
++    list(APPEND ETC_PATT_EXCL PATTERN HistFactorySchema.dtd EXCLUDE)
++    list(APPEND ETC_PATT_EXCL PATTERN RooFitHS3_wsexportkeys.json EXCLUDE)
++    list(APPEND ETC_PATT_EXCL PATTERN RooFitHS3_wsfactoryexpressions.json EXCLUDE)
++  endif()
+   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
++                         ${ETC_PATT_EXCL}
+                          PATTERN "system.rootrc" EXCLUDE
+                          PATTERN "system.rootauthrc" EXCLUDE
+                          PATTERN "system.rootdaemonrc" EXCLUDE
+@@ -612,8 +619,11 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+      set(MAN_PATT_EXCL PATTERN xproofd.1 EXCLUDE)
+   endif()
+   if(NOT fortran OR NOT CMAKE_Fortran_COMPILER)
+-    set(MAN_PATT_EXCL ${MAN_PATT_EXCL} PATTERN h2root.1 EXCLUDE)
+-    set(MAN_PATT_EXCL ${MAN_PATT_EXCL} PATTERN g2root.1 EXCLUDE)
++    list(APPEND MAN_PATT_EXCL PATTERN h2root.1 EXCLUDE)
++    list(APPEND MAN_PATT_EXCL PATTERN g2root.1 EXCLUDE)
++  endif()
++  if(NOT roofit)
++    list(APPEND MAN_PATT_EXCL PATTERN prepareHistFactory.1 EXCLUDE)
+   endif()
+   install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR} ${MAN_PATT_EXCL})
+   install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index 9f60c813ac..e964b5e255 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -29,6 +29,9 @@ ROOT_EXECUTABLE(rmkdepend
+ 
+ if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
+   file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
++  if(NOT roofit)
++    list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
++  endif()
+   set(PRETTY_PRINTER_DESTS)
+   foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
+     get_filename_component(PRETTY_PRINTER_DEST ${PRETTY_PRINTER} NAME)
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index 0c9df7c896..df701fedea 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -224,7 +224,9 @@ if(NOT MSVC)
+ #---addRootC++CmdMan-------------------------------------------------------------------------
+ generateManual(rootMan ${CMAKE_CURRENT_SOURCE_DIR}/src/root-argparse.py ${CMAKE_BINARY_DIR}/man/root.1)
+ generateManual(haddMan ${CMAKE_SOURCE_DIR}/main/src/hadd-argparse.py ${CMAKE_BINARY_DIR}/man/hadd.1)
++if (roofit)
+ generateManual(hist2workspaceMan ${CMAKE_SOURCE_DIR}/roofit/histfactory/src/hist2workspace-argparse.py ${CMAKE_BINARY_DIR}/man/hist2workspace.1)
++endif()
+ generateManual(rootclingMan ${CMAKE_SOURCE_DIR}/core/dictgen/src/rootcling-argparse.py ${CMAKE_BINARY_DIR}/man/rootcling.1)
+ 
+ #---addRootPyCmdMan---------------------------------------------------------------------------
+-- 
+2.39.2
+
diff --git a/root-endian-warn.patch b/root-endian-warn.patch
deleted file mode 100644
index 77cd6b9..0000000
--- a/root-endian-warn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 28 Mar 2022 09:20:18 +0200
-Subject: [PATCH 2/2] Ignore warnings about RooNaNPacker not being implemented
- for big endian
-
-This warning is triggered in many tests, so it makes sense to put it
-in the default ignored set.
----
- test/unit_testing_support/ROOTUnitTestSupport.cxx | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/test/unit_testing_support/ROOTUnitTestSupport.cxx b/test/unit_testing_support/ROOTUnitTestSupport.cxx
-index 259ab4e09c..79cd476950 100644
---- a/test/unit_testing_support/ROOTUnitTestSupport.cxx
-+++ b/test/unit_testing_support/ROOTUnitTestSupport.cxx
-@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
-         return;
-       }
- 
-+      // FIXME: RooNaNPacker warns about not being implemented for big endian
-+      if (level == kWarning
-+	  && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
-+        std::cerr << "Warning in " << location << " " << msg << std::endl;
-+        return;
-+      }
-+
-       FAIL() << "Received unexpected diagnostic of severity "
-          << level
-          << " at '" << location << "' reading '" << msg << "'.\n"
--- 
-2.35.1
-
diff --git a/root-fix-compilation-with-gcc-12.patch b/root-fix-compilation-with-gcc-12.patch
deleted file mode 100644
index 2c34516..0000000
--- a/root-fix-compilation-with-gcc-12.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3bc55ece1db8b32c5e86fd6b85856addd67265fb Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 15 Jan 2022 06:35:58 +0100
-Subject: [PATCH] Fix compilation with gcc 12
-
-Fixes error: use of deleted function
-
-/builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp: In member function 'std::string llvm::NVPTXAsmPrinter::getPTXFundamentalTypeStr(llvm::Type*, bool) const':
-/builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp:1319:10: error: use of deleted function 'std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::basic_string(std::nullptr_t) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::nullptr_t = std::nullptr_t]'
- 1319 |   return nullptr;
-      |          ^~~~~~~
-In file included from /usr/include/c++/12/string:53,
-                 from /usr/include/c++/12/bits/locale_classes.h:40,
-                 from /usr/include/c++/12/bits/ios_base.h:41,
-                 from /usr/include/c++/12/streambuf:41,
-                 from /usr/include/c++/12/bits/streambuf_iterator.h:35,
-                 from /usr/include/c++/12/iterator:66,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/iterator_range.h:21,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/SmallVector.h:16,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/STLExtras.h:20,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/ADT/StringRef.h:12,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/include/llvm/Pass.h:31,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTX.h:17,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.h:17,
-                 from /builddir/build/BUILD/root-6.24.06/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp:14:
-/usr/include/c++/12/bits/basic_string.h:732:7: note: declared here
-  732 |       basic_string(nullptr_t) = delete;
-      |       ^~~~~~~~~~~~
-
-Fix backported from LLVM upstrea https://reviews.llvm.org/D87697
----
- interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
-index 5f38b4a3c4..bfa74bd98f 100644
---- a/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
-+++ b/interpreter/llvm/src/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
-@@ -1281,9 +1281,6 @@ void NVPTXAsmPrinter::emitPTXAddressSpace(unsigned int AddressSpace,
- std::string
- NVPTXAsmPrinter::getPTXFundamentalTypeStr(Type *Ty, bool useB4PTR) const {
-   switch (Ty->getTypeID()) {
--  default:
--    llvm_unreachable("unexpected type");
--    break;
-   case Type::IntegerTyID: {
-     unsigned NumBits = cast<IntegerType>(Ty)->getBitWidth();
-     if (NumBits == 1)
-@@ -1314,9 +1311,10 @@ NVPTXAsmPrinter::getPTXFundamentalTypeStr(Type *Ty, bool useB4PTR) const {
-       return "b32";
-     else
-       return "u32";
-+  default:
-+    break;
-   }
-   llvm_unreachable("unexpected type");
--  return nullptr;
- }
- 
- void NVPTXAsmPrinter::emitPTXGlobalVariable(const GlobalVariable *GVar,
--- 
-2.34.1
-
diff --git a/root-fix-compilation-with-gcc13.patch b/root-fix-compilation-with-gcc13.patch
deleted file mode 100644
index bf411a8..0000000
--- a/root-fix-compilation-with-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 37ac6654194f90db625e760dcb2d48fd7938ba6d Mon Sep 17 00:00:00 2001
-From: scott snyder <sss@karma>
-Date: Tue, 29 Nov 2022 22:05:39 -0500
-Subject: [PATCH] Fix compilation with gcc13.
-
-Missing #include <cstdint>.
----
- math/mathcore/inc/Math/Random.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/math/mathcore/inc/Math/Random.h b/math/mathcore/inc/Math/Random.h
-index 87eaaee5af..23bfabc4a1 100644
---- a/math/mathcore/inc/Math/Random.h
-+++ b/math/mathcore/inc/Math/Random.h
-@@ -25,6 +25,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- 
- namespace ROOT {
--- 
-2.39.0
-
diff --git a/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch b/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
index 007c3cd..274aa66 100644
--- a/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+++ b/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
@@ -1,6 +1,6 @@
-From ddc155795baa9d4690717c204e54a7fd4600c688 Mon Sep 17 00:00:00 2001
+From 15f50c71b4d89bfbf06ce817dee38e843f0f55cd Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 17 Jan 2022 18:49:30 +0100
+Date: Mon, 17 Jan 2022 23:50:47 +0100
 Subject: [PATCH] Fix test failure on ppc64le and aarch64 with gcc 12
 
 .../hist/hist/test/test_tprofile2poly.cxx:61: Failure
@@ -14,19 +14,19 @@ cont1 evaluates to 109868.61342004745,
 cont2 evaluates to 109868.61342004743.
 The abs_error parameter delta evaluates to 9.999999960041972e-12 which is smaller than the minimum distance between doubles for numbers of this magnitude which is 1.4551915228366852e-11, thus making this EXPECT_NEAR check equivalent to EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.
 ---
- hist/hist/test/test_tprofile2poly.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ hist/hist/test/test_tprofile2poly.cxx | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/hist/hist/test/test_tprofile2poly.cxx b/hist/hist/test/test_tprofile2poly.cxx
-index 40cb3052a2..5150da0bea 100644
+index 40cb3052a2..ecf559a4b3 100644
 --- a/hist/hist/test/test_tprofile2poly.cxx
 +++ b/hist/hist/test/test_tprofile2poly.cxx
-@@ -58,14 +58,14 @@ void binEntriesCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
+@@ -58,15 +58,14 @@ void binEntriesCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
        for(Double_t x=0.5; x<10; x+=2.0) {
           cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(x,y));
           cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(x,y));
 -         ASSERT_NEAR(cont1, cont2, delta);
-+         ASSERT_NEAR(cont1, cont2, 2*delta);
++         ASSERT_NEAR(cont1, cont2, 2 * delta);
        }
  
     }
@@ -34,10 +34,11 @@ index 40cb3052a2..5150da0bea 100644
     cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(11,11));
     cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(11,11));
 -   ASSERT_NEAR(cont1, cont2, delta);
-+   ASSERT_NEAR(cont1, cont2, 2*delta);
- 
+-
++   ASSERT_NEAR(cont1, cont2, 2 * delta);
  }
  
+ void binErrorCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
 -- 
-2.34.1
+2.39.2
 
diff --git a/root-fixes-for-32bit-builds.patch b/root-fixes-for-32bit-builds.patch
new file mode 100644
index 0000000..bcff78d
--- /dev/null
+++ b/root-fixes-for-32bit-builds.patch
@@ -0,0 +1,185 @@
+From 6f69a59010a60c949b1955e52275137e39a85b82 Mon Sep 17 00:00:00 2001
+From: Jakob Blomer <jblomer@cern.ch>
+Date: Thu, 9 Mar 2023 15:14:22 +0100
+Subject: [PATCH] [ntuple] fixes for 32bit / non-x86_64 builds
+
+---
+ tree/dataframe/src/RNTupleDS.cxx        |  1 +
+ tree/ntuple/v7/inc/ROOT/RField.hxx      | 21 +++++++++++++++++++--
+ tree/ntuple/v7/test/ntuple_extended.cxx |  8 ++++----
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/tree/dataframe/src/RNTupleDS.cxx b/tree/dataframe/src/RNTupleDS.cxx
+index f7eb0ab5f284..aaea6df81622 100644
+--- a/tree/dataframe/src/RNTupleDS.cxx
++++ b/tree/dataframe/src/RNTupleDS.cxx
+@@ -94,6 +94,7 @@ class RRDFCardinalityField : public ROOT::Experimental::Detail::RFieldBase {
+       return ROOT::Experimental::Detail::RFieldValue(true /* captureFlag */, this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::size_t); }
++   size_t GetAlignment() const final { return alignof(std::size_t); }
+ 
+    /// Get the number of elements of the collection identified by globalIndex
+    void
+diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx
+index b05267d16030..9a85368a94e3 100644
+--- a/tree/ntuple/v7/inc/ROOT/RField.hxx
++++ b/tree/ntuple/v7/inc/ROOT/RField.hxx
+@@ -270,8 +270,9 @@ public:
+    virtual std::vector<RFieldValue> SplitValue(const RFieldValue &value) const;
+    /// The number of bytes taken by a value of the appropriate type
+    virtual size_t GetValueSize() const = 0;
+-   /// For many types, the alignment requirement is equal to the size; otherwise override.
+-   virtual size_t GetAlignment() const { return GetValueSize(); }
++   /// As a rule of thumb, the alignment is equal to the size of the type. There are, however, various exceptions
++   /// to this rule depending on OS and CPU architecture. So enforce the alignment to be explicitly spelled out.
++   virtual size_t GetAlignment() const = 0;
+    int GetTraits() const { return fTraits; }
+    bool HasReadCallbacks() const { return !fReadCallbacks.empty(); }
+ 
+@@ -383,6 +384,7 @@ public:
+    Detail::RFieldValue GenerateValue(void*) override { return Detail::RFieldValue(); }
+    Detail::RFieldValue CaptureValue(void*) final { return Detail::RFieldValue(); }
+    size_t GetValueSize() const final { return 0; }
++   size_t GetAlignment() const final { return 0; }
+ 
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+@@ -889,6 +891,7 @@ public:
+          Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
++   size_t GetAlignment() const final { return alignof(ClusterSize_t); }
+    void CommitCluster() final;
+ };
+ 
+@@ -990,6 +993,7 @@ public:
+          Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
++   size_t GetAlignment() const final { return alignof(ClusterSize_t); }
+ 
+    /// Special help for offset fields
+    void GetCollectionInfo(NTupleSize_t globalIndex, RClusterIndex *collectionStart, ClusterSize_t *size) {
+@@ -1110,6 +1115,7 @@ public:
+          Detail::RColumnElement<bool>(static_cast<bool*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(bool); }
++   size_t GetAlignment() const final { return alignof(bool); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1162,6 +1168,7 @@ public:
+          Detail::RColumnElement<float>(static_cast<float*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(float); }
++   size_t GetAlignment() const final { return alignof(float); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1215,6 +1222,7 @@ public:
+          Detail::RColumnElement<double>(static_cast<double*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(double); }
++   size_t GetAlignment() const final { return alignof(double); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1267,6 +1275,7 @@ public:
+          Detail::RColumnElement<char>(static_cast<char*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(char); }
++   size_t GetAlignment() const final { return alignof(char); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1319,6 +1328,7 @@ public:
+          Detail::RColumnElement<std::int8_t>(static_cast<std::int8_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::int8_t); }
++   size_t GetAlignment() const final { return alignof(std::int8_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1371,6 +1381,7 @@ public:
+          Detail::RColumnElement<std::uint8_t>(static_cast<std::uint8_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::uint8_t); }
++   size_t GetAlignment() const final { return alignof(std::uint8_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1423,6 +1434,7 @@ public:
+          Detail::RColumnElement<std::int16_t>(static_cast<std::int16_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::int16_t); }
++   size_t GetAlignment() const final { return alignof(std::int16_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1475,6 +1487,7 @@ public:
+          Detail::RColumnElement<std::uint16_t>(static_cast<std::uint16_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::uint16_t); }
++   size_t GetAlignment() const final { return alignof(std::uint16_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1527,6 +1540,7 @@ public:
+          Detail::RColumnElement<std::int32_t>(static_cast<std::int32_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::int32_t); }
++   size_t GetAlignment() const final { return alignof(std::int32_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1579,6 +1593,7 @@ public:
+          Detail::RColumnElement<std::uint32_t>(static_cast<std::uint32_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::uint32_t); }
++   size_t GetAlignment() const final { return alignof(std::uint32_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1631,6 +1646,7 @@ public:
+          Detail::RColumnElement<std::uint64_t>(static_cast<std::uint64_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::uint64_t); }
++   size_t GetAlignment() const final { return alignof(std::uint64_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+@@ -1683,6 +1699,7 @@ public:
+          Detail::RColumnElement<std::int64_t>(static_cast<std::int64_t*>(where)), this, where);
+    }
+    size_t GetValueSize() const final { return sizeof(std::int64_t); }
++   size_t GetAlignment() const final { return alignof(std::int64_t); }
+    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
+ };
+ 
+diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
+index 91871e288e98..d3b6ee466359 100644
+--- a/tree/ntuple/v7/test/ntuple_extended.cxx
++++ b/tree/ntuple/v7/test/ntuple_extended.cxx
+@@ -123,8 +123,8 @@ TEST(RNTuple, LargeFile1)
+       RNTupleWriteOptions options;
+       options.SetCompression(0);
+       auto ntuple = RNTupleWriter::Recreate(std::move(modelWrite), "myNTuple", fileGuard.GetPath(), options);
+-      constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
+-      for (unsigned int i = 0; i < nEvents; ++i) {
++      constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
++      for (std::uint64_t i = 0; i < nEvents; ++i) {
+          wrEnergy = rnd.Rndm();
+          chksumWrite += wrEnergy;
+          ntuple->Fill();
+@@ -195,8 +195,8 @@ TEST(RNTuple, LargeFile2)
+ 
+    TRandom3 rnd(42);
+    double chksumWrite = 0.0;
+-   constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
+-   for (unsigned int i = 0; i < nEvents; ++i) {
++   constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
++   for (std::uint64_t i = 0; i < nEvents; ++i) {
+       *E = rnd.Rndm();
+       chksumWrite += *E;
+       writer->Fill();
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 35705a4..e19c4b4 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,38 +1,38 @@
-diff -ur root-6.24.02.orig/core/base/src/TApplication.cxx root-6.24.02/core/base/src/TApplication.cxx
---- root-6.24.02.orig/core/base/src/TApplication.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/core/base/src/TApplication.cxx	2021-08-11 10:49:08.583579248 +0200
-@@ -265,18 +265,11 @@
-    LoadGraphicsLibs();
+diff -ur root-6.28.00.orig/core/base/src/TApplication.cxx root-6.28.00/core/base/src/TApplication.cxx
+--- root-6.28.00.orig/core/base/src/TApplication.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/core/base/src/TApplication.cxx	2023-02-04 12:47:19.757759982 +0100
+@@ -251,18 +251,11 @@
+       LoadGraphicsLibs();
  
-    // Try to load TrueType font renderer. Only try to load if not in batch
--   // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
-+   // mode and Root.UseTTFonts is true. Abort silently
-    // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
--   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                       TROOT::GetTTFFontDir());
--   char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--   // Check for use of DFSG - fonts
--   if (!ttfont)
--      ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
+       // Try to load TrueType font renderer. Only try to load if not in batch
+-      // mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
++      // mode and Root.UseTTFonts is true. Abort silently
+       // if libttf or libGX11TTF are not found in $ROOTSYS/lib or $ROOTSYS/ttf/lib.
+-      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
+-                                          TROOT::GetTTFFontDir());
+-      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
+-      // Check for use of DFSG - fonts
+-      if (!ttfont)
+-         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
 -
- #if !defined(R__WIN32)
-    if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
--       ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+       gEnv->GetValue("Root.UseTTFonts", 1)) {
-       if (gClassTable->GetDict("TGX11TTF")) {
-          // in principle we should not have linked anything against libGX11TTF
-          // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -290,7 +283,6 @@
+    #if !defined(R__WIN32)
+       if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
+-          ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
++          gEnv->GetValue("Root.UseTTFonts", 1)) {
+          if (gClassTable->GetDict("TGX11TTF")) {
+             // in principle we should not have linked anything against libGX11TTF
+             // but with ACLiC this can happen, initialize TGX11TTF by hand
+@@ -276,7 +269,6 @@
+          }
        }
+    #endif
+-      delete [] ttfont;
     }
- #endif
--   delete [] ttfont;
  
-    // Create WM dependent application environment
-    if (fAppImp)
-diff -ur root-6.24.02.orig/graf2d/asimage/CMakeLists.txt root-6.24.02/graf2d/asimage/CMakeLists.txt
---- root-6.24.02.orig/graf2d/asimage/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/asimage/CMakeLists.txt	2021-08-11 10:49:08.583579248 +0200
+    if (!only_web || !fAppImp) {
+diff -ur root-6.28.00.orig/graf2d/asimage/CMakeLists.txt root-6.28.00/graf2d/asimage/CMakeLists.txt
+--- root-6.28.00.orig/graf2d/asimage/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/asimage/CMakeLists.txt	2023-02-04 12:47:19.757759982 +0100
 @@ -30,6 +30,7 @@
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
@@ -41,10 +41,10 @@ diff -ur root-6.24.02.orig/graf2d/asimage/CMakeLists.txt root-6.24.02/graf2d/asi
    DEPENDENCIES
      Core
      Graf
-diff -ur root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx root-6.24.02/graf2d/asimage/src/TASImage.cxx
---- root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/asimage/src/TASImage.cxx	2021-08-11 10:49:08.585579253 +0200
-@@ -112,6 +112,8 @@
+diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/asimage/src/TASImage.cxx
+--- root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/asimage/src/TASImage.cxx	2023-02-04 12:47:19.760759989 +0100
+@@ -115,6 +115,8 @@
  #   include <draw.h>
  }
  
@@ -53,7 +53,7 @@ diff -ur root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx root-6.24.02/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2595,14 +2597,120 @@
+@@ -2590,14 +2592,120 @@
     TString fn = font_name;
     fn.Strip();
  
@@ -181,7 +181,7 @@ diff -ur root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx root-6.24.02/graf2d/a
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2626,14 +2734,11 @@
+@@ -2621,14 +2729,11 @@
        return;
     }
  
@@ -199,9 +199,9 @@ diff -ur root-6.24.02.orig/graf2d/asimage/src/TASImage.cxx root-6.24.02/graf2d/a
     }
  
     get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.24.02.orig/graf2d/graf/CMakeLists.txt root-6.24.02/graf2d/graf/CMakeLists.txt
---- root-6.24.02.orig/graf2d/graf/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/graf/CMakeLists.txt	2021-08-11 10:49:08.586579256 +0200
+diff -ur root-6.28.00.orig/graf2d/graf/CMakeLists.txt root-6.28.00/graf2d/graf/CMakeLists.txt
+--- root-6.28.00.orig/graf2d/graf/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/graf/CMakeLists.txt	2023-02-04 12:47:19.861760233 +0100
 @@ -91,6 +91,7 @@
      ${FREETYPE_LIBRARIES}
      ZLIB::ZLIB
@@ -210,9 +210,9 @@ diff -ur root-6.24.02.orig/graf2d/graf/CMakeLists.txt root-6.24.02/graf2d/graf/C
    DEPENDENCIES
      Hist
      Matrix
-diff -ur root-6.24.02.orig/graf2d/graf/inc/TTF.h root-6.24.02/graf2d/graf/inc/TTF.h
---- root-6.24.02.orig/graf2d/graf/inc/TTF.h	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/graf/inc/TTF.h	2021-08-11 10:49:08.586579256 +0200
+diff -ur root-6.28.00.orig/graf2d/graf/inc/TTF.h root-6.28.00/graf2d/graf/inc/TTF.h
+--- root-6.28.00.orig/graf2d/graf/inc/TTF.h	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/graf/inc/TTF.h	2023-02-04 12:47:19.862760235 +0100
 @@ -76,9 +76,8 @@
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
@@ -224,9 +224,9 @@ diff -ur root-6.24.02.orig/graf2d/graf/inc/TTF.h root-6.24.02/graf2d/graf/inc/TT
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.24.02.orig/graf2d/graf/src/TTF.cxx root-6.24.02/graf2d/graf/src/TTF.cxx
---- root-6.24.02.orig/graf2d/graf/src/TTF.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/graf/src/TTF.cxx	2021-08-11 10:49:08.587579259 +0200
+diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/TTF.cxx
+--- root-6.28.00.orig/graf2d/graf/src/TTF.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/graf/src/TTF.cxx	2023-02-04 12:47:19.863760238 +0100
 @@ -25,6 +25,8 @@
  #include "TMath.h"
  #include "TError.h"
@@ -654,7 +654,7 @@ diff -ur root-6.24.02.orig/graf2d/graf/src/TTF.cxx root-6.24.02/graf2d/graf/src/
 +   FcPatternDestroy (pat);
 +   if (set) FcCharSetDestroy (set);
 +
-    FT_Face  tface = 0;
+    FT_Face  tface = (FT_Face) 0;
  
 -   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
 +   if (FT_New_Face(fgLibrary, ttfont, ttindex, &tface)) {
@@ -679,7 +679,7 @@ diff -ur root-6.24.02.orig/graf2d/graf/src/TTF.cxx root-6.24.02/graf2d/graf/src/
 +   fgFontID[fgFontCount]   = fontid;
     fgCurFontIdx            = fgFontCount;
     fgFace[fgCurFontIdx]    = tface;
-    fgCharMap[fgCurFontIdx] = 0;
+    fgCharMap[fgCurFontIdx] = (FT_CharMap) 0;
     fgFontCount++;
  
     if (italic) {
@@ -787,9 +787,9 @@ diff -ur root-6.24.02.orig/graf2d/graf/src/TTF.cxx root-6.24.02/graf2d/graf/src/
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.24.02.orig/graf2d/postscript/CMakeLists.txt root-6.24.02/graf2d/postscript/CMakeLists.txt
---- root-6.24.02.orig/graf2d/postscript/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/postscript/CMakeLists.txt	2021-08-11 10:49:08.587579259 +0200
+diff -ur root-6.28.00.orig/graf2d/postscript/CMakeLists.txt root-6.28.00/graf2d/postscript/CMakeLists.txt
+--- root-6.28.00.orig/graf2d/postscript/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/postscript/CMakeLists.txt	2023-02-04 12:47:19.863760238 +0100
 @@ -27,6 +27,7 @@
    LIBRARIES
      ZLIB::ZLIB
@@ -798,9 +798,9 @@ diff -ur root-6.24.02.orig/graf2d/postscript/CMakeLists.txt root-6.24.02/graf2d/
    DEPENDENCIES
      Graf
  )
-diff -ur root-6.24.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.24.02/graf2d/postscript/src/TPostScript.cxx
---- root-6.24.02.orig/graf2d/postscript/src/TPostScript.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf2d/postscript/src/TPostScript.cxx	2021-08-11 10:49:08.588579261 +0200
+diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/graf2d/postscript/src/TPostScript.cxx
+--- root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf2d/postscript/src/TPostScript.cxx	2023-02-04 12:47:19.864760240 +0100
 @@ -234,6 +234,7 @@
  #include <cctype>
  #include <cwchar>
@@ -1060,9 +1060,9 @@ diff -ur root-6.24.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.24.02/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.24.02.orig/graf3d/gl/CMakeLists.txt root-6.24.02/graf3d/gl/CMakeLists.txt
---- root-6.24.02.orig/graf3d/gl/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf3d/gl/CMakeLists.txt	2021-08-11 10:49:08.589579264 +0200
+diff -ur root-6.28.00.orig/graf3d/gl/CMakeLists.txt root-6.28.00/graf3d/gl/CMakeLists.txt
+--- root-6.28.00.orig/graf3d/gl/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf3d/gl/CMakeLists.txt	2023-02-04 12:47:19.867760247 +0100
 @@ -208,6 +208,7 @@
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
@@ -1071,9 +1071,9 @@ diff -ur root-6.24.02.orig/graf3d/gl/CMakeLists.txt root-6.24.02/graf3d/gl/CMake
    DEPENDENCIES
      Hist
      Gui
-diff -ur root-6.24.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.24.02/graf3d/gl/src/TGLFontManager.cxx
---- root-6.24.02.orig/graf3d/gl/src/TGLFontManager.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf3d/gl/src/TGLFontManager.cxx	2021-08-11 10:49:08.589579264 +0200
+diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/gl/src/TGLFontManager.cxx
+--- root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf3d/gl/src/TGLFontManager.cxx	2023-02-04 12:47:19.867760247 +0100
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1329,9 +1329,9 @@ diff -ur root-6.24.02.orig/graf3d/gl/src/TGLFontManager.cxx root-6.24.02/graf3d/
     fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
     fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
     fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.24.02.orig/graf3d/gl/src/TGLText.cxx root-6.24.02/graf3d/gl/src/TGLText.cxx
---- root-6.24.02.orig/graf3d/gl/src/TGLText.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/graf3d/gl/src/TGLText.cxx	2021-08-11 10:49:08.590579267 +0200
+diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/TGLText.cxx
+--- root-6.28.00.orig/graf3d/gl/src/TGLText.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/graf3d/gl/src/TGLText.cxx	2023-02-04 12:47:19.868760250 +0100
 @@ -32,6 +32,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1466,10 +1466,10 @@ diff -ur root-6.24.02.orig/graf3d/gl/src/TGLText.cxx root-6.24.02/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.24.02.orig/gui/gui/src/TGApplication.cxx root-6.24.02/gui/gui/src/TGApplication.cxx
---- root-6.24.02.orig/gui/gui/src/TGApplication.cxx	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/gui/gui/src/TGApplication.cxx	2021-08-11 10:49:08.590579267 +0200
-@@ -80,20 +80,12 @@
+diff -ur root-6.28.00.orig/gui/gui/src/TGApplication.cxx root-6.28.00/gui/gui/src/TGApplication.cxx
+--- root-6.28.00.orig/gui/gui/src/TGApplication.cxx	2023-02-03 15:34:27.000000000 +0100
++++ root-6.28.00/gui/gui/src/TGApplication.cxx	2023-02-04 12:47:19.868760250 +0100
+@@ -81,20 +81,12 @@
     gROOT->SetBatch(kFALSE);
  
     if (strcmp(appClassName, "proofserv")) {
diff --git a/root-get-rid-of-lsb_release.patch b/root-get-rid-of-lsb_release.patch
deleted file mode 100644
index 8dca2cc..0000000
--- a/root-get-rid-of-lsb_release.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From 2dde3d060aa21ff9d4a0612b991bd300b7704bdc Mon Sep 17 00:00:00 2001
-From: Axel Naumann <Axel.Naumann@cern.ch>
-Date: Fri, 22 Jul 2022 15:54:03 +0200
-Subject: [PATCH] [cmake,test] Get rid of `lsb_release`:
-
-It is available less and less often, and we do not actually
-benefit a lot from printing the distro (stress) or we can get
-the same info from /etc/os-release (cmake).
----
- cmake/modules/RootCPack.cmake        | 11 +++++++++--
- math/mathcore/test/stressGoFTest.cxx |  4 ----
- test/bench.cxx                       |  4 ----
- test/stress.cxx                      |  4 ----
- test/stressFit.cxx                   |  4 ----
- test/stressGUI.cxx                   |  4 ----
- test/stressGeometry.cxx              |  4 ----
- test/stressGraphics.cxx              |  4 ----
- test/stressHepix.cxx                 |  4 ----
- test/stressHistFactory.cxx           |  4 ----
- test/stressLinear.cxx                |  4 ----
- test/stressRooFit.cxx                |  4 ----
- test/stressRooStats.cxx              |  4 ----
- test/stressTMVA.cxx                  |  4 ----
- 14 files changed, 9 insertions(+), 54 deletions(-)
-
-diff --git a/cmake/modules/RootCPack.cmake b/cmake/modules/RootCPack.cmake
-index a960eb81fd..807eac6ef2 100644
---- a/cmake/modules/RootCPack.cmake
-+++ b/cmake/modules/RootCPack.cmake
-@@ -107,8 +107,15 @@ elseif(WIN32)
-     set(OS_NAME_VERSION win32)
-   endif()
- else()
--  execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE osid OUTPUT_STRIP_TRAILING_WHITESPACE)
--  execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  if(EXISTS "/etc/os-release")
-+    file(STRINGS /etc/os-release osid REGEX "^NAME=")
-+    string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" osid "${osid}")
-+    file(STRINGS /etc/os-release osvers REGEX "^VERSION_ID=")
-+    string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" osvers "${osvers}")
-+  else()
-+    execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE osid OUTPUT_STRIP_TRAILING_WHITESPACE)
-+    execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  endif()
-   if(osid MATCHES Ubuntu)
-     string(REGEX REPLACE "([0-9]+)[.].*" "\\1" osvers "${osvers}")
-     set(OS_NAME_VERSION Linux-ubuntu${osvers}-${arch})
-diff --git a/math/mathcore/test/stressGoFTest.cxx b/math/mathcore/test/stressGoFTest.cxx
-index a78ca99c90..5aa1b4ef70 100644
---- a/math/mathcore/test/stressGoFTest.cxx
-+++ b/math/mathcore/test/stressGoFTest.cxx
-@@ -56,10 +56,6 @@ struct GoFTStress {
-          TString sp = gSystem->GetFromPipe("uname -a");
-          sp.Resize(60);
-          printf("*  SYS: %s\n",sp.Data());
--         if (strstr(gSystem->GetBuildNode(),"Linux")) {
--            sp = gSystem->GetFromPipe("lsb_release -d -s");
--            printf("*  SYS: %s\n",sp.Data());
--         }
-          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-             sp += " Mac OS X ";
-diff --git a/test/bench.cxx b/test/bench.cxx
-index 82bc537e05..e89024e9d9 100644
---- a/test/bench.cxx
-+++ b/test/bench.cxx
-@@ -295,10 +295,6 @@ int main(int argc, char **argv)
-       TString sp = gSystem->GetFromPipe("uname -a");
-       sp.Resize(60);
-       printf("*  SYS: %s\n",sp.Data());
--      if (strstr(gSystem->GetBuildNode(),"Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         printf("*  SYS: %s\n",sp.Data());
--      }
-       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
-diff --git a/test/stress.cxx b/test/stress.cxx
-index d3087fdd56..29dba1625d 100644
---- a/test/stress.cxx
-+++ b/test/stress.cxx
-@@ -200,10 +200,6 @@ void stress(Int_t nevent, Int_t style = 1,
-       TString sp = gSystem->GetFromPipe("uname -a");
-       sp.Resize(60);
-       printf("*  SYS: %s\n",sp.Data());
--      if (strstr(gSystem->GetBuildNode(),"Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         printf("*  SYS: %s\n",sp.Data());
--      }
-       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
-diff --git a/test/stressFit.cxx b/test/stressFit.cxx
-index 667142eff9..80bbd0200f 100644
---- a/test/stressFit.cxx
-+++ b/test/stressFit.cxx
-@@ -646,10 +646,6 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
-      TString sp = gSystem->GetFromPipe("uname -a");
-      sp.Resize(60);
-      printf("*  SYS: %s\n",sp.Data());
--     if (strstr(gSystem->GetBuildNode(),"Linux")) {
--        sp = gSystem->GetFromPipe("lsb_release -d -s");
--        printf("*  SYS: %s\n",sp.Data());
--     }
-      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-         sp += " Mac OS X ";
-diff --git a/test/stressGUI.cxx b/test/stressGUI.cxx
-index 1a92df5341..9daae5f5fe 100644
---- a/test/stressGUI.cxx
-+++ b/test/stressGUI.cxx
-@@ -307,10 +307,6 @@ void stressGUI()
-          TString sp = gSystem->GetFromPipe("uname -a");
-          sp.Resize(60);
-          printf("*  SYS: %s\n",sp.Data());
--         if (strstr(gSystem->GetBuildNode(),"Linux")) {
--            sp = gSystem->GetFromPipe("lsb_release -d -s");
--            printf("*  SYS: %s\n",sp.Data());
--         }
-          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-             sp += " Mac OS X ";
-diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
-index 5e81f5f2ca..2dc366cbf8 100644
---- a/test/stressGeometry.cxx
-+++ b/test/stressGeometry.cxx
-@@ -295,10 +295,6 @@ void stressGeometry(const char *exp="*", Bool_t generate_ref=kFALSE, Bool_t vecg
-          TString sp = gSystem->GetFromPipe("uname -a");
-          sp.Resize(60);
-          printf("*  SYS: %s\n",sp.Data());
--         if (strstr(gSystem->GetBuildNode(),"Linux")) {
--            sp = gSystem->GetFromPipe("lsb_release -d -s");
--            printf("*  SYS: %s\n",sp.Data());
--         }
-          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-             sp += " Mac OS X ";
-diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
-index 5fe958774d..8b6aa9af9a 100644
---- a/test/stressGraphics.cxx
-+++ b/test/stressGraphics.cxx
-@@ -419,10 +419,6 @@ void stressGraphics(Int_t verbose = 0)
-          TString sp = gSystem->GetFromPipe("uname -a");
-          sp.Resize(60);
-          printf("*  SYS: %s\n",sp.Data());
--         if (strstr(gSystem->GetBuildNode(),"Linux")) {
--            sp = gSystem->GetFromPipe("lsb_release -d -s");
--            printf("*  SYS: %s\n",sp.Data());
--         }
-          if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-             sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-             sp += " Mac OS X ";
-diff --git a/test/stressHepix.cxx b/test/stressHepix.cxx
-index d8d2a65a64..01dfc67a54 100644
---- a/test/stressHepix.cxx
-+++ b/test/stressHepix.cxx
-@@ -143,10 +143,6 @@ int main(int argc, char **argv)
-       TString sp = gSystem->GetFromPipe("uname -a");
-       sp.Resize(60);
-       printf("*  SYS: %s\n",sp.Data());
--      if (strstr(gSystem->GetBuildNode(),"Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         printf("*  SYS: %s\n",sp.Data());
--      }
-       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
-diff --git a/test/stressHistFactory.cxx b/test/stressHistFactory.cxx
-index b84fa70f86..ec6deac031 100644
---- a/test/stressHistFactory.cxx
-+++ b/test/stressHistFactory.cxx
-@@ -139,10 +139,6 @@ Int_t stressHistFactory(const char* refFile, Bool_t writeRef, Int_t verbose, Boo
-    if (UNIX) {
-       TString sp = gSystem->GetFromPipe("uname -a");
-       cout << "* SYS: " << sp << endl;
--      if (strstr(gSystem->GetBuildNode(), "Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         cout << "* SYS: " << sp << endl;
--      }
-       if (strstr(gSystem->GetBuildNode(), "Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
-diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
-index ce2e1af23d..e34ddf85a2 100644
---- a/test/stressLinear.cxx
-+++ b/test/stressLinear.cxx
-@@ -296,10 +296,6 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
-      TString sp = gSystem->GetFromPipe("uname -a");
-      sp.Resize(60);
-      printf("*  SYS: %s\n",sp.Data());
--     if (strstr(gSystem->GetBuildNode(),"Linux")) {
--        sp = gSystem->GetFromPipe("lsb_release -d -s");
--        printf("*  SYS: %s\n",sp.Data());
--     }
-      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-         sp += " Mac OS X ";
-diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
-index 18e214ec0c..4f7c5a3d83 100644
---- a/test/stressRooFit.cxx
-+++ b/test/stressRooFit.cxx
-@@ -197,10 +197,6 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
-      TString sp = gSystem->GetFromPipe("uname -a");
-      sp.Resize(60);
-      printf("*  SYS: %s\n",sp.Data());
--     if (strstr(gSystem->GetBuildNode(),"Linux")) {
--        sp = gSystem->GetFromPipe("lsb_release -d -s");
--        printf("*  SYS: %s\n",sp.Data());
--     }
-      if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-         sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-         sp += " Mac OS X ";
-diff --git a/test/stressRooStats.cxx b/test/stressRooStats.cxx
-index 35598b5919..adb3dc4cd8 100644
---- a/test/stressRooStats.cxx
-+++ b/test/stressRooStats.cxx
-@@ -232,10 +232,6 @@ Int_t stressRooStats(const char* refFile, Bool_t writeRef, Int_t verbose, Bool_t
-    if (UNIX) {
-       TString sp = gSystem->GetFromPipe("uname -a");
-       cout << "* SYS: " << sp << endl;
--      if (strstr(gSystem->GetBuildNode(), "Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         cout << "* SYS: " << sp << endl;
--      }
-       if (strstr(gSystem->GetBuildNode(), "Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
-diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
-index f7638a73f6..22e3feaf65 100644
---- a/test/stressTMVA.cxx
-+++ b/test/stressTMVA.cxx
-@@ -3193,10 +3193,6 @@ int main(int argc, char **argv)
-       TString sp = gSystem->GetFromPipe("uname -a");
-       sp.Resize(60);
-       printf("*  SYS: %s\n",sp.Data());
--      if (strstr(gSystem->GetBuildNode(),"Linux")) {
--         sp = gSystem->GetFromPipe("lsb_release -d -s");
--         printf("*  SYS: %s\n",sp.Data());
--      }
-       if (strstr(gSystem->GetBuildNode(),"Darwin")) {
-          sp  = gSystem->GetFromPipe("sw_vers -productVersion");
-          sp += " Mac OS X ";
--- 
-2.37.1
-
diff --git a/root-gtest-compat.patch b/root-gtest-compat.patch
new file mode 100644
index 0000000..4dd4b58
--- /dev/null
+++ b/root-gtest-compat.patch
@@ -0,0 +1,85 @@
+From 922290ebdc5e3363adfa82dd45208862bb01630a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 8 Feb 2023 09:50:00 +0100
+Subject: [PATCH] Fix build with -Dbuiltin_gtest:BOOL=OFF on EPEL 8
+
+---
+ roofit/roofitcore/test/testRooBinSamplingPdf.cxx | 7 ++++++-
+ roofit/roofitcore/test/testRooProdPdf.cxx        | 5 +++++
+ roofit/roofitcore/test/testRooRealIntegral.cxx   | 5 +++++
+ roofit/roofitcore/test/testTestStatistics.cxx    | 2 +-
+ 4 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
+index 823fef712f..116000f9f8 100644
+--- a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
++++ b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
+@@ -13,6 +13,11 @@
+ 
+ #include <gtest/gtest.h>
+ 
++// Backward compatibility for gtest version < 1.10.0
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <memory>
+ 
+ class ParamTest : public testing::TestWithParam<std::tuple<std::string>> {
+@@ -123,7 +128,7 @@ TEST(RooBinSamplingPdf, CheckConsistentNormalization)
+    EXPECT_FLOAT_EQ(int2->getVal(), int3->getVal());
+ }
+ 
+-INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Combine(testing::Values("Off", "Cpu")),
++INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Values("Off", "Cpu"),
+                          [](testing::TestParamInfo<ParamTest::ParamType> const &paramInfo) {
+                             std::stringstream ss;
+                             ss << "BatchMode" << std::get<0>(paramInfo.param);
+diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
+index 86bcf6eb48..d794fb415a 100644
+--- a/roofit/roofitcore/test/testRooProdPdf.cxx
++++ b/roofit/roofitcore/test/testRooProdPdf.cxx
+@@ -16,6 +16,11 @@
+ 
+ #include <gtest/gtest.h>
+ 
++// Backward compatibility for gtest version < 1.10.0
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <memory>
+ #include <sstream>
+ #include <string>
+diff --git a/roofit/roofitcore/test/testRooRealIntegral.cxx b/roofit/roofitcore/test/testRooRealIntegral.cxx
+index c33c6ae138..0ab6ab973f 100644
+--- a/roofit/roofitcore/test/testRooRealIntegral.cxx
++++ b/roofit/roofitcore/test/testRooRealIntegral.cxx
+@@ -20,6 +20,11 @@
+ 
+ #include <gtest/gtest.h>
+ 
++// Backward compatibility for gtest version < 1.10.0
++#ifndef INSTANTIATE_TEST_SUITE_P
++#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#endif
++
+ #include <memory>
+ 
+ namespace {
+diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
+index dc20b4e1c9..1623637653 100644
+--- a/roofit/roofitcore/test/testTestStatistics.cxx
++++ b/roofit/roofitcore/test/testTestStatistics.cxx
+@@ -490,7 +490,7 @@ TEST_P(OffsetBinTest, CrossCheck)
+    EXPECT_NEAR(nllVal1, 0.0, 1e-8) << "NLL with bin offsetting is " << nllVal1 << ", and " << nllVal0 << " without it.";
+ }
+ 
+-INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Combine(testing::Values("Off", "Cpu")),
++INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values("Off", "Cpu"),
+                          [](testing::TestParamInfo<TestStatisticTest::ParamType> const &paramInfo) {
+                             std::stringstream ss;
+                             ss << "BatchMode" << std::get<0>(paramInfo.param);
+-- 
+2.39.1
+
diff --git a/root-ignore-prefix.patch b/root-ignore-prefix.patch
deleted file mode 100644
index 5b9918a..0000000
--- a/root-ignore-prefix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1aa9231becda09a89ec576e4a17ca4d9b6e2f310 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 15 Mar 2022 14:55:37 +0100
-Subject: [PATCH] Link to the blas library found by cmake, not hardcoded
- "blas". Set ROOTIGNOREPREFIX=1 when running built binaries during build. Make
- sure PCH is created before running emitters.
-
----
- tmva/sofie/test/CMakeLists.txt | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/tmva/sofie/test/CMakeLists.txt b/tmva/sofie/test/CMakeLists.txt
-index e4f9d28748..a3a2c9ae16 100644
---- a/tmva/sofie/test/CMakeLists.txt
-+++ b/tmva/sofie/test/CMakeLists.txt
-@@ -51,7 +51,7 @@ foreach(onnx_file ${ONNX_FILES})
- 	get_filename_component(fname ${onnx_file} NAME_WE)
- 	get_filename_component(fdir ${onnx_file} DIRECTORY)
- 	add_custom_command(TARGET SofieCompileModels_ONNX POST_BUILD
--		COMMAND ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
-+		COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
- 		USES_TERMINAL
- 	)
- endforeach()
-@@ -100,7 +101,7 @@ foreach(onnx_file ${ONNX_FILES})
- 	get_filename_component(fname ${onnx_file} NAME_WE)
- 	get_filename_component(fdir ${onnx_file} DIRECTORY)
- 	add_custom_command(TARGET SofieCompileModels_ROOT POST_BUILD
--		COMMAND ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
-+		COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
- 		USES_TERMINAL
- 	)
- endforeach()
--- 
-2.35.1
-
diff --git a/root-longlong.patch b/root-longlong.patch
deleted file mode 100644
index 3c43542..0000000
--- a/root-longlong.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2aa02353663674a338c92fa4e72a0c0e529c410e Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@cern.ch>
-Date: Fri, 8 Apr 2022 17:52:18 +0200
-Subject: [PATCH] [DF] Fix long int + Snapshot test on 32 bit platforms
-
-Co-authored-by: Mattias Ellert <mattias.ellert@physics.uu.se>
----
- tree/dataframe/test/dataframe_snapshot.cxx | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
-index f41848e96a..ddbacaba0f 100644
---- a/tree/dataframe/test/dataframe_snapshot.cxx
-+++ b/tree/dataframe/test/dataframe_snapshot.cxx
-@@ -495,11 +495,14 @@ void ReadWriteCarray(const char *outFileNameBase)
-    t.Branch("vb", vb, "vb[size]/O");
-    t.Branch("vl", vl, "vl[size]/G");
- 
-+   // use 2**33 as a larger-than-int value on 64 bits, otherwise just something larger than short (2**30)
-+   static constexpr long int longintTestValue = sizeof(long int) == 8 ? 8589934592 : 1073741824;
-+
-    // Size 1
-    size = 1;
-    v[0] = 12;
-    vb[0] = true;
--   vl[0] = 8589934592; // 2**33
-+   vl[0] = longintTestValue;
-    t.Fill();
- 
-    // Size 0 (see ROOT-9860)
-@@ -546,7 +549,7 @@ void ReadWriteCarray(const char *outFileNameBase)
-       EXPECT_EQ(rvb.GetSize(), 1u);
-       EXPECT_TRUE(rvb[0]);
-       EXPECT_EQ(rvl.GetSize(), 1u);
--      EXPECT_EQ(rvl[0], 8589934592);
-+      EXPECT_EQ(rvl[0], longintTestValue);
- 
-       // Size 0
-       EXPECT_TRUE(r.Next());
--- 
-2.35.1
-
diff --git a/root-make-DistRDF-optional.patch b/root-make-DistRDF-optional.patch
new file mode 100644
index 0000000..653e14e
--- /dev/null
+++ b/root-make-DistRDF-optional.patch
@@ -0,0 +1,32 @@
+From 90e7f868bc115da821c0f04dbafd80ef72e7490a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 2 Mar 2023 08:31:29 +0100
+Subject: [PATCH 2/2] Missing experimental add-on module
+ ROOT.RDF.Experimental.Distributed (DistRDF) should not fail the loading of
+ the rest of the ROOT.RDF namespace.
+
+---
+ bindings/pyroot/pythonizations/python/ROOT/_facade.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+index 865321e713..69046fc71c 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+@@ -336,8 +336,11 @@ class ROOTFacade(types.ModuleType):
+             ns.FromNumpy = MakeNumpyDataFrame
+ 
+             if sys.version_info >= (3, 8):
+-                # Inject Experimental.Distributed package into namespace RDF
+-                ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
++                try:
++                    # Inject Experimental.Distributed package into namespace RDF if available
++                    ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
++                except ImportError:
++                    pass
+         except:
+             raise Exception('Failed to pythonize the namespace RDF')
+         del type(self).RDF
+-- 
+2.39.2
+
diff --git a/root-make-dyld-based-library-search-behavior-default.patch b/root-make-dyld-based-library-search-behavior-default.patch
deleted file mode 100644
index 9b88576..0000000
--- a/root-make-dyld-based-library-search-behavior-default.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 6ae602bba7d33c900a117c9de0187ab5a28e14b8 Mon Sep 17 00:00:00 2001
-From: Vassil Vassilev <v.g.vassilev@gmail.com>
-Date: Mon, 21 Mar 2022 22:16:54 +0000
-Subject: [PATCH] Make the dyld-based library search behavior default for
- non-modules.
-
-The dyld-based system was developed in the context on C++ modules but it turned
-into a modules-agnostic feature. Instead of having to maintain more code, we
-should rely on it even for non-modules build of ROOT.
----
- core/metacling/src/TCling.cxx | 109 +++-------------------------------
- 1 file changed, 8 insertions(+), 101 deletions(-)
-
-diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
-index dec399cf2b..3eae1c8570 100644
---- a/core/metacling/src/TCling.cxx
-+++ b/core/metacling/src/TCling.cxx
-@@ -6501,14 +6501,18 @@ bool TCling::LibraryLoadingFailed(const std::string& errmessage, const std::stri
-    return false;
- }
- 
--static void* LazyFunctionCreatorAutoloadForModule(const std::string &mangled_name,
--                                                  const cling::DynamicLibraryManager &DLM) {
-+////////////////////////////////////////////////////////////////////////////////
-+/// Autoload a library based on a missing symbol.
-+
-+void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
-+
-+   const cling::DynamicLibraryManager &DLM = *GetInterpreterImpl()->getDynamicLibraryManager();
-    R__LOCKGUARD(gInterpreterMutex);
- 
-    auto LibLoader = [](const std::string& LibName) -> bool {
-      if (gSystem->Load(LibName.c_str(), "", false) < 0) {
--       Error("TCling__LazyFunctionCreatorAutoloadForModule",
--             "Failed to load library %s", LibName.c_str());
-+        ::Error("TCling__LazyFunctionCreatorAutoloadForModule",
-+                "Failed to load library %s", LibName.c_str());
-        return false;
-      }
-      return true; //success.
-@@ -6536,103 +6540,6 @@ static void* LazyFunctionCreatorAutoloadForModule(const std::string &mangled_nam
-       return nullptr;
- 
-    return llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(mangled_name);
--
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Autoload a library based on a missing symbol.
--
--void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
--   if (fCxxModulesEnabled)
--      return LazyFunctionCreatorAutoloadForModule(mangled_name,
--                                                  *GetInterpreterImpl()->getDynamicLibraryManager());
--
--   // First see whether the symbol is in the library that we are currently
--   // loading. It will have access to the symbols of its dependent libraries,
--   // thus checking "back()" is sufficient.
--   if (!fRegisterModuleDyLibs.empty()) {
--      if (void* addr = dlsym(fRegisterModuleDyLibs.back(),
--                             mangled_name.c_str())) {
--         return addr;
--      }
--   }
--
--   int err = 0;
--   char* demangled_name_c = TClassEdit::DemangleName(mangled_name.c_str(), err);
--   if (err) {
--      return 0;
--   }
--
--   std::string name(demangled_name_c);
--   free(demangled_name_c);
--
--   //fprintf(stderr, "demangled name: '%s'\n", demangled_name);
--   //
--   //  Separate out the class or namespace part of the
--   //  function name.
--   //
--
--   std::string::size_type pos = name.find("__thiscall ");
--   if (pos != std::string::npos) {
--      name.erase(0, pos + sizeof("__thiscall ")-1);
--   }
--   pos = name.find("__cdecl ");
--   if (pos != std::string::npos) {
--      name.erase(0, pos + sizeof("__cdecl ")-1);
--   }
--   if (!strncmp(name.c_str(), "typeinfo for ", sizeof("typeinfo for ")-1)) {
--      name.erase(0, sizeof("typeinfo for ")-1);
--   } else if (!strncmp(name.c_str(), "vtable for ", sizeof("vtable for ")-1)) {
--      name.erase(0, sizeof("vtable for ")-1);
--   } else if (!strncmp(name.c_str(), "operator", sizeof("operator")-1)
--              && !isalnum(name[sizeof("operator")])) {
--     // operator...(A, B) - let's try with A!
--     name.erase(0, sizeof("operator")-1);
--     pos = name.rfind('(');
--     if (pos != std::string::npos) {
--       name.erase(0, pos + 1);
--       pos = name.find(",");
--       if (pos != std::string::npos) {
--         // remove next arg up to end, leaving only the first argument type.
--         name.erase(pos);
--       }
--       pos = name.rfind(" const");
--       if (pos != std::string::npos) {
--         name.erase(pos, strlen(" const"));
--       }
--       while (!name.empty() && strchr("&*", name.back()))
--         name.erase(name.length() - 1);
--     }
--   } else {
--      TClassEdit::FunctionSplitInfo fsi;
--      TClassEdit::SplitFunction(name, fsi);
--      name = fsi.fScopeName;
--   }
--   //fprintf(stderr, "name: '%s'\n", name.c_str());
--   // Now we have the class or namespace name, so do the lookup.
--   TString libs = GetClassSharedLibs(name.c_str());
--   if (libs.IsNull()) {
--      // Not found in the map, all done.
--      return 0;
--   }
--   //fprintf(stderr, "library: %s\n", iter->second.c_str());
--   // Now we have the name of the libraries to load, so load them.
--
--   TString lib;
--   Ssiz_t posLib = 0;
--   while (libs.Tokenize(lib, posLib)) {
--      if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) {
--         // The library load failed, all done.
--         //fprintf(stderr, "load failed: %s\n", errmsg.c_str());
--         return 0;
--      }
--   }
--
--   //fprintf(stderr, "load succeeded.\n");
--   // Get the address of the function being called.
--   void* addr = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(mangled_name.c_str());
--   //fprintf(stderr, "addr: %016lx\n", reinterpret_cast<unsigned long>(addr));
--   return addr;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--- 
-2.35.1
-
diff --git a/root-namespace-pymva.patch b/root-namespace-pymva.patch
deleted file mode 100644
index cd2fa57..0000000
--- a/root-namespace-pymva.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0a969f5376af248e76cbcee45c9bdb6463e18c05 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 21:20:07 +0100
-Subject: [PATCH 3/3] Add namespaces to LinkDef
-
-Fixes error:
-
-IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE7PyTorch5ParseENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS9_ImSaImEESaISB_EE' unresolved while linking function '_GLOBAL__sub_I_cling_module_8'!
-You are probably missing the definition of TMVA::Experimental::SOFIE::PyTorch::Parse(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::vector<unsigned long, std::allocator<unsigned long> >, std::allocator<std::vector<unsigned long, std::allocator<unsigned long> > > >)
-Maybe you need to load the corresponding shared library?
-Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libPyMVA.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libPyMVA.so.6.26.00'?
----
- tmva/pymva/inc/LinkDef.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tmva/pymva/inc/LinkDef.h b/tmva/pymva/inc/LinkDef.h
-index 92da99a4f7..83145077dd 100644
---- a/tmva/pymva/inc/LinkDef.h
-+++ b/tmva/pymva/inc/LinkDef.h
-@@ -15,6 +15,8 @@
- #pragma link C++ class TMVA::MethodPyGTB+;
- #pragma link C++ class TMVA::MethodPyKeras+;
- #pragma link C++ class TMVA::MethodPyTorch+;
-+#pragma link C++ namespace TMVA::Experimental::SOFIE::PyKeras;
- #pragma link C++ function TMVA::Experimental::SOFIE::PyKeras::Parse+;
-+#pragma link C++ namespace TMVA::Experimental::SOFIE::PyTorch;
- #pragma link C++ function TMVA::Experimental::SOFIE::PyTorch::Parse+;
- #endif
--- 
-2.35.1
-
diff --git a/root-namespace-roofit.patch b/root-namespace-roofit.patch
deleted file mode 100644
index c8aa92e..0000000
--- a/root-namespace-roofit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4a4df0190ad24c0a3636994c2c23cb6c22e04589 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 15:41:33 +0100
-Subject: [PATCH 2/3] Remove namespace RooFit from libRooFitCore's LinkDef
-
-The namespace is listed in the LinkDef's for both libRooFit and libRooFitCore.
-
-ROOT only autoloads one of the libraries, for some reason usually
-libRooFitCore. After this only symbols in the namespace from that
-library are present. By removing the namespace from liRooFitCore's
-LinkDef, only libRooFit can be chosen when autoloading. Since
-libRooFit depends on libRooFitCore, both libraries are loaded, and the
-symbols from the namespace in both libraries are available.
-
-Fixes error:
-
-IncrementalExecutor::executeFunction: symbol '_ZN6RooFit12bindFunctionEPKcPFddER10RooAbsReal' unresolved while linking function '_GLOBAL__sub_I_cling_module_217'!
-You are probably missing the definition of RooFit::bindFunction(char const*, double (*)(double), RooAbsReal&)
-Maybe you need to load the corresponding shared library?
-Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libRooFit.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libRooFit.so.6.26.00'?
----
- roofit/roofitcore/inc/LinkDef.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/roofit/roofitcore/inc/LinkDef.h b/roofit/roofitcore/inc/LinkDef.h
-index d421fd95cd..72c66db33b 100644
---- a/roofit/roofitcore/inc/LinkDef.h
-+++ b/roofit/roofitcore/inc/LinkDef.h
-@@ -105,7 +105,10 @@
- 
- 
- // Old LinkDef2.h
--#pragma link C++ namespace RooFit ;
-+
-+// "namespace RooFit" is in roofit/roofit/inc/Linkdef1.h
-+// should not be in the dictionary for two different libraries
-+// #pragma link C++ namespace RooFit ;
- #pragma link C++ namespace RooFitShortHand ;
- #pragma link C++ class RooDouble+ ;
- #pragma link C++ class RooEffGenContext+ ;
--- 
-2.35.1
-
diff --git a/root-namespace-sofie.patch b/root-namespace-sofie.patch
deleted file mode 100644
index a011634..0000000
--- a/root-namespace-sofie.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c66ae9d9c035090584f465a41ce2e438e502be81 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 15:23:59 +0100
-Subject: [PATCH 1/3] Add namespace TMVA::Experimental::SOFIE to LinkDef
-
-Fixes error:
-
-IncrementalExecutor::executeFunction: symbol '_ZN4TMVA12Experimental5SOFIE19ConvertTypeToStringB5cxx11ENS1_11ETensorTypeE' unresolved while linking function '_GLOBAL__sub_I_cling_module_8'!
-You are probably missing the definition of TMVA::Experimental::SOFIE::ConvertTypeToString[abi:cxx11](TMVA::Experimental::SOFIE::ETensorType)
-Maybe you need to load the corresponding shared library?
-Symbol found in '/builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libROOTTMVASofie.so.6.26.00'; did you mean to load it with '.L /builddir/build/BUILD/root-6.26.00/redhat-linux-build/lib/libROOTTMVASofie.so.6.26.00'?
----
- tmva/sofie/inc/LinkDef.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tmva/sofie/inc/LinkDef.h b/tmva/sofie/inc/LinkDef.h
-index 715cf35560..3282ff22c1 100644
---- a/tmva/sofie/inc/LinkDef.h
-+++ b/tmva/sofie/inc/LinkDef.h
-@@ -7,6 +7,7 @@
- 
- #pragma link C++ nestedclass;
- 
-+#pragma link C++ namespace TMVA::Experimental::SOFIE;
- #pragma link C++ class TMVA::Experimental::SOFIE::RModel-;
- #pragma link C++ class TMVA::Experimental::SOFIE::ROperator+;
- #pragma link C++ struct TMVA::Experimental::SOFIE::InitializedTensor+;
--- 
-2.35.1
-
diff --git a/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch b/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
new file mode 100644
index 0000000..c833930
--- /dev/null
+++ b/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
@@ -0,0 +1,30 @@
+From 4ab2a1695a3f6350b454203c044db5d6f0c75dd2 Mon Sep 17 00:00:00 2001
+From: Javier Lopez-Gomez <javier.lopez.gomez@cern.ch>
+Date: Mon, 13 Feb 2023 15:05:39 +0100
+Subject: [PATCH] [ntuple] RPageSinkBuf: add missing call to ReleasePage()
+
+---
+ tree/ntuple/v7/src/RPageSinkBuf.cxx | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tree/ntuple/v7/src/RPageSinkBuf.cxx b/tree/ntuple/v7/src/RPageSinkBuf.cxx
+index b22ef705ef..88babb456f 100644
+--- a/tree/ntuple/v7/src/RPageSinkBuf.cxx
++++ b/tree/ntuple/v7/src/RPageSinkBuf.cxx
+@@ -106,8 +106,11 @@ ROOT::Experimental::Detail::RPageSinkBuf::CommitClusterImpl(ROOT::Experimental::
+       }
+       fInnerSink->CommitSealedPageV(toCommit);
+ 
+-      for (auto &bufColumn : fBufferedColumns)
+-         bufColumn.DrainBufferedPages();
++      for (auto &bufColumn : fBufferedColumns) {
++         auto drained = bufColumn.DrainBufferedPages();
++         for (auto &bufPage : std::get<std::deque<RColumnBuf::RPageZipItem>>(drained))
++            ReleasePage(bufPage.fPage);
++      }
+       return fInnerSink->CommitCluster(nEntries);
+    }
+ 
+-- 
+2.39.2
+
diff --git a/root-ntuplewait.patch b/root-ntuplewait.patch
deleted file mode 100644
index b464b69..0000000
--- a/root-ntuplewait.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ad043f8e3304aab4f0ee3ad9e0cf8480c4bbadf0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 16:10:22 +0100
-Subject: [PATCH] Always call WaitForInFlightClusters before checking cluster
- IDs
-
----
- tree/ntuple/v7/test/ntuple_cluster.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tree/ntuple/v7/test/ntuple_cluster.cxx b/tree/ntuple/v7/test/ntuple_cluster.cxx
-index afc2fc32e9..0c299d97de 100644
---- a/tree/ntuple/v7/test/ntuple_cluster.cxx
-+++ b/tree/ntuple/v7/test/ntuple_cluster.cxx
-@@ -213,6 +213,7 @@ TEST(ClusterPool, GetClusterBasics)
-    RPageSourceMock p1;
-    RClusterPool c1(p1, 1);
-    c1.GetCluster(3, {0});
-+   c1.WaitForInFlightClusters();
-    ASSERT_EQ(2U, p1.fReqsClusterIds.size());
-    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
-    EXPECT_EQ(4U, p1.fReqsClusterIds[1]);
-@@ -267,11 +268,13 @@ TEST(ClusterPool, GetClusterIncrementally)
-    RPageSourceMock p1;
-    RClusterPool c1(p1, 1);
-    c1.GetCluster(3, {0});
-+   c1.WaitForInFlightClusters();
-    ASSERT_EQ(2U, p1.fReqsClusterIds.size());
-    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
-    EXPECT_EQ(RCluster::ColumnSet_t({0}), p1.fReqsColumns[0]);
- 
-    c1.GetCluster(3, {1});
-+   c1.WaitForInFlightClusters();
-    ASSERT_EQ(4U, p1.fReqsClusterIds.size());
-    EXPECT_EQ(3U, p1.fReqsClusterIds[2]);
-    EXPECT_EQ(RCluster::ColumnSet_t({1}), p1.fReqsColumns[2]);
--- 
-2.35.1
-
diff --git a/root-old-gtest-compat.patch b/root-old-gtest-compat.patch
deleted file mode 100644
index 7bce796..0000000
--- a/root-old-gtest-compat.patch
+++ /dev/null
@@ -1,477 +0,0 @@
-From 99e9ad9ea54369296537ceb012ccdcb333b5f513 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 26 Mar 2022 10:55:38 +0100
-Subject: [PATCH 2/2] Backward compatibility with older googletest versions in
- EPEL
-
----
- hist/hist/test/test_THBinIterator.cxx                  |  5 +++++
- math/mathcore/test/stress/testGenVector.cxx            | 10 ++++++++++
- math/mathcore/test/stress/testSMatrix.cxx              | 10 ++++++++++
- math/mathcore/test/stress/testVector.cxx               | 10 ++++++++++
- math/mathcore/test/stress/testVector34.cxx             | 10 ++++++++++
- math/mathcore/test/testGradient.cxx                    |  4 ++++
- math/mathcore/test/testGradientFitting.cxx             | 10 ++++++++++
- math/mathmore/test/testStress.cxx                      | 10 ++++++++++
- roofit/histfactory/test/testHistFactory.cxx            |  4 ++++
- roofit/multiprocess/test/test_Job.cxx                  |  5 +++++
- roofit/roofitZMQ/test/test_ZMQ.cpp                     |  4 ++++
- roofit/roofitcore/test/TestStatistics/RooRealL.cpp     |  4 ++++
- .../test/TestStatistics/testLikelihoodGradientJob.cpp  |  5 +++++
- roofit/roofitcore/test/testProxiesAndCategories.cxx    |  3 +++
- roofit/roofitcore/test/testRooDataHist.cxx             |  4 ++++
- roofit/roofitcore/test/testRooGradMinimizerFcn.cxx     |  5 +++++
- tree/dataframe/test/dataframe_definepersample.cxx      |  4 ++++
- tree/dataframe/test/dataframe_merge_results.cxx        |  2 +-
- tree/dataframe/test/dataframe_regression.cxx           |  4 ++++
- tree/dataframe/test/dataframe_samplecallback.cxx       |  4 ++++
- tree/dataframe/test/dataframe_simple.cxx               |  5 +++++
- tree/dataframe/test/dataframe_vary.cxx                 |  4 ++++
- tree/tree/test/TOffsetGeneration.cxx                   |  4 ++++
- 23 files changed, 129 insertions(+), 1 deletion(-)
-
-diff --git a/hist/hist/test/test_THBinIterator.cxx b/hist/hist/test/test_THBinIterator.cxx
-index e30585b8cb..04f1e1487b 100644
---- a/hist/hist/test/test_THBinIterator.cxx
-+++ b/hist/hist/test/test_THBinIterator.cxx
-@@ -1,5 +1,10 @@
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define SetUpTestSuite SetUpTestCase
-+#define TearDownTestSuite TearDownTestCase
-+#endif
-+
- // test iterating histogram bins and using the new THistRange and
- // THBinIterator classes
- 
-diff --git a/math/mathcore/test/stress/testGenVector.cxx b/math/mathcore/test/stress/testGenVector.cxx
-index 93c0bb6aec..b3259158da 100644
---- a/math/mathcore/test/stress/testGenVector.cxx
-+++ b/math/mathcore/test/stress/testGenVector.cxx
-@@ -4,6 +4,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include "StatFunction.h"
- #include "TestHelper.h"
- #include "VectorTest.h"
-diff --git a/math/mathcore/test/stress/testSMatrix.cxx b/math/mathcore/test/stress/testSMatrix.cxx
-index a4d7fc4cd5..a35d88b7c2 100644
---- a/math/mathcore/test/stress/testSMatrix.cxx
-+++ b/math/mathcore/test/stress/testSMatrix.cxx
-@@ -7,6 +7,16 @@
- #include "TestHelper.h"
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include "VectorTest.h"
- #include "TROOT.h"
- #include "TSystem.h"
-diff --git a/math/mathcore/test/stress/testVector.cxx b/math/mathcore/test/stress/testVector.cxx
-index 72e933f0d5..938e27d83c 100644
---- a/math/mathcore/test/stress/testVector.cxx
-+++ b/math/mathcore/test/stress/testVector.cxx
-@@ -4,6 +4,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include "StatFunction.h"
- #include "TestHelper.h"
- #include "VectorTest.h"
-diff --git a/math/mathcore/test/stress/testVector34.cxx b/math/mathcore/test/stress/testVector34.cxx
-index 4b31184559..80d6dd6314 100644
---- a/math/mathcore/test/stress/testVector34.cxx
-+++ b/math/mathcore/test/stress/testVector34.cxx
-@@ -4,6 +4,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include "StatFunction.h"
- #include "VectorTest.h"
- 
-diff --git a/math/mathcore/test/testGradient.cxx b/math/mathcore/test/testGradient.cxx
-index 49a5391b7b..271e89e43c 100644
---- a/math/mathcore/test/testGradient.cxx
-+++ b/math/mathcore/test/testGradient.cxx
-@@ -22,6 +22,10 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE
-+#define TYPED_TEST_SUITE TYPED_TEST_CASE
-+#endif
-+
- #include <chrono>
- #include <iostream>
- #include <string>
-diff --git a/math/mathcore/test/testGradientFitting.cxx b/math/mathcore/test/testGradientFitting.cxx
-index f85f826d9f..1818d1c22f 100644
---- a/math/mathcore/test/testGradientFitting.cxx
-+++ b/math/mathcore/test/testGradientFitting.cxx
-@@ -13,6 +13,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- #include <iostream>
- #include <string>
- 
-diff --git a/math/mathmore/test/testStress.cxx b/math/mathmore/test/testStress.cxx
-index 47bcdd250f..5cf20e69a1 100644
---- a/math/mathmore/test/testStress.cxx
-+++ b/math/mathmore/test/testStress.cxx
-@@ -26,6 +26,16 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef TYPED_TEST_SUITE_P
-+#define TYPED_TEST_SUITE_P TYPED_TEST_CASE_P
-+#endif
-+#ifndef REGISTER_TYPED_TEST_SUITE_P
-+#define REGISTER_TYPED_TEST_SUITE_P REGISTER_TYPED_TEST_CASE_P
-+#endif
-+#ifndef INSTANTIATE_TYPED_TEST_SUITE_P
-+#define INSTANTIATE_TYPED_TEST_SUITE_P INSTANTIATE_TYPED_TEST_CASE_P
-+#endif
-+
- using ::testing::TestWithParam;
- using ::testing::Values;
- 
-diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
-index 71d7b632d2..9063e51070 100644
---- a/roofit/histfactory/test/testHistFactory.cxx
-+++ b/roofit/histfactory/test/testHistFactory.cxx
-@@ -22,6 +22,10 @@
- #include "TCanvas.h"
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <set>
- 
- using namespace RooStats;
-diff --git a/roofit/multiprocess/test/test_Job.cxx b/roofit/multiprocess/test/test_Job.cxx
-index 22e66fc73c..61cc11771d 100644
---- a/roofit/multiprocess/test/test_Job.cxx
-+++ b/roofit/multiprocess/test/test_Job.cxx
-@@ -24,6 +24,11 @@
- #include "RooFit/MultiProcess/Queue.h"          // ... JobManager::queue()
- 
- #include "gtest/gtest.h"
-+
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include "utils.h"
- 
- class xSquaredPlusBVectorSerial {
-diff --git a/roofit/roofitZMQ/test/test_ZMQ.cpp b/roofit/roofitZMQ/test/test_ZMQ.cpp
-index 6dcceaff08..73e75be147 100644
---- a/roofit/roofitZMQ/test/test_ZMQ.cpp
-+++ b/roofit/roofitZMQ/test/test_ZMQ.cpp
-@@ -16,6 +16,10 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <unistd.h> // fork, usleep
- 
- #include <sstream>
-diff --git a/roofit/roofitcore/test/TestStatistics/RooRealL.cpp b/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
-index f8421613ac..3ae6285a12 100644
---- a/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
-+++ b/roofit/roofitcore/test/TestStatistics/RooRealL.cpp
-@@ -34,6 +34,10 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- class RooRealL
-    : public ::testing::TestWithParam<std::tuple<std::size_t>> {
- };
-diff --git a/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp b/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
-index f4adf63eec..05164277f0 100644
---- a/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
-+++ b/roofit/roofitcore/test/TestStatistics/testLikelihoodGradientJob.cpp
-@@ -33,6 +33,11 @@
- #include <stdexcept> // runtime_error
- 
- #include "gtest/gtest.h"
-+
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include "../test_lib.h" // generate_1D_gaussian_pdf_nll
- 
- using RooFit::TestStatistics::LikelihoodWrapper;
-diff --git a/roofit/roofitcore/test/testProxiesAndCategories.cxx b/roofit/roofitcore/test/testProxiesAndCategories.cxx
-index bed3c399bb..550e0c5ac9 100644
---- a/roofit/roofitcore/test/testProxiesAndCategories.cxx
-+++ b/roofit/roofitcore/test/testProxiesAndCategories.cxx
-@@ -16,6 +16,9 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
- 
- TEST(RooCategory, CategoryDefineMultiState) {
-   RooCategory myCat("myCat", "A category", { {"0Lep", 0}, {"1Lep", 1}, {"2Lep", 2}, {"3Lep", 3} });
-diff --git a/roofit/roofitcore/test/testRooDataHist.cxx b/roofit/roofitcore/test/testRooDataHist.cxx
-index 90782e0749..f6b5e087ae 100644
---- a/roofit/roofitcore/test/testRooDataHist.cxx
-+++ b/roofit/roofitcore/test/testRooDataHist.cxx
-@@ -18,6 +18,10 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <algorithm>
- #include <memory>
- 
-diff --git a/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx b/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
-index c1978ae47e..877ab1525f 100644
---- a/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
-+++ b/roofit/roofitcore/test/testRooGradMinimizerFcn.cxx
-@@ -22,6 +22,11 @@
- #include <stdio.h> // remove redundant workspace files
- 
- #include "gtest/gtest.h"
-+
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include "test_lib.h"
- 
- #include <RooMsgService.h>
-diff --git a/tree/dataframe/test/dataframe_definepersample.cxx b/tree/dataframe/test/dataframe_definepersample.cxx
-index 772b8baa70..37da9f3f95 100644
---- a/tree/dataframe/test/dataframe_definepersample.cxx
-+++ b/tree/dataframe/test/dataframe_definepersample.cxx
-@@ -6,6 +6,10 @@
- 
- #include <gtest/gtest.h>
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <atomic>
- #include <memory>
- #include <thread> // std::thread::hardware_concurrency
-diff --git a/tree/dataframe/test/dataframe_merge_results.cxx b/tree/dataframe/test/dataframe_merge_results.cxx
-index 9354b75a39..ea439ea006 100644
---- a/tree/dataframe/test/dataframe_merge_results.cxx
-+++ b/tree/dataframe/test/dataframe_merge_results.cxx
-@@ -340,7 +340,7 @@ TEST(RDataFrameMergeResults, Merge5Hists)
-    EXPECT_FALSE(mh3);
-    EXPECT_FALSE(mh4);
-    EXPECT_FALSE(mh5);
--   EXPECT_TRUE(mergedptr);
-+   EXPECT_TRUE(!!mergedptr);
- 
-    const auto &mh = mergedptr->GetValue();
- 
-diff --git a/tree/dataframe/test/dataframe_regression.cxx b/tree/dataframe/test/dataframe_regression.cxx
-index 9801067cf4..8a991f40c5 100644
---- a/tree/dataframe/test/dataframe_regression.cxx
-+++ b/tree/dataframe/test/dataframe_regression.cxx
-@@ -9,6 +9,10 @@
- 
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- // Fixture for all tests in this file. If parameter is true, run with implicit MT, else run sequentially
- class RDFRegressionTests : public ::testing::TestWithParam<bool> {
- protected:
-diff --git a/tree/dataframe/test/dataframe_samplecallback.cxx b/tree/dataframe/test/dataframe_samplecallback.cxx
-index 188d58dd31..7734586eb3 100644
---- a/tree/dataframe/test/dataframe_samplecallback.cxx
-+++ b/tree/dataframe/test/dataframe_samplecallback.cxx
-@@ -11,6 +11,10 @@
- 
- #include <gtest/gtest.h>
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <algorithm> // std::min
- #include <memory>
- #include <mutex>
-diff --git a/tree/dataframe/test/dataframe_simple.cxx b/tree/dataframe/test/dataframe_simple.cxx
-index 6006f99017..b507edc13f 100644
---- a/tree/dataframe/test/dataframe_simple.cxx
-+++ b/tree/dataframe/test/dataframe_simple.cxx
-@@ -1,5 +1,10 @@
- /****** Run RDataFrame tests both with and without IMT enabled *******/
- #include <gtest/gtest.h>
-+
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <ROOTUnitTestSupport.h>
- #include <ROOT/RDataFrame.hxx>
- #include <ROOT/TSeq.hxx>
-diff --git a/tree/dataframe/test/dataframe_vary.cxx b/tree/dataframe/test/dataframe_vary.cxx
-index 2284b21f53..5a26c43cdc 100644
---- a/tree/dataframe/test/dataframe_vary.cxx
-+++ b/tree/dataframe/test/dataframe_vary.cxx
-@@ -7,6 +7,10 @@
- 
- #include <gtest/gtest.h>
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- using ROOT::RDF::Experimental::VariationsFor;
- 
- class RDFVary : public ::testing::TestWithParam<bool> {
-diff --git a/tree/tree/test/TOffsetGeneration.cxx b/tree/tree/test/TOffsetGeneration.cxx
-index 7b6b7647aa..77f125ca60 100644
---- a/tree/tree/test/TOffsetGeneration.cxx
-+++ b/tree/tree/test/TOffsetGeneration.cxx
-@@ -9,6 +9,10 @@
- #include "ROOTUnitTestSupport.h"
- #include "gtest/gtest.h"
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define SetUpTestSuite SetUpTestCase
-+#endif
-+
- #include "ElementStruct.h"
- 
- class TOffsetGeneration : public ::testing::Test {
--- 
-2.35.1
-
-From 33e5da8c1f678382ab2fd65d000d388bb0dbf3ab Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 17 Apr 2022 22:17:56 +0200
-Subject: [PATCH] Backward compatibility with older googletest versions in EPEL
-
----
- math/vecops/test/vecops_rvec.cxx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
-index 7b513a858b..bea39636ce 100644
---- a/math/vecops/test/vecops_rvec.cxx
-+++ b/math/vecops/test/vecops_rvec.cxx
-@@ -13,6 +13,10 @@
- #include <sstream>
- #include <cmath>
- 
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- using namespace ROOT;
- using namespace ROOT::VecOps;
- using namespace ROOT::Detail::VecOps; // for `IsSmall` and `IsAdopting`
--- 
-2.35.1
-
-From cae450e0210fe584ef30d155a4217cfe2f5aa358 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 30 Jul 2022 17:05:31 +0200
-Subject: [PATCH] Backward compatibility with older googletest versions in EPEL
-
----
- tree/dataframe/test/dataframe_datasetspec.cxx | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tree/dataframe/test/dataframe_datasetspec.cxx b/tree/dataframe/test/dataframe_datasetspec.cxx
-index b422dcf28b..14329102af 100644
---- a/tree/dataframe/test/dataframe_datasetspec.cxx
-+++ b/tree/dataframe/test/dataframe_datasetspec.cxx
-@@ -1,4 +1,9 @@
- #include <gtest/gtest.h>
-+
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <ROOT/RDataFrame.hxx>
- #include <ROOT/RVec.hxx>
- #include <ROOT/RDFHelpers.hxx>
-@@ -36,6 +41,7 @@ protected:
- 
-    ~RDatasetSpecTest() {}
- 
-+public:
-    static void SetUpTestCase()
-    {
-       auto dfWriter0 = RDataFrame(5).Define("z", [](ULong64_t e) { return e + 100; }, {"rdfentry_"});
--- 
-2.37.1
-
diff --git a/root-older-python.patch b/root-older-python.patch
deleted file mode 100644
index fa6a05a..0000000
--- a/root-older-python.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 61116151cce8fe5b397555a65f7b55001b8e416b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 23 Apr 2021 21:39:17 +0200
-Subject: [PATCH] Compat with no f-strings
-
----
- tutorials/tmva/PyTorch_Generate_CNN_Model.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tutorials/tmva/PyTorch_Generate_CNN_Model.py b/tutorials/tmva/PyTorch_Generate_CNN_Model.py
-index 7024112f03..5a314f86dd 100644
---- a/tutorials/tmva/PyTorch_Generate_CNN_Model.py
-+++ b/tutorials/tmva/PyTorch_Generate_CNN_Model.py
-@@ -56,7 +56,7 @@ def fit(model, train_loader, val_loader, num_epochs, batch_size, optimizer, crit
-             # print train statistics
-             running_train_loss += train_loss.item()
-             if i % 4 == 3:    # print every 4 mini-batches
--                print(f"[{epoch+1}, {i+1}] train loss: {running_train_loss / 4 :.3f}")
-+                print("[{}, {}] train loss: {:.3f}".format(epoch+1, i+1, running_train_loss / 4))
-                 running_train_loss = 0.0
- 
-         if schedule:
-@@ -75,15 +75,15 @@ def fit(model, train_loader, val_loader, num_epochs, batch_size, optimizer, crit
- 
-             curr_val = running_val_loss / len(val_loader)
-             if save_best:
--               if best_val==None:
--                   best_val = curr_val
--               best_val = save_best(model, curr_val, best_val)
-+                if best_val is None:
-+                    best_val = curr_val
-+                best_val = save_best(model, curr_val, best_val)
- 
-             # print val statistics per epoch
--            print(f"[{epoch+1}] val loss: {curr_val :.3f}")
-+            print("[{}] val loss: {:.3f}".format(epoch+1, curr_val))
-             running_val_loss = 0.0
- 
--    print(f"Finished Training on {epoch+1} Epochs!")
-+    print("Finished Training on {} Epochs!".format(epoch+1))
- 
-     return model
- 
--- 
-2.30.2
-
diff --git a/root-rcolor-static-init.patch b/root-rcolor-static-init.patch
deleted file mode 100644
index 18e4299..0000000
--- a/root-rcolor-static-init.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c4df90861879f45b281c2a8e55212b711cfdbfa0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 29 Mar 2022 15:30:20 +0200
-Subject: [PATCH] Avoid crashes due to static initialization order
-
-Most commonly seen on ppc64le. Backtrace:
-
-===========================================================
-The lines below might hint at the cause of the crash.
-You may get help by asking at the ROOT forum https://root.cern/forum
-Only if you are really convinced it is a bug in ROOT then please submit a
-report at https://root.cern/bugs Please post the ENTIRE stack trace
-from above as an attachment in addition to anything else
-that might help us fixing this issue.
-===========================================================
- #11 ROOT::Experimental::RColor::toHex[abi:cxx11](unsigned char) (v=<optimized out>) at /usr/include/c++/11/ext/new_allocator.h:82
- #12 0x00007fff90c220ec in ROOT::Experimental::RColor::SetRGB (this=0x7fffeadf5d10, r=<optimized out>, g=<optimized out>, b=<optimized out>) at /usr/include/c++/11/ext/new_allocator.h:89
----
- graf2d/gpadv7/src/RColor.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/graf2d/gpadv7/src/RColor.cxx b/graf2d/gpadv7/src/RColor.cxx
-index de325f1ea3..6878360073 100644
---- a/graf2d/gpadv7/src/RColor.cxx
-+++ b/graf2d/gpadv7/src/RColor.cxx
-@@ -232,10 +232,10 @@ std::vector<uint8_t> RColor::AsRGBA() const
- 
- std::string RColor::toHex(uint8_t v)
- {
--   static const char *digits = "0123456789ABCDEF";
-+   auto digits = [](auto d) { return d < 10 ? '0' + d : 'A' - 10 + d; };
-    std::string res(2,'0');
--   res[0] = digits[v >> 4];
--   res[1] = digits[v & 0xf];
-+   res[0] = digits(v >> 4);
-+   res[1] = digits(v & 0xf);
-    return res;
- }
- 
--- 
-2.35.1
-
diff --git a/root-roofit-tutorial.patch b/root-roofit-tutorial.patch
deleted file mode 100644
index 9d73e11..0000000
--- a/root-roofit-tutorial.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 914e46f1c591f8b9b34115863ff31e42e19bfb97 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 28 Mar 2022 09:32:24 +0200
-Subject: [PATCH] Use calls from Python directly
-
-The rf105_funcbinding.py tutorial used to trigger errors due to unknown
-symbols. In particular the custum new and delete operators used in RooFit
-were not autoloaded when needed.
-
-In the tutorial there was a workaround implemented to call ProcessLine
-instead of making calls directly form Python, to make the autoloading
-from the C++ side of ROOT instead. This did not quite fix the problem,
-and the tutorial still randomly failed due to missing symbols.
-
-After changing the algorthm used for autoloading in commit
-6ae602bba7d33c900a117c9de0187ab5a28e14b8 these problems were solved.
-
-After this fix using the direct calls from Python also works, so this
-PR suggests updating the tutorial to do that.
----
- tutorials/roofit/rf105_funcbinding.py | 30 ++++++---------------------
- 1 file changed, 6 insertions(+), 24 deletions(-)
-
-diff --git a/tutorials/roofit/rf105_funcbinding.py b/tutorials/roofit/rf105_funcbinding.py
-index 72d9cf62fc..b9de2a095a 100644
---- a/tutorials/roofit/rf105_funcbinding.py
-+++ b/tutorials/roofit/rf105_funcbinding.py
-@@ -17,15 +17,8 @@ import ROOT
- # ---------------------------------------------------
- 
- # Bind one-dimensional ROOT.TMath.Erf function as ROOT.RooAbsReal function
--# Directly trying this in python doesn't work:
--# x = ROOT.RooRealVar("x", "x", -3, 3)
--# erf = ROOT.RooFit.bindFunction("erf", ROOT.TMath.Erf, x)
--# Need to go through C interface
--ROOT.gInterpreter.ProcessLine(
--    'auto x = RooRealVar("x", "x", -3, 3); auto myerf = RooFit::bindFunction("erf", TMath::Erf, x)'
--)
--x = ROOT.x
--erf = ROOT.myerf
-+x = ROOT.RooRealVar("x", "x", -3, 3)
-+erf = ROOT.RooFit.bindFunction("erf", ROOT.TMath.Erf, x)
- 
- # Print erf definition
- erf.Print()
-@@ -38,21 +31,10 @@ erf.plotOn(frame1)
- # -----------------------------------------------------------------------
- 
- # Bind pdf ROOT.Math.Beta with three variables as ROOT.RooAbsPdf function
--# As above, this does not work directly in python
--# x2 = ROOT.RooRealVar("x2", "x2", 0, 0.999)
--# a = ROOT.RooRealVar("a", "a", 5, 0, 10)
--# b = ROOT.RooRealVar("b", "b", 2, 0, 10)
--# beta = ROOT.RooFit.bindPdf("beta", ROOT.Math.beta_pdf, x2, a, b)
--ROOT.gInterpreter.ProcessLine(
--    'auto x2 = RooRealVar("x2", "x2", 0, 0.999);\
--    auto a = RooRealVar("a", "a", 5, 0, 10);\
--    auto b = RooRealVar("b", "b", 5, 0, 10);\
--    auto beta = RooFit::bindPdf("beta", ROOT::Math::beta_pdf, x2, a, b)'
--)
--x2 = ROOT.x2
--a = ROOT.a
--b = ROOT.b
--beta = ROOT.beta
-+x2 = ROOT.RooRealVar("x2", "x2", 0, 0.999)
-+a = ROOT.RooRealVar("a", "a", 5, 0, 10)
-+b = ROOT.RooRealVar("b", "b", 2, 0, 10)
-+beta = ROOT.RooFit.bindPdf("beta", ROOT.Math.beta_pdf, x2, a, b)
- 
- # Perf beta definition
- beta.Print()
--- 
-2.35.1
-
diff --git a/root-stressvector-test-fails-on-ix86.patch b/root-stressvector-test-fails-on-ix86.patch
new file mode 100644
index 0000000..ca3f212
--- /dev/null
+++ b/root-stressvector-test-fails-on-ix86.patch
@@ -0,0 +1,37 @@
+From df2902f6c970aa903200a272fd6a79788da3df4f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 28 Feb 2023 11:33:28 +0100
+Subject: [PATCH] The stressVector test fails on ix86 due to too strict check:
+
+DeltaR   TLorentzVector      	 time = 0.2610929	(sec)
+DeltaR   XYZTVector          	 time = 0.22973299	(sec)
+DeltaR   PtEtaPhiEVector     	 time = 0.0016570091	(sec)
+-12823.3585955796	-12823.35859557827	-12823.35859557827
+Test DeltaR failed !!
+
+The new value for the scale parameter (50) was calculated from the
+above values:
+
+root [2] (-12823.3585955796 - (-12823.35859557827)) / -12823.3585955796 / std::numeric_limits<double>::epsilon() / 10
+(double) 46.762663
+---
+ test/stressVector.cxx | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/test/stressVector.cxx b/test/stressVector.cxx
+index 83b86fb2b4..18dc97d421 100644
+--- a/test/stressVector.cxx
++++ b/test/stressVector.cxx
+@@ -540,8 +540,7 @@ int main(int argc,const char *argv[]) {
+       s1=a.testDeltaR   (v1, t, t1,      "DeltaR   TLorentzVector      " );
+       s2=a.testDeltaR   (v2, t, t2,      "DeltaR   XYZTVector          " );
+       s3=a.testDeltaR   (v3, t, t3,      "DeltaR   PtEtaPhiEVector     " );
+-      a.check("DeltaR",s1,s2,s3,15);
+-
++      a.check("DeltaR", s1, s2, s3, 50);
+ 
+       int n1, n2, n3;
+       n1 = a.testAnalysis (v1, t, t1, "Analysis1 TLorentzVector     " );
+-- 
+2.39.2
+
diff --git a/root-symbol-rewrite.patch b/root-symbol-rewrite.patch
deleted file mode 100644
index c91bbe6..0000000
--- a/root-symbol-rewrite.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f99eedeb72644671cd584f48e4c136d47f6b0020 Mon Sep 17 00:00:00 2001
-From: Fangrui Song <maskray@google.com>
-Date: Thu, 12 Dec 2019 16:18:57 -0800
-Subject: [PATCH] [MC][PowerPC] Fix a crash when redefining a symbol after .set
-
-Fix PR44284. This is probably not valid assembly but we should not crash.
-
-Reviewed By: luporl, #powerpc, steven.zhang
-
-Differential Revision: https://reviews.llvm.org/D71443
----
- interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp b/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
-index 00df9e41fdae..5e91bdb2f8de 100644
---- a/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
-+++ b/interpreter/llvm/src/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
-@@ -201,7 +201,8 @@ public:
- 
-   void finish() override {
-     for (auto *Sym : UpdateOther)
--      copyLocalEntry(Sym, Sym->getVariableValue());
-+      if (Sym->isVariable())
-+        copyLocalEntry(Sym, Sym->getVariableValue());
-   }
- 
- private:
--- 
-2.33.1
-
diff --git a/root-test-timeout.patch b/root-test-timeout.patch
deleted file mode 100644
index a07aa39..0000000
--- a/root-test-timeout.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 4d09235937ea29913cbf9a9b5bcd002b52557c0e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 3 Jul 2022 08:18:57 +0200
-Subject: [PATCH] Increase test timeout
-
----
- cmake/modules/RootMacros.cmake    | 14 +++++++-------
- tmva/tmva/test/DNN/CMakeLists.txt |  2 +-
- tree/tree/test/CMakeLists.txt     |  2 +-
- tutorials/CMakeLists.txt          |  4 ++--
- 4 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
-index cc61f4bbad..3e4559fc19 100644
---- a/cmake/modules/RootMacros.cmake
-+++ b/cmake/modules/RootMacros.cmake
-@@ -1779,6 +1779,7 @@ endfunction()
- #----------------------------------------------------------------------------
- # function ROOT_ADD_GTEST(<testsuite> source1 source2...
- #                        [WILLFAIL] Negate output of test
-+#                        [TIMEOUT seconds]
- #                        [COPY_TO_BUILDDIR file1 file2] Copy listed files when ctest invokes the test.
- #                        [LIBRARIES lib1 lib2...] -- Libraries to link against
- #                        [LABELS label1 label2...] -- Labels to annotate the test
-@@ -1790,7 +1791,7 @@ endfunction()
- function(ROOT_ADD_GTEST test_suite)
-   cmake_parse_arguments(ARG
-     "WILLFAIL"
--    "REPEATS;FAILREGEX"
-+    "TIMEOUT;REPEATS;FAILREGEX"
-     "COPY_TO_BUILDDIR;LIBRARIES;LABELS;INCLUDE_DIRS" ${ARGN})
- 
-   ROOT_GET_SOURCES(source_files . ${ARG_UNPARSED_ARGUMENTS})
-@@ -1821,9 +1822,7 @@ function(ROOT_ADD_GTEST test_suite)
-   if(ARG_WILLFAIL)
-     set(willfail WILLFAIL)
-   endif()
--  if(ARG_LABELS)
--    set(labels "LABELS ${ARG_LABELS}")
--  endif()
-+
-   if(ARG_REPEATS)
-     set(extra_command --gtest_repeat=${ARG_REPEATS} --gtest_break_on_failure)
-   endif()
-@@ -1833,10 +1832,11 @@ function(ROOT_ADD_GTEST test_suite)
-     gtest${mangled_name}
-     COMMAND ${test_suite} ${extra_command}
-     WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}
--    COPY_TO_BUILDDIR ${ARG_COPY_TO_BUILDDIR}
-+    COPY_TO_BUILDDIR "${ARG_COPY_TO_BUILDDIR}"
-     ${willfail}
--    ${labels}
--    FAILREGEX ${ARG_FAILREGEX}
-+    TIMEOUT "${ARG_TIMEOUT}"
-+    LABELS "${ARG_LABELS}"
-+    FAILREGEX "${ARG_FAILREGEX}"
-   )
- endfunction()
- 
-diff --git a/tmva/tmva/test/DNN/CMakeLists.txt b/tmva/tmva/test/DNN/CMakeLists.txt
-index a9233682f6..653540e9e3 100644
---- a/tmva/tmva/test/DNN/CMakeLists.txt
-+++ b/tmva/tmva/test/DNN/CMakeLists.txt
-@@ -144,7 +144,7 @@ ROOT_ADD_TEST(TMVA-DNN-MethodDL-SGD-Optimization-Cpu COMMAND testMethodDLSGDOpti
- 
- # DNN - MethodDL Adam Optimization CPU
- ROOT_EXECUTABLE(testMethodDLAdamOptimizationCpu TestMethodDLAdamOptimizationCpu.cxx LIBRARIES ${Libraries})
--ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu)
-+ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu TIMEOUT 1800)
- 
- # DNN - MethodDL Adagrad Optimization CPU
- ROOT_EXECUTABLE(testMethodDLAdagradOptimizationCpu TestMethodDLAdagradOptimizationCpu.cxx LIBRARIES ${Libraries})
-diff --git a/tree/tree/test/CMakeLists.txt b/tree/tree/test/CMakeLists.txt
-index dbe664f8a0..6284e3c4c5 100644
---- a/tree/tree/test/CMakeLists.txt
-+++ b/tree/tree/test/CMakeLists.txt
-@@ -20,7 +20,7 @@ ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
- target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
- ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
--ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
-+ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 3000)
- ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
- ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
- ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index 6ae9be5869..982432fe15 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -532,7 +532,7 @@ foreach(t ${tutorials})
- 
-    # These tests on ARM64 need much more than 20 minutes - increase the timeout
-    if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
--     set(thisTestTimeout 2400) # 40m
-+     set(thisTestTimeout 3000) # 50m
-    else()
-      set(thisTestTimeout 1200) # 20m
-    endif()
-@@ -566,7 +566,7 @@ foreach(t ${mpi_tutorials})
- 
-    # These tests on ARM64 need much more than 20 minutes - increase the timeout
-    if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
--     set(thisTestTimeout 2400) # 40m
-+     set(thisTestTimeout 3000) # 50m
-    else()
-      set(thisTestTimeout 1200) # 20m
-    endif()
--- 
-2.38.1
-
diff --git a/root-testRooAbsL-test-compares-two-doubles-and-fails.patch b/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
new file mode 100644
index 0000000..24a4148
--- /dev/null
+++ b/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
@@ -0,0 +1,49 @@
+From d6a11ace0d3d25c96dd20cef1436642b5caa102e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 28 Feb 2023 11:02:03 +0100
+Subject: [PATCH] The testRooAbsL test compares two doubles and fails due to
+ rounding errors. The failure happens on ppc64le and aarch64.
+
+This PR changes EXPECT_EQ to EXPECT_DOUBLE_EQ in the affected test.
+
+[ RUN      ] SimBinnedConstrainedTest.SubEventSections
+/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:293: Failure
+Expected equality of these values:
+  whole.Sum()
+    Which is: -1263.796050661927
+  N_events_total_parts.Sum()
+    Which is: -1263.7960506619268
+/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:303: Failure
+Expected equality of these values:
+  whole.Sum()
+    Which is: -1263.796050661927
+  thrice_N_events_total_parts.Sum()
+    Which is: -1263.7960506619268
+[  FAILED  ] SimBinnedConstrainedTest.SubEventSections (199 ms)
+---
+ roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
+index 600f4da7be..05dcd6a241 100644
+--- a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
++++ b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
+@@ -293,7 +293,7 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
+          {static_cast<double>(ix) / N_events_total, static_cast<double>(ix + 1) / N_events_total}, 0,
+          likelihood->getNComponents());
+    }
+-   EXPECT_EQ(whole.Sum(), N_events_total_parts.Sum());
++   EXPECT_DOUBLE_EQ(whole.Sum(), N_events_total_parts.Sum());
+ 
+    // now let's do it again over a number of sections 3 times the number of events
+    ROOT::Math::KahanSum<double> thrice_N_events_total_parts;
+@@ -303,5 +303,5 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
+          {static_cast<double>(ix) / (3 * N_events_total), static_cast<double>(ix + 1) / (3 * N_events_total)}, 0,
+          likelihood->getNComponents());
+    }
+-   EXPECT_EQ(whole.Sum(), thrice_N_events_total_parts.Sum());
++   EXPECT_DOUBLE_EQ(whole.Sum(), thrice_N_events_total_parts.Sum());
+ }
+-- 
+2.39.2
+
diff --git a/root-threadsh1-avoid-heap-use-after-free.patch b/root-threadsh1-avoid-heap-use-after-free.patch
deleted file mode 100644
index 6111f2b..0000000
--- a/root-threadsh1-avoid-heap-use-after-free.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 493c4210168fa475aa4130c12e8fdff3b7d85c09 Mon Sep 17 00:00:00 2001
-From: Philippe Canal <pcanal@fnal.gov>
-Date: Mon, 7 Mar 2022 13:32:37 -0600
-Subject: [PATCH] threadsh1: Avoid heap-use-after-free.
-
-Previously, the Canvas `Close` signal which triggers a call to the local function `close` which
-was unconditionally call `Kill` on its associated thread would call it on an already deleted
-object if the `TThread` was deleted before the `TCanvas`.
-
-This fix #10015 (detected by using ASAN).
----
- tutorials/legacy/thread/threadsh1.C | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/tutorials/legacy/thread/threadsh1.C b/tutorials/legacy/thread/threadsh1.C
-index b819f5d020..d6abc67e36 100644
---- a/tutorials/legacy/thread/threadsh1.C
-+++ b/tutorials/legacy/thread/threadsh1.C
-@@ -67,7 +67,8 @@ void *joiner(void *)
- void closed(Int_t id)
- {
-    // kill the thread matching the canvas being closed
--   t[id]->Kill();
-+   if (t[id])
-+      t[id]->Kill();
-    // and set the canvas pointer to 0
-    c[id] = 0;
- }
-@@ -142,11 +143,11 @@ void threadsh1()
-    t[4]->Join();
-    TThread::Ps();
- 
--   delete t[0];
--   delete t[1];
--   delete t[2];
--   delete t[3];
--   delete t[4];
-+   delete t[0]; t[0] = nullptr; // Prevents after deletion access.
-+   delete t[1]; t[1] = nullptr;
-+   delete t[2]; t[2] = nullptr;
-+   delete t[3]; t[3] = nullptr;
-+   delete t[4]; t[4] = nullptr;
- 
-    delete rng[0];
-    delete rng[1];
--- 
-2.35.1
-
diff --git a/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch b/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
new file mode 100644
index 0000000..6a719c5
--- /dev/null
+++ b/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
@@ -0,0 +1,239 @@
+From 54a05a995bef827413d69b63559494a78ed56946 Mon Sep 17 00:00:00 2001
+From: moneta <lorenzo.moneta@cern.ch>
+Date: Tue, 14 Feb 2023 11:00:44 +0100
+Subject: [PATCH] [tmva] Speed up TMVA CNN and RNN tutorials
+
+Run tutorials with a amximum of 4 threads to avoid MT problems on some machines.
+Disable also OpenMP when running in MT in ROOT
+
+Reduce also by a factor of 5 the number of input events
+---
+ tutorials/tmva/TMVA_CNN_Classification.C  | 25 +++++++++++++++-------
+ tutorials/tmva/TMVA_CNN_Classification.py | 12 +++++------
+ tutorials/tmva/TMVA_RNN_Classification.C  | 11 +++++-----
+ tutorials/tmva/TMVA_RNN_Classification.py | 26 ++++++++++-------------
+ 4 files changed, 39 insertions(+), 35 deletions(-)
+
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
+index 0966017ae2..cc6829a24d 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.C
++++ b/tutorials/tmva/TMVA_CNN_Classification.C
+@@ -107,7 +107,16 @@ void MakeImagesTree(int n, int nh, int nw)
+    f.Close();
+ }
+ 
+-void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
++/// @brief Run the TMVA CNN Classification example
++/// @param nevts : number of signal/background events. Use by default a low value (1000)
++///                but increase to at least 5000 to get a good result
++/// @param opt :   vector of bool with method used (default all on if available). The order is:
++///                   - TMVA CNN
++///                   - Keras CNN
++///                   - TMVA DNN
++///                   - TMVA BDT
++///                   - PyTorch CNN
++void TMVA_CNN_Classification(int nevts = 1000, std::vector<bool> opt = {1, 1, 1, 1, 1})
+ {
+ 
+    bool useTMVACNN = (opt.size() > 0) ? opt[0] : false;
+@@ -125,17 +134,17 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+ 
+    bool writeOutputFile = true;
+ 
+-   int num_threads = 0;  // use default threads
++   int num_threads = 4;  // use by default 4 threads if value is not set before
++   // switch off MT in OpenBLAS to avoid conflict with tbb
++   gSystem->Setenv("OMP_NUM_THREADS", "1");
+ 
+    TMVA::Tools::Instance();
+ 
+    // do enable MT running
+    if (num_threads >= 0) {
+       ROOT::EnableImplicitMT(num_threads);
+-      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
+    }
+-   else
+-      gSystem->Setenv("OMP_NUM_THREADS", "1");
++
+ 
+    std::cout << "Running with nthreads  = " << ROOT::GetThreadPoolSize() << std::endl;
+ 
+@@ -161,7 +170,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+     The factory is the major TMVA object you have to interact with. Here is the list of parameters you need to pass
+ 
+     - The first argument is the base of the name of all the output
+-    weightfiles in the directory weight/ that will be created with the
++    weight files in the directory weight/ that will be created with the
+     method parameters
+ 
+     - The second argument is the output file for the training results
+@@ -208,7 +217,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+ 
+    // if file does not exists create it
+    if (!fileExist) {
+-      MakeImagesTree(5000, 16, 16);
++      MakeImagesTree(nevts, 16, 16);
+    }
+ 
+    // TString inputFileName = "tmva_class_example.root";
+@@ -289,7 +298,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
+    // Boosted Decision Trees
+    if (useTMVABDT) {
+       factory.BookMethod(loader, TMVA::Types::kBDT, "BDT",
+-                         "!V:NTrees=400:MinNodeSize=2.5%:MaxDepth=2:BoostType=AdaBoost:AdaBoostBeta=0.5:"
++                         "!V:NTrees=200:MinNodeSize=2.5%:MaxDepth=2:BoostType=AdaBoost:AdaBoostBeta=0.5:"
+                          "UseBaggedBoost:BaggedSampleFraction=0.5:SeparationType=GiniIndex:nCuts=20");
+    }
+    /**
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.py b/tutorials/tmva/TMVA_CNN_Classification.py
+index 0760bacfd9..85fde20763 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.py
++++ b/tutorials/tmva/TMVA_CNN_Classification.py
+@@ -25,6 +25,9 @@
+ 
+ import ROOT
+ 
++#switch off MT in OpenMP (BLAS)
++ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
++
+ TMVA = ROOT.TMVA
+ TFile = ROOT.TFile
+ 
+@@ -105,6 +108,7 @@ def MakeImagesTree(n, nh, nw):
+ hasGPU = ROOT.gSystem.GetFromPipe("root-config --has-tmva-gpu") == "yes"
+ hasCPU = ROOT.gSystem.GetFromPipe("root-config --has-tmva-cpu") == "yes"
+ 
++nevt = 1000    # use a larger value to get better results
+ opt = [1, 1, 1, 1, 1]
+ useTMVACNN = opt[0] if len(opt) > 0  else False
+ useKerasCNN = opt[1] if len(opt) > 1 else False
+@@ -141,17 +145,13 @@ if not useTMVACNN:
+ 
+ writeOutputFile = True
+ 
+-num_threads = 0  # use default threads
++num_threads = 4  # use default threads
+ max_epochs = 10  # maximum number of epochs used for training
+ 
+ 
+ # do enable MT running
+ if num_threads >= 0:
+     ROOT.EnableImplicitMT(num_threads)
+-    if (num_threads > 0) :
+-        ROOT.gSystem.Setenv("OMP_NUM_THREADS", str(num_threads))
+-else:
+-    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
+ 
+ print("Running with nthreads  = ", ROOT.GetThreadPoolSize())
+ 
+@@ -218,7 +218,7 @@ inputFileName = "images_data_16x16.root"
+ 
+ # if the input file does not exist create it
+ if ROOT.gSystem.AccessPathName(inputFileName):
+-    MakeImagesTree(5000, 16, 16)
++    MakeImagesTree(nevt, 16, 16)
+ 
+ inputFile = TFile.Open(inputFileName)
+ if inputFile is None:
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
+index 2711673ec9..8701ba6c19 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.C
++++ b/tutorials/tmva/TMVA_RNN_Classification.C
+@@ -136,13 +136,14 @@ void MakeTimeData(int n, int ntime, int ndim )
+    }
+ }
+ /// macro for performing a classification using a Recurrent Neural Network
++/// @param nevts = 2000  Number of events used. (increase for better classification results)
+ /// @param use_type
+ ///    use_type = 0    use Simple RNN network
+ ///    use_type = 1    use LSTM network
+ ///    use_type = 2    use GRU
+ ///    use_type = 3    build 3 different networks with RNN, LSTM and GRU
+ 
+-void TMVA_RNN_Classification(int use_type = 1)
++void TMVA_RNN_Classification(int nevts = 2000, int use_type = 1)
+ {
+ 
+    const int ninput = 30;
+@@ -150,7 +151,7 @@ void TMVA_RNN_Classification(int use_type = 1)
+    const int batchSize = 100;
+    const int maxepochs = 20;
+ 
+-   int nTotEvts = 10000; // total events to be generated for signal or background
++   int nTotEvts = nevts; // total events to be generated for signal or background
+ 
+    bool useKeras = true;
+ 
+@@ -190,14 +191,12 @@ void TMVA_RNN_Classification(int use_type = 1)
+    useKeras = false;
+ #endif
+ 
+-   int num_threads = 0;   // use by default all threads
++   int num_threads = 4;   // use by default all threads
++   gSystem->Setenv("OMP_NUM_THREADS", "1"); // switch off MT in OpenBLAS
+    // do enable MT running
+    if (num_threads >= 0) {
+       ROOT::EnableImplicitMT(num_threads);
+-      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
+    }
+-   else
+-      gSystem->Setenv("OMP_NUM_THREADS", "1");
+ 
+    TMVA::Config::Instance();
+ 
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.py b/tutorials/tmva/TMVA_RNN_Classification.py
+index 88280a5849..625a120b3d 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.py
++++ b/tutorials/tmva/TMVA_RNN_Classification.py
+@@ -22,6 +22,16 @@
+ 
+ import ROOT
+ 
++num_threads = 4  # use max 4 threads
++# do enable MT running
++if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
++    ROOT.EnableImplicitMT(num_threads)
++    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")  # switch OFF MT in OpenBLAS
++    print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
++else:
++    print("Running in serail mode since ROOT does not support MT")
++
++
+ TMVA = ROOT.TMVA
+ TFile = ROOT.TFile
+ 
+@@ -141,7 +151,7 @@ ntime = 10
+ batchSize = 100
+ maxepochs = 10
+ 
+-nTotEvts = 10000  # total events to be generated for signal or background
++nTotEvts = 2000  # total events to be generated for signal or background
+ 
+ useKeras = True
+ 
+@@ -184,22 +194,8 @@ if ROOT.gSystem.GetFromPipe("root-config --has-tmva-pymva") == "yes":
+ else:
+     useKeras = False
+ 
+-num_threads = 0  # use by default all threads
+-# do enable MT running
+-if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
+-    if num_threads >= 0:
+-        ROOT.EnableImplicitMT(num_threads)
+-        if num_threads > 0:
+-            ROOT.gSystem.Setenv("OMP_NUM_THREADS", str(num_threads))
+-    else:
+-        ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
+ 
+ 
+-    print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
+-
+-else:
+-    print("Running in serail mode since ROOT does not support MT")
+-
+ inputFileName = "time_data_t10_d30.root"
+ 
+ fileDoesNotExist = ROOT.gSystem.AccessPathName(inputFileName)
+-- 
+2.39.2
+
diff --git a/root-tmva-threads.patch b/root-tmva-threads.patch
deleted file mode 100644
index 7506abc..0000000
--- a/root-tmva-threads.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 589ac491519446191b7d480a476ab831dc09b5f9 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 30 Mar 2022 15:51:07 +0200
-Subject: [PATCH] Limit the number of threads in TMVA CNN/DNN test to save
- memory
-
-Processing /builddir/build/BUILD/root-6.26.00/tutorials/tmva/TMVA_CNN_Classification.C...
-Running with nthreads  = 224
-
-[ ... ]
-
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
-OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.
- *** Break *** segmentation violation
- *** Break *** segmentation violation
- *** Break *** segmentation violation
- *** Break *** segmentation violation
- *** Break *** segmentation violation
- *** Break *** segmentation violation
----
- tutorials/tmva/TMVA_CNN_Classification.C | 6 ++++--
- tutorials/tmva/TMVA_RNN_Classification.C | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index 3e590c5958..b748fcee6c 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.C
-+++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -125,14 +125,16 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
- 
-    bool writeOutputFile = true;
- 
--   int num_threads = 0;  // use default threads
-+   int num_threads = 32;
- 
-    TMVA::Tools::Instance();
- 
-    // do enable MT running
-    if (num_threads >= 0) {
-       ROOT::EnableImplicitMT(num_threads);
--      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
-+      if (ROOT::GetThreadPoolSize() > 0)
-+         gSystem->Setenv("OMP_NUM_THREADS",
-+                         TString::Format("%u", ROOT::GetThreadPoolSize()));
-    }
-    else
-       gSystem->Setenv("OMP_NUM_THREADS", "1");
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
-index 5be80824f9..f902025875 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.C
-+++ b/tutorials/tmva/TMVA_RNN_Classification.C
-@@ -190,11 +190,13 @@ void TMVA_RNN_Classification(int use_type = 1)
-    useKeras = false;
- #endif
- 
--   int num_threads = 0;   // use by default all threads
-+   int num_threads = 32;
-    // do enable MT running
-    if (num_threads >= 0) {
-       ROOT::EnableImplicitMT(num_threads);
--      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
-+      if (ROOT::GetThreadPoolSize() > 0)
-+         gSystem->Setenv("OMP_NUM_THREADS",
-+                         TString::Format("%u", ROOT::GetThreadPoolSize()));
-    }
-    else
-       gSystem->Setenv("OMP_NUM_THREADS", "1");
--- 
-2.35.1
-
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
deleted file mode 100644
index 1bdf869..0000000
--- a/root-unbundle-gtest.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 29884ae01fde27204d92f554da4e92227a2ed1e6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 26 Mar 2022 10:22:07 +0100
-Subject: [PATCH 1/2] Implement builtin_gtest option
-
-By setting the option to OFF the system gtest and gmock are used.
-This allows doing tests without network available, e.g. during a
-package build for Fedora/EPEL.
----
- cmake/modules/FindGTest.cmake               | 81 +++++++++++++++++++++
- cmake/modules/RootBuildOptions.cmake        |  2 +
- cmake/modules/RootMacros.cmake              |  2 +-
- cmake/modules/SearchInstalledSoftware.cmake | 44 ++++++++---
- 4 files changed, 118 insertions(+), 11 deletions(-)
- create mode 100644 cmake/modules/FindGTest.cmake
-
-diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
-new file mode 100644
-index 0000000000..438ec501c2
---- /dev/null
-+++ b/cmake/modules/FindGTest.cmake
-@@ -0,0 +1,81 @@
-+# Find the gtest and gmock includes and library.
-+#
-+# This module defines
-+# GTEST_LIBRARIES
-+# GTEST_MAIN_LIBRARIES
-+# GTEST_INCLUDE_DIRS
-+# GMOCK_LIBRARIES
-+# GMOCK_MAIN_LIBRARIES
-+# GMOCK_INCLUDE_DIRS
-+#
-+# GTEST_FOUND           true if all libraries present
-+
-+find_package(Threads QUIET)
-+
-+find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
-+find_library(GTEST_LIBRARIES NAMES gtest)
-+find_library(GTEST_MAIN_LIBRARIES NAMES gtest_main)
-+
-+find_path(GMOCK_INCLUDE_DIRS NAMES gmock/gmock.h)
-+find_library(GMOCK_LIBRARIES NAMES gmock)
-+find_library(GMOCK_MAIN_LIBRARIES NAMES gmock_main)
-+
-+# Special for EPEL 7's gmock
-+if(NOT GMOCK_LIBRARIES)
-+  find_path(GMOCK_SRC_DIR NAMES gmock-all.cc PATHS /usr/src/gmock)
-+endif()
-+
-+if(NOT GMOCK_MAIN_LIBRARIES)
-+  find_path(GMOCK_MAIN_SRC_DIR NAMES gmock_main.cc PATHS /usr/src/gmock)
-+endif()
-+
-+if (GTEST_INCLUDE_DIRS AND
-+    GTEST_LIBRARIES AND
-+    GTEST_MAIN_LIBRARIES AND
-+    GMOCK_INCLUDE_DIRS AND
-+    (GMOCK_LIBRARIES OR GMOCK_SRC_DIR) AND
-+    (GMOCK_MAIN_LIBRARIES OR GMOCK_MAIN_SRC_DIR))
-+
-+  add_library(gtest UNKNOWN IMPORTED)
-+  set_target_properties(gtest PROPERTIES
-+    IMPORTED_LOCATION ${GTEST_LIBRARIES}
-+    INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS})
-+  target_link_libraries(gtest INTERFACE Threads::Threads)
-+
-+  add_library(gtest_main UNKNOWN IMPORTED)
-+  set_target_properties(gtest_main PROPERTIES
-+    IMPORTED_LOCATION ${GTEST_MAIN_LIBRARIES})
-+  target_link_libraries(gtest_main INTERFACE gtest Threads::Threads)
-+
-+  if(GMOCK_LIBRARIES)
-+    add_library(gmock UNKNOWN IMPORTED)
-+    set_target_properties(gmock PROPERTIES
-+      IMPORTED_LOCATION ${GMOCK_LIBRARIES}
-+      INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIRS})
-+  else()
-+    add_library(gmock STATIC ${GMOCK_SRC_DIR}/gmock-all.cc)
-+    target_include_directories(gmock PUBLIC ${GMOCK_INCLUDE_DIRS})
-+    set(GMOCK_LIBRARIES gmock)
-+  endif()
-+  target_link_libraries(gmock INTERFACE gtest Threads::Threads)
-+
-+  if(GMOCK_MAIN_LIBRARIES)
-+    add_library(gmock_main UNKNOWN IMPORTED)
-+    set_target_properties(gmock_main PROPERTIES
-+      IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARIES})
-+  else()
-+    add_library(gmock_main STATIC ${GMOCK_MAIN_SRC_DIR}/gmock_main.cc)
-+    set(GMOCK_MAIN_LIBRARIES gmock_main)
-+  endif()
-+  target_link_libraries(gmock_main INTERFACE gmock Threads::Threads)
-+
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(GTest DEFAULT_MSG
-+  GTEST_LIBRARIES
-+  GTEST_MAIN_LIBRARIES
-+  GTEST_INCLUDE_DIRS
-+  GMOCK_LIBRARIES
-+  GMOCK_MAIN_LIBRARIES
-+  GMOCK_INCLUDE_DIRS)
-diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
-index 7886c5f3e9..01108a18c9 100644
---- a/cmake/modules/RootBuildOptions.cmake
-+++ b/cmake/modules/RootBuildOptions.cmake
-@@ -94,6 +94,7 @@ ROOT_BUILD_OPTION(builtin_ftgl OFF "Build bundled copy of FTGL")
- ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build bundled copy of gl2ps")
- ROOT_BUILD_OPTION(builtin_glew OFF "Build bundled copy of GLEW")
- ROOT_BUILD_OPTION(builtin_gsl OFF "Build GSL internally (requires network)")
-+ROOT_BUILD_OPTION(builtin_gtest OFF "Build googletest internally (requires network)")
- ROOT_BUILD_OPTION(builtin_llvm ON "Build bundled copy of LLVM")
- ROOT_BUILD_OPTION(builtin_lz4 OFF "Build bundled copy of lz4")
- ROOT_BUILD_OPTION(builtin_lzma OFF "Build bundled copy of lzma")
-@@ -293,6 +294,7 @@ if(builtin_all)
-   set(builtin_gl2ps_defvalue ON)
-   set(builtin_glew_defvalue ON)
-   set(builtin_gsl_defvalue ON)
-+  set(builtin_gtest_defvalue ON)
-   set(builtin_llvm_defvalue ON)
-   set(builtin_lz4_defvalue ON)
-   set(builtin_lzma_defvalue ON)
-diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
-index cb75c0b1da..38fd5d6baf 100644
---- a/cmake/modules/RootMacros.cmake
-+++ b/cmake/modules/RootMacros.cmake
-@@ -1671,7 +1671,7 @@ function(ROOT_ADD_TEST test)
- 
-   set_property(TEST ${test} APPEND PROPERTY ENVIRONMENT ROOT_HIST=0)
- 
--  #- Handle TIMOUT and DEPENDS arguments
-+  #- Handle TIMEOUT and DEPENDS arguments
-   if(ARG_TIMEOUT)
-     set_property(TEST ${test} PROPERTY TIMEOUT ${ARG_TIMEOUT})
-   endif()
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index fe40898d12..b6a3cc4c76 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -1860,15 +1860,6 @@ if (mpi)
-   endif()
- endif()
- 
--if(testing AND NO_CONNECTION)
--  if(fail-on-missing)
--    message(FATAL_ERROR "No internet connection. Please check your connection, or either disable the 'testing' option or the 'fail-on-missing' to automatically disable options requiring internet access")
--  else()
--    message(STATUS "No internet connection, disabling 'testing' option")
--    set(testing OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
--  endif()
--endif()
--
- #---Check for ZeroMQ when building RooFit::MultiProcess--------------------------------------------
- 
- if (roofit_multiprocess)
-@@ -1942,8 +1933,41 @@ if (roofit_multiprocess)
-   target_compile_definitions(cppzmq INTERFACE ZMQ_NO_EXPORT)
- endif (roofit_multiprocess)
- 
--#---Download googletest--------------------------------------------------------------
-+#---Check for googletest---------------------------------------------------------------
- if (testing)
-+  if (NOT builtin_gtest)
-+    if(fail-on-missing)
-+      find_package(GTest REQUIRED)
-+    else()
-+      find_package(GTest)
-+      if(NOT GTEST_FOUND)
-+        if(NO_CONNECTION)
-+          if(fail-on-missing)
-+            message(FATAL_ERROR "No internet connection and GTest was not found. Please check your connection, or either disable the 'testing' option or the 'fail-on-missing' to automatically disable options requiring internet access")
-+          else()
-+            message(STATUS "GTest not found, and no internet connection. Disabing the 'testing' option.")
-+            set(testing OFF CACHE BOOL "Disabled because testing requested and GTest not found (${builtin_gtest_description}) and there is no internet connection" FORCE)
-+          endif()
-+        else()
-+          message(STATUS "GTest not found, switching ON 'builtin_gtest' option.")
-+          set(builtin_gtest ON CACHE BOOL "Enabled because testing requested and GTest not found (${builtin_gtest_description})" FORCE)
-+        endif()
-+      endif()
-+    endif()
-+  else()
-+    if(NO_CONNECTION)
-+      if(fail-on-missing)
-+        message(FATAL_ERROR "No internet connection. Please check your connection, or either disable the 'testing' option or the 'builtin_gtest' option or the 'fail-on-missing' option to automatically disable options requiring internet access")
-+      else()
-+        message(STATUS "No internet connection, disabling the 'testing' and 'builtin_gtest' options")
-+        set(testing OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-+        set(builtin_gtest OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-+      endif()
-+    endif()
-+  endif()
-+endif()
-+
-+if (builtin_gtest)
-   # FIXME: Remove our version of gtest in roottest. We can reuse this one.
-   # Add googletest
-   # http://stackoverflow.com/questions/9689183/cmake-googletest
--- 
-2.35.1
-
diff --git a/root-uring-warn.patch b/root-uring-warn.patch
deleted file mode 100644
index 05cfd56..0000000
--- a/root-uring-warn.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 580fcf8fe95c45e337d222a7fd2338fdef2f52c5 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 24 Mar 2022 16:18:57 +0100
-Subject: [PATCH 1/2] Ignore warnings about uring failing during test
-
----
- tree/ntuple/v7/test/ntuple_extended.cxx | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
-index 8e3998996c..98d65ef319 100644
---- a/tree/ntuple/v7/test/ntuple_extended.cxx
-+++ b/tree/ntuple/v7/test/ntuple_extended.cxx
-@@ -4,6 +4,8 @@
- 
- #include "TROOT.h"
- 
-+#include "ROOTUnitTestSupport.h"
-+
- TEST(RNTuple, RealWorld1)
- {
-    ROOT::EnableImplicitMT();
-@@ -111,6 +113,17 @@ TEST(RNTuple, RandomAccess)
- #if !defined(_MSC_VER) || defined(R__ENABLE_BROKEN_WIN_TESTS)
- TEST(RNTuple, LargeFile)
- {
-+   ROOTUnitTestSupport::CheckDiagsRAII raii;
-+   raii.optionalDiag(kWarning, "RIoUring",
-+                     "io_uring is unexpectedly not available because:", false);
-+   raii.optionalDiag(kWarning, "RRawFileUnix",
-+                     "io_uring setup failed, falling back to blocking I/O in ReadV", true);
-+
-+   raii.optionalDiag(kWarning, "ROOT.NTuple",
-+                     "The RNTuple file format will change. Do not store real data with this version of RNTuple!", true);
-+   raii.optionalDiag(kWarning, "ROOT.NTuple",
-+                     "Pre-release format version: ", false);
-+
-    ROOT::EnableImplicitMT();
-    FileRaii fileGuard("test_large_file.root");
- 
--- 
-2.35.1
-
diff --git a/root-use-consistent-minimum-python-version-for-DistRDF.patch b/root-use-consistent-minimum-python-version-for-DistRDF.patch
new file mode 100644
index 0000000..23e9e5c
--- /dev/null
+++ b/root-use-consistent-minimum-python-version-for-DistRDF.patch
@@ -0,0 +1,27 @@
+From 8624d1c7eb4f532d6843118251d9564650f89924 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 2 Mar 2023 08:25:36 +0100
+Subject: [PATCH 1/2] Use consistent minimum Python version for DistRDF The
+ minimum version was changed in bindings/CMakeLists.txt but not in the check
+ in the code.
+
+---
+ bindings/pyroot/pythonizations/python/ROOT/_facade.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+index 7370a234d1..865321e713 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+@@ -335,7 +335,7 @@ class ROOTFacade(types.ModuleType):
+             ns.MakeNumpyDataFrame = DeprecatedMakeNumpy
+             ns.FromNumpy = MakeNumpyDataFrame
+ 
+-            if sys.version_info >= (3, 7):
++            if sys.version_info >= (3, 8):
+                 # Inject Experimental.Distributed package into namespace RDF
+                 ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
+         except:
+-- 
+2.39.2
+
diff --git a/root-use-unique-filenames-in-fillrandom-tutorials.patch b/root-use-unique-filenames-in-fillrandom-tutorials.patch
deleted file mode 100644
index 724eb79..0000000
--- a/root-use-unique-filenames-in-fillrandom-tutorials.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b781f954ac80cc227777992dcb4fbe1837c7e351 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 29 Mar 2022 15:44:17 +0200
-Subject: [PATCH] Use unique filenames in fillrandom.py and fillrandom.C
-
----
- tutorials/hist/fillrandom.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tutorials/hist/fillrandom.py b/tutorials/hist/fillrandom.py
-index d5eb3f6f38..4b1a94a37e 100644
---- a/tutorials/hist/fillrandom.py
-+++ b/tutorials/hist/fillrandom.py
-@@ -41,7 +41,7 @@ h1f.FillRandom("sqroot",10000)
- h1f.Draw()
- c1.Update()
- 
--f = ROOT.TFile("fillrandom.root","RECREATE")
-+f = ROOT.TFile("fillrandom-py.root","RECREATE")
- form1.Write()
- sqroot.Write()
- h1f.Write()
--- 
-2.35.1
-
diff --git a/root-veto-tests-using-clad-when-clad-is-disabled.patch b/root-veto-tests-using-clad-when-clad-is-disabled.patch
new file mode 100644
index 0000000..d201fdb
--- /dev/null
+++ b/root-veto-tests-using-clad-when-clad-is-disabled.patch
@@ -0,0 +1,66 @@
+From 6583668f3e5f1b4e1d219a5a92a19da31d8d5494 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 1 Mar 2023 18:32:45 +0100
+Subject: [PATCH] Veto tests using clad when clad is disabled
+
+---
+ math/minuit2/test/CMakeLists.txt | 8 ++++----
+ tutorials/CMakeLists.txt         | 9 ++++++---
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/math/minuit2/test/CMakeLists.txt b/math/minuit2/test/CMakeLists.txt
+index 7ecf30350c..8951ac0a84 100644
+--- a/math/minuit2/test/CMakeLists.txt
++++ b/math/minuit2/test/CMakeLists.txt
+@@ -11,10 +11,10 @@ if(NOT DEFINED ROOT_SOURCE_DIR)
+    include(${ROOT_USE_FILE})
+ endif()
+ 
+-set(TestSource
+-      testMinimizer.cxx
+-      testADMinim.cxx
+-)
++set(TestSource testMinimizer.cxx)
++if (clad)
++  list(APPEND TestSource testADMinim.cxx)
++endif()
+ 
+ set(TestSourceMnTutorial
+     MnTutorial/Quad1FMain.cxx
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index bf7c1d4089..deb5f67d23 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -65,16 +65,18 @@ endfunction()
+ 
+ #---Tutorials disabled depending on the build components-------------
+ if(NOT ROOT_minuit2_FOUND)
+-  set(minuit2_veto fit/fit2dHist.C fit/fit2dHist.C
+-                   fit/fitCircle.C fit/minuit2FitBench2D.C
++  set(minuit2_veto fit/fit2dHist.C fit/fitCircle.C
+                    fit/minuit2FitBench2D.C fit/minuit2FitBench.C
+-                   fit/minuit2FitBench.C fit/minuit2GausFit.C
+                    fit/minuit2GausFit.C fit/NumericalMinimization.C
+                    fit/combinedFit.C fit/TestBinomial.C
+                    fit/fitNormSum.C fit/vectorizedFit.C
+                    tutorials/roostats/rs_bernsteinCorrection.C)
+ endif()
+ 
++if(NOT clad)
++  set(clad_veto fit/minuit2GausFit.C)
++endif()
++
+ if (NOT dataframe)
+     # RDataFrame
+     list(APPEND dataframe_veto dataframe/*.C dataframe/*.py)
+@@ -457,6 +459,7 @@ set(all_veto hsimple.C
+              ${spectrum_veto}
+              ${dataframe_veto}
+              ${macm1_veto}
++             ${clad_veto}
+              )
+ 
+ file(GLOB_RECURSE tutorials RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.C)
+-- 
+2.39.2
+
diff --git a/root.spec b/root.spec
index 7b8e3be..eb06a82 100644
--- a/root.spec
+++ b/root.spec
@@ -1,23 +1,13 @@
+# Needed for EPEL 8
 %undefine __cmake_in_source_build
-%undefine __cmake3_in_source_build
 
 # Disable package note flags, since root saves the compiler/linker flags
 # used during the build
 %undefine _package_note_flags
 
-%if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
-# Don't build python2-root for Fedora >= 31
-%global buildpy2 0
-%else
-%global buildpy2 1
-%endif
-
-%if %{buildpy2}
-%global python2_version_uscore %(tr . _ <<< "%{python2_version}")
-%endif
 %global python3_version_uscore %(tr . _ <<< "%{python3_version}")
 
-%if %{?fedora}%{!?fedora:0} >= 34 || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
 # Building the experimental ROOT 7 classes requires c++-17.
 # This is the default for gcc 11 and later.
 %global root7 1
@@ -25,46 +15,41 @@
 %global root7 0
 %endif
 
-%global xrootd5 1
-
-%global webgui 1
-
-%global gfal2 1
-
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-# The SOFIE parser requires protobuf 3.0
-%global tmvasofieparser 1
-%else
+%if %{?rhel}%{!?rhel:0} == 8
+%ifarch %{power64}
+# These modules cause "pure virtual method called" errors
+# https://github.com/root-project/root/issues/12372
+%global dataframe 0
+%global roofit 0
 %global tmvasofieparser 0
+%else
+%global dataframe 1
+%global roofit 1
+%global tmvasofieparser 1
+%endif
+%else
+%global dataframe 1
+%global roofit 1
+%global tmvasofieparser 1
 %endif
 
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# DistRDF requires Python 3.7+
-%global distrdf 1
+# DistRDF requires Python 3.8+
+%global distrdf %{dataframe}
 %else
 %global distrdf 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
-# Multi-threading support requires TBB version >= 2018
-%global tbb 1
-%else
-%global tbb 0
-%endif
-
-# Do not create .orig files when patching source
-%global _default_patch_flags --no-backup-if-mismatch
-
 # Do not generate autoprovides for Python modules
-%global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
+%global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.26.10
+Version:	6.28.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
-License:	LGPLv2+
+License:	LGPL-2.1-or-later
 URL:		https://root.cern/
 #		The upstream source is modified to exclude proprietary fonts
 #		See Source8 for how to create Source0
@@ -86,118 +71,75 @@ Source7:	JupyROOT-on-EPEL
 Source8:	%{name}-get-src.sh
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
-#		Revert the removal of DataFrame for 32 bit architectures
-#		https://github.com/root-project/root/pull/10300
-Patch1:		%{name}-32bit-dataframe.patch
-#		Unbundle gtest
-#		Add builtin_gtest cmake option
-#		Compatibility with older gtest
-#		https://github.com/root-project/root/pull/10301
-Patch2:		%{name}-unbundle-gtest.patch
-Patch3:		%{name}-old-gtest-compat.patch
 #		Reduce memory usage of build
 #		Do not link rootcling_stage1 and libCling in parallel
-Patch4:		%{name}-memory-usage.patch
+Patch1:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llvm libraries
 #		Fedora builders run out of memory with the default setting
-Patch5:		%{name}-memory-arm-x86.patch
+Patch2:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
-Patch6:		%{name}-dont-install-minicern.patch
+Patch3:		%{name}-dont-install-minicern.patch
 #		Do not export Python modules in CMake config
-Patch7:		%{name}-no-export-python-modules.patch
+Patch4:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch8:		%{name}-32bit-tests.patch
+Patch5:		%{name}-32bit-tests.patch
 #		Use local static script and style files for JsMVA
-Patch9:		%{name}-jsmva-static.patch
-#		Fix python bytecode compilation on EPEL 7
-#		Compatibility with older python versions (no f-strings)
-Patch10:	%{name}-older-python.patch
-#		Backported fix from LLVM upstream
-Patch11:	%{name}-symbol-rewrite.patch
-#		Backport gcc 12 fix from LLVM
-#		https://github.com/root-project/root/pull/9586
-Patch12:	%{name}-fix-compilation-with-gcc-12.patch
+Patch6:		%{name}-jsmva-static.patch
 #		Fix test failure on ppc64le and aarch64 with gcc 12
 #		https://github.com/root-project/root/pull/9601
-Patch13:	%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
-#		Adjust some test timeouts
-#		https://github.com/root-project/root/pull/10886
-Patch14:	%{name}-test-timeout.patch
-#		Fixes for tmva-sofie test compilation
-#		https://github.com/root-project/root/pull/10117
-Patch15:	%{name}-ignore-prefix.patch
-#		Use different filenames in io/loopdir tests
-#		https://github.com/root-project/root/pull/11725
-Patch16:	%{name}-different-filename.patch
-#		Fix test when long is 32 bits
-#		https://github.com/root-project/root/pull/10302
-Patch17:	%{name}-longlong.patch
-#		Ignore warnings (uring and RooNaNPacker)
-#		https://github.com/root-project/root/pull/10303
-Patch18:	%{name}-uring-warn.patch
-Patch19:	%{name}-endian-warn.patch
-#		Always call WaitForInFlightClusters before checking cluster IDs
-#		https://github.com/root-project/root/pull/10304
-Patch20:	%{name}-ntuplewait.patch
-#		NENTRIES is not always a multiple of the expected size
-#		https://github.com/root-project/root/pull/10305
-Patch21:	%{name}-dataframe-callback.patch
-#		Add/remove namespaces from Linkdef
-#		https://github.com/root-project/root/pull/10306
-Patch22:	%{name}-namespace-sofie.patch
-Patch23:	%{name}-namespace-roofit.patch
-Patch24:	%{name}-namespace-pymva.patch
-#		Use calls from Python directly in tutorial
-#		https://github.com/root-project/root/pull/10307
-Patch25:	%{name}-roofit-tutorial.patch
+Patch7:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 #		Byte swap values read from the protobuf raw data stream on
 #		big endian architectures
 #		https://github.com/root-project/root/pull/10308
-Patch26:	%{name}-big-endian-byte-swap.patch
-#		Avoid crashes due to static initialization order
-#		https://github.com/root-project/root/pull/10309
-Patch27:	%{name}-rcolor-static-init.patch
-#		Avoid deleting TFormulas twice
-#		https://github.com/root-project/root/pull/10310
-Patch28:	%{name}-avoid-deleting-TFormulas-twice.patch
-#		Use unique filenames in fillrandom.py and fillrandom.C
-#		https://github.com/root-project/root/pull/10311
-Patch29:	%{name}-use-unique-filenames-in-fillrandom-tutorials.patch
-#		Limit the number of threads in TMVA CNN/DNN test to save memory
-#		https://github.com/root-project/root/pull/10312
-Patch30:	%{name}-tmva-threads.patch
-#		Fix library link order
-#		https://github.com/root-project/root/pull/10313
-Patch31:	%{name}-core-base-test.patch
-#		Backports
-Patch32:	%{name}-make-dyld-based-library-search-behavior-default.patch
-Patch33:	%{name}-get-rid-of-lsb_release.patch
-Patch34:	%{name}-threadsh1-avoid-heap-use-after-free.patch
-Patch35:	%{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch
-Patch36:	%{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch
-#		Avoid race condition between C++ an Python version of test
-#		https://github.com/root-project/root/pull/11643
-Patch37:	%{name}-avoid-race-condition-tutorial-roofit-rf512.patch
+Patch8:		%{name}-big-endian-byte-swap.patch
 #		Add missing #include <cstdint>
 #		https://github.com/root-project/root/pull/12065
-Patch38:	%{name}-add-missing-include-cstdint.patch
-#		Backport from upstream
-Patch39:	%{name}-fix-compilation-with-gcc13.patch
-#		numpy.object obsolete since numpy 1.20 and removed since 1.24
-#		https://github.com/root-project/root/issues/12148
-#		https://github.com/root-project/root/pull/12159
-Patch40:	%{name}-avoid-deprecated-numpy.object.patch
+Patch9:		%{name}-add-missing-include-cstdint.patch
+#		https://github.com/root-project/root/pull/12218
+Patch10:	%{name}-Simplify-creation-of-TargetMachine.patch
+#		Fix build with -Dbuiltin_gtest:BOOL=OFF on EPEL 8
+#		https://github.com/root-project/root/pull/12250
+Patch11:	%{name}-gtest-compat.patch
+#		Limit the number of threads in TMVA CNN/DNN test to save memory
+#		https://github.com/root-project/root/pull/12310
+Patch12:	%{name}-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
+#		https://github.com/root-project/root/issues/12293
+#		https://github.com/root-project/root/pull/12335
+Patch13:	%{name}-Set-DataLayout-from-our-TargetMachine.patch
+#		https://github.com/root-project/root/issues/12294
+#		https://github.com/root-project/root/pull/12353
+Patch14:	%{name}-cling-Disable-outline-atomics-on-AArch64.patch
+#		https://github.com/root-project/root/pull/12385
+Patch15:	%{name}-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
+#		https://github.com/root-project/root/pull/12389
+Patch16:	%{name}-testRooAbsL-test-compares-two-doubles-and-fails.patch
+#		https://github.com/root-project/root/pull/12390
+Patch17:	%{name}-stressvector-test-fails-on-ix86.patch
+#		https://github.com/root-project/root/pull/12402
+Patch18:	%{name}-dont-install-roofit-files-when-roofit-is-disabled.patch
+#		https://github.com/root-project/root/pull/12403
+Patch19:	%{name}-veto-tests-using-clad-when-clad-is-disabled.patch
+#		https://github.com/root-project/root/pull/12407
+Patch20:	%{name}-use-consistent-minimum-python-version-for-DistRDF.patch
+Patch21:	%{name}-make-DistRDF-optional.patch
+#		https://github.com/root-project/root/pull/12423
+Patch22:	%{name}-dont-install-roofit-files-fix.patch
+#		https://github.com/root-project/root/issues/12430
+#		https://github.com/root-project/root/pull/12447
+Patch23:	%{name}-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
+#		https://github.com/root-project/root/issues/12427
+#		https://github.com/root-project/root/pull/12468
+Patch24:	%{name}-fixes-for-32bit-builds.patch
+#		https://github.com/root-project/root/pull/12476
+Patch25:	%{name}-do-not-remove-Wp-before-D-and-U.patch
+#		Backport (fixes a failing test on ix86)
+Patch26:	%{name}-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
 
-%if %{?rhel}%{!?rhel:0} == 7
-BuildRequires:	devtoolset-8-toolchain
-BuildRequires:	cmake3 >= 3.9
-%else
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 BuildRequires:	make
-BuildRequires:	cmake >= 3.9
-%endif
+BuildRequires:	cmake >= 3.16
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -222,62 +164,38 @@ BuildRequires:	libxml2-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
 BuildRequires:	unuran-devel
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	mariadb-connector-c-devel
-%else
-BuildRequires:	mysql-devel
-%endif
 BuildRequires:	sqlite-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8
 BuildRequires:	libpq-devel
-%else
-BuildRequires:	postgresql-devel
-%endif
-%if %{buildpy2}
-BuildRequires:	python2-devel
-BuildRequires:	python2-setuptools
-BuildRequires:	python2-numpy
-%endif
 BuildRequires:	python%{python3_pkgversion}-devel
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
-%if %{webgui}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtwebengine-devel
 %endif
-%endif
 BuildRequires:	openssl-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
-%if %{xrootd5}
 BuildRequires:	xrootd-client-devel >= 1:5.0.0
-%else
-BuildRequires:	xrootd-client-devel >= 1:3.3.5
-BuildRequires:	xrootd-private-devel >= 1:3.3.5
-%endif
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.6.4
-%if %{gfal2}
 BuildRequires:	gfal2-devel
-%endif
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
-%if %{tbb}
 BuildRequires:	tbb-devel >= 2018
-%endif
 BuildRequires:	libuuid-devel
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
-%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
 BuildRequires:	flexiblas-devel
 #		Required for FlexiBLAS support in FindBLAS.cmake
 #		(in cmake 3.19.0, backported to cmake 3.18.3-1 in Fedora)
@@ -286,7 +204,9 @@ BuildRequires:	cmake-data >= 3.18.3-1
 BuildRequires:	openblas-devel
 %endif
 BuildRequires:	json-devel
-%if %{?fedora}%{!?fedora:0}
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+#		Disable uring in EPEL 8 (liburing is available, but uring not
+#		supported by the kernel)
 BuildRequires:	liburing-devel
 %endif
 %if %{tmvasofieparser}
@@ -310,12 +230,15 @@ BuildRequires:	font(z003)
 BuildRequires:	font(droidsansfallback)
 #		With gdb installed test failures will show backtraces
 BuildRequires:	gdb
+#		Defines _jsdir
+BuildRequires:	web-assets-devel
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
 Requires:	emacs-filesystem >= %{_emacs_version}
 Provides:	emacs-%{name} = %{version}-%{release}
@@ -363,7 +286,7 @@ This package contains icons used by the ROOT GUI.
 Summary:	ROOT font collection
 BuildArch:	noarch
 #		STIX version 0.9 only
-License:	OFL
+License:	OFL-1.1
 Requires:	%{name}-core = %{version}-%{release}
 
 %description fonts
@@ -380,7 +303,7 @@ This package contains the tutorial scripts and test suite for ROOT.
 
 %package core
 Summary:	ROOT core libraries
-License:	LGPLv2+ and BSD
+License:	LGPL-2.1-or-later AND LGPL-2.0-or-later AND ISC AND MIT AND NCSA
 Requires:	%{name}-fonts = %{version}-%{release}
 Requires:	%{name}-icons = %{version}-%{release}
 #		Dynamic dependencies
@@ -402,7 +325,9 @@ Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-physics%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+%if %{dataframe}
 Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
+%endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		To resolve dependency in installed ROOTConfig.cmake
@@ -431,17 +356,6 @@ Obsoletes:	%{name}-net-globus < 6.18.00
 Obsoletes:	%{name}-net-ldap < 6.18.00
 Obsoletes:	%{name}-net-krb5 < 6.18.00
 Obsoletes:	%{name}-table < 6.18.00
-%if ! %{buildpy2}
-Obsoletes:	python2-%{name} < %{version}-%{release}
-Obsoletes:	python2-jupyroot < %{version}-%{release}
-Obsoletes:	python2-jsmva < %{version}-%{release}
-Obsoletes:	%{name}-rootaas < 6.08.00
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
-Obsoletes:	python%{?python3_other_pkgversion}-%{name} < 6.22.00
-Obsoletes:	python%{?python3_other_pkgversion}-jupyroot < 6.22.00
-Obsoletes:	python%{?python3_other_pkgversion}-jsmva < 6.22.00
-%endif
 Obsoletes:	%{name}-memstat < 6.26.00
 Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
 Obsoletes:	%{name}-doc < 6.26.00
@@ -458,12 +372,24 @@ Obsoletes:	%{name}-gui-fitpanelv7 < 6.26.00
 Obsoletes:	%{name}-histv7 < 6.26.00
 Obsoletes:	%{name}-hist-draw < 6.26.00
 Obsoletes:	%{name}-tree-ntuple < 6.26.00
-%endif
-%if %{buildpy2}
-Obsoletes:	python2-distrdf < 6.26.00
-%endif
-%if ! %{distrdf}
+#		Obsolete the DistRDF package in EPEL 8
+#		Minimum Python version requirement introduced
 Obsoletes:	python%{python3_pkgversion}-distrdf < 6.26.00
+%ifarch %{power64}
+#		Obsolete for ppc64le in EPEL 8
+#		These modules cause "pure virtual method called" errors
+Obsoletes:	%{name}-tree-dataframe < 6.28.00
+Obsoletes:	%{name}-roofit < 6.28.00
+Obsoletes:	%{name}-roofit-common < 6.28.00
+Obsoletes:	%{name}-roofit-core < 6.28.00
+Obsoletes:	%{name}-roofit-more < 6.28.00
+Obsoletes:	%{name}-roofit-batchcompute < 6.28.00
+Obsoletes:	%{name}-roofit-dataframe-helpers < 6.28.00
+Obsoletes:	%{name}-roofit-hs3 < 6.28.00
+Obsoletes:	%{name}-roostats < 6.28.00
+Obsoletes:	%{name}-hist-factory < 6.28.00
+Obsoletes:	%{name}-tmva-sofie-parser < 6.28.00
+%endif
 %endif
 
 %description core
@@ -481,7 +407,7 @@ This package provides ROOT's multi-processor support library: libMultiProc.
 
 %package cling
 Summary:	Cling C++ interpreter
-License:	NCSA and (NCSA or LGPLv2+)
+License:	(NCSA OR LGPL-2.1-only) AND (Apache-2.0 WITH LLVM-exception OR NCSA) AND BSD-2-Clause AND BSD-3-Clause AND MIT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 #		Root's cling interpreter uses a particular git commit of
@@ -491,11 +417,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 #		visible outside of the libCling module.
 Provides:	bundled(clang-libs)
 Provides:	bundled(llvm-libs)
-%if %{?rhel}%{!?rhel:0} == 7
-Requires:	devtoolset-8-toolchain
-%else
 Requires:	gcc-c++
-%endif
 Requires:	redhat-rpm-config
 Obsoletes:	%{name}-cint7 < 5.26.00c
 Obsoletes:	%{name}-cint < 6.00.00
@@ -506,6 +428,13 @@ Obsoletes:	%{name}-reflex < 6.00.00
 Cling is an interactive C++ interpreter, built on top of Clang and
 LLVM compiler infrastructure.
 
+%package testsupport
+Summary:	Unit test support library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description testsupport
+This package contains the unit test support library for ROOT.
+
 %package tpython
 Summary:	ROOT's TPython interface
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -517,51 +446,6 @@ Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
 This package contains ROOT's TPython interface. It makes it possible
 to call Python from ROOT.
 
-%if %{buildpy2}
-%package -n python2-%{name}
-Summary:	Python extension for ROOT
-%py_provides	python2-%{name}
-Provides:	%{name}-python = %{version}-%{release}
-Obsoletes:	%{name}-python < 6.08.00
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description -n python2-%{name}
-This package contains the Python extension for ROOT. It makes it
-possible to use ROOT classes in Python.
-
-%package -n python2-jupyroot
-Summary:	ROOT Jupyter kernel
-%py_provides	python2-jupyroot
-Requires:	python2-%{name}%{?_isa} = %{version}-%{release}
-Requires:	python2-jsmva = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-notebook = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 26
-#		python-metakernel for python2 not available in
-#		Fedora <= 25 or RHEL/EPEL - some functionality missing
-Requires:	python2-ipython
-Requires:	python2-metakernel
-%endif
-%if %{?fedora}%{!?fedora:0} >= 28
-Requires:	python-jupyter-filesystem
-%endif
-Obsoletes:	%{name}-rootaas < 6.08.00
-
-%description -n python2-jupyroot
-The Jupyter kernel for the ROOT notebook.
-
-%package -n python2-jsmva
-Summary:	TMVA interface used by JupyROOT
-BuildArch:	noarch
-%py_provides	python2-jsmva
-Requires:	%{name}-tmva = %{version}-%{release}
-
-%description -n python2-jsmva
-TMVA interface used by JupyROOT.
-%endif
-
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
 %py_provides	python%{python3_pkgversion}-%{name}
@@ -584,13 +468,11 @@ Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-notebook = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 26
-#		python-metakernel for python3 not available in
-#		Fedora <= 25 or RHEL/EPEL - some functionality missing
+%if %{?fedora}%{!?fedora:0}
+#		python-metakernel not available in RHEL/EPEL
+#		some functionality missing
 Requires:	python%{python3_pkgversion}-ipython
 Requires:	python%{python3_pkgversion}-metakernel
-%endif
-%if %{?fedora}%{!?fedora:0} >= 28
 Requires:	python-jupyter-filesystem
 %endif
 
@@ -658,17 +540,41 @@ This package contains a genetic minimizer module for ROOT.
 %package geom
 Summary:	Geometry library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+#		Package split (geom-builder and geom-painter from geom)
+Obsoletes:	%{name}-geom < 6.28.00
+
+%description geom
+This package contains a library for defining geometries in ROOT.
+
+%package geom-builder
+Summary:	Geometry builder library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+#		Package split (geom-builder and geom-painter from geom)
+Obsoletes:	%{name}-geom < 6.28.00
+
+%description geom-builder
+This package contains a library for building geometries in ROOT.
+
+%package geom-painter
+Summary:	Geometry painter library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split (geom-builder and geom-painter from geom)
+Obsoletes:	%{name}-geom < 6.28.00
 
-%description geom
-This package contains a library for defining geometries in ROOT.
+%description geom-painter
+This package contains a library for drawing geometries in ROOT.
 
 %package gdml
 Summary:	GDML import/export for ROOT geometries
@@ -724,6 +630,7 @@ Summary:	Canvas and pad library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 #		Dynamic dependency
 Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
@@ -981,24 +888,6 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 %description spectrum-painter
 This package contains a painter of spectra for ROOT.
 
-%package hist-factory
-Summary:	RooFit PDFs from ROOT histograms
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description hist-factory
-Create RooFit probability density functions from ROOT histograms.
-
 %package html
 Summary:	HTML documentation generator for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1024,7 +913,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
-%if %{gfal2}
 %package io-gfal
 Summary:	Grid File Access Library input/output library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1032,7 +920,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
-%endif
 
 %package io-sql
 Summary:	SQL input/output library for ROOT
@@ -1079,7 +966,7 @@ easier to use for the average user.
 
 %package fftw
 Summary:	FFTW library for ROOT
-License:	GPLv2+
+License:	GPL-2.0-or-later
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description fftw
@@ -1116,7 +1003,7 @@ This package contains the MathCore library for ROOT.
 
 %package mathmore
 Summary:	GSL interface library for ROOT
-License:	GPLv2+
+License:	GPL-2.0-or-later
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 
@@ -1235,7 +1122,7 @@ discriminating variables.
 
 %package unuran
 Summary:	Random number generator library
-License:	GPLv2+
+License:	GPL-2.0-or-later
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
@@ -1324,7 +1211,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 6
+Requires:	js-jsroot >= 7
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1356,8 +1243,7 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description netx
 This package contains the NetX extension for ROOT, i.e. a client for
-the xrootd server. Both the old (NetX) and the new (NetXNG) version are
-provided.
+the xrootd server. Only the new (NetXNG) version is provided.
 
 %package proof
 Summary:	PROOF extension for ROOT
@@ -1371,9 +1257,7 @@ Obsoletes:	%{name}-peac < 5.34.01
 #		Package split (proof-player from proof)
 Obsoletes:	%{name}-proof < 6.14.00
 Obsoletes:	%{name}-proofd < 6.16.00
-%if %{xrootd5}
-Obsoletes:	%{name}-xproof < %{version}-%{release}
-%endif
+Obsoletes:	%{name}-xproof < 6.22.08-2
 
 %description proof
 This package contains the proof extension for ROOT. This provides a
@@ -1425,25 +1309,10 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 This package contains a library for browsing an interactive PROOF
 session in ROOT.
 
-%if ! %{xrootd5}
-%package xproof
-Summary:	XPROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-#		Dynamic dependency
-Requires:	%{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires:	xrootd-server%{?_isa}
-
-%description xproof
-This package contains the xproof extension for ROOT. This provides a
-client to be used in a PROOF environment.
-%endif
-
+%if %{roofit}
 %package roofit
 Summary:	ROOT extension for modeling expected distributions - toolkit
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1472,7 +1341,7 @@ This package contains the RooFit toolkit classes.
 
 %package roofit-common
 Summary:	ROOT extension for modeling expected distributions - common
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description roofit-common
@@ -1492,7 +1361,7 @@ This package contains the RooFit common classes.
 
 %package roofit-core
 Summary:	ROOT extension for modeling expected distributions - core
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-foam%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
@@ -1501,7 +1370,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-common%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
@@ -1525,11 +1393,10 @@ This package contains the core RooFit classes.
 
 %package roofit-more
 Summary:	ROOT extension for modeling expected distributions - more
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1551,6 +1418,7 @@ This package contains RooFit classes that use the mathmore library.
 
 %package roofit-batchcompute
 Summary:	Optimized computation functions for PDFs
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
@@ -1569,9 +1437,10 @@ multiple times for different vector instuction set architectures and
 the optimal code is executed during runtime, as a result of an
 automatic hardware detection mechanism that this library contains.
 
+%if %{dataframe}
 %package roofit-dataframe-helpers
 Summary:	RooFit DaraFrame helpers
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description roofit-dataframe-helpers
@@ -1588,14 +1457,16 @@ analysis environment, but the general nature of the package make it
 suitable for adoption in different disciplines as well.
 
 This package contains DaraFrame helper classes for RooFit
+%endif
 
 %package roofit-hs3
 Summary:	RooFit HS3
-License:	BSD
+License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 
 %description roofit-hs3
@@ -1606,9 +1477,28 @@ may be useful to store statistical models in text form. This library
 sets out to achieve exactly that, exporting to and importing from JSON
 and YML.
 
+%package roofit-jsoninterface
+Summary:	JSON interface to RooFit
+License:	BSD-2-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+
+%description roofit-jsoninterface
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains the JSON interface to RooFit.
+
 %package roostats
 Summary:	Statistical tools built on top of RooFit
-License:	BSD
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1627,6 +1517,22 @@ Obsoletes:	%{name}-roofit < 6.20.00
 RooStats is a package containing statistical tools built on top of
 RooFit.
 
+%package hist-factory
+Summary:	RooFit PDFs from ROOT histograms
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description hist-factory
+Create RooFit probability density functions from ROOT histograms.
+%endif
+
 %package sql-mysql
 Summary:	MySQL client plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1672,7 +1578,7 @@ ROOT environment.
 
 %package tmva
 Summary:	Toolkit for multivariate data analysis
-License:	BSD
+License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1710,7 +1616,7 @@ compared.
 
 %package tmva-python
 Summary:	Toolkit for multivariate data analysis (Python)
-License:	BSD
+License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
@@ -1721,7 +1627,7 @@ Python integration with TMVA.
 
 %package tmva-r
 Summary:	Toolkit for multivariate data analysis (R)
-License:	BSD
+License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-r%{?_isa} = %{version}-%{release}
@@ -1732,6 +1638,7 @@ R integration with TMVA.
 
 %package tmva-sofie
 Summary:	ROOT/TMVA SOFIE (System for Optimized Fast Inference code Emit)
+License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 
 %description tmva-sofie
@@ -1744,6 +1651,7 @@ produces C++ header files that can be included and utilized in a
 %if %{tmvasofieparser}
 %package tmva-sofie-parser
 Summary:	ROOT/TMVA SOFIE Parsers
+License:	BSD-3-Clause AND MIT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
 
@@ -1753,7 +1661,7 @@ Parsers for ROOT/TMVA SOFIE
 
 %package tmva-gui
 Summary:	Toolkit for multivariate data analysis GUI
-License:	BSD
+License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -1777,6 +1685,7 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 %description tree
 This package contains the Tree library for ROOT.
 
+%if %{dataframe}
 %package tree-dataframe
 Summary:	A high level interface to ROOT trees
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1794,6 +1703,7 @@ Obsoletes:	%{name}-tree-player < 6.14.00
 
 %description tree-dataframe
 This package contains a high level interface to ROOT trees.
+%endif
 
 %package tree-player
 Summary:	Library to loop over a ROOT tree
@@ -1829,6 +1739,17 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description tree-viewer
 This package contains a plugin for browsing a ROOT tree in ROOT.
 
+%package tree-webviewer
+Summary:	ROOT tree web viewer library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description tree-webviewer
+This package contains a plugin for browsing a ROOT tree in a web GUI.
+
 %package unfold
 Summary:	Distribution unfolding
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1853,34 +1774,34 @@ Summary:	Static files for the Jupyter ROOT Notebook
 BuildArch:	noarch
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	js-jsroot >= 6
-%if %{?fedora}%{!?fedora:0} >= 26
-#		jupyter-notebook not available in
-#		Fedora <= 25 or RHEL/EPEL - some functionality missing
+%if %{?fedora}%{!?fedora:0}
+#		jupyter-notebook not available in RHEL/EPEL
+#		some functionality missing
 Requires:	jupyter-notebook
 %endif
 
 %description notebook
 Javascript and style files for the Jupyter ROOT Notebook.
 
-%if %{webgui}
 %package gui-webdisplay
-Summary:	Web display (ROOT 7)
+Summary:	Web display for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 
 %description gui-webdisplay
-This package contains a web display extension for ROOT 7.
+This package contains a web display extension for ROOT.
 
 %ifarch %{qt5_qtwebengine_arches}
 %package gui-qt5webdisplay
-Summary:	Qt5 Web display (ROOT 7)
+Summary:	Qt5 Web display
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 
 %description gui-qt5webdisplay
-This package contains a Qt5 web display extension for ROOT 7.
+This package contains a Qt5 web display extension for ROOT.
 %endif
 
 %package gui-webgui6
@@ -1888,16 +1809,25 @@ Summary:	Web based GUI for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description gui-webgui6
 This package provides a Web based GUI for ROOT.
-%endif
 
 %if %{root7}
+%package geom-webviewer
+Summary:	Geometry web viewer library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description geom-webviewer
+This package contains a library for viewing geometries in a web GUI.
+
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1950,13 +1880,15 @@ This package contains GUI browsable components for ROOT 7.
 Summary:	Browser (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom-webviewer%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d-eve7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-webviewer%{?_isa} = %{version}-%{release}
 
 %description gui-browserv7
 This package contains a file browser for ROOT 7.
@@ -2003,10 +1935,52 @@ This package contains an histogram drawing extension for ROOT 7.
 Summary:	Ntuple (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 
 %description tree-ntuple
 This package contains an ntuple extension for ROOT 7.
+
+%package tree-ntuple-utils
+Summary:	Ntuple utility library (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+
+%description tree-ntuple-utils
+This package contains utility functions for ntuples.
+
+%if %{roofit}
+%package xroofit
+Summary:	Extra tools for RooFit projects
+License:	BSD-2-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-hs3%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description xroofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains extra tools for RooFit projects.
+%endif
 %endif
 
 %prep
@@ -2039,20 +2013,6 @@ This package contains an ntuple extension for ROOT 7.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2089,30 +2049,17 @@ rm -rf documentation/doxygen/mathjax.tar.gz
 #  * jsroot
 rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 
-# Remove unsupported man page macros
-sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
-
 # Remove pre-minified script and style files
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
-%if %{?rhel}%{!?rhel:0} == 7 || %{?rhel}%{!?rhel:0} == 8
-# Allow older json on EPEL 7/8
+%if %{?rhel}%{!?rhel:0} == 8
+# Allow older json on EPEL 8
 sed 's!nlohmann_json 3.9!nlohmann_json 3.6!' \
     -i cmake/modules/SearchInstalledSoftware.cmake
 %endif
 
-%if %{?rhel}%{!?rhel:0} == 7
-# On EPEL 7 disable test that fails to compile
-# Brace initialization list is ambiguous with old compiler
-sed 's!.*dataframe_datasetspec!### &!' -i tree/dataframe/test/CMakeLists.txt
-%endif
-
 %build
-%if %{?rhel}%{!?rhel:0} == 7
-. /opt/rh/devtoolset-8/enable
-%endif
-
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
 %define _lto_cflags %{nil}
@@ -2129,12 +2076,15 @@ for s in etc/notebook/JsMVA/css/*.css ; do
     python3 -m rcssmin < ${s} > ${s%.css}.min.css
 done
 
-# Avoid overlinking (this used to be the default with the old configure script)
+# Avoid overlinking (this is the default on Fedora and EPEL 9)
+%if %{?rhel}%{!?rhel:0} == 8
 LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
+%endif
 
-%cmake3 \
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
+       -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
        -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
@@ -2180,7 +2130,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dcuda:BOOL=OFF \
        -Dcxxmodules:BOOL=OFF \
        -Ddaos:BOOL=OFF \
+%if %{dataframe}
        -Ddataframe:BOOL=ON \
+%else
+       -Ddataframe:BOOL=OFF \
+%endif
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Ddev:BOOL=OFF \
@@ -2191,24 +2145,18 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
-%if %{gfal2}
        -Dgfal:BOOL=ON \
-%else
-       -Dgfal:BOOL=OFF \
-%endif
        -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
        -Dhttp:BOOL=ON \
-%if %{tbb}
        -Dimt:BOOL=ON \
-%else
-       -Dimt:BOOL=OFF \
-%endif
        -Djemalloc:BOOL=OFF \
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
        -Dminuit2:BOOL=ON \
+       -Dminuit2_mpi:BOOL=OFF \
+       -Dminuit2_omp:BOOL=OFF \
        -Dmlp:BOOL=ON \
        -Dmonalisa:BOOL=OFF \
        -Dmpi:BOOL=OFF \
@@ -2228,7 +2176,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %endif
        -Dqt6web:BOOL=OFF \
        -Dr:BOOL=ON \
+%if %{roofit}
        -Droofit:BOOL=ON \
+%else
+       -Droofit:BOOL=OFF \
+%endif
        -Droofit_multiprocess:BOOL=OFF \
        -Droofit_hs3_ryml:BOOL=OFF \
 %if %{root7}
@@ -2247,11 +2199,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dssl:BOOL=ON \
        -Dtcmalloc:BOOL=OFF \
        -Dtmva:BOOL=ON \
-%if %{tbb}
        -Dtmva-cpu:BOOL=ON \
-%else
-       -Dtmva-cpu:BOOL=OFF \
-%endif
        -Dtmva-gpu:BOOL=OFF \
        -Dtmva-pymva:BOOL=ON \
        -Dtmva-rmva:BOOL=ON \
@@ -2261,7 +2209,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-sofie:BOOL=OFF \
 %endif
        -Dunuran:BOOL=ON \
-%if %{?fedora}%{!?fedora:0}
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
        -During:BOOL=ON \
 %else
        -During:BOOL=OFF \
@@ -2270,19 +2218,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dvdt:BOOL=OFF \
        -Dveccore:BOOL=OFF \
        -Dvecgeom:BOOL=OFF \
-%if %{webgui}
        -Dwebgui:BOOL=ON \
-%else
-       -Dwebgui:BOOL=OFF \
-%endif
        -Dx11:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
-%if %{xrootd5}
        -Dxproofd:BOOL=OFF \
-%else
-       -Dxproofd:BOOL=ON \
-%endif
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
        -Dtest_distrdf_pyspark:BOOL=OFF \
@@ -2292,10 +2232,10 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Droottest:BOOL=OFF \
        -Drootbench:BOOL=OFF \
        -Dasan:BOOL=OFF
-%cmake3_build
+%cmake_build
 
 %install
-%cmake3_install
+%cmake_install
 
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
@@ -2319,100 +2259,41 @@ install -p -m 644 %{SOURCE7} %{buildroot}%{_pkgdocdir}
 
 # Move python cli helper to its own directory
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
-mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
+mv %{buildroot}%{python3_sitearch}/cmdLineUtils.py \
    %{buildroot}%{_datadir}/%{name}/cli
-rm %{buildroot}%{_libdir}/%{name}/__pycache__/cmdLineUtils.*
 sed -e '/^\#!/d' -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py
 
 # Install GDB pretty printers to auto load safe path
-# These are installed (in libdir) by "make install" if CMAKE_BUILD_TYPE
-# matches Debug or RelWithDebInfo
 mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
-install -p -m 644 build/gdbPrinters/libCore.so-gdb.py \
-   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libCore.so.%{version}-gdb.py
-install -p -m 644 build/gdbPrinters/libRooFitCore.so-gdb.py \
-   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.so.%{version}-gdb.py
+mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
+   %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
+
+# Let rpm redo the python byte compilation
+find %{buildroot}%{python3_sitearch} -depth -type d -name __pycache__ -exec rm -r {} ';'
 
 # Do python byte compilation (for non-standard paths)
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
-# This is the default for Fedora 30+, set it for Fedora 28-29
-%global _python_bytecompile_extra 0
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
-%endif
 
-%if %{buildpy2}
-
-# Move the python modules to sitearch/sitelib
-mkdir -p %{buildroot}%{python2_sitearch}
-
-cp -pr %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python2_sitearch}
-ln -s ../../root/libcppyy%{python2_version_uscore}.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libcppyy%{python2_version_uscore}.so
-
-cp -pr %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python2_sitearch}
-ln -s ../../root/libcppyy_backend%{python2_version_uscore}.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libcppyy_backend%{python2_version_uscore}.so
-
-cp -pr %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python2_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libROOTPythonizations%{python2_version_uscore}.so
-rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python2_version_uscore}.so
-
-cp -pr %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python2_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so.%{version} \
-   %{buildroot}%{python2_sitearch}/libJupyROOT%{python2_version_uscore}.so
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python2_version_uscore}.so
-
-mkdir -p %{buildroot}%{python2_sitelib}
-cp -pr %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python2_sitelib}
-
-# Create .egg-info files so that rpm auto-generates provides
-echo 'Name: ROOT' > \
-    %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-echo 'Version: %{version}' >> \
-    %{buildroot}%{python2_sitearch}/ROOT-%{version}.egg-info
-echo 'Name: JupyROOT' > \
-    %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
-echo 'Version: %{version}' >> \
-    %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.egg-info
-echo 'Name: JsMVA' > \
-    %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
-echo 'Version: %{version}' >> \
-    %{buildroot}%{python2_sitelib}/JsMVA-%{version}.egg-info
-
-%endif
-
-# Move the python modules to sitearch/sitelib
-mkdir -p %{buildroot}%{python3_sitearch}
-
-mv %{buildroot}%{_libdir}/%{name}/cppyy %{buildroot}%{python3_sitearch}
-ln -s ../../root/libcppyy%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libcppyy%{python3_version_uscore}%{python3_ext_suffix}
-
-mv %{buildroot}%{_libdir}/%{name}/cppyy_backend %{buildroot}%{python3_sitearch}
-ln -s ../../root/libcppyy_backend%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
-
-mv %{buildroot}%{_libdir}/%{name}/ROOT %{buildroot}%{python3_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
+# Fix python extension suffix
+mv %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
    %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
-rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libROOTPythonizations%{python3_version_uscore}.so
+rm %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so.%{libversion}
+rm %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so
 
-mv %{buildroot}%{_libdir}/%{name}/JupyROOT %{buildroot}%{python3_sitearch}
-mv %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{version} \
+mv %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so.%{version} \
    %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}%{python3_ext_suffix}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so.%{libversion}
-rm %{buildroot}%{_libdir}/%{name}/libJupyROOT%{python3_version_uscore}.so
+rm %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so.%{libversion}
+rm %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so
 
+# Move noarch python modules to sitelib
+if [ "%{python3_sitelib}" != "%{python3_sitearch}" ] ; then
 mkdir -p %{buildroot}%{python3_sitelib}
-mv %{buildroot}%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{python3_sitearch}/JsMVA %{buildroot}%{python3_sitelib}
 %if %{distrdf}
-mv %{buildroot}%{_libdir}/%{name}/DistRDF %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{python3_sitearch}/DistRDF %{buildroot}%{python3_sitelib}
 %endif
+fi
 
 # Create .egg-info files so that rpm auto-generates provides
 echo 'Name: ROOT' > \
@@ -2437,16 +2318,6 @@ echo 'Version: %{version}' >> \
 # Put jupyter stuff in the right places
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
-%if %{buildpy2}
-cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
-   %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot
-sed -e 's/ROOT C++/& (Python 2)/' \
-    -e 's!python[0-9]*\.[0-9]*!%{__python2}!' \
-    -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json
-sed -e '/^\#!/d' \
-    -i %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py
-%endif
-
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
    %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 sed -e 's/ROOT C++/& (Python 3)/' \
@@ -2522,43 +2393,34 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 rm TBrowserImp/P030_RWebBrowserImp.C
 %endif
 rm TDataSetManager/P020_TDataSetManagerAliEn.C
-%if ! %{gfal2}
-rm TFile/P050_TGFALFile.C
-%endif
 rm TFile/P070_TAlienFile.C
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TGrid/P010_TAlien.C
-%if ! %{webgui}
-rm TGuiFactory/P030_TWebGuiFactory.C
-%endif
-%if %{xrootd5}
 rm TProofMgr/P010_TXProofMgr.C
 rm TProofServ/P010_TXProofServ.C
 rm TSlave/P010_TXSlave.C
-%endif
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 %if ! %{root7}
-rm TVirtualGeoPainter/P020_REveGeoPainter.C
+rm TVirtualGeoPainter/P020_RGeoPainter.C
 %endif
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
 rmdir TGrid
-%if %{xrootd5}
 rmdir TProofMgr
 rmdir TProofServ
 rmdir TSlave
-%endif
 rmdir TVirtualGeoConverter
 popd
 
 # Replace bundled jsroot with symlinks to system version
-for x in img libs scripts style files/draw.htm files/online.htm ; do
-    ln -s /usr/share/javascript/jsroot/$x %{buildroot}%{_datadir}/%{name}/js/$x
+for x in build img modules scripts files/draw.htm files/online.htm ; do
+    ln -nrs %{buildroot}%{_jsdir}/jsroot/$x \
+	    %{buildroot}%{_datadir}/%{name}/js/$x
 done
 
 # Create ldconfig configuration
@@ -2568,17 +2430,13 @@ echo %{_libdir}/%{name} > \
 
 # Make ROOTConfig-targets.cmake not error on missing files to work better with
 # subpackages
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-%global pkgmgr dnf
-%else
-%global pkgmgr yum
-%endif
-sed -e '/FATAL.*import/i\      message(WARNING "The imported target \\"\${target}\\" references the file\
-   \\"\${file}\\"\
-but this file does not exist.  If this target is used you need to install the package that provides this file\
-   %{pkgmgr} install \${file}\
+sed -e 's/FATAL_ERROR \(.*imported\)/WARNING \1/' \
+    -e '/Possible reasons include/i\
+but this file does not exist.\
+If this target is used you need to install the package that provides this\
+file using \\"dnf install\\".\
 If this target is not used this warning can be ignored.")' \
-    -e '/FATAL.*import/,/)/d' \
+    -e '/Possible reasons include/,/)/d' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
 
 # Rename to avoid name clashes
@@ -2591,30 +2449,17 @@ for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
-%if %{?rhel}%{!?rhel:0} == 7
-    DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-%else
     DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
-%endif
     ( cd $tmpdir ; find . -type f) | sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
 done
 
 # ... and merge some of them
 cat includelist-core-{[^mw],m[^au]}* > includelist-core
-cat includelist-geom-geom* > includelist-geom
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
 cat includelist-graf3d-rglew >> includelist-graf3d-gl
-cat includelist-net-netxng > includelist-netx
-%if ! %{xrootd5}
-cat includelist-net-netx >> includelist-netx
-%endif
 
 %check
-%if %{?rhel}%{!?rhel:0} == 7
-. /opt/rh/devtoolset-8/enable
-%endif
-
 pushd %{_vpath_builddir}
 pushd test
 ln -s ../../files files
@@ -2704,8 +2549,6 @@ popd
 #   reads input data over network
 #   http://root.cern/files/tmva101.root
 #
-# - pyunittests-pyroot-dependency-versions
-# - pyunittests-pyroot-numbadeclare
 # - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
 #   these tests require the numba python module which is not available
@@ -2742,8 +2585,6 @@ gtest-tmva-tmva-test-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
 tutorial-tmva-tmva004_RStandardScaler|\
 tutorial-tmva-tmva103_Application|\
-pyunittests-pyroot-dependency-versions|\
-pyunittests-pyroot-numbadeclare|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 test-webgui-ping"
@@ -2752,29 +2593,25 @@ test-webgui-ping"
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
 # - tutorial-roofit-rf409_NumPyPandasToRooFit-py
-#   requires the pandas python module which is not available in EPEL 7
-#   or EPEL 9
+#   Requires the pandas python module not (yet) available in RHEL/EPEL 9
 excluded="${excluded}|\
 test-import-pandas|\
 tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
-%if %{?rhel}%{!?rhel:0} == 7
-# - pyunittests-pyroot-roofit-roodataset-numpy
-#   AttributeError: module 'numpy' has no attribute 'isin'
-excluded="${excluded}|\
-pyunittests-pyroot-roofit-roodataset-numpy"
-%endif
-
 %if %{?fedora}%{!?fedora:0} >= 38
-# Failures with Fedora 38 (GCC 13 related?)
+# - pyunittests-dataframe-histograms
+# - tutorial-legacy-rootenv
+#   Failures with Fedora 38 (GCC 13 related?)
 excluded="${excluded}|\
 pyunittests-dataframe-histograms|\
 tutorial-legacy-rootenv"
 
 %ifarch %{ix86}
-# Failures with Fedora 38 i686 (after numpy 1.24 update)
+# - pyunittests-pyroot-roofit-roodataset-numpy
+#   Failures with Fedora 38 i686 (after numpy 1.24 update)
+#   https://github.com/root-project/root/issues/12162
 excluded="${excluded}|\
 pyunittests-pyroot-roofit-roodataset-numpy"
 %endif
@@ -2782,7 +2619,6 @@ pyunittests-pyroot-roofit-roodataset-numpy"
 
 %ifarch %{arm}
 # 32 bit arm specific failures
-#
 # - gtest-tree-tree-test-testBulkApi
 # - gtest-tree-tree-test-testBulkApiSillyStruct
 # - gtest-tree-dataframe-test-dataframe-snapshot
@@ -2799,76 +2635,34 @@ pyunittests-distrdf-unit-test-headnode"
 %endif
 
 %ifarch %{power64} aarch64
-# This test fails on ppc64le and aarch64 (but not on x86_64)
-# The interpreted version works though, only compiled version fails
 # - test-stresshistofit
-excluded="${excluded}|test-stresshistofit\$\$"
+# - test-stressroofit
+# - test-stressroofit-batchmode-cpu
+# - test-stressroofit-interpreted
+excluded="${excluded}|\
+test-stresshistofit\$\$|\
+test-stressroofit\$\$|\
+test-stressroofit-batchmode-cpu|\
+test-stressroofit-interpreted"
 %endif
 
 %ifarch %{power64}
 # PPC64LE specific failures
-#
 # - test-stresshistofit-interpreted
 # - test-stresshistogram-interpreted
 # - test-stressmathcore-interpreted
 # - test-stressroostats-interpreted
 #
 # Always timeout (hang?)
-# - pyunittests-pyroot-pyz-rdataframe-makenumpy
-# - tutorial-dataframe-df032_MakeNumpyDataFrame-py
+# - test-stressinterpreter
+# - tutorial-unuran-unuranFoamTest
 excluded="${excluded}|\
 test-stresshistofit-interpreted|\
 test-stresshistogram-interpreted|\
 test-stressmathcore-interpreted|\
 test-stressroostats-interpreted|\
-pyunittests-pyroot-pyz-rdataframe-makenumpy|\
-tutorial-dataframe-df032_MakeNumpyDataFrame-py"
-
-%if %{?rhel}%{!?rhel:0} == 9
-# tmva/tmva/test/branchlessForest.cxx:215: Failure
-# Expected equality of these values:
-#   predictions[1]
-#     Which is: -1
-#   -1.0 + 2.0
-#     Which is: 1
-# - gtest-tmva-tmva-test-branchlessForest
-#
-# Error in <TAxis::TAxis::Set>: bins must be in increasing order
-# Error in <TGraphPainter::PaintGrapHist>: X must be in increasing order
-# - tutorial-math-kdTreeBinning
-#
-# Segmentation violation - malloc(): unaligned tcache chunk detected
-# - tutorial-unfold-testUnfold7c
-#
-# TFormula double free in Python
-# - tutorial-hist-fillrandom-py
-# - tutorial-pyroot-fillrandom-py
-# - tutorial-pyroot-fit1-py (uses output of tutorial-pyroot-fillrandom-py)
-# - tutorial-pyroot-formula1-py
-excluded="${excluded}|\
-gtest-tmva-tmva-test-branchlessForest|\
-tutorial-math-kdTreeBinning|\
-tutorial-unfold-testUnfold7c|\
-tutorial-hist-fillrandom-py|\
-tutorial-pyroot-fillrandom-py|\
-tutorial-pyroot-fit1-py|\
-tutorial-pyroot-formula1-py"
-%endif
-
-%if %{?rhel}%{!?rhel:0} == 7 || %{?rhel}%{!?rhel:0} == 8
-# crash - free(): corrupted unsorted chunks
-# - gtest-roofit-RDataFrameHelpers-test-testActionHelpers
-# - gtest-tmva-tmva-test-rtensor-utils
-# - gtest-tree-dataframe-test-dataframe-*
-# - gtest-tree-dataframe-test-datasource-*
-# - tutorial-dataframe-df004_cutFlowReport
-excluded="${excluded}|\
-gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
-gtest-tmva-tmva-test-rtensor-utils|\
-gtest-tree-dataframe-test-dataframe|\
-gtest-tree-dataframe-test-datasource|\
-tutorial-dataframe-df004_cutFlowReport"
-%endif
+test-stressinterpreter|\
+tutorial-unuran-unuranFoamTest"
 
 %if %{?rhel}%{!?rhel:0} == 8
 # Fails on ppc64le since RHEL 8.5 update
@@ -2879,115 +2673,121 @@ tutorial-dataframe-df004_cutFlowReport"
 #  - librt-2.28
 # - pyunittests-pyroot-import-load-libs
 #
-# crash - double free or corruption (out)
+# - tutorial-fit-combinedFit(-py)
+# - tutorial-fit-exampleFit3D
+# - tutorial-fit-fit2dHist
+# - tutorial-fit-fitCircle
+# - tutorial-fit-line3Dfit
+# - tutorial-multicore-mt103_fillNtupleFromMultipleThreads
 # - tutorial-multicore-mt201_parallelHistoFill
-#
-# segmentation violation
 # - tutorial-multicore-mt304_fillHistos
+# - tutorial-multicore-mtbb001_fillHistos
+# - tutorial-multicore-mtbb101_fillNtuples
+# - tutorial-multicore-mtbb201_parallelHistoFill
 excluded="${excluded}|\
 pyunittests-pyroot-import-load-libs|\
+tutorial-fit-combinedFit|\
+tutorial-fit-exampleFit3D|\
+tutorial-fit-fit2dHist|\
+tutorial-fit-fitCircle|\
+tutorial-fit-line3Dfit|\
+tutorial-multicore-mt103_fillNtupleFromMultipleThreads|\
 tutorial-multicore-mt201_parallelHistoFill|\
-tutorial-multicore-mt304_fillHistos"
+tutorial-multicore-mt304_fillHistos|\
+tutorial-multicore-mtbb001_fillHistos|\
+tutorial-multicore-mtbb101_fillNtuples|\
+tutorial-multicore-mtbb201_parallelHistoFill"
 %endif
 %endif
 
 %ifarch s390x
-# s390x specific failures
-#
 # - gtest-roofit-roofitcore-test-testNaNPacker
-# - gtest-roofit-roofitcore-test-testRooProdPdf
-# - gtest-tree-dataframe-test-datasource-ntuple
-# - gtest-tree-ntuple-v7-test-ntuple-basics
-# - gtest-tree-ntuple-v7-test-ntuple-extended
-# - gtest-tree-ntuple-v7-test-ntuple-merger
-# - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-serialize
-# - pyunittests-pyroot-pyz-rtensor
-# - pyunittests-pyroot-pyz-stl-vector
-# - test-stresshistofit(-interpreted)
-# - test-stresshistogram(-interpreted)
-# - tutorial-dataframe-df006_ranges-py
-# - tutorial-math-exampleFunction-py
 # - tutorial-roofit-rf612_recoverFromInvalidParameters
+#   Uses "Packed NaN" feature, not implemented for big endian.
 excluded="${excluded}|\
 gtest-roofit-roofitcore-test-testNaNPacker|\
-gtest-roofit-roofitcore-test-testRooProdPdf|\
-gtest-tree-dataframe-test-datasource-ntuple|\
+tutorial-roofit-rf612_recoverFromInvalidParameters"
+
+# - gtest-tree-ntuple-v7-test-ntuple-basics
+# - gtest-tree-ntuple-v7-test-ntuple-endian
+# - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-minifile
+# - gtest-tree-ntuple-v7-test-ntuple-rdf
+# - gtest-tree-ntuple-v7-test-ntuple-serialize
+# - gtest-tree-ntuple-v7-test-ntuple-types
+#   https://github.com/root-project/root/issues/12426
+#
+# - pyunittests-pyroot-pyz-rtensor
+# - pyunittests-pyroot-pyz-stl-vector
+# - tutorial-dataframe-df006_ranges-py
+# - tutorial-fit-combinedFit-py
+# - tutorial-math-exampleFunction-py
+# - tutorial-tmva-TMVA_CNN_Classification-py
+# - tutorial-tmva-TMVA_Higgs_Classification-py
+# - tutorial-tmva-TMVA_RNN_Classification-py
+#   https://github.com/root-project/root/issues/12429
+#
+# - tutorial-tree-drawsparse
+#   https://github.com/root-project/root/issues/12431
+#
+# - test-stresshistofit
+# - test-stresshistofit-interpreted
+# - test-stresshistogram
+# - test-stresshistogram-interpreted
+# - test-stressroofit
+# - test-stressroofit-batchmode-cpu
+# - test-stressroofit-interpreted
+excluded="${excluded}|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
+gtest-tree-ntuple-v7-test-ntuple-endian|\
 gtest-tree-ntuple-v7-test-ntuple-extended|\
-gtest-tree-ntuple-v7-test-ntuple-merger|\
 gtest-tree-ntuple-v7-test-ntuple-minifile|\
+gtest-tree-ntuple-v7-test-ntuple-rdf|\
 gtest-tree-ntuple-v7-test-ntuple-serialize|\
+gtest-tree-ntuple-v7-test-ntuple-types|\
 pyunittests-pyroot-pyz-rtensor|\
 pyunittests-pyroot-pyz-stl-vector|\
-test-stresshistofit|\
-test-stresshistogram|\
 tutorial-dataframe-df006_ranges-py|\
+tutorial-fit-combinedFit-py|\
 tutorial-math-exampleFunction-py|\
-tutorial-roofit-rf612_recoverFromInvalidParameters"
+tutorial-tmva-TMVA_CNN_Classification-py|\
+tutorial-tmva-TMVA_Higgs_Classification-py|\
+tutorial-tmva-TMVA_RNN_Classification-py|\
+tutorial-tree-drawsparse|\
+test-stresshistofit\$\$|\
+test-stresshistofit-interpreted|\
+test-stresshistogram\$\$|\
+test-stresshistogram-interpreted|\
+test-stressroofit\$\$|\
+test-stressroofit-batchmode-cpu|\
+test-stressroofit-interpreted"
 
 %if %{?rhel}%{!?rhel:0} == 8
 # Issues with file sizes on EPEL 8 s390x
+# - gtest-tree-readspeed-test-readspeed-general
 # - gtest-tree-tree-test-testTBranch
 # - test-stress
 # - test-stressgraphics(-interpreted)
 excluded="${excluded}|\
+gtest-tree-readspeed-test-readspeed-general|\
 gtest-tree-tree-test-testTBranch|\
 test-stress\$\$|\
 test-stressgraphics"
 %endif
-
-%if %{?fedora}%{!?fedora:0} >= 38
-# Segmentation faults and invalid pointers
-# Mainly related to DataFrame
-excluded="${excluded}|\
-pyunittests-dataframe|\
-pyunittests-distrdf-unit-backend-test-dist|\
-pyunittests-distrdf-unit-test-headnode|\
-pyunittests-pyroot-pyz-rdataframe-asnumpy|\
-pyunittests-pyroot-pyz-rdataframe-makenumpy|\
-pyunittests-pyroot-rdfdescription|\
-gtest-roofit-RDataFrameHelpers-test-testActionHelpers|\
-gtest-tree-dataframe-test-dataframe|\
-gtest-tree-dataframe-test-datasource|\
-gtest-tree-ntuple-v7-test-ntuple-rdf|\
-tutorial-dataframe-df|\
-tutorial-graphs-timeSeriesFromCSV_TDF|\
-tutorial-multicore-mt304_fillHistos|\
-tutorial-rcanvas|\
-tutorial-roofit-rf408_RDataFrameToRooFit-py|\
-tutorial-roofit-rf508_listsetmanip-py|\
-tutorial-tmva-tmva002_RDataFrameAsTensor|\
-tutorial-v7-concurrentfill.cxx|\
-tutorial-v7-histops.cxx|\
-tutorial-v7-perf.cxx|\
-tutorial-v7-perfcomp.cxx|\
-tutorial-v7-simple.cxx"
-%endif
 %endif
 
 # Filter out parts of tests that require remote network access
-GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix \
-make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
-popd
-
-%if %{?rhel}%{!?rhel:0} == 7
-%post
-touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
-    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-fi
-update-desktop-database >/dev/null 2>&1 || :
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+# RNTuple.TClassEBO seg fault
+# https://github.com/root-project/root/issues/12428
+GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix:TFile.ReadWithoutGlobalRegistrationWeb:TFile.ReadWithoutGlobalRegistrationNet:RNTuple.TClassEBO \
+%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
+ROOTTEST_IGNORE_PANDAS_PY3=1 \
 %endif
+ROOTTEST_IGNORE_NUMBA_PY3=1 \
+ROOTTEST_IGNORE_JUPYTER_PY3=1 \
+make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
+
+popd
 
 %pretrans net-http -p <lua>
 path = "%{_datadir}/%{name}/js"
@@ -2998,22 +2798,13 @@ end
 
 %post net-http
 # Replace bundled jsroot with symlinks to system version
-for x in img libs scripts style files/draw.htm files/online.htm ; do
-    ln -fs /usr/share/javascript/jsroot/$x %{_datadir}/%{name}/js/$x
+for x in build img modules scripts files/draw.htm files/online.htm ; do
+    ln -fnrs %{_jsdir}/jsroot/$x %{_datadir}/%{name}/js/$x
 done
 %{?ldconfig}
 
 %ldconfig_postun net-http
 
-%if %{buildpy2}
-%pre -n python2-%{name}
-if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
-    for alt in `grep python2.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
-	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
-    done
-fi
-%endif
-
 %pre -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     for alt in `grep python3.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
@@ -3028,7 +2819,7 @@ if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
 fi
 cat << EOF >> /etc/jupyter/jupyter_notebook_config.py
 # Extra static path for JupyROOT - start - do not remove this line
-c.NotebookApp.extra_static_paths.append('%{_datadir}/javascript/jsroot')
+c.NotebookApp.extra_static_paths.append('%{_jsdir}/jsroot')
 c.NotebookApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
 # Extra static path for JupyROOT - end - do not remove this line
 EOF
@@ -3037,7 +2828,7 @@ if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
 fi
 cat << EOF >> /etc/jupyter/jupyter_server_config.py
 # Extra static path for JupyROOT - start - do not remove this line
-c.ServerApp.extra_static_paths.append('%{_datadir}/javascript/jsroot')
+c.ServerApp.extra_static_paths.append('%{_jsdir}/jsroot')
 c.ServerApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
 # Extra static path for JupyROOT - end - do not remove this line
 EOF
@@ -3066,14 +2857,13 @@ fi
 %ldconfig_scriptlets multiproc
 %ldconfig_scriptlets cling
 %ldconfig_scriptlets tpython
-%if %{buildpy2}
-%ldconfig_scriptlets -n python2-%{name}
-%endif
 %ldconfig_scriptlets -n python%{python3_pkgversion}-%{name}
 %ldconfig_scriptlets r
 %ldconfig_scriptlets r-tools
 %ldconfig_scriptlets genetic
 %ldconfig_scriptlets geom
+%ldconfig_scriptlets geom-builder
+%ldconfig_scriptlets geom-painter
 %ldconfig_scriptlets gdml
 %ldconfig_scriptlets graf
 %ldconfig_scriptlets graf-asimage
@@ -3099,13 +2889,10 @@ fi
 %ldconfig_scriptlets hist-painter
 %ldconfig_scriptlets spectrum
 %ldconfig_scriptlets spectrum-painter
-%ldconfig_scriptlets hist-factory
 %ldconfig_scriptlets html
 %ldconfig_scriptlets io
 %ldconfig_scriptlets io-dcache
-%if %{gfal2}
 %ldconfig_scriptlets io-gfal
-%endif
 %ldconfig_scriptlets io-sql
 %ldconfig_scriptlets io-xml
 %ldconfig_scriptlets io-xmlparser
@@ -3137,17 +2924,20 @@ fi
 %ldconfig_scriptlets proof-bench
 %ldconfig_scriptlets proof-player
 %ldconfig_scriptlets proof-sessionviewer
-%if ! %{xrootd5}
-%ldconfig_scriptlets xproof
-%endif
+%if %{roofit}
 %ldconfig_scriptlets roofit
 %ldconfig_scriptlets roofit-common
 %ldconfig_scriptlets roofit-core
 %ldconfig_scriptlets roofit-more
 %ldconfig_scriptlets roofit-batchcompute
+%if %{dataframe}
 %ldconfig_scriptlets roofit-dataframe-helpers
+%endif
+%ldconfig_scriptlets roofit-jsoninterface
 %ldconfig_scriptlets roofit-hs3
 %ldconfig_scriptlets roostats
+%ldconfig_scriptlets hist-factory
+%endif
 %ldconfig_scriptlets sql-mysql
 %ldconfig_scriptlets sql-odbc
 %ldconfig_scriptlets sql-sqlite
@@ -3161,18 +2951,20 @@ fi
 %endif
 %ldconfig_scriptlets tmva-gui
 %ldconfig_scriptlets tree
+%if %{dataframe}
 %ldconfig_scriptlets tree-dataframe
+%endif
 %ldconfig_scriptlets tree-player
 %ldconfig_scriptlets tree-viewer
+%ldconfig_scriptlets tree-webviewer
 %ldconfig_scriptlets unfold
-%if %{webgui}
 %ldconfig_scriptlets gui-webdisplay
 %ifarch %{qt5_qtwebengine_arches}
 %ldconfig_scriptlets gui-qt5webdisplay
 %endif
 %ldconfig_scriptlets gui-webgui6
-%endif
 %if %{root7}
+%ldconfig_scriptlets geom-webviewer
 %ldconfig_scriptlets graf-gpadv7
 %ldconfig_scriptlets graf-primitives
 %ldconfig_scriptlets graf3d-eve7
@@ -3183,6 +2975,10 @@ fi
 %ldconfig_scriptlets histv7
 %ldconfig_scriptlets hist-draw
 %ldconfig_scriptlets tree-ntuple
+%ldconfig_scriptlets tree-ntuple-utils
+%if %{roofit}
+%ldconfig_scriptlets xroofit
+%endif
 %endif
 
 %files
@@ -3190,8 +2986,10 @@ fi
 %{_bindir}/root
 %{_bindir}/root.exe
 %{_bindir}/rootn.exe
+%{_bindir}/rootreadspeed
 %{_bindir}/roots
 %{_bindir}/roots.exe
+%{_bindir}/rootssh
 %{_mandir}/man1/hadd.1*
 %{_mandir}/man1/root.1*
 %{_mandir}/man1/root.exe.1*
@@ -3228,10 +3026,8 @@ fi
 %{_libdir}/%{name}/lib*Dict.*
 %dir %{_datadir}/gdb/auto-load%{_libdir}/%{name}
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/libCore.*
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 %dir %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libCore.*
-%endif
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/allDict.cxx.pch
 %{_datadir}/%{name}/class.rules
@@ -3288,41 +3084,21 @@ fi
 %doc interpreter/llvm/src/llvm-README.txt
 %license interpreter/llvm/src/llvm-LICENSE.TXT
 
+%files testsupport
+%{_includedir}/%{name}/ROOT/TestSupport.hxx
+%{_libdir}/%{name}/libTestSupport.a
+%doc core/testsupport/README.md
+
 %files tpython -f includelist-bindings-tpython
 %{_libdir}/%{name}/libROOTTPython.*
 %{_libdir}/%{name}/libROOTTPython_rdict.pcm
 
-%if %{buildpy2}
-%files -n python2-%{name} -f includelist-bindings-pyroot
-%{python2_sitearch}/cppyy
-%{python2_sitearch}/cppyy_backend
-%{python2_sitearch}/ROOT
-%{python2_sitearch}/ROOT-*.egg-info
-%{python2_sitearch}/libcppyy%{python2_version_uscore}.so
-%{python2_sitearch}/libcppyy_backend%{python2_version_uscore}.so
-%{python2_sitearch}/libROOTPythonizations%{python2_version_uscore}.so
-%{_libdir}/%{name}/libcppyy%{python2_version_uscore}.*
-%{_libdir}/%{name}/libcppyy_backend%{python2_version_uscore}.*
-%dir %{_includedir}/%{name}/CPyCppyy
-
-%files -n python2-jupyroot
-%{python2_sitearch}/JupyROOT
-%{python2_sitearch}/JupyROOT-*.egg-info
-%{python2_sitearch}/libJupyROOT%{python2_version_uscore}.so
-%{_datadir}/jupyter/kernels/python2-jupyroot
-%doc bindings/jupyroot/README.md
-
-%files -n python2-jsmva
-%{python2_sitelib}/JsMVA
-%{python2_sitelib}/JsMVA-*.egg-info
-%endif
-
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{python3_sitearch}/cppyy
 %{python3_sitearch}/cppyy_backend
 %{python3_sitearch}/ROOT
 %{python3_sitearch}/ROOT-*.egg-info
-%{python3_sitearch}/libcppyy%{python3_version_uscore}%{python3_ext_suffix}
+%{python3_sitearch}/libcppyy%{python3_version_uscore}.so
 %{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
 %{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
 %{_libdir}/%{name}/libcppyy%{python3_version_uscore}.*
@@ -3361,16 +3137,20 @@ fi
 %{_libdir}/%{name}/libGenetic_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P080_GeneticMinimizer.C
 
-%files geom -f includelist-geom
+%files geom -f includelist-geom-geom
 %{_libdir}/%{name}/libGeom.*
 %{_libdir}/%{name}/libGeom_rdict.pcm
+%{_datadir}/%{name}/RadioNuclides.txt
+
+%files geom-builder -f includelist-geom-geombuilder
 %{_libdir}/%{name}/libGeomBuilder.*
 %{_libdir}/%{name}/libGeomBuilder_rdict.pcm
+%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
+
+%files geom-painter -f includelist-geom-geompainter
 %{_libdir}/%{name}/libGeomPainter.*
 %{_libdir}/%{name}/libGeomPainter_rdict.pcm
-%{_datadir}/%{name}/plugins/TGeoManagerEditor/P010_TGeoManagerEditor.C
 %{_datadir}/%{name}/plugins/TVirtualGeoPainter/P010_TGeoPainter.C
-%{_datadir}/%{name}/RadioNuclides.txt
 
 %files gdml -f includelist-geom-gdml
 %{_libdir}/%{name}/libGdml.*
@@ -3512,17 +3292,6 @@ fi
 %{_libdir}/%{name}/libSpectrumPainter.*
 %{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
 
-%files hist-factory -f includelist-roofit-histfactory
-%{_bindir}/hist2workspace
-%{_bindir}/prepareHistFactory
-%{_mandir}/man1/hist2workspace.1*
-%{_mandir}/man1/prepareHistFactory.1*
-%{_libdir}/%{name}/libHistFactory.*
-%{_libdir}/%{name}/libHistFactory_rdict.pcm
-%{_datadir}/%{name}/HistFactorySchema.dtd
-%dir %{_includedir}/%{name}/RooStats/HistFactory
-%doc roofit/histfactory/doc/README
-
 %files html -f includelist-html
 %{_libdir}/%{name}/libHtml.*
 %{_libdir}/%{name}/libHtml_rdict.pcm
@@ -3539,12 +3308,10 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
-%if %{gfal2}
 %files io-gfal -f includelist-io-gfal
 %{_libdir}/%{name}/libGFAL.*
 %{_libdir}/%{name}/libGFAL_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-%endif
 
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
@@ -3701,12 +3468,13 @@ fi
 %dir %{_datadir}/%{name}/js
 %dir %{_datadir}/%{name}/js/files
 %{_datadir}/%{name}/js/files/canv_batch.htm
+%{_datadir}/%{name}/js/files/geom_batch.htm
 %{_datadir}/%{name}/js/files/web.config
 %{_datadir}/%{name}/js/files/wslist.htm
+%ghost %{_datadir}/%{name}/js/build
 %ghost %{_datadir}/%{name}/js/img
-%ghost %{_datadir}/%{name}/js/libs
+%ghost %{_datadir}/%{name}/js/modules
 %ghost %{_datadir}/%{name}/js/scripts
-%ghost %{_datadir}/%{name}/js/style
 %ghost %{_datadir}/%{name}/js/files/draw.htm
 %ghost %{_datadir}/%{name}/js/files/online.htm
 %doc net/http/README.txt net/http/civetweb/*.md
@@ -3715,11 +3483,7 @@ fi
 %{_libdir}/%{name}/libRHTTPSniff.*
 %{_libdir}/%{name}/libRHTTPSniff_rdict.pcm
 
-%files netx -f includelist-netx
-%if ! %{xrootd5}
-%{_libdir}/%{name}/libNetx.*
-%{_libdir}/%{name}/libNetx_rdict.pcm
-%endif
+%files netx -f includelist-net-netxng
 %{_libdir}/%{name}/libNetxNG.*
 %{_libdir}/%{name}/libNetxNG_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C
@@ -3769,19 +3533,7 @@ fi
 %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
 %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
 
-%if ! %{xrootd5}
-%files xproof -f includelist-proof-proofx
-%{_bindir}/proofexecv
-%{_bindir}/xproofd
-%{_mandir}/man1/xproofd.1*
-%{_libdir}/%{name}/libProofx.*
-%{_libdir}/%{name}/libProofx_rdict.pcm
-%{_libdir}/%{name}/libXrdProofd.*
-%{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C
-%{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C
-%{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C
-%endif
-
+%if %{roofit}
 %files roofit -f includelist-roofit-roofit
 %{_libdir}/%{name}/libRooFit.*
 %{_libdir}/%{name}/libRooFit_rdict.pcm
@@ -3793,9 +3545,7 @@ fi
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooFitCore_rdict.pcm
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
-%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
-%endif
 
 %files roofit-more -f includelist-roofit-roofitmore
 %{_libdir}/%{name}/libRooFitMore.*
@@ -3806,9 +3556,11 @@ fi
 %{_libdir}/%{name}/libRooBatchCompute_*
 %doc roofit/batchcompute/README.md
 
+%if %{dataframe}
 %files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
 %{_libdir}/%{name}/libRooFitRDataFrameHelpers.*
 %{_libdir}/%{name}/libRooFitRDataFrameHelpers_rdict.pcm
+%endif
 
 %files roofit-hs3 -f includelist-roofit-hs3
 %{_libdir}/%{name}/libRooFitHS3.*
@@ -3817,11 +3569,27 @@ fi
 %{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
 %doc roofit/hs3/README.md
 
+%files roofit-jsoninterface -f includelist-roofit-jsoninterface
+%{_libdir}/%{name}/libRooFitJSONInterface.*
+%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+
 %files roostats -f includelist-roofit-roostats
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
 %dir %{_includedir}/%{name}/RooStats
 
+%files hist-factory -f includelist-roofit-histfactory
+%{_bindir}/hist2workspace
+%{_bindir}/prepareHistFactory
+%{_mandir}/man1/hist2workspace.1*
+%{_mandir}/man1/prepareHistFactory.1*
+%{_libdir}/%{name}/libHistFactory.*
+%{_libdir}/%{name}/libHistFactory_rdict.pcm
+%{_datadir}/%{name}/HistFactorySchema.dtd
+%dir %{_includedir}/%{name}/RooStats/HistFactory
+%doc roofit/histfactory/doc/README
+%endif
+
 %files sql-mysql -f includelist-sql-mysql
 %{_libdir}/%{name}/libRMySQL.*
 %{_libdir}/%{name}/libRMySQL_rdict.pcm
@@ -3848,9 +3616,7 @@ fi
 %dir %{_includedir}/%{name}/TMVA
 %dir %{_includedir}/%{name}/TMVA/DNN
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures
-%if %{tbb}
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
-%endif
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
 %license tmva/doc/LICENSE
 
@@ -3882,9 +3648,11 @@ fi
 %{_libdir}/%{name}/libTree_rdict.pcm
 %doc %{_pkgdocdir}/README.SELECTOR
 
+%if %{dataframe}
 %files tree-dataframe -f includelist-tree-dataframe
 %{_libdir}/%{name}/libROOTDataFrame.*
 %{_libdir}/%{name}/libROOTDataFrame_rdict.pcm
+%endif
 
 %files tree-player -f includelist-tree-treeplayer
 %{_libdir}/%{name}/libTreePlayer.*
@@ -3897,6 +3665,11 @@ fi
 %{_libdir}/%{name}/libTreeViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
+%files tree-webviewer -f includelist-tree-webviewer
+%{_libdir}/%{name}/libROOTTreeViewer.*
+%{_libdir}/%{name}/libROOTTreeViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualTreeViewer/P020_RTreeViewer.C
+
 %files unfold -f includelist-hist-unfold
 %{_libdir}/%{name}/libUnfold.*
 %{_libdir}/%{name}/libUnfold_rdict.pcm
@@ -3919,7 +3692,6 @@ fi
 %{_datadir}/%{name}/notebook
 %doc %{_pkgdocdir}/JupyROOT-on-EPEL
 
-%if %{webgui}
 %files gui-webdisplay -f includelist-gui-webdisplay
 %{_libdir}/%{name}/libROOTWebDisplay.*
 %{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
@@ -3933,10 +3705,15 @@ fi
 %files gui-webgui6 -f includelist-gui-webgui6
 %{_libdir}/%{name}/libWebGui6.*
 %{_libdir}/%{name}/libWebGui6_rdict.pcm
-%{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
-%endif
+%{_datadir}/%{name}/plugins/TCanvasImp/P010_TWebCanvas.C
+%{_datadir}/%{name}/plugins/TControlBarImp/P010_TWebControlBar.C
 
 %if %{root7}
+%files geom-webviewer -f includelist-geom-webviewer
+%{_libdir}/%{name}/libROOTGeomViewer.*
+%{_libdir}/%{name}/libROOTGeomViewer_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P020_RGeoPainter.C
+
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
 %{_libdir}/%{name}/libROOTGpadv7.*
 %{_libdir}/%{name}/libROOTGpadv7_rdict.pcm
@@ -3948,7 +3725,6 @@ fi
 %files graf3d-eve7 -f includelist-graf3d-eve7
 %{_libdir}/%{name}/libROOTEve.*
 %{_libdir}/%{name}/libROOTEve_rdict.pcm
-%{_datadir}/%{name}/plugins/TVirtualGeoPainter/P020_REveGeoPainter.C
 
 %files gui-browsable -f includelist-gui-browsable
 %{_libdir}/%{name}/libROOTBrowsable.*
@@ -3969,6 +3745,7 @@ fi
 %{_libdir}/%{name}/libROOTBrowserGeomWidget.*
 %{_libdir}/%{name}/libROOTBrowserRCanvasWidget.*
 %{_libdir}/%{name}/libROOTBrowserTCanvasWidget.*
+%{_libdir}/%{name}/libROOTBrowserTreeWidget.*
 %{_libdir}/%{name}/libROOTBrowserWidgets.*
 %{_datadir}/%{name}/plugins/TBrowserImp/P030_RWebBrowserImp.C
 
@@ -3990,9 +3767,34 @@ fi
 %files tree-ntuple -f includelist-tree-ntuple
 %{_libdir}/%{name}/libROOTNTuple.*
 %{_libdir}/%{name}/libROOTNTuple_rdict.pcm
+
+%files tree-ntuple-utils -f includelist-tree-ntupleutil
+%{_libdir}/%{name}/libROOTNTupleUtil.*
+%{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
+
+%if %{roofit}
+%files xroofit -f includelist-roofit-xroofit
+%{_libdir}/%{name}/libRooFitXRooFit.*
+%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
+%endif
 %endif
 
 %changelog
+* Sat Mar 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.00-1
+- Update to 6.28.00
+- ROOT now uses llvm/clang version 13 (updated from version 9)
+- Clean up specfile by removing EPEL 7 conditionals
+- Drop dataframe, roofit and tmva-sofieparser on EPEL 8 ppc64le due to
+  "pure virtual method called" errors
+- Split the root-geom sub-package into three separate sub-packages:
+  root-geom, root-geom-builder and root-geom-painter
+- Enable uring support in EPEL 9 (liburing now available)
+- New sub-packages: root-geom-webviewer, root-roofit-jsoninterface,
+  root-testsupport, root-tree-ntuple-utils, root-tree-webviewer, root-xroofit
+- Dropped patches: 31
+- New patches: 17
+- Updated patches: 4
+
 * Mon Jan 30 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.10-5
 - Adapt to numpy 1.24
 
diff --git a/sources b/sources
index ef0a91f..e37c144 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.26.10.tar.xz) = 896727ce6da68871a52894a0a3c1b749fece9f08c8cefe62f5beac505710d579c41b84832a727a2ba39dab09e4456773c05b5b23a0fd859ace8062470653bbdb
+SHA512 (root-6.28.00.tar.xz) = 57e5e111e41d3942b63a9e038198e6cc91457d7724cc9dcf9673679b12b13acb6980e7786828a8527a292c018bd13af51854e83f99301f6bc5e4455cdc23c30e
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 088e995d07cf6c050f713cca636bdd81d00f47fe Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 22 Mar 2023 21:46:20 +0100
Subject: [PATCH 243/344] Update to 6.28.02

Dropped patches: 13
New patches: 1
---
 ...t-and-TMVA-pythonizations-if-enabled.patch | 117 ---------
 ...et-DataLayout-from-our-TargetMachine.patch |  32 ---
 root-Simplify-creation-of-TargetMachine.patch |  94 -------
 root-add-missing-include-cstdint.patch        |  38 ---
 ...g-Disable-outline-atomics-on-AArch64.patch |  35 ---
 ...roofit-files-when-roofit-is-disabled.patch |  75 ------
 root-gtest-compat.patch                       |  85 -------
 root-make-DistRDF-optional.patch              |  32 ---
 root-memory-usage.patch                       |  30 ---
 ...kBuf-add-missing-call-to-ReleasePage.patch |  30 ---
 ...-Speed-up-TMVA-CNN-and-RNN-tutorials.patch | 239 ------------------
 ...t-minimum-python-version-for-DistRDF.patch |  27 --
 ...istent-wording-in-tmva-test-comments.patch |  86 +++++++
 ...sts-using-clad-when-clad-is-disabled.patch |  66 -----
 root.spec                                     |  94 +++----
 sources                                       |   2 +-
 16 files changed, 117 insertions(+), 965 deletions(-)
 delete mode 100644 root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
 delete mode 100644 root-Set-DataLayout-from-our-TargetMachine.patch
 delete mode 100644 root-Simplify-creation-of-TargetMachine.patch
 delete mode 100644 root-add-missing-include-cstdint.patch
 delete mode 100644 root-cling-Disable-outline-atomics-on-AArch64.patch
 delete mode 100644 root-dont-install-roofit-files-when-roofit-is-disabled.patch
 delete mode 100644 root-gtest-compat.patch
 delete mode 100644 root-make-DistRDF-optional.patch
 delete mode 100644 root-memory-usage.patch
 delete mode 100644 root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
 delete mode 100644 root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
 delete mode 100644 root-use-consistent-minimum-python-version-for-DistRDF.patch
 create mode 100644 root-use-consistent-wording-in-tmva-test-comments.patch
 delete mode 100644 root-veto-tests-using-clad-when-clad-is-disabled.patch

diff --git a/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch b/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
deleted file mode 100644
index 0ca4387..0000000
--- a/root-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From d759a42a33fe6a9195c3c79275fe05e4da2b4195 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Sat, 14 Jan 2023 12:25:20 +0100
-Subject: [PATCH] [PyROOT] Only build RooFit and TMVA pythonizations if needed
-
-Like this, we are polluting the build and install directories less with
-unneeded files and it also speeds up the build process a bit if RooFit
-and/or TMVA are disabled. Their pythonization files don't need to be
-compiled to `.pyc` files.
----
- bindings/pyroot/pythonizations/CMakeLists.txt | 76 ++++++++++---------
- 1 file changed, 42 insertions(+), 34 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
-index 9e853d1885..8395785b24 100644
---- a/bindings/pyroot/pythonizations/CMakeLists.txt
-+++ b/bindings/pyroot/pythonizations/CMakeLists.txt
-@@ -25,6 +25,48 @@ if(dataframe)
-         inc/RNumpyDS.hxx)
- endif()
- 
-+if(roofit)
-+    list(APPEND PYROOT_EXTRA_PY2_PY3_SOURCE
-+        ROOT/_pythonization/_roofit/__init__.py
-+        ROOT/_pythonization/_roofit/_rooabscollection.py
-+        ROOT/_pythonization/_roofit/_rooabsdata.py
-+        ROOT/_pythonization/_roofit/_rooabspdf.py
-+        ROOT/_pythonization/_roofit/_rooabsreallvalue.py
-+        ROOT/_pythonization/_roofit/_rooabsreal.py
-+        ROOT/_pythonization/_roofit/_rooarglist.py
-+        ROOT/_pythonization/_roofit/_rooargset.py
-+        ROOT/_pythonization/_roofit/_roocategory.py
-+        ROOT/_pythonization/_roofit/_roochi2var.py
-+        ROOT/_pythonization/_roofit/_roodatahist.py
-+        ROOT/_pythonization/_roofit/_roodataset.py
-+        ROOT/_pythonization/_roofit/_roodecays.py
-+        ROOT/_pythonization/_roofit/_roogenfitstudy.py
-+        ROOT/_pythonization/_roofit/_rooglobalfunc.py
-+        ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
-+        ROOT/_pythonization/_roofit/_roomcstudy.py
-+        ROOT/_pythonization/_roofit/_roomsgservice.py
-+        ROOT/_pythonization/_roofit/_roonllvar.py
-+        ROOT/_pythonization/_roofit/_rooprodpdf.py
-+        ROOT/_pythonization/_roofit/_roorealvar.py
-+        ROOT/_pythonization/_roofit/_roosimultaneous.py
-+        ROOT/_pythonization/_roofit/_roosimwstool.py
-+        ROOT/_pythonization/_roofit/_roovectordatastore.py
-+        ROOT/_pythonization/_roofit/_rooworkspace.py
-+        ROOT/_pythonization/_roofit/_utils.py)
-+endif()
-+
-+if(tmva)
-+    list(APPEND PYROOT_EXTRA_PY2_PY3_SOURCE
-+        ROOT/_pythonization/_tmva/_crossvalidation.py
-+        ROOT/_pythonization/_tmva/_dataloader.py
-+        ROOT/_pythonization/_tmva/_factory.py
-+        ROOT/_pythonization/_tmva/__init__.py
-+        ROOT/_pythonization/_tmva/_rbdt.py
-+        ROOT/_pythonization/_tmva/_rtensor.py
-+        ROOT/_pythonization/_tmva/_tree_inference.py
-+        ROOT/_pythonization/_tmva/_utils.py)
-+endif()
-+
- list(APPEND PYROOT_EXTRA_HEADERS
-      inc/TPyDispatcher.h)
- 
-@@ -39,32 +81,6 @@ set(py2_py3_sources
-   ROOT/_pythonization/_generic.py
-   ROOT/_pythonization/__init__.py
-   ROOT/_pythonization/_pyz_utils.py
--  ROOT/_pythonization/_roofit/__init__.py
--  ROOT/_pythonization/_roofit/_rooabscollection.py
--  ROOT/_pythonization/_roofit/_rooabsdata.py
--  ROOT/_pythonization/_roofit/_rooabspdf.py
--  ROOT/_pythonization/_roofit/_rooabsreallvalue.py
--  ROOT/_pythonization/_roofit/_rooabsreal.py
--  ROOT/_pythonization/_roofit/_rooarglist.py
--  ROOT/_pythonization/_roofit/_rooargset.py
--  ROOT/_pythonization/_roofit/_roocategory.py
--  ROOT/_pythonization/_roofit/_roochi2var.py
--  ROOT/_pythonization/_roofit/_roodatahist.py
--  ROOT/_pythonization/_roofit/_roodataset.py
--  ROOT/_pythonization/_roofit/_roodecays.py
--  ROOT/_pythonization/_roofit/_roogenfitstudy.py
--  ROOT/_pythonization/_roofit/_rooglobalfunc.py
--  ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
--  ROOT/_pythonization/_roofit/_roomcstudy.py
--  ROOT/_pythonization/_roofit/_roomsgservice.py
--  ROOT/_pythonization/_roofit/_roonllvar.py
--  ROOT/_pythonization/_roofit/_rooprodpdf.py
--  ROOT/_pythonization/_roofit/_roorealvar.py
--  ROOT/_pythonization/_roofit/_roosimultaneous.py
--  ROOT/_pythonization/_roofit/_roosimwstool.py
--  ROOT/_pythonization/_roofit/_roovectordatastore.py
--  ROOT/_pythonization/_roofit/_rooworkspace.py
--  ROOT/_pythonization/_roofit/_utils.py
-   ROOT/_pythonization/_rvec.py
-   ROOT/_pythonization/_stl_vector.py
-   ROOT/_pythonization/_tarray.py
-@@ -79,14 +95,6 @@ set(py2_py3_sources
-   ROOT/_pythonization/_tgraph.py
-   ROOT/_pythonization/_th1.py
-   ROOT/_pythonization/_titer.py
--  ROOT/_pythonization/_tmva/_crossvalidation.py
--  ROOT/_pythonization/_tmva/_dataloader.py
--  ROOT/_pythonization/_tmva/_factory.py
--  ROOT/_pythonization/_tmva/__init__.py
--  ROOT/_pythonization/_tmva/_rbdt.py
--  ROOT/_pythonization/_tmva/_rtensor.py
--  ROOT/_pythonization/_tmva/_tree_inference.py
--  ROOT/_pythonization/_tmva/_utils.py
-   ROOT/_pythonization/_tobject.py
-   ROOT/_pythonization/_tobjstring.py
-   ROOT/_pythonization/_tseqcollection.py
--- 
-2.39.2
-
diff --git a/root-Set-DataLayout-from-our-TargetMachine.patch b/root-Set-DataLayout-from-our-TargetMachine.patch
deleted file mode 100644
index d936302..0000000
--- a/root-Set-DataLayout-from-our-TargetMachine.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d4c66a41ae50ecfb905ebe66eb296de4e5c146d7 Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Thu, 16 Feb 2023 16:40:16 +0100
-Subject: [PATCH 2/2] [cling] Set DataLayout from our TargetMachine
-
-Otherwise LLJIT's constructor will ask the LLJITBuilder's JTMB to
-create a DataLayout. As we don't propagate the JTMB (yet -- we
-probably should!), this will be wrong if target features influence
-the DataLayout.
-
-This should fix #12293.
-
-(cherry picked from commit 254bac6cfad78ed671ec3af3d2001c52487b4c86)
----
- interpreter/cling/lib/Interpreter/IncrementalJIT.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-index 80b6761491..e1721a4d45 100644
---- a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-+++ b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-@@ -358,6 +358,7 @@ IncrementalJIT::IncrementalJIT(
-   ErrorAsOutParameter _(&Err);
- 
-   LLJITBuilder Builder;
-+  Builder.setDataLayout(TM->createDataLayout());
-   Builder.setExecutorProcessControl(std::move(EPC));
- 
-   // Create ObjectLinkingLayer with our own MemoryManager.
--- 
-2.39.2
-
diff --git a/root-Simplify-creation-of-TargetMachine.patch b/root-Simplify-creation-of-TargetMachine.patch
deleted file mode 100644
index 8eaa5d8..0000000
--- a/root-Simplify-creation-of-TargetMachine.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 63d16de24e695a847274fa3044127cefffc7b0b6 Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Fri, 3 Feb 2023 11:52:22 +0100
-Subject: [PATCH 1/2] [cling] Simplify creation of TargetMachine
-
-We know exactly which target triple and features the CompilerInstance
-wants, we don't need to (and probably must not) second-guess that. This
-brings us closer to upstream clang-repl and also includes the change of
-https://reviews.llvm.org/D128853 which is crucial for RISC-V.
-
-(cherry picked from commit df0905c499a541eaac3be63c0455a07946022983)
----
- .../cling/lib/Interpreter/IncrementalJIT.cpp  | 34 ++++++-------------
- 1 file changed, 11 insertions(+), 23 deletions(-)
-
-diff --git a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-index 5342945ed1..80b6761491 100644
---- a/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-+++ b/interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
-@@ -15,6 +15,7 @@
- #include "cling/Utils/Output.h"
- #include "cling/Utils/Utils.h"
- 
-+#include <clang/Basic/TargetInfo.h>
- #include <clang/Basic/TargetOptions.h>
- #include <clang/Frontend/CompilerInstance.h>
- 
-@@ -292,45 +293,32 @@ Error RTDynamicLibrarySearchGenerator::tryToGenerate(
- }
- 
- static std::unique_ptr<TargetMachine>
--CreateHostTargetMachine(const clang::CompilerInstance& CI) {
--  const clang::TargetOptions& TargetOpts = CI.getTargetOpts();
--  const clang::CodeGenOptions& CGOpt = CI.getCodeGenOpts();
--  const std::string& Triple = TargetOpts.Triple;
--
--  std::string Error;
--  const Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error);
--  if (!TheTarget) {
--    cling::errs() << "cling::IncrementalExecutor: unable to find target:\n"
--                  << Error;
--    return std::unique_ptr<TargetMachine>();
--  }
--
-+CreateTargetMachine(const clang::CompilerInstance& CI) {
-   CodeGenOpt::Level OptLevel = CodeGenOpt::Default;
--  switch (CGOpt.OptimizationLevel) {
-+  switch (CI.getCodeGenOpts().OptimizationLevel) {
-     case 0: OptLevel = CodeGenOpt::None; break;
-     case 1: OptLevel = CodeGenOpt::Less; break;
-     case 2: OptLevel = CodeGenOpt::Default; break;
-     case 3: OptLevel = CodeGenOpt::Aggressive; break;
-     default: OptLevel = CodeGenOpt::Default;
-   }
-+
-   using namespace llvm::orc;
--  auto JTMB = JITTargetMachineBuilder::detectHost();
--  if (!JTMB)
--    logAllUnhandledErrors(JTMB.takeError(), llvm::errs(),
--                          "Error detecting host");
-+  auto JTMB = JITTargetMachineBuilder(CI.getTarget().getTriple());
-+  JTMB.addFeatures(CI.getTargetOpts().Features);
- 
--  JTMB->setCodeGenOptLevel(OptLevel);
-+  JTMB.setCodeGenOptLevel(OptLevel);
- #ifdef _WIN32
--  JTMB->getOptions().EmulatedTLS = false;
-+  JTMB.getOptions().EmulatedTLS = false;
- #endif // _WIN32
- 
- #if defined(__powerpc64__) || defined(__PPC64__)
-   // We have to use large code model for PowerPC64 because TOC and text sections
-   // can be more than 2GB apart.
--  JTMB->setCodeModel(CodeModel::Large);
-+  JTMB.setCodeModel(CodeModel::Large);
- #endif
- 
--  std::unique_ptr<TargetMachine> TM = cantFail(JTMB->createTargetMachine());
-+  std::unique_ptr<TargetMachine> TM = cantFail(JTMB.createTargetMachine());
- 
-   // Forcefully disable GlobalISel, it might be enabled on AArch64 without
-   // optimizations. In tests on an Apple M1 after the upgrade to LLVM 9, this
-@@ -365,7 +353,7 @@ IncrementalJIT::IncrementalJIT(
-     std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC, Error& Err,
-     void *ExtraLibHandle, bool Verbose)
-     : SkipHostProcessLookup(false),
--      TM(CreateHostTargetMachine(CI)),
-+      TM(CreateTargetMachine(CI)),
-       SingleThreadedContext(std::make_unique<LLVMContext>()) {
-   ErrorAsOutParameter _(&Err);
- 
--- 
-2.39.2
-
diff --git a/root-add-missing-include-cstdint.patch b/root-add-missing-include-cstdint.patch
deleted file mode 100644
index 0572ac3..0000000
--- a/root-add-missing-include-cstdint.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 87d302b9192538e18645f4c3efadc70e9a20a913 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 20 Jan 2023 06:34:11 +0100
-Subject: [PATCH] Add missing #include <cstdint>
-
-Fixes compilation error with gcc 13
----
- tree/ntuple/v7/inc/ROOT/RDaos.hxx    | 1 +
- tree/ntuple/v7/test/CustomStruct.hxx | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/tree/ntuple/v7/inc/ROOT/RDaos.hxx b/tree/ntuple/v7/inc/ROOT/RDaos.hxx
-index 69ee9ba99d..6367dfa93f 100644
---- a/tree/ntuple/v7/inc/ROOT/RDaos.hxx
-+++ b/tree/ntuple/v7/inc/ROOT/RDaos.hxx
-@@ -22,6 +22,7 @@
- 
- #include <daos.h>
- 
-+#include <cstdint>
- #include <functional>
- #include <memory>
- #include <string>
-diff --git a/tree/ntuple/v7/test/CustomStruct.hxx b/tree/ntuple/v7/test/CustomStruct.hxx
-index a975b5ce5d..be08eba924 100644
---- a/tree/ntuple/v7/test/CustomStruct.hxx
-+++ b/tree/ntuple/v7/test/CustomStruct.hxx
-@@ -1,6 +1,7 @@
- #ifndef ROOT7_RNTuple_Test_CustomStruct
- #define ROOT7_RNTuple_Test_CustomStruct
- 
-+#include <cstdint>
- #include <string>
- #include <variant>
- #include <vector>
--- 
-2.39.1
-
diff --git a/root-cling-Disable-outline-atomics-on-AArch64.patch b/root-cling-Disable-outline-atomics-on-AArch64.patch
deleted file mode 100644
index ca00e5f..0000000
--- a/root-cling-Disable-outline-atomics-on-AArch64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ddf9a8c3d113e3a3d48dbe13b6b4a6bf2338fb7a Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Mon, 20 Feb 2023 10:08:00 +0100
-Subject: [PATCH] [cling] Disable outline-atomics on AArch64
-
-The routines __aarch64_* are defined in the static library libgcc.a
-and not necessarily included in libCling or otherwise present in the
-process, so the interpreter has a hard time finding them.
-
-Fixes #12294
----
- interpreter/cling/lib/Interpreter/CIFactory.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
-index b135bf21aa..b5b5df2e8e 100644
---- a/interpreter/cling/lib/Interpreter/CIFactory.cpp
-+++ b/interpreter/cling/lib/Interpreter/CIFactory.cpp
-@@ -1254,6 +1254,13 @@ namespace {
- #if __APPLE__ && __arm64__
-     argvCompile.push_back("--target=arm64-apple-darwin20.3.0");
- #endif
-+#if __aarch64__
-+    // Disable outline-atomics on AArch64; the routines __aarch64_* are defined
-+    // in the static library libgcc.a and not necessarily included in libCling
-+    // or otherwise present in the process, so the interpreter has a hard time
-+    // finding them.
-+    argvCompile.push_back("-mno-outline-atomics");
-+#endif
- 
-     // Variables for storing the memory of the C-string arguments.
-     // FIXME: We shouldn't use C-strings in the first place, but just use
--- 
-2.39.2
-
diff --git a/root-dont-install-roofit-files-when-roofit-is-disabled.patch b/root-dont-install-roofit-files-when-roofit-is-disabled.patch
deleted file mode 100644
index 7b4881d..0000000
--- a/root-dont-install-roofit-files-when-roofit-is-disabled.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From df636dcc05d0284f39427ea5be1d72e7faca90d8 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 1 Mar 2023 18:30:35 +0100
-Subject: [PATCH] Don't install roofit files when roofit is disabled
-
----
- CMakeLists.txt           | 14 ++++++++++++--
- build/CMakeLists.txt     |  3 +++
- core/base/CMakeLists.txt |  2 ++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1d998fde2..7992e27b64 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -591,7 +591,14 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-   else()
-     install(DIRECTORY README DESTINATION ${CMAKE_INSTALL_DOCDIR})
-   endif()
-+  set(ETC_PATT_EXCL)
-+  if(NOT roofit)
-+    list(APPEND ETC_PATT_EXCL PATTERN HistFactorySchema.dtd EXCLUDE)
-+    list(APPEND ETC_PATT_EXCL PATTERN RooFitHS3_wsexportkeys.json EXCLUDE)
-+    list(APPEND ETC_PATT_EXCL PATTERN RooFitHS3_wsfactoryexpressions.json EXCLUDE)
-+  endif()
-   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
-+                         ${ETC_PATT_EXCL}
-                          PATTERN "system.rootrc" EXCLUDE
-                          PATTERN "system.rootauthrc" EXCLUDE
-                          PATTERN "system.rootdaemonrc" EXCLUDE
-@@ -612,8 +619,11 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-      set(MAN_PATT_EXCL PATTERN xproofd.1 EXCLUDE)
-   endif()
-   if(NOT fortran OR NOT CMAKE_Fortran_COMPILER)
--    set(MAN_PATT_EXCL ${MAN_PATT_EXCL} PATTERN h2root.1 EXCLUDE)
--    set(MAN_PATT_EXCL ${MAN_PATT_EXCL} PATTERN g2root.1 EXCLUDE)
-+    list(APPEND MAN_PATT_EXCL PATTERN h2root.1 EXCLUDE)
-+    list(APPEND MAN_PATT_EXCL PATTERN g2root.1 EXCLUDE)
-+  endif()
-+  if(NOT roofit)
-+    list(APPEND MAN_PATT_EXCL PATTERN prepareHistFactory.1 EXCLUDE)
-   endif()
-   install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR} ${MAN_PATT_EXCL})
-   install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index 9f60c813ac..e964b5e255 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -29,6 +29,9 @@ ROOT_EXECUTABLE(rmkdepend
- 
- if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
-   file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
-+  if(NOT roofit)
-+    list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
-+  endif()
-   set(PRETTY_PRINTER_DESTS)
-   foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
-     get_filename_component(PRETTY_PRINTER_DEST ${PRETTY_PRINTER} NAME)
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index 0c9df7c896..df701fedea 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -224,7 +224,9 @@ if(NOT MSVC)
- #---addRootC++CmdMan-------------------------------------------------------------------------
- generateManual(rootMan ${CMAKE_CURRENT_SOURCE_DIR}/src/root-argparse.py ${CMAKE_BINARY_DIR}/man/root.1)
- generateManual(haddMan ${CMAKE_SOURCE_DIR}/main/src/hadd-argparse.py ${CMAKE_BINARY_DIR}/man/hadd.1)
-+if (roofit)
- generateManual(hist2workspaceMan ${CMAKE_SOURCE_DIR}/roofit/histfactory/src/hist2workspace-argparse.py ${CMAKE_BINARY_DIR}/man/hist2workspace.1)
-+endif()
- generateManual(rootclingMan ${CMAKE_SOURCE_DIR}/core/dictgen/src/rootcling-argparse.py ${CMAKE_BINARY_DIR}/man/rootcling.1)
- 
- #---addRootPyCmdMan---------------------------------------------------------------------------
--- 
-2.39.2
-
diff --git a/root-gtest-compat.patch b/root-gtest-compat.patch
deleted file mode 100644
index 4dd4b58..0000000
--- a/root-gtest-compat.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 922290ebdc5e3363adfa82dd45208862bb01630a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 8 Feb 2023 09:50:00 +0100
-Subject: [PATCH] Fix build with -Dbuiltin_gtest:BOOL=OFF on EPEL 8
-
----
- roofit/roofitcore/test/testRooBinSamplingPdf.cxx | 7 ++++++-
- roofit/roofitcore/test/testRooProdPdf.cxx        | 5 +++++
- roofit/roofitcore/test/testRooRealIntegral.cxx   | 5 +++++
- roofit/roofitcore/test/testTestStatistics.cxx    | 2 +-
- 4 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
-index 823fef712f..116000f9f8 100644
---- a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
-+++ b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
-@@ -13,6 +13,11 @@
- 
- #include <gtest/gtest.h>
- 
-+// Backward compatibility for gtest version < 1.10.0
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <memory>
- 
- class ParamTest : public testing::TestWithParam<std::tuple<std::string>> {
-@@ -123,7 +128,7 @@ TEST(RooBinSamplingPdf, CheckConsistentNormalization)
-    EXPECT_FLOAT_EQ(int2->getVal(), int3->getVal());
- }
- 
--INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Combine(testing::Values("Off", "Cpu")),
-+INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Values("Off", "Cpu"),
-                          [](testing::TestParamInfo<ParamTest::ParamType> const &paramInfo) {
-                             std::stringstream ss;
-                             ss << "BatchMode" << std::get<0>(paramInfo.param);
-diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
-index 86bcf6eb48..d794fb415a 100644
---- a/roofit/roofitcore/test/testRooProdPdf.cxx
-+++ b/roofit/roofitcore/test/testRooProdPdf.cxx
-@@ -16,6 +16,11 @@
- 
- #include <gtest/gtest.h>
- 
-+// Backward compatibility for gtest version < 1.10.0
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <memory>
- #include <sstream>
- #include <string>
-diff --git a/roofit/roofitcore/test/testRooRealIntegral.cxx b/roofit/roofitcore/test/testRooRealIntegral.cxx
-index c33c6ae138..0ab6ab973f 100644
---- a/roofit/roofitcore/test/testRooRealIntegral.cxx
-+++ b/roofit/roofitcore/test/testRooRealIntegral.cxx
-@@ -20,6 +20,11 @@
- 
- #include <gtest/gtest.h>
- 
-+// Backward compatibility for gtest version < 1.10.0
-+#ifndef INSTANTIATE_TEST_SUITE_P
-+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#endif
-+
- #include <memory>
- 
- namespace {
-diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
-index dc20b4e1c9..1623637653 100644
---- a/roofit/roofitcore/test/testTestStatistics.cxx
-+++ b/roofit/roofitcore/test/testTestStatistics.cxx
-@@ -490,7 +490,7 @@ TEST_P(OffsetBinTest, CrossCheck)
-    EXPECT_NEAR(nllVal1, 0.0, 1e-8) << "NLL with bin offsetting is " << nllVal1 << ", and " << nllVal0 << " without it.";
- }
- 
--INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Combine(testing::Values("Off", "Cpu")),
-+INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values("Off", "Cpu"),
-                          [](testing::TestParamInfo<TestStatisticTest::ParamType> const &paramInfo) {
-                             std::stringstream ss;
-                             ss << "BatchMode" << std::get<0>(paramInfo.param);
--- 
-2.39.1
-
diff --git a/root-make-DistRDF-optional.patch b/root-make-DistRDF-optional.patch
deleted file mode 100644
index 653e14e..0000000
--- a/root-make-DistRDF-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 90e7f868bc115da821c0f04dbafd80ef72e7490a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 2 Mar 2023 08:31:29 +0100
-Subject: [PATCH 2/2] Missing experimental add-on module
- ROOT.RDF.Experimental.Distributed (DistRDF) should not fail the loading of
- the rest of the ROOT.RDF namespace.
-
----
- bindings/pyroot/pythonizations/python/ROOT/_facade.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-index 865321e713..69046fc71c 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-@@ -336,8 +336,11 @@ class ROOTFacade(types.ModuleType):
-             ns.FromNumpy = MakeNumpyDataFrame
- 
-             if sys.version_info >= (3, 8):
--                # Inject Experimental.Distributed package into namespace RDF
--                ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
-+                try:
-+                    # Inject Experimental.Distributed package into namespace RDF if available
-+                    ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
-+                except ImportError:
-+                    pass
-         except:
-             raise Exception('Failed to pythonize the namespace RDF')
-         del type(self).RDF
--- 
-2.39.2
-
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
deleted file mode 100644
index 713d565..0000000
--- a/root-memory-usage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5618a02bd7ca4107f545e07a19b8a0762f31e45a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 16 Aug 2021 19:45:00 +0200
-Subject: [PATCH] Reduce memory usage for all builds - not only debug builds
-
----
- core/metacling/src/CMakeLists.txt | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index 8cbbe4ba08..f205b24602 100644
---- a/core/metacling/src/CMakeLists.txt
-+++ b/core/metacling/src/CMakeLists.txt
-@@ -107,11 +107,8 @@ ROOT_LINKER_LIBRARY(Cling
-         $<TARGET_OBJECTS:MetaCling>
-         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
- 
--string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
--if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
--  # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
--  add_dependencies(Cling rootcling_stage1)
--endif()
-+# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
-+add_dependencies(Cling rootcling_stage1)
- 
- if(MSVC)
-   set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
--- 
-2.35.1
-
diff --git a/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch b/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
deleted file mode 100644
index c833930..0000000
--- a/root-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4ab2a1695a3f6350b454203c044db5d6f0c75dd2 Mon Sep 17 00:00:00 2001
-From: Javier Lopez-Gomez <javier.lopez.gomez@cern.ch>
-Date: Mon, 13 Feb 2023 15:05:39 +0100
-Subject: [PATCH] [ntuple] RPageSinkBuf: add missing call to ReleasePage()
-
----
- tree/ntuple/v7/src/RPageSinkBuf.cxx | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tree/ntuple/v7/src/RPageSinkBuf.cxx b/tree/ntuple/v7/src/RPageSinkBuf.cxx
-index b22ef705ef..88babb456f 100644
---- a/tree/ntuple/v7/src/RPageSinkBuf.cxx
-+++ b/tree/ntuple/v7/src/RPageSinkBuf.cxx
-@@ -106,8 +106,11 @@ ROOT::Experimental::Detail::RPageSinkBuf::CommitClusterImpl(ROOT::Experimental::
-       }
-       fInnerSink->CommitSealedPageV(toCommit);
- 
--      for (auto &bufColumn : fBufferedColumns)
--         bufColumn.DrainBufferedPages();
-+      for (auto &bufColumn : fBufferedColumns) {
-+         auto drained = bufColumn.DrainBufferedPages();
-+         for (auto &bufPage : std::get<std::deque<RColumnBuf::RPageZipItem>>(drained))
-+            ReleasePage(bufPage.fPage);
-+      }
-       return fInnerSink->CommitCluster(nEntries);
-    }
- 
--- 
-2.39.2
-
diff --git a/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch b/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
deleted file mode 100644
index 6a719c5..0000000
--- a/root-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 54a05a995bef827413d69b63559494a78ed56946 Mon Sep 17 00:00:00 2001
-From: moneta <lorenzo.moneta@cern.ch>
-Date: Tue, 14 Feb 2023 11:00:44 +0100
-Subject: [PATCH] [tmva] Speed up TMVA CNN and RNN tutorials
-
-Run tutorials with a amximum of 4 threads to avoid MT problems on some machines.
-Disable also OpenMP when running in MT in ROOT
-
-Reduce also by a factor of 5 the number of input events
----
- tutorials/tmva/TMVA_CNN_Classification.C  | 25 +++++++++++++++-------
- tutorials/tmva/TMVA_CNN_Classification.py | 12 +++++------
- tutorials/tmva/TMVA_RNN_Classification.C  | 11 +++++-----
- tutorials/tmva/TMVA_RNN_Classification.py | 26 ++++++++++-------------
- 4 files changed, 39 insertions(+), 35 deletions(-)
-
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index 0966017ae2..cc6829a24d 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.C
-+++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -107,7 +107,16 @@ void MakeImagesTree(int n, int nh, int nw)
-    f.Close();
- }
- 
--void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
-+/// @brief Run the TMVA CNN Classification example
-+/// @param nevts : number of signal/background events. Use by default a low value (1000)
-+///                but increase to at least 5000 to get a good result
-+/// @param opt :   vector of bool with method used (default all on if available). The order is:
-+///                   - TMVA CNN
-+///                   - Keras CNN
-+///                   - TMVA DNN
-+///                   - TMVA BDT
-+///                   - PyTorch CNN
-+void TMVA_CNN_Classification(int nevts = 1000, std::vector<bool> opt = {1, 1, 1, 1, 1})
- {
- 
-    bool useTMVACNN = (opt.size() > 0) ? opt[0] : false;
-@@ -125,17 +134,17 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
- 
-    bool writeOutputFile = true;
- 
--   int num_threads = 0;  // use default threads
-+   int num_threads = 4;  // use by default 4 threads if value is not set before
-+   // switch off MT in OpenBLAS to avoid conflict with tbb
-+   gSystem->Setenv("OMP_NUM_THREADS", "1");
- 
-    TMVA::Tools::Instance();
- 
-    // do enable MT running
-    if (num_threads >= 0) {
-       ROOT::EnableImplicitMT(num_threads);
--      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
-    }
--   else
--      gSystem->Setenv("OMP_NUM_THREADS", "1");
-+
- 
-    std::cout << "Running with nthreads  = " << ROOT::GetThreadPoolSize() << std::endl;
- 
-@@ -161,7 +170,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
-     The factory is the major TMVA object you have to interact with. Here is the list of parameters you need to pass
- 
-     - The first argument is the base of the name of all the output
--    weightfiles in the directory weight/ that will be created with the
-+    weight files in the directory weight/ that will be created with the
-     method parameters
- 
-     - The second argument is the output file for the training results
-@@ -208,7 +217,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
- 
-    // if file does not exists create it
-    if (!fileExist) {
--      MakeImagesTree(5000, 16, 16);
-+      MakeImagesTree(nevts, 16, 16);
-    }
- 
-    // TString inputFileName = "tmva_class_example.root";
-@@ -289,7 +298,7 @@ void TMVA_CNN_Classification(std::vector<bool> opt = {1, 1, 1, 1, 1})
-    // Boosted Decision Trees
-    if (useTMVABDT) {
-       factory.BookMethod(loader, TMVA::Types::kBDT, "BDT",
--                         "!V:NTrees=400:MinNodeSize=2.5%:MaxDepth=2:BoostType=AdaBoost:AdaBoostBeta=0.5:"
-+                         "!V:NTrees=200:MinNodeSize=2.5%:MaxDepth=2:BoostType=AdaBoost:AdaBoostBeta=0.5:"
-                          "UseBaggedBoost:BaggedSampleFraction=0.5:SeparationType=GiniIndex:nCuts=20");
-    }
-    /**
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.py b/tutorials/tmva/TMVA_CNN_Classification.py
-index 0760bacfd9..85fde20763 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.py
-+++ b/tutorials/tmva/TMVA_CNN_Classification.py
-@@ -25,6 +25,9 @@
- 
- import ROOT
- 
-+#switch off MT in OpenMP (BLAS)
-+ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
-+
- TMVA = ROOT.TMVA
- TFile = ROOT.TFile
- 
-@@ -105,6 +108,7 @@ def MakeImagesTree(n, nh, nw):
- hasGPU = ROOT.gSystem.GetFromPipe("root-config --has-tmva-gpu") == "yes"
- hasCPU = ROOT.gSystem.GetFromPipe("root-config --has-tmva-cpu") == "yes"
- 
-+nevt = 1000    # use a larger value to get better results
- opt = [1, 1, 1, 1, 1]
- useTMVACNN = opt[0] if len(opt) > 0  else False
- useKerasCNN = opt[1] if len(opt) > 1 else False
-@@ -141,17 +145,13 @@ if not useTMVACNN:
- 
- writeOutputFile = True
- 
--num_threads = 0  # use default threads
-+num_threads = 4  # use default threads
- max_epochs = 10  # maximum number of epochs used for training
- 
- 
- # do enable MT running
- if num_threads >= 0:
-     ROOT.EnableImplicitMT(num_threads)
--    if (num_threads > 0) :
--        ROOT.gSystem.Setenv("OMP_NUM_THREADS", str(num_threads))
--else:
--    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
- 
- print("Running with nthreads  = ", ROOT.GetThreadPoolSize())
- 
-@@ -218,7 +218,7 @@ inputFileName = "images_data_16x16.root"
- 
- # if the input file does not exist create it
- if ROOT.gSystem.AccessPathName(inputFileName):
--    MakeImagesTree(5000, 16, 16)
-+    MakeImagesTree(nevt, 16, 16)
- 
- inputFile = TFile.Open(inputFileName)
- if inputFile is None:
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
-index 2711673ec9..8701ba6c19 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.C
-+++ b/tutorials/tmva/TMVA_RNN_Classification.C
-@@ -136,13 +136,14 @@ void MakeTimeData(int n, int ntime, int ndim )
-    }
- }
- /// macro for performing a classification using a Recurrent Neural Network
-+/// @param nevts = 2000  Number of events used. (increase for better classification results)
- /// @param use_type
- ///    use_type = 0    use Simple RNN network
- ///    use_type = 1    use LSTM network
- ///    use_type = 2    use GRU
- ///    use_type = 3    build 3 different networks with RNN, LSTM and GRU
- 
--void TMVA_RNN_Classification(int use_type = 1)
-+void TMVA_RNN_Classification(int nevts = 2000, int use_type = 1)
- {
- 
-    const int ninput = 30;
-@@ -150,7 +151,7 @@ void TMVA_RNN_Classification(int use_type = 1)
-    const int batchSize = 100;
-    const int maxepochs = 20;
- 
--   int nTotEvts = 10000; // total events to be generated for signal or background
-+   int nTotEvts = nevts; // total events to be generated for signal or background
- 
-    bool useKeras = true;
- 
-@@ -190,14 +191,12 @@ void TMVA_RNN_Classification(int use_type = 1)
-    useKeras = false;
- #endif
- 
--   int num_threads = 0;   // use by default all threads
-+   int num_threads = 4;   // use by default all threads
-+   gSystem->Setenv("OMP_NUM_THREADS", "1"); // switch off MT in OpenBLAS
-    // do enable MT running
-    if (num_threads >= 0) {
-       ROOT::EnableImplicitMT(num_threads);
--      if (num_threads > 0) gSystem->Setenv("OMP_NUM_THREADS", TString::Format("%d",num_threads));
-    }
--   else
--      gSystem->Setenv("OMP_NUM_THREADS", "1");
- 
-    TMVA::Config::Instance();
- 
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.py b/tutorials/tmva/TMVA_RNN_Classification.py
-index 88280a5849..625a120b3d 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.py
-+++ b/tutorials/tmva/TMVA_RNN_Classification.py
-@@ -22,6 +22,16 @@
- 
- import ROOT
- 
-+num_threads = 4  # use max 4 threads
-+# do enable MT running
-+if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
-+    ROOT.EnableImplicitMT(num_threads)
-+    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")  # switch OFF MT in OpenBLAS
-+    print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
-+else:
-+    print("Running in serail mode since ROOT does not support MT")
-+
-+
- TMVA = ROOT.TMVA
- TFile = ROOT.TFile
- 
-@@ -141,7 +151,7 @@ ntime = 10
- batchSize = 100
- maxepochs = 10
- 
--nTotEvts = 10000  # total events to be generated for signal or background
-+nTotEvts = 2000  # total events to be generated for signal or background
- 
- useKeras = True
- 
-@@ -184,22 +194,8 @@ if ROOT.gSystem.GetFromPipe("root-config --has-tmva-pymva") == "yes":
- else:
-     useKeras = False
- 
--num_threads = 0  # use by default all threads
--# do enable MT running
--if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
--    if num_threads >= 0:
--        ROOT.EnableImplicitMT(num_threads)
--        if num_threads > 0:
--            ROOT.gSystem.Setenv("OMP_NUM_THREADS", str(num_threads))
--    else:
--        ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
- 
- 
--    print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
--
--else:
--    print("Running in serail mode since ROOT does not support MT")
--
- inputFileName = "time_data_t10_d30.root"
- 
- fileDoesNotExist = ROOT.gSystem.AccessPathName(inputFileName)
--- 
-2.39.2
-
diff --git a/root-use-consistent-minimum-python-version-for-DistRDF.patch b/root-use-consistent-minimum-python-version-for-DistRDF.patch
deleted file mode 100644
index 23e9e5c..0000000
--- a/root-use-consistent-minimum-python-version-for-DistRDF.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8624d1c7eb4f532d6843118251d9564650f89924 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 2 Mar 2023 08:25:36 +0100
-Subject: [PATCH 1/2] Use consistent minimum Python version for DistRDF The
- minimum version was changed in bindings/CMakeLists.txt but not in the check
- in the code.
-
----
- bindings/pyroot/pythonizations/python/ROOT/_facade.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-index 7370a234d1..865321e713 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
-@@ -335,7 +335,7 @@ class ROOTFacade(types.ModuleType):
-             ns.MakeNumpyDataFrame = DeprecatedMakeNumpy
-             ns.FromNumpy = MakeNumpyDataFrame
- 
--            if sys.version_info >= (3, 7):
-+            if sys.version_info >= (3, 8):
-                 # Inject Experimental.Distributed package into namespace RDF
-                 ns.Experimental.Distributed = _create_rdf_experimental_distributed_module(ns.Experimental)
-         except:
--- 
-2.39.2
-
diff --git a/root-use-consistent-wording-in-tmva-test-comments.patch b/root-use-consistent-wording-in-tmva-test-comments.patch
new file mode 100644
index 0000000..1d3e52a
--- /dev/null
+++ b/root-use-consistent-wording-in-tmva-test-comments.patch
@@ -0,0 +1,86 @@
+From e6928c405fe1647a0ee6ea32543b18ebc3828227 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 23 Feb 2023 22:10:46 +0100
+Subject: [PATCH] Use consistent wording of the comments in the different TMVA
+ classification tests to avoid confusion.
+
+---
+ tutorials/tmva/TMVA_CNN_Classification.C  | 2 +-
+ tutorials/tmva/TMVA_CNN_Classification.py | 4 ++--
+ tutorials/tmva/TMVA_RNN_Classification.C  | 6 ++++--
+ tutorials/tmva/TMVA_RNN_Classification.py | 5 +++--
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
+index cc6829a24d..db5af784d4 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.C
++++ b/tutorials/tmva/TMVA_CNN_Classification.C
+@@ -134,7 +134,7 @@ void TMVA_CNN_Classification(int nevts = 1000, std::vector<bool> opt = {1, 1, 1,
+ 
+    bool writeOutputFile = true;
+ 
+-   int num_threads = 4;  // use by default 4 threads if value is not set before
++   int num_threads = 4; // use max 4 threads
+    // switch off MT in OpenBLAS to avoid conflict with tbb
+    gSystem->Setenv("OMP_NUM_THREADS", "1");
+ 
+diff --git a/tutorials/tmva/TMVA_CNN_Classification.py b/tutorials/tmva/TMVA_CNN_Classification.py
+index 85fde20763..5d3c6e7220 100644
+--- a/tutorials/tmva/TMVA_CNN_Classification.py
++++ b/tutorials/tmva/TMVA_CNN_Classification.py
+@@ -25,7 +25,7 @@
+ 
+ import ROOT
+ 
+-#switch off MT in OpenMP (BLAS)
++# switch off MT in OpenBLAS to avoid conflict with tbb
+ ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
+ 
+ TMVA = ROOT.TMVA
+@@ -145,7 +145,7 @@ if not useTMVACNN:
+ 
+ writeOutputFile = True
+ 
+-num_threads = 4  # use default threads
++num_threads = 4  # use max 4 threads
+ max_epochs = 10  # maximum number of epochs used for training
+ 
+ 
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
+index 8701ba6c19..d4bb7a4e4a 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.C
++++ b/tutorials/tmva/TMVA_RNN_Classification.C
+@@ -191,8 +191,10 @@ void TMVA_RNN_Classification(int nevts = 2000, int use_type = 1)
+    useKeras = false;
+ #endif
+ 
+-   int num_threads = 4;   // use by default all threads
+-   gSystem->Setenv("OMP_NUM_THREADS", "1"); // switch off MT in OpenBLAS
++   int num_threads = 4; // use max 4 threads
++   // switch off MT in OpenBLAS to avoid conflict with tbb
++   gSystem->Setenv("OMP_NUM_THREADS", "1");
++
+    // do enable MT running
+    if (num_threads >= 0) {
+       ROOT::EnableImplicitMT(num_threads);
+diff --git a/tutorials/tmva/TMVA_RNN_Classification.py b/tutorials/tmva/TMVA_RNN_Classification.py
+index 625a120b3d..65aa83c070 100644
+--- a/tutorials/tmva/TMVA_RNN_Classification.py
++++ b/tutorials/tmva/TMVA_RNN_Classification.py
+@@ -26,10 +26,11 @@ num_threads = 4  # use max 4 threads
+ # do enable MT running
+ if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
+     ROOT.EnableImplicitMT(num_threads)
+-    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")  # switch OFF MT in OpenBLAS
++    # switch off MT in OpenBLAS to avoid conflict with tbb
++    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
+     print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
+ else:
+-    print("Running in serail mode since ROOT does not support MT")
++    print("Running in serial mode since ROOT does not support MT")
+ 
+ 
+ TMVA = ROOT.TMVA
+-- 
+2.39.2
+
diff --git a/root-veto-tests-using-clad-when-clad-is-disabled.patch b/root-veto-tests-using-clad-when-clad-is-disabled.patch
deleted file mode 100644
index d201fdb..0000000
--- a/root-veto-tests-using-clad-when-clad-is-disabled.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6583668f3e5f1b4e1d219a5a92a19da31d8d5494 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 1 Mar 2023 18:32:45 +0100
-Subject: [PATCH] Veto tests using clad when clad is disabled
-
----
- math/minuit2/test/CMakeLists.txt | 8 ++++----
- tutorials/CMakeLists.txt         | 9 ++++++---
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/math/minuit2/test/CMakeLists.txt b/math/minuit2/test/CMakeLists.txt
-index 7ecf30350c..8951ac0a84 100644
---- a/math/minuit2/test/CMakeLists.txt
-+++ b/math/minuit2/test/CMakeLists.txt
-@@ -11,10 +11,10 @@ if(NOT DEFINED ROOT_SOURCE_DIR)
-    include(${ROOT_USE_FILE})
- endif()
- 
--set(TestSource
--      testMinimizer.cxx
--      testADMinim.cxx
--)
-+set(TestSource testMinimizer.cxx)
-+if (clad)
-+  list(APPEND TestSource testADMinim.cxx)
-+endif()
- 
- set(TestSourceMnTutorial
-     MnTutorial/Quad1FMain.cxx
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index bf7c1d4089..deb5f67d23 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -65,16 +65,18 @@ endfunction()
- 
- #---Tutorials disabled depending on the build components-------------
- if(NOT ROOT_minuit2_FOUND)
--  set(minuit2_veto fit/fit2dHist.C fit/fit2dHist.C
--                   fit/fitCircle.C fit/minuit2FitBench2D.C
-+  set(minuit2_veto fit/fit2dHist.C fit/fitCircle.C
-                    fit/minuit2FitBench2D.C fit/minuit2FitBench.C
--                   fit/minuit2FitBench.C fit/minuit2GausFit.C
-                    fit/minuit2GausFit.C fit/NumericalMinimization.C
-                    fit/combinedFit.C fit/TestBinomial.C
-                    fit/fitNormSum.C fit/vectorizedFit.C
-                    tutorials/roostats/rs_bernsteinCorrection.C)
- endif()
- 
-+if(NOT clad)
-+  set(clad_veto fit/minuit2GausFit.C)
-+endif()
-+
- if (NOT dataframe)
-     # RDataFrame
-     list(APPEND dataframe_veto dataframe/*.C dataframe/*.py)
-@@ -457,6 +459,7 @@ set(all_veto hsimple.C
-              ${spectrum_veto}
-              ${dataframe_veto}
-              ${macm1_veto}
-+             ${clad_veto}
-              )
- 
- file(GLOB_RECURSE tutorials RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.C)
--- 
-2.39.2
-
diff --git a/root.spec b/root.spec
index c551e00..eb40ef0 100644
--- a/root.spec
+++ b/root.spec
@@ -44,7 +44,7 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.28.00
+Version:	6.28.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -71,70 +71,41 @@ Source7:	JupyROOT-on-EPEL
 Source8:	%{name}-get-src.sh
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
-#		Reduce memory usage of build
-#		Do not link rootcling_stage1 and libCling in parallel
-Patch1:		%{name}-memory-usage.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
 #		smaller debuginfo for the llvm libraries
 #		Fedora builders run out of memory with the default setting
-Patch2:		%{name}-memory-arm-x86.patch
+Patch1:		%{name}-memory-arm-x86.patch
 #		Don't install minicern static library
-Patch3:		%{name}-dont-install-minicern.patch
+Patch2:		%{name}-dont-install-minicern.patch
 #		Do not export Python modules in CMake config
-Patch4:		%{name}-no-export-python-modules.patch
+Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
-Patch5:		%{name}-32bit-tests.patch
+Patch4:		%{name}-32bit-tests.patch
 #		Use local static script and style files for JsMVA
-Patch6:		%{name}-jsmva-static.patch
+Patch5:		%{name}-jsmva-static.patch
 #		Fix test failure on ppc64le and aarch64 with gcc 12
 #		https://github.com/root-project/root/pull/9601
-Patch7:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+Patch6:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 #		Byte swap values read from the protobuf raw data stream on
 #		big endian architectures
 #		https://github.com/root-project/root/pull/10308
-Patch8:		%{name}-big-endian-byte-swap.patch
-#		Add missing #include <cstdint>
-#		https://github.com/root-project/root/pull/12065
-Patch9:		%{name}-add-missing-include-cstdint.patch
-#		https://github.com/root-project/root/pull/12218
-Patch10:	%{name}-Simplify-creation-of-TargetMachine.patch
-#		Fix build with -Dbuiltin_gtest:BOOL=OFF on EPEL 8
-#		https://github.com/root-project/root/pull/12250
-Patch11:	%{name}-gtest-compat.patch
-#		Limit the number of threads in TMVA CNN/DNN test to save memory
-#		https://github.com/root-project/root/pull/12310
-Patch12:	%{name}-tmva-Speed-up-TMVA-CNN-and-RNN-tutorials.patch
-#		https://github.com/root-project/root/issues/12293
-#		https://github.com/root-project/root/pull/12335
-Patch13:	%{name}-Set-DataLayout-from-our-TargetMachine.patch
-#		https://github.com/root-project/root/issues/12294
-#		https://github.com/root-project/root/pull/12353
-Patch14:	%{name}-cling-Disable-outline-atomics-on-AArch64.patch
-#		https://github.com/root-project/root/pull/12385
-Patch15:	%{name}-PyROOT-only-build-RooFit-and-TMVA-pythonizations-if-enabled.patch
+Patch7:		%{name}-big-endian-byte-swap.patch
+#		https://github.com/root-project/root/pull/12375
+Patch8:		%{name}-use-consistent-wording-in-tmva-test-comments.patch
 #		https://github.com/root-project/root/pull/12389
-Patch16:	%{name}-testRooAbsL-test-compares-two-doubles-and-fails.patch
+Patch9:		%{name}-testRooAbsL-test-compares-two-doubles-and-fails.patch
 #		https://github.com/root-project/root/pull/12390
-Patch17:	%{name}-stressvector-test-fails-on-ix86.patch
-#		https://github.com/root-project/root/pull/12402
-Patch18:	%{name}-dont-install-roofit-files-when-roofit-is-disabled.patch
-#		https://github.com/root-project/root/pull/12403
-Patch19:	%{name}-veto-tests-using-clad-when-clad-is-disabled.patch
-#		https://github.com/root-project/root/pull/12407
-Patch20:	%{name}-use-consistent-minimum-python-version-for-DistRDF.patch
-Patch21:	%{name}-make-DistRDF-optional.patch
+Patch10:	%{name}-stressvector-test-fails-on-ix86.patch
 #		https://github.com/root-project/root/pull/12423
-Patch22:	%{name}-dont-install-roofit-files-fix.patch
+Patch11:	%{name}-dont-install-roofit-files-fix.patch
 #		https://github.com/root-project/root/issues/12430
 #		https://github.com/root-project/root/pull/12447
-Patch23:	%{name}-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
+Patch12:	%{name}-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
 #		https://github.com/root-project/root/issues/12427
 #		https://github.com/root-project/root/pull/12468
-Patch24:	%{name}-fixes-for-32bit-builds.patch
+Patch13:	%{name}-fixes-for-32bit-builds.patch
 #		https://github.com/root-project/root/pull/12476
-Patch25:	%{name}-do-not-remove-Wp-before-D-and-U.patch
-#		Backport (fixes a failing test on ix86)
-Patch26:	%{name}-ntuple-RPageSinkBuf-add-missing-call-to-ReleasePage.patch
+Patch14:	%{name}-do-not-remove-Wp-before-D-and-U.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -2001,18 +1972,6 @@ This package contains extra tools for RooFit projects.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2237,6 +2196,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %install
 %cmake_install
 
+# Let rpm redo the python byte compilation
+find %{buildroot}%{python3_sitearch} -depth -type d -name __pycache__ -exec rm -r {} ';'
+
 # Do emacs byte compilation
 emacs -batch -no-site-file -f batch-byte-compile \
     %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
@@ -2268,13 +2230,6 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
    %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 
-# Let rpm redo the python byte compilation
-find %{buildroot}%{python3_sitearch} -depth -type d -name __pycache__ -exec rm -r {} ';'
-
-# Do python byte compilation (for non-standard paths)
-%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
-%py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
-
 # Fix python extension suffix
 mv %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
    %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
@@ -2459,6 +2414,10 @@ cat includelist-core-{[^mw],m[^au]}* > includelist-core
 cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
 cat includelist-graf3d-rglew >> includelist-graf3d-gl
 
+# Do python byte compilation (for non-standard paths)
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/cli
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
+
 %check
 pushd %{_vpath_builddir}
 pushd test
@@ -2678,6 +2637,7 @@ tutorial-unuran-unuranFoamTest"
 # - tutorial-fit-fit2dHist
 # - tutorial-fit-fitCircle
 # - tutorial-fit-line3Dfit
+# - tutorial-math-exampleFunction-py
 # - tutorial-multicore-mt103_fillNtupleFromMultipleThreads
 # - tutorial-multicore-mt201_parallelHistoFill
 # - tutorial-multicore-mt304_fillHistos
@@ -2691,6 +2651,7 @@ tutorial-fit-exampleFit3D|\
 tutorial-fit-fit2dHist|\
 tutorial-fit-fitCircle|\
 tutorial-fit-line3Dfit|\
+tutorial-math-exampleFunction-py|\
 tutorial-multicore-mt103_fillNtupleFromMultipleThreads|\
 tutorial-multicore-mt201_parallelHistoFill|\
 tutorial-multicore-mt304_fillHistos|\
@@ -3780,6 +3741,11 @@ fi
 %endif
 
 %changelog
+* Wed Mar 22 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.02-1
+- Update to 6.28.02
+- Dropped patches: 13
+- New patches: 1
+
 * Sat Mar 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.00-1
 - Update to 6.28.00
 - ROOT now uses llvm/clang version 13 (updated from version 9)
diff --git a/sources b/sources
index e37c144..229877a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.00.tar.xz) = 57e5e111e41d3942b63a9e038198e6cc91457d7724cc9dcf9673679b12b13acb6980e7786828a8527a292c018bd13af51854e83f99301f6bc5e4455cdc23c30e
+SHA512 (root-6.28.02.tar.xz) = acc1d1e31cb368f499dee0244936b78042cb21e5072cebcc4cc7d05f505359b7ecab3383a13311d8af7a67db72f31fe482dcaa54724c4b02194ffb98894e669f
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 3365b50fc9c2495512b75f18ab4a9992729895de Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 23 Mar 2023 03:47:57 +0100
Subject: [PATCH 244/344] Disable uring in EPEL 9 (liburing is available, but
 uring not supported by kernel)

---
 root.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/root.spec b/root.spec
index eb40ef0..429018f 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.28.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -175,9 +175,9 @@ BuildRequires:	cmake-data >= 3.18.3-1
 BuildRequires:	openblas-devel
 %endif
 BuildRequires:	json-devel
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-#		Disable uring in EPEL 8 (liburing is available, but uring not
-#		supported by the kernel)
+%if %{?fedora}%{!?fedora:0}
+#		Disable uring in EPEL 8 and 9 (liburing is available,
+#		but uring not supported by the kernel)
 BuildRequires:	liburing-devel
 %endif
 %if %{tmvasofieparser}
@@ -2168,7 +2168,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dtmva-sofie:BOOL=OFF \
 %endif
        -Dunuran:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0}
        -During:BOOL=ON \
 %else
        -During:BOOL=OFF \
@@ -3741,6 +3741,10 @@ fi
 %endif
 
 %changelog
+* Thu Mar 23 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.02-2
+- Disable uring in EPEL 9 (liburing is available, but uring not
+  supported by kernel)
+
 * Wed Mar 22 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.02-1
 - Update to 6.28.02
 - Dropped patches: 13

From 0de23e866bd3351068c49c5d6e5876a5ee714404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Fri, 21 Apr 2023 12:42:03 +0200
Subject: [PATCH 245/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 429018f..644ab6e 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.28.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3741,6 +3741,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 6.28.02-3
+- R-maint-sig mass rebuild
+
 * Thu Mar 23 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.02-2
 - Disable uring in EPEL 9 (liburing is available, but uring not
   supported by kernel)

From c39df0d6cee0595fbc1e7708f2bcd0d728cd9c3e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 9 May 2023 21:38:39 +0200
Subject: [PATCH 246/344] Update to 6.28.04

Drop patch root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
  (previously backported)
Enable Apache Arrow support (64 bit architectures only)
---
 ...ProdPdf.TestGetPartIntList-unit-test.patch | 168 ------------------
 root.spec                                     |  42 ++---
 sources                                       |   2 +-
 3 files changed, 18 insertions(+), 194 deletions(-)
 delete mode 100644 root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch

diff --git a/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch b/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
deleted file mode 100644
index d295c53..0000000
--- a/root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From c20004230608a5679ee6c0a7648af5f190c415c9 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Tue, 7 Mar 2023 11:53:01 +0100
-Subject: [PATCH] [RF] Rewrite `RooProdPdf.TestGetPartIntList` unit test
-
-In the ROOT 6.26 development cycle, the RooProdPdf was partially
-rewritten in moden C++ with less manual memory allocation to improve
-performance (PR #7907).
-
-In that PR, a unit test that verifies the RooProdPdf can correctly deal
-with factorizing PDFs was implemented. However, that test used an
-arbitrary PDF where the correct factorization was checked in a rather
-crude way: check by hashing the content of the RooProdPdf cache element
-for a given normalization set that said PR doesn't change any behavior
-(the reference hash was hardcoded in the unit test).
-
-This commit suggests a better alternative for the unit test, checking
-for a multidimensional product pdf of factorizing uniform pdfs that the
-pdf values for differenc normalization sets is as expected. This should
-cover the same functionality and is less fragile and implementation
-dependend than hashing the cache elements.
-
-This closes GitHub issue #12430, as the rewritten test is not affected
-anymore by the problem reported in that issue.
----
- roofit/roofitcore/inc/RooProdPdf.h        |  2 -
- roofit/roofitcore/src/RooProdPdf.cxx      |  4 --
- roofit/roofitcore/test/testRooProdPdf.cxx | 88 +++++++----------------
- 3 files changed, 26 insertions(+), 68 deletions(-)
-
-diff --git a/roofit/roofitcore/inc/RooProdPdf.h b/roofit/roofitcore/inc/RooProdPdf.h
-index 3d779a4901..0a76c839aa 100644
---- a/roofit/roofitcore/inc/RooProdPdf.h
-+++ b/roofit/roofitcore/inc/RooProdPdf.h
-@@ -96,8 +96,6 @@ public:
- 
-   RooArgSet* findPdfNSet(RooAbsPdf const& pdf) const ;
- 
--  void writeCacheToStream(std::ostream& os, RooArgSet const* nset) const;
--
-   std::unique_ptr<RooAbsArg> compileForNormSet(RooArgSet const &normSet, RooFit::Detail::CompileContext & ctx) const override;
- 
- private:
-diff --git a/roofit/roofitcore/src/RooProdPdf.cxx b/roofit/roofitcore/src/RooProdPdf.cxx
-index 8c8c7e01c6..6af7279603 100644
---- a/roofit/roofitcore/src/RooProdPdf.cxx
-+++ b/roofit/roofitcore/src/RooProdPdf.cxx
-@@ -2324,10 +2324,6 @@ void RooProdPdf::CacheElem::writeToStream(std::ostream& os) const {
-   }
- }
- 
--void RooProdPdf::writeCacheToStream(std::ostream& os, RooArgSet const* nset) const {
--  getCacheElem(nset)->writeToStream(os);
--}
--
- std::unique_ptr<RooArgSet> RooProdPdf::fillNormSetForServer(RooArgSet const &normSet, RooAbsArg const &server) const
- {
-    if (normSet.empty())
-diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
-index d794fb415a..ff334211d2 100644
---- a/roofit/roofitcore/test/testRooProdPdf.cxx
-+++ b/roofit/roofitcore/test/testRooProdPdf.cxx
-@@ -74,76 +74,40 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
-                             return ss.str();
-                          });
- 
--std::vector<std::vector<RooAbsArg *>> allPossibleSubset(RooAbsCollection const &arr)
-+TEST(RooProdPdf, TestGetPartIntList)
- {
--   std::vector<std::vector<RooAbsArg *>> out;
--   std::size_t n = arr.size();
--
--   std::size_t count = std::pow(2, n);
--   for (std::size_t i = 0; i < count; i++) {
--      out.emplace_back();
--      auto &back = out.back();
--      for (std::size_t j = 0; j < n; j++) {
--         if ((i & (1 << j)) != 0) {
--            back.push_back(arr[j]);
--         }
--      }
--   }
--   return out;
--}
-+   RooHelpers::LocalChangeMsgLevel chmsglvl1{RooFit::ERROR, 0u, RooFit::InputArguments, true};
-+   RooHelpers::LocalChangeMsgLevel chmsglvl2{RooFit::WARNING, 0u, RooFit::NumIntegration, true};
- 
--// Hash the integral configuration for all possible normalization sets.
--unsigned int hashRooProduct(RooProdPdf const &prod)
--{
--   RooArgSet params;
--   prod.getParameters(nullptr, params);
--   auto subsets = allPossibleSubset(params);
-+   // This test checks if RooProdPdf::getPartIntList factorizes the integrals
-+   // as expected, for the example of a three dimensional RooProdPdf.
- 
--   std::stringstream ss;
-+   RooWorkspace ws;
- 
--   for (auto const &subset : subsets) {
--      // this can't be on the stack, otherwise we will always get the same
--      // address and therefore get wrong cache hits!
--      auto nset = std::make_unique<RooArgSet>(subset.begin(), subset.end());
--      prod.writeCacheToStream(ss, nset.get());
--   }
-+   double a = 10.;
-+   double b = 4.;
-+   double c = 2.5;
- 
--   std::string s = ss.str();
--   return TString::Hash(s.c_str(), s.size());
--}
-+   auto &x = static_cast<RooRealVar &>(*ws.factory("x[0, 0, " + std::to_string(a) + "]"));
-+   auto &y = static_cast<RooRealVar &>(*ws.factory("y[0, 0, " + std::to_string(b) + "]"));
-+   auto &z = static_cast<RooRealVar &>(*ws.factory("z[0, 0, " + std::to_string(c) + "]"));
- 
--TEST(RooProdPdf, TestGetPartIntList)
--{
--   // This test checks if RooProdPdf::getPartIntList factorizes the integrals
--   // as expected.
--   // Instead of trying to construct tests for all possible cases by hand,
--   // this test creates a product where the factors have different patters of
--   // overlapping parameters. To make sure all possible cases are covered, we
--   // are using all possible subsets of the parameters one after the other to
--   // create the reference test result.
--
--   RooRealVar x{"x", "x", 1., 0, 10};
--   RooRealVar y{"y", "y", 1., 0, 10};
--   RooRealVar z{"z", "z", 1., 0, 10};
--
--   RooRealVar m1{"m1", "m1", 1., 0, 10};
--   RooRealVar m2{"m2", "m2", 1., 0, 10};
--   RooRealVar m3{"m3", "m3", 1., 0, 10};
--
--   RooGenericPdf gauss1{"gauss1", "gauss1", "x+m1", {x, m1}};
--   RooGenericPdf gauss2{"gauss2", "gauss2", "x+m2", {x, m2}};
--   RooGenericPdf gauss3{"gauss3", "gauss3", "y+m3", {y, m3}};
--   RooGenericPdf gauss4{"gauss4", "gauss4", "z+m1", {z, m1}};
--   RooGenericPdf gauss5{"gauss5", "gauss5", "x+m1", {x, m1}};
-+   // Factorize the product in one 1D and one 2D pdf to get a more complicated
-+   // and complete test case.
-+   ws.factory("Uniform::pdf1({x})");
-+   ws.factory("Uniform::pdf2({y, z})");
- 
-    // Product of all the pdfs.
--   RooProdPdf prod{"prod", "prod", RooArgList{gauss1, gauss2, gauss3, gauss4, gauss5}};
--
--   // We hash the string serializations of caches for all possible
--   // normalization sets and compare it to the expected hash.
--   // This value must be updated if the convention for integral names in
--   // RooProdPdf changes.
--   EXPECT_EQ(hashRooProduct(prod), 2448666198);
-+   auto &prod = static_cast<RooProdPdf &>(*ws.factory("PROD::prod(pdf1, pdf2)"));
-+
-+   EXPECT_DOUBLE_EQ(prod.getVal({}), 1.0);
-+   EXPECT_DOUBLE_EQ(prod.getVal({x}), 1. / a);
-+   EXPECT_DOUBLE_EQ(prod.getVal({y}), 1. / b);
-+   EXPECT_DOUBLE_EQ(prod.getVal({z}), 1. / c);
-+   EXPECT_DOUBLE_EQ(prod.getVal({x, y}), 1. / a / b);
-+   EXPECT_DOUBLE_EQ(prod.getVal({x, z}), 1. / a / c);
-+   EXPECT_DOUBLE_EQ(prod.getVal({y, z}), 1. / b / c);
-+   EXPECT_DOUBLE_EQ(prod.getVal({x, y, z}), 1. / a / b / c);
- }
- 
- TEST(RooProdPdf, TestDepsAreCond)
--- 
-2.39.2
-
diff --git a/root.spec b/root.spec
index 644ab6e..713b9fe 100644
--- a/root.spec
+++ b/root.spec
@@ -44,9 +44,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.28.02
+Version:	6.28.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -98,14 +98,11 @@ Patch9:		%{name}-testRooAbsL-test-compares-two-doubles-and-fails.patch
 Patch10:	%{name}-stressvector-test-fails-on-ix86.patch
 #		https://github.com/root-project/root/pull/12423
 Patch11:	%{name}-dont-install-roofit-files-fix.patch
-#		https://github.com/root-project/root/issues/12430
-#		https://github.com/root-project/root/pull/12447
-Patch12:	%{name}-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
 #		https://github.com/root-project/root/issues/12427
 #		https://github.com/root-project/root/pull/12468
-Patch13:	%{name}-fixes-for-32bit-builds.patch
+Patch12:	%{name}-fixes-for-32bit-builds.patch
 #		https://github.com/root-project/root/pull/12476
-Patch14:	%{name}-do-not-remove-Wp-before-D-and-U.patch
+Patch13:	%{name}-do-not-remove-Wp-before-D-and-U.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -183,6 +180,9 @@ BuildRequires:	liburing-devel
 %if %{tmvasofieparser}
 BuildRequires:	protobuf-devel >= 3.0
 %endif
+%ifnarch %{ix86} %{arm}
+BuildRequires:	libarrow-devel
+%endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
@@ -1971,7 +1971,6 @@ This package contains extra tools for RooFit projects.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2079,7 +2078,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_zlib:BOOL=OFF \
        -Dbuiltin_zstd:BOOL=OFF \
        -Dalien:BOOL=OFF \
+%ifnarch %{ix86} %{arm}
+       -Darrow:BOOL=ON \
+%else
        -Darrow:BOOL=OFF \
+%endif
        -Dasimage:BOOL=ON \
        -Dccache:BOOL=OFF \
        -Ddistcc:BOOL=OFF \
@@ -2576,23 +2579,6 @@ pyunittests-pyroot-roofit-roodataset-numpy"
 %endif
 %endif
 
-%ifarch %{arm}
-# 32 bit arm specific failures
-# - gtest-tree-tree-test-testBulkApi
-# - gtest-tree-tree-test-testBulkApiSillyStruct
-# - gtest-tree-dataframe-test-dataframe-snapshot
-# - gtest-tree-dataframe-test-dataframe-vary
-# - pyunittests-dataframe-merge-results
-# - pyunittests-distrdf-unit-test-headnode
-excluded="${excluded}|\
-gtest-tree-tree-test-testBulkApi\$\$|\
-gtest-tree-tree-test-testBulkApiSillyStruct|\
-gtest-tree-dataframe-test-dataframe-snapshot|\
-gtest-tree-dataframe-test-dataframe-vary|\
-pyunittests-dataframe-merge-results|\
-pyunittests-distrdf-unit-test-headnode"
-%endif
-
 %ifarch %{power64} aarch64
 # - test-stresshistofit
 # - test-stressroofit
@@ -3741,6 +3727,12 @@ fi
 %endif
 
 %changelog
+* Mon May 08 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-1
+- Update to 6.28.04
+- Drop patch root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch
+  (previously backported)
+- Enable Apache Arrow support (64 bit architectures only)
+
 * Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 6.28.02-3
 - R-maint-sig mass rebuild
 
diff --git a/sources b/sources
index 229877a..196cdf9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.02.tar.xz) = acc1d1e31cb368f499dee0244936b78042cb21e5072cebcc4cc7d05f505359b7ecab3383a13311d8af7a67db72f31fe482dcaa54724c4b02194ffb98894e669f
+SHA512 (root-6.28.04.tar.xz) = 480f08455025c6275b9ea6309336b4d73455b6c30e896aee01d2a583558514ad0fc9a268d130c7f8638984a8a9062596472c0ba6be0bb3bee6c788e594b78fd0
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 08cf4b36a244c9b8f6b1b27fb95bc9f75fef4a37 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 26 Jun 2023 08:06:21 -0600
Subject: [PATCH 247/344] Rebuilt for Python 3.12

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 713b9fe..7cf88ca 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
 Name:		root
 Version:	6.28.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3727,6 +3727,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 26 2023 Orion Poplawski <orion@nwra.com> - 6.28.04-2
+- Rebuilt for Python 3.12
+
 * Mon May 08 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-1
 - Update to 6.28.04
 - Drop patch root-RF-Rewrite-RooProdPdf.TestGetPartIntList-unit-test.patch

From c3f7b6f7f15fa3fd7d64de691e49dbdd1beb76ba Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 9 Jul 2023 07:02:33 +0200
Subject: [PATCH 248/344] Fix build on Fedora 39+ where glibc has strlcpy and
 strlcat

Enable build of root-gui-qt6webdisplay sub-package if Qt6 is available
---
 root-strlcpy.patch                            | 12 +++
 ...-test-compares-two-doubles-and-fails.patch | 24 +++---
 root.spec                                     | 78 +++++++++++++++----
 3 files changed, 90 insertions(+), 24 deletions(-)
 create mode 100644 root-strlcpy.patch

diff --git a/root-strlcpy.patch b/root-strlcpy.patch
new file mode 100644
index 0000000..e15e84b
--- /dev/null
+++ b/root-strlcpy.patch
@@ -0,0 +1,12 @@
+diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx
+index 5f53eb9f21..0b36743c4f 100644
+--- a/core/foundation/inc/ROOT/RConfig.hxx
++++ b/core/foundation/inc/ROOT/RConfig.hxx
+@@ -146,6 +146,7 @@
+ #      define R__USESTHROW
+ #      define R__SEEK64
+ #   endif
++#   define HAS_STRLCPY
+ #endif
+ 
+ #if defined(linux) && defined(__i386__)
diff --git a/root-testRooAbsL-test-compares-two-doubles-and-fails.patch b/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
index 24a4148..32ab358 100644
--- a/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
+++ b/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
@@ -1,8 +1,10 @@
-From d6a11ace0d3d25c96dd20cef1436642b5caa102e Mon Sep 17 00:00:00 2001
+From 3e0e63a02ebabc4cd7ab126ea166ecdfd6dab3a7 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 28 Feb 2023 11:02:03 +0100
-Subject: [PATCH] The testRooAbsL test compares two doubles and fails due to
- rounding errors. The failure happens on ppc64le and aarch64.
+Subject: [PATCH] [RF] Fix testRooAbsL failures from rounding errors with
+ doubles
+
+The failure happens on ppc64le and aarch64.
 
 This PR changes EXPECT_EQ to EXPECT_DOUBLE_EQ in the affected test.
 
@@ -21,23 +23,27 @@ Expected equality of these values:
     Which is: -1263.7960506619268
 [  FAILED  ] SimBinnedConstrainedTest.SubEventSections (199 ms)
 ---
- roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
-index 600f4da7be..05dcd6a241 100644
+index 600f4da7be..7b586121f1 100644
 --- a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
 +++ b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
-@@ -293,7 +293,7 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
+@@ -293,7 +293,11 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
           {static_cast<double>(ix) / N_events_total, static_cast<double>(ix + 1) / N_events_total}, 0,
           likelihood->getNComponents());
     }
 -   EXPECT_EQ(whole.Sum(), N_events_total_parts.Sum());
++   // We cannot EXPECT_EQ in this test, because we compare actually different
++   // calculations. The multiple additions and FMA operations involved in the
++   // calculation of the multiple parts introduces different rounding errors
++   // on the CPU level than the single calculation over all events at once.
 +   EXPECT_DOUBLE_EQ(whole.Sum(), N_events_total_parts.Sum());
  
     // now let's do it again over a number of sections 3 times the number of events
     ROOT::Math::KahanSum<double> thrice_N_events_total_parts;
-@@ -303,5 +303,5 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
+@@ -303,5 +307,5 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
           {static_cast<double>(ix) / (3 * N_events_total), static_cast<double>(ix + 1) / (3 * N_events_total)}, 0,
           likelihood->getNComponents());
     }
@@ -45,5 +51,5 @@ index 600f4da7be..05dcd6a241 100644
 +   EXPECT_DOUBLE_EQ(whole.Sum(), thrice_N_events_total_parts.Sum());
  }
 -- 
-2.39.2
+2.40.1
 
diff --git a/root.spec b/root.spec
index 7cf88ca..a04f11e 100644
--- a/root.spec
+++ b/root.spec
@@ -40,13 +40,22 @@
 %global distrdf 0
 %endif
 
+# qt6-srpm-macros not in buildroot for Fedora 37/38 or EPEL 9
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220860
+# Definition of qt6_qtwebengine_arches incorrect in qt6-srpm-macros
+# https://bugzilla.redhat.com/show_bug.cgi?id=2215703
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+%global qt6_qtwebengine_arches aarch64 x86_64
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
 Version:	6.28.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -103,6 +112,9 @@ Patch11:	%{name}-dont-install-roofit-files-fix.patch
 Patch12:	%{name}-fixes-for-32bit-builds.patch
 #		https://github.com/root-project/root/pull/12476
 Patch13:	%{name}-do-not-remove-Wp-before-D-and-U.patch
+#		strlcpy and strlcat available in glibc in Fedora 39+
+#		https://bugzilla.redhat.com/show_bug.cgi?id=2220860
+Patch14:	%{name}-strlcpy.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -145,6 +157,10 @@ BuildRequires:	python%{python3_pkgversion}-numpy
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtwebengine-devel
 %endif
+%ifarch %{qt6_qtwebengine_arches}
+BuildRequires:	qt6-qtbase-devel
+BuildRequires:	qt6-qtwebengine-devel
+%endif
 BuildRequires:	openssl-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
@@ -1434,7 +1450,9 @@ This package contains DaraFrame helper classes for RooFit
 Summary:	RooFit HS3
 License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
@@ -1775,6 +1793,17 @@ Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 This package contains a Qt5 web display extension for ROOT.
 %endif
 
+%ifarch %{qt6_qtwebengine_arches}
+%package gui-qt6webdisplay
+Summary:	Qt6 Web display
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
+
+%description gui-qt6webdisplay
+This package contains a Qt6 web display extension for ROOT.
+%endif
+
 %package gui-webgui6
 Summary:	Web based GUI for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1957,20 +1986,23 @@ This package contains extra tools for RooFit projects.
 %prep
 %setup -q -a 1
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 12 -p1
+%patch -P 13 -p1
+%if %{?fedora}%{!?fedora:0} >= 39
+%patch -P 14 -p1
+%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2136,7 +2168,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %else
        -Dqt5web:BOOL=OFF \
 %endif
+%ifarch %{qt6_qtwebengine_arches}
+       -Dqt6web:BOOL=ON \
+%else
        -Dqt6web:BOOL=OFF \
+%endif
        -Dr:BOOL=ON \
 %if %{roofit}
        -Droofit:BOOL=ON \
@@ -2909,6 +2945,9 @@ fi
 %ifarch %{qt5_qtwebengine_arches}
 %ldconfig_scriptlets gui-qt5webdisplay
 %endif
+%ifarch %{qt6_qtwebengine_arches}
+%ldconfig_scriptlets gui-qt6webdisplay
+%endif
 %ldconfig_scriptlets gui-webgui6
 %if %{root7}
 %ldconfig_scriptlets geom-webviewer
@@ -3649,6 +3688,11 @@ fi
 %{_libdir}/%{name}/libROOTQt5WebDisplay.*
 %endif
 
+%ifarch %{qt6_qtwebengine_arches}
+%files gui-qt6webdisplay
+%{_libdir}/%{name}/libROOTQt6WebDisplay.*
+%endif
+
 %files gui-webgui6 -f includelist-gui-webgui6
 %{_libdir}/%{name}/libWebGui6.*
 %{_libdir}/%{name}/libWebGui6_rdict.pcm
@@ -3727,6 +3771,10 @@ fi
 %endif
 
 %changelog
+* Sun Jul 09 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-3
+- Fix build on Fedora 39+ where glibc has strlcpy and strlcat
+- Enable build of root-gui-qt6webdisplay sub-package if Qt6 is available
+
 * Mon Jun 26 2023 Orion Poplawski <orion@nwra.com> - 6.28.04-2
 - Rebuilt for Python 3.12
 

From 879bb250d39b82b0263d4b54128eaa4384d787b6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 17:00:48 +0000
Subject: [PATCH 249/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index a04f11e..f140e8b 100644
--- a/root.spec
+++ b/root.spec
@@ -55,7 +55,7 @@
 Name:		root
 Version:	6.28.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3771,6 +3771,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.28.04-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sun Jul 09 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-3
 - Fix build on Fedora 39+ where glibc has strlcpy and strlcat
 - Enable build of root-gui-qt6webdisplay sub-package if Qt6 is available

From d58a4c22ba3ba68d5ced67cc9411c1159856f159 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 6 Aug 2023 06:49:55 +0200
Subject: [PATCH 250/344] Rebuilt for libarrow.so.1300

---
 root-strlcpy.patch | 25 ++++++++++++++++++++++---
 root.spec          |  7 ++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/root-strlcpy.patch b/root-strlcpy.patch
index e15e84b..823a302 100644
--- a/root-strlcpy.patch
+++ b/root-strlcpy.patch
@@ -1,12 +1,31 @@
+From 8fb0e35446ed67c9d56639b4708c8f05459b7f84 Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@pm.me>
+Date: Thu, 3 Aug 2023 11:15:47 -0600
+Subject: [PATCH] [core] Do not provide our own strlcpy if glibc >= 2.38
+
+Since version 2.38, glibc provides strlcpy and strlcat.
+No need to provide our own.
+
+In fact ROOT's definitions clash with glibc's: the latter are
+marked `noexcept`.
+---
+ core/foundation/inc/ROOT/RConfig.hxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
 diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx
-index 5f53eb9f21..0b36743c4f 100644
+index 5f53eb9f21..385c05da3e 100644
 --- a/core/foundation/inc/ROOT/RConfig.hxx
 +++ b/core/foundation/inc/ROOT/RConfig.hxx
-@@ -146,6 +146,7 @@
+@@ -146,6 +146,9 @@
  #      define R__USESTHROW
  #      define R__SEEK64
  #   endif
-+#   define HAS_STRLCPY
++#   if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38)
++#      define HAS_STRLCPY
++#   endif
  #endif
  
  #if defined(linux) && defined(__i386__)
+-- 
+2.41.0
+
diff --git a/root.spec b/root.spec
index f140e8b..651b9e0 100644
--- a/root.spec
+++ b/root.spec
@@ -55,7 +55,7 @@
 Name:		root
 Version:	6.28.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2000,9 +2000,7 @@ This package contains extra tools for RooFit projects.
 %patch -P 11 -p1
 %patch -P 12 -p1
 %patch -P 13 -p1
-%if %{?fedora}%{!?fedora:0} >= 39
 %patch -P 14 -p1
-%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3771,6 +3769,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug 06 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-5
+- Rebuilt for libarrow.so.1300
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.28.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 79c12df5ba2db9028fcbc674d5ed32cb1e653eb8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 6 Sep 2023 23:23:03 +0200
Subject: [PATCH 251/344] Update to 6.28.06

Drop patches root-testRooAbsL-test-compares-two-doubles-and-fails.patch and
  root-strlcpy.patch (fixed upstream)
---
 root-stressvector-test-fails-on-ix86.patch    |  8 +--
 root-strlcpy.patch                            | 31 ----------
 ...-test-compares-two-doubles-and-fails.patch | 55 ------------------
 root.spec                                     | 56 +++++--------------
 sources                                       |  2 +-
 5 files changed, 20 insertions(+), 132 deletions(-)
 delete mode 100644 root-strlcpy.patch
 delete mode 100644 root-testRooAbsL-test-compares-two-doubles-and-fails.patch

diff --git a/root-stressvector-test-fails-on-ix86.patch b/root-stressvector-test-fails-on-ix86.patch
index ca3f212..fa519f2 100644
--- a/root-stressvector-test-fails-on-ix86.patch
+++ b/root-stressvector-test-fails-on-ix86.patch
@@ -1,4 +1,4 @@
-From df2902f6c970aa903200a272fd6a79788da3df4f Mon Sep 17 00:00:00 2001
+From aae37d7eceeb25e4a09e8504275083e6830832d6 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Tue, 28 Feb 2023 11:33:28 +0100
 Subject: [PATCH] The stressVector test fails on ix86 due to too strict check:
@@ -19,19 +19,19 @@ root [2] (-12823.3585955796 - (-12823.35859557827)) / -12823.3585955796 / std::n
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/test/stressVector.cxx b/test/stressVector.cxx
-index 83b86fb2b4..18dc97d421 100644
+index b0ba21e845..18dc97d421 100644
 --- a/test/stressVector.cxx
 +++ b/test/stressVector.cxx
 @@ -540,8 +540,7 @@ int main(int argc,const char *argv[]) {
        s1=a.testDeltaR   (v1, t, t1,      "DeltaR   TLorentzVector      " );
        s2=a.testDeltaR   (v2, t, t2,      "DeltaR   XYZTVector          " );
        s3=a.testDeltaR   (v3, t, t3,      "DeltaR   PtEtaPhiEVector     " );
--      a.check("DeltaR",s1,s2,s3,15);
+-      a.check("DeltaR",s1,s2,s3,20);
 -
 +      a.check("DeltaR", s1, s2, s3, 50);
  
        int n1, n2, n3;
        n1 = a.testAnalysis (v1, t, t1, "Analysis1 TLorentzVector     " );
 -- 
-2.39.2
+2.40.1
 
diff --git a/root-strlcpy.patch b/root-strlcpy.patch
deleted file mode 100644
index 823a302..0000000
--- a/root-strlcpy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8fb0e35446ed67c9d56639b4708c8f05459b7f84 Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud@pm.me>
-Date: Thu, 3 Aug 2023 11:15:47 -0600
-Subject: [PATCH] [core] Do not provide our own strlcpy if glibc >= 2.38
-
-Since version 2.38, glibc provides strlcpy and strlcat.
-No need to provide our own.
-
-In fact ROOT's definitions clash with glibc's: the latter are
-marked `noexcept`.
----
- core/foundation/inc/ROOT/RConfig.hxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx
-index 5f53eb9f21..385c05da3e 100644
---- a/core/foundation/inc/ROOT/RConfig.hxx
-+++ b/core/foundation/inc/ROOT/RConfig.hxx
-@@ -146,6 +146,9 @@
- #      define R__USESTHROW
- #      define R__SEEK64
- #   endif
-+#   if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38)
-+#      define HAS_STRLCPY
-+#   endif
- #endif
- 
- #if defined(linux) && defined(__i386__)
--- 
-2.41.0
-
diff --git a/root-testRooAbsL-test-compares-two-doubles-and-fails.patch b/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
deleted file mode 100644
index 32ab358..0000000
--- a/root-testRooAbsL-test-compares-two-doubles-and-fails.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3e0e63a02ebabc4cd7ab126ea166ecdfd6dab3a7 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 28 Feb 2023 11:02:03 +0100
-Subject: [PATCH] [RF] Fix testRooAbsL failures from rounding errors with
- doubles
-
-The failure happens on ppc64le and aarch64.
-
-This PR changes EXPECT_EQ to EXPECT_DOUBLE_EQ in the affected test.
-
-[ RUN      ] SimBinnedConstrainedTest.SubEventSections
-/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:293: Failure
-Expected equality of these values:
-  whole.Sum()
-    Which is: -1263.796050661927
-  N_events_total_parts.Sum()
-    Which is: -1263.7960506619268
-/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:303: Failure
-Expected equality of these values:
-  whole.Sum()
-    Which is: -1263.796050661927
-  thrice_N_events_total_parts.Sum()
-    Which is: -1263.7960506619268
-[  FAILED  ] SimBinnedConstrainedTest.SubEventSections (199 ms)
----
- roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
-index 600f4da7be..7b586121f1 100644
---- a/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
-+++ b/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx
-@@ -293,7 +293,11 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
-          {static_cast<double>(ix) / N_events_total, static_cast<double>(ix + 1) / N_events_total}, 0,
-          likelihood->getNComponents());
-    }
--   EXPECT_EQ(whole.Sum(), N_events_total_parts.Sum());
-+   // We cannot EXPECT_EQ in this test, because we compare actually different
-+   // calculations. The multiple additions and FMA operations involved in the
-+   // calculation of the multiple parts introduces different rounding errors
-+   // on the CPU level than the single calculation over all events at once.
-+   EXPECT_DOUBLE_EQ(whole.Sum(), N_events_total_parts.Sum());
- 
-    // now let's do it again over a number of sections 3 times the number of events
-    ROOT::Math::KahanSum<double> thrice_N_events_total_parts;
-@@ -303,5 +307,5 @@ TEST_F(SimBinnedConstrainedTest, SubEventSections)
-          {static_cast<double>(ix) / (3 * N_events_total), static_cast<double>(ix + 1) / (3 * N_events_total)}, 0,
-          likelihood->getNComponents());
-    }
--   EXPECT_EQ(whole.Sum(), thrice_N_events_total_parts.Sum());
-+   EXPECT_DOUBLE_EQ(whole.Sum(), thrice_N_events_total_parts.Sum());
- }
--- 
-2.40.1
-
diff --git a/root.spec b/root.spec
index 651b9e0..aa32b3c 100644
--- a/root.spec
+++ b/root.spec
@@ -53,9 +53,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.28.04
+Version:	6.28.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -101,20 +101,15 @@ Patch6:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 Patch7:		%{name}-big-endian-byte-swap.patch
 #		https://github.com/root-project/root/pull/12375
 Patch8:		%{name}-use-consistent-wording-in-tmva-test-comments.patch
-#		https://github.com/root-project/root/pull/12389
-Patch9:		%{name}-testRooAbsL-test-compares-two-doubles-and-fails.patch
 #		https://github.com/root-project/root/pull/12390
-Patch10:	%{name}-stressvector-test-fails-on-ix86.patch
+Patch9:	%{name}-stressvector-test-fails-on-ix86.patch
 #		https://github.com/root-project/root/pull/12423
-Patch11:	%{name}-dont-install-roofit-files-fix.patch
+Patch10:	%{name}-dont-install-roofit-files-fix.patch
 #		https://github.com/root-project/root/issues/12427
 #		https://github.com/root-project/root/pull/12468
-Patch12:	%{name}-fixes-for-32bit-builds.patch
+Patch11:	%{name}-fixes-for-32bit-builds.patch
 #		https://github.com/root-project/root/pull/12476
-Patch13:	%{name}-do-not-remove-Wp-before-D-and-U.patch
-#		strlcpy and strlcat available in glibc in Fedora 39+
-#		https://bugzilla.redhat.com/show_bug.cgi?id=2220860
-Patch14:	%{name}-strlcpy.patch
+Patch12:	%{name}-do-not-remove-Wp-before-D-and-U.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1999,8 +1994,6 @@ This package contains extra tools for RooFit projects.
 %patch -P 10 -p1
 %patch -P 11 -p1
 %patch -P 12 -p1
-%patch -P 13 -p1
-%patch -P 14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2532,6 +2525,7 @@ popd
 #   http://root.cern.ch/files/davix.test
 #
 # - gtest-net-netxng-test-RRawFileNetXNG
+#   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/xrootd.test
 #
 # - gtest-tmva-tmva-test-rreader
@@ -2596,35 +2590,16 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 38
-# - pyunittests-dataframe-histograms
-# - tutorial-legacy-rootenv
-#   Failures with Fedora 38 (GCC 13 related?)
-excluded="${excluded}|\
-pyunittests-dataframe-histograms|\
-tutorial-legacy-rootenv"
-
+%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
 %ifarch %{ix86}
 # - pyunittests-pyroot-roofit-roodataset-numpy
-#   Failures with Fedora 38 i686 (after numpy 1.24 update)
+#   Failures with Fedora 37/38 i686 (after numpy 1.24 update)
 #   https://github.com/root-project/root/issues/12162
 excluded="${excluded}|\
 pyunittests-pyroot-roofit-roodataset-numpy"
 %endif
 %endif
 
-%ifarch %{power64} aarch64
-# - test-stresshistofit
-# - test-stressroofit
-# - test-stressroofit-batchmode-cpu
-# - test-stressroofit-interpreted
-excluded="${excluded}|\
-test-stresshistofit\$\$|\
-test-stressroofit\$\$|\
-test-stressroofit-batchmode-cpu|\
-test-stressroofit-interpreted"
-%endif
-
 %ifarch %{power64}
 # PPC64LE specific failures
 # - test-stresshistofit-interpreted
@@ -2715,9 +2690,6 @@ tutorial-roofit-rf612_recoverFromInvalidParameters"
 # - test-stresshistofit-interpreted
 # - test-stresshistogram
 # - test-stresshistogram-interpreted
-# - test-stressroofit
-# - test-stressroofit-batchmode-cpu
-# - test-stressroofit-interpreted
 excluded="${excluded}|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
 gtest-tree-ntuple-v7-test-ntuple-endian|\
@@ -2738,10 +2710,7 @@ tutorial-tree-drawsparse|\
 test-stresshistofit\$\$|\
 test-stresshistofit-interpreted|\
 test-stresshistogram\$\$|\
-test-stresshistogram-interpreted|\
-test-stressroofit\$\$|\
-test-stressroofit-batchmode-cpu|\
-test-stressroofit-interpreted"
+test-stresshistogram-interpreted"
 
 %if %{?rhel}%{!?rhel:0} == 8
 # Issues with file sizes on EPEL 8 s390x
@@ -3769,6 +3738,11 @@ fi
 %endif
 
 %changelog
+* Tue Sep 05 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.06-1
+- Update to 6.28.06
+- Drop patches root-testRooAbsL-test-compares-two-doubles-and-fails.patch and
+  root-strlcpy.patch (fixed upstream)
+
 * Sun Aug 06 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.04-5
 - Rebuilt for libarrow.so.1300
 
diff --git a/sources b/sources
index 196cdf9..e30a52f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.04.tar.xz) = 480f08455025c6275b9ea6309336b4d73455b6c30e896aee01d2a583558514ad0fc9a268d130c7f8638984a8a9062596472c0ba6be0bb3bee6c788e594b78fd0
+SHA512 (root-6.28.06.tar.xz) = 1a7252950517b480e036cf6e12d7eb675068e1d23df1f91822494d5f0ca769545a40a37b3478cc3cf3517a20e2b48a46a7b8ff2cd4601a7c23574de989195901
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 85ea6724079b37ce93d6b05734d1d0bbd29f2590 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 14 Oct 2023 23:56:11 +0200
Subject: [PATCH 252/344] Update to 6.28.08

New subpackage root-tmva-utils (split off from root-tmva)
Port to pcre2
---
 root-boolean-numpy-array.patch |  45 ++++
 root-pcre2-6.28.patch          |  52 ++++
 root-pcre2.patch               | 436 +++++++++++++++++++++++++++++++++
 root-tmva-rbdt.patch           |  40 +++
 root.spec                      | 100 ++++++--
 sources                        |   2 +-
 6 files changed, 647 insertions(+), 28 deletions(-)
 create mode 100644 root-boolean-numpy-array.patch
 create mode 100644 root-pcre2-6.28.patch
 create mode 100644 root-pcre2.patch
 create mode 100644 root-tmva-rbdt.patch

diff --git a/root-boolean-numpy-array.patch b/root-boolean-numpy-array.patch
new file mode 100644
index 0000000..e5d6482
--- /dev/null
+++ b/root-boolean-numpy-array.patch
@@ -0,0 +1,45 @@
+From 2b3dd4f1bfecea5b1b936d5507f8b0c664322a19 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Wed, 6 Sep 2023 02:16:33 +0200
+Subject: [PATCH] [RF][PyROOT] Avoid boolean operators on numpy arrays in unit
+ test
+
+The `n_in_range` reference value in the unit test
+`roodataset_numpy.TestRooDataSetNumpy.test_ignoring_out_of_range`
+apparently doesn't get computed right on some 32 platforms.
+
+I can't reproduce the problem, but I'm sure it will be fixed by avoiding
+the use of the operators `&` and `|` with numpy arrays. Just doing a
+manual loop in Python should be more platform independent.
+
+Closes #12162.
+---
+ .../pythonizations/test/roofit/roodataset_numpy.py   | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
+index 79259af321..5587677c45 100644
+--- a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
++++ b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
+@@ -135,9 +135,15 @@ class TestRooDataSetNumpy(unittest.TestCase):
+         cat.defineType("minus", -1)
+         cat.defineType("plus", +1)
+ 
+-        in_x_range = (data["x"] <= x.getMax()) & (data["x"] >= x.getMin())
+-        in_cat_range = (data["cat"] == -1) | (data["cat"] == +1)
+-        n_in_range = np.sum(in_x_range & in_cat_range)
++        # Use manual loop because we had some problems with numpys boolean
++        # comparisions in the past (see GitHub issue #12162).
++        n_in_range = 0
++        for i in range(n_events):
++            in_x_range = data["x"][i] <= x.getMax() and data["x"][i] >= x.getMin()
++            in_cat_range = (data["cat"][i] == -1) or (data["cat"][i] == +1)
++            is_in_range = in_x_range and in_cat_range
++            if is_in_range:
++                n_in_range = n_in_range + 1
+ 
+         dataset_numpy = ROOT.RooDataSet.from_numpy(data, {x, cat}, name="dataSetNumpy")
+ 
+-- 
+2.41.0
+
diff --git a/root-pcre2-6.28.patch b/root-pcre2-6.28.patch
new file mode 100644
index 0000000..db907b5
--- /dev/null
+++ b/root-pcre2-6.28.patch
@@ -0,0 +1,52 @@
+diff -ur root-6.28.06.orig/core/base/CMakeLists.txt root-6.28.06/core/base/CMakeLists.txt
+--- root-6.28.06.orig/core/base/CMakeLists.txt	2023-08-28 13:26:43.000000000 +0200
++++ root-6.28.06/core/base/CMakeLists.txt	2023-10-02 01:53:35.956143717 +0200
+@@ -212,9 +212,15 @@
+ 
+ ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
+ 
++if (PCRE2_FOUND)
++  set(PCRE_INCDIR ${PCRE2_INCLUDE_DIR})
++else()
++  set(PCRE_INCDIR ${PCRE_INCLUDE_DIR})
++endif()
++
+ target_include_directories(Base PRIVATE
+    ${BASE_V7_INC}
+-   ${PCRE_INCLUDE_DIR}
++   ${PCRE_INCDIR}
+    res
+    ${CMAKE_SOURCE_DIR}/core/foundation/res
+    ${CMAKE_SOURCE_DIR}/core/clib/inc
+@@ -237,6 +243,11 @@
+   ${CMAKE_BINARY_DIR}/ginclude/TApplicationCommandLineOptionsHelp.h
+ )
+ 
++if(PCRE2_FOUND)
++  set_source_files_properties(src/TPRegexp.cxx
++    PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
++endif()
++
+ ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
+ 
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man)
+diff -ur root-6.28.06.orig/core/CMakeLists.txt root-6.28.06/core/CMakeLists.txt
+--- root-6.28.06.orig/core/CMakeLists.txt	2023-08-28 13:26:43.000000000 +0200
++++ root-6.28.06/core/CMakeLists.txt	2023-10-02 01:47:00.134174041 +0200
+@@ -261,9 +261,15 @@
+ 
+ target_include_directories(G__Core PRIVATE ${CMAKE_SOURCE_DIR}/core/clingutils/inc)
+ 
++if (PCRE2_FOUND)
++  set (PCRE_TGT PCRE2::PCRE2)
++else()
++  set (PCRE_TGT PCRE::PCRE)
++endif()
++
+ target_link_libraries(Core
+   PRIVATE
+-    PCRE::PCRE
++    ${PCRE_TGT}
+     ${LIBLZMA_LIBRARIES}
+     xxHash::xxHash
+     LZ4::LZ4
diff --git a/root-pcre2.patch b/root-pcre2.patch
new file mode 100644
index 0000000..8d1adee
--- /dev/null
+++ b/root-pcre2.patch
@@ -0,0 +1,436 @@
+From f89fc640f9ca1b2cccf0dc496b0b7ea434b53fad Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 2 Oct 2023 09:25:13 +0200
+Subject: [PATCH] Support PCRE2
+
+---
+ .../pythonizations/test/import_load_libs.py   |   1 +
+ cmake/modules/FindPCRE2.cmake                 | 106 ++++++++++++++++++
+ cmake/modules/SearchInstalledSoftware.cmake   |  17 +--
+ core/base/CMakeLists.txt                      |   9 +-
+ core/base/src/TPRegexp.cxx                    |  99 +++++++++++++++-
+ tutorials/legacy/regexp/regexp.C              |   6 +-
+ 6 files changed, 223 insertions(+), 15 deletions(-)
+ create mode 100644 cmake/modules/FindPCRE2.cmake
+
+diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
+index 087db7da5c..179c76f6fd 100644
+--- a/bindings/pyroot/pythonizations/test/import_load_libs.py
++++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
+@@ -23,6 +23,7 @@ class ImportLoadLibs(unittest.TestCase):
+             'libc',
+             'libdl',
+             'libpcre',
++            'libpcre2-8',
+             # libCling and dependencies
+             'libCling.*',
+             'librt',
+diff --git a/cmake/modules/FindPCRE2.cmake b/cmake/modules/FindPCRE2.cmake
+new file mode 100644
+index 0000000000..2417453e8b
+--- /dev/null
++++ b/cmake/modules/FindPCRE2.cmake
+@@ -0,0 +1,106 @@
++# Copyright (C) 1995-2019, Rene Brun and Fons Rademakers.
++# All rights reserved.
++#
++# For the licensing terms see $ROOTSYS/LICENSE.
++# For the list of contributors see $ROOTSYS/README/CREDITS.
++
++#.rst:
++# FindPCRE2
++# --------
++#
++# Find PCRE2 library
++#
++# Imported Targets
++# ^^^^^^^^^^^^^^^^
++#
++# This module defines :prop_tgt:`IMPORTED` target:
++#
++# ``PCRE2::PCRE2``
++#   The pcre2 library, if found.
++#
++# Result Variables
++# ^^^^^^^^^^^^^^^^
++# This module will set the following variables in your project:
++#
++# ``PCRE2_FOUND``
++#   True if PCRE2 has been found.
++# ``PCRE2_INCLUDE_DIRS``
++#   Where to find pcre2.h
++# ``PCRE2_LIBRARIES``
++#   The libraries to link against to use PCRE2.
++# ``PCRE2_VERSION``
++#   The version of the PCRE2 found (e.g. 10.42)
++#
++# Obsolete variables
++# ^^^^^^^^^^^^^^^^^^
++#
++# The following variables may also be set, for backwards compatibility:
++#
++# ``PCRE2_PCRE2_LIBRARY``
++#   where to find the PCRE2_PCRE2 library.
++# ``PCRE2_INCLUDE_DIR``
++#   where to find the pcre2.h header (same as PCRE2_INCLUDE_DIRS)
++#
++
++foreach(var PCRE2_FOUND PCRE2_INCLUDE_DIR PCRE2_PCRE2_LIBRARY PCRE2_LIBRARIES)
++  unset(${var} CACHE)
++endforeach()
++
++find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h PATH_SUFFIXES include)
++mark_as_advanced(PCRE2_INCLUDE_DIR)
++
++if (PCRE2_INCLUDE_DIR AND EXISTS "${PCRE2_INCLUDE_DIR}/pcre2.h")
++  file(STRINGS "${PCRE2_INCLUDE_DIR}/pcre2.h" PCRE2_H REGEX "^#define PCRE2_(MAJOR|MINOR).*$")
++  string(REGEX REPLACE "^.*PCRE2_MAJOR[ ]+([0-9]+).*$" "\\1" PCRE2_VERSION_MAJOR "${PCRE2_H}")
++  string(REGEX REPLACE "^.*PCRE2_MINOR[ ]+([0-9]+).*$" "\\1" PCRE2_VERSION_MINOR "${PCRE2_H}")
++  set(PCRE2_VERSION "${PCRE2_VERSION_MAJOR}.${PCRE2_VERSION_MINOR}")
++endif()
++
++if(NOT PCRE2_PCRE2_LIBRARY)
++  find_library(PCRE2_PCRE2_LIBRARY_RELEASE NAMES pcre2-8)
++  find_library(PCRE2_PCRE2_LIBRARY_DEBUG NAMES pcre2-8${CMAKE_DEBUG_POSTFIX} pcre2-8d)
++  include(SelectLibraryConfigurations)
++  select_library_configurations(PCRE2_PCRE2)
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(PCRE2
++  REQUIRED_VARS
++    PCRE2_INCLUDE_DIR
++    PCRE2_PCRE2_LIBRARY
++  VERSION_VAR
++    PCRE2_VERSION
++)
++
++if(PCRE2_FOUND)
++  set(PCRE2_INCLUDE_DIRS "${PCRE2_INCLUDE_DIR}")
++
++  if (NOT PCRE2_LIBRARIES)
++    set(PCRE2_LIBRARIES "${PCRE2_PCRE2_LIBRARY}")
++  endif()
++
++  if(NOT TARGET PCRE2::PCRE2)
++    add_library(PCRE2::PCRE2 UNKNOWN IMPORTED)
++    set_target_properties(PCRE2::PCRE2 PROPERTIES
++      INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIRS}")
++
++    if(PCRE2_PCRE2_LIBRARY_DEBUG)
++      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
++        IMPORTED_CONFIGURATIONS DEBUG)
++      set_target_properties(PCRE2::PCRE2 PROPERTIES
++        IMPORTED_LOCATION_DEBUG "${PCRE2_PCRE2_LIBRARY_DEBUG}")
++    endif()
++
++    if(PCRE2_PCRE2_LIBRARY_RELEASE)
++      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
++        IMPORTED_CONFIGURATIONS RELEASE)
++      set_target_properties(PCRE2::PCRE2 PROPERTIES
++        IMPORTED_LOCATION_RELEASE "${PCRE2_PCRE2_LIBRARY_RELEASE}")
++    endif()
++
++    if(NOT PCRE2_PCRE2_LIBRARY_DEBUG AND NOT PCRE2_PCRE2_LIBRARY_RELEASE)
++      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
++        IMPORTED_LOCATION "${PCRE2_PCRE2_LIBRARY}")
++    endif()
++  endif()
++endif()
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index 464155fd50..252aa56737 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -204,13 +204,16 @@ if(NOT builtin_pcre)
+   foreach(suffix FOUND INCLUDE_DIR PCRE_LIBRARY)
+     unset(PCRE_${suffix} CACHE)
+   endforeach()
+-  if(fail-on-missing)
+-    find_package(PCRE REQUIRED)
+-  else()
+-    find_package(PCRE)
+-    if(NOT PCRE_FOUND)
+-      message(STATUS "PCRE not found. Switching on builtin_pcre option")
+-      set(builtin_pcre ON CACHE BOOL "Enabled because PCRE not found (${builtin_pcre_description})" FORCE)
++  find_package(PCRE2)
++  if(NOT PCRE2_FOUND)
++    if(fail-on-missing)
++      find_package(PCRE REQUIRED)
++    else()
++      find_package(PCRE)
++      if(NOT PCRE_FOUND)
++        message(STATUS "PCRE not found. Switching on builtin_pcre option")
++        set(builtin_pcre ON CACHE BOOL "Enabled because PCRE not found (${builtin_pcre_description})" FORCE)
++      endif()
+     endif()
+   endif()
+ endif()
+diff --git a/core/base/src/TPRegexp.cxx b/core/base/src/TPRegexp.cxx
+index 949b8cc8e9..d70f3e5b8b 100644
+--- a/core/base/src/TPRegexp.cxx
++++ b/core/base/src/TPRegexp.cxx
+@@ -25,19 +25,36 @@ found at : http://perldoc.perl.org/perlre.html
+ #include "TObjString.h"
+ #include "TError.h"
+ 
++#ifdef USE_PCRE2
++#ifdef R__WIN32
++#define PCRE2_STATIC
++#endif
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
++#define PCRE_CASELESS  PCRE2_CASELESS
++#define PCRE_MULTILINE PCRE2_MULTILINE
++#define PCRE_DOTALL    PCRE2_DOTALL
++#define PCRE_EXTENDED  PCRE2_EXTENDED
++#define PCRE_ERROR_NOMATCH PCRE2_ERROR_NOMATCH
++#else
+ #ifdef R__WIN32
+ #define PCRE_STATIC
+ #endif
+ #include <pcre.h>
++#endif
+ 
+ #include <vector>
+ #include <stdexcept>
+ 
+ struct PCREPriv_t {
++#ifdef USE_PCRE2
++   pcre2_code *fPCRE;
++   PCREPriv_t() { fPCRE = nullptr; }
++#else
+    pcre       *fPCRE;
+    pcre_extra *fPCREExtra;
+-
+    PCREPriv_t() { fPCRE = nullptr; fPCREExtra = nullptr; }
++#endif
+ };
+ 
+ 
+@@ -79,10 +96,15 @@ TPRegexp::TPRegexp(const TPRegexp &p)
+ 
+ TPRegexp::~TPRegexp()
+ {
++#ifdef USE_PCRE2
++   if (fPriv->fPCRE)
++      pcre2_code_free(fPriv->fPCRE);
++#else
+    if (fPriv->fPCRE)
+       pcre_free(fPriv->fPCRE);
+    if (fPriv->fPCREExtra)
+       pcre_free(fPriv->fPCREExtra);
++#endif
+    delete fPriv;
+ }
+ 
+@@ -93,12 +115,18 @@ TPRegexp &TPRegexp::operator=(const TPRegexp &p)
+ {
+    if (this != &p) {
+       fPattern = p.fPattern;
++#ifdef USE_PCRE2
++      if (fPriv->fPCRE)
++         pcre2_code_free(fPriv->fPCRE);
++      fPriv->fPCRE = nullptr;
++#else
+       if (fPriv->fPCRE)
+          pcre_free(fPriv->fPCRE);
+       fPriv->fPCRE = nullptr;
+       if (fPriv->fPCREExtra)
+          pcre_free(fPriv->fPCREExtra);
+       fPriv->fPCREExtra = nullptr;
++#endif
+       fPCREOpts  = p.fPCREOpts;
+    }
+    return *this;
+@@ -197,31 +225,50 @@ TString TPRegexp::GetModifiers() const
+ 
+ void TPRegexp::Compile()
+ {
++#ifdef USE_PCRE2
++   if (fPriv->fPCRE)
++      pcre2_code_free(fPriv->fPCRE);
++#else
+    if (fPriv->fPCRE)
+       pcre_free(fPriv->fPCRE);
++#endif
+ 
+    if (fPCREOpts & kPCRE_DEBUG_MSGS)
+       Info("Compile", "PREGEX compiling %s", fPattern.Data());
+ 
++#ifdef USE_PCRE2
++   int errcode;
++   PCRE2_SIZE patIndex;
++   fPriv->fPCRE = pcre2_compile((PCRE2_SPTR)fPattern.Data(), fPattern.Length(),
++                                fPCREOpts & kPCRE_INTMASK,
++                                &errcode, &patIndex, nullptr);
++#else
+    const char *errstr;
+    Int_t patIndex;
+    fPriv->fPCRE = pcre_compile(fPattern.Data(), fPCREOpts & kPCRE_INTMASK,
+                                &errstr, &patIndex, nullptr);
++#endif
+ 
+    if (!fPriv->fPCRE) {
++#ifdef USE_PCRE2
++      PCRE2_UCHAR errstr[256];
++      pcre2_get_error_message(errcode, errstr, 256);
++#endif
+       if (fgThrowAtCompileError) {
+          throw std::runtime_error
+             (TString::Format("TPRegexp::Compile() compilation of TPRegexp(%s) failed at: %d because %s",
+-                             fPattern.Data(), patIndex, errstr).Data());
++                             fPattern.Data(), (int)patIndex, errstr).Data());
+       } else {
+          Error("Compile", "compilation of TPRegexp(%s) failed at: %d because %s",
+-               fPattern.Data(), patIndex, errstr);
++               fPattern.Data(), (int)patIndex, errstr);
+          return;
+       }
+    }
+ 
++#ifndef USE_PCRE2
+    if (fPriv->fPCREExtra || (fPCREOpts & kPCRE_OPTIMIZE))
+       Optimize();
++#endif
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -229,6 +276,7 @@ void TPRegexp::Compile()
+ 
+ void TPRegexp::Optimize()
+ {
++#ifndef USE_PCRE2
+    if (fPriv->fPCREExtra)
+       pcre_free(fPriv->fPCREExtra);
+ 
+@@ -243,6 +291,7 @@ void TPRegexp::Optimize()
+       Error("Optimize", "Optimization of TPRegexp(%s) failed: %s",
+             fPattern.Data(), errstr);
+    }
++#endif
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -308,21 +357,43 @@ Int_t TPRegexp::MatchInternal(const TString &s, Int_t start,
+                               Int_t nMaxMatch, TArrayI *pos) const
+ {
+    Int_t *offVec = new Int_t[3*nMaxMatch];
++
++#ifdef USE_PCRE2
++   pcre2_match_data *match_data;
++   match_data = pcre2_match_data_create_from_pattern(fPriv->fPCRE, nullptr);
++   Int_t nrMatch = pcre2_match(fPriv->fPCRE, (PCRE2_SPTR8)s.Data(),
++                               s.Length(), start, 0,
++                               match_data, nullptr);
++#else
+    // pcre_exec allows less options - see pcre_internal.h PUBLIC_EXEC_OPTIONS.
+    Int_t nrMatch = pcre_exec(fPriv->fPCRE, fPriv->fPCREExtra, s.Data(),
+                              s.Length(), start, 0,
+                              offVec, 3*nMaxMatch);
++#endif
+ 
+    if (nrMatch == PCRE_ERROR_NOMATCH)
+       nrMatch = 0;
+    else if (nrMatch <= 0) {
+       Error("Match","pcre_exec error = %d", nrMatch);
++#ifdef USE_PCRE2
++      pcre2_match_data_free(match_data);
++#endif
+       delete [] offVec;
+       return 0;
+    }
+ 
+-   if (pos)
++   if (pos) {
++#ifdef USE_PCRE2
++      PCRE2_SIZE *oVec = pcre2_get_ovector_pointer(match_data);
++      for (int i = 0; i < 2 * nrMatch; ++i)
++         offVec[i] = oVec[i];
++#endif
+       pos->Set(2*nrMatch, offVec);
++   }
++
++#ifdef USE_PCRE2
++   pcre2_match_data_free(match_data);
++#endif
+    delete [] offVec;
+ 
+    return nrMatch;
+@@ -404,13 +475,24 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
+    Int_t offset = start;
+    Int_t last = 0;
+ 
++#ifdef USE_PCRE2
++   pcre2_match_data *match_data;
++   match_data = pcre2_match_data_create_from_pattern(fPriv->fPCRE, nullptr);
++#endif
++
+    while (kTRUE) {
+ 
+       // find next matching subs
+       // pcre_exec allows less options - see pcre_internal.h PUBLIC_EXEC_OPTIONS.
++#ifdef USE_PCRE2
++      Int_t nrMatch = pcre2_match(fPriv->fPCRE, (PCRE2_SPTR)s.Data(),
++                                  s.Length(), offset, 0,
++                                  match_data, nullptr);
++#else
+       Int_t nrMatch = pcre_exec(fPriv->fPCRE, fPriv->fPCREExtra, s.Data(),
+                                 s.Length(), offset, 0,
+                                 offVec, 3*nMaxMatch);
++#endif
+ 
+       if (nrMatch == PCRE_ERROR_NOMATCH) {
+          break;
+@@ -419,6 +501,12 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
+          break;
+       }
+ 
++#ifdef USE_PCRE2
++      PCRE2_SIZE *oVec = pcre2_get_ovector_pointer(match_data);
++      for (int i = 0; i < 2 * nrMatch; ++i)
++         offVec[i] = oVec[i];
++#endif
++
+       // append anything previously unmatched, but not substituted
+       if (last <= offVec[0]) {
+          fin += s(last,offVec[0]-last);
+@@ -446,6 +534,9 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
+       }
+    }
+ 
++#ifdef USE_PCRE2
++   pcre2_match_data_free(match_data);
++#endif
+    delete [] offVec;
+ 
+    fin += s(last,s.Length()-last);
+diff --git a/tutorials/legacy/regexp/regexp.C b/tutorials/legacy/regexp/regexp.C
+index 995b823bce..f38ed6799e 100644
+--- a/tutorials/legacy/regexp/regexp.C
++++ b/tutorials/legacy/regexp/regexp.C
+@@ -94,11 +94,11 @@ void regexp()
+    // criteria:
+    // 1) It should be of the form string1@string2 . The "^" and "$" ensure that we compare the complete
+    //    email string
+-   // 2) ([\\w-\\.]+)  :
++   // 2) ([\\w\\-\\.]+)  :
+    //    string1 is only allowed to be composed out of the alphanumeric characters, "-" and "." .
+    //    The "+" ensures that string1 can not be empty .
+    // 3) string2 is matched against three different parts :
+-   //    a. ((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w-]+\\.)+))  :
++   //    a. ((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w\\-]+\\.)+))  :
+    //       This regular expression ensures that EITHER the string starts with "[" followed by three groups
+    //       of numbers, separated by "." , where each group has 1 to 3 numbers, OR alphanumeric strings,
+    //       possibly containing "-" characters, separated by "." .
+@@ -108,7 +108,7 @@ void regexp()
+    //       At most one "]" character .
+ 
+    TString s5("fons.rademakers@cern.ch");
+-   TPRegexp r5("^([\\w-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
++   TPRegexp r5("^([\\w\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
+    cout << "Check if the email address \"" << s5 << "\" is valid: " << (r5.MatchB(s5) ? "TRUE" : "FALSE") << endl;
+ 
+    // Substitute Example with pattern modifier :
+-- 
+2.41.0
+
diff --git a/root-tmva-rbdt.patch b/root-tmva-rbdt.patch
new file mode 100644
index 0000000..b7afb2d
--- /dev/null
+++ b/root-tmva-rbdt.patch
@@ -0,0 +1,40 @@
+From c3eb92abb450aee2e3a798218ca2d309524dab11 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 14 Oct 2023 15:51:16 +0200
+Subject: [PATCH] src/RBDT.cxx is a source file of libTMVAUtils and should not
+ also be a source file of libTMVA. Remove it. Adjust test using symbols
+ defined in this source file to link to libTMVAUtils instead of libTMVA.
+
+---
+ tmva/tmva/CMakeLists.txt      | 1 -
+ tmva/tmva/test/CMakeLists.txt | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tmva/tmva/CMakeLists.txt b/tmva/tmva/CMakeLists.txt
+index 84efce9d59..109f4c1021 100644
+--- a/tmva/tmva/CMakeLists.txt
++++ b/tmva/tmva/CMakeLists.txt
+@@ -334,7 +334,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TMVA
+     src/PDEFoamVect.cxx
+     src/PDF.cxx
+     src/QuickMVAProbEstimator.cxx
+-    src/RBDT.cxx
+     src/Ranking.cxx
+     src/Reader.cxx
+     src/RegressionVariance.cxx
+diff --git a/tmva/tmva/test/CMakeLists.txt b/tmva/tmva/test/CMakeLists.txt
+index ebe1be187b..5dcf5175f2 100644
+--- a/tmva/tmva/test/CMakeLists.txt
++++ b/tmva/tmva/test/CMakeLists.txt
+@@ -29,7 +29,7 @@ if(dataframe)
+     # Tree inference system and user interface
+     if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+         ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
+-        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
++        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVAUtils)
+     endif()
+ endif()
+ 
+-- 
+2.41.0
+
diff --git a/root.spec b/root.spec
index aa32b3c..b880090 100644
--- a/root.spec
+++ b/root.spec
@@ -53,7 +53,7 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.28.06
+Version:	6.28.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -102,7 +102,7 @@ Patch7:		%{name}-big-endian-byte-swap.patch
 #		https://github.com/root-project/root/pull/12375
 Patch8:		%{name}-use-consistent-wording-in-tmva-test-comments.patch
 #		https://github.com/root-project/root/pull/12390
-Patch9:	%{name}-stressvector-test-fails-on-ix86.patch
+Patch9:		%{name}-stressvector-test-fails-on-ix86.patch
 #		https://github.com/root-project/root/pull/12423
 Patch10:	%{name}-dont-install-roofit-files-fix.patch
 #		https://github.com/root-project/root/issues/12427
@@ -110,6 +110,18 @@ Patch10:	%{name}-dont-install-roofit-files-fix.patch
 Patch11:	%{name}-fixes-for-32bit-builds.patch
 #		https://github.com/root-project/root/pull/12476
 Patch12:	%{name}-do-not-remove-Wp-before-D-and-U.patch
+#		Avoid boolean operators on numpy arrays in unit test
+#		https://github.com/root-project/root/issues/12162
+#		https://github.com/root-project/root/pull/13612
+Patch13:	root-boolean-numpy-array.patch
+#		Port to pcre2
+#		https://github.com/root-project/root/issues/11395
+#		https://github.com/root-project/root/pull/13771
+Patch14:	root-pcre2.patch
+Patch15:	root-pcre2-6.28.patch
+#		src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
+#		https://github.com/root-project/root/pull/13863
+Patch16:	root-tmva-rbdt.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -125,7 +137,7 @@ BuildRequires:	fcgi-devel
 BuildRequires:	ftgl-devel
 BuildRequires:	gl2ps-devel
 BuildRequires:	glew-devel
-BuildRequires:	pcre-devel
+BuildRequires:	pcre2-devel
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:	lz4-devel
@@ -169,8 +181,6 @@ BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
 BuildRequires:	tbb-devel >= 2018
 BuildRequires:	libuuid-devel
-BuildRequires:	emacs
-BuildRequires:	emacs-el
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
@@ -222,9 +232,6 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
-Requires:	emacs-filesystem >= %{_emacs_version}
-Provides:	emacs-%{name} = %{version}-%{release}
-Provides:	emacs-%{name}-el = %{version}-%{release}
 Obsoletes:	emacs-%{name} < 5.34.28
 Obsoletes:	emacs-%{name}-el < 5.34.28
 
@@ -1577,6 +1584,8 @@ Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
+#		Library split (tmva-utils from tmva)
+Obsoletes:	%{name}-tmva < 6.28.08
 
 %description tmva
 The Toolkit for Multivariate Analysis (TMVA) provides a
@@ -1598,6 +1607,19 @@ evaluation). In addition all these methods can be tested in parallel,
 and hence their performance on a particular data set may easily be
 compared.
 
+%if %{dataframe}
+%package tmva-utils
+Summary:	Toolkit for multivariate data analysis (dataframe utilities)
+License:	BSD-3-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+#		Library split (tmva-utils from tmva)
+Obsoletes:	%{name}-tmva < 6.28.08
+
+%description tmva-utils
+TMVA utilities using dataframe.
+%endif
+
 %package tmva-python
 Summary:	Toolkit for multivariate data analysis (Python)
 License:	BSD-3-Clause
@@ -1757,7 +1779,7 @@ written in python.
 Summary:	Static files for the Jupyter ROOT Notebook
 BuildArch:	noarch
 Requires:	%{name}-core = %{version}-%{release}
-Requires:	js-jsroot >= 6
+Requires:	js-jsroot >= 7
 %if %{?fedora}%{!?fedora:0}
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -1994,6 +2016,10 @@ This package contains extra tools for RooFit projects.
 %patch -P 10 -p1
 %patch -P 11 -p1
 %patch -P 12 -p1
+%patch -P 13 -p1
+%patch -P 14 -p1
+%patch -P 15 -p1
+%patch -P 16 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2068,7 +2094,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-       -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_afterimage:BOOL=OFF \
        -Dbuiltin_cfitsio:BOOL=OFF \
@@ -2229,10 +2254,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 # Let rpm redo the python byte compilation
 find %{buildroot}%{python3_sitearch} -depth -type d -name __pycache__ -exec rm -r {} ';'
 
-# Do emacs byte compilation
-emacs -batch -no-site-file -f batch-byte-compile \
-    %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el
-
 # Install desktop entry and icon
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
@@ -2590,16 +2611,6 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
-%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
-%ifarch %{ix86}
-# - pyunittests-pyroot-roofit-roodataset-numpy
-#   Failures with Fedora 37/38 i686 (after numpy 1.24 update)
-#   https://github.com/root-project/root/issues/12162
-excluded="${excluded}|\
-pyunittests-pyroot-roofit-roodataset-numpy"
-%endif
-%endif
-
 %ifarch %{power64}
 # PPC64LE specific failures
 # - test-stresshistofit-interpreted
@@ -2893,6 +2904,9 @@ fi
 %ldconfig_scriptlets sql-sqlite
 %ldconfig_scriptlets sql-pgsql
 %ldconfig_scriptlets tmva
+%if %{dataframe}
+%ldconfig_scriptlets tmva-utils
+%endif
 %ldconfig_scriptlets tmva-python
 %ldconfig_scriptlets tmva-r
 %ldconfig_scriptlets tmva-sofie
@@ -2952,9 +2966,6 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/root.png
 %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
 %{_datadir}/mime/packages/root.xml
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitelispdir}/%{name}/*.el
 
 %files icons
 %{_datadir}/%{name}/icons
@@ -2997,6 +3008,8 @@ fi
 %{_mandir}/man1/system.rootdaemonrc.1*
 %dir %{_datadir}/%{name}/cmake
 %{_datadir}/%{name}/cmake/*.cmake
+%dir %{_datadir}/%{name}/cmake/modules
+%{_datadir}/%{name}/cmake/modules/*.cmake
 %dir %{_datadir}/%{name}/macros
 %{_datadir}/%{name}/macros/Dialogs.C
 %dir %{_datadir}/%{name}/plugins
@@ -3572,6 +3585,34 @@ fi
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
 %license tmva/doc/LICENSE
+%exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
+%exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
+%exclude %{_includedir}/%{name}/TMVA/RReader.hxx
+%exclude %{_includedir}/%{name}/TMVA/RSofieReader.hxx
+%exclude %{_includedir}/%{name}/TMVA/RStandardScaler.hxx
+%exclude %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
+%exclude %{_includedir}/%{name}/TMVA/TreeInference/BranchlessTree.hxx
+%exclude %{_includedir}/%{name}/TMVA/TreeInference/Forest.hxx
+%exclude %{_includedir}/%{name}/TMVA/TreeInference/Objectives.hxx
+%exclude %{_includedir}/%{name}/TMVA/TreeInference/PythonHelpers.hxx
+
+%if %{dataframe}
+%files tmva-utils
+%{_libdir}/%{name}/libTMVAUtils.*
+%{_libdir}/%{name}/libTMVAUtils_rdict.pcm
+%dir %{_includedir}/%{name}/TMVA
+%dir %{_includedir}/%{name}/TMVA/TreeInference
+%{_includedir}/%{name}/TMVA/RBDT.hxx
+%{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
+%{_includedir}/%{name}/TMVA/RReader.hxx
+%{_includedir}/%{name}/TMVA/RSofieReader.hxx
+%{_includedir}/%{name}/TMVA/RStandardScaler.hxx
+%{_includedir}/%{name}/TMVA/RTensorUtils.hxx
+%{_includedir}/%{name}/TMVA/TreeInference/BranchlessTree.hxx
+%{_includedir}/%{name}/TMVA/TreeInference/Forest.hxx
+%{_includedir}/%{name}/TMVA/TreeInference/Objectives.hxx
+%{_includedir}/%{name}/TMVA/TreeInference/PythonHelpers.hxx
+%endif
 
 %files tmva-python -f includelist-tmva-pymva
 %{_libdir}/%{name}/libPyMVA.*
@@ -3738,6 +3779,11 @@ fi
 %endif
 
 %changelog
+* Sat Oct 14 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-1
+- Update to 6.28.08
+- New subpackage root-tmva-utils (split off from root-tmva)
+- Port to pcre2
+
 * Tue Sep 05 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.06-1
 - Update to 6.28.06
 - Drop patches root-testRooAbsL-test-compares-two-doubles-and-fails.patch and
diff --git a/sources b/sources
index e30a52f..abdf4dd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.06.tar.xz) = 1a7252950517b480e036cf6e12d7eb675068e1d23df1f91822494d5f0ca769545a40a37b3478cc3cf3517a20e2b48a46a7b8ff2cd4601a7c23574de989195901
+SHA512 (root-6.28.08.tar.xz) = 868d770a05372677da84e4456023c1b2b575ff1eac8b6b841ed45dd1e0fd0c6c7aede533271b986404f2a55c91ea196ac2d8c81b3b4d1edfae159c0b665c415e
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From fb5c22a14dac9c1c25b9afcf43a4d813279d2b9c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@ellert.se>
Date: Wed, 1 Nov 2023 13:42:56 +0100
Subject: [PATCH 253/344] Enable RooFit::MultiProcess on Fedroa 40+

---
 root-Fix-cmake-modules-FindZeroMQ.cmake.patch | 51 +++++++++++++
 root.spec                                     | 75 ++++++++++++++++---
 2 files changed, 114 insertions(+), 12 deletions(-)
 create mode 100644 root-Fix-cmake-modules-FindZeroMQ.cmake.patch

diff --git a/root-Fix-cmake-modules-FindZeroMQ.cmake.patch b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
new file mode 100644
index 0000000..196ae81
--- /dev/null
+++ b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
@@ -0,0 +1,51 @@
+From f178a821b57043fdb7b722187e0175b975c7076b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 1 Nov 2023 10:04:03 +0100
+Subject: [PATCH] Fix cmake/modules/FindZeroMQ.cmake
+
+It now finds ZeroMQ in Fedora 40.
+---
+ cmake/modules/FindZeroMQ.cmake | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/modules/FindZeroMQ.cmake b/cmake/modules/FindZeroMQ.cmake
+index 24a1c171f5..bd8bf0b3db 100644
+--- a/cmake/modules/FindZeroMQ.cmake
++++ b/cmake/modules/FindZeroMQ.cmake
+@@ -38,17 +38,21 @@ set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+ set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+ 
+ # check for zmq_ppoll
+-if(ZeroMQ_FOUND)
+-    SET(SAVE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+-    SET(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
++if(ZeroMQ_LIBRARIES)
++    include(CheckCXXSymbolExists)
++    set(CMAKE_REQUIRED_LIBRARIES ${ZeroMQ_LIBRARIES})
++    set(CMAKE_REQUIRED_INCLUDES ${ZeroMQ_INCLUDE_DIRS})
++    set(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
+     check_cxx_symbol_exists(zmq_ppoll zmq.h ZeroMQ_HAS_PPOLL)
+-    SET(CMAKE_REQUIRED_DEFINITIONS "${SAVE_CMAKE_REQUIRED_DEFINITIONS}")
++    unset(CMAKE_REQUIRED_LIBRARIES)
++    unset(CMAKE_REQUIRED_INCLUDES)
++    unset(CMAKE_REQUIRED_DEFINITIONS)
+ endif()
+ 
+ include ( FindPackageHandleStandardArgs )
+ # handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
+ # if all listed variables are TRUE
+-find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL)
++find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL )
+ 
+ if(ZeroMQ_FOUND)
+     if(NOT TARGET libzmq)
+@@ -57,4 +61,4 @@ if(ZeroMQ_FOUND)
+                 IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+                 INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
+     endif()
+-endif()
+\ No newline at end of file
++endif()
+-- 
+2.41.0
+
diff --git a/root.spec b/root.spec
index b880090..1c76e82 100644
--- a/root.spec
+++ b/root.spec
@@ -40,12 +40,9 @@
 %global distrdf 0
 %endif
 
-# qt6-srpm-macros not in buildroot for Fedora 37/38 or EPEL 9
+# qt6-srpm-macros not in buildroot for Fedora 37/38
 # https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220860
-# Definition of qt6_qtwebengine_arches incorrect in qt6-srpm-macros
-# https://bugzilla.redhat.com/show_bug.cgi?id=2215703
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
 %global qt6_qtwebengine_arches aarch64 x86_64
 %endif
 
@@ -55,7 +52,7 @@
 Name:		root
 Version:	6.28.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -113,15 +110,18 @@ Patch12:	%{name}-do-not-remove-Wp-before-D-and-U.patch
 #		Avoid boolean operators on numpy arrays in unit test
 #		https://github.com/root-project/root/issues/12162
 #		https://github.com/root-project/root/pull/13612
-Patch13:	root-boolean-numpy-array.patch
+Patch13:	%{name}-boolean-numpy-array.patch
 #		Port to pcre2
 #		https://github.com/root-project/root/issues/11395
 #		https://github.com/root-project/root/pull/13771
-Patch14:	root-pcre2.patch
-Patch15:	root-pcre2-6.28.patch
+Patch14:	%{name}-pcre2.patch
+Patch15:	%{name}-pcre2-6.28.patch
 #		src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
 #		https://github.com/root-project/root/pull/13863
-Patch16:	root-tmva-rbdt.patch
+Patch16:	%{name}-tmva-rbdt.patch
+#		Fix cmake/modules/FindZeroMQ.cmake
+#		https://github.com/root-project/root/pull/13995
+Patch17:	%{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -204,6 +204,14 @@ BuildRequires:	protobuf-devel >= 3.0
 %ifnarch %{ix86} %{arm}
 BuildRequires:	libarrow-devel
 %endif
+%if %{roofit}
+%if %{?fedora}%{!?fedora:0} >= 40
+#		Required for roofit-multiprocess
+#		Requires new zeromq with zmq_ppoll
+BuildRequires:	zeromq-devel >= 4.3.5
+BuildRequires:	cppzmq-devel
+%endif
+%endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
@@ -1488,6 +1496,28 @@ suitable for adoption in different disciplines as well.
 
 This package contains the JSON interface to RooFit.
 
+%if %{?fedora}%{!?fedora:0} >= 40
+%package roofit-multiprocess
+Summary:	Multi-process support for RooFit
+License:	BSD-2-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-common%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-zmq%{?_isa} = %{version}-%{release}
+
+%description roofit-multiprocess
+This package contains a library providing classes that implements
+mult-process support for RooFit.
+
+%package roofit-zmq
+Summary:	ZeroMQ interface library for RooFit
+License:	BSD-2-Clause
+
+%description roofit-zmq
+This package contains a helper library used by RooFit::MultiProcess to
+interface to the ZeroMQ library.
+%endif
+
 %package roostats
 Summary:	Statistical tools built on top of RooFit
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -2020,6 +2050,7 @@ This package contains extra tools for RooFit projects.
 %patch -P 14 -p1
 %patch -P 15 -p1
 %patch -P 16 -p1
+%patch -P 17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2192,10 +2223,15 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dr:BOOL=ON \
 %if %{roofit}
        -Droofit:BOOL=ON \
+%if %{?fedora}%{!?fedora:0} >= 40
+       -Droofit_multiprocess:BOOL=ON \
+%else
+       -Droofit_multiprocess:BOOL=OFF \
+%endif
 %else
        -Droofit:BOOL=OFF \
-%endif
        -Droofit_multiprocess:BOOL=OFF \
+%endif
        -Droofit_hs3_ryml:BOOL=OFF \
 %if %{root7}
        -Droot7:BOOL=ON \
@@ -2894,8 +2930,12 @@ fi
 %if %{dataframe}
 %ldconfig_scriptlets roofit-dataframe-helpers
 %endif
-%ldconfig_scriptlets roofit-jsoninterface
 %ldconfig_scriptlets roofit-hs3
+%ldconfig_scriptlets roofit-jsoninterface
+%if %{?fedora}%{!?fedora:0} >= 40
+%ldconfig_scriptlets roofit-multiprocess
+%ldconfig_scriptlets roofit-zmq
+%endif
 %ldconfig_scriptlets roostats
 %ldconfig_scriptlets hist-factory
 %endif
@@ -3539,6 +3579,14 @@ fi
 %{_libdir}/%{name}/libRooFitJSONInterface.*
 %{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
 
+%if %{?fedora}%{!?fedora:0} >= 40
+%files roofit-multiprocess -f includelist-roofit-multiprocess
+%{_libdir}/%{name}/libRooFitMultiProcess.*
+
+%files roofit-zmq
+%{_libdir}/%{name}/libRooFitZMQ.*
+%endif
+
 %files roostats -f includelist-roofit-roostats
 %{_libdir}/%{name}/libRooStats.*
 %{_libdir}/%{name}/libRooStats_rdict.pcm
@@ -3779,6 +3827,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 01 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-2
+- Enable RooFit::MultiProcess on Fedroa 40+
+
 * Sat Oct 14 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-1
 - Update to 6.28.08
 - New subpackage root-tmva-utils (split off from root-tmva)

From ae0a7919250ae3903e9f4d78501b4cef0b775525 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 2 Nov 2023 12:45:23 +0100
Subject: [PATCH 254/344] Rebuilt for libarrow.so.1400

---
 root.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 1c76e82..96f8888 100644
--- a/root.spec
+++ b/root.spec
@@ -52,7 +52,7 @@
 Name:		root
 Version:	6.28.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3827,8 +3827,11 @@ fi
 %endif
 
 %changelog
+* Thu Nov 02 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-3
+- Rebuilt for libarrow.so.1400
+
 * Wed Nov 01 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-2
-- Enable RooFit::MultiProcess on Fedroa 40+
+- Enable RooFit::MultiProcess on Fedora 40+
 
 * Sat Oct 14 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-1
 - Update to 6.28.08

From 59989efa5f4087c1dd7b9eb3d4f660cd78c20675 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 26 Nov 2023 16:11:31 +0100
Subject: [PATCH 255/344] Update to 6.30.00

Removed subpackages: root-io-gfal and root-roofit-common
Dropped patches: 6
New patches: 6
---
 root-avoid-out-of-memory-during-linking.patch |  30 +
 root-boolean-numpy-array.patch                |  45 --
 root-clad.patch                               |  26 +
 root-do-not-remove-Wp-before-D-and-U.patch    |  44 --
 root-dont-install-roofit-files-fix.patch      |  26 -
 root-fixes-for-32bit-builds.patch             | 185 ------
 root-gtest-back.patch                         |  25 +
 ...about-RooNaNPacker-not-being-impleme.patch |  33 ++
 root-np32.patch                               |  89 +++
 root-old-gtest.patch                          |  54 ++
 root-pcre2-6.28.patch                         |  52 --
 root-pcre2.patch                              |  20 +
 root-stressvector-test-fails-on-ix86.patch    |  37 --
 root-tmva-rbdt.patch                          |   2 +-
 root.spec                                     | 551 ++++++++----------
 sources                                       |   2 +-
 16 files changed, 507 insertions(+), 714 deletions(-)
 create mode 100644 root-avoid-out-of-memory-during-linking.patch
 delete mode 100644 root-boolean-numpy-array.patch
 create mode 100644 root-clad.patch
 delete mode 100644 root-do-not-remove-Wp-before-D-and-U.patch
 delete mode 100644 root-dont-install-roofit-files-fix.patch
 delete mode 100644 root-fixes-for-32bit-builds.patch
 create mode 100644 root-gtest-back.patch
 create mode 100644 root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
 create mode 100644 root-np32.patch
 create mode 100644 root-old-gtest.patch
 delete mode 100644 root-pcre2-6.28.patch
 delete mode 100644 root-stressvector-test-fails-on-ix86.patch

diff --git a/root-avoid-out-of-memory-during-linking.patch b/root-avoid-out-of-memory-during-linking.patch
new file mode 100644
index 0000000..d182e44
--- /dev/null
+++ b/root-avoid-out-of-memory-during-linking.patch
@@ -0,0 +1,30 @@
+From 51b84e7bc21f8729de8d3e8f9ff08b337af33b78 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 17 Nov 2023 17:15:15 +0100
+Subject: [PATCH] Avoid out of memory during linking regardless of build type
+
+---
+ core/metacling/src/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
+index e750480eb3..dd50793d29 100644
+--- a/core/metacling/src/CMakeLists.txt
++++ b/core/metacling/src/CMakeLists.txt
+@@ -111,11 +111,8 @@ ROOT_LINKER_LIBRARY(Cling
+         $<TARGET_OBJECTS:MetaCling>
+         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
+ 
+-string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
+-if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
+-  # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
+-  add_dependencies(Cling rootcling_stage1)
+-endif()
++# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
++add_dependencies(Cling rootcling_stage1)
+ 
+ if(MSVC)
+   set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+-- 
+2.43.0
+
diff --git a/root-boolean-numpy-array.patch b/root-boolean-numpy-array.patch
deleted file mode 100644
index e5d6482..0000000
--- a/root-boolean-numpy-array.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b3dd4f1bfecea5b1b936d5507f8b0c664322a19 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Wed, 6 Sep 2023 02:16:33 +0200
-Subject: [PATCH] [RF][PyROOT] Avoid boolean operators on numpy arrays in unit
- test
-
-The `n_in_range` reference value in the unit test
-`roodataset_numpy.TestRooDataSetNumpy.test_ignoring_out_of_range`
-apparently doesn't get computed right on some 32 platforms.
-
-I can't reproduce the problem, but I'm sure it will be fixed by avoiding
-the use of the operators `&` and `|` with numpy arrays. Just doing a
-manual loop in Python should be more platform independent.
-
-Closes #12162.
----
- .../pythonizations/test/roofit/roodataset_numpy.py   | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-index 79259af321..5587677c45 100644
---- a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-+++ b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-@@ -135,9 +135,15 @@ class TestRooDataSetNumpy(unittest.TestCase):
-         cat.defineType("minus", -1)
-         cat.defineType("plus", +1)
- 
--        in_x_range = (data["x"] <= x.getMax()) & (data["x"] >= x.getMin())
--        in_cat_range = (data["cat"] == -1) | (data["cat"] == +1)
--        n_in_range = np.sum(in_x_range & in_cat_range)
-+        # Use manual loop because we had some problems with numpys boolean
-+        # comparisions in the past (see GitHub issue #12162).
-+        n_in_range = 0
-+        for i in range(n_events):
-+            in_x_range = data["x"][i] <= x.getMax() and data["x"][i] >= x.getMin()
-+            in_cat_range = (data["cat"][i] == -1) or (data["cat"][i] == +1)
-+            is_in_range = in_x_range and in_cat_range
-+            if is_in_range:
-+                n_in_range = n_in_range + 1
- 
-         dataset_numpy = ROOT.RooDataSet.from_numpy(data, {x, cat}, name="dataSetNumpy")
- 
--- 
-2.41.0
-
diff --git a/root-clad.patch b/root-clad.patch
new file mode 100644
index 0000000..0715240
--- /dev/null
+++ b/root-clad.patch
@@ -0,0 +1,26 @@
+From fae9b92742c5e991ad33769d1357a721838e93f9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 17 Nov 2023 11:37:23 +0100
+Subject: [PATCH 1/3] Add fit/exampleFit3D.C to clad veto
+
+---
+ tutorials/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index 5cba95407b..81f6539f03 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -74,7 +74,8 @@ if(NOT ROOT_minuit2_FOUND)
+ endif()
+ 
+ if(NOT clad)
+-  set(clad_veto fit/minuit2GausFit.C)
++  set(clad_veto fit/minuit2GausFit.C
++                fit/exampleFit3D.C)
+ endif()
+ 
+ # RBatchGenerator tutorials need Python 3.8+.
+-- 
+2.42.0
+
diff --git a/root-do-not-remove-Wp-before-D-and-U.patch b/root-do-not-remove-Wp-before-D-and-U.patch
deleted file mode 100644
index 820b7af..0000000
--- a/root-do-not-remove-Wp-before-D-and-U.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0191a987b7583c2aa84b1293105db353fee40b1d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 10 Mar 2023 20:49:02 +0100
-Subject: [PATCH] Do not remove -Wp, before -D and -U when recording used
- compiler flags
-
-This breaks the pattern used when undefining and then defining a
-variable in the same flag:
-
-$ echo | g++ -Wp,-UVAR,-DVAR=1 -c -x c++ -
-
-Here -Wp,-UVAR,-DVAR=1 will first undefine VAR and then define it to 1
-
-If the -Wp, is dropped, this fails:
-$ echo | g++ -UVAR,-DVAR=1 -c -x c++ -
-<command-line>: warning: extra tokens at end of #undef directive
-
-Now it will only undefine VAR, but not defin it. I.e.
-
-insted of
-
-you get
-
-which explains the rather cryptic warning about extra token after #undef.
----
- cmake/modules/RootConfiguration.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index 3d1ae9be53..042b43f039 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -729,7 +729,7 @@ if (cxxmodules)
- endif()
- 
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
--string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
-+string(REGEX MATCHALL "(-Wp,)?-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
- set(ROOT_CXX_FLAGS \"${__cxxflags}\")
--- 
-2.39.2
-
diff --git a/root-dont-install-roofit-files-fix.patch b/root-dont-install-roofit-files-fix.patch
deleted file mode 100644
index 295a4b7..0000000
--- a/root-dont-install-roofit-files-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 74aaf99530443a712f9b0577d8edde615ea8902d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 4 Mar 2023 21:27:35 +0100
-Subject: [PATCH] Use FILTER instead of REMOVE_ITEM since GLOB returns absolute
- paths
-
----
- build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index e964b5e255..2b24b1d6e6 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -30,7 +30,7 @@ ROOT_EXECUTABLE(rmkdepend
- if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
-   file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
-   if(NOT roofit)
--    list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
-+    list(FILTER PRETTY_PRINTERS EXCLUDE REGEX libRooFitCore.so-gdb.py)
-   endif()
-   set(PRETTY_PRINTER_DESTS)
-   foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
--- 
-2.39.2
-
diff --git a/root-fixes-for-32bit-builds.patch b/root-fixes-for-32bit-builds.patch
deleted file mode 100644
index bcff78d..0000000
--- a/root-fixes-for-32bit-builds.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 6f69a59010a60c949b1955e52275137e39a85b82 Mon Sep 17 00:00:00 2001
-From: Jakob Blomer <jblomer@cern.ch>
-Date: Thu, 9 Mar 2023 15:14:22 +0100
-Subject: [PATCH] [ntuple] fixes for 32bit / non-x86_64 builds
-
----
- tree/dataframe/src/RNTupleDS.cxx        |  1 +
- tree/ntuple/v7/inc/ROOT/RField.hxx      | 21 +++++++++++++++++++--
- tree/ntuple/v7/test/ntuple_extended.cxx |  8 ++++----
- 3 files changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/tree/dataframe/src/RNTupleDS.cxx b/tree/dataframe/src/RNTupleDS.cxx
-index f7eb0ab5f284..aaea6df81622 100644
---- a/tree/dataframe/src/RNTupleDS.cxx
-+++ b/tree/dataframe/src/RNTupleDS.cxx
-@@ -94,6 +94,7 @@ class RRDFCardinalityField : public ROOT::Experimental::Detail::RFieldBase {
-       return ROOT::Experimental::Detail::RFieldValue(true /* captureFlag */, this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::size_t); }
-+   size_t GetAlignment() const final { return alignof(std::size_t); }
- 
-    /// Get the number of elements of the collection identified by globalIndex
-    void
-diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx
-index b05267d16030..9a85368a94e3 100644
---- a/tree/ntuple/v7/inc/ROOT/RField.hxx
-+++ b/tree/ntuple/v7/inc/ROOT/RField.hxx
-@@ -270,8 +270,9 @@ public:
-    virtual std::vector<RFieldValue> SplitValue(const RFieldValue &value) const;
-    /// The number of bytes taken by a value of the appropriate type
-    virtual size_t GetValueSize() const = 0;
--   /// For many types, the alignment requirement is equal to the size; otherwise override.
--   virtual size_t GetAlignment() const { return GetValueSize(); }
-+   /// As a rule of thumb, the alignment is equal to the size of the type. There are, however, various exceptions
-+   /// to this rule depending on OS and CPU architecture. So enforce the alignment to be explicitly spelled out.
-+   virtual size_t GetAlignment() const = 0;
-    int GetTraits() const { return fTraits; }
-    bool HasReadCallbacks() const { return !fReadCallbacks.empty(); }
- 
-@@ -383,6 +384,7 @@ public:
-    Detail::RFieldValue GenerateValue(void*) override { return Detail::RFieldValue(); }
-    Detail::RFieldValue CaptureValue(void*) final { return Detail::RFieldValue(); }
-    size_t GetValueSize() const final { return 0; }
-+   size_t GetAlignment() const final { return 0; }
- 
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-@@ -889,6 +891,7 @@ public:
-          Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+   size_t GetAlignment() const final { return alignof(ClusterSize_t); }
-    void CommitCluster() final;
- };
- 
-@@ -990,6 +993,7 @@ public:
-          Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+   size_t GetAlignment() const final { return alignof(ClusterSize_t); }
- 
-    /// Special help for offset fields
-    void GetCollectionInfo(NTupleSize_t globalIndex, RClusterIndex *collectionStart, ClusterSize_t *size) {
-@@ -1110,6 +1115,7 @@ public:
-          Detail::RColumnElement<bool>(static_cast<bool*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(bool); }
-+   size_t GetAlignment() const final { return alignof(bool); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1162,6 +1168,7 @@ public:
-          Detail::RColumnElement<float>(static_cast<float*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(float); }
-+   size_t GetAlignment() const final { return alignof(float); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1215,6 +1222,7 @@ public:
-          Detail::RColumnElement<double>(static_cast<double*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(double); }
-+   size_t GetAlignment() const final { return alignof(double); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1267,6 +1275,7 @@ public:
-          Detail::RColumnElement<char>(static_cast<char*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(char); }
-+   size_t GetAlignment() const final { return alignof(char); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1319,6 +1328,7 @@ public:
-          Detail::RColumnElement<std::int8_t>(static_cast<std::int8_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::int8_t); }
-+   size_t GetAlignment() const final { return alignof(std::int8_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1371,6 +1381,7 @@ public:
-          Detail::RColumnElement<std::uint8_t>(static_cast<std::uint8_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::uint8_t); }
-+   size_t GetAlignment() const final { return alignof(std::uint8_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1423,6 +1434,7 @@ public:
-          Detail::RColumnElement<std::int16_t>(static_cast<std::int16_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::int16_t); }
-+   size_t GetAlignment() const final { return alignof(std::int16_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1475,6 +1487,7 @@ public:
-          Detail::RColumnElement<std::uint16_t>(static_cast<std::uint16_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::uint16_t); }
-+   size_t GetAlignment() const final { return alignof(std::uint16_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1527,6 +1540,7 @@ public:
-          Detail::RColumnElement<std::int32_t>(static_cast<std::int32_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::int32_t); }
-+   size_t GetAlignment() const final { return alignof(std::int32_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1579,6 +1593,7 @@ public:
-          Detail::RColumnElement<std::uint32_t>(static_cast<std::uint32_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::uint32_t); }
-+   size_t GetAlignment() const final { return alignof(std::uint32_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1631,6 +1646,7 @@ public:
-          Detail::RColumnElement<std::uint64_t>(static_cast<std::uint64_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::uint64_t); }
-+   size_t GetAlignment() const final { return alignof(std::uint64_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-@@ -1683,6 +1699,7 @@ public:
-          Detail::RColumnElement<std::int64_t>(static_cast<std::int64_t*>(where)), this, where);
-    }
-    size_t GetValueSize() const final { return sizeof(std::int64_t); }
-+   size_t GetAlignment() const final { return alignof(std::int64_t); }
-    void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
- 
-diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
-index 91871e288e98..d3b6ee466359 100644
---- a/tree/ntuple/v7/test/ntuple_extended.cxx
-+++ b/tree/ntuple/v7/test/ntuple_extended.cxx
-@@ -123,8 +123,8 @@ TEST(RNTuple, LargeFile1)
-       RNTupleWriteOptions options;
-       options.SetCompression(0);
-       auto ntuple = RNTupleWriter::Recreate(std::move(modelWrite), "myNTuple", fileGuard.GetPath(), options);
--      constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
--      for (unsigned int i = 0; i < nEvents; ++i) {
-+      constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+      for (std::uint64_t i = 0; i < nEvents; ++i) {
-          wrEnergy = rnd.Rndm();
-          chksumWrite += wrEnergy;
-          ntuple->Fill();
-@@ -195,8 +195,8 @@ TEST(RNTuple, LargeFile2)
- 
-    TRandom3 rnd(42);
-    double chksumWrite = 0.0;
--   constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
--   for (unsigned int i = 0; i < nEvents; ++i) {
-+   constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+   for (std::uint64_t i = 0; i < nEvents; ++i) {
-       *E = rnd.Rndm();
-       chksumWrite += *E;
-       writer->Fill();
diff --git a/root-gtest-back.patch b/root-gtest-back.patch
new file mode 100644
index 0000000..1624451
--- /dev/null
+++ b/root-gtest-back.patch
@@ -0,0 +1,25 @@
+From 1942f5569b1d101f2c89341765ea37850e3de669 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 17 Nov 2023 11:43:46 +0100
+Subject: [PATCH 2/3] Add old gtest compat for SetUpTestSuite/TearDownTestSuite
+
+---
+ tree/tree/test/friendinfo.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tree/tree/test/friendinfo.cxx b/tree/tree/test/friendinfo.cxx
+index 141a495052..6e94056946 100644
+--- a/tree/tree/test/friendinfo.cxx
++++ b/tree/tree/test/friendinfo.cxx
+@@ -14,6 +14,8 @@
+ // Backward compatibility for gtest version < 1.10.0
+ #ifndef INSTANTIATE_TEST_SUITE_P
+ #define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#define SetUpTestSuite SetUpTestCase
++#define TearDownTestSuite TearDownTestCase
+ #endif
+ 
+ namespace {
+-- 
+2.42.0
+
diff --git a/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
new file mode 100644
index 0000000..20e2ee5
--- /dev/null
+++ b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
@@ -0,0 +1,33 @@
+From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 28 Mar 2022 09:20:18 +0200
+Subject: [PATCH] Ignore warnings about RooNaNPacker not being implemented for
+ big endian
+
+This warning is triggered in many tests, so it makes sense to put it
+in the default ignored set.
+---
+ core/testsupport/src/TestSupport.cxx | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
+index 259ab4e09c..79cd476950 100644
+--- a/core/testsupport/src/TestSupport.cxx
++++ b/core/testsupport/src/TestSupport.cxx
+@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
+         return;
+       }
+ 
++      // FIXME: RooNaNPacker warns about not being implemented for big endian
++      if (level == kWarning
++	  && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
++        std::cerr << "Warning in " << location << " " << msg << std::endl;
++        return;
++      }
++
+       FAIL() << "Received unexpected diagnostic of severity "
+          << level
+          << " at '" << location << "' reading '" << msg << "'.\n"
+-- 
+2.42.0
+
diff --git a/root-np32.patch b/root-np32.patch
new file mode 100644
index 0000000..3ac6f41
--- /dev/null
+++ b/root-np32.patch
@@ -0,0 +1,89 @@
+From 88162e7738d810f8203ed0242179f7af94ded500 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 17 Nov 2023 11:46:14 +0100
+Subject: [PATCH 3/3] Fix pythonizations test errors on ix86 Linux
+
+======================================================================
+ERROR: test_sliced_array (rdataframe_makenumpy.DataFrameFromNumpy.test_sliced_array)
+Test correct reading of a sliced numpy array (#13690)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py", line 153, in test_sliced_array
+    x_col = df.Take['Long64_t']("x")
+            ^^^^^^^^^^^^^^^^^^^^^^^^
+cppyy.gbl.std.runtime_error: Could not instantiate Take<Long64_t>:
+  ROOT::RDF::RResultPtr<vector<Long64_t> > ROOT::RDF::RInterface<ROOT::Detail::RDF::RLoopManager,void>::Take(basic_string_view<char,char_traits<char> > column = "") =>
+    runtime_error: Column x has type int while the id specified is associated to type Long64_t
+----------------------------------------------------------------------
+
+======================================================================
+ERROR: test_dtypes (rtensor.AsRTensor.test_dtypes)
+Test adoption of numpy arrays with different data types
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rtensor.py", line 45, in test_dtypes
+    root_obj = ROOT.TMVA.Experimental.RTensor(self.cpptypes[i])(np_obj)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/builddir/build/BUILD/root-6.30.00/redhat-linux-build/lib/ROOT/_pythonization/_tmva/_rtensor.py", line 131, in RTensorInit
+    return self._original_init_(data,shape,layout)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+TypeError: none of the 6 overloaded methods succeeded. Full details:
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(TMVA::Experimental::RTensor<long,vector<long> >&&) =>
+    TypeError: takes at most 1 arguments (3 given)
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(const TMVA::Experimental::RTensor<long,vector<long> >&) =>
+    TypeError: takes at most 1 arguments (3 given)
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(shared_ptr<vector<long> > container, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+    TypeError: could not convert argument 1
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+    TypeError: takes at most 2 arguments (3 given)
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, vector<unsigned int> strides, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+    TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+  RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+    TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+----------------------------------------------------------------------
+---
+ .../pyroot/pythonizations/test/rdataframe_makenumpy.py     | 2 +-
+ bindings/pyroot/pythonizations/test/rtensor.py             | 7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+index cd2ebc9b5b..1860bd49f5 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+@@ -147,7 +147,7 @@ class DataFrameFromNumpy(unittest.TestCase):
+         """
+         Test correct reading of a sliced numpy array (#13690)
+         """
+-        table = np.array([[1,2], [3,4]])
++        table = np.array([[1,2], [3,4]], dtype="int64")
+         columns = {'x': table[:,0], 'y': table[:,1]}
+         df = ROOT.RDF.FromNumpy(columns)
+         x_col = df.Take['Long64_t']("x")
+diff --git a/bindings/pyroot/pythonizations/test/rtensor.py b/bindings/pyroot/pythonizations/test/rtensor.py
+index 99b458cfa9..070a5d24d0 100644
+--- a/bindings/pyroot/pythonizations/test/rtensor.py
++++ b/bindings/pyroot/pythonizations/test/rtensor.py
+@@ -3,6 +3,7 @@ import ROOT
+ RTensor = ROOT.TMVA.Experimental.RTensor
+ import numpy as np
+ import platform
++import sys
+ 
+ 
+ def check_shape(root_obj, np_obj):
+@@ -28,8 +29,10 @@ class AsRTensor(unittest.TestCase):
+         """
+         Test adoption of numpy arrays with different data types
+         """
+-        #using long long on Linux does not work although it is same size as long
+-        if (platform.system() == "Windows") :
++        # Using long long on 64 bit Linux does not work although it is
++        # same size as long
++        if ((platform.system() == "Windows") or
++            ((platform.system() == "Linux") and (sys.maxsize < 2**32))) :
+                 self.cpptypes[1] = "long long"
+                 self.cpptypes[3] = "unsigned long long"
+ 
+-- 
+2.42.0
+
diff --git a/root-old-gtest.patch b/root-old-gtest.patch
new file mode 100644
index 0000000..bdefd48
--- /dev/null
+++ b/root-old-gtest.patch
@@ -0,0 +1,54 @@
+diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
+index 7553ba4e4a..fefdca8e97 100644
+--- a/roofit/histfactory/test/testHistFactory.cxx
++++ b/roofit/histfactory/test/testHistFactory.cxx
+@@ -752,6 +752,7 @@ std::string getNameFromInfo(testing::TestParamInfo<HFFixture::ParamType> const &
+    return getName(paramInfo.param, false);
+ }
+ 
++/*
+ INSTANTIATE_TEST_SUITE_P(
+    HistFactory, HFFixture,
+    testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
+@@ -784,3 +785,4 @@ INSTANTIATE_TEST_SUITE_P(HistFactoryCodeGen, HFFixtureFit,
+                                           testing::Values(RooFit::EvalBackend::Codegen())),
+                          getNameFromInfo);
+ #endif
++*/
+diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
+index 34fb559cd1..09734f5c5d 100644
+--- a/roofit/roofitcore/test/testRooProdPdf.cxx
++++ b/roofit/roofitcore/test/testRooProdPdf.cxx
+@@ -64,6 +64,7 @@ TEST_P(TestProdPdf, CachingOpt)
+       << "b=" << b.getVal() << " +- " << b.getError() << " doesn't match truth value with O" << _optimize << ".";
+ }
+ 
++/*
+ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+                          testing::Combine(testing::Values(0, 1, 2),
+                                           testing::Values(ROOFIT_EVAL_BACKENDS)),
+@@ -72,6 +73,7 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+                             ss << "opt" << std::get<0>(paramInfo.param) << std::get<1>(paramInfo.param).name();
+                             return ss.str();
+                          });
++*/
+ 
+ TEST(RooProdPdf, TestGetPartIntList)
+ {
+diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
+index 3099d82060..5846353043 100644
+--- a/roofit/roofitcore/test/testTestStatistics.cxx
++++ b/roofit/roofitcore/test/testTestStatistics.cxx
+@@ -585,6 +585,7 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values(ROOFIT_EV
+                             return ss.str();
+                          });
+ 
++/*
+ INSTANTIATE_TEST_SUITE_P(RooNLLVar, OffsetBinTest,
+                          testing::Combine(testing::Values(ROOFIT_EVAL_BACKENDS), // EvalBackend
+                                           testing::Values(false, true),   // unbinned or binned
+@@ -622,3 +623,4 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVarBinnedL, OffsetBinTest,
+                             ss << (std::get<5>(paramInfo.param) ? "BinnedL" : "");
+                             return ss.str();
+                          });
++*/
diff --git a/root-pcre2-6.28.patch b/root-pcre2-6.28.patch
deleted file mode 100644
index db907b5..0000000
--- a/root-pcre2-6.28.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur root-6.28.06.orig/core/base/CMakeLists.txt root-6.28.06/core/base/CMakeLists.txt
---- root-6.28.06.orig/core/base/CMakeLists.txt	2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/base/CMakeLists.txt	2023-10-02 01:53:35.956143717 +0200
-@@ -212,9 +212,15 @@
- 
- ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
- 
-+if (PCRE2_FOUND)
-+  set(PCRE_INCDIR ${PCRE2_INCLUDE_DIR})
-+else()
-+  set(PCRE_INCDIR ${PCRE_INCLUDE_DIR})
-+endif()
-+
- target_include_directories(Base PRIVATE
-    ${BASE_V7_INC}
--   ${PCRE_INCLUDE_DIR}
-+   ${PCRE_INCDIR}
-    res
-    ${CMAKE_SOURCE_DIR}/core/foundation/res
-    ${CMAKE_SOURCE_DIR}/core/clib/inc
-@@ -237,6 +243,11 @@
-   ${CMAKE_BINARY_DIR}/ginclude/TApplicationCommandLineOptionsHelp.h
- )
- 
-+if(PCRE2_FOUND)
-+  set_source_files_properties(src/TPRegexp.cxx
-+    PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
-+endif()
-+
- ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
- 
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man)
-diff -ur root-6.28.06.orig/core/CMakeLists.txt root-6.28.06/core/CMakeLists.txt
---- root-6.28.06.orig/core/CMakeLists.txt	2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/CMakeLists.txt	2023-10-02 01:47:00.134174041 +0200
-@@ -261,9 +261,15 @@
- 
- target_include_directories(G__Core PRIVATE ${CMAKE_SOURCE_DIR}/core/clingutils/inc)
- 
-+if (PCRE2_FOUND)
-+  set (PCRE_TGT PCRE2::PCRE2)
-+else()
-+  set (PCRE_TGT PCRE::PCRE)
-+endif()
-+
- target_link_libraries(Core
-   PRIVATE
--    PCRE::PCRE
-+    ${PCRE_TGT}
-     ${LIBLZMA_LIBRARIES}
-     xxHash::xxHash
-     LZ4::LZ4
diff --git a/root-pcre2.patch b/root-pcre2.patch
index 8d1adee..359acc2 100644
--- a/root-pcre2.patch
+++ b/root-pcre2.patch
@@ -165,6 +165,26 @@ index 464155fd50..252aa56737 100644
      endif()
    endif()
  endif()
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index df701fedea..5798c93775 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -214,7 +214,14 @@ target_include_directories(Core PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/v7/inc>
+ )
+ 
+-target_link_libraries(Core PRIVATE PCRE::PCRE)
++if(PCRE2_FOUND)
++  target_link_libraries(Core PRIVATE PCRE2::PCRE2)
++  set_source_files_properties(src/TPRegexp.cxx
++    TARGET_DIRECTORY Core
++    PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
++else()
++  target_link_libraries(Core PRIVATE PCRE::PCRE)
++endif()
+ 
+ ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
+ 
 diff --git a/core/base/src/TPRegexp.cxx b/core/base/src/TPRegexp.cxx
 index 949b8cc8e9..d70f3e5b8b 100644
 --- a/core/base/src/TPRegexp.cxx
diff --git a/root-stressvector-test-fails-on-ix86.patch b/root-stressvector-test-fails-on-ix86.patch
deleted file mode 100644
index fa519f2..0000000
--- a/root-stressvector-test-fails-on-ix86.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae37d7eceeb25e4a09e8504275083e6830832d6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 28 Feb 2023 11:33:28 +0100
-Subject: [PATCH] The stressVector test fails on ix86 due to too strict check:
-
-DeltaR   TLorentzVector      	 time = 0.2610929	(sec)
-DeltaR   XYZTVector          	 time = 0.22973299	(sec)
-DeltaR   PtEtaPhiEVector     	 time = 0.0016570091	(sec)
--12823.3585955796	-12823.35859557827	-12823.35859557827
-Test DeltaR failed !!
-
-The new value for the scale parameter (50) was calculated from the
-above values:
-
-root [2] (-12823.3585955796 - (-12823.35859557827)) / -12823.3585955796 / std::numeric_limits<double>::epsilon() / 10
-(double) 46.762663
----
- test/stressVector.cxx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/stressVector.cxx b/test/stressVector.cxx
-index b0ba21e845..18dc97d421 100644
---- a/test/stressVector.cxx
-+++ b/test/stressVector.cxx
-@@ -540,8 +540,7 @@ int main(int argc,const char *argv[]) {
-       s1=a.testDeltaR   (v1, t, t1,      "DeltaR   TLorentzVector      " );
-       s2=a.testDeltaR   (v2, t, t2,      "DeltaR   XYZTVector          " );
-       s3=a.testDeltaR   (v3, t, t3,      "DeltaR   PtEtaPhiEVector     " );
--      a.check("DeltaR",s1,s2,s3,20);
--
-+      a.check("DeltaR", s1, s2, s3, 50);
- 
-       int n1, n2, n3;
-       n1 = a.testAnalysis (v1, t, t1, "Analysis1 TLorentzVector     " );
--- 
-2.40.1
-
diff --git a/root-tmva-rbdt.patch b/root-tmva-rbdt.patch
index b7afb2d..b31769a 100644
--- a/root-tmva-rbdt.patch
+++ b/root-tmva-rbdt.patch
@@ -28,7 +28,7 @@ index ebe1be187b..5dcf5175f2 100644
 +++ b/tmva/tmva/test/CMakeLists.txt
 @@ -29,7 +29,7 @@ if(dataframe)
      # Tree inference system and user interface
-     if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+     if(NOT MSVC OR llvm13_broken_tests)
          ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
 -        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
 +        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVAUtils)
diff --git a/root.spec b/root.spec
index 96f8888..547164c 100644
--- a/root.spec
+++ b/root.spec
@@ -7,13 +7,7 @@
 
 %global python3_version_uscore %(tr . _ <<< "%{python3_version}")
 
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# Building the experimental ROOT 7 classes requires c++-17.
-# This is the default for gcc 11 and later.
 %global root7 1
-%else
-%global root7 0
-%endif
 
 %if %{?rhel}%{!?rhel:0} == 8
 %ifarch %{power64}
@@ -33,26 +27,27 @@
 %global tmvasofieparser 1
 %endif
 
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# DistRDF requires Python 3.8+
-%global distrdf %{dataframe}
-%else
+%if %{?rhel}%{!?rhel:0} == 8
+# DistRDF requires Python 3.8 or later, RHEL 8 has version 3.6
 %global distrdf 0
+%else
+%global distrdf %{dataframe}
 %endif
 
-# qt6-srpm-macros not in buildroot for Fedora 37/38
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
-%global qt6_qtwebengine_arches aarch64 x86_64
+%if %{?rhel}%{!?rhel:0} == 8
+# Requires nlohmann json version 3.9 or later, RHEL 8 has version 3.6
+%global bundlejson 1
+%else
+%global bundlejson 0
 %endif
 
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.28.08
+Version:	6.30.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -98,30 +93,26 @@ Patch6:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 Patch7:		%{name}-big-endian-byte-swap.patch
 #		https://github.com/root-project/root/pull/12375
 Patch8:		%{name}-use-consistent-wording-in-tmva-test-comments.patch
-#		https://github.com/root-project/root/pull/12390
-Patch9:		%{name}-stressvector-test-fails-on-ix86.patch
-#		https://github.com/root-project/root/pull/12423
-Patch10:	%{name}-dont-install-roofit-files-fix.patch
-#		https://github.com/root-project/root/issues/12427
-#		https://github.com/root-project/root/pull/12468
-Patch11:	%{name}-fixes-for-32bit-builds.patch
-#		https://github.com/root-project/root/pull/12476
-Patch12:	%{name}-do-not-remove-Wp-before-D-and-U.patch
-#		Avoid boolean operators on numpy arrays in unit test
-#		https://github.com/root-project/root/issues/12162
-#		https://github.com/root-project/root/pull/13612
-Patch13:	%{name}-boolean-numpy-array.patch
+#		https://github.com/root-project/root/pull/10303
+Patch9:		%{name}-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
 #		Port to pcre2
 #		https://github.com/root-project/root/issues/11395
 #		https://github.com/root-project/root/pull/13771
-Patch14:	%{name}-pcre2.patch
-Patch15:	%{name}-pcre2-6.28.patch
+Patch10:	%{name}-pcre2.patch
 #		src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
 #		https://github.com/root-project/root/pull/13863
-Patch16:	%{name}-tmva-rbdt.patch
+Patch11:	%{name}-tmva-rbdt.patch
 #		Fix cmake/modules/FindZeroMQ.cmake
 #		https://github.com/root-project/root/pull/13995
-Patch17:	%{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+Patch12:	%{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+#		https://github.com/root-project/root/pull/14111
+Patch13:	%{name}-avoid-out-of-memory-during-linking.patch
+#		https://github.com/root-project/root/pull/14112
+Patch14:	%{name}-clad.patch
+Patch15:	%{name}-gtest-back.patch
+Patch16:	%{name}-np32.patch
+#		Only for EPEL 8 - disable tests not working with old gtest
+Patch17:	%{name}-old-gtest.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -175,7 +166,6 @@ BuildRequires:	dcap-devel
 BuildRequires:	xrootd-client-devel >= 1:5.0.0
 BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.6.4
-BuildRequires:	gfal2-devel
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
@@ -192,7 +182,9 @@ BuildRequires:	cmake-data >= 3.18.3-1
 %else
 BuildRequires:	openblas-devel
 %endif
-BuildRequires:	json-devel
+%if ! %{bundlejson}
+BuildRequires:	json-devel >= 3.9
+%endif
 %if %{?fedora}%{!?fedora:0}
 #		Disable uring in EPEL 8 and 9 (liburing is available,
 #		but uring not supported by the kernel)
@@ -328,7 +320,11 @@ Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		To resolve dependency in installed ROOTConfig.cmake
-Requires:	json-devel
+%if %{bundlejson}
+Provides:	bundled(json-devel) = 3.10.5
+%else
+Requires:	json-devel >= 3.9
+%endif
 #		Fonts
 Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 Requires:	font(freesans)
@@ -356,19 +352,9 @@ Obsoletes:	%{name}-table < 6.18.00
 Obsoletes:	%{name}-memstat < 6.26.00
 Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
 Obsoletes:	%{name}-doc < 6.26.00
+Obsoletes:	%{name}-io-gfal < 6.30.00
+Obsoletes:	%{name}-roofit-common < 6.30.00
 %if %{?rhel}%{!?rhel:0} == 8
-#		Obsolete the ROOT 7 packages in EPEL 8
-#		Minimum C++ version changed from 14 to 17
-Obsoletes:	%{name}-graf-gpadv7 < 6.26.00
-Obsoletes:	%{name}-graf-primitives < 6.26.00
-Obsoletes:	%{name}-graf3d-eve7 < 6.26.00
-Obsoletes:	%{name}-gui-browsable < 6.26.00
-Obsoletes:	%{name}-gui-browserv7 < 6.26.00
-Obsoletes:	%{name}-gui-canvaspainter < 6.26.00
-Obsoletes:	%{name}-gui-fitpanelv7 < 6.26.00
-Obsoletes:	%{name}-histv7 < 6.26.00
-Obsoletes:	%{name}-hist-draw < 6.26.00
-Obsoletes:	%{name}-tree-ntuple < 6.26.00
 #		Obsolete the DistRDF package in EPEL 8
 #		Minimum Python version requirement introduced
 Obsoletes:	python%{python3_pkgversion}-distrdf < 6.26.00
@@ -910,14 +896,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description io-dcache
 This package contains the dCache extension for ROOT.
 
-%package io-gfal
-Summary:	Grid File Access Library input/output library for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-gfal
-This package contains the Grid File Access Library extension for ROOT.
-
 %package io-sql
 Summary:	SQL input/output library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1208,7 +1186,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7
+Requires:	js-jsroot >= 7.5
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1336,26 +1314,6 @@ suitable for adoption in different disciplines as well.
 
 This package contains the RooFit toolkit classes.
 
-%package roofit-common
-Summary:	ROOT extension for modeling expected distributions - common
-License:	BSD-2-Clause
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description roofit-common
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains the RooFit common classes.
-
 %package roofit-core
 Summary:	ROOT extension for modeling expected distributions - core
 License:	BSD-2-Clause
@@ -1368,7 +1326,6 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-common%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1502,7 +1459,6 @@ Summary:	Multi-process support for RooFit
 License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-common%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-zmq%{?_isa} = %{version}-%{release}
 
 %description roofit-multiprocess
@@ -1552,6 +1508,39 @@ Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 
 %description hist-factory
 Create RooFit probability density functions from ROOT histograms.
+
+%package xroofit
+Summary:	Extra tools for RooFit projects
+License:	BSD-2-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-hs3%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description xroofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains extra tools for RooFit projects.
 %endif
 
 %package sql-mysql
@@ -1809,7 +1798,7 @@ written in python.
 Summary:	Static files for the Jupyter ROOT Notebook
 BuildArch:	noarch
 Requires:	%{name}-core = %{version}-%{release}
-Requires:	js-jsroot >= 7
+Requires:	js-jsroot >= 7.5
 %if %{?fedora}%{!?fedora:0}
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -1993,41 +1982,6 @@ Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 
 %description tree-ntuple-utils
 This package contains utility functions for ntuples.
-
-%if %{roofit}
-%package xroofit
-Summary:	Extra tools for RooFit projects
-License:	BSD-2-Clause
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-hs3%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
-
-%description xroofit
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains extra tools for RooFit projects.
-%endif
 %endif
 
 %prep
@@ -2050,7 +2004,9 @@ This package contains extra tools for RooFit projects.
 %patch -P 14 -p1
 %patch -P 15 -p1
 %patch -P 16 -p1
+%if %{?rhel}%{!?rhel:0} == 8
 %patch -P 17 -p1
+%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2063,7 +2019,9 @@ rm -rf graf2d/freetype/src
 rm -rf builtins/davix
 rm -rf builtins/glew
 rm -rf builtins/lz4
+%if ! %{bundlejson}
 rm -rf builtins/nlohmann
+%endif
 rm -rf builtins/openssl
 rm -rf builtins/pcre
 rm -rf builtins/tbb
@@ -2073,17 +2031,15 @@ rm -rf builtins/zeromq
 rm -rf builtins/zlib
 rm -rf builtins/zstd
 #  * lzma
-rm -rf core/lzma/src/*.tar.gz
+rm core/lzma/src/*.tar.gz
 #  * gl2ps
 rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
 #  * unuran
-rm -rf math/unuran/src/*.tar.gz
+rm math/unuran/src/*.tar.gz
 #  * xrootd-private-devel headers
 rm -rf proof/xrdinc/*
 #  * x11 extension headers
 rm -rf graf2d/x11/inc/X11
-#  * mathjax
-rm -rf documentation/doxygen/mathjax.tar.gz
 #  * jsroot
 rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 
@@ -2091,12 +2047,6 @@ rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
-%if %{?rhel}%{!?rhel:0} == 8
-# Allow older json on EPEL 8
-sed 's!nlohmann_json 3.9!nlohmann_json 3.6!' \
-    -i cmake/modules/SearchInstalledSoftware.cmake
-%endif
-
 %build
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
@@ -2142,7 +2092,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_llvm:BOOL=ON \
        -Dbuiltin_lz4:BOOL=OFF \
        -Dbuiltin_lzma:BOOL=OFF \
+%if %{bundlejson}
+       -Dbuiltin_nlohmannjson:BOOL=ON \
+%else
        -Dbuiltin_nlohmannjson:BOOL=OFF \
+%endif
        -Dbuiltin_openssl:BOOL=OFF \
        -Dbuiltin_openui5:BOOL=ON \
        -Dbuiltin_pcre:BOOL=OFF \
@@ -2156,7 +2110,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dbuiltin_zeromq:BOOL=OFF \
        -Dbuiltin_zlib:BOOL=OFF \
        -Dbuiltin_zstd:BOOL=OFF \
-       -Dalien:BOOL=OFF \
 %ifnarch %{ix86} %{arm}
        -Darrow:BOOL=ON \
 %else
@@ -2186,12 +2139,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
-       -Dgfal:BOOL=ON \
-       -Dgsl_shared:BOOL=ON \
        -Dgviz:BOOL=ON \
        -Dhttp:BOOL=ON \
        -Dimt:BOOL=ON \
-       -Djemalloc:BOOL=OFF \
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
@@ -2199,17 +2149,17 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dminuit2_mpi:BOOL=OFF \
        -Dminuit2_omp:BOOL=OFF \
        -Dmlp:BOOL=ON \
-       -Dmonalisa:BOOL=OFF \
        -Dmpi:BOOL=OFF \
        -Dmysql:BOOL=ON \
        -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
        -Doracle:BOOL=OFF \
        -Dpgsql:BOOL=ON \
+       -Dproof:BOOL=ON \
+       -Dpyroot:BOOL=ON \
+       -Dpyroot-python2:BOOL=OFF \
        -Dpythia6:BOOL=OFF \
        -Dpythia8:BOOL=ON \
-       -Dpyroot:BOOL=ON \
-       -Dpyroot_legacy:BOOL=OFF \
 %ifarch %{qt5_qtwebengine_arches}
        -Dqt5web:BOOL=ON \
 %else
@@ -2247,7 +2197,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dspectrum:BOOL=ON \
        -Dsqlite:BOOL=ON \
        -Dssl:BOOL=ON \
-       -Dtcmalloc:BOOL=OFF \
        -Dtmva:BOOL=ON \
        -Dtmva-cpu:BOOL=ON \
        -Dtmva-gpu:BOOL=OFF \
@@ -2258,6 +2207,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
 %else
        -Dtmva-sofie:BOOL=OFF \
 %endif
+       -Dunfold:BOOL=ON \
        -Dunuran:BOOL=ON \
 %if %{?fedora}%{!?fedora:0}
        -During:BOOL=ON \
@@ -2272,7 +2222,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dx11:BOOL=ON \
        -Dxml:BOOL=ON \
        -Dxrootd:BOOL=ON \
-       -Dxproofd:BOOL=OFF \
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
        -Dtest_distrdf_pyspark:BOOL=OFF \
@@ -2414,6 +2363,8 @@ sed -e 's!/usr/bin/env python!%{__python3}!' \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/GenerateModel.py \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/MulticlassKeras.py \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
+sed -e 's!/usr/bin/python!%{__python3}!' \
+    -i %{buildroot}%{_datadir}/%{name}/pdg_table_update.py
 
 # Remove some junk
 rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
@@ -2422,7 +2373,6 @@ rm %{buildroot}%{_datadir}/%{name}/root.desktop
 rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
 rm %{buildroot}%{_pkgdocdir}/INSTALL
-rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
@@ -2434,16 +2384,13 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 %if ! %{root7}
 rm TBrowserImp/P030_RWebBrowserImp.C
 %endif
-rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P070_TAlienFile.C
+rm TFile/P050_TGFALFile.C
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
-rm TGrid/P010_TAlien.C
 rm TProofMgr/P010_TXProofMgr.C
 rm TProofServ/P010_TXProofServ.C
 rm TSlave/P010_TXSlave.C
 rm TSQLServer/P040_TOracleServer.C
-rm TSystem/P030_TAlienSystem.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 %if ! %{root7}
 rm TVirtualGeoPainter/P020_RGeoPainter.C
@@ -2452,7 +2399,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
-rmdir TGrid
 rmdir TProofMgr
 rmdir TProofServ
 rmdir TSlave
@@ -2460,7 +2406,7 @@ rmdir TVirtualGeoConverter
 popd
 
 # Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
     ln -nrs %{buildroot}%{_jsdir}/jsroot/$x \
 	    %{buildroot}%{_datadir}/%{name}/js/$x
 done
@@ -2481,13 +2427,8 @@ If this target is not used this warning can be ignored.")' \
     -e '/Possible reasons include/,/)/d' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
 
-# Rename to avoid name clashes
-cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
-cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
-cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
-
 # Create includelist files ...
-for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm-project/*'` ; do
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
@@ -2518,6 +2459,9 @@ for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
     ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
 done
 popd
+pushd tmva/tmva/test
+ln -s ../../../../files files
+popd
 pushd tmva/tmva/test/DNN
 ln -s ../../../../../files files
 popd
@@ -2558,7 +2502,7 @@ popd
 #
 # - tutorial-dataframe-df104_HiggsToTwoPhotons-py
 # - tutorial-dataframe-df105_WBosonAnalysis-py
-# - tutorial-dataframe-df106_HiggsToFourLeptons-py
+# - tutorial-dataframe-df106_HiggsToFourLeptons(-py)
 # - tutorial-dataframe-df107_SingleTopAnalysis-py
 # - tutorial-rcanvas-df104-py
 # - tutorial-rcanvas-df105-py
@@ -2577,6 +2521,10 @@ popd
 #   reads input data over network
 #   http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
 #
+# - tutorial-v7-ntuple-ntpl008_import
+#   reads input data over network
+#   http://root.cern.ch/files/HiggsTauTauReduced/GluGluToHToTauTau.root (20 MB)
+#
 # - gtest-net-davix-test-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
@@ -2585,6 +2533,10 @@ popd
 #   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/xrootd.test
 #
+# - gtest-net-netxng-test-TNetXNGFileTest
+#   reads input file over network
+#   root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
+#
 # - gtest-tmva-tmva-test-rreader
 # - gtest-tmva-tmva-test-rstandardscaler
 # - tutorial-tmva-tmva003_RReader
@@ -2596,6 +2548,10 @@ popd
 #   reads input data over network
 #   http://root.cern/files/tmva101.root
 #
+# - tutorial-tmva-RBatchGenerator_NumPy-py
+#   reads input data over network
+#   http://root.cern/files/Higgs_data.root
+#
 # - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
 #   these tests require the numba python module which is not available
@@ -2618,20 +2574,23 @@ gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
 tutorial-dataframe-df105_WBosonAnalysis-py|\
-tutorial-dataframe-df106_HiggsToFourLeptons-py|\
+tutorial-dataframe-df106_HiggsToFourLeptons|\
 tutorial-dataframe-df107_SingleTopAnalysis-py|\
 tutorial-rcanvas-df104-py|\
 tutorial-rcanvas-df105-py|\
 tutorial-v7-global_temperatures.cxx|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
+tutorial-v7-ntuple-ntpl008_import|\
 gtest-net-davix-test-RRawFileDavix|\
 gtest-net-netxng-test-RRawFileNetXNG|\
+gtest-net-netxng-test-TNetXNGFileTest|\
 gtest-tmva-tmva-test-rreader|\
 gtest-tmva-tmva-test-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
 tutorial-tmva-tmva004_RStandardScaler|\
 tutorial-tmva-tmva103_Application|\
+tutorial-tmva-RBatchGenerator_NumPy-py|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 test-webgui-ping"
@@ -2647,12 +2606,18 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
+%ifarch %{ix86}
+# - gtest-tree-dataframe-test-dataframe-concurrency
+#   "There's already an active task arena."
+excluded="${excluded}|\
+gtest-tree-dataframe-test-dataframe-concurrency"
+%endif
+
 %ifarch %{power64}
 # PPC64LE specific failures
 # - test-stresshistofit-interpreted
 # - test-stresshistogram-interpreted
 # - test-stressmathcore-interpreted
-# - test-stressroostats-interpreted
 #
 # Always timeout (hang?)
 # - test-stressinterpreter
@@ -2661,7 +2626,6 @@ excluded="${excluded}|\
 test-stresshistofit-interpreted|\
 test-stresshistogram-interpreted|\
 test-stressmathcore-interpreted|\
-test-stressroostats-interpreted|\
 test-stressinterpreter|\
 tutorial-unuran-unuranFoamTest"
 
@@ -2675,7 +2639,6 @@ tutorial-unuran-unuranFoamTest"
 # - pyunittests-pyroot-import-load-libs
 #
 # - tutorial-fit-combinedFit(-py)
-# - tutorial-fit-exampleFit3D
 # - tutorial-fit-fit2dHist
 # - tutorial-fit-fitCircle
 # - tutorial-fit-line3Dfit
@@ -2686,10 +2649,17 @@ tutorial-unuran-unuranFoamTest"
 # - tutorial-multicore-mtbb001_fillHistos
 # - tutorial-multicore-mtbb101_fillNtuples
 # - tutorial-multicore-mtbb201_parallelHistoFill
+# - tutorial-rcanvas-*
+# - tutorial-v7-concurrentfill.cxx
+# - tutorial-v7-ntuple-ntpl001_staff
+# - tutorial-v7-ntuple-ntpl002_vector
+# - tutorial-v7-ntuple-ntpl005_introspection
+# - tutorial-v7-ntuple-ntpl006_friends
+# - tutorial-v7-ntuple-ntpl007_mtFill
+# - tutorial-v7-simple.cxx
 excluded="${excluded}|\
 pyunittests-pyroot-import-load-libs|\
 tutorial-fit-combinedFit|\
-tutorial-fit-exampleFit3D|\
 tutorial-fit-fit2dHist|\
 tutorial-fit-fitCircle|\
 tutorial-fit-line3Dfit|\
@@ -2699,32 +2669,64 @@ tutorial-multicore-mt201_parallelHistoFill|\
 tutorial-multicore-mt304_fillHistos|\
 tutorial-multicore-mtbb001_fillHistos|\
 tutorial-multicore-mtbb101_fillNtuples|\
-tutorial-multicore-mtbb201_parallelHistoFill"
+tutorial-multicore-mtbb201_parallelHistoFill|\
+tutorial-rcanvas|\
+tutorial-v7-concurrentfill.cxx|\
+tutorial-v7-ntuple-ntpl001_staff|\
+tutorial-v7-ntuple-ntpl002_vector|\
+tutorial-v7-ntuple-ntpl005_introspection|\
+tutorial-v7-ntuple-ntpl006_friends|\
+tutorial-v7-ntuple-ntpl007_mtFill|\
+tutorial-v7-simple.cxx"
 %endif
 %endif
 
 %ifarch s390x
 # - gtest-roofit-roofitcore-test-testNaNPacker
-# - tutorial-roofit-rf612_recoverFromInvalidParameters
 #   Uses "Packed NaN" feature, not implemented for big endian.
 excluded="${excluded}|\
-gtest-roofit-roofitcore-test-testNaNPacker|\
-tutorial-roofit-rf612_recoverFromInvalidParameters"
+gtest-roofit-roofitcore-test-testNaNPacker"
 
+# - gtest-core-base-test-CoreBaseTests
+# - gtest-core-dictgen-test-dictgen-base
+# - gtest-core-meta-test-testTDataType
+#
+# - gtest-tree-dataframe-test-datasource-ntuple
 # - gtest-tree-ntuple-v7-test-ntuple-basics
+# - gtest-tree-ntuple-v7-test-ntuple-bulk
 # - gtest-tree-ntuple-v7-test-ntuple-endian
 # - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-friends
 # - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-rdf
+# - gtest-tree-ntuple-v7-test-ntuple-modelext
+# - gtest-tree-ntuple-v7-test-ntuple-packing
+# - gtest-tree-ntuple-v7-test-ntuple-project
 # - gtest-tree-ntuple-v7-test-ntuple-serialize
+# - gtest-tree-ntuple-v7-test-ntuple-show
+# - gtest-tree-ntuple-v7-test-ntuple-storage
+# - gtest-tree-ntuple-v7-test-ntuple-storage-daos
 # - gtest-tree-ntuple-v7-test-ntuple-types
+# - gtest-tree-ntuple-v7-test-ntuple-view
+# - gtest-tree-ntuple-v7-test-rfield-vector
+# - gtest-tree-ntupleutil-v7-test-ntuple-importer
+# - gtest-tree-ntupleutil-v7-test-ntuple-inspector
 #   https://github.com/root-project/root/issues/12426
 #
+# - pyunittests-distrdf-unit-backend-test-graph-caching
 # - pyunittests-pyroot-pyz-rtensor
 # - pyunittests-pyroot-pyz-stl-vector
 # - tutorial-dataframe-df006_ranges-py
 # - tutorial-fit-combinedFit-py
+# - tutorial-fit-fitcont
+# - tutorial-fit-NumericalMinimization-py
 # - tutorial-math-exampleFunction-py
+# - tutorial-rcanvas-rbox-py
+# - tutorial-roofit-rf108_plotbinning-py
+# - tutorial-roofit-rf306_condpereventerrors-py
+# - tutorial-roofit-rf307_fullpereventerrors-py
+# - tutorial-roofit-rf310_sliceplot-py
+# - tutorial-roofit-rf708_bphysics-py
+# - tutorial-tmva-RBatchGenerator_filters_vectors-py
 # - tutorial-tmva-TMVA_CNN_Classification-py
 # - tutorial-tmva-TMVA_Higgs_Classification-py
 # - tutorial-tmva-TMVA_RNN_Classification-py
@@ -2738,18 +2740,43 @@ tutorial-roofit-rf612_recoverFromInvalidParameters"
 # - test-stresshistogram
 # - test-stresshistogram-interpreted
 excluded="${excluded}|\
+gtest-core-base-test-CoreBaseTests|\
+gtest-core-dictgen-test-dictgen-base|\
+gtest-core-meta-test-testTDataType|\
+gtest-tree-dataframe-test-datasource-ntuple|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
+gtest-tree-ntuple-v7-test-ntuple-bulk|\
 gtest-tree-ntuple-v7-test-ntuple-endian|\
 gtest-tree-ntuple-v7-test-ntuple-extended|\
+gtest-tree-ntuple-v7-test-ntuple-friends|\
 gtest-tree-ntuple-v7-test-ntuple-minifile|\
-gtest-tree-ntuple-v7-test-ntuple-rdf|\
+gtest-tree-ntuple-v7-test-ntuple-modelext|\
+gtest-tree-ntuple-v7-test-ntuple-packing|\
+gtest-tree-ntuple-v7-test-ntuple-project|\
 gtest-tree-ntuple-v7-test-ntuple-serialize|\
+gtest-tree-ntuple-v7-test-ntuple-show|\
+gtest-tree-ntuple-v7-test-ntuple-storage|\
+gtest-tree-ntuple-v7-test-ntuple-storage-daos|\
 gtest-tree-ntuple-v7-test-ntuple-types|\
+gtest-tree-ntuple-v7-test-ntuple-view|\
+gtest-tree-ntuple-v7-test-rfield-vector|\
+gtest-tree-ntupleutil-v7-test-ntuple-importer|\
+gtest-tree-ntupleutil-v7-test-ntuple-inspector|\
+pyunittests-distrdf-unit-backend-test-graph-caching|\
 pyunittests-pyroot-pyz-rtensor|\
 pyunittests-pyroot-pyz-stl-vector|\
 tutorial-dataframe-df006_ranges-py|\
 tutorial-fit-combinedFit-py|\
+tutorial-fit-fitcont|\
+tutorial-fit-NumericalMinimization-py|\
 tutorial-math-exampleFunction-py|\
+tutorial-rcanvas-rbox-py|\
+tutorial-roofit-rf108_plotbinning-py|\
+tutorial-roofit-rf306_condpereventerrors-py|\
+tutorial-roofit-rf307_fullpereventerrors-py|\
+tutorial-roofit-rf310_sliceplot-py|\
+tutorial-roofit-rf708_bphysics-py|\
+tutorial-tmva-RBatchGenerator_filters_vectors-py|\
 tutorial-tmva-TMVA_CNN_Classification-py|\
 tutorial-tmva-TMVA_Higgs_Classification-py|\
 tutorial-tmva-TMVA_RNN_Classification-py|\
@@ -2776,7 +2803,14 @@ test-stressgraphics"
 # Filter out parts of tests that require remote network access
 # RNTuple.TClassEBO seg fault
 # https://github.com/root-project/root/issues/12428
-GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix:TFile.ReadWithoutGlobalRegistrationWeb:TFile.ReadWithoutGlobalRegistrationNet:RNTuple.TClassEBO \
+GTEST_FILTER=-\
+RCsvDS.Remote:\
+RRawFile.Remote:\
+RSqliteDS.Davix:\
+TChainParsing.RemoteGlob:\
+TFile.ReadWithoutGlobalRegistrationNet:\
+TFile.ReadWithoutGlobalRegistrationWeb:\
+RNTuple.TClassEBO \
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 ROOTTEST_IGNORE_PANDAS_PY3=1 \
 %endif
@@ -2795,12 +2829,9 @@ end
 
 %post net-http
 # Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
     ln -fnrs %{_jsdir}/jsroot/$x %{_datadir}/%{name}/js/$x
 done
-%{?ldconfig}
-
-%ldconfig_postun net-http
 
 %pre -n python%{python3_pkgversion}-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2851,143 +2882,6 @@ fi
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
 
-%ldconfig_scriptlets multiproc
-%ldconfig_scriptlets cling
-%ldconfig_scriptlets tpython
-%ldconfig_scriptlets -n python%{python3_pkgversion}-%{name}
-%ldconfig_scriptlets r
-%ldconfig_scriptlets r-tools
-%ldconfig_scriptlets genetic
-%ldconfig_scriptlets geom
-%ldconfig_scriptlets geom-builder
-%ldconfig_scriptlets geom-painter
-%ldconfig_scriptlets gdml
-%ldconfig_scriptlets graf
-%ldconfig_scriptlets graf-asimage
-%ldconfig_scriptlets graf-fitsio
-%ldconfig_scriptlets graf-gpad
-%ldconfig_scriptlets graf-gviz
-%ldconfig_scriptlets graf-postscript
-%ldconfig_scriptlets graf-x11
-%ldconfig_scriptlets graf3d
-%ldconfig_scriptlets graf3d-csg
-%ldconfig_scriptlets graf3d-eve
-%ldconfig_scriptlets graf3d-gl
-%ldconfig_scriptlets graf3d-gviz3d
-%ldconfig_scriptlets graf3d-x3d
-%ldconfig_scriptlets gui
-%ldconfig_scriptlets gui-html
-%ldconfig_scriptlets gui-fitpanel
-%ldconfig_scriptlets gui-ged
-%ldconfig_scriptlets gui-builder
-%ldconfig_scriptlets gui-recorder
-%ldconfig_scriptlets hbook
-%ldconfig_scriptlets hist
-%ldconfig_scriptlets hist-painter
-%ldconfig_scriptlets spectrum
-%ldconfig_scriptlets spectrum-painter
-%ldconfig_scriptlets html
-%ldconfig_scriptlets io
-%ldconfig_scriptlets io-dcache
-%ldconfig_scriptlets io-gfal
-%ldconfig_scriptlets io-sql
-%ldconfig_scriptlets io-xml
-%ldconfig_scriptlets io-xmlparser
-%ldconfig_scriptlets foam
-%ldconfig_scriptlets fftw
-%ldconfig_scriptlets fumili
-%ldconfig_scriptlets genvector
-%ldconfig_scriptlets mathcore
-%ldconfig_scriptlets mathmore
-%ldconfig_scriptlets matrix
-%ldconfig_scriptlets minuit
-%ldconfig_scriptlets minuit2
-%ldconfig_scriptlets mlp
-%ldconfig_scriptlets physics
-%ldconfig_scriptlets quadp
-%ldconfig_scriptlets smatrix
-%ldconfig_scriptlets splot
-%ldconfig_scriptlets unuran
-%ldconfig_scriptlets vecops
-%ldconfig_scriptlets montecarlo-eg
-%ldconfig_scriptlets montecarlo-pythia8
-%ldconfig_scriptlets net
-%ldconfig_scriptlets net-rpdutils
-%ldconfig_scriptlets net-auth
-%ldconfig_scriptlets net-davix
-%ldconfig_scriptlets net-httpsniff
-%ldconfig_scriptlets netx
-%ldconfig_scriptlets proof
-%ldconfig_scriptlets proof-bench
-%ldconfig_scriptlets proof-player
-%ldconfig_scriptlets proof-sessionviewer
-%if %{roofit}
-%ldconfig_scriptlets roofit
-%ldconfig_scriptlets roofit-common
-%ldconfig_scriptlets roofit-core
-%ldconfig_scriptlets roofit-more
-%ldconfig_scriptlets roofit-batchcompute
-%if %{dataframe}
-%ldconfig_scriptlets roofit-dataframe-helpers
-%endif
-%ldconfig_scriptlets roofit-hs3
-%ldconfig_scriptlets roofit-jsoninterface
-%if %{?fedora}%{!?fedora:0} >= 40
-%ldconfig_scriptlets roofit-multiprocess
-%ldconfig_scriptlets roofit-zmq
-%endif
-%ldconfig_scriptlets roostats
-%ldconfig_scriptlets hist-factory
-%endif
-%ldconfig_scriptlets sql-mysql
-%ldconfig_scriptlets sql-odbc
-%ldconfig_scriptlets sql-sqlite
-%ldconfig_scriptlets sql-pgsql
-%ldconfig_scriptlets tmva
-%if %{dataframe}
-%ldconfig_scriptlets tmva-utils
-%endif
-%ldconfig_scriptlets tmva-python
-%ldconfig_scriptlets tmva-r
-%ldconfig_scriptlets tmva-sofie
-%if %{tmvasofieparser}
-%ldconfig_scriptlets tmva-sofie-parser
-%endif
-%ldconfig_scriptlets tmva-gui
-%ldconfig_scriptlets tree
-%if %{dataframe}
-%ldconfig_scriptlets tree-dataframe
-%endif
-%ldconfig_scriptlets tree-player
-%ldconfig_scriptlets tree-viewer
-%ldconfig_scriptlets tree-webviewer
-%ldconfig_scriptlets unfold
-%ldconfig_scriptlets gui-webdisplay
-%ifarch %{qt5_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt5webdisplay
-%endif
-%ifarch %{qt6_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt6webdisplay
-%endif
-%ldconfig_scriptlets gui-webgui6
-%if %{root7}
-%ldconfig_scriptlets geom-webviewer
-%ldconfig_scriptlets graf-gpadv7
-%ldconfig_scriptlets graf-primitives
-%ldconfig_scriptlets graf3d-eve7
-%ldconfig_scriptlets gui-browsable
-%ldconfig_scriptlets gui-browserv7
-%ldconfig_scriptlets gui-canvaspainter
-%ldconfig_scriptlets gui-fitpanelv7
-%ldconfig_scriptlets histv7
-%ldconfig_scriptlets hist-draw
-%ldconfig_scriptlets tree-ntuple
-%ldconfig_scriptlets tree-ntuple-utils
-%if %{roofit}
-%ldconfig_scriptlets xroofit
-%endif
-%endif
-
 %files
 %{_bindir}/hadd
 %{_bindir}/root
@@ -3055,9 +2949,13 @@ fi
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/plugins/*
 %dir %{_includedir}/%{name}
+%if %{bundlejson}
+%dir %{_includedir}/%{name}/nlohmann
+%{_includedir}/%{name}/nlohmann/json.hpp
+%{_includedir}/%{name}/nlohmann/json_fwd.hpp
+%endif
 %{_includedir}/%{name}/RConfigOptions.h
 %{_includedir}/%{name}/RConfigure.h
-%{_includedir}/%{name}/RGitCommit.h
 %{_includedir}/%{name}/compiledata.h
 %{_includedir}/%{name}/module.modulemap
 %dir %{_includedir}/%{name}/Math
@@ -3086,13 +2984,10 @@ fi
 %doc interpreter/cling/CREDITS.txt
 %doc interpreter/cling/README.md
 %license interpreter/cling/LICENSE.TXT
-%doc interpreter/llvm/src/llvm-CREDITS.TXT
-%doc interpreter/llvm/src/llvm-README.txt
-%license interpreter/llvm/src/llvm-LICENSE.TXT
 
 %files testsupport
 %{_includedir}/%{name}/ROOT/TestSupport.hxx
-%{_libdir}/%{name}/libTestSupport.a
+%{_libdir}/%{name}/TestSupport
 %doc core/testsupport/README.md
 
 %files tpython -f includelist-bindings-tpython
@@ -3314,11 +3209,6 @@ fi
 %{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
 %{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
 
-%files io-gfal -f includelist-io-gfal
-%{_libdir}/%{name}/libGFAL.*
-%{_libdir}/%{name}/libGFAL_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
 %{_libdir}/%{name}/libSQLIO_rdict.pcm
@@ -3433,6 +3323,7 @@ fi
 %{_libdir}/%{name}/libEG.*
 %{_libdir}/%{name}/libEG_rdict.pcm
 %{_datadir}/%{name}/pdg_table.txt
+%{_datadir}/%{name}/pdg_table_update.py
 %doc %{_pkgdocdir}/cfortran.doc
 
 %files montecarlo-pythia8 -f includelist-montecarlo-pythia8
@@ -3479,6 +3370,7 @@ fi
 %{_datadir}/%{name}/js/files/wslist.htm
 %ghost %{_datadir}/%{name}/js/build
 %ghost %{_datadir}/%{name}/js/img
+%ghost %{_datadir}/%{name}/js/mathjax
 %ghost %{_datadir}/%{name}/js/modules
 %ghost %{_datadir}/%{name}/js/scripts
 %ghost %{_datadir}/%{name}/js/files/draw.htm
@@ -3544,12 +3436,13 @@ fi
 %{_libdir}/%{name}/libRooFit.*
 %{_libdir}/%{name}/libRooFit_rdict.pcm
 
-%files roofit-common
-%{_libdir}/%{name}/libRooFitCommon.*
-
 %files roofit-core -f includelist-roofit-roofitcore
 %{_libdir}/%{name}/libRooFitCore.*
 %{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/Detail
+%dir %{_includedir}/%{name}/RooFit/TestStatistics
+%dir %{_includedir}/%{name}/RooFitLegacy
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
 
@@ -3557,10 +3450,9 @@ fi
 %{_libdir}/%{name}/libRooFitMore.*
 %{_libdir}/%{name}/libRooFitMore_rdict.pcm
 
-%files roofit-batchcompute -f includelist-roofit-batchcompute
+%files roofit-batchcompute
 %{_libdir}/%{name}/libRooBatchCompute.*
 %{_libdir}/%{name}/libRooBatchCompute_*
-%doc roofit/batchcompute/README.md
 
 %if %{dataframe}
 %files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
@@ -3571,17 +3463,20 @@ fi
 %files roofit-hs3 -f includelist-roofit-hs3
 %{_libdir}/%{name}/libRooFitHS3.*
 %{_libdir}/%{name}/libRooFitHS3_rdict.pcm
+%dir %{_includedir}/%{name}/RooFitHS3
 %{_datadir}/%{name}/RooFitHS3_wsexportkeys.json
 %{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
-%doc roofit/hs3/README.md
 
 %files roofit-jsoninterface -f includelist-roofit-jsoninterface
 %{_libdir}/%{name}/libRooFitJSONInterface.*
 %{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
 
 %if %{?fedora}%{!?fedora:0} >= 40
 %files roofit-multiprocess -f includelist-roofit-multiprocess
 %{_libdir}/%{name}/libRooFitMultiProcess.*
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/MultiProcess
 
 %files roofit-zmq
 %{_libdir}/%{name}/libRooFitZMQ.*
@@ -3601,7 +3496,13 @@ fi
 %{_libdir}/%{name}/libHistFactory_rdict.pcm
 %{_datadir}/%{name}/HistFactorySchema.dtd
 %dir %{_includedir}/%{name}/RooStats/HistFactory
+%dir %{_includedir}/%{name}/RooStats/HistFactory/Detail
 %doc roofit/histfactory/doc/README
+
+%files xroofit -f includelist-roofit-xroofit
+%{_libdir}/%{name}/libRooFitXRooFit.*
+%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit/xRooFit
 %endif
 
 %files sql-mysql -f includelist-sql-mysql
@@ -3632,6 +3533,8 @@ fi
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
 %dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
+%dir %{_includedir}/%{name}/TMVA/DNN/CNN
+%dir %{_includedir}/%{name}/TMVA/DNN/RNN
 %license tmva/doc/LICENSE
 %exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
 %exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
@@ -3777,6 +3680,7 @@ fi
 %{_libdir}/%{name}/libROOTBrowsable.*
 %{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
 %{_libdir}/%{name}/libROOTBranchBrowseProvider.*
+%{_libdir}/%{name}/libROOTGeoBrowseProvider.*
 %{_libdir}/%{name}/libROOTHistDrawProvider.*
 %{_libdir}/%{name}/libROOTLeafDraw6Provider.*
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
@@ -3814,19 +3718,20 @@ fi
 %files tree-ntuple -f includelist-tree-ntuple
 %{_libdir}/%{name}/libROOTNTuple.*
 %{_libdir}/%{name}/libROOTNTuple_rdict.pcm
+%dir %{_includedir}/%{name}/ROOT/libdaos_mock
 
 %files tree-ntuple-utils -f includelist-tree-ntupleutil
 %{_libdir}/%{name}/libROOTNTupleUtil.*
 %{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
-
-%if %{roofit}
-%files xroofit -f includelist-roofit-xroofit
-%{_libdir}/%{name}/libRooFitXRooFit.*
-%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
-%endif
 %endif
 
 %changelog
+* Sat Nov 25 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.00-1
+- Update to 6.30.00
+- Removed subpackages: root-io-gfal and root-roofit-common
+- Dropped patches: 6
+- New patches: 6
+
 * Thu Nov 02 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.28.08-3
 - Rebuilt for libarrow.so.1400
 
diff --git a/sources b/sources
index abdf4dd..3dad81b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.08.tar.xz) = 868d770a05372677da84e4456023c1b2b575ff1eac8b6b841ed45dd1e0fd0c6c7aede533271b986404f2a55c91ea196ac2d8c81b3b4d1edfae159c0b665c415e
+SHA512 (root-6.30.00.tar.xz) = 0050fea34b679343829cf0bfe4bbd6ff66d93c8e2ceedef41b71d401c4e82495ec5fa4ecac82ef8d4d58f8cc0c724a6331d59b63998e6af28f022dd1942e3797
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 6d457ab71f59f244f20986dd144dec499ca8dfc1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 5 Dec 2023 13:15:36 +0100
Subject: [PATCH 256/344] Update to 6.30.02

---
 root-Fix-cmake-modules-FindZeroMQ.cmake.patch | 51 ----------------
 ...or-failures-on-aarch64-ppc64le-s390x.patch | 32 ++++++++++
 root-clad.patch                               |  2 +-
 root-np32.patch                               | 60 +++++++++++++------
 root-tmva-rbdt.patch                          | 40 -------------
 root.spec                                     | 26 ++++----
 sources                                       |  2 +-
 7 files changed, 87 insertions(+), 126 deletions(-)
 delete mode 100644 root-Fix-cmake-modules-FindZeroMQ.cmake.patch
 create mode 100644 root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
 delete mode 100644 root-tmva-rbdt.patch

diff --git a/root-Fix-cmake-modules-FindZeroMQ.cmake.patch b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
deleted file mode 100644
index 196ae81..0000000
--- a/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f178a821b57043fdb7b722187e0175b975c7076b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 1 Nov 2023 10:04:03 +0100
-Subject: [PATCH] Fix cmake/modules/FindZeroMQ.cmake
-
-It now finds ZeroMQ in Fedora 40.
----
- cmake/modules/FindZeroMQ.cmake | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/modules/FindZeroMQ.cmake b/cmake/modules/FindZeroMQ.cmake
-index 24a1c171f5..bd8bf0b3db 100644
---- a/cmake/modules/FindZeroMQ.cmake
-+++ b/cmake/modules/FindZeroMQ.cmake
-@@ -38,17 +38,21 @@ set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
- set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
- 
- # check for zmq_ppoll
--if(ZeroMQ_FOUND)
--    SET(SAVE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
--    SET(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
-+if(ZeroMQ_LIBRARIES)
-+    include(CheckCXXSymbolExists)
-+    set(CMAKE_REQUIRED_LIBRARIES ${ZeroMQ_LIBRARIES})
-+    set(CMAKE_REQUIRED_INCLUDES ${ZeroMQ_INCLUDE_DIRS})
-+    set(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
-     check_cxx_symbol_exists(zmq_ppoll zmq.h ZeroMQ_HAS_PPOLL)
--    SET(CMAKE_REQUIRED_DEFINITIONS "${SAVE_CMAKE_REQUIRED_DEFINITIONS}")
-+    unset(CMAKE_REQUIRED_LIBRARIES)
-+    unset(CMAKE_REQUIRED_INCLUDES)
-+    unset(CMAKE_REQUIRED_DEFINITIONS)
- endif()
- 
- include ( FindPackageHandleStandardArgs )
- # handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
- # if all listed variables are TRUE
--find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL)
-+find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL )
- 
- if(ZeroMQ_FOUND)
-     if(NOT TARGET libzmq)
-@@ -57,4 +61,4 @@ if(ZeroMQ_FOUND)
-                 IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
-                 INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
-     endif()
--endif()
-\ No newline at end of file
-+endif()
--- 
-2.41.0
-
diff --git a/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch b/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
new file mode 100644
index 0000000..05f7fa6
--- /dev/null
+++ b/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
@@ -0,0 +1,32 @@
+From 8e6b901646c0a4139b9f6f18c5d6cd5c98614136 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 2 Dec 2023 18:50:04 +0100
+Subject: [PATCH] Adjust test for failures on aarch64, ppc64le and s390x
+
+[ RUN      ] RooTruthModel.IntegrateSubrange
+[#1] INFO:Eval -- RooRealVar::setRange(dt) new range named 'integral' created with bounds [2,2]
+/builddir/build/BUILD/root-6.30.02/roofit/roofitcore/test/testRooTruthModel.cxx:38: Failure
+Expected equality of these values:
+  integ->getVal()
+    Which is: -2.8822093e-17
+  0.0
+    Which is: 0
+[  FAILED  ] RooTruthModel.IntegrateSubrange (194 ms)
+---
+ roofit/roofitcore/test/testRooTruthModel.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/roofit/roofitcore/test/testRooTruthModel.cxx b/roofit/roofitcore/test/testRooTruthModel.cxx
+index a97fcb7c4e..ff3464a880 100644
+--- a/roofit/roofitcore/test/testRooTruthModel.cxx
++++ b/roofit/roofitcore/test/testRooTruthModel.cxx
+@@ -35,5 +35,5 @@ TEST(RooTruthModel, IntegrateSubrange)
+    dt.setRange("integral", 2, 2);
+ 
+    std::unique_ptr<RooAbsReal> integ{bcpg.createIntegral({dt}, "integral")};
+-   EXPECT_FLOAT_EQ(integ->getVal(), 0.0);
++   EXPECT_NEAR(integ->getVal(), 0.0, 1e-16);
+ }
+-- 
+2.43.0
+
diff --git a/root-clad.patch b/root-clad.patch
index 0715240..139775e 100644
--- a/root-clad.patch
+++ b/root-clad.patch
@@ -12,7 +12,7 @@ index 5cba95407b..81f6539f03 100644
 --- a/tutorials/CMakeLists.txt
 +++ b/tutorials/CMakeLists.txt
 @@ -74,7 +74,8 @@ if(NOT ROOT_minuit2_FOUND)
- endif()
+ #---Tutorials disabled depending on the build components-------------
  
  if(NOT clad)
 -  set(clad_veto fit/minuit2GausFit.C)
diff --git a/root-np32.patch b/root-np32.patch
index 3ac6f41..832f6c7 100644
--- a/root-np32.patch
+++ b/root-np32.patch
@@ -1,4 +1,4 @@
-From 88162e7738d810f8203ed0242179f7af94ded500 Mon Sep 17 00:00:00 2001
+From 42b9c691fdd2d0001c61f78cc8adfbb9c994f6b4 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Fri, 17 Nov 2023 11:46:14 +0100
 Subject: [PATCH 3/3] Fix pythonizations test errors on ix86 Linux
@@ -42,15 +42,21 @@ TypeError: none of the 6 overloaded methods succeeded. Full details:
     TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
 ----------------------------------------------------------------------
 ---
- .../pyroot/pythonizations/test/rdataframe_makenumpy.py     | 2 +-
- bindings/pyroot/pythonizations/test/rtensor.py             | 7 +++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
+ .../pyroot/pythonizations/test/rdataframe_makenumpy.py    | 8 ++++----
+ bindings/pyroot/pythonizations/test/rtensor.py            | 8 +-------
+ 2 files changed, 5 insertions(+), 11 deletions(-)
 
 diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-index cd2ebc9b5b..1860bd49f5 100644
+index cd2ebc9b5b..cc46f5bea1 100644
 --- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
 +++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-@@ -147,7 +147,7 @@ class DataFrameFromNumpy(unittest.TestCase):
+@@ -142,19 +142,19 @@ class DataFrameFromNumpy(unittest.TestCase):
+         gc.collect()
+         ref4 = sys.getrefcount(x)
+         self.assertEqual(ref1, ref4)
+-    
++
+     def test_sliced_array(self):
          """
          Test correct reading of a sliced numpy array (#13690)
          """
@@ -59,31 +65,47 @@ index cd2ebc9b5b..1860bd49f5 100644
          columns = {'x': table[:,0], 'y': table[:,1]}
          df = ROOT.RDF.FromNumpy(columns)
          x_col = df.Take['Long64_t']("x")
+         y_col = df.Take['Long64_t']("y")
+-        self.assertEqual(list(x_col.GetValue()), [1,3]) 
++        self.assertEqual(list(x_col.GetValue()), [1,3])
+         self.assertEqual(list(y_col.GetValue()), [2,4])
+-        
++
+ 
+ if __name__ == '__main__':
+     unittest.main()
 diff --git a/bindings/pyroot/pythonizations/test/rtensor.py b/bindings/pyroot/pythonizations/test/rtensor.py
-index 99b458cfa9..070a5d24d0 100644
+index 99b458cfa9..ca119f0b41 100644
 --- a/bindings/pyroot/pythonizations/test/rtensor.py
 +++ b/bindings/pyroot/pythonizations/test/rtensor.py
-@@ -3,6 +3,7 @@ import ROOT
+@@ -2,7 +2,6 @@ import unittest
+ import ROOT
  RTensor = ROOT.TMVA.Experimental.RTensor
  import numpy as np
- import platform
-+import sys
+-import platform
  
  
  def check_shape(root_obj, np_obj):
-@@ -28,8 +29,10 @@ class AsRTensor(unittest.TestCase):
+@@ -21,18 +20,13 @@ class AsRTensor(unittest.TestCase):
+     dtypes = [
+         "int32", "int64", "uint32", "uint64", "float32", "float64"
+     ]
+-    cpptypes = ["int", "long", "unsigned int", "unsigned long", "float", "double"]
++    cpptypes = ["int32_t", "int64_t", "uint32_t", "uint64_t", "float", "double"]
+ 
+     # Tests
+     def test_dtypes(self):
          """
          Test adoption of numpy arrays with different data types
          """
 -        #using long long on Linux does not work although it is same size as long
 -        if (platform.system() == "Windows") :
-+        # Using long long on 64 bit Linux does not work although it is
-+        # same size as long
-+        if ((platform.system() == "Windows") or
-+            ((platform.system() == "Linux") and (sys.maxsize < 2**32))) :
-                 self.cpptypes[1] = "long long"
-                 self.cpptypes[3] = "unsigned long long"
- 
+-                self.cpptypes[1] = "long long"
+-                self.cpptypes[3] = "unsigned long long"
+-
+         i = 0
+         for dtype in self.dtypes:
+             np_obj = np.array([[1, 2], [3, 4], [5, 6]], dtype=dtype)
 -- 
-2.42.0
+2.43.0
 
diff --git a/root-tmva-rbdt.patch b/root-tmva-rbdt.patch
deleted file mode 100644
index b31769a..0000000
--- a/root-tmva-rbdt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c3eb92abb450aee2e3a798218ca2d309524dab11 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 14 Oct 2023 15:51:16 +0200
-Subject: [PATCH] src/RBDT.cxx is a source file of libTMVAUtils and should not
- also be a source file of libTMVA. Remove it. Adjust test using symbols
- defined in this source file to link to libTMVAUtils instead of libTMVA.
-
----
- tmva/tmva/CMakeLists.txt      | 1 -
- tmva/tmva/test/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tmva/tmva/CMakeLists.txt b/tmva/tmva/CMakeLists.txt
-index 84efce9d59..109f4c1021 100644
---- a/tmva/tmva/CMakeLists.txt
-+++ b/tmva/tmva/CMakeLists.txt
-@@ -334,7 +334,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TMVA
-     src/PDEFoamVect.cxx
-     src/PDF.cxx
-     src/QuickMVAProbEstimator.cxx
--    src/RBDT.cxx
-     src/Ranking.cxx
-     src/Reader.cxx
-     src/RegressionVariance.cxx
-diff --git a/tmva/tmva/test/CMakeLists.txt b/tmva/tmva/test/CMakeLists.txt
-index ebe1be187b..5dcf5175f2 100644
---- a/tmva/tmva/test/CMakeLists.txt
-+++ b/tmva/tmva/test/CMakeLists.txt
-@@ -29,7 +29,7 @@ if(dataframe)
-     # Tree inference system and user interface
-     if(NOT MSVC OR llvm13_broken_tests)
-         ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
--        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
-+        ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVAUtils)
-     endif()
- endif()
- 
--- 
-2.41.0
-
diff --git a/root.spec b/root.spec
index 547164c..07b4412 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.30.00
+Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -99,20 +99,16 @@ Patch9:		%{name}-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
 #		https://github.com/root-project/root/issues/11395
 #		https://github.com/root-project/root/pull/13771
 Patch10:	%{name}-pcre2.patch
-#		src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
-#		https://github.com/root-project/root/pull/13863
-Patch11:	%{name}-tmva-rbdt.patch
-#		Fix cmake/modules/FindZeroMQ.cmake
-#		https://github.com/root-project/root/pull/13995
-Patch12:	%{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
 #		https://github.com/root-project/root/pull/14111
-Patch13:	%{name}-avoid-out-of-memory-during-linking.patch
+Patch11:	%{name}-avoid-out-of-memory-during-linking.patch
 #		https://github.com/root-project/root/pull/14112
-Patch14:	%{name}-clad.patch
-Patch15:	%{name}-gtest-back.patch
-Patch16:	%{name}-np32.patch
+Patch12:	%{name}-clad.patch
+Patch13:	%{name}-gtest-back.patch
+Patch14:	%{name}-np32.patch
+#		https://github.com/root-project/root/pull/14164
+Patch15:	%{name}-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
 #		Only for EPEL 8 - disable tests not working with old gtest
-Patch17:	%{name}-old-gtest.patch
+Patch16:	%{name}-old-gtest.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -2003,9 +1999,8 @@ This package contains utility functions for ntuples.
 %patch -P 13 -p1
 %patch -P 14 -p1
 %patch -P 15 -p1
-%patch -P 16 -p1
 %if %{?rhel}%{!?rhel:0} == 8
-%patch -P 17 -p1
+%patch -P 16 -p1
 %endif
 
 # Remove bundled sources in order to be sure they are not used
@@ -3726,6 +3721,9 @@ fi
 %endif
 
 %changelog
+* Sat Dec 02 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-1
+- Update to 6.30.02
+
 * Sat Nov 25 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.00-1
 - Update to 6.30.00
 - Removed subpackages: root-io-gfal and root-roofit-common
diff --git a/sources b/sources
index 3dad81b..4d9b587 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.30.00.tar.xz) = 0050fea34b679343829cf0bfe4bbd6ff66d93c8e2ceedef41b71d401c4e82495ec5fa4ecac82ef8d4d58f8cc0c724a6331d59b63998e6af28f022dd1942e3797
+SHA512 (root-6.30.02.tar.xz) = 8f4790f2cc81fd637d8e7a499232430648935856738a92b9e33b7d483e9126b6dcd238504c810818397c05aa2f34b04b6eab2dc4821e605da50ccf85db33532e
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 9875b6b48a8345e11b73148f7640510da9bcf537 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 15 Dec 2023 22:08:26 +0100
Subject: [PATCH 257/344] Exclude pyunittests-pyroot-numbadeclare test

---
 root.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 07b4412..c9a6ed3 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2549,6 +2549,7 @@ popd
 #
 # - test-import-numba
 # - tutorial-pyroot-pyroot004_NumbaDeclare-py
+# - pyunittests-pyroot-numbadeclare
 #   these tests require the numba python module which is not available
 #
 # - test-webgui-ping
@@ -2588,6 +2589,7 @@ tutorial-tmva-tmva103_Application|\
 tutorial-tmva-RBatchGenerator_NumPy-py|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
+pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
@@ -3721,6 +3723,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-2
+- Exclude pyunittests-pyroot-numbadeclare test
+
 * Sat Dec 02 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-1
 - Update to 6.30.02
 

From 735b7a8692b7ed6d598f5ebe77a3fcbce4f602a5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 18 Dec 2023 20:23:26 +0100
Subject: [PATCH 258/344] Use "standardsymbolsps" instead of "symbol" when
 searching for the Symbols font in order to not find Noto Symbols instead

---
 root-fontconfig.patch | 48 +++++++++++++++++++++----------------------
 root.spec             | 13 ++++++++++--
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index e19c4b4..a8d8a30 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -61,7 +61,7 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 -   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
 +   const char *basename = gSystem->BaseName(fn);
 +
-+   char *ttfnt = NULL;
++   char *ttfnt = nullptr;
 +   int ttindex = 0;
 +
 +   FcPattern *pat, *match;
@@ -136,7 +136,7 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +   }
 +   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +   }
@@ -163,9 +163,9 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +   }
 +
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
  
@@ -255,7 +255,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +   // Add root's font directory
 +   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 +                                       TROOT::GetTTFFontDir());
-+   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
++   FcConfigAppFontAddDir (nullptr, (const FcChar8*)ttpath);
 +
     // load default font (arialbd)
     SetTextFont(62);
@@ -468,7 +468,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   char *ttfont = NULL;
++   char *ttfont = nullptr;
 +   int ttindex = 0;
  
 -   if (!ttfont) {
@@ -481,7 +481,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -         return 1;
 -      }
 +   FcPattern *pat, *match;
-+   FcCharSet *set = NULL;
++   FcCharSet *set = nullptr;
 +   FcResult result;
 +
 +   pat = FcPatternCreate ();
@@ -544,7 +544,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +      break;
 +   case 12:
 +   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
@@ -643,9 +643,9 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +      break;
     }
  
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   char *ttfnt;
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +   ttfont = StrDup (ttfnt);
@@ -776,7 +776,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -         // try backup free font
 -         thisset = 1;
 -      }
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, nullptr );
     }
 -   Int_t italic = 0;
 -   if (fontid==15) italic = 1;
@@ -860,10 +860,10 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 -                                               fonttable[fontid][0], fonttable[fontid][1]);
 -         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
 +
-+         char *ttfont = NULL;
++         char *ttfont = nullptr;
 +
 +         FcPattern *pat, *match;
-+         FcCharSet *set = NULL;
++         FcCharSet *set = nullptr;
 +         FcResult result;
 +
 +         pat = FcPatternCreate ();
@@ -925,7 +925,7 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 +            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +            break;
 +         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +            break;
@@ -1015,9 +1015,9 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 +            break;
 +         }
 +
-+         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +         FcDefaultSubstitute (pat);
-+         match = FcFontMatch (NULL, pat, &result);
++         match = FcFontMatch (nullptr, pat, &result);
 +         char *ttfnt;
 +         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +         ttfont = StrDup(ttfnt);
@@ -1104,11 +1104,11 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 -                                   ((TObjString*)fgFontFileArray[fileID])->String());
 -         file = fp;
 -         delete [] fp;
-+      char *file = NULL;
++      char *file = nullptr;
 +      int ttindex = 0;
 +
 +      FcPattern *pat, *match;
-+      FcCharSet *set = NULL;
++      FcCharSet *set = nullptr;
 +      FcResult result;
 +
 +      pat = FcPatternCreate ();
@@ -1171,7 +1171,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 +         break;
 +      case 11:
 +      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +         break;
@@ -1262,9 +1262,9 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 +         FcPatternAddCharSet (pat, FC_CHARSET, set);
        }
  
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
++      match = FcFontMatch (nullptr, pat, &result);
 +      char *ttfnt;
 +      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +      file = StrDup (ttfnt);
@@ -1431,7 +1431,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 12:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
@@ -1447,9 +1447,9 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
 +      break;
 +   }
 +
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
 +   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
  
diff --git a/root.spec b/root.spec
index c9a6ed3..74ba73f 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2554,6 +2554,10 @@ popd
 #
 # - test-webgui-ping
 #   error: Cannot display window in native
+#
+# - gtest-core-metacling-test-TClingLoadUnloadFile
+#   random failures
+#   terminate called after throwing an instance of 'std::bad_alloc'
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2590,7 +2594,8 @@ tutorial-tmva-RBatchGenerator_NumPy-py|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
-test-webgui-ping"
+test-webgui-ping|\
+gtest-core-metacling-test-TClingLoadUnloadFile"
 
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 # - test-import-pandas
@@ -3723,6 +3728,10 @@ fi
 %endif
 
 %changelog
+* Mon Dec 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-3
+- Use "standardsymbolsps" instead of "symbol" when searching for the
+  Symbols font in order to not find Noto Symbols instead
+
 * Fri Dec 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-2
 - Exclude pyunittests-pyroot-numbadeclare test
 

From b4f122310f19cf59072c0e56c268d251d5e34b74 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 21 Dec 2023 21:31:38 +0100
Subject: [PATCH 259/344] Adjust tests for zlib-ng

---
 root-new-zlib.patch | 89 +++++++++++++++++++++++++++++++++++++++++++++
 root.spec           | 11 +++++-
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 root-new-zlib.patch

diff --git a/root-new-zlib.patch b/root-new-zlib.patch
new file mode 100644
index 0000000..f12eef7
--- /dev/null
+++ b/root-new-zlib.patch
@@ -0,0 +1,89 @@
+From 260fc202a1387cfc3f3ef756f584923ab5b0a198 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 21 Dec 2023 17:58:49 +0100
+Subject: [PATCH] Adapt tests to work with zlib-ng
+
+Fedora 40 has replaced zlib with a zlib compatible version of zlib-ng
+---
+ test/stress.cxx         |  2 +-
+ test/stressGraphics.ref | 28 ++++++++++++++--------------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/test/stress.cxx b/test/stress.cxx
+index de8061a9fc..77f48d43b8 100644
+--- a/test/stress.cxx
++++ b/test/stress.cxx
+@@ -406,7 +406,7 @@ void stress3()
+ #else
+    constexpr Long64_t lastgood = 52090;
+ #endif
+-   constexpr Long64_t tolerance = 150;
++   constexpr Long64_t tolerance = 300;
+ #ifdef R__HAS_DEFAULT_LZ4
+       constexpr Long64_t difflastgoodlz4 = 5500;
+       if (last < lastgood - tolerance || last > lastgood + difflastgoodlz4 + tolerance || comp < 1.5 || comp > 2.1)
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 16d06e33fa..a21068927d 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -2,12 +2,12 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+     1       529        50     12767        50     23848      3700      3937       100       569        60
+     2      4627       600     14506       100     13368      7900      9208      3000      4690       600
+     3       452        50     12694        50     11232      4200      3796     10700       492        50
+-    4     23617      1500     19386       100    143320    123000     45665     11000     24908      1500
++    4     23617      1500     19386       200    143320    123000     45665     11000     24908      1500
+     5      1025       150     12802       200     33468      9900     30846      5000      1072       200
+     6       430        50     12669        50      9558       100      5325       700       471        50
+     7      4980        50     13893        50     16143      1300     12230       500      5011        70
+     8      5442        80     13473        50     18430       700     12398       300      5469        80
+-    9      9253       100     14377        50     19851      2400     12199       900      9449       100
++    9      9253       100     14377       100     19851      2400     12199       900      9449       100
+    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
+    11     12971       100     14444        50     34063      2000     32033      1200     12864       150
+    12      7674       100     13533        50     83557      3000     38505      4000      7720       150
+@@ -15,30 +15,30 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
+    15     15690      5000     17179       200     23076      9500     15202       900     10437      5000
+    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
+-   17     20444       400     21520       100     27511     11000     16867       600     20721       400
+-   18     15894       100     19305       100     27187     10300     15925       350     15925       100
+-   19     22521       300     42926       150     43868     17000     19232     11000     22729       300
++   17     20444       400     21520       150     27511     11000     16867       600     20721       400
++   18     15894       100     19305       200     27187     10300     15925       350     15925       100
++   19     22521       300     42926       200     43868     17000     19232     11000     22729       300
+    20      3664       600     14437       100     19824      6300     10396       900      4220       600
+    21     17608       600     13900       150     49440      6300     37586      9000      5938       600
+    22      4866       600     14162       100     30889     10050     21311      1800      4845       600
+-   23      4131        40     15272        50     34038      2500     12258      1400      4162        40
++   23      4131        40     15272       100     34038      2500     12258      1400      4162        40
+    24      7813       300     23739       100     11085      6000      6973      3100      8081       300
+    25     28422       150     29391       300     14104     14800      7386      2800     14493       150
+    26      4545       150     14541       100     27602     14800     13094      2800      4467       150
+    27      6141       200     15967       100     39594     21600     19331      7000      6596       500
+    28      9110       500     16584       200     21346     21600     10645      7000      8869       500
+    29      7419       500     15112       200     18872     21600      7928      7000      7296       500
+-   30     17016      5500     18198       100     32434     17400     22157      5000     20823      5500
+-   31     30615      8200     27176       150     50520     18200     35724      5400     36690      8200
+-   32   3304592       100    712308       500     62688     19000    123056      7000         0         0
++   30     17016      5500     18198       250     32434     17400     22157      5000     20823      5500
++   31     30615      8200     27176       200     50520     18200     35724      5400     36690      8200
++   32   3304592       100    712308      3000     62688     19000    123056      7000         0         0
+    33     89233       500     47975       300     65532     27800     37314     12000     90600       500
+    34     36514       300     16815       200     47408     12700     33739      3700     36399       300
+-   35    207729       750     87126       100     76094     38000     54717     11000    210497       800
+-   36    401670      6500    156361       500     62719     34100     45592     14000    410114      6500
+-   37    566142      5000    225206       750     65828     31800     53934      6500    573396      5000
+-   38   3738751     35000   1292739      8000     60580      9900    133547      3500   3783013     35000
++   35    207729       750     87126       750     76094     38000     54717     11000    210497       800
++   36    401670      6500    156361      2000     62719     34100     45592     14000    410114      6500
++   37    566142      5000    225206      2000     65828     31800     53934      6500    573396      5000
++   38   3738751     35000   1292739     12000     60580      9900    133547      3500   3783013     35000
+    39   1466028      9000    853193     50000     38425     13500     91242     18100   1463263      7500
+-   40     38312       200     56877       250     36524     11800    119641      8000     38121       200
++   40     38312       200     56877       750     36524     11800    119641      8000     38121       200
+    41     15025      3000     29289       500     42525     11300     33336      3900     14787      4000
+    42    254604      5000    383258      7000     55666     30400     46534      6500    259594      7000
+    43      4846       150     14075       150     33239       600     25303       300      4877       150
+-- 
+2.43.0
+
diff --git a/root.spec b/root.spec
index 74ba73f..ab0b5aa 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -109,6 +109,9 @@ Patch14:	%{name}-np32.patch
 Patch15:	%{name}-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
 #		Only for EPEL 8 - disable tests not working with old gtest
 Patch16:	%{name}-old-gtest.patch
+#		Adjust tests for zlib-ng
+#		https://github.com/root-project/root/pull/14295
+Patch17:	%{name}-new-zlib.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -2002,6 +2005,7 @@ This package contains utility functions for ntuples.
 %if %{?rhel}%{!?rhel:0} == 8
 %patch -P 16 -p1
 %endif
+%patch -P 17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2556,7 +2560,7 @@ popd
 #   error: Cannot display window in native
 #
 # - gtest-core-metacling-test-TClingLoadUnloadFile
-#   random failures
+#   random failures: https://github.com/root-project/root/issues/14121
 #   terminate called after throwing an instance of 'std::bad_alloc'
 excluded="\
 test-stressIOPlugins|\
@@ -3728,6 +3732,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 21 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-4
+- Adjust tests for zlib-ng
+
 * Mon Dec 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-3
 - Use "standardsymbolsps" instead of "symbol" when searching for the
   Symbols font in order to not find Noto Symbols instead

From 63c341633f6396b3aa4fe09855f0839c464fa9d0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 12 Jan 2024 20:24:43 +0100
Subject: [PATCH 260/344] Define PYTHON_EXECUTABLE when calling cmake (Fixes
 EPEL 8 build)

---
 root.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index ab0b5aa..8606d2e 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -206,7 +206,7 @@ BuildRequires:	cppzmq-devel
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
-BuildRequires:	python3-rcssmin
+BuildRequires:	python%{python3_pkgversion}-rcssmin
 BuildRequires:	uglify-js3
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
@@ -2074,6 +2074,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
+       -DPYTHON_EXECUTABLE=%{__python3} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_afterimage:BOOL=OFF \
        -Dbuiltin_cfitsio:BOOL=OFF \
@@ -3732,6 +3733,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 12 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-5
+- Define PYTHON_EXECUTABLE when calling cmake (Fixes EPEL 8 build)
+
 * Thu Dec 21 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-4
 - Adjust tests for zlib-ng
 

From 40040121b9021fd13242af649095090e71e92877 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 17 Jan 2024 23:28:26 +0000
Subject: [PATCH 261/344] Rebuilt for TBB 2021.11

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8606d2e..2cf8e87 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3733,6 +3733,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 6.30.02-6
+- Rebuilt for TBB 2021.11
+
 * Fri Jan 12 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-5
 - Define PYTHON_EXECUTABLE when calling cmake (Fixes EPEL 8 build)
 

From 277c592ff22f672d0807876d6bf5188c23b39d66 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 11:52:28 +0000
Subject: [PATCH 262/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 2cf8e87..088ea04 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3733,6 +3733,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.30.02-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 6.30.02-6
 - Rebuilt for TBB 2021.11
 

From 65481a92449017b145537e66c38eb8445fb70a04 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 26 Jan 2024 07:10:54 +0100
Subject: [PATCH 263/344] Exclude failing
 gtest-math-matrix-test-testMatrixTSparse on Fedora 40 (aarch64, ppc64le and
 s390x)

---
 root.spec | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 088ea04..bce52de 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2807,6 +2807,16 @@ test-stressgraphics"
 %endif
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 40
+%ifarch aarch64 %{power64} s390x
+# Fails with gcc 14 on aarch64, ppc64le and s390x
+# https://github.com/root-project/root/issues/14446
+# - gtest-math-matrix-test-testMatrixTSparse
+excluded="${excluded}|\
+gtest-math-matrix-test-testMatrixTSparse"
+%endif
+%endif
+
 # Filter out parts of tests that require remote network access
 # RNTuple.TClassEBO seg fault
 # https://github.com/root-project/root/issues/12428
@@ -3733,6 +3743,10 @@ fi
 %endif
 
 %changelog
+* Fri Jan 26 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-8
+- Exclude failing gtest-math-matrix-test-testMatrixTSparse on Fedora 40
+  (aarch64, ppc64le and s390x)
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.30.02-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a5b9453dc488a5f2f4e321f0c845426a8c9b3ff2 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 26 Jan 2024 23:46:38 +0100
Subject: [PATCH 264/344] Rebuilt for libarrow.so.1500

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bce52de..c116b12 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3743,6 +3743,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 26 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-9
+- Rebuilt for libarrow.so.1500
+
 * Fri Jan 26 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-8
 - Exclude failing gtest-math-matrix-test-testMatrixTSparse on Fedora 40
   (aarch64, ppc64le and s390x)

From c2cd7682c3bcdf161e4c7632f702f9112418c3b0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@ellert.se>
Date: Thu, 1 Feb 2024 07:40:40 +0100
Subject: [PATCH 265/344] Update to 6.30.04

Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
  (accepted upstrem)
Exclude failing TClingDataMemberInfo.Offset test on s390x
---
 ...or-failures-on-aarch64-ppc64le-s390x.patch | 32 -------------------
 root.spec                                     | 24 +++++++++-----
 sources                                       |  2 +-
 3 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch

diff --git a/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch b/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
deleted file mode 100644
index 05f7fa6..0000000
--- a/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8e6b901646c0a4139b9f6f18c5d6cd5c98614136 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 2 Dec 2023 18:50:04 +0100
-Subject: [PATCH] Adjust test for failures on aarch64, ppc64le and s390x
-
-[ RUN      ] RooTruthModel.IntegrateSubrange
-[#1] INFO:Eval -- RooRealVar::setRange(dt) new range named 'integral' created with bounds [2,2]
-/builddir/build/BUILD/root-6.30.02/roofit/roofitcore/test/testRooTruthModel.cxx:38: Failure
-Expected equality of these values:
-  integ->getVal()
-    Which is: -2.8822093e-17
-  0.0
-    Which is: 0
-[  FAILED  ] RooTruthModel.IntegrateSubrange (194 ms)
----
- roofit/roofitcore/test/testRooTruthModel.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/roofit/roofitcore/test/testRooTruthModel.cxx b/roofit/roofitcore/test/testRooTruthModel.cxx
-index a97fcb7c4e..ff3464a880 100644
---- a/roofit/roofitcore/test/testRooTruthModel.cxx
-+++ b/roofit/roofitcore/test/testRooTruthModel.cxx
-@@ -35,5 +35,5 @@ TEST(RooTruthModel, IntegrateSubrange)
-    dt.setRange("integral", 2, 2);
- 
-    std::unique_ptr<RooAbsReal> integ{bcpg.createIntegral({dt}, "integral")};
--   EXPECT_FLOAT_EQ(integ->getVal(), 0.0);
-+   EXPECT_NEAR(integ->getVal(), 0.0, 1e-16);
- }
--- 
-2.43.0
-
diff --git a/root.spec b/root.spec
index c116b12..063bdbe 100644
--- a/root.spec
+++ b/root.spec
@@ -45,9 +45,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.30.02
+Version:	6.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	9%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -105,13 +105,11 @@ Patch11:	%{name}-avoid-out-of-memory-during-linking.patch
 Patch12:	%{name}-clad.patch
 Patch13:	%{name}-gtest-back.patch
 Patch14:	%{name}-np32.patch
-#		https://github.com/root-project/root/pull/14164
-Patch15:	%{name}-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
-#		Only for EPEL 8 - disable tests not working with old gtest
-Patch16:	%{name}-old-gtest.patch
 #		Adjust tests for zlib-ng
 #		https://github.com/root-project/root/pull/14295
-Patch17:	%{name}-new-zlib.patch
+Patch15:	%{name}-new-zlib.patch
+#		Only for EPEL 8 - disable tests not working with old gtest
+Patch16:	%{name}-old-gtest.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -2005,7 +2003,6 @@ This package contains utility functions for ntuples.
 %if %{?rhel}%{!?rhel:0} == 8
 %patch -P 16 -p1
 %endif
-%patch -P 17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2818,6 +2815,8 @@ gtest-math-matrix-test-testMatrixTSparse"
 %endif
 
 # Filter out parts of tests that require remote network access
+# TClingDataMemberInfo.Offset fails on s390x
+# https://github.com/root-project/root/issues/14512
 # RNTuple.TClassEBO seg fault
 # https://github.com/root-project/root/issues/12428
 GTEST_FILTER=-\
@@ -2827,6 +2826,9 @@ RSqliteDS.Davix:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
 TFile.ReadWithoutGlobalRegistrationWeb:\
+%ifarch s390x
+TClingDataMemberInfo.Offset:\
+%endif
 RNTuple.TClassEBO \
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 ROOTTEST_IGNORE_PANDAS_PY3=1 \
@@ -3743,6 +3745,12 @@ fi
 %endif
 
 %changelog
+* Wed Jan 31 2024 Mattias Ellert <ellert@ellert.se> - 6.30.04-1
+- Update to 6.30.04
+- Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
+  (accepted upstrem)
+- Exclude failing TClingDataMemberInfo.Offset test on s390x
+
 * Fri Jan 26 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-9
 - Rebuilt for libarrow.so.1500
 
diff --git a/sources b/sources
index 4d9b587..c59f721 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.30.02.tar.xz) = 8f4790f2cc81fd637d8e7a499232430648935856738a92b9e33b7d483e9126b6dcd238504c810818397c05aa2f34b04b6eab2dc4821e605da50ccf85db33532e
+SHA512 (root-6.30.04.tar.xz) = cb78a34755f4830b3dcc74d10302a391b05198e378257f5fa06bb19f23a0a4c50a45fa58e7e0cc3d4bf91368726a4419d624af40dd683715c4b4720a776133d3
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 29328ac08b05e64a4200cb920cf0ffb3d681b5a9 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 25 Mar 2024 11:16:05 +0100
Subject: [PATCH 266/344] Support StandardSymbolsPS.otf

---
 root-fontconfig.patch | 5 ++++-
 root.spec             | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index a8d8a30..e8ad108 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -268,7 +268,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
        FT_Done_Face(fgFace[i]);
     }
     if (fgRotMatrix) delete fgRotMatrix;
-@@ -109,12 +114,19 @@
+@@ -109,12 +114,22 @@
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
@@ -281,6 +281,9 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +             (platform == 7 && encoding == 2 &&
 +              (fgFontID[fgCurFontIdx] == 12 ||
 +               fgFontID[fgCurFontIdx] == 14 ||
++               fgFontID[fgCurFontIdx] == 15)) ||
++             (platform == 0 && encoding == 3 &&
++              (fgFontID[fgCurFontIdx] == 12 ||
 +               fgFontID[fgCurFontIdx] == 15)) ||
               (platform == 1 && encoding == 0 &&
 -              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
diff --git a/root.spec b/root.spec
index 063bdbe..04a4c38 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3745,6 +3745,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 25 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.04-2
+- Support StandardSymbolsPS.otf
+
 * Wed Jan 31 2024 Mattias Ellert <ellert@ellert.se> - 6.30.04-1
 - Update to 6.30.04
 - Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch

From d22cdf63445b84f2459dd50f2fced00d29deb152 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 5 Apr 2024 15:37:21 +0200
Subject: [PATCH 267/344] Update to 6.30.06

---
 root-old-gtest.patch | 29 +++++++++++++++++++++++++++++
 root.spec            | 30 +++++++++++-------------------
 sources              |  2 +-
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/root-old-gtest.patch b/root-old-gtest.patch
index bdefd48..87b6fe4 100644
--- a/root-old-gtest.patch
+++ b/root-old-gtest.patch
@@ -1,3 +1,32 @@
+From 8b7369a527aa52204e1ce529c8cb206cfee4c61b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 17 Nov 2023 16:18:12 +0100
+Subject: [PATCH] Disable tests that don't compile with old gtest (EPEL 8)
+
+---
+ core/metacling/test/TClingLoadUnloadFileTests.cxx | 2 ++
+ roofit/histfactory/test/testHistFactory.cxx       | 2 ++
+ roofit/roofitcore/test/testRooProdPdf.cxx         | 2 ++
+ roofit/roofitcore/test/testTestStatistics.cxx     | 2 ++
+ 4 files changed, 8 insertions(+)
+
+diff --git a/core/metacling/test/TClingLoadUnloadFileTests.cxx b/core/metacling/test/TClingLoadUnloadFileTests.cxx
+index 7f97f3f441..d1b7a65fbc 100644
+--- a/core/metacling/test/TClingLoadUnloadFileTests.cxx
++++ b/core/metacling/test/TClingLoadUnloadFileTests.cxx
+@@ -73,6 +73,7 @@ void remove_n_library_artifacts(const std::string &basename, unsigned int n)
+    }
+ }
+ 
++/*
+ TEST(TClingLoadUnloadFile, ConcurrentLoadUnloadSameLib)
+ {
+    GTEST_SKIP() << "fails sporadically, see "
+@@ -125,3 +126,4 @@ TEST(TClingLoadUnloadFile, ConcurrentLoadUnloadOneLibPerThread)
+ 
+    remove_n_library_artifacts(basename, n_libraries);
+ }
++*/
 diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
 index 7553ba4e4a..fefdca8e97 100644
 --- a/roofit/histfactory/test/testHistFactory.cxx
diff --git a/root.spec b/root.spec
index 04a4c38..9632e82 100644
--- a/root.spec
+++ b/root.spec
@@ -45,9 +45,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.30.04
+Version:	6.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2556,10 +2556,6 @@ popd
 #
 # - test-webgui-ping
 #   error: Cannot display window in native
-#
-# - gtest-core-metacling-test-TClingLoadUnloadFile
-#   random failures: https://github.com/root-project/root/issues/14121
-#   terminate called after throwing an instance of 'std::bad_alloc'
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2596,8 +2592,7 @@ tutorial-tmva-RBatchGenerator_NumPy-py|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
-test-webgui-ping|\
-gtest-core-metacling-test-TClingLoadUnloadFile"
+test-webgui-ping"
 
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 # - test-import-pandas
@@ -2730,7 +2725,6 @@ gtest-roofit-roofitcore-test-testNaNPacker"
 # - tutorial-roofit-rf307_fullpereventerrors-py
 # - tutorial-roofit-rf310_sliceplot-py
 # - tutorial-roofit-rf708_bphysics-py
-# - tutorial-tmva-RBatchGenerator_filters_vectors-py
 # - tutorial-tmva-TMVA_CNN_Classification-py
 # - tutorial-tmva-TMVA_Higgs_Classification-py
 # - tutorial-tmva-TMVA_RNN_Classification-py
@@ -2780,7 +2774,6 @@ tutorial-roofit-rf306_condpereventerrors-py|\
 tutorial-roofit-rf307_fullpereventerrors-py|\
 tutorial-roofit-rf310_sliceplot-py|\
 tutorial-roofit-rf708_bphysics-py|\
-tutorial-tmva-RBatchGenerator_filters_vectors-py|\
 tutorial-tmva-TMVA_CNN_Classification-py|\
 tutorial-tmva-TMVA_Higgs_Classification-py|\
 tutorial-tmva-TMVA_RNN_Classification-py|\
@@ -2817,19 +2810,16 @@ gtest-math-matrix-test-testMatrixTSparse"
 # Filter out parts of tests that require remote network access
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
-# RNTuple.TClassEBO seg fault
-# https://github.com/root-project/root/issues/12428
 GTEST_FILTER=-\
+%ifarch s390x
+TClingDataMemberInfo.Offset:\
+%endif
 RCsvDS.Remote:\
 RRawFile.Remote:\
 RSqliteDS.Davix:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
-TFile.ReadWithoutGlobalRegistrationWeb:\
-%ifarch s390x
-TClingDataMemberInfo.Offset:\
-%endif
-RNTuple.TClassEBO \
+TFile.ReadWithoutGlobalRegistrationWeb \
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 ROOTTEST_IGNORE_PANDAS_PY3=1 \
 %endif
@@ -2971,12 +2961,11 @@ fi
 %if %{bundlejson}
 %dir %{_includedir}/%{name}/nlohmann
 %{_includedir}/%{name}/nlohmann/json.hpp
-%{_includedir}/%{name}/nlohmann/json_fwd.hpp
 %endif
 %{_includedir}/%{name}/RConfigOptions.h
 %{_includedir}/%{name}/RConfigure.h
+%{_includedir}/%{name}/ROOT.modulemap
 %{_includedir}/%{name}/compiledata.h
-%{_includedir}/%{name}/module.modulemap
 %dir %{_includedir}/%{name}/Math
 %dir %{_includedir}/%{name}/ROOT
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -3745,6 +3734,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 05 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-1
+- Update to 6.30.06
+
 * Mon Mar 25 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.04-2
 - Support StandardSymbolsPS.otf
 
diff --git a/sources b/sources
index c59f721..755c137 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.30.04.tar.xz) = cb78a34755f4830b3dcc74d10302a391b05198e378257f5fa06bb19f23a0a4c50a45fa58e7e0cc3d4bf91368726a4419d624af40dd683715c4b4720a776133d3
+SHA512 (root-6.30.06.tar.xz) = 10309321a8e803f1ea2019a4d8ddde6220b052ddfa1ed7dedd432201db5917da748e944b2323794317251fd0d70048b276ad7bed6e3fcd84835de7be88b4c420
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From fbaff99ab697b5c5d0db6a5bf87e6ca22fdf0fab Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 23 Apr 2024 09:53:13 +0200
Subject: [PATCH 268/344] Rebuilt for libarrow.so.1600

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9632e82..e5fd7eb 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3734,6 +3734,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 23 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-2
+- Rebuilt for libarrow.so.1600
+
 * Fri Apr 05 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-1
 - Update to 6.30.06
 

From 518c033b52372bc24f8c996740dc9f45e5217df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Thu, 25 Apr 2024 16:16:49 +0200
Subject: [PATCH 269/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index e5fd7eb..3aba984 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3734,6 +3734,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 25 2024 Iñaki Úcar <iucar@fedoraproject.org> - 6.30.06-3
+- R-maint-sig mass rebuild
+
 * Tue Apr 23 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-2
 - Rebuilt for libarrow.so.1600
 

From 0f2b684662cd83ea098314b4a50741ab93dc99b6 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 19 Feb 2024 13:49:35 -0500
Subject: [PATCH 270/344] Do not test with Pandas on 32-bit architectures

https://bugzilla.redhat.com/show_bug.cgi?id=2263999
---
 root.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/root.spec b/root.spec
index 3aba984..207b1f5 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -201,7 +201,7 @@ BuildRequires:	zeromq-devel >= 4.3.5
 BuildRequires:	cppzmq-devel
 %endif
 %endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
+%if (0%{?fedora} && 0%{?__isa_bits} == 64) || 0%{?rhel} == 8
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
 BuildRequires:	python%{python3_pkgversion}-rcssmin
@@ -2594,7 +2594,7 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
-%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
+%if (0%{?fedora} && 0%{?__isa_bits} != 64) || 0%{?rhel} == 8
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
 # - tutorial-roofit-rf409_NumPyPandasToRooFit-py
@@ -3734,6 +3734,9 @@ fi
 %endif
 
 %changelog
+* Sun Apr 28 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 6.30.06-4
+- Do not test with Pandas on 32-bit architectures
+
 * Thu Apr 25 2024 Iñaki Úcar <iucar@fedoraproject.org> - 6.30.06-3
 - R-maint-sig mass rebuild
 

From 4d9bac38913ea0c73ef57610b910aa09bd579004 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 15 May 2024 12:58:24 +0200
Subject: [PATCH 271/344] Rebuilt for libarrow.so.1601 Improved fontconfig
 support

---
 root-fontconfig.patch | 1461 ++++++++++++++---------------------------
 root.spec             |   22 +-
 2 files changed, 507 insertions(+), 976 deletions(-)

diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index e8ad108..d0f38b1 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,7 +1,28 @@
-diff -ur root-6.28.00.orig/core/base/src/TApplication.cxx root-6.28.00/core/base/src/TApplication.cxx
---- root-6.28.00.orig/core/base/src/TApplication.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/core/base/src/TApplication.cxx	2023-02-04 12:47:19.757759982 +0100
-@@ -251,18 +251,11 @@
+From c5f13cb25c3b803346d1a6cac483badbcf2ced62 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 11 May 2024 20:09:47 +0200
+Subject: [PATCH] Use system fonts via fontconfig
+
+---
+ core/base/src/TApplication.cxx        |  11 +-
+ graf2d/asimage/CMakeLists.txt         |   1 +
+ graf2d/asimage/src/TASImage.cxx       |  91 +++++++-
+ graf2d/graf/CMakeLists.txt            |   1 +
+ graf2d/graf/inc/TTF.h                 |   3 +-
+ graf2d/graf/src/TTF.cxx               | 291 +++++++++++++++++---------
+ graf2d/postscript/CMakeLists.txt      |   1 +
+ graf2d/postscript/src/TPostScript.cxx | 106 +++++-----
+ graf3d/gl/CMakeLists.txt              |   1 +
+ graf3d/gl/src/TGLFontManager.cxx      | 123 ++++++++++-
+ graf3d/gl/src/TGLText.cxx             |  56 +++--
+ gui/gui/src/TGApplication.cxx         |  10 +-
+ 12 files changed, 494 insertions(+), 201 deletions(-)
+
+diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
+index 992713264a..32bfc0bbb9 100644
+--- a/core/base/src/TApplication.cxx
++++ b/core/base/src/TApplication.cxx
+@@ -251,18 +251,12 @@ void TApplication::InitializeGraphics(Bool_t only_web)
        LoadGraphicsLibs();
  
        // Try to load TrueType font renderer. Only try to load if not in batch
@@ -14,7 +35,7 @@ diff -ur root-6.28.00.orig/core/base/src/TApplication.cxx root-6.28.00/core/base
 -      // Check for use of DFSG - fonts
 -      if (!ttfont)
 -         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--
+ 
     #if !defined(R__WIN32)
        if (!gROOT->IsBatch() && !strcmp(gVirtualX->GetName(), "X11") &&
 -          ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
@@ -22,7 +43,7 @@ diff -ur root-6.28.00.orig/core/base/src/TApplication.cxx root-6.28.00/core/base
           if (gClassTable->GetDict("TGX11TTF")) {
              // in principle we should not have linked anything against libGX11TTF
              // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -276,7 +269,6 @@
+@@ -276,7 +270,6 @@ void TApplication::InitializeGraphics(Bool_t only_web)
           }
        }
     #endif
@@ -30,10 +51,11 @@ diff -ur root-6.28.00.orig/core/base/src/TApplication.cxx root-6.28.00/core/base
     }
  
     if (!only_web || !fAppImp) {
-diff -ur root-6.28.00.orig/graf2d/asimage/CMakeLists.txt root-6.28.00/graf2d/asimage/CMakeLists.txt
---- root-6.28.00.orig/graf2d/asimage/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/asimage/CMakeLists.txt	2023-02-04 12:47:19.757759982 +0100
-@@ -30,6 +30,7 @@
+diff --git a/graf2d/asimage/CMakeLists.txt b/graf2d/asimage/CMakeLists.txt
+index 31114ad45d..be95419491 100644
+--- a/graf2d/asimage/CMakeLists.txt
++++ b/graf2d/asimage/CMakeLists.txt
+@@ -30,6 +30,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
      ZLIB::ZLIB
@@ -41,10 +63,11 @@ diff -ur root-6.28.00.orig/graf2d/asimage/CMakeLists.txt root-6.28.00/graf2d/asi
    DEPENDENCIES
      Core
      Graf
-diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/asimage/src/TASImage.cxx
---- root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/asimage/src/TASImage.cxx	2023-02-04 12:47:19.760759989 +0100
-@@ -115,6 +115,8 @@
+diff --git a/graf2d/asimage/src/TASImage.cxx b/graf2d/asimage/src/TASImage.cxx
+index 7e046f4724..137265bd4a 100644
+--- a/graf2d/asimage/src/TASImage.cxx
++++ b/graf2d/asimage/src/TASImage.cxx
+@@ -117,6 +117,8 @@ extern "C" {
  #   include <draw.h>
  }
  
@@ -53,135 +76,101 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2590,14 +2592,120 @@
-    TString fn = font_name;
-    fn.Strip();
- 
--   // This is for backward compatibility...
--   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
-+   const char *basename = gSystem->BaseName(fn);
-+
-+   char *ttfnt = nullptr;
-+   int ttindex = 0;
-+
-+   FcPattern *pat, *match;
-+   FcResult result;
-+
-+   pat = FcPatternCreate ();
-+
-+   if (strcmp(basename, "timesi.ttf") == 0 ||
-+       strcmp(basename, "FreeSerifItalic.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "timesbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBold.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "timesbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "arial.ttf") == 0 ||
-+            strcmp(basename, "FreeSans.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "ariali.ttf") == 0 ||
-+            strcmp(basename, "FreeSansOblique.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "arialbd.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBold.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "arialbi.ttf") == 0 ||
-+            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "cour.ttf") == 0 ||
-+            strcmp(basename, "FreeMono.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "couri.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoOblique.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "courbd.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBold.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "courbi.ttf") == 0 ||
-+            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "times.ttf") == 0 ||
-+            strcmp(basename, "FreeSerif.otf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "wingding.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+   else if (strcmp(basename, "BlackChancery.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"urwchanceryl");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+   }
-+   else {
-+      Warning("DrawText", "cannot find a font %s", font_name);
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+   }
-+
-+   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (nullptr, pat, &result);
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
+@@ -2595,11 +2597,88 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
+    // This is for backward compatibility...
+    if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
  
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -                                       TROOT::GetTTFFontDir());
 -   char *tmpstr = gSystem->Which(ttpath, fn, kReadPermission);
 -   fn = tmpstr;
 -   delete [] tmpstr;
-+   fn = ttfnt;
++   const char *basename = gSystem->BaseName(fn);
 +
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
++   int ttindex = 0;
++
++   FcPattern *pat = nullptr, *match;
++   FcResult result;
++
++   if (strcmp(basename, "timesi.ttf") == 0 ||
++       strcmp(basename, "FreeSerifItalic.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freeserif:italic");
++   }
++   else if (strcmp(basename, "timesbd.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBold.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freeserif:bold");
++   }
++   else if (strcmp(basename, "timesbi.ttf") == 0 ||
++            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freeserif:bold:italic");
++   }
++   else if (strcmp(basename, "arial.ttf") == 0 ||
++            strcmp(basename, "FreeSans.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freesans");
++   }
++   else if (strcmp(basename, "ariali.ttf") == 0 ||
++            strcmp(basename, "FreeSansOblique.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freesans:italic");
++   }
++   else if (strcmp(basename, "arialbd.ttf") == 0 ||
++            strcmp(basename, "FreeSansBold.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freesans:bold");
++   }
++   else if (strcmp(basename, "arialbi.ttf") == 0 ||
++            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freesans:bold:italic");
++   }
++   else if (strcmp(basename, "cour.ttf") == 0 ||
++            strcmp(basename, "FreeMono.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freemono");
++   }
++   else if (strcmp(basename, "couri.ttf") == 0 ||
++            strcmp(basename, "FreeMonoOblique.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freemono:italic");
++   }
++   else if (strcmp(basename, "courbd.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBold.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freemono:bold");
++   }
++   else if (strcmp(basename, "courbi.ttf") == 0 ||
++            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freemono:bold:italic");
++   }
++   else if (strcmp(basename, "symbol.ttf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "standardsymbolsps");
++   }
++   else if (strcmp(basename, "times.ttf") == 0 ||
++            strcmp(basename, "FreeSerif.otf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "freeserif");
++   }
++   else if (strcmp(basename, "wingding.ttf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "dingbats");
++   }
++   else if (strcmp(basename, "BlackChancery.ttf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "urwchanceryl");
++   }
++   else if (gSystem->AccessPathName(fn, kReadPermission) != 0) {
++      // Font name is not a file - usae as pattern
++      pat = FcNameParse ((const FcChar8*) fn.Data());
++   }
++
++   if (pat) {
++      FcConfigSubstitute (nullptr, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (nullptr, pat, &result);
++      if (match) {
++         char *ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**) &ttfnt);
++         fn = ttfnt;
++         FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++         FcPatternDestroy (match);
++      }
++      FcPatternDestroy (pat);
++   }
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2621,14 +2729,11 @@
+@@ -2623,7 +2702,7 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
        return;
     }
  
@@ -189,20 +178,12 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 +   ASFont *font = get_asfont(gFontManager, fn.Data(), ttindex, size, ASF_GuessWho);
  
     if (!font) {
--      font = get_asfont(gFontManager, "fixed", 0, size, ASF_GuessWho);
--      if (!font) {
--         Warning("DrawText", "cannot find a font %s", font_name);
--         return;
--      }
-+      Warning("DrawText", "cannot find a font %s", font_name);
-+      return;
-    }
- 
-    get_text_size(text, font, (ASText3DType)type, &width, &height);
-diff -ur root-6.28.00.orig/graf2d/graf/CMakeLists.txt root-6.28.00/graf2d/graf/CMakeLists.txt
---- root-6.28.00.orig/graf2d/graf/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/graf/CMakeLists.txt	2023-02-04 12:47:19.861760233 +0100
-@@ -91,6 +91,7 @@
+       font = get_asfont(gFontManager, "fixed", 0, size, ASF_GuessWho);
+diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt
+index d7d1b77c21..c4ebb994a4 100644
+--- a/graf2d/graf/CMakeLists.txt
++++ b/graf2d/graf/CMakeLists.txt
+@@ -91,6 +91,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
      ${FREETYPE_LIBRARIES}
      ZLIB::ZLIB
      mathtext
@@ -210,24 +191,27 @@ diff -ur root-6.28.00.orig/graf2d/graf/CMakeLists.txt root-6.28.00/graf2d/graf/C
    DEPENDENCIES
      Hist
      Matrix
-diff -ur root-6.28.00.orig/graf2d/graf/inc/TTF.h root-6.28.00/graf2d/graf/inc/TTF.h
---- root-6.28.00.orig/graf2d/graf/inc/TTF.h	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/graf/inc/TTF.h	2023-02-04 12:47:19.862760235 +0100
-@@ -76,9 +76,8 @@
+diff --git a/graf2d/graf/inc/TTF.h b/graf2d/graf/inc/TTF.h
+index 0bef9dcb95..ea96fe47ce 100644
+--- a/graf2d/graf/inc/TTF.h
++++ b/graf2d/graf/inc/TTF.h
+@@ -76,9 +76,10 @@ protected:
     static FT_BBox        fgCBox;                  ///< string control box
     static FT_CharMap     fgCharMap[kTTMaxFonts];  ///< font character map
     static Int_t          fgCurFontIdx;            ///< current font index
 -   static Int_t          fgSymbItaFontIdx;        ///< Symbol italic font index
     static Int_t          fgFontCount;             ///< number of fonts loaded
--   static char          *fgFontName[kTTMaxFonts]; ///< font name
-+   static Int_t          fgFontID[kTTMaxFonts];   ///< font ID
+    static char          *fgFontName[kTTMaxFonts]; ///< font name
++   static Int_t          fgFontIdx[kTTMaxFonts];  ///< font index in font file
++   static Int_t          fgFontIta[kTTMaxFonts];  ///< font slanted using transform
     static FT_Face        fgFace[kTTMaxFonts];     ///< font face
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
-diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/TTF.cxx
---- root-6.28.00.orig/graf2d/graf/src/TTF.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/graf/src/TTF.cxx	2023-02-04 12:47:19.863760238 +0100
-@@ -25,6 +25,8 @@
+diff --git a/graf2d/graf/src/TTF.cxx b/graf2d/graf/src/TTF.cxx
+index ca38ed1f9c..8f1d62686b 100644
+--- a/graf2d/graf/src/TTF.cxx
++++ b/graf2d/graf/src/TTF.cxx
+@@ -25,6 +25,8 @@ Interface to the freetype 2 library.
  #include "TMath.h"
  #include "TError.h"
  
@@ -236,19 +220,20 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
  // to scale fonts to the same size as the old TT version
  const Float_t kScale = 0.93376068;
  
-@@ -38,10 +40,9 @@
+@@ -38,10 +40,11 @@ Int_t          TTF::fgTBlankW        = 0;
  Int_t          TTF::fgWidth          = 0;
  Int_t          TTF::fgAscent         = 0;
  Int_t          TTF::fgCurFontIdx     = -1;
 -Int_t          TTF::fgSymbItaFontIdx = -1;
  Int_t          TTF::fgFontCount      = 0;
  Int_t          TTF::fgNumGlyphs      = 0;
--char          *TTF::fgFontName[kTTMaxFonts];
-+Int_t          TTF::fgFontID[kTTMaxFonts];
+ char          *TTF::fgFontName[kTTMaxFonts];
++Int_t          TTF::fgFontIdx[kTTMaxFonts];
++Int_t          TTF::fgFontIta[kTTMaxFonts];
  FT_Matrix     *TTF::fgRotMatrix      = nullptr;
  FT_Library     TTF::fgLibrary;
  FT_BBox        TTF::fgCBox;
-@@ -72,6 +73,11 @@
+@@ -72,6 +75,11 @@ void TTF::Init()
        return;
     }
  
@@ -260,180 +245,159 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
     // load default font (arialbd)
     SetTextFont(62);
  }
-@@ -84,7 +90,6 @@
-    if (!fgInit) return;
- 
-    for (int i = 0; i < fgFontCount; i++) {
--      delete [] fgFontName[i];
-       FT_Done_Face(fgFace[i]);
-    }
-    if (fgRotMatrix) delete fgRotMatrix;
-@@ -109,12 +114,22 @@
+@@ -109,12 +117,15 @@ Short_t TTF::CharToUnicode(UInt_t code)
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
 -         if ((platform == 3 && encoding == 1) ||
 +         if ((platform == 3 && encoding == 1 &&
-+              (fgFontID[fgCurFontIdx] != 12 &&
-+               fgFontID[fgCurFontIdx] != 14 &&
-+               fgFontID[fgCurFontIdx] != 15)) ||
++              (fgFontIta[fgCurFontIdx] & 2) == 0) ||
               (platform == 0 && encoding == 0) ||
 +             (platform == 7 && encoding == 2 &&
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)) ||
++              (fgFontIta[fgCurFontIdx] & 2) != 0) ||
 +             (platform == 0 && encoding == 3 &&
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 15)) ||
++              (fgFontIta[fgCurFontIdx] & 2) != 0) ||
               (platform == 1 && encoding == 0 &&
 -              !strcmp(fgFontName[fgCurFontIdx], "wingding.ttf")) ||
 -             (platform == 1 && encoding == 0 &&
 -              !strcmp(fgFontName[fgCurFontIdx], "symbol.ttf")))
-+              (fgFontID[fgCurFontIdx] == 12 ||
-+               fgFontID[fgCurFontIdx] == 14 ||
-+               fgFontID[fgCurFontIdx] == 15)))
++              (fgFontIta[fgCurFontIdx] & 2) != 0))
           {
              fgCharMap[fgCurFontIdx] = charmap;
              if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -381,27 +393,147 @@
- 
-    if (!fontname || !fontname[0]) {
-       Warning("TTF::SetTextFont",
--              "no font name specified, using default font %s", fgFontName[0]);
-+              "no font name specified, using default font");
-       fgCurFontIdx = 0;
-       return 0;
+@@ -387,21 +398,145 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
     }
     const char *basename = gSystem->BaseName(fontname);
  
++   char *ttfont = nullptr;
++   int ttindex = 0;
++
++   FcPattern *pat = nullptr, *match;
++   FcResult result;
++
 +   if (strcmp(basename, "timesi.ttf") == 0 ||
 +       strcmp(basename, "FreeSerifItalic.otf") == 0) {
-+      SetTextFont(12);
++      pat = FcNameParse ((const FcChar8*) "freeserif:italic");
 +   }
 +   else if (strcmp(basename, "timesbd.ttf") == 0 ||
 +            strcmp(basename, "FreeSerifBold.otf") == 0) {
-+      SetTextFont(22);
++      pat = FcNameParse ((const FcChar8*) "freeserif:bold");
 +   }
 +   else if (strcmp(basename, "timesbi.ttf") == 0 ||
 +            strcmp(basename, "FreeSerifBoldItalic.otf") == 0) {
-+      SetTextFont(32);
++      pat = FcNameParse ((const FcChar8*) "freeserif:bold:italic");
 +   }
 +   else if (strcmp(basename, "arial.ttf") == 0 ||
 +            strcmp(basename, "FreeSans.otf") == 0) {
-+      SetTextFont(42);
++      pat = FcNameParse ((const FcChar8*) "freesans");
 +   }
 +   else if (strcmp(basename, "ariali.ttf") == 0 ||
 +            strcmp(basename, "FreeSansOblique.otf") == 0) {
-+      SetTextFont(52);
++      pat = FcNameParse ((const FcChar8*) "freesans:italic");
 +   }
 +   else if (strcmp(basename, "arialbd.ttf") == 0 ||
 +            strcmp(basename, "FreeSansBold.otf") == 0) {
-+      SetTextFont(62);
++      pat = FcNameParse ((const FcChar8*) "freesans:bold");
 +   }
 +   else if (strcmp(basename, "arialbi.ttf") == 0 ||
 +            strcmp(basename, "FreeSansBoldOblique.otf") == 0) {
-+      SetTextFont(72);
++      pat = FcNameParse ((const FcChar8*) "freesans:bold:italic");
 +   }
 +   else if (strcmp(basename, "cour.ttf") == 0 ||
 +            strcmp(basename, "FreeMono.otf") == 0) {
-+      SetTextFont(82);
++      pat = FcNameParse ((const FcChar8*) "freemono");
 +   }
 +   else if (strcmp(basename, "couri.ttf") == 0 ||
 +            strcmp(basename, "FreeMonoOblique.otf") == 0) {
-+      SetTextFont(92);
++      pat = FcNameParse ((const FcChar8*) "freemono:italic");
 +   }
 +   else if (strcmp(basename, "courbd.ttf") == 0 ||
 +            strcmp(basename, "FreeMonoBold.otf") == 0) {
-+      SetTextFont(102);
++      pat = FcNameParse ((const FcChar8*) "freemono:bold");
 +   }
 +   else if (strcmp(basename, "courbi.ttf") == 0 ||
 +            strcmp(basename, "FreeMonoBoldOblique.otf") == 0) {
-+      SetTextFont(112);
++      pat = FcNameParse ((const FcChar8*) "freemono:bold:italic");
 +   }
 +   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      if (italic)
-+         SetTextFont(152);
-+      else
-+         SetTextFont(122);
++      pat = FcNameParse ((const FcChar8*) "standardsymbolsps");
++      italic &= 2;
 +   }
 +   else if (strcmp(basename, "times.ttf") == 0 ||
 +            strcmp(basename, "FreeSerif.otf") == 0) {
-+      SetTextFont(132);
++      pat = FcNameParse ((const FcChar8*) "freeserif");
 +   }
 +   else if (strcmp(basename, "wingding.ttf") == 0) {
-+      SetTextFont(142);
++      pat = FcNameParse ((const FcChar8*) "dingbats");
++      italic &= 2;
 +   }
 +   else if (strcmp(basename, "STIXGeneral.otf") == 0) {
-+      SetTextFont(162);
++      pat = FcNameParse ((const FcChar8*) "stixgeneral");
 +   }
 +   else if (strcmp(basename, "STIXGeneralItalic.otf") == 0) {
-+      SetTextFont(172);
++      pat = FcNameParse ((const FcChar8*) "stixgeneral:italic");
 +   }
 +   else if (strcmp(basename, "STIXGeneralBol.otf") == 0) {
-+      SetTextFont(182);
++      pat = FcNameParse ((const FcChar8*) "stixgeneral:bold");
 +   }
 +   else if (strcmp(basename, "STIXGeneralBolIta.otf") == 0) {
-+      SetTextFont(192);
++      pat = FcNameParse ((const FcChar8*) "stixgeneral:bold:italic");
 +   }
 +   else if (strcmp(basename, "STIXSiz1Sym.otf") == 0) {
-+      SetTextFont(202);
++      pat = FcNameParse ((const FcChar8*) "stixsize1");
 +   }
 +   else if (strcmp(basename, "STIXSiz1SymBol.otf") == 0) {
-+      SetTextFont(212);
++      pat = FcNameParse ((const FcChar8*) "stixsize1:bold");
 +   }
 +   else if (strcmp(basename, "STIXSiz2Sym.otf") == 0) {
-+      SetTextFont(222);
++      pat = FcNameParse ((const FcChar8*) "stixsize2");
 +   }
 +   else if (strcmp(basename, "STIXSiz2SymBol.otf") == 0) {
-+      SetTextFont(232);
++      pat = FcNameParse ((const FcChar8*) "stixsize2:bold");
 +   }
 +   else if (strcmp(basename, "STIXSiz3Sym.otf") == 0) {
-+      SetTextFont(242);
++      pat = FcNameParse ((const FcChar8*) "stixsize3");
 +   }
 +   else if (strcmp(basename, "STIXSiz3SymBol.otf") == 0) {
-+      SetTextFont(252);
++      pat = FcNameParse ((const FcChar8*) "stixsize3:bold");
 +   }
 +   else if (strcmp(basename, "STIXSiz4Sym.otf") == 0) {
-+      SetTextFont(262);
++      pat = FcNameParse ((const FcChar8*) "stixsize4");
 +   }
 +   else if (strcmp(basename, "STIXSiz4SymBol.otf") == 0) {
-+      SetTextFont(272);
++      pat = FcNameParse ((const FcChar8*) "stixsize4:bold");
 +   }
 +   else if (strcmp(basename, "STIXSiz5Sym.otf") == 0) {
-+      SetTextFont(282);
++      pat = FcNameParse ((const FcChar8*) "stixsize5");
 +   }
 +   else if (strcmp(basename, "DroidSansFallback.ttf") == 0) {
-+      SetTextFont(292);
++      pat = FcNameParse ((const FcChar8*) "droidsansfallback:charset=4e00 0410");
 +   }
-+   else {
-+      Error("TTF::SetTextFont", "font %s not known to ROOT", basename);
-+      if (fgFontCount) {
-+         Warning("TTF::SetTextFont", "using default font");
-+         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+         return 0;
-+      } else {
-+         return 1;
++   else if (strcmp(basename, "BlackChancery.ttf") == 0) {
++      pat = FcNameParse ((const FcChar8*) "urwchanceryl");
++   }
++   else if (gSystem->AccessPathName(fontname, kReadPermission) != 0) {
++      // Font name is not a file - usae as pattern
++      pat = FcNameParse ((const FcChar8*) fontname);
++   }
++
++   if (pat) {
++      FcConfigSubstitute (nullptr, pat, FcMatchPattern);
++      FcDefaultSubstitute (pat);
++      match = FcFontMatch (nullptr, pat, &result);
++      if (match) {
++         const char *ttfnt;
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**) &ttfnt);
++         ttfont = StrDup(ttfnt);
++         FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++         FcPatternDestroy (match);
 +      }
++      FcPatternDestroy (pat);
 +   }
 +
-+   return 0;
-+}
++   if (!ttfont) ttfont = StrDup(fontname);
 +
-+//______________________________________________________________________________
-+void TTF::SetTextFont(Font_t fontnumber)
-+{
-+   int fontid = fontnumber / 10;
-+   if (fontid < 0 || fontid > 31) fontid = 0;
-+
-+   Int_t italic = 0;
-+   if (fontid==15) italic = 1;
-+
-+   if (!fgInit) Init();
-+
-+   if (fontid == 0) {
-+      fgCurFontIdx = 0;  // use font 0 (default font, set in ctor)
-+      return;
-+   }
++   basename = gSystem->BaseName(ttfont);
 +
     // check if font is in cache
     int i;
@@ -450,30 +414,28 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -               return 0;
 -            }
 -         }
-+      if (fgFontID[i] == fontid) {
++      if (!strcmp(fgFontName[i], basename) &&
++          (fgFontIdx[i] == ttindex) &&
++          (fgFontIta[i] == italic)) {
 +         fgCurFontIdx = i;
-+         return;
++         delete [] ttfont;
++         return 0;
        }
     }
  
-@@ -409,151 +541,215 @@
-    if (fgFontCount >= kTTMaxFonts) {
-       Error("TTF::SetTextFont", "too many fonts opened (increase kTTMaxFont = %d)",
+@@ -411,28 +546,13 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
              kTTMaxFonts);
--      Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
-+      Warning("TTF::SetTextFont", "using default font");
+       Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
        fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
--      return 0;
-+      return;
++      delete [] ttfont;
+       return 0;
     }
  
 -   // try to load font (font must be in Root.TTFontPath resource)
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   char *ttfont = nullptr;
-+   int ttindex = 0;
- 
+-
 -   if (!ttfont) {
 -      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
 -      if (fgFontCount) {
@@ -483,180 +445,8 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -      } else {
 -         return 1;
 -      }
-+   FcPattern *pat, *match;
-+   FcCharSet *set = nullptr;
-+   FcResult result;
-+
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 16:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 17:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 18:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 19:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 20:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 21:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 22:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 23:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 24:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 25:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 26:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 27:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 28:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 29:
-+   case 30:
-+   case 31:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      set = FcCharSetCreate ();
-+      FcCharSetAddChar (set, 0x0410); // Cyrillic
-+      FcCharSetAddChar (set, 0x4e00); // CJK
-+      FcPatternAddCharSet (pat, FC_CHARSET, set);
-+      break;
-+   default:
-+      Error("TTF::SetTextFont", "font %i not known to ROOT", fontid);
-+      FcPatternDestroy (pat);
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
-+      return;
-+      break;
-    }
- 
-+   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
-+   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (nullptr, pat, &result);
-+   char *ttfnt;
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+   ttfont = StrDup (ttfnt);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
-+   FcPatternDestroy (match);
-+   FcPatternDestroy (pat);
-+   if (set) FcCharSetDestroy (set);
-+
+-   }
+-
     FT_Face  tface = (FT_Face) 0;
  
 -   if (FT_New_Face(fgLibrary, ttfont, 0, &tface)) {
@@ -664,64 +454,34 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
        Error("TTF::SetTextFont", "error loading font %s", ttfont);
        delete [] ttfont;
        if (tface) FT_Done_Face(tface);
--      if (fgFontCount) {
--         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
--         fgCurFontIdx = 0;
--         return 0;
--      } else {
--         return 1;
--      }
-+      Warning("TTF::SetTextFont", "using default font");
-+      fgCurFontIdx = 0;
-+      return;
-    }
- 
+@@ -448,19 +568,20 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
     delete [] ttfont;
  
--   fgFontName[fgFontCount] = StrDup(basename);
-+   fgFontID[fgFontCount]   = fontid;
+    fgFontName[fgFontCount] = StrDup(basename);
++   fgFontIdx[fgFontCount]  = ttindex;
++   fgFontIta[fgFontCount]  = italic;
     fgCurFontIdx            = fgFontCount;
     fgFace[fgCurFontIdx]    = tface;
     fgCharMap[fgCurFontIdx] = (FT_CharMap) 0;
     fgFontCount++;
  
-    if (italic) {
+-   if (italic) {
 -      fgSymbItaFontIdx = fgCurFontIdx;
++   if ((italic & 1) != 0) {
        FT_Matrix slantMat;
        slantMat.xx = (1 << 16);
        slantMat.xy = ((1 << 16) >> 2);
        slantMat.yx = 0;
        slantMat.yy = (1 << 16);
 -      FT_Set_Transform( fgFace[fgSymbItaFontIdx], &slantMat, NULL );
--   }
--
--   return 0;
--}
--
--////////////////////////////////////////////////////////////////////////////////
--/// Set specified font.
--/// List of the currently supported fonts (screen and PostScript)
--///
--/// | Font ID |   X11                     |     TTF          |
--/// |---------|---------------------------|------------------|
--/// |      1  | times-medium-i-normal     | timesi.ttf       |
--/// |      2  | times-bold-r-normal       | timesbd.ttf      |
--/// |      3  | times-bold-i-normal       | timesbi.ttf      |
--/// |      4  | helvetica-medium-r-normal | arial.ttf        |
--/// |      5  | helvetica-medium-o-normal | ariali.ttf       |
--/// |      6  | helvetica-bold-r-normal   | arialbd.ttf      |
--/// |      7  | helvetica-bold-o-normal   | arialbi.ttf      |
--/// |      8  | courier-medium-r-normal   | cour.ttf         |
--/// |      9  | courier-medium-o-normal   | couri.ttf        |
--/// |     10  | courier-bold-r-normal     | courbd.ttf       |
--/// |     11  | courier-bold-o-normal     | courbi.ttf       |
--/// |     12  | symbol-medium-r-normal    | symbol.ttf       |
--/// |     13  | times-medium-r-normal     | times.ttf        |
--/// |     14  |                           | wingding.ttf     |
--/// |     15  | symbol oblique is emulated from symbol.ttf | |
--
--void TTF::SetTextFont(Font_t fontnumber)
--{
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, nullptr );
+    }
+ 
+    return 0;
+@@ -489,70 +610,50 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+ 
+ void TTF::SetTextFont(Font_t fontnumber)
+ {
 -   // Added by cholm for use of DFSG - fonts - based on Kevins fix.
 -   // Table of Microsoft and (for non-MSFT operating systems) backup
 -   // FreeFont TTF fonts.
@@ -758,14 +518,47 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -     { "Root.TTFont.ME", "DroidSansFallback.ttf" },
 -     { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
 -     { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
--   };
--
++   static const char *fonttable[] = {
++      "freesans:bold",
++      "freeserif:italic",
++      "freeserif:bold",
++      "freeserif:bold:italic",
++      "freesans",
++      "freesans:italic",
++      "freesans:bold",
++      "freesans:bold:italic",
++      "freemono",
++      "freemono:italic",
++      "freemono:bold",
++      "freemono:bold:italic",
++      "standardsymbolsps",
++      "freeserif",
++      "dingbats",
++      "standardsymbolsps",
++      "stixgeneral",
++      "stixgeneral:italic",
++      "stixgeneral:bold",
++      "stixgeneral:bold:italic",
++      "stixsize1",
++      "stixsize1:bold",
++      "stixsize2",
++      "stixsize2:bold",
++      "stixsize3",
++      "stixsize3:bold",
++      "stixsize4",
++      "stixsize4:bold",
++      "stixsize5",
++      "droidsansfallback:charset=4e00 0410",
++      "droidsansfallback:charset=4e00 0410",
++      "droidsansfallback:charset=4e00 0410"
+    };
+ 
 -   static int fontset = -1;
 -   int        thisset = fontset;
 -
--   int fontid = fontnumber / 10;
--   if (fontid < 0 || fontid > 31) fontid = 0;
--
+    int fontid = fontnumber / 10;
+    if (fontid < 0 || fontid > 31) fontid = 0;
+ 
 -   if (thisset == -1) {
 -      // try to load font (font must be in Root.TTFontPath resource)
 -      // to see which fontset we have available
@@ -779,21 +572,26 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -         // try backup free font
 -         thisset = 1;
 -      }
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, nullptr );
-    }
--   Int_t italic = 0;
+-   }
+    Int_t italic = 0;
 -   if (fontid==15) italic = 1;
 -   int ret = SetTextFont(gEnv->GetValue(fonttable[fontid][thisset], fonttable[fontid][1]), italic);
 -   // Do not define font set is we're loading the symbol.ttf - it's
 -   // the same in both cases.
 -   if (ret == 0 && fontid != 12) fontset = thisset;
++   if (fontid==12) italic = 2;
++   if (fontid==14) italic = 2;
++   if (fontid==15) italic = 3;
++
++   SetTextFont(fonttable[fontid], italic);
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-diff -ur root-6.28.00.orig/graf2d/postscript/CMakeLists.txt root-6.28.00/graf2d/postscript/CMakeLists.txt
---- root-6.28.00.orig/graf2d/postscript/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/postscript/CMakeLists.txt	2023-02-04 12:47:19.863760238 +0100
-@@ -27,6 +27,7 @@
+diff --git a/graf2d/postscript/CMakeLists.txt b/graf2d/postscript/CMakeLists.txt
+index eb091bbb39..a05023a3f4 100644
+--- a/graf2d/postscript/CMakeLists.txt
++++ b/graf2d/postscript/CMakeLists.txt
+@@ -27,6 +27,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Postscript
    LIBRARIES
      ZLIB::ZLIB
      mathtext
@@ -801,10 +599,11 @@ diff -ur root-6.28.00.orig/graf2d/postscript/CMakeLists.txt root-6.28.00/graf2d/
    DEPENDENCIES
      Graf
  )
-diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/graf2d/postscript/src/TPostScript.cxx
---- root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf2d/postscript/src/TPostScript.cxx	2023-02-04 12:47:19.864760240 +0100
-@@ -234,6 +234,7 @@
+diff --git a/graf2d/postscript/src/TPostScript.cxx b/graf2d/postscript/src/TPostScript.cxx
+index 09ea7ffa9c..180fd5e3c1 100644
+--- a/graf2d/postscript/src/TPostScript.cxx
++++ b/graf2d/postscript/src/TPostScript.cxx
+@@ -234,6 +234,7 @@ To change the color model use `gStyle->SetColorModelPS(c)`.
  #include <cctype>
  #include <cwchar>
  #include <fstream>
@@ -812,7 +611,7 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
  
  #include "strlcpy.h"
  #include "snprintf.h"
-@@ -1585,56 +1586,179 @@
+@@ -1585,56 +1586,60 @@ Bool_t TPostScript::FontEmbedType42(const char *filename)
  
  void TPostScript::FontEmbed(void)
  {
@@ -849,8 +648,41 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 -      { "Root.TTFont.ME", "DroidSansFallback.ttf" },
 -      { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
 -      { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
--   };
--
++   static const char *fonttable[] = {
++      "freesans:bold",
++      "freeserif:italic",
++      "freeserif:bold",
++      "freeserif:bold:italic",
++      "freesans",
++      "freesans:italic",
++      "freesans:bold",
++      "freesans:bold:italic",
++      "freemono",
++      "freemono:italic",
++      "freemono:bold",
++      "freemono:bold:italic",
++      "standardsymbolsps",
++      "freeserif",
++      "dingbats",
++      "standardsymbolsps",
++      "stixgeneral",
++      "stixgeneral:italic",
++      "stixgeneral:bold",
++      "stixgeneral:bold:italic",
++      "stixsize1",
++      "stixsize1:bold",
++      "stixsize2",
++      "stixsize2:bold",
++      "stixsize3",
++      "stixsize3:bold",
++      "stixsize4",
++      "stixsize4:bold",
++      "stixsize5",
++      "droidsansfallback:charset=4e00 0410",
++      "droidsansfallback:charset=4e00 0410",
++      "droidsansfallback:charset=4e00 0410"
+    };
+ 
     PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
  
 -   // try to load font (font must be in Root.TTFontPath resource)
@@ -862,182 +694,28 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 -         const char *filename = gEnv->GetValue(
 -                                               fonttable[fontid][0], fonttable[fontid][1]);
 -         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
-+
 +         char *ttfont = nullptr;
 +
 +         FcPattern *pat, *match;
-+         FcCharSet *set = nullptr;
 +         FcResult result;
 +
-+         pat = FcPatternCreate ();
-+
-+         switch (fontid) {
-+         case 1:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 2:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 3:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 4:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 5:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 6:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 7:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 8:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 9:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 10:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 11:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 13:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 14:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 16:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 17:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 18:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 19:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+            break;
-+         case 20:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 21:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 22:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 23:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 24:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 25:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 26:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 27:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 28:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            break;
-+         case 29:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+            set = FcCharSetCreate ();
-+            FcCharSetAddChar (set, 0x0410); // Cyrillic
-+            FcCharSetAddChar (set, 0x4e00); // CJK
-+            FcPatternAddCharSet (pat, FC_CHARSET, set);
-+            break;
-+         }
++         pat = FcNameParse ((const FcChar8*) fonttable[fontid]);
 +
 +         FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +         FcDefaultSubstitute (pat);
 +         match = FcFontMatch (nullptr, pat, &result);
-+         char *ttfnt;
-+         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+         ttfont = StrDup(ttfnt);
-+         FcPatternDestroy (match);
-+         FcPatternDestroy (pat);
-+         if (set) FcCharSetDestroy (set);
++         FcPatternGetString (match, FC_FILE, 0, (FcChar8**) &ttfont);
 +
           if (!ttfont) {
 -            Error("TPostScript::FontEmbed",
 -                  "font %d (filename `%s') not found in path",
 -                  fontid, filename);
-+            Error("TPostScript::FontEmbed", "font %d not found in path",
++            Error("TPostScript::FontEmbed", "font %d not found",
 +                  fontid);
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1643,9 +1767,8 @@
+@@ -1643,12 +1648,13 @@ void TPostScript::FontEmbed(void)
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -1047,9 +725,15 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 +               Error("TPostScript::FontEmbed", "failed to embed font %d)",
 +                     fontid);
              }
-             delete [] ttfont;
+-            delete [] ttfont;
           }
-@@ -2837,10 +2960,10 @@
++
++         FcPatternDestroy (match);
++         FcPatternDestroy (pat);
+       }
+    }
+    PrintStr("%%IncludeResource: font Times-Roman@");
+@@ -2837,10 +2843,10 @@ void TPostScript::Text(Double_t xx, Double_t yy, const wchar_t *chars)
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -1063,10 +747,11 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
        { "Root.PSFont.STIXGen", "/STIXGeneral" },
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
-diff -ur root-6.28.00.orig/graf3d/gl/CMakeLists.txt root-6.28.00/graf3d/gl/CMakeLists.txt
---- root-6.28.00.orig/graf3d/gl/CMakeLists.txt	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf3d/gl/CMakeLists.txt	2023-02-04 12:47:19.867760247 +0100
-@@ -208,6 +208,7 @@
+diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt
+index a874da9e1d..5454469606 100644
+--- a/graf3d/gl/CMakeLists.txt
++++ b/graf3d/gl/CMakeLists.txt
+@@ -208,6 +208,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
      RGlew
@@ -1074,9 +759,10 @@ diff -ur root-6.28.00.orig/graf3d/gl/CMakeLists.txt root-6.28.00/graf3d/gl/CMake
    DEPENDENCIES
      Hist
      Gui
-diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/gl/src/TGLFontManager.cxx
---- root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf3d/gl/src/TGLFontManager.cxx	2023-02-04 12:47:19.867760247 +0100
+diff --git a/graf3d/gl/src/TGLFontManager.cxx b/graf3d/gl/src/TGLFontManager.cxx
+index 776e9d286f..c4134c5980 100644
+--- a/graf3d/gl/src/TGLFontManager.cxx
++++ b/graf3d/gl/src/TGLFontManager.cxx
 @@ -36,6 +36,7 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1085,16 +771,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
  
  /** \class TGLFont
  \ingroup opengl
-@@ -419,7 +420,7 @@
- ClassImp(TGLFontManager);
- 
- TObjArray   TGLFontManager::fgFontFileArray;
--Int_t TGLFontManager::fgExtendedFontStart;
-+Int_t TGLFontManager::fgExtendedFontStart = 0;
- TGLFontManager::FontSizeVec_t TGLFontManager::fgFontSizeArray;
- Bool_t  TGLFontManager::fgStaticInitDone = kFALSE;
- 
-@@ -450,17 +451,175 @@
+@@ -450,16 +451,120 @@ void TGLFontManager::RegisterFont(Int_t sizeIn, Int_t fileID, TGLFont::EMode mod
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -1107,234 +784,127 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 -                                   ((TObjString*)fgFontFileArray[fileID])->String());
 -         file = fp;
 -         delete [] fp;
-+      char *file = nullptr;
-+      int ttindex = 0;
++      TString file;
 +
-+      FcPattern *pat, *match;
-+      FcCharSet *set = nullptr;
++      TString fontname = fileID < fgExtendedFontStart ?
++         ((TObjString*)fgFontFileArray[fileID])->String() + ".ttf" :
++         ((TObjString*)fgFontFileArray[fileID])->String();
++
++      FcPattern *pat = nullptr, *match;
 +      FcResult result;
 +
-+      pat = FcPatternCreate ();
-+
-+      switch (fileID) {
-+      case 0:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 1:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 2:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 3:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 4:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 5:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 6:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 7:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 8:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 9:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 10:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 11:
-+      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 12:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 13:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 15:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 16:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 17:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 18:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+         break;
-+      case 19:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 20:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 21:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 22:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 23:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 24:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 25:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 26:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 27:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         break;
-+      case 28:
-+      case 29:
-+      case 30:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback");
-+         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+         set = FcCharSetCreate ();
-+         FcCharSetAddChar (set, 0x0410); // Cyrillic
-+         FcCharSetAddChar (set, 0x4e00); // CJK
-+         FcPatternAddCharSet (pat, FC_CHARSET, set);
++      if (strcmp(fontname, "timesi.ttf") == 0 ||
++          strcmp(fontname, "FreeSerifItalic.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freeserif:italic");
++      }
++      else if (strcmp(fontname, "timesbd.ttf") == 0 ||
++               strcmp(fontname, "FreeSerifBold.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freeserif:bold");
++      }
++      else if (strcmp(fontname, "timesbi.ttf") == 0 ||
++               strcmp(fontname, "FreeSerifBoldItalic.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freeserif:bold:italic");
++      }
++      else if (strcmp(fontname, "arial.ttf") == 0 ||
++               strcmp(fontname, "FreeSans.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freesans");
++      }
++      else if (strcmp(fontname, "ariali.ttf") == 0 ||
++               strcmp(fontname, "FreeSansOblique.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freesans:italic");
++      }
++      else if (strcmp(fontname, "arialbd.ttf") == 0 ||
++               strcmp(fontname, "FreeSansBold.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freesans:bold");
++      }
++      else if (strcmp(fontname, "arialbi.ttf") == 0 ||
++               strcmp(fontname, "FreeSansBoldOblique.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freesans:bold:italic");
++      }
++      else if (strcmp(fontname, "cour.ttf") == 0 ||
++               strcmp(fontname, "FreeMono.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freemono");
++      }
++      else if (strcmp(fontname, "couri.ttf") == 0 ||
++               strcmp(fontname, "FreeMonoOblique.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freemono:italic");
++      }
++      else if (strcmp(fontname, "courbd.ttf") == 0 ||
++               strcmp(fontname, "FreeMonoBold.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freemono:bold");
++      }
++      else if (strcmp(fontname, "courbi.ttf") == 0 ||
++               strcmp(fontname, "FreeMonoBoldOblique.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freemono:bold:italic");
++      }
++      else if (strcmp(fontname, "symbol.ttf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "standardsymbolsps");
++      }
++      else if (strcmp(fontname, "times.ttf") == 0 ||
++               strcmp(fontname, "FreeSerif.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "freeserif");
        }
- 
++      else if (strcmp(fontname, "wingding.ttf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "dingbats");
++      }
++      else if (strcmp(fontname, "STIXGeneral.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixgeneral");
++      }
++      else if (strcmp(fontname, "STIXGeneralItalic.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixgeneral:italic");
++      }
++      else if (strcmp(fontname, "STIXGeneralBol.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixgeneral:bold");
++      }
++      else if (strcmp(fontname, "STIXGeneralBolIta.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixgeneral:bold:italic");
++      }
++      else if (strcmp(fontname, "STIXSiz1Sym.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize1");
++      }
++      else if (strcmp(fontname, "STIXSiz1SymBol.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize1:bold");
++      }
++      else if (strcmp(fontname, "STIXSiz2Sym.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize2");
++      }
++      else if (strcmp(fontname, "STIXSiz2SymBol.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize2:bold");
++      }
++      else if (strcmp(fontname, "STIXSiz3Sym.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize3");
++      }
++      else if (strcmp(fontname, "STIXSiz3SymBol.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize3:bold");
++      }
++      else if (strcmp(fontname, "STIXSiz4Sym.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize4");
++      }
++      else if (strcmp(fontname, "STIXSiz4SymBol.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize4:bold");
++      }
++      else if (strcmp(fontname, "STIXSiz5Sym.otf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "stixsize5");
++      }
++      else if (strcmp(fontname, "DroidSansFallback.ttf") == 0) {
++         pat = FcNameParse ((const FcChar8*) "droidsansfallback:charset=4e00 0410");
++      }
++
 +      FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +      FcDefaultSubstitute (pat);
 +      match = FcFontMatch (nullptr, pat, &result);
 +      char *ttfnt;
-+      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
-+      file = StrDup (ttfnt);
-+      FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++      FcPatternGetString (match, FC_FILE, 0, (FcChar8**) &ttfnt);
++      file = ttfnt;
 +      FcPatternDestroy (match);
 +      FcPatternDestroy (pat);
-+      if (set) FcCharSetDestroy (set);
-+
+ 
        FTFont* ftfont = 0;
        switch (mode)
-       {
-@@ -484,10 +643,14 @@
-             ftfont = new FTGLTextureFont(file);
-             break;
-          default:
-+            delete [] file;
-             Error("TGLFontManager::RegisterFont", "invalid FTGL type");
-             return;
-             break;
-       }
-+
-+      delete [] file;
-+
-       ftfont->FaceSize(size);
-       const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
-       out.CopyAttributes(mf);
-@@ -570,8 +733,6 @@
- {
-    if (fgStaticInitDone == kFALSE) InitStatics();
- 
--   assert(fgExtendedFontStart > 0 && "GetExtendedFontStartIndex, invalid index");
--
-    return fgExtendedFontStart;
- }
- 
-@@ -641,28 +802,6 @@
-    fgFontFileArray.Add(new TObjString("wingding")); // 140
-    fgFontFileArray.Add(new TObjString("symbol"));   // 150
- 
--   fgExtendedFontStart = fgFontFileArray.GetEntries();
--   //"Extended" fonts for gl-pad.
--   //fgPadFontStart + ...
--   fgFontFileArray.Add(new TObjString("FreeSerifItalic.otf"));      //  10 (160)
--   fgFontFileArray.Add(new TObjString("FreeSerifBold.otf"));        //  20 (170)
--   fgFontFileArray.Add(new TObjString("FreeSerifBoldItalic.otf"));  //  30
--
--   fgFontFileArray.Add(new TObjString("FreeSans.otf"));             //  40
--   fgFontFileArray.Add(new TObjString("FreeSansOblique.otf"));      //  50
--   fgFontFileArray.Add(new TObjString("FreeSansBold.otf"));         //  60
--   fgFontFileArray.Add(new TObjString("FreeSansBoldOblique.otf"));  //  70
--
--   fgFontFileArray.Add(new TObjString("FreeMono.otf"));             //  80
--   fgFontFileArray.Add(new TObjString("FreeMonoOblique.otf"));      //  90
--   fgFontFileArray.Add(new TObjString("FreeMonoBold.otf"));         // 100
--   fgFontFileArray.Add(new TObjString("FreeMonoBoldOblique.otf"));  // 110
--
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 120
--   fgFontFileArray.Add(new TObjString("FreeSerif.otf"));            // 130
--   fgFontFileArray.Add(new TObjString("wingding.ttf"));             // 140
--   fgFontFileArray.Add(new TObjString("symbol.ttf"));               // 150
--
-    fgFontFileArray.Add(new TObjString("STIXGeneral.otf"));          // 200
-    fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf"));    // 210
-    fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf"));       // 220
-diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/TGLText.cxx
---- root-6.28.00.orig/graf3d/gl/src/TGLText.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/graf3d/gl/src/TGLText.cxx	2023-02-04 12:47:19.868760250 +0100
+diff --git a/graf3d/gl/src/TGLText.cxx b/graf3d/gl/src/TGLText.cxx
+index f84f5193d2..8a672c787c 100644
+--- a/graf3d/gl/src/TGLText.cxx
++++ b/graf3d/gl/src/TGLText.cxx
 @@ -32,6 +32,8 @@
  # include "FTGLBitmapFont.h"
  #endif
@@ -1344,7 +914,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -176,27 +178,92 @@
+@@ -176,27 +178,35 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
  {
     int fontid = fontnumber / 10;
  
@@ -1369,96 +939,39 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
++   static const char *fonttable[] = {
++      "freesans:bold",
++      "freeserif:italic",
++      "freeserif:bold",
++      "freeserif:bold:italic",
++      "freesans",
++      "freesans:italic",
++      "freesans:bold",
++      "freesans:bold:italic",
++      "freemono",
++      "freemono:italic",
++      "freemono:bold",
++      "freemono:bold:italic",
++      "standardsymbolsps",
++      "freeserif",
++      "dingbats",
++   };
++
++   char *ttfont;
++
 +   FcPattern *pat, *match;
 +   FcResult result;
-+   char *ttfont;
-+   int ttindex;
 +
-+   pat = FcPatternCreate ();
-+
-+   switch (fontid) {
-+   case 1:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 2:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 3:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 4:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 5:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 0:
-+   case 6:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 7:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freesans");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 8:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 9:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 10:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 11:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freemono");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
-+      break;
-+   case 12:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 13:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"freeserif");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   case 14:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"dingbats");
-+      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
-+      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
-+      break;
-+   }
++   pat = FcNameParse ((const FcChar8*) fonttable[fontid]);
 +
 +   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
 +   match = FcFontMatch (nullptr, pat, &result);
-+   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
-+   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
++   FcPatternGetString (match, FC_FILE, 0, (FcChar8**) &ttfont);
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -204,7 +271,9 @@
+@@ -204,7 +214,9 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
  
     fGLTextFont = new FTGLPolygonFont(ttfont);
  
@@ -1469,10 +982,11 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff -ur root-6.28.00.orig/gui/gui/src/TGApplication.cxx root-6.28.00/gui/gui/src/TGApplication.cxx
---- root-6.28.00.orig/gui/gui/src/TGApplication.cxx	2023-02-03 15:34:27.000000000 +0100
-+++ root-6.28.00/gui/gui/src/TGApplication.cxx	2023-02-04 12:47:19.868760250 +0100
-@@ -81,20 +81,12 @@
+diff --git a/gui/gui/src/TGApplication.cxx b/gui/gui/src/TGApplication.cxx
+index 72d7dbbf95..73a44fdd7f 100644
+--- a/gui/gui/src/TGApplication.cxx
++++ b/gui/gui/src/TGApplication.cxx
+@@ -81,20 +81,12 @@ TGApplication::TGApplication(const char *appClassName,
     gROOT->SetBatch(kFALSE);
  
     if (strcmp(appClassName, "proofserv")) {
@@ -1494,3 +1008,6 @@ diff -ur root-6.28.00.orig/gui/gui/src/TGApplication.cxx root-6.28.00/gui/gui/sr
     }
  
     // Create the canvas colors early so they are allocated before
+-- 
+2.45.0
+
diff --git a/root.spec b/root.spec
index 207b1f5..bfe8824 100644
--- a/root.spec
+++ b/root.spec
@@ -41,13 +41,23 @@
 %global bundlejson 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
+%ifarch %{ix86} %{arm}
+%global pandas 0
+%else
+%global pandas 1
+%endif
+%else
+%global pandas 0
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
 Version:	6.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -201,7 +211,7 @@ BuildRequires:	zeromq-devel >= 4.3.5
 BuildRequires:	cppzmq-devel
 %endif
 %endif
-%if (0%{?fedora} && 0%{?__isa_bits} == 64) || 0%{?rhel} == 8
+%if %{pandas}
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
 BuildRequires:	python%{python3_pkgversion}-rcssmin
@@ -2594,7 +2604,7 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
-%if (0%{?fedora} && 0%{?__isa_bits} != 64) || 0%{?rhel} == 8
+%if ! %{pandas}
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
 # - tutorial-roofit-rf409_NumPyPandasToRooFit-py
@@ -2820,7 +2830,7 @@ RSqliteDS.Davix:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
 TFile.ReadWithoutGlobalRegistrationWeb \
-%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
+%if ! %{pandas}
 ROOTTEST_IGNORE_PANDAS_PY3=1 \
 %endif
 ROOTTEST_IGNORE_NUMBA_PY3=1 \
@@ -3734,6 +3744,10 @@ fi
 %endif
 
 %changelog
+* Wed May 15 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-5
+- Rebuilt for libarrow.so.1601
+- Improved fontconfig support
+
 * Sun Apr 28 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 6.30.06-4
 - Do not test with Pandas on 32-bit architectures
 

From 95f73fc33a01c2cbdedf36cdb9e4fab77a7e6381 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@ellert.se>
Date: Fri, 7 Jun 2024 12:04:22 +0200
Subject: [PATCH 272/344] Update to 6.32.00

Drop EPEL 8 build (now requires Python >= 3.7 ans tbb >= 2020)
Dropped patches: 12
New patches: 6
The JsMVA python module is now a submodule of the ROOT python module
The notebook package was merged with the JupyROOT package
---
 root-32bit-tests.patch                        |  16 +-
 root-avoid-out-of-memory-during-linking.patch |  30 --
 root-big-endian-byte-swap.patch               |  58 ---
 root-clad.patch                               |  26 -
 root-failure-on-ppc64le-and-s390x.patch       |  35 ++
 ...-fix-one-more-broken-import-in-JsMVA.patch |  25 +
 ...e-on-ppc64le-and-aarch64-with-gcc-12.patch |  44 --
 root-fontconfig.patch                         |   8 +-
 root-format-warnings-32-bit.patch             |  73 +++
 root-gtest-back.patch                         |  25 -
 ...about-RooNaNPacker-not-being-impleme.patch |  33 --
 root-jsmva-static.patch                       |  36 --
 root-new-zlib.patch                           |  89 ----
 root-no-export-python-modules.patch           |  42 +-
 root-np32.patch                               | 111 ----
 root-old-gtest.patch                          |  83 ---
 root-out-of-bounds.patch                      |  26 +
 root-pcre2.patch                              | 456 ----------------
 root-stress.patch                             |  32 ++
 ...istent-wording-in-tmva-test-comments.patch |  86 ---
 root-write-array.patch                        | 125 +++++
 root.spec                                     | 493 ++++++------------
 sources                                       |   2 +-
 23 files changed, 500 insertions(+), 1454 deletions(-)
 delete mode 100644 root-avoid-out-of-memory-during-linking.patch
 delete mode 100644 root-big-endian-byte-swap.patch
 delete mode 100644 root-clad.patch
 create mode 100644 root-failure-on-ppc64le-and-s390x.patch
 create mode 100644 root-fix-one-more-broken-import-in-JsMVA.patch
 delete mode 100644 root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
 create mode 100644 root-format-warnings-32-bit.patch
 delete mode 100644 root-gtest-back.patch
 delete mode 100644 root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
 delete mode 100644 root-jsmva-static.patch
 delete mode 100644 root-new-zlib.patch
 delete mode 100644 root-np32.patch
 delete mode 100644 root-old-gtest.patch
 create mode 100644 root-out-of-bounds.patch
 delete mode 100644 root-pcre2.patch
 create mode 100644 root-stress.patch
 delete mode 100644 root-use-consistent-wording-in-tmva-test-comments.patch
 create mode 100644 root-write-array.patch

diff --git a/root-32bit-tests.patch b/root-32bit-tests.patch
index ea926b4..ae15a5d 100644
--- a/root-32bit-tests.patch
+++ b/root-32bit-tests.patch
@@ -1,7 +1,7 @@
-From 70d941cd6ebbc3726e08ef7f52d0135453f0b840 Mon Sep 17 00:00:00 2001
+From 55446dcd6eabc1fff218f266c11f31697fe99f09 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Fri, 13 Mar 2020 16:21:55 +0100
-Subject: [PATCH 2/3] Run tests on 32 bit
+Subject: [PATCH] Run tests on 32 bit
 
 ---
  test/stressGeometry.cxx       |  8 --------
@@ -9,7 +9,7 @@ Subject: [PATCH 2/3] Run tests on 32 bit
  2 files changed, 3 insertions(+), 15 deletions(-)
 
 diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
-index 5e81f5f2ca..18e41a6f45 100644
+index f8d78f4f54..617b9e1644 100644
 --- a/test/stressGeometry.cxx
 +++ b/test/stressGeometry.cxx
 @@ -257,14 +257,6 @@ void stressGeometry(const char *exp="*", Bool_t generate_ref=kFALSE, Bool_t vecg
@@ -28,26 +28,26 @@ index 5e81f5f2ca..18e41a6f45 100644
     TString fname;
     for (i=0; i<NG; i++) {
 diff --git a/tree/tree/test/CMakeLists.txt b/tree/tree/test/CMakeLists.txt
-index 0c1a39d01e..3bafe47934 100644
+index 5bb222edc5..f29a17801d 100644
 --- a/tree/tree/test/CMakeLists.txt
 +++ b/tree/tree/test/CMakeLists.txt
-@@ -12,13 +12,9 @@ ROOT_ADD_GTEST(testTOffsetGeneration TOffsetGeneration.cxx ElementStruct.cxx Ele
+@@ -17,13 +17,9 @@ endif()
  target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
  ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
  ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
 -#FIXME: tests are having timeout on 32bit CERN VM (in docker container everything is fine),
 -# to be reverted after investigation.
 -if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
--  ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
+-  ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 3000)
 -  ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
 -  ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
 -endif()
-+ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
++ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 3000)
 +ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
 +ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
  ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
  ROOT_ADD_GTEST(testTBranch TBranch.cxx LIBRARIES RIO Tree MathCore)
  ROOT_ADD_GTEST(testTIOFeatures TIOFeatures.cxx LIBRARIES RIO Tree)
 -- 
-2.24.1
+2.45.1
 
diff --git a/root-avoid-out-of-memory-during-linking.patch b/root-avoid-out-of-memory-during-linking.patch
deleted file mode 100644
index d182e44..0000000
--- a/root-avoid-out-of-memory-during-linking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 51b84e7bc21f8729de8d3e8f9ff08b337af33b78 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 17 Nov 2023 17:15:15 +0100
-Subject: [PATCH] Avoid out of memory during linking regardless of build type
-
----
- core/metacling/src/CMakeLists.txt | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index e750480eb3..dd50793d29 100644
---- a/core/metacling/src/CMakeLists.txt
-+++ b/core/metacling/src/CMakeLists.txt
-@@ -111,11 +111,8 @@ ROOT_LINKER_LIBRARY(Cling
-         $<TARGET_OBJECTS:MetaCling>
-         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
- 
--string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
--if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
--  # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
--  add_dependencies(Cling rootcling_stage1)
--endif()
-+# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
-+add_dependencies(Cling rootcling_stage1)
- 
- if(MSVC)
-   set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
--- 
-2.43.0
-
diff --git a/root-big-endian-byte-swap.patch b/root-big-endian-byte-swap.patch
deleted file mode 100644
index caa3076..0000000
--- a/root-big-endian-byte-swap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b32c7a1b080cb5d14f242070bf906ea6929d604d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 25 Mar 2022 11:13:12 +0100
-Subject: [PATCH] Byte swap values read from the protobuf raw data stream on
- big endian
-
----
- tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 23 +++++++++++++++-----
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-index ab457dcddc..d701fb3299 100644
---- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-+++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-@@ -1,3 +1,4 @@
-+#include "Byteswap.h"
- #include "TMVA/RModelParser_ONNX.hxx"
- #include "onnx_proto3.pb.h"
- 
-@@ -335,9 +336,14 @@ RModel RModelParser_ONNX::Parse(std::string filename, bool verbose)
-       case ETensorType::FLOAT: {
-          std::shared_ptr<void> data(malloc(fLength * sizeof(float)), free);
- 
--         if (tensorproto->raw_data().empty() == false) {
--            auto raw_data_ptr = reinterpret_cast<float *>(const_cast<char *>(tensorproto->raw_data().c_str()));
--            std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(float));
-+         if (!tensorproto->raw_data().empty()) {
-+#ifdef R__BYTESWAP
-+            std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(float));
-+#else
-+            for (std::size_t k = 0; k < fLength; ++k)
-+               (reinterpret_cast<uint32_t *>(data.get()))[k] =
-+                  Rbswap_32((reinterpret_cast<const uint32_t *>(tensorproto->raw_data().c_str()))[k]);
-+#endif
-          } else {
-             tensorproto->mutable_float_data()->ExtractSubrange(0, tensorproto->float_data_size(),
-                                                                static_cast<float *>(data.get()));
-@@ -350,9 +356,14 @@ RModel RModelParser_ONNX::Parse(std::string filename, bool verbose)
-       case ETensorType::INT64: {
-          std::shared_ptr<void> data(malloc(fLength * sizeof(int64_t)), free);
- 
--         if (tensorproto->raw_data().empty() == false) {
--            auto raw_data_ptr = reinterpret_cast<int64_t *>(const_cast<char *>(tensorproto->raw_data().c_str()));
--            std::memcpy(data.get(), raw_data_ptr, fLength * sizeof(int64_t));
-+         if (!tensorproto->raw_data().empty()) {
-+#ifdef R__BYTESWAP
-+            std::memcpy(data.get(), tensorproto->raw_data().c_str(), fLength * sizeof(int64_t));
-+#else
-+            for (std::size_t k = 0; k < fLength; ++k)
-+               (reinterpret_cast<uint64_t *>(data.get()))[k] =
-+                  Rbswap_64((reinterpret_cast<const uint64_t *>(tensorproto->raw_data().c_str()))[k]);
-+#endif
-          } else {
-             tensorproto->mutable_int64_data()->ExtractSubrange(0, tensorproto->int64_data_size(),
-                                                                static_cast<int64_t *>(data.get()));
--- 
-2.39.2
-
diff --git a/root-clad.patch b/root-clad.patch
deleted file mode 100644
index 139775e..0000000
--- a/root-clad.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fae9b92742c5e991ad33769d1357a721838e93f9 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 17 Nov 2023 11:37:23 +0100
-Subject: [PATCH 1/3] Add fit/exampleFit3D.C to clad veto
-
----
- tutorials/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
-index 5cba95407b..81f6539f03 100644
---- a/tutorials/CMakeLists.txt
-+++ b/tutorials/CMakeLists.txt
-@@ -74,7 +74,8 @@ if(NOT ROOT_minuit2_FOUND)
- #---Tutorials disabled depending on the build components-------------
- 
- if(NOT clad)
--  set(clad_veto fit/minuit2GausFit.C)
-+  set(clad_veto fit/minuit2GausFit.C
-+                fit/exampleFit3D.C)
- endif()
- 
- # RBatchGenerator tutorials need Python 3.8+.
--- 
-2.42.0
-
diff --git a/root-failure-on-ppc64le-and-s390x.patch b/root-failure-on-ppc64le-and-s390x.patch
new file mode 100644
index 0000000..787eab5
--- /dev/null
+++ b/root-failure-on-ppc64le-and-s390x.patch
@@ -0,0 +1,35 @@
+From d3b5ef223500c69efadb9b8c4735247d9ba5c5ea Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 2 Jun 2024 07:03:42 +0200
+Subject: [PATCH] Fix test failure on ppc64le and s390x
+
+---
+ hist/hist/test/test_tprofile2poly.cxx | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/hist/hist/test/test_tprofile2poly.cxx b/hist/hist/test/test_tprofile2poly.cxx
+index 26b9801593..1dfa93259c 100644
+--- a/hist/hist/test/test_tprofile2poly.cxx
++++ b/hist/hist/test/test_tprofile2poly.cxx
+@@ -25,10 +25,16 @@ void FillForTest(TProfile2D* tp2d, TProfile2Poly* tpp, TRandom& ran) {
+ }
+ 
+ void globalStatsCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
++   const double relTol = 1e-12;
++   double cont1, cont2;
+    for(Int_t c=1; c<=3; ++c) {
+       ASSERT_DOUBLE_EQ(tp2d->GetMean(c), tpp->GetMean(c));
+-      ASSERT_DOUBLE_EQ(tp2d->GetMeanError(c), tpp->GetMeanError(c));
+-      ASSERT_DOUBLE_EQ(tp2d->GetStdDev(c), tpp->GetStdDev(c));
++      cont1 = tp2d->GetMeanError(c);
++      cont2 = tpp->GetMeanError(c);
++      ASSERT_NEAR(cont1, cont2, relTol * cont2);
++      cont1 = tp2d->GetStdDev(c);
++      cont2 = tpp->GetStdDev(c);
++      ASSERT_NEAR(cont1, cont2, relTol * cont2);
+    }
+ }
+ 
+-- 
+2.45.1
+
diff --git a/root-fix-one-more-broken-import-in-JsMVA.patch b/root-fix-one-more-broken-import-in-JsMVA.patch
new file mode 100644
index 0000000..0393bdc
--- /dev/null
+++ b/root-fix-one-more-broken-import-in-JsMVA.patch
@@ -0,0 +1,25 @@
+From de85dbd3344709d1c5ca87e93c87cdbce147ce5b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 5 Jun 2024 08:49:14 +0200
+Subject: [PATCH] Fix one more broken import in JsMVA
+
+---
+ bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py b/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
+index 57358765e4..7f56cd6dd5 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
+@@ -23,7 +23,7 @@ class JsMVAMagic(Magics):
+     @magic_arguments()
+     @argument("arg", nargs="?", default="on", help="Enable/Disable JavaScript visualisation for TMVA")
+     def jsmva(self, line):
+-        from JsMVA.JPyInterface import functions
++        from .JPyInterface import functions
+ 
+         args = parse_argstring(self.jsmva, line)
+         if args.arg == "on":
+-- 
+2.45.1
+
diff --git a/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch b/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
deleted file mode 100644
index 274aa66..0000000
--- a/root-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 15f50c71b4d89bfbf06ce817dee38e843f0f55cd Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 17 Jan 2022 23:50:47 +0100
-Subject: [PATCH] Fix test failure on ppc64le and aarch64 with gcc 12
-
-.../hist/hist/test/test_tprofile2poly.cxx:61: Failure
-The difference between cont1 and cont2 is 1.4551915228366852e-11, which exceeds delta, where
-cont1 evaluates to 54886.064319363642,
-cont2 evaluates to 54886.064319363628, and
-delta evaluates to 9.999999960041972e-12.
-.../hist/hist/test/test_tprofile2poly.cxx:61: Failure
-The difference between cont1 and cont2 is 1.4551915228366852e-11, where
-cont1 evaluates to 109868.61342004745,
-cont2 evaluates to 109868.61342004743.
-The abs_error parameter delta evaluates to 9.999999960041972e-12 which is smaller than the minimum distance between doubles for numbers of this magnitude which is 1.4551915228366852e-11, thus making this EXPECT_NEAR check equivalent to EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.
----
- hist/hist/test/test_tprofile2poly.cxx | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/hist/hist/test/test_tprofile2poly.cxx b/hist/hist/test/test_tprofile2poly.cxx
-index 40cb3052a2..ecf559a4b3 100644
---- a/hist/hist/test/test_tprofile2poly.cxx
-+++ b/hist/hist/test/test_tprofile2poly.cxx
-@@ -58,15 +58,14 @@ void binEntriesCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
-       for(Double_t x=0.5; x<10; x+=2.0) {
-          cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(x,y));
-          cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(x,y));
--         ASSERT_NEAR(cont1, cont2, delta);
-+         ASSERT_NEAR(cont1, cont2, 2 * delta);
-       }
- 
-    }
-    // test overflow
-    cont1 = tp2d->GetBinEffectiveEntries(tp2d->FindBin(11,11));
-    cont2 = tpp->GetBinEffectiveEntries(tpp->FindBin(11,11));
--   ASSERT_NEAR(cont1, cont2, delta);
--
-+   ASSERT_NEAR(cont1, cont2, 2 * delta);
- }
- 
- void binErrorCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
--- 
-2.39.2
-
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index d0f38b1..185b1c4 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -490,10 +490,10 @@ index ca38ed1f9c..8f1d62686b 100644
 -     { "Root.TTFont.1", "FreeSerifItalic.otf" },
 -     { "Root.TTFont.2", "FreeSerifBold.otf" },
 -     { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
--     { "Root.TTFont.4", "FreeSans.otf" },
--     { "Root.TTFont.5", "FreeSansOblique.otf" },
--     { "Root.TTFont.6", "FreeSansBold.otf" },
--     { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+-     { "Root.TTFont.4", "texgyreheros-regular.otf" },
+-     { "Root.TTFont.5", "texgyreheros-italic.otf" },
+-     { "Root.TTFont.6", "texgyreheros-bold.otf" },
+-     { "Root.TTFont.7", "texgyreheros-bolditalic.otf" },
 -     { "Root.TTFont.8", "FreeMono.otf" },
 -     { "Root.TTFont.9", "FreeMonoOblique.otf" },
 -     { "Root.TTFont.10", "FreeMonoBold.otf" },
diff --git a/root-format-warnings-32-bit.patch b/root-format-warnings-32-bit.patch
new file mode 100644
index 0000000..3583398
--- /dev/null
+++ b/root-format-warnings-32-bit.patch
@@ -0,0 +1,73 @@
+From 8592c5e065b8cf46480f5a1efe0363fcf2150551 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 4 Jun 2024 08:47:04 +0200
+Subject: [PATCH] Correct format - warnings seen on 32 bit architectures
+
+---
+ core/clib/src/mmapsup.c           | 2 +-
+ roofit/xroofit/src/xRooNode.cxx   | 2 +-
+ tree/dataframe/src/RDFDisplay.cxx | 4 ++--
+ tree/dataframe/src/RDFHelpers.cxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/core/clib/src/mmapsup.c b/core/clib/src/mmapsup.c
+index 81f68a2059..da46dc7ba5 100644
+--- a/core/clib/src/mmapsup.c
++++ b/core/clib/src/mmapsup.c
+@@ -174,7 +174,7 @@ PTR __mmalloc_mmap_morecore(struct mdesc *mdp, int size)
+             if (mdp -> top != PAGE_ALIGN(mdp -> top)) {
+               fprintf(stderr,
+                       "mmap_morecore error: base memory location (%p) is not aligned with %zu as required.\n",
+-                      mdp -> top, (long)pagesize);
++                      mdp -> top, pagesize);
+               return result;
+             }
+             mapto = mmap (mdp -> top, mapbytes, PROT_READ | PROT_WRITE,
+diff --git a/roofit/xroofit/src/xRooNode.cxx b/roofit/xroofit/src/xRooNode.cxx
+index f8c96fbf62..852e6997c0 100644
+--- a/roofit/xroofit/src/xRooNode.cxx
++++ b/roofit/xroofit/src/xRooNode.cxx
+@@ -11075,7 +11075,7 @@ std::string cling::printValue(const xRooNode *v)
+             out += "{";
+          out += n->GetName();
+          if (out.length() > 100 && left > 0) {
+-            out += TString::Format(",... and %lu more", left);
++            out += TString::Format(",... and %zu more", left);
+             break;
+          }
+       }
+diff --git a/tree/dataframe/src/RDFDisplay.cxx b/tree/dataframe/src/RDFDisplay.cxx
+index 9dc555fc1d..2ef7de7ddc 100644
+--- a/tree/dataframe/src/RDFDisplay.cxx
++++ b/tree/dataframe/src/RDFDisplay.cxx
+@@ -232,12 +232,12 @@ void RDisplay::Print() const
+                // Thus, the first column is only the Row column and the actual first column is printed
+          columnsToPrint = 2;
+       }
+-      Info("Print", "Only showing %lu columns out of %lu\n", columnsToPrint, fNColumns);
++      Info("Print", "Only showing %zu columns out of %zu\n", columnsToPrint, fNColumns);
+       allColumnsFit = false;
+    }
+ 
+    if (fNMaxCollectionElements < 1)
+-      Info("Print", "No collections shown since fNMaxCollectionElements is %lu\n", fNMaxCollectionElements);
++      Info("Print", "No collections shown since fNMaxCollectionElements is %zu\n", fNMaxCollectionElements);
+ 
+    auto nrRows = fTable.size();
+    std::cout << DashesBetweenLines(columnsToPrint, allColumnsFit); // Print dashes in the top of the table
+diff --git a/tree/dataframe/src/RDFHelpers.cxx b/tree/dataframe/src/RDFHelpers.cxx
+index 4891454cc0..3490901b5d 100644
+--- a/tree/dataframe/src/RDFHelpers.cxx
++++ b/tree/dataframe/src/RDFHelpers.cxx
+@@ -74,7 +74,7 @@ unsigned int ROOT::RDF::RunGraphs(std::vector<RResultHandle> handles)
+    const unsigned int nToRun =
+       std::count_if(handles.begin(), handles.end(), [](const auto &h) { return !h.IsReady(); });
+    if (nToRun < handles.size()) {
+-      Warning("RunGraphs", "Got %lu handles from which %lu link to results which are already ready.", handles.size(),
++      Warning("RunGraphs", "Got %zu handles from which %zu link to results which are already ready.", handles.size(),
+               handles.size() - nToRun);
+    }
+    if (nToRun == 0u)
+-- 
+2.45.1
+
diff --git a/root-gtest-back.patch b/root-gtest-back.patch
deleted file mode 100644
index 1624451..0000000
--- a/root-gtest-back.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1942f5569b1d101f2c89341765ea37850e3de669 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 17 Nov 2023 11:43:46 +0100
-Subject: [PATCH 2/3] Add old gtest compat for SetUpTestSuite/TearDownTestSuite
-
----
- tree/tree/test/friendinfo.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tree/tree/test/friendinfo.cxx b/tree/tree/test/friendinfo.cxx
-index 141a495052..6e94056946 100644
---- a/tree/tree/test/friendinfo.cxx
-+++ b/tree/tree/test/friendinfo.cxx
-@@ -14,6 +14,8 @@
- // Backward compatibility for gtest version < 1.10.0
- #ifndef INSTANTIATE_TEST_SUITE_P
- #define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-+#define SetUpTestSuite SetUpTestCase
-+#define TearDownTestSuite TearDownTestCase
- #endif
- 
- namespace {
--- 
-2.42.0
-
diff --git a/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
deleted file mode 100644
index 20e2ee5..0000000
--- a/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 28 Mar 2022 09:20:18 +0200
-Subject: [PATCH] Ignore warnings about RooNaNPacker not being implemented for
- big endian
-
-This warning is triggered in many tests, so it makes sense to put it
-in the default ignored set.
----
- core/testsupport/src/TestSupport.cxx | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
-index 259ab4e09c..79cd476950 100644
---- a/core/testsupport/src/TestSupport.cxx
-+++ b/core/testsupport/src/TestSupport.cxx
-@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
-         return;
-       }
- 
-+      // FIXME: RooNaNPacker warns about not being implemented for big endian
-+      if (level == kWarning
-+	  && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
-+        std::cerr << "Warning in " << location << " " << msg << std::endl;
-+        return;
-+      }
-+
-       FAIL() << "Received unexpected diagnostic of severity "
-          << level
-          << " at '" << location << "' reading '" << msg << "'.\n"
--- 
-2.42.0
-
diff --git a/root-jsmva-static.patch b/root-jsmva-static.patch
deleted file mode 100644
index 2550f4d..0000000
--- a/root-jsmva-static.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur root-6.24.02.orig/bindings/jsmva/python/JsMVA/JPyInterface.py root-6.24.02/bindings/jsmva/python/JsMVA/JPyInterface.py
---- root-6.24.02.orig/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/bindings/jsmva/python/JsMVA/JPyInterface.py	2021-08-11 09:06:21.894746090 +0200
-@@ -188,7 +188,7 @@
- ## Class for creating the output scripts and inserting them to cell output
- class JsDraw:
-     ## Base repository
--    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
-+    __jsMVARepo = "/static/JsMVA"
- 
-     ## String containing the link to JavaScript files
-     __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.24.02.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py root-6.24.02/bindings/pyroot_legacy/JsMVA/JPyInterface.py
---- root-6.24.02.orig/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/bindings/pyroot_legacy/JsMVA/JPyInterface.py	2021-08-11 09:06:21.925746168 +0200
-@@ -188,7 +188,7 @@
- ## Class for creating the output scripts and inserting them to cell output
- class JsDraw:
-     ## Base repository
--    __jsMVARepo = "https://root.cern.ch/js/jsmva/latest"
-+    __jsMVARepo = "/static/JsMVA"
-  
-     ## String containing the link to JavaScript files
-     __jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.24.02.orig/etc/notebook/JsMVA/js/JsMVA.js root-6.24.02/etc/notebook/JsMVA/js/JsMVA.js
---- root-6.24.02.orig/etc/notebook/JsMVA/js/JsMVA.js	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/etc/notebook/JsMVA/js/JsMVA.js	2021-08-11 09:10:45.638410266 +0200
-@@ -16,7 +16,7 @@
- 
- (function(factory){
- 
--    var JSROOT_source_dir = "https://root.cern/js/5.9.1/scripts/";
-+    var JSROOT_source_dir = "/static/scripts/";
- 
-     var url = "";
-     if (requirejs.s.contexts.hasOwnProperty("_")) {
diff --git a/root-new-zlib.patch b/root-new-zlib.patch
deleted file mode 100644
index f12eef7..0000000
--- a/root-new-zlib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 260fc202a1387cfc3f3ef756f584923ab5b0a198 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 21 Dec 2023 17:58:49 +0100
-Subject: [PATCH] Adapt tests to work with zlib-ng
-
-Fedora 40 has replaced zlib with a zlib compatible version of zlib-ng
----
- test/stress.cxx         |  2 +-
- test/stressGraphics.ref | 28 ++++++++++++++--------------
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/test/stress.cxx b/test/stress.cxx
-index de8061a9fc..77f48d43b8 100644
---- a/test/stress.cxx
-+++ b/test/stress.cxx
-@@ -406,7 +406,7 @@ void stress3()
- #else
-    constexpr Long64_t lastgood = 52090;
- #endif
--   constexpr Long64_t tolerance = 150;
-+   constexpr Long64_t tolerance = 300;
- #ifdef R__HAS_DEFAULT_LZ4
-       constexpr Long64_t difflastgoodlz4 = 5500;
-       if (last < lastgood - tolerance || last > lastgood + difflastgoodlz4 + tolerance || comp < 1.5 || comp > 2.1)
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 16d06e33fa..a21068927d 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -2,12 +2,12 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-     1       529        50     12767        50     23848      3700      3937       100       569        60
-     2      4627       600     14506       100     13368      7900      9208      3000      4690       600
-     3       452        50     12694        50     11232      4200      3796     10700       492        50
--    4     23617      1500     19386       100    143320    123000     45665     11000     24908      1500
-+    4     23617      1500     19386       200    143320    123000     45665     11000     24908      1500
-     5      1025       150     12802       200     33468      9900     30846      5000      1072       200
-     6       430        50     12669        50      9558       100      5325       700       471        50
-     7      4980        50     13893        50     16143      1300     12230       500      5011        70
-     8      5442        80     13473        50     18430       700     12398       300      5469        80
--    9      9253       100     14377        50     19851      2400     12199       900      9449       100
-+    9      9253       100     14377       100     19851      2400     12199       900      9449       100
-    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
-    11     12971       100     14444        50     34063      2000     32033      1200     12864       150
-    12      7674       100     13533        50     83557      3000     38505      4000      7720       150
-@@ -15,30 +15,30 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
-    15     15690      5000     17179       200     23076      9500     15202       900     10437      5000
-    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
--   17     20444       400     21520       100     27511     11000     16867       600     20721       400
--   18     15894       100     19305       100     27187     10300     15925       350     15925       100
--   19     22521       300     42926       150     43868     17000     19232     11000     22729       300
-+   17     20444       400     21520       150     27511     11000     16867       600     20721       400
-+   18     15894       100     19305       200     27187     10300     15925       350     15925       100
-+   19     22521       300     42926       200     43868     17000     19232     11000     22729       300
-    20      3664       600     14437       100     19824      6300     10396       900      4220       600
-    21     17608       600     13900       150     49440      6300     37586      9000      5938       600
-    22      4866       600     14162       100     30889     10050     21311      1800      4845       600
--   23      4131        40     15272        50     34038      2500     12258      1400      4162        40
-+   23      4131        40     15272       100     34038      2500     12258      1400      4162        40
-    24      7813       300     23739       100     11085      6000      6973      3100      8081       300
-    25     28422       150     29391       300     14104     14800      7386      2800     14493       150
-    26      4545       150     14541       100     27602     14800     13094      2800      4467       150
-    27      6141       200     15967       100     39594     21600     19331      7000      6596       500
-    28      9110       500     16584       200     21346     21600     10645      7000      8869       500
-    29      7419       500     15112       200     18872     21600      7928      7000      7296       500
--   30     17016      5500     18198       100     32434     17400     22157      5000     20823      5500
--   31     30615      8200     27176       150     50520     18200     35724      5400     36690      8200
--   32   3304592       100    712308       500     62688     19000    123056      7000         0         0
-+   30     17016      5500     18198       250     32434     17400     22157      5000     20823      5500
-+   31     30615      8200     27176       200     50520     18200     35724      5400     36690      8200
-+   32   3304592       100    712308      3000     62688     19000    123056      7000         0         0
-    33     89233       500     47975       300     65532     27800     37314     12000     90600       500
-    34     36514       300     16815       200     47408     12700     33739      3700     36399       300
--   35    207729       750     87126       100     76094     38000     54717     11000    210497       800
--   36    401670      6500    156361       500     62719     34100     45592     14000    410114      6500
--   37    566142      5000    225206       750     65828     31800     53934      6500    573396      5000
--   38   3738751     35000   1292739      8000     60580      9900    133547      3500   3783013     35000
-+   35    207729       750     87126       750     76094     38000     54717     11000    210497       800
-+   36    401670      6500    156361      2000     62719     34100     45592     14000    410114      6500
-+   37    566142      5000    225206      2000     65828     31800     53934      6500    573396      5000
-+   38   3738751     35000   1292739     12000     60580      9900    133547      3500   3783013     35000
-    39   1466028      9000    853193     50000     38425     13500     91242     18100   1463263      7500
--   40     38312       200     56877       250     36524     11800    119641      8000     38121       200
-+   40     38312       200     56877       750     36524     11800    119641      8000     38121       200
-    41     15025      3000     29289       500     42525     11300     33336      3900     14787      4000
-    42    254604      5000    383258      7000     55666     30400     46534      6500    259594      7000
-    43      4846       150     14075       150     33239       600     25303       300      4877       150
--- 
-2.43.0
-
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index aa7604d..be22620 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,30 +1,16 @@
-diff -ur root-6.24.02.orig/bindings/jupyroot/CMakeLists.txt root-6.24.02/bindings/jupyroot/CMakeLists.txt
---- root-6.24.02.orig/bindings/jupyroot/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/bindings/jupyroot/CMakeLists.txt	2021-08-11 10:53:03.272202496 +0200
-@@ -70,8 +70,7 @@
-   endforeach()
+--- root-6.32.00/bindings/pyroot/pythonizations/CMakeLists.txt	2024-05-28 06:06:46.000000000 +0200
++++ root-6.32.00/bindings/pyroot/pythonizations/CMakeLists.txt	2024-05-29 09:47:08.960324940 +0200
+@@ -189,11 +189,10 @@
+ # Create meta-target PyROOT3 (INTERFACE library)
+ # Export of targets are not supported for custom targets(add_custom_targets())
+ add_library(PyROOT INTERFACE)
+-target_link_libraries(PyROOT INTERFACE cppyy_backend cppyy ROOTPythonizations)
++target_link_libraries(PyROOT INTERFACE cppyy_backend cppyy)
  
-   # Install library
--  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
--                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-+  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-                              LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
-                              ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
- 
-diff -ur root-6.24.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.24.02/bindings/pyroot/pythonizations/CMakeLists.txt
---- root-6.24.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
-+++ root-6.24.02/bindings/pyroot/pythonizations/CMakeLists.txt	2021-08-11 10:53:03.272202496 +0200
-@@ -137,11 +137,10 @@
-   # Create meta-target PyROOT2 and PyROOT3 (INTERFACE library)
-   # Export of targets are not supported for custom targets(add_custom_targets())
-   add_library(PyROOT${python_major_version_string} INTERFACE)
--  target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string} ROOTPythonizations${python_under_version_string})
-+  target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string})
- 
-   # Install library
--  install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
--                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-+  install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-                              LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
-                              ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
+ # Install library
+-install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
+-                            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
++install(TARGETS ${libname}  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+                             LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
+                             ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
  
diff --git a/root-np32.patch b/root-np32.patch
deleted file mode 100644
index 832f6c7..0000000
--- a/root-np32.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 42b9c691fdd2d0001c61f78cc8adfbb9c994f6b4 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 17 Nov 2023 11:46:14 +0100
-Subject: [PATCH 3/3] Fix pythonizations test errors on ix86 Linux
-
-======================================================================
-ERROR: test_sliced_array (rdataframe_makenumpy.DataFrameFromNumpy.test_sliced_array)
-Test correct reading of a sliced numpy array (#13690)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py", line 153, in test_sliced_array
-    x_col = df.Take['Long64_t']("x")
-            ^^^^^^^^^^^^^^^^^^^^^^^^
-cppyy.gbl.std.runtime_error: Could not instantiate Take<Long64_t>:
-  ROOT::RDF::RResultPtr<vector<Long64_t> > ROOT::RDF::RInterface<ROOT::Detail::RDF::RLoopManager,void>::Take(basic_string_view<char,char_traits<char> > column = "") =>
-    runtime_error: Column x has type int while the id specified is associated to type Long64_t
-----------------------------------------------------------------------
-
-======================================================================
-ERROR: test_dtypes (rtensor.AsRTensor.test_dtypes)
-Test adoption of numpy arrays with different data types
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rtensor.py", line 45, in test_dtypes
-    root_obj = ROOT.TMVA.Experimental.RTensor(self.cpptypes[i])(np_obj)
-               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/builddir/build/BUILD/root-6.30.00/redhat-linux-build/lib/ROOT/_pythonization/_tmva/_rtensor.py", line 131, in RTensorInit
-    return self._original_init_(data,shape,layout)
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-TypeError: none of the 6 overloaded methods succeeded. Full details:
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(TMVA::Experimental::RTensor<long,vector<long> >&&) =>
-    TypeError: takes at most 1 arguments (3 given)
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(const TMVA::Experimental::RTensor<long,vector<long> >&) =>
-    TypeError: takes at most 1 arguments (3 given)
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(shared_ptr<vector<long> > container, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
-    TypeError: could not convert argument 1
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
-    TypeError: takes at most 2 arguments (3 given)
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, vector<unsigned int> strides, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
-    TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
-  RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
-    TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
-----------------------------------------------------------------------
----
- .../pyroot/pythonizations/test/rdataframe_makenumpy.py    | 8 ++++----
- bindings/pyroot/pythonizations/test/rtensor.py            | 8 +-------
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-index cd2ebc9b5b..cc46f5bea1 100644
---- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-+++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-@@ -142,19 +142,19 @@ class DataFrameFromNumpy(unittest.TestCase):
-         gc.collect()
-         ref4 = sys.getrefcount(x)
-         self.assertEqual(ref1, ref4)
--    
-+
-     def test_sliced_array(self):
-         """
-         Test correct reading of a sliced numpy array (#13690)
-         """
--        table = np.array([[1,2], [3,4]])
-+        table = np.array([[1,2], [3,4]], dtype="int64")
-         columns = {'x': table[:,0], 'y': table[:,1]}
-         df = ROOT.RDF.FromNumpy(columns)
-         x_col = df.Take['Long64_t']("x")
-         y_col = df.Take['Long64_t']("y")
--        self.assertEqual(list(x_col.GetValue()), [1,3]) 
-+        self.assertEqual(list(x_col.GetValue()), [1,3])
-         self.assertEqual(list(y_col.GetValue()), [2,4])
--        
-+
- 
- if __name__ == '__main__':
-     unittest.main()
-diff --git a/bindings/pyroot/pythonizations/test/rtensor.py b/bindings/pyroot/pythonizations/test/rtensor.py
-index 99b458cfa9..ca119f0b41 100644
---- a/bindings/pyroot/pythonizations/test/rtensor.py
-+++ b/bindings/pyroot/pythonizations/test/rtensor.py
-@@ -2,7 +2,6 @@ import unittest
- import ROOT
- RTensor = ROOT.TMVA.Experimental.RTensor
- import numpy as np
--import platform
- 
- 
- def check_shape(root_obj, np_obj):
-@@ -21,18 +20,13 @@ class AsRTensor(unittest.TestCase):
-     dtypes = [
-         "int32", "int64", "uint32", "uint64", "float32", "float64"
-     ]
--    cpptypes = ["int", "long", "unsigned int", "unsigned long", "float", "double"]
-+    cpptypes = ["int32_t", "int64_t", "uint32_t", "uint64_t", "float", "double"]
- 
-     # Tests
-     def test_dtypes(self):
-         """
-         Test adoption of numpy arrays with different data types
-         """
--        #using long long on Linux does not work although it is same size as long
--        if (platform.system() == "Windows") :
--                self.cpptypes[1] = "long long"
--                self.cpptypes[3] = "unsigned long long"
--
-         i = 0
-         for dtype in self.dtypes:
-             np_obj = np.array([[1, 2], [3, 4], [5, 6]], dtype=dtype)
--- 
-2.43.0
-
diff --git a/root-old-gtest.patch b/root-old-gtest.patch
deleted file mode 100644
index 87b6fe4..0000000
--- a/root-old-gtest.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 8b7369a527aa52204e1ce529c8cb206cfee4c61b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 17 Nov 2023 16:18:12 +0100
-Subject: [PATCH] Disable tests that don't compile with old gtest (EPEL 8)
-
----
- core/metacling/test/TClingLoadUnloadFileTests.cxx | 2 ++
- roofit/histfactory/test/testHistFactory.cxx       | 2 ++
- roofit/roofitcore/test/testRooProdPdf.cxx         | 2 ++
- roofit/roofitcore/test/testTestStatistics.cxx     | 2 ++
- 4 files changed, 8 insertions(+)
-
-diff --git a/core/metacling/test/TClingLoadUnloadFileTests.cxx b/core/metacling/test/TClingLoadUnloadFileTests.cxx
-index 7f97f3f441..d1b7a65fbc 100644
---- a/core/metacling/test/TClingLoadUnloadFileTests.cxx
-+++ b/core/metacling/test/TClingLoadUnloadFileTests.cxx
-@@ -73,6 +73,7 @@ void remove_n_library_artifacts(const std::string &basename, unsigned int n)
-    }
- }
- 
-+/*
- TEST(TClingLoadUnloadFile, ConcurrentLoadUnloadSameLib)
- {
-    GTEST_SKIP() << "fails sporadically, see "
-@@ -125,3 +126,4 @@ TEST(TClingLoadUnloadFile, ConcurrentLoadUnloadOneLibPerThread)
- 
-    remove_n_library_artifacts(basename, n_libraries);
- }
-+*/
-diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
-index 7553ba4e4a..fefdca8e97 100644
---- a/roofit/histfactory/test/testHistFactory.cxx
-+++ b/roofit/histfactory/test/testHistFactory.cxx
-@@ -752,6 +752,7 @@ std::string getNameFromInfo(testing::TestParamInfo<HFFixture::ParamType> const &
-    return getName(paramInfo.param, false);
- }
- 
-+/*
- INSTANTIATE_TEST_SUITE_P(
-    HistFactory, HFFixture,
-    testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
-@@ -784,3 +785,4 @@ INSTANTIATE_TEST_SUITE_P(HistFactoryCodeGen, HFFixtureFit,
-                                           testing::Values(RooFit::EvalBackend::Codegen())),
-                          getNameFromInfo);
- #endif
-+*/
-diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
-index 34fb559cd1..09734f5c5d 100644
---- a/roofit/roofitcore/test/testRooProdPdf.cxx
-+++ b/roofit/roofitcore/test/testRooProdPdf.cxx
-@@ -64,6 +64,7 @@ TEST_P(TestProdPdf, CachingOpt)
-       << "b=" << b.getVal() << " +- " << b.getError() << " doesn't match truth value with O" << _optimize << ".";
- }
- 
-+/*
- INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
-                          testing::Combine(testing::Values(0, 1, 2),
-                                           testing::Values(ROOFIT_EVAL_BACKENDS)),
-@@ -72,6 +73,7 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
-                             ss << "opt" << std::get<0>(paramInfo.param) << std::get<1>(paramInfo.param).name();
-                             return ss.str();
-                          });
-+*/
- 
- TEST(RooProdPdf, TestGetPartIntList)
- {
-diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
-index 3099d82060..5846353043 100644
---- a/roofit/roofitcore/test/testTestStatistics.cxx
-+++ b/roofit/roofitcore/test/testTestStatistics.cxx
-@@ -585,6 +585,7 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values(ROOFIT_EV
-                             return ss.str();
-                          });
- 
-+/*
- INSTANTIATE_TEST_SUITE_P(RooNLLVar, OffsetBinTest,
-                          testing::Combine(testing::Values(ROOFIT_EVAL_BACKENDS), // EvalBackend
-                                           testing::Values(false, true),   // unbinned or binned
-@@ -622,3 +623,4 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVarBinnedL, OffsetBinTest,
-                             ss << (std::get<5>(paramInfo.param) ? "BinnedL" : "");
-                             return ss.str();
-                          });
-+*/
diff --git a/root-out-of-bounds.patch b/root-out-of-bounds.patch
new file mode 100644
index 0000000..fbae2ea
--- /dev/null
+++ b/root-out-of-bounds.patch
@@ -0,0 +1,26 @@
+From 069359fe9e6c36a4287a64d3356246d516409149 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Tue, 4 Jun 2024 12:53:53 +0200
+Subject: [PATCH] [RF] Set size of offsets vector in LikelihoodJob correctly
+
+When `std::copy`ing into a vector, it needs to have the right size
+before. Doing only `std::reserve` is not enough.
+
+Fixes #15730.
+---
+ roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx b/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
+index 85c3d02c02ccf..42d191833d14c 100644
+--- a/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
++++ b/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
+@@ -93,7 +93,7 @@ void LikelihoodJob::update_state()
+             assert(!more);
+             auto offsets_message_begin = offsets_message.data<ROOT::Math::KahanSum<double>>();
+             std::size_t N_offsets = offsets_message.size() / sizeof(ROOT::Math::KahanSum<double>);
+-            shared_offset_.offsets().reserve(N_offsets);
++            shared_offset_.offsets().resize(N_offsets);
+             auto offsets_message_end = offsets_message_begin + N_offsets;
+             std::copy(offsets_message_begin, offsets_message_end, shared_offset_.offsets().begin());
+          }
diff --git a/root-pcre2.patch b/root-pcre2.patch
deleted file mode 100644
index 359acc2..0000000
--- a/root-pcre2.patch
+++ /dev/null
@@ -1,456 +0,0 @@
-From f89fc640f9ca1b2cccf0dc496b0b7ea434b53fad Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 2 Oct 2023 09:25:13 +0200
-Subject: [PATCH] Support PCRE2
-
----
- .../pythonizations/test/import_load_libs.py   |   1 +
- cmake/modules/FindPCRE2.cmake                 | 106 ++++++++++++++++++
- cmake/modules/SearchInstalledSoftware.cmake   |  17 +--
- core/base/CMakeLists.txt                      |   9 +-
- core/base/src/TPRegexp.cxx                    |  99 +++++++++++++++-
- tutorials/legacy/regexp/regexp.C              |   6 +-
- 6 files changed, 223 insertions(+), 15 deletions(-)
- create mode 100644 cmake/modules/FindPCRE2.cmake
-
-diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
-index 087db7da5c..179c76f6fd 100644
---- a/bindings/pyroot/pythonizations/test/import_load_libs.py
-+++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
-@@ -23,6 +23,7 @@ class ImportLoadLibs(unittest.TestCase):
-             'libc',
-             'libdl',
-             'libpcre',
-+            'libpcre2-8',
-             # libCling and dependencies
-             'libCling.*',
-             'librt',
-diff --git a/cmake/modules/FindPCRE2.cmake b/cmake/modules/FindPCRE2.cmake
-new file mode 100644
-index 0000000000..2417453e8b
---- /dev/null
-+++ b/cmake/modules/FindPCRE2.cmake
-@@ -0,0 +1,106 @@
-+# Copyright (C) 1995-2019, Rene Brun and Fons Rademakers.
-+# All rights reserved.
-+#
-+# For the licensing terms see $ROOTSYS/LICENSE.
-+# For the list of contributors see $ROOTSYS/README/CREDITS.
-+
-+#.rst:
-+# FindPCRE2
-+# --------
-+#
-+# Find PCRE2 library
-+#
-+# Imported Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target:
-+#
-+# ``PCRE2::PCRE2``
-+#   The pcre2 library, if found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+# This module will set the following variables in your project:
-+#
-+# ``PCRE2_FOUND``
-+#   True if PCRE2 has been found.
-+# ``PCRE2_INCLUDE_DIRS``
-+#   Where to find pcre2.h
-+# ``PCRE2_LIBRARIES``
-+#   The libraries to link against to use PCRE2.
-+# ``PCRE2_VERSION``
-+#   The version of the PCRE2 found (e.g. 10.42)
-+#
-+# Obsolete variables
-+# ^^^^^^^^^^^^^^^^^^
-+#
-+# The following variables may also be set, for backwards compatibility:
-+#
-+# ``PCRE2_PCRE2_LIBRARY``
-+#   where to find the PCRE2_PCRE2 library.
-+# ``PCRE2_INCLUDE_DIR``
-+#   where to find the pcre2.h header (same as PCRE2_INCLUDE_DIRS)
-+#
-+
-+foreach(var PCRE2_FOUND PCRE2_INCLUDE_DIR PCRE2_PCRE2_LIBRARY PCRE2_LIBRARIES)
-+  unset(${var} CACHE)
-+endforeach()
-+
-+find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h PATH_SUFFIXES include)
-+mark_as_advanced(PCRE2_INCLUDE_DIR)
-+
-+if (PCRE2_INCLUDE_DIR AND EXISTS "${PCRE2_INCLUDE_DIR}/pcre2.h")
-+  file(STRINGS "${PCRE2_INCLUDE_DIR}/pcre2.h" PCRE2_H REGEX "^#define PCRE2_(MAJOR|MINOR).*$")
-+  string(REGEX REPLACE "^.*PCRE2_MAJOR[ ]+([0-9]+).*$" "\\1" PCRE2_VERSION_MAJOR "${PCRE2_H}")
-+  string(REGEX REPLACE "^.*PCRE2_MINOR[ ]+([0-9]+).*$" "\\1" PCRE2_VERSION_MINOR "${PCRE2_H}")
-+  set(PCRE2_VERSION "${PCRE2_VERSION_MAJOR}.${PCRE2_VERSION_MINOR}")
-+endif()
-+
-+if(NOT PCRE2_PCRE2_LIBRARY)
-+  find_library(PCRE2_PCRE2_LIBRARY_RELEASE NAMES pcre2-8)
-+  find_library(PCRE2_PCRE2_LIBRARY_DEBUG NAMES pcre2-8${CMAKE_DEBUG_POSTFIX} pcre2-8d)
-+  include(SelectLibraryConfigurations)
-+  select_library_configurations(PCRE2_PCRE2)
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(PCRE2
-+  REQUIRED_VARS
-+    PCRE2_INCLUDE_DIR
-+    PCRE2_PCRE2_LIBRARY
-+  VERSION_VAR
-+    PCRE2_VERSION
-+)
-+
-+if(PCRE2_FOUND)
-+  set(PCRE2_INCLUDE_DIRS "${PCRE2_INCLUDE_DIR}")
-+
-+  if (NOT PCRE2_LIBRARIES)
-+    set(PCRE2_LIBRARIES "${PCRE2_PCRE2_LIBRARY}")
-+  endif()
-+
-+  if(NOT TARGET PCRE2::PCRE2)
-+    add_library(PCRE2::PCRE2 UNKNOWN IMPORTED)
-+    set_target_properties(PCRE2::PCRE2 PROPERTIES
-+      INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIRS}")
-+
-+    if(PCRE2_PCRE2_LIBRARY_DEBUG)
-+      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
-+        IMPORTED_CONFIGURATIONS DEBUG)
-+      set_target_properties(PCRE2::PCRE2 PROPERTIES
-+        IMPORTED_LOCATION_DEBUG "${PCRE2_PCRE2_LIBRARY_DEBUG}")
-+    endif()
-+
-+    if(PCRE2_PCRE2_LIBRARY_RELEASE)
-+      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
-+        IMPORTED_CONFIGURATIONS RELEASE)
-+      set_target_properties(PCRE2::PCRE2 PROPERTIES
-+        IMPORTED_LOCATION_RELEASE "${PCRE2_PCRE2_LIBRARY_RELEASE}")
-+    endif()
-+
-+    if(NOT PCRE2_PCRE2_LIBRARY_DEBUG AND NOT PCRE2_PCRE2_LIBRARY_RELEASE)
-+      set_property(TARGET PCRE2::PCRE2 APPEND PROPERTY
-+        IMPORTED_LOCATION "${PCRE2_PCRE2_LIBRARY}")
-+    endif()
-+  endif()
-+endif()
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 464155fd50..252aa56737 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -204,13 +204,16 @@ if(NOT builtin_pcre)
-   foreach(suffix FOUND INCLUDE_DIR PCRE_LIBRARY)
-     unset(PCRE_${suffix} CACHE)
-   endforeach()
--  if(fail-on-missing)
--    find_package(PCRE REQUIRED)
--  else()
--    find_package(PCRE)
--    if(NOT PCRE_FOUND)
--      message(STATUS "PCRE not found. Switching on builtin_pcre option")
--      set(builtin_pcre ON CACHE BOOL "Enabled because PCRE not found (${builtin_pcre_description})" FORCE)
-+  find_package(PCRE2)
-+  if(NOT PCRE2_FOUND)
-+    if(fail-on-missing)
-+      find_package(PCRE REQUIRED)
-+    else()
-+      find_package(PCRE)
-+      if(NOT PCRE_FOUND)
-+        message(STATUS "PCRE not found. Switching on builtin_pcre option")
-+        set(builtin_pcre ON CACHE BOOL "Enabled because PCRE not found (${builtin_pcre_description})" FORCE)
-+      endif()
-     endif()
-   endif()
- endif()
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index df701fedea..5798c93775 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -214,7 +214,14 @@ target_include_directories(Core PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/v7/inc>
- )
- 
--target_link_libraries(Core PRIVATE PCRE::PCRE)
-+if(PCRE2_FOUND)
-+  target_link_libraries(Core PRIVATE PCRE2::PCRE2)
-+  set_source_files_properties(src/TPRegexp.cxx
-+    TARGET_DIRECTORY Core
-+    PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
-+else()
-+  target_link_libraries(Core PRIVATE PCRE::PCRE)
-+endif()
- 
- ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
- 
-diff --git a/core/base/src/TPRegexp.cxx b/core/base/src/TPRegexp.cxx
-index 949b8cc8e9..d70f3e5b8b 100644
---- a/core/base/src/TPRegexp.cxx
-+++ b/core/base/src/TPRegexp.cxx
-@@ -25,19 +25,36 @@ found at : http://perldoc.perl.org/perlre.html
- #include "TObjString.h"
- #include "TError.h"
- 
-+#ifdef USE_PCRE2
-+#ifdef R__WIN32
-+#define PCRE2_STATIC
-+#endif
-+#define PCRE2_CODE_UNIT_WIDTH 8
-+#include <pcre2.h>
-+#define PCRE_CASELESS  PCRE2_CASELESS
-+#define PCRE_MULTILINE PCRE2_MULTILINE
-+#define PCRE_DOTALL    PCRE2_DOTALL
-+#define PCRE_EXTENDED  PCRE2_EXTENDED
-+#define PCRE_ERROR_NOMATCH PCRE2_ERROR_NOMATCH
-+#else
- #ifdef R__WIN32
- #define PCRE_STATIC
- #endif
- #include <pcre.h>
-+#endif
- 
- #include <vector>
- #include <stdexcept>
- 
- struct PCREPriv_t {
-+#ifdef USE_PCRE2
-+   pcre2_code *fPCRE;
-+   PCREPriv_t() { fPCRE = nullptr; }
-+#else
-    pcre       *fPCRE;
-    pcre_extra *fPCREExtra;
--
-    PCREPriv_t() { fPCRE = nullptr; fPCREExtra = nullptr; }
-+#endif
- };
- 
- 
-@@ -79,10 +96,15 @@ TPRegexp::TPRegexp(const TPRegexp &p)
- 
- TPRegexp::~TPRegexp()
- {
-+#ifdef USE_PCRE2
-+   if (fPriv->fPCRE)
-+      pcre2_code_free(fPriv->fPCRE);
-+#else
-    if (fPriv->fPCRE)
-       pcre_free(fPriv->fPCRE);
-    if (fPriv->fPCREExtra)
-       pcre_free(fPriv->fPCREExtra);
-+#endif
-    delete fPriv;
- }
- 
-@@ -93,12 +115,18 @@ TPRegexp &TPRegexp::operator=(const TPRegexp &p)
- {
-    if (this != &p) {
-       fPattern = p.fPattern;
-+#ifdef USE_PCRE2
-+      if (fPriv->fPCRE)
-+         pcre2_code_free(fPriv->fPCRE);
-+      fPriv->fPCRE = nullptr;
-+#else
-       if (fPriv->fPCRE)
-          pcre_free(fPriv->fPCRE);
-       fPriv->fPCRE = nullptr;
-       if (fPriv->fPCREExtra)
-          pcre_free(fPriv->fPCREExtra);
-       fPriv->fPCREExtra = nullptr;
-+#endif
-       fPCREOpts  = p.fPCREOpts;
-    }
-    return *this;
-@@ -197,31 +225,50 @@ TString TPRegexp::GetModifiers() const
- 
- void TPRegexp::Compile()
- {
-+#ifdef USE_PCRE2
-+   if (fPriv->fPCRE)
-+      pcre2_code_free(fPriv->fPCRE);
-+#else
-    if (fPriv->fPCRE)
-       pcre_free(fPriv->fPCRE);
-+#endif
- 
-    if (fPCREOpts & kPCRE_DEBUG_MSGS)
-       Info("Compile", "PREGEX compiling %s", fPattern.Data());
- 
-+#ifdef USE_PCRE2
-+   int errcode;
-+   PCRE2_SIZE patIndex;
-+   fPriv->fPCRE = pcre2_compile((PCRE2_SPTR)fPattern.Data(), fPattern.Length(),
-+                                fPCREOpts & kPCRE_INTMASK,
-+                                &errcode, &patIndex, nullptr);
-+#else
-    const char *errstr;
-    Int_t patIndex;
-    fPriv->fPCRE = pcre_compile(fPattern.Data(), fPCREOpts & kPCRE_INTMASK,
-                                &errstr, &patIndex, nullptr);
-+#endif
- 
-    if (!fPriv->fPCRE) {
-+#ifdef USE_PCRE2
-+      PCRE2_UCHAR errstr[256];
-+      pcre2_get_error_message(errcode, errstr, 256);
-+#endif
-       if (fgThrowAtCompileError) {
-          throw std::runtime_error
-             (TString::Format("TPRegexp::Compile() compilation of TPRegexp(%s) failed at: %d because %s",
--                             fPattern.Data(), patIndex, errstr).Data());
-+                             fPattern.Data(), (int)patIndex, errstr).Data());
-       } else {
-          Error("Compile", "compilation of TPRegexp(%s) failed at: %d because %s",
--               fPattern.Data(), patIndex, errstr);
-+               fPattern.Data(), (int)patIndex, errstr);
-          return;
-       }
-    }
- 
-+#ifndef USE_PCRE2
-    if (fPriv->fPCREExtra || (fPCREOpts & kPCRE_OPTIMIZE))
-       Optimize();
-+#endif
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -229,6 +276,7 @@ void TPRegexp::Compile()
- 
- void TPRegexp::Optimize()
- {
-+#ifndef USE_PCRE2
-    if (fPriv->fPCREExtra)
-       pcre_free(fPriv->fPCREExtra);
- 
-@@ -243,6 +291,7 @@ void TPRegexp::Optimize()
-       Error("Optimize", "Optimization of TPRegexp(%s) failed: %s",
-             fPattern.Data(), errstr);
-    }
-+#endif
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
-@@ -308,21 +357,43 @@ Int_t TPRegexp::MatchInternal(const TString &s, Int_t start,
-                               Int_t nMaxMatch, TArrayI *pos) const
- {
-    Int_t *offVec = new Int_t[3*nMaxMatch];
-+
-+#ifdef USE_PCRE2
-+   pcre2_match_data *match_data;
-+   match_data = pcre2_match_data_create_from_pattern(fPriv->fPCRE, nullptr);
-+   Int_t nrMatch = pcre2_match(fPriv->fPCRE, (PCRE2_SPTR8)s.Data(),
-+                               s.Length(), start, 0,
-+                               match_data, nullptr);
-+#else
-    // pcre_exec allows less options - see pcre_internal.h PUBLIC_EXEC_OPTIONS.
-    Int_t nrMatch = pcre_exec(fPriv->fPCRE, fPriv->fPCREExtra, s.Data(),
-                              s.Length(), start, 0,
-                              offVec, 3*nMaxMatch);
-+#endif
- 
-    if (nrMatch == PCRE_ERROR_NOMATCH)
-       nrMatch = 0;
-    else if (nrMatch <= 0) {
-       Error("Match","pcre_exec error = %d", nrMatch);
-+#ifdef USE_PCRE2
-+      pcre2_match_data_free(match_data);
-+#endif
-       delete [] offVec;
-       return 0;
-    }
- 
--   if (pos)
-+   if (pos) {
-+#ifdef USE_PCRE2
-+      PCRE2_SIZE *oVec = pcre2_get_ovector_pointer(match_data);
-+      for (int i = 0; i < 2 * nrMatch; ++i)
-+         offVec[i] = oVec[i];
-+#endif
-       pos->Set(2*nrMatch, offVec);
-+   }
-+
-+#ifdef USE_PCRE2
-+   pcre2_match_data_free(match_data);
-+#endif
-    delete [] offVec;
- 
-    return nrMatch;
-@@ -404,13 +475,24 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
-    Int_t offset = start;
-    Int_t last = 0;
- 
-+#ifdef USE_PCRE2
-+   pcre2_match_data *match_data;
-+   match_data = pcre2_match_data_create_from_pattern(fPriv->fPCRE, nullptr);
-+#endif
-+
-    while (kTRUE) {
- 
-       // find next matching subs
-       // pcre_exec allows less options - see pcre_internal.h PUBLIC_EXEC_OPTIONS.
-+#ifdef USE_PCRE2
-+      Int_t nrMatch = pcre2_match(fPriv->fPCRE, (PCRE2_SPTR)s.Data(),
-+                                  s.Length(), offset, 0,
-+                                  match_data, nullptr);
-+#else
-       Int_t nrMatch = pcre_exec(fPriv->fPCRE, fPriv->fPCREExtra, s.Data(),
-                                 s.Length(), offset, 0,
-                                 offVec, 3*nMaxMatch);
-+#endif
- 
-       if (nrMatch == PCRE_ERROR_NOMATCH) {
-          break;
-@@ -419,6 +501,12 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
-          break;
-       }
- 
-+#ifdef USE_PCRE2
-+      PCRE2_SIZE *oVec = pcre2_get_ovector_pointer(match_data);
-+      for (int i = 0; i < 2 * nrMatch; ++i)
-+         offVec[i] = oVec[i];
-+#endif
-+
-       // append anything previously unmatched, but not substituted
-       if (last <= offVec[0]) {
-          fin += s(last,offVec[0]-last);
-@@ -446,6 +534,9 @@ Int_t TPRegexp::SubstituteInternal(TString &s, const TString &replacePattern,
-       }
-    }
- 
-+#ifdef USE_PCRE2
-+   pcre2_match_data_free(match_data);
-+#endif
-    delete [] offVec;
- 
-    fin += s(last,s.Length()-last);
-diff --git a/tutorials/legacy/regexp/regexp.C b/tutorials/legacy/regexp/regexp.C
-index 995b823bce..f38ed6799e 100644
---- a/tutorials/legacy/regexp/regexp.C
-+++ b/tutorials/legacy/regexp/regexp.C
-@@ -94,11 +94,11 @@ void regexp()
-    // criteria:
-    // 1) It should be of the form string1@string2 . The "^" and "$" ensure that we compare the complete
-    //    email string
--   // 2) ([\\w-\\.]+)  :
-+   // 2) ([\\w\\-\\.]+)  :
-    //    string1 is only allowed to be composed out of the alphanumeric characters, "-" and "." .
-    //    The "+" ensures that string1 can not be empty .
-    // 3) string2 is matched against three different parts :
--   //    a. ((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w-]+\\.)+))  :
-+   //    a. ((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w\\-]+\\.)+))  :
-    //       This regular expression ensures that EITHER the string starts with "[" followed by three groups
-    //       of numbers, separated by "." , where each group has 1 to 3 numbers, OR alphanumeric strings,
-    //       possibly containing "-" characters, separated by "." .
-@@ -108,7 +108,7 @@ void regexp()
-    //       At most one "]" character .
- 
-    TString s5("fons.rademakers@cern.ch");
--   TPRegexp r5("^([\\w-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
-+   TPRegexp r5("^([\\w\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
-    cout << "Check if the email address \"" << s5 << "\" is valid: " << (r5.MatchB(s5) ? "TRUE" : "FALSE") << endl;
- 
-    // Substitute Example with pattern modifier :
--- 
-2.41.0
-
diff --git a/root-stress.patch b/root-stress.patch
new file mode 100644
index 0000000..bf7f468
--- /dev/null
+++ b/root-stress.patch
@@ -0,0 +1,32 @@
+From 706c94ca916387287f7459c984d61439e52c1aba Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 2 Jun 2024 06:19:43 +0200
+Subject: [PATCH] Adjust stressGraphics.ref
+
+---
+ test/stressGraphics.ref | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 37077a2fb9..9d5cd0352d 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -7,13 +7,13 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+     6       430        50     12669        50      9558       100      5325       700       471        50
+     7      4980        50     13893        50     16143      1300     12230       500      5011        70
+     8      5442        80     13473        50     18430       700     12398       300      5469        80
+-    9      9253       100     14377       100     19851      2400     12199       900      9283       100
++    9      9253       100     14377       150     19851      2400     12199       900      9283       100
+    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
+    11     12971       100     14444        50     34063      2000     32033      1200     12864       150
+    12      7674       100     13533        50     83557      3000     38505      4000      7720       150
+    13      5600       400     13242       300     16881       400     15063       800      5638       400
+    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
+-   15     15690      5000     17179       200     23076      9500     14232      1000     10437      5000
++   15     15690      5000     17179       200     23076      9500     14232      1500     10437      5000
+    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       150     27511     11000     16867       600     20721       400
+    18     15894       100     19305       200     27187     10300     15925       350     15925       100
+-- 
+2.45.1
+
diff --git a/root-use-consistent-wording-in-tmva-test-comments.patch b/root-use-consistent-wording-in-tmva-test-comments.patch
deleted file mode 100644
index 1d3e52a..0000000
--- a/root-use-consistent-wording-in-tmva-test-comments.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From e6928c405fe1647a0ee6ea32543b18ebc3828227 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 23 Feb 2023 22:10:46 +0100
-Subject: [PATCH] Use consistent wording of the comments in the different TMVA
- classification tests to avoid confusion.
-
----
- tutorials/tmva/TMVA_CNN_Classification.C  | 2 +-
- tutorials/tmva/TMVA_CNN_Classification.py | 4 ++--
- tutorials/tmva/TMVA_RNN_Classification.C  | 6 ++++--
- tutorials/tmva/TMVA_RNN_Classification.py | 5 +++--
- 4 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.C b/tutorials/tmva/TMVA_CNN_Classification.C
-index cc6829a24d..db5af784d4 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.C
-+++ b/tutorials/tmva/TMVA_CNN_Classification.C
-@@ -134,7 +134,7 @@ void TMVA_CNN_Classification(int nevts = 1000, std::vector<bool> opt = {1, 1, 1,
- 
-    bool writeOutputFile = true;
- 
--   int num_threads = 4;  // use by default 4 threads if value is not set before
-+   int num_threads = 4; // use max 4 threads
-    // switch off MT in OpenBLAS to avoid conflict with tbb
-    gSystem->Setenv("OMP_NUM_THREADS", "1");
- 
-diff --git a/tutorials/tmva/TMVA_CNN_Classification.py b/tutorials/tmva/TMVA_CNN_Classification.py
-index 85fde20763..5d3c6e7220 100644
---- a/tutorials/tmva/TMVA_CNN_Classification.py
-+++ b/tutorials/tmva/TMVA_CNN_Classification.py
-@@ -25,7 +25,7 @@
- 
- import ROOT
- 
--#switch off MT in OpenMP (BLAS)
-+# switch off MT in OpenBLAS to avoid conflict with tbb
- ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
- 
- TMVA = ROOT.TMVA
-@@ -145,7 +145,7 @@ if not useTMVACNN:
- 
- writeOutputFile = True
- 
--num_threads = 4  # use default threads
-+num_threads = 4  # use max 4 threads
- max_epochs = 10  # maximum number of epochs used for training
- 
- 
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.C b/tutorials/tmva/TMVA_RNN_Classification.C
-index 8701ba6c19..d4bb7a4e4a 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.C
-+++ b/tutorials/tmva/TMVA_RNN_Classification.C
-@@ -191,8 +191,10 @@ void TMVA_RNN_Classification(int nevts = 2000, int use_type = 1)
-    useKeras = false;
- #endif
- 
--   int num_threads = 4;   // use by default all threads
--   gSystem->Setenv("OMP_NUM_THREADS", "1"); // switch off MT in OpenBLAS
-+   int num_threads = 4; // use max 4 threads
-+   // switch off MT in OpenBLAS to avoid conflict with tbb
-+   gSystem->Setenv("OMP_NUM_THREADS", "1");
-+
-    // do enable MT running
-    if (num_threads >= 0) {
-       ROOT::EnableImplicitMT(num_threads);
-diff --git a/tutorials/tmva/TMVA_RNN_Classification.py b/tutorials/tmva/TMVA_RNN_Classification.py
-index 625a120b3d..65aa83c070 100644
---- a/tutorials/tmva/TMVA_RNN_Classification.py
-+++ b/tutorials/tmva/TMVA_RNN_Classification.py
-@@ -26,10 +26,11 @@ num_threads = 4  # use max 4 threads
- # do enable MT running
- if ROOT.gSystem.GetFromPipe("root-config --has-imt") == "yes":
-     ROOT.EnableImplicitMT(num_threads)
--    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")  # switch OFF MT in OpenBLAS
-+    # switch off MT in OpenBLAS to avoid conflict with tbb
-+    ROOT.gSystem.Setenv("OMP_NUM_THREADS", "1")
-     print("Running with nthreads  = {}".format(ROOT.GetThreadPoolSize()))
- else:
--    print("Running in serail mode since ROOT does not support MT")
-+    print("Running in serial mode since ROOT does not support MT")
- 
- 
- TMVA = ROOT.TMVA
--- 
-2.39.2
-
diff --git a/root-write-array.patch b/root-write-array.patch
new file mode 100644
index 0000000..30b5945
--- /dev/null
+++ b/root-write-array.patch
@@ -0,0 +1,125 @@
+From a7be6f726b13a7ccf1c46dec35f53520781159df Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 7 Jun 2024 06:49:39 +0200
+Subject: [PATCH] Put back check for n = 0
+
+---
+ io/io/src/TBufferFile.cxx | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/io/io/src/TBufferFile.cxx b/io/io/src/TBufferFile.cxx
+index 81e0f95e02..b5b7ef9831 100644
+--- a/io/io/src/TBufferFile.cxx
++++ b/io/io/src/TBufferFile.cxx
+@@ -1948,6 +1948,8 @@ void TBufferFile::WriteArrayDouble32(const Double_t *d, Int_t n, TStreamerElemen
+ 
+ void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(UChar_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -1974,6 +1976,8 @@ void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -1995,6 +1999,8 @@ void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n)
+ 
+ void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2023,6 +2029,8 @@ void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Short_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2054,7 +2062,8 @@ void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n)
+ {
+-   
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = 4;
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2086,6 +2095,8 @@ void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = 8;
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2108,6 +2119,8 @@ void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = 8;
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2128,6 +2141,8 @@ void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Long64_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2154,6 +2169,8 @@ void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2185,6 +2202,8 @@ void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n)
+ 
+ void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Double_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2212,6 +2231,8 @@ void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n)
+ 
+ void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerElement *ele)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+@@ -2270,6 +2291,8 @@ void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerE
+ 
+ void TBufferFile::WriteFastArrayDouble32(const Double_t *d, Long64_t n, TStreamerElement *ele)
+ {
++   if (n == 0) return;
++
+    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
+    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
+    if (n < 0 || n > maxElements)
+-- 
+2.45.2
+
diff --git a/root.spec b/root.spec
index bfe8824..c39adee 100644
--- a/root.spec
+++ b/root.spec
@@ -1,47 +1,16 @@
-# Needed for EPEL 8
-%undefine __cmake_in_source_build
-
 # Disable package note flags, since root saves the compiler/linker flags
 # used during the build
 %undefine _package_note_flags
 
-%global python3_version_uscore %(tr . _ <<< "%{python3_version}")
-
 %global root7 1
-
-%if %{?rhel}%{!?rhel:0} == 8
-%ifarch %{power64}
-# These modules cause "pure virtual method called" errors
-# https://github.com/root-project/root/issues/12372
-%global dataframe 0
-%global roofit 0
-%global tmvasofieparser 0
-%else
 %global dataframe 1
 %global roofit 1
 %global tmvasofieparser 1
-%endif
-%else
-%global dataframe 1
-%global roofit 1
-%global tmvasofieparser 1
-%endif
-
-%if %{?rhel}%{!?rhel:0} == 8
-# DistRDF requires Python 3.8 or later, RHEL 8 has version 3.6
-%global distrdf 0
-%else
 %global distrdf %{dataframe}
-%endif
 
-%if %{?rhel}%{!?rhel:0} == 8
-# Requires nlohmann json version 3.9 or later, RHEL 8 has version 3.6
-%global bundlejson 1
-%else
 %global bundlejson 0
-%endif
 
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
+%if %{?fedora}%{!?fedora:0}
 %ifarch %{ix86} %{arm}
 %global pandas 0
 %else
@@ -55,9 +24,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.30.06
+Version:	6.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -92,39 +61,33 @@ Patch2:		%{name}-dont-install-minicern.patch
 Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
-#		Use local static script and style files for JsMVA
-Patch5:		%{name}-jsmva-static.patch
-#		Fix test failure on ppc64le and aarch64 with gcc 12
-#		https://github.com/root-project/root/pull/9601
-Patch6:		%{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
-#		Byte swap values read from the protobuf raw data stream on
-#		big endian architectures
-#		https://github.com/root-project/root/pull/10308
-Patch7:		%{name}-big-endian-byte-swap.patch
-#		https://github.com/root-project/root/pull/12375
-Patch8:		%{name}-use-consistent-wording-in-tmva-test-comments.patch
-#		https://github.com/root-project/root/pull/10303
-Patch9:		%{name}-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
-#		Port to pcre2
-#		https://github.com/root-project/root/issues/11395
-#		https://github.com/root-project/root/pull/13771
-Patch10:	%{name}-pcre2.patch
-#		https://github.com/root-project/root/pull/14111
-Patch11:	%{name}-avoid-out-of-memory-during-linking.patch
-#		https://github.com/root-project/root/pull/14112
-Patch12:	%{name}-clad.patch
-Patch13:	%{name}-gtest-back.patch
-Patch14:	%{name}-np32.patch
-#		Adjust tests for zlib-ng
-#		https://github.com/root-project/root/pull/14295
-Patch15:	%{name}-new-zlib.patch
-#		Only for EPEL 8 - disable tests not working with old gtest
-Patch16:	%{name}-old-gtest.patch
+#		Adjust stress graphics reference
+#		https://github.com/root-project/root/pull/15735
+Patch5:		%{name}-stress.patch
+#		Avoid segmentation fault on ix86
+#		https://github.com/root-project/root/issues/15738
+#		https://github.com/root-project/root/pull/15780
+Patch6:		%{name}-write-array.patch
+#		Adjust test limit
+#		https://github.com/root-project/root/pull/15734
+Patch7:		%{name}-failure-on-ppc64le-and-s390x.patch
+#		Correct format warnings seen on 32 bit architectures
+#		https://github.com/root-project/root/pull/15732
+Patch8:		%{name}-format-warnings-32-bit.patch
+#		Out-of-bounds vector access
+#		https://github.com/root-project/root/issues/15730
+#		https://github.com/root-project/root/pull/15739
+Patch9:		%{name}-out-of-bounds.patch
+#		Fix one more broken import in JsMVA
+#		https://github.com/root-project/root/pull/15752
+Patch10:	%{name}-fix-one-more-broken-import-in-JsMVA.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 BuildRequires:	make
-BuildRequires:	cmake >= 3.16
+#		root on Linux requires cmake 3.16
+#		but 3.19 is needed for flexiblas support
+BuildRequires:	cmake >= 3.19
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -141,9 +104,10 @@ BuildRequires:	xz-devel
 BuildRequires:	lz4-devel
 BuildRequires:	xxhash-devel
 BuildRequires:	libzstd-devel
-#		Require a version of libAfterImage that is properly linked to
-#		its dependencies
-BuildRequires:	libAfterImage-devel >= 1.20-21
+BuildRequires:	libtiff-devel
+BuildRequires:	libpng-devel
+BuildRequires:	giflib-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	fftw-devel
@@ -155,7 +119,7 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libpq-devel
-BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
 %ifarch %{qt5_qtwebengine_arches}
@@ -172,23 +136,17 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	xrootd-client-devel >= 1:5.0.0
 BuildRequires:	cfitsio-devel
-BuildRequires:	davix-devel >= 0.6.4
+#		Davix version >= 0.6.4, but not between 0.6.8 and 0.7.0
+BuildRequires:	davix-devel >= 0.7.1
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
 BuildRequires:	readline-devel
-BuildRequires:	tbb-devel >= 2018
+BuildRequires:	tbb-devel >= 2020
 BuildRequires:	libuuid-devel
 BuildRequires:	graphviz-devel
 BuildRequires:	expat-devel
 BuildRequires:	pythia8-devel >= 8.1.80
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
 BuildRequires:	flexiblas-devel
-#		Required for FlexiBLAS support in FindBLAS.cmake
-#		(in cmake 3.19.0, backported to cmake 3.18.3-1 in Fedora)
-BuildRequires:	cmake-data >= 3.18.3-1
-%else
-BuildRequires:	openblas-devel
-%endif
 %if ! %{bundlejson}
 BuildRequires:	json-devel >= 3.9
 %endif
@@ -361,26 +319,6 @@ Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
 Obsoletes:	%{name}-doc < 6.26.00
 Obsoletes:	%{name}-io-gfal < 6.30.00
 Obsoletes:	%{name}-roofit-common < 6.30.00
-%if %{?rhel}%{!?rhel:0} == 8
-#		Obsolete the DistRDF package in EPEL 8
-#		Minimum Python version requirement introduced
-Obsoletes:	python%{python3_pkgversion}-distrdf < 6.26.00
-%ifarch %{power64}
-#		Obsolete for ppc64le in EPEL 8
-#		These modules cause "pure virtual method called" errors
-Obsoletes:	%{name}-tree-dataframe < 6.28.00
-Obsoletes:	%{name}-roofit < 6.28.00
-Obsoletes:	%{name}-roofit-common < 6.28.00
-Obsoletes:	%{name}-roofit-core < 6.28.00
-Obsoletes:	%{name}-roofit-more < 6.28.00
-Obsoletes:	%{name}-roofit-batchcompute < 6.28.00
-Obsoletes:	%{name}-roofit-dataframe-helpers < 6.28.00
-Obsoletes:	%{name}-roofit-hs3 < 6.28.00
-Obsoletes:	%{name}-roostats < 6.28.00
-Obsoletes:	%{name}-hist-factory < 6.28.00
-Obsoletes:	%{name}-tmva-sofie-parser < 6.28.00
-%endif
-%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -446,6 +384,9 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split (tpython from Python bindings)
 Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
+#		JsMVA python module is now a submodule of ROOT python module
+Provides:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
+Obsoletes:	python%{python3_pkgversion}-jsmva < 6.32.00
 
 %description -n python%{python3_pkgversion}-%{name}
 This package contains the Python extension for ROOT. It makes it
@@ -453,12 +394,18 @@ possible to use ROOT classes in Python.
 
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
+BuildArch:	noarch
 %py_provides	python%{python3_pkgversion}-jupyroot
-Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
-Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-notebook = %{version}-%{release}
+Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
+#		notebook package was merged with JupyROOT package
+Provides:	%{name}-notebook = %{version}-%{release}
+Obsoletes:	%{name}-notebook < 6.32.00
+Requires:	js-jsroot >= 7.5
 %if %{?fedora}%{!?fedora:0}
+#		jupyter-notebook not available in RHEL/EPEL
+#		some functionality missing
+Requires:	jupyter-notebook
 #		python-metakernel not available in RHEL/EPEL
 #		some functionality missing
 Requires:	python%{python3_pkgversion}-ipython
@@ -469,15 +416,6 @@ Requires:	python-jupyter-filesystem
 %description -n python%{python3_pkgversion}-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
-%package -n python%{python3_pkgversion}-jsmva
-Summary:	TMVA interface used by JupyROOT
-BuildArch:	noarch
-%py_provides	python%{python3_pkgversion}-jsmva
-Requires:	%{name}-tmva = %{version}-%{release}
-
-%description -n python%{python3_pkgversion}-jsmva
-TMVA interface used by JupyROOT.
-
 %if %{distrdf}
 %package -n python%{python3_pkgversion}-distrdf
 Summary:	Distributed RDataFrame
@@ -594,9 +532,6 @@ Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-#		Require a version of libAfterImage that is properly linked to
-#		its dependencies
-Requires:	libAfterImage >= 1.20-21
 
 %description graf-asimage
 This package contains the AfterImage renderer for ROOT, which allows
@@ -1801,20 +1736,6 @@ Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
 The ROOT command line utilities is a set of scripts for common tasks
 written in python.
 
-%package notebook
-Summary:	Static files for the Jupyter ROOT Notebook
-BuildArch:	noarch
-Requires:	%{name}-core = %{version}-%{release}
-Requires:	js-jsroot >= 7.5
-%if %{?fedora}%{!?fedora:0}
-#		jupyter-notebook not available in RHEL/EPEL
-#		some functionality missing
-Requires:	jupyter-notebook
-%endif
-
-%description notebook
-Javascript and style files for the Jupyter ROOT Notebook.
-
 %package gui-webdisplay
 Summary:	Web display for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1994,46 +1915,34 @@ This package contains utility functions for ntuples.
 %prep
 %setup -q -a 1
 
-%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 11 -p1
-%patch -P 12 -p1
-%patch -P 13 -p1
-%patch -P 14 -p1
-%patch -P 15 -p1
-%if %{?rhel}%{!?rhel:0} == 8
-%patch -P 16 -p1
-%endif
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
-rm -rf graf2d/asimage/src/libAfterImage
+rm -rf graf2d/asimage/src/libAfterImage/{libjpeg,libpng,libungif,zlib}
+sed '/zlib\/zlib.h/d' -i graf2d/asimage/src/libAfterImage/.depend
 #  * ftgl
 rm -rf graf3d/ftgl/src graf3d/ftgl/inc
 #  * freetype
 rm -rf graf2d/freetype/src
-#  * davix, glew, lz4, nlohmann, openssl, pcre, tbb, xxhash, zlib, zstd
-rm -rf builtins/davix
+#  * glew, lz4, nlohmann, pcre, xxhash, zlib, zstd
 rm -rf builtins/glew
 rm -rf builtins/lz4
 %if ! %{bundlejson}
 rm -rf builtins/nlohmann
 %endif
-rm -rf builtins/openssl
 rm -rf builtins/pcre
-rm -rf builtins/tbb
-rm -rf builtins/xrootd
 rm -rf builtins/xxhash
-rm -rf builtins/zeromq
 rm -rf builtins/zlib
 rm -rf builtins/zstd
 #  * lzma
@@ -2053,6 +1962,9 @@ rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
+# Additional documentation
+install -p -m 644 %{SOURCE7} bindings/jupyroot
+
 %build
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
@@ -2070,20 +1982,15 @@ for s in etc/notebook/JsMVA/css/*.css ; do
     python3 -m rcssmin < ${s} > ${s%.css}.min.css
 done
 
-# Avoid overlinking (this is the default on Fedora and EPEL 9)
-%if %{?rhel}%{!?rhel:0} == 8
-LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-%endif
-
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
        -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-       -DPYTHON_EXECUTABLE=%{__python3} \
+       -DPython3_EXECUTABLE=%{__python3} \
        -Dgnuinstall:BOOL=ON \
-       -Dbuiltin_afterimage:BOOL=OFF \
+       -Dbuiltin_afterimage:BOOL=ON \
        -Dbuiltin_cfitsio:BOOL=OFF \
        -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_cling:BOOL=ON \
@@ -2129,6 +2036,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dclad:BOOL=OFF \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
+       -Dcudnn:BOOL=OFF \
        -Dcxxmodules:BOOL=OFF \
        -Ddaos:BOOL=OFF \
 %if %{dataframe}
@@ -2139,7 +2047,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Ddev:BOOL=OFF \
-       -Dexceptions:BOOL=ON \
        -Dfcgi:BOOL=ON \
        -Dfftw3:BOOL=ON \
        -DFIREFOX_EXECUTABLE:PATH=/usr/bin/firefox \
@@ -2152,20 +2059,15 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
        -Dlibcxx:BOOL=OFF \
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
-       -Dminuit2:BOOL=ON \
        -Dminuit2_mpi:BOOL=OFF \
        -Dminuit2_omp:BOOL=OFF \
-       -Dmlp:BOOL=ON \
        -Dmpi:BOOL=OFF \
        -Dmysql:BOOL=ON \
        -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
-       -Doracle:BOOL=OFF \
        -Dpgsql:BOOL=ON \
        -Dproof:BOOL=ON \
        -Dpyroot:BOOL=ON \
-       -Dpyroot-python2:BOOL=OFF \
-       -Dpythia6:BOOL=OFF \
        -Dpythia8:BOOL=ON \
 %ifarch %{qt5_qtwebengine_arches}
        -Dqt5web:BOOL=ON \
@@ -2259,9 +2161,6 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages
 install -p -m 644 %{SOURCE6} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
 
-# Additional documentation
-install -p -m 644 %{SOURCE7} %{buildroot}%{_pkgdocdir}
-
 # Move python cli helper to its own directory
 mkdir -p %{buildroot}%{_datadir}/%{name}/cli
 mv %{buildroot}%{python3_sitearch}/cmdLineUtils.py \
@@ -2274,43 +2173,37 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
    %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 
 # Fix python extension suffix
-mv %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
-rm %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so.%{libversion}
-rm %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}.so
-
-mv %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so.%{version} \
-   %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}%{python3_ext_suffix}
-rm %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so.%{libversion}
-rm %{buildroot}%{python3_sitearch}/libJupyROOT%{python3_version_uscore}.so
+mv %{buildroot}%{python3_sitearch}/libROOTPythonizations.so.%{version} \
+   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_ext_suffix}
+rm %{buildroot}%{python3_sitearch}/libROOTPythonizations.so.%{libversion}
+rm %{buildroot}%{python3_sitearch}/libROOTPythonizations.so
 
 # Move noarch python modules to sitelib
 if [ "%{python3_sitelib}" != "%{python3_sitearch}" ] ; then
 mkdir -p %{buildroot}%{python3_sitelib}
-mv %{buildroot}%{python3_sitearch}/JsMVA %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{python3_sitearch}/JupyROOT %{buildroot}%{python3_sitelib}
 %if %{distrdf}
 mv %{buildroot}%{python3_sitearch}/DistRDF %{buildroot}%{python3_sitelib}
 %endif
 fi
 
-# Create .egg-info files so that rpm auto-generates provides
+# Create .dist-info files so that rpm auto-generates provides
+mkdir %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info
 echo 'Name: ROOT' > \
-    %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+    %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info/METADATA
 echo 'Version: %{version}' >> \
-    %{buildroot}%{python3_sitearch}/ROOT-%{version}.egg-info
+    %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info/METADATA
+mkdir %{buildroot}%{python3_sitelib}/JupyROOT-%{version}.dist-info
 echo 'Name: JupyROOT' > \
-    %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
+    %{buildroot}%{python3_sitelib}/JupyROOT-%{version}.dist-info/METADATA
 echo 'Version: %{version}' >> \
-    %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.egg-info
-echo 'Name: JsMVA' > \
-    %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
-echo 'Version: %{version}' >> \
-    %{buildroot}%{python3_sitelib}/JsMVA-%{version}.egg-info
+    %{buildroot}%{python3_sitelib}/JupyROOT-%{version}.dist-info/METADATA
 %if %{distrdf}
+mkdir %{buildroot}%{python3_sitelib}/DistRDF-%{version}.dist-info
 echo 'Name: DistRDF' > \
-    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
+    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.dist-info/METADATA
 echo 'Version: %{version}' >> \
-    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.egg-info
+    %{buildroot}%{python3_sitelib}/DistRDF-%{version}.dist-info/METADATA
 %endif
 
 # Put jupyter stuff in the right places
@@ -2322,7 +2215,7 @@ sed -e 's/ROOT C++/& (Python 3)/' \
     -e 's!python[0-9]*\.[0-9]*!%{__python3}!' \
     -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
 sed -e '/^\#!/d' \
-    -i %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py
+    -i %{buildroot}%{python3_sitelib}/JupyROOT/kernel/rootkernel.py
 
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
@@ -2391,10 +2284,10 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 %if ! %{root7}
 rm TBrowserImp/P030_RWebBrowserImp.C
 %endif
-rm TFile/P050_TGFALFile.C
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TProofMgr/P010_TXProofMgr.C
+rm TProofMonSender/P010_TProofMonSenderML.C
 rm TProofServ/P010_TXProofServ.C
 rm TSlave/P010_TXSlave.C
 rm TSQLServer/P040_TOracleServer.C
@@ -2516,10 +2409,6 @@ popd
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/opendata/atlas/OutreachDatasets/2020-01-22/
 #
-# - tutorial-v7-global_temperatures.cxx
-#   reads input data over network
-#   http://root.cern.ch/files/tutorials/GlobalLandTemperaturesByCity.csv
-#
 # - tutorial-v7-ntuple-ntpl003_lhcbOpenData
 #   reads input data over network
 #   http://root.cern.ch/files/LHCb/lhcb_B2HHH_MagnetUp.root (425 MB)
@@ -2532,6 +2421,10 @@ popd
 #   reads input data over network
 #   http://root.cern.ch/files/HiggsTauTauReduced/GluGluToHToTauTau.root (20 MB)
 #
+# - tutorial-v7-ntuple-ntpl011_global_temperatures
+#   reads input data over network
+#   http://root.cern.ch/files/tutorials/GlobalLandTemperaturesByCity.csv
+#
 # - gtest-net-davix-test-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
@@ -2586,10 +2479,10 @@ tutorial-dataframe-df106_HiggsToFourLeptons|\
 tutorial-dataframe-df107_SingleTopAnalysis-py|\
 tutorial-rcanvas-df104-py|\
 tutorial-rcanvas-df105-py|\
-tutorial-v7-global_temperatures.cxx|\
 tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
 tutorial-v7-ntuple-ntpl008_import|\
+tutorial-v7-ntuple-ntpl011_global_temperatures|\
 gtest-net-davix-test-RRawFileDavix|\
 gtest-net-netxng-test-RRawFileNetXNG|\
 gtest-net-netxng-test-TNetXNGFileTest|\
@@ -2607,87 +2500,36 @@ test-webgui-ping"
 %if ! %{pandas}
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
+# - tutorial-dataframe-df035_RDFFromPandas-py
 # - tutorial-roofit-rf409_NumPyPandasToRooFit-py
 #   Requires the pandas python module not (yet) available in RHEL/EPEL 9
 excluded="${excluded}|\
 test-import-pandas|\
 tutorial-dataframe-df026_AsNumpyArrays-py|\
+tutorial-dataframe-df035_RDFFromPandas-py|\
 tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
 %ifarch %{ix86}
 # - gtest-tree-dataframe-test-dataframe-concurrency
 #   "There's already an active task arena."
+#
+# - gtest-tree-dataframe-test-dataframe-simple
+#   free(): invalid pointer
 excluded="${excluded}|\
-gtest-tree-dataframe-test-dataframe-concurrency"
+gtest-tree-dataframe-test-dataframe-concurrency|\
+gtest-tree-dataframe-test-dataframe-simple"
 %endif
 
 %ifarch %{power64}
-# PPC64LE specific failures
-# - test-stresshistofit-interpreted
-# - test-stresshistogram-interpreted
-# - test-stressmathcore-interpreted
+# - test-stressgraphics(-interpreted)
+#   *** stack smashing detected ***: terminated
 #
-# Always timeout (hang?)
-# - test-stressinterpreter
-# - tutorial-unuran-unuranFoamTest
+# - tutorial-roostats-IntervalExamples-py
+#   *** Break *** segmentation violation
 excluded="${excluded}|\
-test-stresshistofit-interpreted|\
-test-stresshistogram-interpreted|\
-test-stressmathcore-interpreted|\
-test-stressinterpreter|\
-tutorial-unuran-unuranFoamTest"
-
-%if %{?rhel}%{!?rhel:0} == 8
-# Fails on ppc64le since RHEL 8.5 update
-# Exception: Found not whitelisted libraries after importing ROOT:
-#  - libpthread-2.28
-#  - libm-2.28
-#  - libc-2.28
-#  - librt-2.28
-# - pyunittests-pyroot-import-load-libs
-#
-# - tutorial-fit-combinedFit(-py)
-# - tutorial-fit-fit2dHist
-# - tutorial-fit-fitCircle
-# - tutorial-fit-line3Dfit
-# - tutorial-math-exampleFunction-py
-# - tutorial-multicore-mt103_fillNtupleFromMultipleThreads
-# - tutorial-multicore-mt201_parallelHistoFill
-# - tutorial-multicore-mt304_fillHistos
-# - tutorial-multicore-mtbb001_fillHistos
-# - tutorial-multicore-mtbb101_fillNtuples
-# - tutorial-multicore-mtbb201_parallelHistoFill
-# - tutorial-rcanvas-*
-# - tutorial-v7-concurrentfill.cxx
-# - tutorial-v7-ntuple-ntpl001_staff
-# - tutorial-v7-ntuple-ntpl002_vector
-# - tutorial-v7-ntuple-ntpl005_introspection
-# - tutorial-v7-ntuple-ntpl006_friends
-# - tutorial-v7-ntuple-ntpl007_mtFill
-# - tutorial-v7-simple.cxx
-excluded="${excluded}|\
-pyunittests-pyroot-import-load-libs|\
-tutorial-fit-combinedFit|\
-tutorial-fit-fit2dHist|\
-tutorial-fit-fitCircle|\
-tutorial-fit-line3Dfit|\
-tutorial-math-exampleFunction-py|\
-tutorial-multicore-mt103_fillNtupleFromMultipleThreads|\
-tutorial-multicore-mt201_parallelHistoFill|\
-tutorial-multicore-mt304_fillHistos|\
-tutorial-multicore-mtbb001_fillHistos|\
-tutorial-multicore-mtbb101_fillNtuples|\
-tutorial-multicore-mtbb201_parallelHistoFill|\
-tutorial-rcanvas|\
-tutorial-v7-concurrentfill.cxx|\
-tutorial-v7-ntuple-ntpl001_staff|\
-tutorial-v7-ntuple-ntpl002_vector|\
-tutorial-v7-ntuple-ntpl005_introspection|\
-tutorial-v7-ntuple-ntpl006_friends|\
-tutorial-v7-ntuple-ntpl007_mtFill|\
-tutorial-v7-simple.cxx"
-%endif
+test-stressgraphics|\
+tutorial-roostats-IntervalExamples-py"
 %endif
 
 %ifarch s390x
@@ -2696,19 +2538,21 @@ tutorial-v7-simple.cxx"
 excluded="${excluded}|\
 gtest-roofit-roofitcore-test-testNaNPacker"
 
-# - gtest-core-base-test-CoreBaseTests
 # - gtest-core-dictgen-test-dictgen-base
-# - gtest-core-meta-test-testTDataType
+# - gtest-tree-dataframe-test-dataframe-unified-constructor
 #
 # - gtest-tree-dataframe-test-datasource-ntuple
 # - gtest-tree-ntuple-v7-test-ntuple-basics
 # - gtest-tree-ntuple-v7-test-ntuple-bulk
+# - gtest-tree-ntuple-v7-test-ntuple-compat
 # - gtest-tree-ntuple-v7-test-ntuple-endian
 # - gtest-tree-ntuple-v7-test-ntuple-extended
 # - gtest-tree-ntuple-v7-test-ntuple-friends
+# - gtest-tree-ntuple-v7-test-ntuple-merger
 # - gtest-tree-ntuple-v7-test-ntuple-minifile
 # - gtest-tree-ntuple-v7-test-ntuple-modelext
 # - gtest-tree-ntuple-v7-test-ntuple-packing
+# - gtest-tree-ntuple-v7-test-ntuple-parallel-writer
 # - gtest-tree-ntuple-v7-test-ntuple-project
 # - gtest-tree-ntuple-v7-test-ntuple-serialize
 # - gtest-tree-ntuple-v7-test-ntuple-show
@@ -2716,6 +2560,8 @@ gtest-roofit-roofitcore-test-testNaNPacker"
 # - gtest-tree-ntuple-v7-test-ntuple-storage-daos
 # - gtest-tree-ntuple-v7-test-ntuple-types
 # - gtest-tree-ntuple-v7-test-ntuple-view
+# - gtest-tree-ntuple-v7-test-rfield-class
+# - gtest-tree-ntuple-v7-test-rfield-variant
 # - gtest-tree-ntuple-v7-test-rfield-vector
 # - gtest-tree-ntupleutil-v7-test-ntuple-importer
 # - gtest-tree-ntupleutil-v7-test-ntuple-inspector
@@ -2726,18 +2572,9 @@ gtest-roofit-roofitcore-test-testNaNPacker"
 # - pyunittests-pyroot-pyz-stl-vector
 # - tutorial-dataframe-df006_ranges-py
 # - tutorial-fit-combinedFit-py
-# - tutorial-fit-fitcont
 # - tutorial-fit-NumericalMinimization-py
 # - tutorial-math-exampleFunction-py
 # - tutorial-rcanvas-rbox-py
-# - tutorial-roofit-rf108_plotbinning-py
-# - tutorial-roofit-rf306_condpereventerrors-py
-# - tutorial-roofit-rf307_fullpereventerrors-py
-# - tutorial-roofit-rf310_sliceplot-py
-# - tutorial-roofit-rf708_bphysics-py
-# - tutorial-tmva-TMVA_CNN_Classification-py
-# - tutorial-tmva-TMVA_Higgs_Classification-py
-# - tutorial-tmva-TMVA_RNN_Classification-py
 #   https://github.com/root-project/root/issues/12429
 #
 # - tutorial-tree-drawsparse
@@ -2748,18 +2585,20 @@ gtest-roofit-roofitcore-test-testNaNPacker"
 # - test-stresshistogram
 # - test-stresshistogram-interpreted
 excluded="${excluded}|\
-gtest-core-base-test-CoreBaseTests|\
 gtest-core-dictgen-test-dictgen-base|\
-gtest-core-meta-test-testTDataType|\
+gtest-tree-dataframe-test-dataframe-unified-constructor|\
 gtest-tree-dataframe-test-datasource-ntuple|\
 gtest-tree-ntuple-v7-test-ntuple-basics|\
 gtest-tree-ntuple-v7-test-ntuple-bulk|\
+gtest-tree-ntuple-v7-test-ntuple-compat|\
 gtest-tree-ntuple-v7-test-ntuple-endian|\
 gtest-tree-ntuple-v7-test-ntuple-extended|\
 gtest-tree-ntuple-v7-test-ntuple-friends|\
+gtest-tree-ntuple-v7-test-ntuple-merger|\
 gtest-tree-ntuple-v7-test-ntuple-minifile|\
 gtest-tree-ntuple-v7-test-ntuple-modelext|\
 gtest-tree-ntuple-v7-test-ntuple-packing|\
+gtest-tree-ntuple-v7-test-ntuple-parallel-writer|\
 gtest-tree-ntuple-v7-test-ntuple-project|\
 gtest-tree-ntuple-v7-test-ntuple-serialize|\
 gtest-tree-ntuple-v7-test-ntuple-show|\
@@ -2767,6 +2606,8 @@ gtest-tree-ntuple-v7-test-ntuple-storage|\
 gtest-tree-ntuple-v7-test-ntuple-storage-daos|\
 gtest-tree-ntuple-v7-test-ntuple-types|\
 gtest-tree-ntuple-v7-test-ntuple-view|\
+gtest-tree-ntuple-v7-test-rfield-class|\
+gtest-tree-ntuple-v7-test-rfield-variant|\
 gtest-tree-ntuple-v7-test-rfield-vector|\
 gtest-tree-ntupleutil-v7-test-ntuple-importer|\
 gtest-tree-ntupleutil-v7-test-ntuple-inspector|\
@@ -2775,36 +2616,14 @@ pyunittests-pyroot-pyz-rtensor|\
 pyunittests-pyroot-pyz-stl-vector|\
 tutorial-dataframe-df006_ranges-py|\
 tutorial-fit-combinedFit-py|\
-tutorial-fit-fitcont|\
 tutorial-fit-NumericalMinimization-py|\
 tutorial-math-exampleFunction-py|\
 tutorial-rcanvas-rbox-py|\
-tutorial-roofit-rf108_plotbinning-py|\
-tutorial-roofit-rf306_condpereventerrors-py|\
-tutorial-roofit-rf307_fullpereventerrors-py|\
-tutorial-roofit-rf310_sliceplot-py|\
-tutorial-roofit-rf708_bphysics-py|\
-tutorial-tmva-TMVA_CNN_Classification-py|\
-tutorial-tmva-TMVA_Higgs_Classification-py|\
-tutorial-tmva-TMVA_RNN_Classification-py|\
 tutorial-tree-drawsparse|\
 test-stresshistofit\$\$|\
 test-stresshistofit-interpreted|\
 test-stresshistogram\$\$|\
 test-stresshistogram-interpreted"
-
-%if %{?rhel}%{!?rhel:0} == 8
-# Issues with file sizes on EPEL 8 s390x
-# - gtest-tree-readspeed-test-readspeed-general
-# - gtest-tree-tree-test-testTBranch
-# - test-stress
-# - test-stressgraphics(-interpreted)
-excluded="${excluded}|\
-gtest-tree-readspeed-test-readspeed-general|\
-gtest-tree-tree-test-testTBranch|\
-test-stress\$\$|\
-test-stressgraphics"
-%endif
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 40
@@ -2818,15 +2637,21 @@ gtest-math-matrix-test-testMatrixTSparse"
 %endif
 
 # Filter out parts of tests that require remote network access
+# RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
 GTEST_FILTER=-\
+%ifarch %{ix86}
+RNTuple.StdAtomic:\
+%endif
 %ifarch s390x
 TClingDataMemberInfo.Offset:\
 %endif
 RCsvDS.Remote:\
+RNTuple.OpenHTTP:\
 RRawFile.Remote:\
 RSqliteDS.Davix:\
+TChainParsing.DoubleSlash:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
 TFile.ReadWithoutGlobalRegistrationWeb \
@@ -2859,38 +2684,36 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     done
 fi
 
-%post notebook
+%post -n python%{python3_pkgversion}-jupyroot
 mkdir -p /etc/jupyter
 if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
-    sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
+    sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
 fi
 cat << EOF >> /etc/jupyter/jupyter_notebook_config.py
-# Extra static path for JupyROOT - start - do not remove this line
+# Extra static paths for JupyROOT - start - do not remove this line
 c.NotebookApp.extra_static_paths.append('%{_jsdir}/jsroot')
-c.NotebookApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
-# Extra static path for JupyROOT - end - do not remove this line
+# Extra static paths for JupyROOT - end - do not remove this line
 EOF
 if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
-    sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
+    sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
 fi
 cat << EOF >> /etc/jupyter/jupyter_server_config.py
-# Extra static path for JupyROOT - start - do not remove this line
+# Extra static paths for JupyROOT - start - do not remove this line
 c.ServerApp.extra_static_paths.append('%{_jsdir}/jsroot')
-c.ServerApp.extra_static_paths.append('%{_datadir}/%{name}/notebook')
-# Extra static path for JupyROOT - end - do not remove this line
+# Extra static paths for JupyROOT - end - do not remove this line
 EOF
 
-%postun notebook
+%postun -n python%{python3_pkgversion}-jupyroot
 if [ $1 -eq 0 ] ; then
     if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
-	sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
+	sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
 	if [ ! -s /etc/jupyter/jupyter_notebook_config.py ] ; then
 	    rm /etc/jupyter/jupyter_notebook_config.py
 	    rmdir /etc/jupyter 2>/dev/null || :
 	fi
     fi
     if [ -e /etc/jupyter/jupyter_server_config.py ] ; then
-	sed '/Extra static path for JupyROOT - start/','/Extra static path for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
+	sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_server_config.py
 	if [ ! -s /etc/jupyter/jupyter_server_config.py ] ; then
 	    rm /etc/jupyter/jupyter_server_config.py
 	    rmdir /etc/jupyter 2>/dev/null || :
@@ -3016,29 +2839,27 @@ fi
 %{python3_sitearch}/cppyy
 %{python3_sitearch}/cppyy_backend
 %{python3_sitearch}/ROOT
-%{python3_sitearch}/ROOT-*.egg-info
-%{python3_sitearch}/libcppyy%{python3_version_uscore}.so
-%{python3_sitearch}/libcppyy_backend%{python3_version_uscore}.so
-%{python3_sitearch}/libROOTPythonizations%{python3_version_uscore}%{python3_ext_suffix}
-%{_libdir}/%{name}/libcppyy%{python3_version_uscore}.*
-%{_libdir}/%{name}/libcppyy_backend%{python3_version_uscore}.*
+%{python3_sitearch}/ROOT-*.dist-info
+%{python3_sitearch}/libcppyy.so
+%{python3_sitearch}/libcppyy_backend.so
+%{python3_sitearch}/libROOTPythonizations%{python3_ext_suffix}
+%{_libdir}/%{name}/libcppyy.*
+%{_libdir}/%{name}/libcppyy_backend.*
 %dir %{_includedir}/%{name}/CPyCppyy
 
 %files -n python%{python3_pkgversion}-jupyroot
-%{python3_sitearch}/JupyROOT
-%{python3_sitearch}/JupyROOT-*.egg-info
-%{python3_sitearch}/libJupyROOT%{python3_version_uscore}%{python3_ext_suffix}
+%{python3_sitelib}/JupyROOT
+%{python3_sitelib}/JupyROOT-*.dist-info
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
+%{_bindir}/rootnb.exe
+%{_datadir}/%{name}/notebook
 %doc bindings/jupyroot/README.md
-
-%files -n python%{python3_pkgversion}-jsmva
-%{python3_sitelib}/JsMVA
-%{python3_sitelib}/JsMVA-*.egg-info
+%doc bindings/jupyroot/JupyROOT-on-EPEL
 
 %if %{distrdf}
 %files -n python%{python3_pkgversion}-distrdf
 %{python3_sitelib}/DistRDF
-%{python3_sitelib}/DistRDF-*.egg-info
+%{python3_sitelib}/DistRDF-*.dist-info
 %endif
 
 %files r -f includelist-bindings-r
@@ -3433,7 +3254,6 @@ fi
 %{_libdir}/%{name}/libProofDraw_rdict.pcm
 %{_libdir}/%{name}/libProofPlayer.*
 %{_libdir}/%{name}/libProofPlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C
 %{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
 %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
@@ -3554,33 +3374,30 @@ fi
 %dir %{_includedir}/%{name}/TMVA/DNN/CNN
 %dir %{_includedir}/%{name}/TMVA/DNN/RNN
 %license tmva/doc/LICENSE
+%exclude %{_includedir}/%{name}/TMVA/RBatchGenerator.hxx
+%exclude %{_includedir}/%{name}/TMVA/RBatchLoader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
+%exclude %{_includedir}/%{name}/TMVA/RChunkLoader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
 %exclude %{_includedir}/%{name}/TMVA/RReader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RSofieReader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RStandardScaler.hxx
 %exclude %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
-%exclude %{_includedir}/%{name}/TMVA/TreeInference/BranchlessTree.hxx
-%exclude %{_includedir}/%{name}/TMVA/TreeInference/Forest.hxx
-%exclude %{_includedir}/%{name}/TMVA/TreeInference/Objectives.hxx
-%exclude %{_includedir}/%{name}/TMVA/TreeInference/PythonHelpers.hxx
 
 %if %{dataframe}
 %files tmva-utils
 %{_libdir}/%{name}/libTMVAUtils.*
 %{_libdir}/%{name}/libTMVAUtils_rdict.pcm
 %dir %{_includedir}/%{name}/TMVA
-%dir %{_includedir}/%{name}/TMVA/TreeInference
+%{_includedir}/%{name}/TMVA/RBatchGenerator.hxx
+%{_includedir}/%{name}/TMVA/RBatchLoader.hxx
 %{_includedir}/%{name}/TMVA/RBDT.hxx
+%{_includedir}/%{name}/TMVA/RChunkLoader.hxx
 %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
 %{_includedir}/%{name}/TMVA/RReader.hxx
 %{_includedir}/%{name}/TMVA/RSofieReader.hxx
 %{_includedir}/%{name}/TMVA/RStandardScaler.hxx
 %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
-%{_includedir}/%{name}/TMVA/TreeInference/BranchlessTree.hxx
-%{_includedir}/%{name}/TMVA/TreeInference/Forest.hxx
-%{_includedir}/%{name}/TMVA/TreeInference/Objectives.hxx
-%{_includedir}/%{name}/TMVA/TreeInference/PythonHelpers.hxx
 %endif
 
 %files tmva-python -f includelist-tmva-pymva
@@ -3650,14 +3467,10 @@ fi
 %{_bindir}/rootslimtree
 %{_datadir}/%{name}/cli
 
-%files notebook
-%{_bindir}/rootnb.exe
-%{_datadir}/%{name}/notebook
-%doc %{_pkgdocdir}/JupyROOT-on-EPEL
-
 %files gui-webdisplay -f includelist-gui-webdisplay
 %{_libdir}/%{name}/libROOTWebDisplay.*
 %{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+%{_datadir}/%{name}/runfirefox.sh
 %{_datadir}/%{name}/ui5
 
 %ifarch %{qt5_qtwebengine_arches}
@@ -3744,6 +3557,14 @@ fi
 %endif
 
 %changelog
+* Mon Jun 03 2024 Mattias Ellert <ellert@ellert.se> - 6.32.00-1
+- Update to 6.32.00
+- Drop EPEL 8 build (now requires Python >= 3.7 ans tbb >= 2020)
+- Dropped patches: 12
+- New patches: 6
+- The JsMVA python module is now a submodule of the ROOT python module
+- The notebook package was merged with the JupyROOT package
+
 * Wed May 15 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.06-5
 - Rebuilt for libarrow.so.1601
 - Improved fontconfig support
diff --git a/sources b/sources
index 755c137..a8ec13f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.30.06.tar.xz) = 10309321a8e803f1ea2019a4d8ddde6220b052ddfa1ed7dedd432201db5917da748e944b2323794317251fd0d70048b276ad7bed6e3fcd84835de7be88b4c420
+SHA512 (root-6.32.00.tar.xz) = 4b1015684b79aa352edd42316a3a87ae48f4330a7566230349f0a5c4e3ff49cddca79b5171128300d88575dfe2503ab1357cb3bd99d2c2a78985cc9aabd742f6
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 559fe2b850daf3fb8eb9c05ba2d993284eb66d7d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 8 Jun 2024 22:04:11 +0200
Subject: [PATCH 273/344] Python 3.13 compatibility

---
 root-pyroot-add-python-3.13-attributes.patch | 62 ++++++++++++++++++++
 root.spec                                    | 18 +++++-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 root-pyroot-add-python-3.13-attributes.patch

diff --git a/root-pyroot-add-python-3.13-attributes.patch b/root-pyroot-add-python-3.13-attributes.patch
new file mode 100644
index 0000000..9ba3149
--- /dev/null
+++ b/root-pyroot-add-python-3.13-attributes.patch
@@ -0,0 +1,62 @@
+From 4d1486b95cd8c7850b12bd1777ea4463529f0b96 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 8 Jun 2024 17:08:48 +0200
+Subject: [PATCH] [pyroot] Add __firstlineno__ and __static_attributes__ to
+ blacklist
+
+For compatibility with Python 3.13
+
+See: https://docs.python.org/3.13/whatsnew/3.13.html
+
+From the above page:
+
+* Classes have a new __firstlineno__ attribute, populated by the
+  compiler, with the line number of the first line of the class
+  definition. (Contributed by Serhiy Storchaka in gh-118465.)
+
+* Classes have a new __static_attributes__ attribute, populated by the
+  compiler, with a tuple of names of attributes of this class which
+  are accessed through self.X from any function in its
+  body. (Contributed by Irit Katriel in gh-115775.)
+
+Without adding the new attributes to the blacklist there are errors:
+
+AttributeError: 'int' object attribute 'doc' is read-only
+from the __firstlineno__ attribute.
+
+AttributeError: 'tuple' object attribute 'doc' is read-only
+from the __static_attributes__ attribute.
+---
+ .../python/ROOT/_pythonization/_roofit/__init__.py              | 2 +-
+ .../pythonizations/python/ROOT/_pythonization/_tmva/__init__.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
+index 83b3b69e3b..4ebd53736d 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
+@@ -122,7 +122,7 @@ def get_defined_attributes(klass, consider_base_classes=False):
+     any of its base classes (except for `object`).
+     """
+ 
+-    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__"]
++    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__", "__firstlineno__", "__static_attributes__"]
+ 
+     if not consider_base_classes:
+         return sorted([attr for attr in klass.__dict__.keys() if attr not in blacklist])
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
+index b2dea5b541..72c210663d 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
+@@ -69,7 +69,7 @@ def get_defined_attributes(klass, consider_base_classes=False):
+     any of its base classes (except for `object`).
+     """
+ 
+-    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__"]
++    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__", "__firstlineno__", "__static_attributes__"]
+ 
+     if not consider_base_classes:
+         return sorted([attr for attr in klass.__dict__.keys() if attr not in blacklist])
+-- 
+2.45.2
+
diff --git a/root.spec b/root.spec
index c39adee..8ae9e2f 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -81,6 +81,10 @@ Patch9:		%{name}-out-of-bounds.patch
 #		Fix one more broken import in JsMVA
 #		https://github.com/root-project/root/pull/15752
 Patch10:	%{name}-fix-one-more-broken-import-in-JsMVA.patch
+#		Python 3.13 compatibility
+#		https://github.com/root-project/root/issues/15430
+#		https://github.com/root-project/root/pull/15798
+Patch11:	%{name}-pyroot-add-python-3.13-attributes.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1926,6 +1930,7 @@ This package contains utility functions for ntuples.
 %patch -P8 -p1
 %patch -P9 -p1
 %patch -P10 -p1
+%patch -P11 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2497,6 +2502,14 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
+%if %{?fedora}%{!?fedora:0} >= 41
+# - pyunittests-pyroot-pyz-ttree-setbranchaddress
+#   Segfault with Python 3.13:
+#   https://github.com/root-project/root/issues/15799
+excluded="${excluded}|\
+pyunittests-pyroot-pyz-ttree-setbranchaddress"
+%endif
+
 %if ! %{pandas}
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
@@ -3557,6 +3570,9 @@ fi
 %endif
 
 %changelog
+* Sat Jun 08 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-2
+- Python 3.13 compatibility
+
 * Mon Jun 03 2024 Mattias Ellert <ellert@ellert.se> - 6.32.00-1
 - Update to 6.32.00
 - Drop EPEL 8 build (now requires Python >= 3.7 ans tbb >= 2020)

From 48045b2bdf7e46b48746527048b2d1c25b230141 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Sun, 9 Jun 2024 02:47:16 +0200
Subject: [PATCH 274/344] Rebuilt for Python 3.13

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8ae9e2f..cd12db9 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3570,6 +3570,9 @@ fi
 %endif
 
 %changelog
+* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 6.32.00-3
+- Rebuilt for Python 3.13
+
 * Sat Jun 08 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-2
 - Python 3.13 compatibility
 

From 4946c86aeaca3ac3a3ae44d713c58afa26604fa8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 10 Jun 2024 22:42:59 +0200
Subject: [PATCH 275/344] Backport fix for failing test with Python 3.13

---
 ...-allow-any-openssl-3.x-with-civetweb.patch |  30 +++
 ...TTree-SetBranchAddress-pythonization.patch | 214 ++++++++++++++++++
 root.spec                                     |  23 +-
 3 files changed, 258 insertions(+), 9 deletions(-)
 create mode 100644 root-allow-any-openssl-3.x-with-civetweb.patch
 create mode 100644 root-python-3.13-TTree-SetBranchAddress-pythonization.patch

diff --git a/root-allow-any-openssl-3.x-with-civetweb.patch b/root-allow-any-openssl-3.x-with-civetweb.patch
new file mode 100644
index 0000000..05e2a64
--- /dev/null
+++ b/root-allow-any-openssl-3.x-with-civetweb.patch
@@ -0,0 +1,30 @@
+From 6952dd5ca51e7be8a8ae74b446ac268949f5f383 Mon Sep 17 00:00:00 2001
+From: Sergey Linev <S.Linev@gsi.de>
+Date: Mon, 10 Jun 2024 09:19:47 +0200
+Subject: [PATCH] [http] Allow to use any of openssl 3.x with civetweb
+
+civetweb was designed when only openssl 3.0 was existing.
+Therefore name of define is `OPENSSL_API_3_0`
+Meanwhile there is openssl 3.1 and 3.2.
+While seems to be there is no changes in API both can
+be used with civetweb.
+---
+ net/http/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt
+index 02d7514400..6ef98a604b 100644
+--- a/net/http/CMakeLists.txt
++++ b/net/http/CMakeLists.txt
+@@ -78,7 +78,7 @@ if(ssl)
+     MESSAGE(STATUS "Use SSL API VERSION 1.1 for civetweb")
+     target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_1_1)
+     set(link_ssl ON)
+-  elseif((${ssl_major} EQUAL "3") AND ((${ssl_minor} EQUAL "0") OR (${ssl_minor} EQUAL "1")))
++  elseif(${ssl_major} EQUAL "3")
+     MESSAGE(STATUS "Use SSL API VERSION 3.${ssl_minor} for civetweb")
+     target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_3_0)
+     set(link_ssl ON)
+-- 
+2.45.2
+
diff --git a/root-python-3.13-TTree-SetBranchAddress-pythonization.patch b/root-python-3.13-TTree-SetBranchAddress-pythonization.patch
new file mode 100644
index 0000000..f891893
--- /dev/null
+++ b/root-python-3.13-TTree-SetBranchAddress-pythonization.patch
@@ -0,0 +1,214 @@
+From 0cc7d61c6f732e701ef6ed263344105b01ef9613 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Mon, 10 Jun 2024 12:32:42 +0200
+Subject: [PATCH] [PyROOT] Implement TTree SetBranchAddress pythonization in
+ Python
+
+The pythonization of `TTree::SetBranchAddress` was implemented in C++,
+hacking into CPyCppy by using implementation details like data member
+caches (this call: `((CPPInstance *)address)GetDatamemberCache()`). Not
+too surprising that it apparently breaks with the upcoming Python 3.13.
+
+It's better to implement the pythonizations in Python and also manage
+the lifetime of the necessary data in Python. This is done in this
+commit.
+
+The pythonization is extensively tested in `ttree_setbranchaddress.py`.
+
+Possible closes #15799.
+---
+ .../python/ROOT/_pythonization/_ttree.py      | 67 ++++++++++++++++---
+ .../pythonizations/src/PyROOTModule.cxx       |  2 -
+ .../pythonizations/src/PyROOTPythonize.h      |  1 -
+ .../pyroot/pythonizations/src/TTreePyz.cxx    | 63 -----------------
+ 4 files changed, 59 insertions(+), 74 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
+index 2781189e45..18840bb43e 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
+@@ -130,7 +130,7 @@ ds.SetBranchAddress('structb', ms)
+ */
+ '''
+ 
+-from libROOTPythonizations import GetBranchAttr, SetBranchAddressPyz, BranchPyz
++from libROOTPythonizations import GetBranchAttr, BranchPyz
+ from . import pythonization
+ 
+ # TTree iterator
+@@ -145,15 +145,66 @@ def _TTree__iter__(self):
+     if bytes_read == -1:
+         raise RuntimeError("TTree I/O error")
+ 
+-def _SetBranchAddress(self, *args):
+-    # Modify the behaviour if args is (const char*, void*)
+-    res = SetBranchAddressPyz(self, *args)
++def _pythonize_branch_addr(branch, addr_orig):
++    """Helper for the SetBranchAddress pythonization, extracting the relevant
++    address from a Python object if possible.
++    """
++    import cppyy
++    import ctypes
+ 
+-    if res is None:
+-        # Fall back to the original implementation for the rest of overloads
+-        res = self._OriginalSetBranchAddress(*args)
++    # Pythonization for cppyy proxies (of type CPPInstance)
++    if isinstance(addr_orig, cppyy._backend.CPPInstance):
+ 
+-    return res
++        is_leaf_list = branch.IsA() is cppyy.gbl.TBranch.Class()
++
++        if is_leaf_list:
++            # If the branch is a leaf list, SetBranchAddress expects the
++            # address of the object that has the corresponding data members.
++            return ctypes.c_void_p(cppyy.addressof(instance=addr_orig, byref=False))
++
++        # Otherwise, SetBranchAddress is expecting a pointer to the address of
++        # the object, and the pointer needs to stay alive. Therefore, we create
++        # a container for the pointer and cache it in the original cppyy proxy.
++        addr_view = cppyy.gbl.array["std::intptr_t", 1]([cppyy.addressof(instance=addr_orig, byref=False)])
++
++        if not hasattr(addr_orig, "_set_branch_cached_pointers"):
++            addr_orig._set_branch_cached_pointers = []
++        addr_orig._set_branch_cached_pointers.append(addr_view)
++
++        # Finally, we have to return the address of the container
++        return ctypes.c_void_p(cppyy.addressof(instance=addr_view, byref=False))
++
++    # For NumPy arrays
++    if hasattr(addr_orig, "__array_interface__"):
++        return ctypes.c_void_p(addr_orig.__array_interface__["data"][0])
++
++    # For the builtin array library
++    if hasattr(addr_orig, "buffer_info"):
++        return ctypes.c_void_p(addr_orig.buffer_info()[0])
++
++    # We don't know how to pythonize the address parameter. return the
++    # original value one.
++    return addr_orig
++
++def _SetBranchAddress(self, bname, addr, *args, **kwargs):
++    """
++    Pythonization for TTree::SetBranchAddress.
++
++    Modify the behaviour of SetBranchAddress so that proxy references can be passed
++    as arguments from the Python side, more precisely in cases where the C++
++    implementation of the method expects the address of a pointer.
++
++    For example:
++    ```
++    v = ROOT.std.vector('int')()
++    t.SetBranchAddress("my_vector_branch", v)
++    ```
++    """
++
++    branch = self.GetBranch(bname)
++    addr = _pythonize_branch_addr(branch, addr)
++
++    return self._OriginalSetBranchAddress(bname, addr, *args, **kwargs)
+ 
+ def _Branch(self, *args):
+     # Modify the behaviour if args is one of:
+diff --git a/bindings/pyroot/pythonizations/src/PyROOTModule.cxx b/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
+index e943e0ad4b..b74bae358e 100644
+--- a/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
++++ b/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
+@@ -48,8 +48,6 @@ static PyMethodDef gPyROOTMethods[] = {
+     (char *)"Cast the void* returned by TClass::DynamicCast to the right type"},
+    {(char *)"AddTObjectEqNePyz", (PyCFunction)PyROOT::AddTObjectEqNePyz, METH_VARARGS,
+     (char *)"Add equality and inequality comparison operators to TObject"},
+-   {(char *)"SetBranchAddressPyz", (PyCFunction)PyROOT::SetBranchAddressPyz, METH_VARARGS,
+-    (char *)"Fully enable the use of TTree::SetBranchAddress from Python"},
+    {(char *)"BranchPyz", (PyCFunction)PyROOT::BranchPyz, METH_VARARGS,
+     (char *)"Fully enable the use of TTree::Branch from Python"},
+    {(char *)"AddPrettyPrintingPyz", (PyCFunction)PyROOT::AddPrettyPrintingPyz, METH_VARARGS,
+diff --git a/bindings/pyroot/pythonizations/src/PyROOTPythonize.h b/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
+index 9f2d4506b6..684f256596 100644
+--- a/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
++++ b/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
+@@ -22,7 +22,6 @@ PyObject *AddPrettyPrintingPyz(PyObject *self, PyObject *args);
+ 
+ PyObject *GetBranchAttr(PyObject *self, PyObject *args);
+ PyObject *BranchPyz(PyObject *self, PyObject *args);
+-PyObject *SetBranchAddressPyz(PyObject *self, PyObject *args);
+ 
+ PyObject *AddTClassDynamicCastPyz(PyObject *self, PyObject *args);
+ 
+diff --git a/bindings/pyroot/pythonizations/src/TTreePyz.cxx b/bindings/pyroot/pythonizations/src/TTreePyz.cxx
+index d6763fdb25..f06811c43c 100644
+--- a/bindings/pyroot/pythonizations/src/TTreePyz.cxx
++++ b/bindings/pyroot/pythonizations/src/TTreePyz.cxx
+@@ -201,69 +201,6 @@ PyObject *PyROOT::GetBranchAttr(PyObject * /*self*/, PyObject *args)
+    return 0;
+ }
+ 
+-////////////////////////////////////////////////////////////////////////////
+-/// \brief Add pythonization for TTree::SetBranchAddress.
+-/// \param[in] self Always null, since this is a module function.
+-/// \param[in] args Pointer to a Python tuple object containing the arguments
+-/// received from Python.
+-///
+-/// Modify the behaviour of SetBranchAddress so that proxy references can be passed
+-/// as arguments from the Python side, more precisely in cases where the C++
+-/// implementation of the method expects the address of a pointer.
+-///
+-/// For example:
+-/// ~~~{.py}
+-/// v = ROOT.std.vector('int')()
+-/// t.SetBranchAddress("my_vector_branch", v)
+-/// ~~~
+-PyObject *PyROOT::SetBranchAddressPyz(PyObject * /* self */, PyObject *args)
+-{
+-   PyObject *treeObj = nullptr, *name = nullptr, *address = nullptr;
+-
+-   int argc = PyTuple_GET_SIZE(args);
+-
+-   // Look for the (const char*, void*) overload
+-   auto argParseStr = "OUO:SetBranchAddress";
+-   if (argc == 3 && PyArg_ParseTuple(args, argParseStr, &treeObj, &name, &address)) {
+-
+-      auto tree = (TTree *)GetTClass(treeObj)->DynamicCast(TTree::Class(), CPyCppyy::Instance_AsVoidPtr(treeObj));
+-
+-      if (!tree) {
+-         PyErr_SetString(PyExc_TypeError,
+-                         "TTree::SetBranchAddress must be called with a TTree instance as first argument");
+-         return nullptr;
+-      }
+-
+-      auto branchName = PyUnicode_AsUTF8(name);
+-      auto branch = tree->GetBranch(branchName);
+-      if (!branch) {
+-         PyErr_SetString(PyExc_TypeError, "TTree::SetBranchAddress must be called with a valid branch name");
+-         return nullptr;
+-      }
+-
+-      bool isLeafList = branch->IsA() == TBranch::Class();
+-
+-      void *buf = 0;
+-      if (CPyCppyy::Instance_Check(address)) {
+-         ((CPPInstance *)address)->GetDatamemberCache(); // force creation of cache
+-
+-         if (((CPPInstance *)address)->fFlags & CPPInstance::kIsReference || isLeafList)
+-            buf = CPyCppyy::Instance_AsVoidPtr(address);
+-         else
+-            buf = (void *)&(((CPPInstance *)address)->GetObjectRaw());
+-      } else
+-         Utility::GetBuffer(address, '*', 1, buf, false);
+-
+-      if (buf != nullptr) {
+-         auto res = tree->SetBranchAddress(PyUnicode_AsUTF8(name), buf);
+-         return PyInt_FromLong(res);
+-      }
+-   }
+-
+-   // Not the overload we wanted to pythonize, return None
+-   Py_RETURN_NONE;
+-}
+-
+ ////////////////////////////////////////////////////////////////////////////
+ /// Try to match the arguments of TTree::Branch to the following overload:
+ /// - ( const char*, void*, const char*, Int_t = 32000 )
+-- 
+2.45.2
+
diff --git a/root.spec b/root.spec
index cd12db9..a2adb6c 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -85,6 +85,14 @@ Patch10:	%{name}-fix-one-more-broken-import-in-JsMVA.patch
 #		https://github.com/root-project/root/issues/15430
 #		https://github.com/root-project/root/pull/15798
 Patch11:	%{name}-pyroot-add-python-3.13-attributes.patch
+#		Implement TTree SetBranchAddress pythonization in Python
+#		Backport fix for failing test with Python 3.13
+#		pyunittests-pyroot-pyz-ttree-setbranchaddress
+#		https://github.com/root-project/root/issues/15799
+#		https://github.com/root-project/root/pull/15807
+Patch12:	%{name}-python-3.13-TTree-SetBranchAddress-pythonization.patch
+#		Backport build fix from upstream
+Patch13:	%{name}-allow-any-openssl-3.x-with-civetweb.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1931,6 +1939,8 @@ This package contains utility functions for ntuples.
 %patch -P9 -p1
 %patch -P10 -p1
 %patch -P11 -p1
+%patch -P12 -p1
+%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2502,14 +2512,6 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
-%if %{?fedora}%{!?fedora:0} >= 41
-# - pyunittests-pyroot-pyz-ttree-setbranchaddress
-#   Segfault with Python 3.13:
-#   https://github.com/root-project/root/issues/15799
-excluded="${excluded}|\
-pyunittests-pyroot-pyz-ttree-setbranchaddress"
-%endif
-
 %if ! %{pandas}
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
@@ -3570,6 +3572,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 10 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-4
+- Backport fix for failing test with Python 3.13
+
 * Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 6.32.00-3
 - Rebuilt for Python 3.13
 

From ea27f7093bee4e9b47ff5449eb5433f89593d0e8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 18 Jun 2024 04:22:08 +0200
Subject: [PATCH 276/344] Add dependency on liburing-devel to root-io

Exclude failing tutorial-tmva-RBatchGenerator_filters_vectors-py test
  on aarch64 (Fedora 40+)
---
 root.spec | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/root.spec b/root.spec
index a2adb6c..eb906de 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -413,7 +413,7 @@ Requires:	%{name}-core = %{version}-%{release}
 #		notebook package was merged with JupyROOT package
 Provides:	%{name}-notebook = %{version}-%{release}
 Obsoletes:	%{name}-notebook < 6.32.00
-Requires:	js-jsroot >= 7.5
+Requires:	js-jsroot >= 7.7
 %if %{?fedora}%{!?fedora:0}
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -838,6 +838,9 @@ from marked up sources.
 %package io
 Summary:	Input/output of ROOT objects
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+%if %{?fedora}%{!?fedora:0}
+Requires:	liburing-devel
+%endif
 
 %description io
 This package provides I/O routines for ROOT objects.
@@ -1140,7 +1143,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7.5
+Requires:	js-jsroot >= 7.7
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -2536,6 +2539,15 @@ gtest-tree-dataframe-test-dataframe-concurrency|\
 gtest-tree-dataframe-test-dataframe-simple"
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 40
+# - tutorial-tmva-RBatchGenerator_filters_vectors-py
+#   *** Break *** segmentation violation
+%ifarch aarch64
+excluded="${excluded}|\
+tutorial-tmva-RBatchGenerator_filters_vectors-py"
+%endif
+%endif
+
 %ifarch %{power64}
 # - test-stressgraphics(-interpreted)
 #   *** stack smashing detected ***: terminated
@@ -3572,6 +3584,11 @@ fi
 %endif
 
 %changelog
+* Mon Jun 17 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-5
+- Add dependency on liburing-devel to root-io
+- Exclude failing tutorial-tmva-RBatchGenerator_filters_vectors-py test
+  on aarch64 (Fedora 40+)
+
 * Mon Jun 10 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-4
 - Backport fix for failing test with Python 3.13
 
@@ -3583,7 +3600,7 @@ fi
 
 * Mon Jun 03 2024 Mattias Ellert <ellert@ellert.se> - 6.32.00-1
 - Update to 6.32.00
-- Drop EPEL 8 build (now requires Python >= 3.7 ans tbb >= 2020)
+- Drop EPEL 8 build (now requires Python >= 3.7 and tbb >= 2020)
 - Dropped patches: 12
 - New patches: 6
 - The JsMVA python module is now a submodule of the ROOT python module

From c1e2a7a6b3ee9893404417a2c17fe1b1b5f239e7 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 18 Jun 2024 17:15:43 +0200
Subject: [PATCH 277/344] Update to 6.32.02

Drop paches accepted upstream
---
 root-failure-on-ppc64le-and-s390x.patch       |  35 ---
 ...-fix-one-more-broken-import-in-JsMVA.patch |  25 --
 root-format-warnings-32-bit.patch             |  73 ------
 root-out-of-bounds.patch                      |  26 ---
 root-pyroot-add-python-3.13-attributes.patch  |  62 -----
 ...TTree-SetBranchAddress-pythonization.patch | 214 ------------------
 root.spec                                     |  46 +---
 sources                                       |   2 +-
 8 files changed, 11 insertions(+), 472 deletions(-)
 delete mode 100644 root-failure-on-ppc64le-and-s390x.patch
 delete mode 100644 root-fix-one-more-broken-import-in-JsMVA.patch
 delete mode 100644 root-format-warnings-32-bit.patch
 delete mode 100644 root-out-of-bounds.patch
 delete mode 100644 root-pyroot-add-python-3.13-attributes.patch
 delete mode 100644 root-python-3.13-TTree-SetBranchAddress-pythonization.patch

diff --git a/root-failure-on-ppc64le-and-s390x.patch b/root-failure-on-ppc64le-and-s390x.patch
deleted file mode 100644
index 787eab5..0000000
--- a/root-failure-on-ppc64le-and-s390x.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d3b5ef223500c69efadb9b8c4735247d9ba5c5ea Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 2 Jun 2024 07:03:42 +0200
-Subject: [PATCH] Fix test failure on ppc64le and s390x
-
----
- hist/hist/test/test_tprofile2poly.cxx | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/hist/hist/test/test_tprofile2poly.cxx b/hist/hist/test/test_tprofile2poly.cxx
-index 26b9801593..1dfa93259c 100644
---- a/hist/hist/test/test_tprofile2poly.cxx
-+++ b/hist/hist/test/test_tprofile2poly.cxx
-@@ -25,10 +25,16 @@ void FillForTest(TProfile2D* tp2d, TProfile2Poly* tpp, TRandom& ran) {
- }
- 
- void globalStatsCompare(TProfile2D* tp2d, TProfile2Poly* tpp) {
-+   const double relTol = 1e-12;
-+   double cont1, cont2;
-    for(Int_t c=1; c<=3; ++c) {
-       ASSERT_DOUBLE_EQ(tp2d->GetMean(c), tpp->GetMean(c));
--      ASSERT_DOUBLE_EQ(tp2d->GetMeanError(c), tpp->GetMeanError(c));
--      ASSERT_DOUBLE_EQ(tp2d->GetStdDev(c), tpp->GetStdDev(c));
-+      cont1 = tp2d->GetMeanError(c);
-+      cont2 = tpp->GetMeanError(c);
-+      ASSERT_NEAR(cont1, cont2, relTol * cont2);
-+      cont1 = tp2d->GetStdDev(c);
-+      cont2 = tpp->GetStdDev(c);
-+      ASSERT_NEAR(cont1, cont2, relTol * cont2);
-    }
- }
- 
--- 
-2.45.1
-
diff --git a/root-fix-one-more-broken-import-in-JsMVA.patch b/root-fix-one-more-broken-import-in-JsMVA.patch
deleted file mode 100644
index 0393bdc..0000000
--- a/root-fix-one-more-broken-import-in-JsMVA.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de85dbd3344709d1c5ca87e93c87cdbce147ce5b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 5 Jun 2024 08:49:14 +0200
-Subject: [PATCH] Fix one more broken import in JsMVA
-
----
- bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py b/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
-index 57358765e4..7f56cd6dd5 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py
-@@ -23,7 +23,7 @@ class JsMVAMagic(Magics):
-     @magic_arguments()
-     @argument("arg", nargs="?", default="on", help="Enable/Disable JavaScript visualisation for TMVA")
-     def jsmva(self, line):
--        from JsMVA.JPyInterface import functions
-+        from .JPyInterface import functions
- 
-         args = parse_argstring(self.jsmva, line)
-         if args.arg == "on":
--- 
-2.45.1
-
diff --git a/root-format-warnings-32-bit.patch b/root-format-warnings-32-bit.patch
deleted file mode 100644
index 3583398..0000000
--- a/root-format-warnings-32-bit.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8592c5e065b8cf46480f5a1efe0363fcf2150551 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 4 Jun 2024 08:47:04 +0200
-Subject: [PATCH] Correct format - warnings seen on 32 bit architectures
-
----
- core/clib/src/mmapsup.c           | 2 +-
- roofit/xroofit/src/xRooNode.cxx   | 2 +-
- tree/dataframe/src/RDFDisplay.cxx | 4 ++--
- tree/dataframe/src/RDFHelpers.cxx | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/clib/src/mmapsup.c b/core/clib/src/mmapsup.c
-index 81f68a2059..da46dc7ba5 100644
---- a/core/clib/src/mmapsup.c
-+++ b/core/clib/src/mmapsup.c
-@@ -174,7 +174,7 @@ PTR __mmalloc_mmap_morecore(struct mdesc *mdp, int size)
-             if (mdp -> top != PAGE_ALIGN(mdp -> top)) {
-               fprintf(stderr,
-                       "mmap_morecore error: base memory location (%p) is not aligned with %zu as required.\n",
--                      mdp -> top, (long)pagesize);
-+                      mdp -> top, pagesize);
-               return result;
-             }
-             mapto = mmap (mdp -> top, mapbytes, PROT_READ | PROT_WRITE,
-diff --git a/roofit/xroofit/src/xRooNode.cxx b/roofit/xroofit/src/xRooNode.cxx
-index f8c96fbf62..852e6997c0 100644
---- a/roofit/xroofit/src/xRooNode.cxx
-+++ b/roofit/xroofit/src/xRooNode.cxx
-@@ -11075,7 +11075,7 @@ std::string cling::printValue(const xRooNode *v)
-             out += "{";
-          out += n->GetName();
-          if (out.length() > 100 && left > 0) {
--            out += TString::Format(",... and %lu more", left);
-+            out += TString::Format(",... and %zu more", left);
-             break;
-          }
-       }
-diff --git a/tree/dataframe/src/RDFDisplay.cxx b/tree/dataframe/src/RDFDisplay.cxx
-index 9dc555fc1d..2ef7de7ddc 100644
---- a/tree/dataframe/src/RDFDisplay.cxx
-+++ b/tree/dataframe/src/RDFDisplay.cxx
-@@ -232,12 +232,12 @@ void RDisplay::Print() const
-                // Thus, the first column is only the Row column and the actual first column is printed
-          columnsToPrint = 2;
-       }
--      Info("Print", "Only showing %lu columns out of %lu\n", columnsToPrint, fNColumns);
-+      Info("Print", "Only showing %zu columns out of %zu\n", columnsToPrint, fNColumns);
-       allColumnsFit = false;
-    }
- 
-    if (fNMaxCollectionElements < 1)
--      Info("Print", "No collections shown since fNMaxCollectionElements is %lu\n", fNMaxCollectionElements);
-+      Info("Print", "No collections shown since fNMaxCollectionElements is %zu\n", fNMaxCollectionElements);
- 
-    auto nrRows = fTable.size();
-    std::cout << DashesBetweenLines(columnsToPrint, allColumnsFit); // Print dashes in the top of the table
-diff --git a/tree/dataframe/src/RDFHelpers.cxx b/tree/dataframe/src/RDFHelpers.cxx
-index 4891454cc0..3490901b5d 100644
---- a/tree/dataframe/src/RDFHelpers.cxx
-+++ b/tree/dataframe/src/RDFHelpers.cxx
-@@ -74,7 +74,7 @@ unsigned int ROOT::RDF::RunGraphs(std::vector<RResultHandle> handles)
-    const unsigned int nToRun =
-       std::count_if(handles.begin(), handles.end(), [](const auto &h) { return !h.IsReady(); });
-    if (nToRun < handles.size()) {
--      Warning("RunGraphs", "Got %lu handles from which %lu link to results which are already ready.", handles.size(),
-+      Warning("RunGraphs", "Got %zu handles from which %zu link to results which are already ready.", handles.size(),
-               handles.size() - nToRun);
-    }
-    if (nToRun == 0u)
--- 
-2.45.1
-
diff --git a/root-out-of-bounds.patch b/root-out-of-bounds.patch
deleted file mode 100644
index fbae2ea..0000000
--- a/root-out-of-bounds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 069359fe9e6c36a4287a64d3356246d516409149 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Tue, 4 Jun 2024 12:53:53 +0200
-Subject: [PATCH] [RF] Set size of offsets vector in LikelihoodJob correctly
-
-When `std::copy`ing into a vector, it needs to have the right size
-before. Doing only `std::reserve` is not enough.
-
-Fixes #15730.
----
- roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx b/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
-index 85c3d02c02ccf..42d191833d14c 100644
---- a/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
-+++ b/roofit/roofitcore/src/TestStatistics/LikelihoodJob.cxx
-@@ -93,7 +93,7 @@ void LikelihoodJob::update_state()
-             assert(!more);
-             auto offsets_message_begin = offsets_message.data<ROOT::Math::KahanSum<double>>();
-             std::size_t N_offsets = offsets_message.size() / sizeof(ROOT::Math::KahanSum<double>);
--            shared_offset_.offsets().reserve(N_offsets);
-+            shared_offset_.offsets().resize(N_offsets);
-             auto offsets_message_end = offsets_message_begin + N_offsets;
-             std::copy(offsets_message_begin, offsets_message_end, shared_offset_.offsets().begin());
-          }
diff --git a/root-pyroot-add-python-3.13-attributes.patch b/root-pyroot-add-python-3.13-attributes.patch
deleted file mode 100644
index 9ba3149..0000000
--- a/root-pyroot-add-python-3.13-attributes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4d1486b95cd8c7850b12bd1777ea4463529f0b96 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 8 Jun 2024 17:08:48 +0200
-Subject: [PATCH] [pyroot] Add __firstlineno__ and __static_attributes__ to
- blacklist
-
-For compatibility with Python 3.13
-
-See: https://docs.python.org/3.13/whatsnew/3.13.html
-
-From the above page:
-
-* Classes have a new __firstlineno__ attribute, populated by the
-  compiler, with the line number of the first line of the class
-  definition. (Contributed by Serhiy Storchaka in gh-118465.)
-
-* Classes have a new __static_attributes__ attribute, populated by the
-  compiler, with a tuple of names of attributes of this class which
-  are accessed through self.X from any function in its
-  body. (Contributed by Irit Katriel in gh-115775.)
-
-Without adding the new attributes to the blacklist there are errors:
-
-AttributeError: 'int' object attribute 'doc' is read-only
-from the __firstlineno__ attribute.
-
-AttributeError: 'tuple' object attribute 'doc' is read-only
-from the __static_attributes__ attribute.
----
- .../python/ROOT/_pythonization/_roofit/__init__.py              | 2 +-
- .../pythonizations/python/ROOT/_pythonization/_tmva/__init__.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
-index 83b3b69e3b..4ebd53736d 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/__init__.py
-@@ -122,7 +122,7 @@ def get_defined_attributes(klass, consider_base_classes=False):
-     any of its base classes (except for `object`).
-     """
- 
--    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__"]
-+    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__", "__firstlineno__", "__static_attributes__"]
- 
-     if not consider_base_classes:
-         return sorted([attr for attr in klass.__dict__.keys() if attr not in blacklist])
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
-index b2dea5b541..72c210663d 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_tmva/__init__.py
-@@ -69,7 +69,7 @@ def get_defined_attributes(klass, consider_base_classes=False):
-     any of its base classes (except for `object`).
-     """
- 
--    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__"]
-+    blacklist = ["__dict__", "__doc__", "__hash__", "__module__", "__weakref__", "__firstlineno__", "__static_attributes__"]
- 
-     if not consider_base_classes:
-         return sorted([attr for attr in klass.__dict__.keys() if attr not in blacklist])
--- 
-2.45.2
-
diff --git a/root-python-3.13-TTree-SetBranchAddress-pythonization.patch b/root-python-3.13-TTree-SetBranchAddress-pythonization.patch
deleted file mode 100644
index f891893..0000000
--- a/root-python-3.13-TTree-SetBranchAddress-pythonization.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 0cc7d61c6f732e701ef6ed263344105b01ef9613 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Mon, 10 Jun 2024 12:32:42 +0200
-Subject: [PATCH] [PyROOT] Implement TTree SetBranchAddress pythonization in
- Python
-
-The pythonization of `TTree::SetBranchAddress` was implemented in C++,
-hacking into CPyCppy by using implementation details like data member
-caches (this call: `((CPPInstance *)address)GetDatamemberCache()`). Not
-too surprising that it apparently breaks with the upcoming Python 3.13.
-
-It's better to implement the pythonizations in Python and also manage
-the lifetime of the necessary data in Python. This is done in this
-commit.
-
-The pythonization is extensively tested in `ttree_setbranchaddress.py`.
-
-Possible closes #15799.
----
- .../python/ROOT/_pythonization/_ttree.py      | 67 ++++++++++++++++---
- .../pythonizations/src/PyROOTModule.cxx       |  2 -
- .../pythonizations/src/PyROOTPythonize.h      |  1 -
- .../pyroot/pythonizations/src/TTreePyz.cxx    | 63 -----------------
- 4 files changed, 59 insertions(+), 74 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
-index 2781189e45..18840bb43e 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
-@@ -130,7 +130,7 @@ ds.SetBranchAddress('structb', ms)
- */
- '''
- 
--from libROOTPythonizations import GetBranchAttr, SetBranchAddressPyz, BranchPyz
-+from libROOTPythonizations import GetBranchAttr, BranchPyz
- from . import pythonization
- 
- # TTree iterator
-@@ -145,15 +145,66 @@ def _TTree__iter__(self):
-     if bytes_read == -1:
-         raise RuntimeError("TTree I/O error")
- 
--def _SetBranchAddress(self, *args):
--    # Modify the behaviour if args is (const char*, void*)
--    res = SetBranchAddressPyz(self, *args)
-+def _pythonize_branch_addr(branch, addr_orig):
-+    """Helper for the SetBranchAddress pythonization, extracting the relevant
-+    address from a Python object if possible.
-+    """
-+    import cppyy
-+    import ctypes
- 
--    if res is None:
--        # Fall back to the original implementation for the rest of overloads
--        res = self._OriginalSetBranchAddress(*args)
-+    # Pythonization for cppyy proxies (of type CPPInstance)
-+    if isinstance(addr_orig, cppyy._backend.CPPInstance):
- 
--    return res
-+        is_leaf_list = branch.IsA() is cppyy.gbl.TBranch.Class()
-+
-+        if is_leaf_list:
-+            # If the branch is a leaf list, SetBranchAddress expects the
-+            # address of the object that has the corresponding data members.
-+            return ctypes.c_void_p(cppyy.addressof(instance=addr_orig, byref=False))
-+
-+        # Otherwise, SetBranchAddress is expecting a pointer to the address of
-+        # the object, and the pointer needs to stay alive. Therefore, we create
-+        # a container for the pointer and cache it in the original cppyy proxy.
-+        addr_view = cppyy.gbl.array["std::intptr_t", 1]([cppyy.addressof(instance=addr_orig, byref=False)])
-+
-+        if not hasattr(addr_orig, "_set_branch_cached_pointers"):
-+            addr_orig._set_branch_cached_pointers = []
-+        addr_orig._set_branch_cached_pointers.append(addr_view)
-+
-+        # Finally, we have to return the address of the container
-+        return ctypes.c_void_p(cppyy.addressof(instance=addr_view, byref=False))
-+
-+    # For NumPy arrays
-+    if hasattr(addr_orig, "__array_interface__"):
-+        return ctypes.c_void_p(addr_orig.__array_interface__["data"][0])
-+
-+    # For the builtin array library
-+    if hasattr(addr_orig, "buffer_info"):
-+        return ctypes.c_void_p(addr_orig.buffer_info()[0])
-+
-+    # We don't know how to pythonize the address parameter. return the
-+    # original value one.
-+    return addr_orig
-+
-+def _SetBranchAddress(self, bname, addr, *args, **kwargs):
-+    """
-+    Pythonization for TTree::SetBranchAddress.
-+
-+    Modify the behaviour of SetBranchAddress so that proxy references can be passed
-+    as arguments from the Python side, more precisely in cases where the C++
-+    implementation of the method expects the address of a pointer.
-+
-+    For example:
-+    ```
-+    v = ROOT.std.vector('int')()
-+    t.SetBranchAddress("my_vector_branch", v)
-+    ```
-+    """
-+
-+    branch = self.GetBranch(bname)
-+    addr = _pythonize_branch_addr(branch, addr)
-+
-+    return self._OriginalSetBranchAddress(bname, addr, *args, **kwargs)
- 
- def _Branch(self, *args):
-     # Modify the behaviour if args is one of:
-diff --git a/bindings/pyroot/pythonizations/src/PyROOTModule.cxx b/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
-index e943e0ad4b..b74bae358e 100644
---- a/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
-+++ b/bindings/pyroot/pythonizations/src/PyROOTModule.cxx
-@@ -48,8 +48,6 @@ static PyMethodDef gPyROOTMethods[] = {
-     (char *)"Cast the void* returned by TClass::DynamicCast to the right type"},
-    {(char *)"AddTObjectEqNePyz", (PyCFunction)PyROOT::AddTObjectEqNePyz, METH_VARARGS,
-     (char *)"Add equality and inequality comparison operators to TObject"},
--   {(char *)"SetBranchAddressPyz", (PyCFunction)PyROOT::SetBranchAddressPyz, METH_VARARGS,
--    (char *)"Fully enable the use of TTree::SetBranchAddress from Python"},
-    {(char *)"BranchPyz", (PyCFunction)PyROOT::BranchPyz, METH_VARARGS,
-     (char *)"Fully enable the use of TTree::Branch from Python"},
-    {(char *)"AddPrettyPrintingPyz", (PyCFunction)PyROOT::AddPrettyPrintingPyz, METH_VARARGS,
-diff --git a/bindings/pyroot/pythonizations/src/PyROOTPythonize.h b/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
-index 9f2d4506b6..684f256596 100644
---- a/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
-+++ b/bindings/pyroot/pythonizations/src/PyROOTPythonize.h
-@@ -22,7 +22,6 @@ PyObject *AddPrettyPrintingPyz(PyObject *self, PyObject *args);
- 
- PyObject *GetBranchAttr(PyObject *self, PyObject *args);
- PyObject *BranchPyz(PyObject *self, PyObject *args);
--PyObject *SetBranchAddressPyz(PyObject *self, PyObject *args);
- 
- PyObject *AddTClassDynamicCastPyz(PyObject *self, PyObject *args);
- 
-diff --git a/bindings/pyroot/pythonizations/src/TTreePyz.cxx b/bindings/pyroot/pythonizations/src/TTreePyz.cxx
-index d6763fdb25..f06811c43c 100644
---- a/bindings/pyroot/pythonizations/src/TTreePyz.cxx
-+++ b/bindings/pyroot/pythonizations/src/TTreePyz.cxx
-@@ -201,69 +201,6 @@ PyObject *PyROOT::GetBranchAttr(PyObject * /*self*/, PyObject *args)
-    return 0;
- }
- 
--////////////////////////////////////////////////////////////////////////////
--/// \brief Add pythonization for TTree::SetBranchAddress.
--/// \param[in] self Always null, since this is a module function.
--/// \param[in] args Pointer to a Python tuple object containing the arguments
--/// received from Python.
--///
--/// Modify the behaviour of SetBranchAddress so that proxy references can be passed
--/// as arguments from the Python side, more precisely in cases where the C++
--/// implementation of the method expects the address of a pointer.
--///
--/// For example:
--/// ~~~{.py}
--/// v = ROOT.std.vector('int')()
--/// t.SetBranchAddress("my_vector_branch", v)
--/// ~~~
--PyObject *PyROOT::SetBranchAddressPyz(PyObject * /* self */, PyObject *args)
--{
--   PyObject *treeObj = nullptr, *name = nullptr, *address = nullptr;
--
--   int argc = PyTuple_GET_SIZE(args);
--
--   // Look for the (const char*, void*) overload
--   auto argParseStr = "OUO:SetBranchAddress";
--   if (argc == 3 && PyArg_ParseTuple(args, argParseStr, &treeObj, &name, &address)) {
--
--      auto tree = (TTree *)GetTClass(treeObj)->DynamicCast(TTree::Class(), CPyCppyy::Instance_AsVoidPtr(treeObj));
--
--      if (!tree) {
--         PyErr_SetString(PyExc_TypeError,
--                         "TTree::SetBranchAddress must be called with a TTree instance as first argument");
--         return nullptr;
--      }
--
--      auto branchName = PyUnicode_AsUTF8(name);
--      auto branch = tree->GetBranch(branchName);
--      if (!branch) {
--         PyErr_SetString(PyExc_TypeError, "TTree::SetBranchAddress must be called with a valid branch name");
--         return nullptr;
--      }
--
--      bool isLeafList = branch->IsA() == TBranch::Class();
--
--      void *buf = 0;
--      if (CPyCppyy::Instance_Check(address)) {
--         ((CPPInstance *)address)->GetDatamemberCache(); // force creation of cache
--
--         if (((CPPInstance *)address)->fFlags & CPPInstance::kIsReference || isLeafList)
--            buf = CPyCppyy::Instance_AsVoidPtr(address);
--         else
--            buf = (void *)&(((CPPInstance *)address)->GetObjectRaw());
--      } else
--         Utility::GetBuffer(address, '*', 1, buf, false);
--
--      if (buf != nullptr) {
--         auto res = tree->SetBranchAddress(PyUnicode_AsUTF8(name), buf);
--         return PyInt_FromLong(res);
--      }
--   }
--
--   // Not the overload we wanted to pythonize, return None
--   Py_RETURN_NONE;
--}
--
- ////////////////////////////////////////////////////////////////////////////
- /// Try to match the arguments of TTree::Branch to the following overload:
- /// - ( const char*, void*, const char*, Int_t = 32000 )
--- 
-2.45.2
-
diff --git a/root.spec b/root.spec
index eb906de..9f600e4 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.32.00
+Version:	6.32.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -68,31 +68,8 @@ Patch5:		%{name}-stress.patch
 #		https://github.com/root-project/root/issues/15738
 #		https://github.com/root-project/root/pull/15780
 Patch6:		%{name}-write-array.patch
-#		Adjust test limit
-#		https://github.com/root-project/root/pull/15734
-Patch7:		%{name}-failure-on-ppc64le-and-s390x.patch
-#		Correct format warnings seen on 32 bit architectures
-#		https://github.com/root-project/root/pull/15732
-Patch8:		%{name}-format-warnings-32-bit.patch
-#		Out-of-bounds vector access
-#		https://github.com/root-project/root/issues/15730
-#		https://github.com/root-project/root/pull/15739
-Patch9:		%{name}-out-of-bounds.patch
-#		Fix one more broken import in JsMVA
-#		https://github.com/root-project/root/pull/15752
-Patch10:	%{name}-fix-one-more-broken-import-in-JsMVA.patch
-#		Python 3.13 compatibility
-#		https://github.com/root-project/root/issues/15430
-#		https://github.com/root-project/root/pull/15798
-Patch11:	%{name}-pyroot-add-python-3.13-attributes.patch
-#		Implement TTree SetBranchAddress pythonization in Python
-#		Backport fix for failing test with Python 3.13
-#		pyunittests-pyroot-pyz-ttree-setbranchaddress
-#		https://github.com/root-project/root/issues/15799
-#		https://github.com/root-project/root/pull/15807
-Patch12:	%{name}-python-3.13-TTree-SetBranchAddress-pythonization.patch
 #		Backport build fix from upstream
-Patch13:	%{name}-allow-any-openssl-3.x-with-civetweb.patch
+Patch7:		%{name}-allow-any-openssl-3.x-with-civetweb.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1938,12 +1915,6 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
-%patch -P12 -p1
-%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2539,14 +2510,13 @@ gtest-tree-dataframe-test-dataframe-concurrency|\
 gtest-tree-dataframe-test-dataframe-simple"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 40
-# - tutorial-tmva-RBatchGenerator_filters_vectors-py
-#   *** Break *** segmentation violation
 %ifarch aarch64
+# - tutorial-tmva-RBatchGenerator_filters_vectors-py
+#   Randomly segfaults
+#   *** Break *** segmentation violation
 excluded="${excluded}|\
 tutorial-tmva-RBatchGenerator_filters_vectors-py"
 %endif
-%endif
 
 %ifarch %{power64}
 # - test-stressgraphics(-interpreted)
@@ -3584,6 +3554,10 @@ fi
 %endif
 
 %changelog
+* Tue Jun 18 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-1
+- Update to 6.32.02
+- Drop paches accepted upstream
+
 * Mon Jun 17 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-5
 - Add dependency on liburing-devel to root-io
 - Exclude failing tutorial-tmva-RBatchGenerator_filters_vectors-py test
diff --git a/sources b/sources
index a8ec13f..274fb5a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.32.00.tar.xz) = 4b1015684b79aa352edd42316a3a87ae48f4330a7566230349f0a5c4e3ff49cddca79b5171128300d88575dfe2503ab1357cb3bd99d2c2a78985cc9aabd742f6
+SHA512 (root-6.32.02.tar.xz) = 603bb458fd6dc5cfd6e995319b3572bef81be1e1c7a777099939a810d8bcf62e6260c39ba4e5ba2edbfc947378aaa43026af24c3cf19157d58666613fdf91368
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 82f076284ecc7521e99982a36d31707360702775 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 11 Jul 2024 21:27:50 +0200
Subject: [PATCH 278/344] Add openssl-devel-engine build requirement on Fedora
 41+

---
 root.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 9f600e4..dd35d09 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -120,6 +120,10 @@ BuildRequires:	qt6-qtbase-devel
 BuildRequires:	qt6-qtwebengine-devel
 %endif
 BuildRequires:	openssl-devel
+%if %{?fedora}%{!?fedora:0} >= 41
+#		Needed by civetweb.c in root-net-http
+BuildRequires:	openssl-devel-engine
+%endif
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
@@ -1078,7 +1082,7 @@ Requires:	%{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
 
 %description montecarlo-pythia8
 This package contains the Pythia version 8 plug-in for ROOT. This
-package provide the ROOT user with transparent interface to the Pythia
+package provides the ROOT user with transparent interface to the Pythia
 (version 8) event generators for hadronic interactions. If the term
 "hadronic" does not ring any bells, this package is not for you.
 
@@ -3554,6 +3558,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 11 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-2
+- Add openssl-devel-engine build requirement on Fedora 41+
+
 * Tue Jun 18 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-1
 - Update to 6.32.02
 - Drop paches accepted upstream

From 8bc319c31877c65b76cd90e9932ded85ea1a7d3f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 12 Jul 2024 01:01:14 +0200
Subject: [PATCH 279/344] Fixes for TUri class (PCRE2 compatibility) Fix test
 failure with tbb 2021.13.0

---
 ...-regular-expression-for-the-scheme-p.patch | 42 ++++++++++++++
 root-Make-TUri-class-PCRE2-compatible.patch   | 56 +++++++++++++++++++
 ...-libtbbmalloc-in-library-import-test.patch | 40 +++++++++++++
 root.spec                                     | 12 ++++
 4 files changed, 150 insertions(+)
 create mode 100644 root-Correct-the-regular-expression-for-the-scheme-p.patch
 create mode 100644 root-Make-TUri-class-PCRE2-compatible.patch
 create mode 100644 root-Whitelist-libtbbmalloc-in-library-import-test.patch

diff --git a/root-Correct-the-regular-expression-for-the-scheme-p.patch b/root-Correct-the-regular-expression-for-the-scheme-p.patch
new file mode 100644
index 0000000..25999ea
--- /dev/null
+++ b/root-Correct-the-regular-expression-for-the-scheme-p.patch
@@ -0,0 +1,42 @@
+From defef44f15aebc5eca9e34df767f3f92688d594c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 4 Jul 2024 18:21:06 +0200
+Subject: [PATCH 2/2] [core] Correct the regular expression for the scheme part
+ in TUri class
+
+RFC 3986 (https://datatracker.ietf.org/doc/html/rfc3986) defines the
+scheme part of a URI as:
+
+    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+
+The regular expression for finding the scheme part in the TUri class
+was defined as
+
+    ^[[:alpha:]][[:alpha:][:digit:]+-.]*$
+
+This does not match the definition in the RFC, since +-. in regular
+expression syntax is the range of ascii codes from '+' to '.', which
+means '+', ',', '-' and '.'. I.e. the ',' is included in the regular
+expression in error. This commit adds a backslash escape to the '-' so
+that it is interpreted as a literal '-' sign instead of indicating a
+range in the regular expression.
+---
+ core/base/src/TUri.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/base/src/TUri.cxx b/core/base/src/TUri.cxx
+index 9660470556..b324d0ffea 100644
+--- a/core/base/src/TUri.cxx
++++ b/core/base/src/TUri.cxx
+@@ -270,7 +270,7 @@ Bool_t TUri::SetScheme(const TString &scheme)
+ Bool_t TUri::IsScheme(const TString &string)
+ {
+    return TPRegexp(
+-             "^[[:alpha:]][[:alpha:][:digit:]+-.]*$"
++             "^[[:alpha:]][[:alpha:][:digit:]+\\-.]*$"
+           ).Match(string);
+ }
+ 
+-- 
+2.45.2
+
diff --git a/root-Make-TUri-class-PCRE2-compatible.patch b/root-Make-TUri-class-PCRE2-compatible.patch
new file mode 100644
index 0000000..e21501c
--- /dev/null
+++ b/root-Make-TUri-class-PCRE2-compatible.patch
@@ -0,0 +1,56 @@
+From 9f696986449451d9df951891eb930231e718989b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 4 Jul 2024 18:08:32 +0200
+Subject: [PATCH 1/2] [core] Make TUri class PCRE2 compatible
+
+PCRE2 has a stricter regular expression syntax parsing than PCRE.
+Some non-conforming regular expressions that were accepted by PCRE are
+correcrly rejected by PCRE2.
+
+Some of the regular expressions used by the TUri class do not follow
+the syntax rules and were relying on them being acceped by PCRE
+anyway. This commit corrects the syntax of these expressions so that
+they are now accepted by PCRE2. The corrected expressions still work
+correctly with the old PCRE.
+---
+ core/base/src/TUri.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/core/base/src/TUri.cxx b/core/base/src/TUri.cxx
+index 04aab1edb3..9660470556 100644
+--- a/core/base/src/TUri.cxx
++++ b/core/base/src/TUri.cxx
+@@ -27,10 +27,10 @@ a validating parser.
+ 
+ //RFC3986:
+ // pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+-const char* const kURI_pchar        = "(?:[[:alpha:][:digit:]-._~!$&'()*+,;=:@]|%[0-9A-Fa-f][0-9A-Fa-f])";
++const char* const kURI_pchar        = "(?:[[:alpha:][:digit:]\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f][0-9A-Fa-f])";
+ 
+ //unreserved characters, see chapter 2.3
+-const char* const kURI_unreserved   = "[[:alpha:][:digit:]-._~]";
++const char* const kURI_unreserved   = "[[:alpha:][:digit:]\\-._~]";
+ 
+ // reserved characters, see chapter
+ // reserved      = gen-delims / sub-delims
+@@ -900,7 +900,7 @@ Bool_t TUri::IsPathAbsolute(const TString &string)
+ Bool_t TUri::IsPathNoscheme(const TString &string)
+ {
+    return (TPRegexp(
+-              TString("^(([[:alpha:][:digit:]-._~!$&'()*+,;=@]|%[0-9A-Fa-f][0-9A-Fa-f])+)(/") + TString(kURI_pchar) + "*)*$"
++              TString("^(([[:alpha:][:digit:]\\-._~!$&'()*+,;=@]|%[0-9A-Fa-f][0-9A-Fa-f])+)(/") + TString(kURI_pchar) + "*)*$"
+            ).Match(string) > 0);
+ }
+ 
+@@ -950,7 +950,7 @@ Bool_t TUri::IsPort(const TString &string)
+ Bool_t TUri::IsRegName(const TString &string)
+ {
+    return (TPRegexp(
+-              "^([[:alpha:][:digit:]-._~!$&'()*+,;=]|%[0-9A-Fa-f][0-9A-Fa-f])*$").Match(string) > 0);
++              "^([[:alpha:][:digit:]\\-._~!$&'()*+,;=]|%[0-9A-Fa-f][0-9A-Fa-f])*$").Match(string) > 0);
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+-- 
+2.45.2
+
diff --git a/root-Whitelist-libtbbmalloc-in-library-import-test.patch b/root-Whitelist-libtbbmalloc-in-library-import-test.patch
new file mode 100644
index 0000000..a01c4cf
--- /dev/null
+++ b/root-Whitelist-libtbbmalloc-in-library-import-test.patch
@@ -0,0 +1,40 @@
+From 8dc4654de6d569e5040313065fd5cd04d651fb92 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 12 Jul 2024 00:20:04 +0200
+Subject: [PATCH] [pyroot] Whitelist libtbbmalloc in library import test
+
+   6/1344 Test   #12: pyunittests-pyroot-import-load-libs .......................................***Failed    1.35 sec
+test_import (import_load_libs.ImportLoadLibs.test_import)
+Test libraries loaded after importing ROOT ... ERROR
+======================================================================
+ERROR: test_import (import_load_libs.ImportLoadLibs.test_import)
+Test libraries loaded after importing ROOT
+----------------------------------------------------------------------
+Exception: Found not whitelisted libraries after importing ROOT:
+ - libtbbmalloc
+If the test fails with a library that is loaded on purpose, please add it to the whitelist.
+----------------------------------------------------------------------
+Ran 1 test in 1.186s
+FAILED (errors=1)
+
+This failure is seen in Fedora 41 after tbb was updated from version
+2021.11.0 to version 2021.13.0 in  the distribution.
+---
+ bindings/pyroot/pythonizations/test/import_load_libs.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
+index 179c76f6fd..c370a3cd42 100644
+--- a/bindings/pyroot/pythonizations/test/import_load_libs.py
++++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
+@@ -40,6 +40,7 @@ class ImportLoadLibs(unittest.TestCase):
+             'libssl',
+             'libcrypt.*', # by libssl
+             'libtbb',
++            'libtbbmalloc',
+             'liburing', # by libRIO if uring option is enabled
+             # On centos7 libssl links against kerberos pulling in all dependencies below, removed with libssl1.1.0
+             'libgssapi_krb5',
+-- 
+2.45.2
+
diff --git a/root.spec b/root.spec
index dd35d09..fb68047 100644
--- a/root.spec
+++ b/root.spec
@@ -70,6 +70,13 @@ Patch5:		%{name}-stress.patch
 Patch6:		%{name}-write-array.patch
 #		Backport build fix from upstream
 Patch7:		%{name}-allow-any-openssl-3.x-with-civetweb.patch
+#		Fixes for TUri class
+#		https://github.com/root-project/root/pull/15988
+Patch8:		root-Make-TUri-class-PCRE2-compatible.patch
+Patch9:		root-Correct-the-regular-expression-for-the-scheme-p.patch
+#		Fix test failure with tbb 2021.13.0
+#		https://github.com/root-project/root/pull/16016
+Patch10:	root-Whitelist-libtbbmalloc-in-library-import-test.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1919,6 +1926,9 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3560,6 +3570,8 @@ fi
 %changelog
 * Thu Jul 11 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-2
 - Add openssl-devel-engine build requirement on Fedora 41+
+- Fixes for TUri class (PCRE2 compatibility)
+- Fix test failure with tbb 2021.13.0
 
 * Tue Jun 18 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-1
 - Update to 6.32.02

From c960d44c7d57140f8724c68bc3e6eb894a50ad40 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 18:44:52 +0000
Subject: [PATCH 280/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index fb68047..1707564 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3568,6 +3568,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.32.02-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jul 11 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-2
 - Add openssl-devel-engine build requirement on Fedora 41+
 - Fixes for TUri class (PCRE2 compatibility)

From dafa5d9be68997265dd02220b91dcf5cbc41b3d5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 21 Jul 2024 23:44:51 +0200
Subject: [PATCH 281/344] Update ROOT's R interface for Rcpp 1.0.13

---
 root-r.patch | 32 ++++++++++++++++++++++++++++++++
 root.spec    |  9 ++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 root-r.patch

diff --git a/root-r.patch b/root-r.patch
new file mode 100644
index 0000000..8be2617
--- /dev/null
+++ b/root-r.patch
@@ -0,0 +1,32 @@
+From 141f62e800bfc54d2fdf76c0750dc6082d00910d Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 21 Jul 2024 23:09:54 +0200
+Subject: [PATCH] Update ROOT's R interface for Rcpp 1.0.13
+
+---
+ bindings/r/inc/TRInternalFunction.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/bindings/r/inc/TRInternalFunction.h b/bindings/r/inc/TRInternalFunction.h
+index d9bf532205..fa77cbddbc 100644
+--- a/bindings/r/inc/TRInternalFunction.h
++++ b/bindings/r/inc/TRInternalFunction.h
+@@ -31,7 +31,15 @@ public:
+ 
+       RCPP_GENERATE_CTOR_ASSIGN(TRInternalFunction_Impl)
+ 
++#if RCPP_VERSION >= Rcpp_Version(1,0,13)
++      template <typename OUT, typename... T>
++      TRInternalFunction_Impl(OUT(*fun)(T...))
++      {
++         set(Rcpp::XPtr< Rcpp::CppFunctionN<OUT, T...> >(new Rcpp::CppFunctionN<OUT, T...>(fun), false));
++      }
++#else
+ #include <TRInternalFunction__ctors.h>
++#endif
+       void update(SEXP) {}
+ private:
+ 
+-- 
+2.45.2
+
diff --git a/root.spec b/root.spec
index 1707564..386248b 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -77,6 +77,9 @@ Patch9:		root-Correct-the-regular-expression-for-the-scheme-p.patch
 #		Fix test failure with tbb 2021.13.0
 #		https://github.com/root-project/root/pull/16016
 Patch10:	root-Whitelist-libtbbmalloc-in-library-import-test.patch
+#		Update ROOT's R interface for Rcpp 1.0.13
+#		https://github.com/root-project/root/pull/16075
+Patch11:	root-r.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1929,6 +1932,7 @@ This package contains utility functions for ntuples.
 %patch -P8 -p1
 %patch -P9 -p1
 %patch -P10 -p1
+%patch -P11 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3568,6 +3572,9 @@ fi
 %endif
 
 %changelog
+* Sun Jul 21 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-4
+- Update ROOT's R interface for Rcpp 1.0.13
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.32.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 1617973423cdc5ee967e9b349d058c5225043132 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 16 Aug 2024 06:35:34 +0200
Subject: [PATCH 282/344] Update to 6.32.04

Drop patches accepted upstream
Disable Qt5 Web display for Fedora 41+ (broken qt5-qtwebengine package)
---
 ...-regular-expression-for-the-scheme-p.patch | 42 --------------
 root-Make-TUri-class-PCRE2-compatible.patch   | 56 -------------------
 ...-libtbbmalloc-in-library-import-test.patch | 40 -------------
 root-r.patch                                  | 32 -----------
 root.spec                                     | 34 ++++++-----
 sources                                       |  2 +-
 6 files changed, 17 insertions(+), 189 deletions(-)
 delete mode 100644 root-Correct-the-regular-expression-for-the-scheme-p.patch
 delete mode 100644 root-Make-TUri-class-PCRE2-compatible.patch
 delete mode 100644 root-Whitelist-libtbbmalloc-in-library-import-test.patch
 delete mode 100644 root-r.patch

diff --git a/root-Correct-the-regular-expression-for-the-scheme-p.patch b/root-Correct-the-regular-expression-for-the-scheme-p.patch
deleted file mode 100644
index 25999ea..0000000
--- a/root-Correct-the-regular-expression-for-the-scheme-p.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From defef44f15aebc5eca9e34df767f3f92688d594c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 4 Jul 2024 18:21:06 +0200
-Subject: [PATCH 2/2] [core] Correct the regular expression for the scheme part
- in TUri class
-
-RFC 3986 (https://datatracker.ietf.org/doc/html/rfc3986) defines the
-scheme part of a URI as:
-
-    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-
-The regular expression for finding the scheme part in the TUri class
-was defined as
-
-    ^[[:alpha:]][[:alpha:][:digit:]+-.]*$
-
-This does not match the definition in the RFC, since +-. in regular
-expression syntax is the range of ascii codes from '+' to '.', which
-means '+', ',', '-' and '.'. I.e. the ',' is included in the regular
-expression in error. This commit adds a backslash escape to the '-' so
-that it is interpreted as a literal '-' sign instead of indicating a
-range in the regular expression.
----
- core/base/src/TUri.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/base/src/TUri.cxx b/core/base/src/TUri.cxx
-index 9660470556..b324d0ffea 100644
---- a/core/base/src/TUri.cxx
-+++ b/core/base/src/TUri.cxx
-@@ -270,7 +270,7 @@ Bool_t TUri::SetScheme(const TString &scheme)
- Bool_t TUri::IsScheme(const TString &string)
- {
-    return TPRegexp(
--             "^[[:alpha:]][[:alpha:][:digit:]+-.]*$"
-+             "^[[:alpha:]][[:alpha:][:digit:]+\\-.]*$"
-           ).Match(string);
- }
- 
--- 
-2.45.2
-
diff --git a/root-Make-TUri-class-PCRE2-compatible.patch b/root-Make-TUri-class-PCRE2-compatible.patch
deleted file mode 100644
index e21501c..0000000
--- a/root-Make-TUri-class-PCRE2-compatible.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9f696986449451d9df951891eb930231e718989b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 4 Jul 2024 18:08:32 +0200
-Subject: [PATCH 1/2] [core] Make TUri class PCRE2 compatible
-
-PCRE2 has a stricter regular expression syntax parsing than PCRE.
-Some non-conforming regular expressions that were accepted by PCRE are
-correcrly rejected by PCRE2.
-
-Some of the regular expressions used by the TUri class do not follow
-the syntax rules and were relying on them being acceped by PCRE
-anyway. This commit corrects the syntax of these expressions so that
-they are now accepted by PCRE2. The corrected expressions still work
-correctly with the old PCRE.
----
- core/base/src/TUri.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/core/base/src/TUri.cxx b/core/base/src/TUri.cxx
-index 04aab1edb3..9660470556 100644
---- a/core/base/src/TUri.cxx
-+++ b/core/base/src/TUri.cxx
-@@ -27,10 +27,10 @@ a validating parser.
- 
- //RFC3986:
- // pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
--const char* const kURI_pchar        = "(?:[[:alpha:][:digit:]-._~!$&'()*+,;=:@]|%[0-9A-Fa-f][0-9A-Fa-f])";
-+const char* const kURI_pchar        = "(?:[[:alpha:][:digit:]\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f][0-9A-Fa-f])";
- 
- //unreserved characters, see chapter 2.3
--const char* const kURI_unreserved   = "[[:alpha:][:digit:]-._~]";
-+const char* const kURI_unreserved   = "[[:alpha:][:digit:]\\-._~]";
- 
- // reserved characters, see chapter
- // reserved      = gen-delims / sub-delims
-@@ -900,7 +900,7 @@ Bool_t TUri::IsPathAbsolute(const TString &string)
- Bool_t TUri::IsPathNoscheme(const TString &string)
- {
-    return (TPRegexp(
--              TString("^(([[:alpha:][:digit:]-._~!$&'()*+,;=@]|%[0-9A-Fa-f][0-9A-Fa-f])+)(/") + TString(kURI_pchar) + "*)*$"
-+              TString("^(([[:alpha:][:digit:]\\-._~!$&'()*+,;=@]|%[0-9A-Fa-f][0-9A-Fa-f])+)(/") + TString(kURI_pchar) + "*)*$"
-            ).Match(string) > 0);
- }
- 
-@@ -950,7 +950,7 @@ Bool_t TUri::IsPort(const TString &string)
- Bool_t TUri::IsRegName(const TString &string)
- {
-    return (TPRegexp(
--              "^([[:alpha:][:digit:]-._~!$&'()*+,;=]|%[0-9A-Fa-f][0-9A-Fa-f])*$").Match(string) > 0);
-+              "^([[:alpha:][:digit:]\\-._~!$&'()*+,;=]|%[0-9A-Fa-f][0-9A-Fa-f])*$").Match(string) > 0);
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--- 
-2.45.2
-
diff --git a/root-Whitelist-libtbbmalloc-in-library-import-test.patch b/root-Whitelist-libtbbmalloc-in-library-import-test.patch
deleted file mode 100644
index a01c4cf..0000000
--- a/root-Whitelist-libtbbmalloc-in-library-import-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8dc4654de6d569e5040313065fd5cd04d651fb92 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 12 Jul 2024 00:20:04 +0200
-Subject: [PATCH] [pyroot] Whitelist libtbbmalloc in library import test
-
-   6/1344 Test   #12: pyunittests-pyroot-import-load-libs .......................................***Failed    1.35 sec
-test_import (import_load_libs.ImportLoadLibs.test_import)
-Test libraries loaded after importing ROOT ... ERROR
-======================================================================
-ERROR: test_import (import_load_libs.ImportLoadLibs.test_import)
-Test libraries loaded after importing ROOT
-----------------------------------------------------------------------
-Exception: Found not whitelisted libraries after importing ROOT:
- - libtbbmalloc
-If the test fails with a library that is loaded on purpose, please add it to the whitelist.
-----------------------------------------------------------------------
-Ran 1 test in 1.186s
-FAILED (errors=1)
-
-This failure is seen in Fedora 41 after tbb was updated from version
-2021.11.0 to version 2021.13.0 in  the distribution.
----
- bindings/pyroot/pythonizations/test/import_load_libs.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
-index 179c76f6fd..c370a3cd42 100644
---- a/bindings/pyroot/pythonizations/test/import_load_libs.py
-+++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
-@@ -40,6 +40,7 @@ class ImportLoadLibs(unittest.TestCase):
-             'libssl',
-             'libcrypt.*', # by libssl
-             'libtbb',
-+            'libtbbmalloc',
-             'liburing', # by libRIO if uring option is enabled
-             # On centos7 libssl links against kerberos pulling in all dependencies below, removed with libssl1.1.0
-             'libgssapi_krb5',
--- 
-2.45.2
-
diff --git a/root-r.patch b/root-r.patch
deleted file mode 100644
index 8be2617..0000000
--- a/root-r.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 141f62e800bfc54d2fdf76c0750dc6082d00910d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 21 Jul 2024 23:09:54 +0200
-Subject: [PATCH] Update ROOT's R interface for Rcpp 1.0.13
-
----
- bindings/r/inc/TRInternalFunction.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/bindings/r/inc/TRInternalFunction.h b/bindings/r/inc/TRInternalFunction.h
-index d9bf532205..fa77cbddbc 100644
---- a/bindings/r/inc/TRInternalFunction.h
-+++ b/bindings/r/inc/TRInternalFunction.h
-@@ -31,7 +31,15 @@ public:
- 
-       RCPP_GENERATE_CTOR_ASSIGN(TRInternalFunction_Impl)
- 
-+#if RCPP_VERSION >= Rcpp_Version(1,0,13)
-+      template <typename OUT, typename... T>
-+      TRInternalFunction_Impl(OUT(*fun)(T...))
-+      {
-+         set(Rcpp::XPtr< Rcpp::CppFunctionN<OUT, T...> >(new Rcpp::CppFunctionN<OUT, T...>(fun), false));
-+      }
-+#else
- #include <TRInternalFunction__ctors.h>
-+#endif
-       void update(SEXP) {}
- private:
- 
--- 
-2.45.2
-
diff --git a/root.spec b/root.spec
index 386248b..e22edeb 100644
--- a/root.spec
+++ b/root.spec
@@ -20,13 +20,18 @@
 %global pandas 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 41
+# Disable Qt5 Web display for Fedora 41+ (broken qt5-qtwebengine package)
+%global qt5_qtwebengine_arches none
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.32.02
+Version:	6.32.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -70,16 +75,6 @@ Patch5:		%{name}-stress.patch
 Patch6:		%{name}-write-array.patch
 #		Backport build fix from upstream
 Patch7:		%{name}-allow-any-openssl-3.x-with-civetweb.patch
-#		Fixes for TUri class
-#		https://github.com/root-project/root/pull/15988
-Patch8:		root-Make-TUri-class-PCRE2-compatible.patch
-Patch9:		root-Correct-the-regular-expression-for-the-scheme-p.patch
-#		Fix test failure with tbb 2021.13.0
-#		https://github.com/root-project/root/pull/16016
-Patch10:	root-Whitelist-libtbbmalloc-in-library-import-test.patch
-#		Update ROOT's R interface for Rcpp 1.0.13
-#		https://github.com/root-project/root/pull/16075
-Patch11:	root-r.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1929,10 +1924,6 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2549,9 +2540,11 @@ tutorial-roostats-IntervalExamples-py"
 
 %ifarch s390x
 # - gtest-roofit-roofitcore-test-testNaNPacker
+# - gtest-roofit-roofitcore-test-testLikelihoodGradientJob
 #   Uses "Packed NaN" feature, not implemented for big endian.
 excluded="${excluded}|\
-gtest-roofit-roofitcore-test-testNaNPacker"
+gtest-roofit-roofitcore-test-testNaNPacker|\
+gtest-roofit-roofitcore-test-testLikelihoodGradientJob"
 
 # - gtest-core-dictgen-test-dictgen-base
 # - gtest-tree-dataframe-test-dataframe-unified-constructor
@@ -3572,6 +3565,11 @@ fi
 %endif
 
 %changelog
+* Wed Aug 14 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.04-1
+- Update to 6.32.04
+- Drop patches accepted upstream
+- Disable Qt5 Web display for Fedora 41+ (broken qt5-qtwebengine package)
+
 * Sun Jul 21 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-4
 - Update ROOT's R interface for Rcpp 1.0.13
 
@@ -3585,7 +3583,7 @@ fi
 
 * Tue Jun 18 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.02-1
 - Update to 6.32.02
-- Drop paches accepted upstream
+- Drop patches accepted upstream
 
 * Mon Jun 17 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-5
 - Add dependency on liburing-devel to root-io
diff --git a/sources b/sources
index 274fb5a..3eca7e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.32.02.tar.xz) = 603bb458fd6dc5cfd6e995319b3572bef81be1e1c7a777099939a810d8bcf62e6260c39ba4e5ba2edbfc947378aaa43026af24c3cf19157d58666613fdf91368
+SHA512 (root-6.32.04.tar.xz) = 2ab96e3f6e541973c2f69e0e83f366af4fdf6e978d5ae586a6f039d97d2f50e2e373b1d9e70d736e1bb3bad6fb76000d9179bc3263b52a76eb65a7451e2648b0
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 59f38a443a111761d3138922f61d42d7aa6daab5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 21 Aug 2024 16:38:38 +0200
Subject: [PATCH 283/344] Re-enable Qt5 Web display for Fedora 41+
 (qt5-qtwebengine fixed)

---
 root.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/root.spec b/root.spec
index e22edeb..68bfa8a 100644
--- a/root.spec
+++ b/root.spec
@@ -20,18 +20,13 @@
 %global pandas 0
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 41
-# Disable Qt5 Web display for Fedora 41+ (broken qt5-qtwebengine package)
-%global qt5_qtwebengine_arches none
-%endif
-
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
 Version:	6.32.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3565,6 +3560,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 21 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.04-2
+- Re-enable Qt5 Web display for Fedora 41+ (qt5-qtwebengine fixed)
+
 * Wed Aug 14 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.04-1
 - Update to 6.32.04
 - Drop patches accepted upstream

From 5498e74cafacb6aa40dbeaa24ad55b4ee2a788ff Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 25 Sep 2024 14:02:06 +0200
Subject: [PATCH 284/344] Update to 6.32.06

Split out ROOT 7 dependent parts of root-browsable to a separate package
Split out ROOT 7 dependent parts of root-browserv7 to a separate package
---
 root.spec | 133 +++++++++++++++++++++++++++++++++---------------------
 sources   |   2 +-
 2 files changed, 82 insertions(+), 53 deletions(-)

diff --git a/root.spec b/root.spec
index 68bfa8a..2a8e296 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.32.04
+Version:	6.32.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -1776,7 +1776,37 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description gui-webgui6
 This package provides a Web based GUI for ROOT.
 
-%if %{root7}
+%package gui-browsable
+Summary:	ROOT GUI browsable providers
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+#		Package split (gui-browsable-v7 from gui-browsable)
+Obsoletes:	%{name}-gui-browsable < 6.32.06
+
+%description gui-browsable
+This package contains ROOT GUI browsable providers.
+
+%package gui-browserv7
+Summary:	ROOT file browser and browser widgets
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom-webviewer%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-webviewer%{?_isa} = %{version}-%{release}
+#		Package split (gui-browserv7-v7 from gui-browserv7)
+Obsoletes:	%{name}-gui-browserv7 < 6.32.06
+
+%description gui-browserv7
+This package contains the ROOT file browser (RBrowser) and browser widgets.
+
 %package geom-webviewer
 Summary:	Geometry web viewer library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1788,6 +1818,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description geom-webviewer
 This package contains a library for viewing geometries in a web GUI.
 
+%if %{root7}
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1823,35 +1854,32 @@ Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 %description graf3d-eve7
 This package contains a library for defining event displays in ROOT 7.
 
-%package gui-browsable
-Summary:	GUI browsable (ROOT 7)
+%package gui-browsable-v7
+Summary:	Additional ROOT GUI browsable providers (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
-
-%description gui-browsable
-This package contains GUI browsable components for ROOT 7.
-
-%package gui-browserv7
-Summary:	Browser (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
-Requires:	%{name}-geom-webviewer%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webgui6%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-webviewer%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+#		Package split (gui-browsable-v7 from gui-browsable)
+Obsoletes:	%{name}-gui-browsable < 6.32.06
 
-%description gui-browserv7
-This package contains a file browser for ROOT 7.
+%description gui-browsable-v7
+This package contains additional ROOT GUI browsable providers for ROOT 7.
+
+%package gui-browserv7-v7
+Summary:	Additional ROOT browser widgets (ROOT 7)
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-browserv7%{?_isa} = %{version}-%{release}
+#		Package split (gui-browserv7-v7 from gui-browserv7)
+Obsoletes:	%{name}-gui-browserv7 < 6.32.06
+
+%description gui-browserv7-v7
+This package contains additional ROOT browser widgets for ROOT 7.
 
 %package gui-canvaspainter
 Summary:	Canvas painter (ROOT 7)
@@ -2166,10 +2194,8 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
    %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 
 # Fix python extension suffix
-mv %{buildroot}%{python3_sitearch}/libROOTPythonizations.so.%{version} \
+mv %{buildroot}%{python3_sitearch}/libROOTPythonizations.so \
    %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_ext_suffix}
-rm %{buildroot}%{python3_sitearch}/libROOTPythonizations.so.%{libversion}
-rm %{buildroot}%{python3_sitearch}/libROOTPythonizations.so
 
 # Move noarch python modules to sitelib
 if [ "%{python3_sitelib}" != "%{python3_sitearch}" ] ; then
@@ -2274,9 +2300,6 @@ rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
 pushd %{buildroot}%{_datadir}/%{name}/plugins
-%if ! %{root7}
-rm TBrowserImp/P030_RWebBrowserImp.C
-%endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TProofMgr/P010_TXProofMgr.C
@@ -2285,9 +2308,6 @@ rm TProofServ/P010_TXProofServ.C
 rm TSlave/P010_TXSlave.C
 rm TSQLServer/P040_TOracleServer.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
-%if ! %{root7}
-rm TVirtualGeoPainter/P020_RGeoPainter.C
-%endif
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
@@ -3492,12 +3512,29 @@ fi
 %{_datadir}/%{name}/plugins/TCanvasImp/P010_TWebCanvas.C
 %{_datadir}/%{name}/plugins/TControlBarImp/P010_TWebControlBar.C
 
-%if %{root7}
+%files gui-browsable -f includelist-gui-browsable
+%{_libdir}/%{name}/libROOTBrowsable.*
+%{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
+%{_libdir}/%{name}/libROOTBranchBrowseProvider.*
+%{_libdir}/%{name}/libROOTGeoBrowseProvider.*
+%{_libdir}/%{name}/libROOTLeafDraw6Provider.*
+%{_libdir}/%{name}/libROOTObjectDraw6Provider.*
+
+%files gui-browserv7 -f includelist-gui-browserv7
+%{_libdir}/%{name}/libROOTBrowserv7.*
+%{_libdir}/%{name}/libROOTBrowserv7_rdict.pcm
+%{_libdir}/%{name}/libROOTBrowserGeomWidget.*
+%{_libdir}/%{name}/libROOTBrowserTCanvasWidget.*
+%{_libdir}/%{name}/libROOTBrowserTreeWidget.*
+%{_libdir}/%{name}/libROOTBrowserWidgets.*
+%{_datadir}/%{name}/plugins/TBrowserImp/P030_RWebBrowserImp.C
+
 %files geom-webviewer -f includelist-geom-webviewer
 %{_libdir}/%{name}/libROOTGeomViewer.*
 %{_libdir}/%{name}/libROOTGeomViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualGeoPainter/P020_RGeoPainter.C
 
+%if %{root7}
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
 %{_libdir}/%{name}/libROOTGpadv7.*
 %{_libdir}/%{name}/libROOTGpadv7_rdict.pcm
@@ -3510,29 +3547,16 @@ fi
 %{_libdir}/%{name}/libROOTEve.*
 %{_libdir}/%{name}/libROOTEve_rdict.pcm
 
-%files gui-browsable -f includelist-gui-browsable
-%{_libdir}/%{name}/libROOTBrowsable.*
-%{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
-%{_libdir}/%{name}/libROOTBranchBrowseProvider.*
-%{_libdir}/%{name}/libROOTGeoBrowseProvider.*
+%files gui-browsable-v7
 %{_libdir}/%{name}/libROOTHistDrawProvider.*
-%{_libdir}/%{name}/libROOTLeafDraw6Provider.*
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
 %{_libdir}/%{name}/libROOTNTupleBrowseProvider.*
 %{_libdir}/%{name}/libROOTNTupleDraw6Provider.*
 %{_libdir}/%{name}/libROOTNTupleDraw7Provider.*
-%{_libdir}/%{name}/libROOTObjectDraw6Provider.*
 %{_libdir}/%{name}/libROOTObjectDraw7Provider.*
 
-%files gui-browserv7 -f includelist-gui-browserv7
-%{_libdir}/%{name}/libROOTBrowserv7.*
-%{_libdir}/%{name}/libROOTBrowserv7_rdict.pcm
-%{_libdir}/%{name}/libROOTBrowserGeomWidget.*
+%files gui-browserv7-v7
 %{_libdir}/%{name}/libROOTBrowserRCanvasWidget.*
-%{_libdir}/%{name}/libROOTBrowserTCanvasWidget.*
-%{_libdir}/%{name}/libROOTBrowserTreeWidget.*
-%{_libdir}/%{name}/libROOTBrowserWidgets.*
-%{_datadir}/%{name}/plugins/TBrowserImp/P030_RWebBrowserImp.C
 
 %files gui-canvaspainter
 %{_libdir}/%{name}/libROOTCanvasPainter.*
@@ -3560,6 +3584,11 @@ fi
 %endif
 
 %changelog
+* Mon Sep 23 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.06-1
+- Update to 6.32.06
+- Split out ROOT 7 dependent parts of root-browsable to a separate package
+- Split out ROOT 7 dependent parts of root-browserv7 to a separate package
+
 * Wed Aug 21 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.04-2
 - Re-enable Qt5 Web display for Fedora 41+ (qt5-qtwebengine fixed)
 
diff --git a/sources b/sources
index 3eca7e9..03824b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.32.04.tar.xz) = 2ab96e3f6e541973c2f69e0e83f366af4fdf6e978d5ae586a6f039d97d2f50e2e373b1d9e70d736e1bb3bad6fb76000d9179bc3263b52a76eb65a7451e2648b0
+SHA512 (root-6.32.06.tar.xz) = 2588dc266fe71a612fbcc3a261372a80848334ee1e4bc606df4599d707d6c30ca665cd6d919b59902f404e276ea35923cc320bef0c9c5856ecea0626a2df9158
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From 6b314d2ebb48580b60d746d569184eb4dbdfe604 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 14 Nov 2024 22:31:01 +0100
Subject: [PATCH 285/344] Update to 6.32.08

---
 root.spec | 5 ++++-
 sources   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 2a8e296..99a1259 100644
--- a/root.spec
+++ b/root.spec
@@ -24,7 +24,7 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.32.06
+Version:	6.32.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -3584,6 +3584,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 14 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.08-1
+- Update to 6.32.08
+
 * Mon Sep 23 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.06-1
 - Update to 6.32.06
 - Split out ROOT 7 dependent parts of root-browsable to a separate package
diff --git a/sources b/sources
index 03824b4..afea219 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.32.06.tar.xz) = 2588dc266fe71a612fbcc3a261372a80848334ee1e4bc606df4599d707d6c30ca665cd6d919b59902f404e276ea35923cc320bef0c9c5856ecea0626a2df9158
+SHA512 (root-6.32.08.tar.xz) = 268f68745bcf545aff5b3ad4208e8b6b373800da3885cc3d7a8083a6b4ab8c92788a4da0163b3344c24cd62e50a7b74319bc65ee519de4e53f4394330687a2be
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f

From cac5562c15443d18842254eb8b9f8307718573b6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Nov 2024 14:35:57 +0000
Subject: [PATCH 286/344] Rebuild for libarrow 18

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 99a1259..9a0316e 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.32.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3584,6 +3584,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 27 2024 Richard W.M. Jones <rjones@redhat.com> - 6.32.08-2
+- Rebuild for libarrow 18
+
 * Thu Nov 14 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.08-1
 - Update to 6.32.08
 

From 75f062bccd02b4f92a9d9b5c8dc84dce6b6461b4 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 26 Dec 2024 10:59:52 +0100
Subject: [PATCH 287/344] Update to 6.34.02

Build CLAD plugin
Removed package: root-roofit-dataframe-helpers
---
 root-Fix-compilation-on-s390x.patch           |  38 +++
 root-Make-DCLAD_SOURCE_DIR-option-work.patch  |  66 ++++
 ...-allow-any-openssl-3.x-with-civetweb.patch |  30 --
 root-stress.patch                             |  32 --
 root-tmva-sofie-Fix-Tile-operator.patch       |  79 +++++
 root-write-array.patch                        | 125 -------
 root.spec                                     | 310 ++++++++++--------
 sources                                       |   3 +-
 8 files changed, 351 insertions(+), 332 deletions(-)
 create mode 100644 root-Fix-compilation-on-s390x.patch
 create mode 100644 root-Make-DCLAD_SOURCE_DIR-option-work.patch
 delete mode 100644 root-allow-any-openssl-3.x-with-civetweb.patch
 delete mode 100644 root-stress.patch
 create mode 100644 root-tmva-sofie-Fix-Tile-operator.patch
 delete mode 100644 root-write-array.patch

diff --git a/root-Fix-compilation-on-s390x.patch b/root-Fix-compilation-on-s390x.patch
new file mode 100644
index 0000000..be89d3f
--- /dev/null
+++ b/root-Fix-compilation-on-s390x.patch
@@ -0,0 +1,38 @@
+From 67e3b45b5d346a779533636397e28b1c48a21070 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 16 Dec 2024 15:32:21 +0100
+Subject: [PATCH] Fix compilation on s390x
+
+There were changes to the code but the big endian code was not updated
+to match the changes in the little endian code.
+---
+ tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+index 81a4b23697..1415e06e0f 100644
+--- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
++++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+@@ -131,9 +131,9 @@ std::shared_ptr<void> GetInitializedTensorData(onnx::TensorProto * tensorproto,
+ #ifdef R__BYTESWAP
+       std::memcpy(data.get(), tensorproto->raw_data().c_str(), length * sizeof(T));
+ #else
+-      for (std::size_t k = 0; k < fLength; ++k)
+-         (reinterpret_cast<uint32_t *>(data.get()))[k] =
+-            Rbswap_32((reinterpret_cast<const uint32_t *>(tensorproto->raw_data().c_str()))[k]);
++      for (std::size_t k = 0; k < length; ++k)
++         (reinterpret_cast<typename RByteSwap<sizeof(T)>::value_type *>(data.get()))[k] =
++            RByteSwap<sizeof(T)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(T)>::value_type *>(tensorproto->raw_data().c_str()))[k]);
+ #endif
+    } else {
+       ExtractDataFromTP<T>::Copy(tensorproto, data.get());
+@@ -628,4 +628,4 @@ void RModelParser_ONNX::ParseONNXGraph(RModel & rmodel, const onnx::GraphProto &
+ 
+ } // namespace SOFIE
+ } // namespace Experimental
+-} // namespace TMVA
+\ No newline at end of file
++} // namespace TMVA
+-- 
+2.47.1
+
diff --git a/root-Make-DCLAD_SOURCE_DIR-option-work.patch b/root-Make-DCLAD_SOURCE_DIR-option-work.patch
new file mode 100644
index 0000000..a4aaada
--- /dev/null
+++ b/root-Make-DCLAD_SOURCE_DIR-option-work.patch
@@ -0,0 +1,66 @@
+From 7d5ae0dcfbf770cc3943cc25283bf2d39329d9f3 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 16 Dec 2024 15:48:42 +0100
+Subject: [PATCH] Make -DCLAD_SOURCE_DIR option work
+
+Using the -DCLAD_SOURCE_DIR currently does not disable the git checkout.
+From the cmake documentation for ExternalProject_Add:
+
+Note: If a download method is specified, any existing contents of the
+source directory may be deleted. Only the URL download method checks
+whether this directory is either missing or empty before initiating
+the download, stopping with an error if it is not empty. All other
+download methods silently discard any previous contents of the source
+directory.
+
+Currently cmake deletes the source directory defined by
+-DCLAD_SOURCE_DIR and then tries to recreate it using a git checkout,
+but fails if there is no network available:
+
+Cloning into 'clad-1.7'...
+fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
+Cloning into 'clad-1.7'...
+fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
+Cloning into 'clad-1.7'...
+fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
+Had to git clone more than once: 3 times.
+CMake Error at redhat-linux-build/interpreter/cling/tools/plugins/clad/clad-prefix/tmp/clad-gitclone.cmake:50 (message):
+  Failed to clone repository: 'https://github.com/vgvassilev/clad.git'
+
+The attempt to disable the git checkout by setting the
+DOWNLOAD_COMMAND option to an empty string is not working.
+
+This commit fixes the issue by only defining the GIT_REPOSITORY and
+GIT_TAG options when CLAD_SOURCE_DIR is not defined.
+---
+ interpreter/cling/tools/plugins/clad/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/interpreter/cling/tools/plugins/clad/CMakeLists.txt b/interpreter/cling/tools/plugins/clad/CMakeLists.txt
+index ba5f09786c..3c70d00a10 100644
+--- a/interpreter/cling/tools/plugins/clad/CMakeLists.txt
++++ b/interpreter/cling/tools/plugins/clad/CMakeLists.txt
+@@ -68,8 +68,10 @@ set(_clad_extra_settings
+ # If the CLAD_SOURCE_DIR variable is defined in the CMake configuration, we're
+ # skipping the download of the repository and use the passed directory.
+ if (DEFINED CLAD_SOURCE_DIR)
+-  list(APPEND _clad_extra_settings DOWNLOAD_COMMAND "")
+   list(APPEND _clad_extra_settings SOURCE_DIR ${CLAD_SOURCE_DIR})
++else()
++  list(APPEND _clad_extra_settings GIT_REPOSITORY https://github.com/vgvassilev/clad.git)
++  list(APPEND _clad_extra_settings GIT_TAG v1.7)
+ endif()
+ 
+ #list(APPEND _clad_patches_list "patch1.patch" "patch2.patch")
+@@ -82,8 +84,6 @@ endif()
+ 
+ ExternalProject_Add(
+   clad
+-  GIT_REPOSITORY https://github.com/vgvassilev/clad.git
+-  GIT_TAG v1.7
+   UPDATE_COMMAND ""
+   PATCH_COMMAND ${_clad_patch_command}
+   CMAKE_ARGS -G ${CMAKE_GENERATOR}
+-- 
+2.47.1
+
diff --git a/root-allow-any-openssl-3.x-with-civetweb.patch b/root-allow-any-openssl-3.x-with-civetweb.patch
deleted file mode 100644
index 05e2a64..0000000
--- a/root-allow-any-openssl-3.x-with-civetweb.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6952dd5ca51e7be8a8ae74b446ac268949f5f383 Mon Sep 17 00:00:00 2001
-From: Sergey Linev <S.Linev@gsi.de>
-Date: Mon, 10 Jun 2024 09:19:47 +0200
-Subject: [PATCH] [http] Allow to use any of openssl 3.x with civetweb
-
-civetweb was designed when only openssl 3.0 was existing.
-Therefore name of define is `OPENSSL_API_3_0`
-Meanwhile there is openssl 3.1 and 3.2.
-While seems to be there is no changes in API both can
-be used with civetweb.
----
- net/http/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt
-index 02d7514400..6ef98a604b 100644
---- a/net/http/CMakeLists.txt
-+++ b/net/http/CMakeLists.txt
-@@ -78,7 +78,7 @@ if(ssl)
-     MESSAGE(STATUS "Use SSL API VERSION 1.1 for civetweb")
-     target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_1_1)
-     set(link_ssl ON)
--  elseif((${ssl_major} EQUAL "3") AND ((${ssl_minor} EQUAL "0") OR (${ssl_minor} EQUAL "1")))
-+  elseif(${ssl_major} EQUAL "3")
-     MESSAGE(STATUS "Use SSL API VERSION 3.${ssl_minor} for civetweb")
-     target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_3_0)
-     set(link_ssl ON)
--- 
-2.45.2
-
diff --git a/root-stress.patch b/root-stress.patch
deleted file mode 100644
index bf7f468..0000000
--- a/root-stress.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 706c94ca916387287f7459c984d61439e52c1aba Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 2 Jun 2024 06:19:43 +0200
-Subject: [PATCH] Adjust stressGraphics.ref
-
----
- test/stressGraphics.ref | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 37077a2fb9..9d5cd0352d 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -7,13 +7,13 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-     6       430        50     12669        50      9558       100      5325       700       471        50
-     7      4980        50     13893        50     16143      1300     12230       500      5011        70
-     8      5442        80     13473        50     18430       700     12398       300      5469        80
--    9      9253       100     14377       100     19851      2400     12199       900      9283       100
-+    9      9253       100     14377       150     19851      2400     12199       900      9283       100
-    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
-    11     12971       100     14444        50     34063      2000     32033      1200     12864       150
-    12      7674       100     13533        50     83557      3000     38505      4000      7720       150
-    13      5600       400     13242       300     16881       400     15063       800      5638       400
-    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
--   15     15690      5000     17179       200     23076      9500     14232      1000     10437      5000
-+   15     15690      5000     17179       200     23076      9500     14232      1500     10437      5000
-    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       150     27511     11000     16867       600     20721       400
-    18     15894       100     19305       200     27187     10300     15925       350     15925       100
--- 
-2.45.1
-
diff --git a/root-tmva-sofie-Fix-Tile-operator.patch b/root-tmva-sofie-Fix-Tile-operator.patch
new file mode 100644
index 0000000..1bf2667
--- /dev/null
+++ b/root-tmva-sofie-Fix-Tile-operator.patch
@@ -0,0 +1,79 @@
+From ef1f3bba9059cd2e61d7de5f46fbfc26c4746ebc Mon Sep 17 00:00:00 2001
+From: moneta <lorenzo.moneta@cern.ch>
+Date: Thu, 19 Dec 2024 15:22:37 +0100
+Subject: [PATCH] [tmva][sofie] Fix Tile operator
+
+Fix the casting of the input repeats vector data of the Tile operator.
+The type of data should be int64_t and not size_t
+The previous code could have some issue when the size of size_t is 32 bits
+---
+ tmva/sofie/inc/TMVA/ROperator_Tile.hxx | 31 ++++++++++++++++----------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/tmva/sofie/inc/TMVA/ROperator_Tile.hxx b/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
+index 869cd55d9a439..3686db1e0914a 100644
+--- a/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
++++ b/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
+@@ -51,12 +51,17 @@ public:
+       }
+       fShapeInput=model.GetTensorShape(fNInput);
+ 
+-         // Retrieve the data pointer for the repeats tensor
++      // if repeats vector is not initialized we cannot deduce shape of output
++      // not support for time being this case
++      if (!model.IsInitializedTensor(fNRepeats)) {
++         throw std::runtime_error("TMVA SOFIE Tile Op: non-initialized repeats input is not supported");
++      }
++
++      // Retrieve the data pointer for the repeats tensor
+       auto repptr = model.GetInitializedTensorData(fNRepeats);
+       // Cast the raw pointer to the appropriate type (size_t*)
+-      auto repeat_shape = static_cast<size_t*>(repptr.get());
+-
+-      if (repeat_shape == nullptr) {
++      auto repeats_data = static_cast<int64_t*>(repptr.get());
++      if (repeats_data == nullptr) {
+         throw std::runtime_error("Failed to retrieve the data for the repeats tensor.");
+       }
+       // Get the shape of the repeats tensor to determine the number of elements
+@@ -66,12 +71,18 @@ public:
+          throw std::runtime_error("Repeats tensor is not 1D.");
+       }
+       size_t num_elements = repeats_shape[0];
+-      // Convert the data to a vector
+-      std::vector<size_t> repeats_vector(repeat_shape, repeat_shape + num_elements);
++      // Convert the data to a vector of size_t
++      std::vector<size_t> repeats_vector(num_elements);
++      std::copy(repeats_data, repeats_data + num_elements, repeats_vector.begin());
++
+ 
+       fShapeY = ShapeInference({fShapeInput,repeats_vector})[0];
+ 
+       model.AddIntermediateTensor(fNY, model.GetTensorType(fNInput), fShapeY);
++
++      if (model.Verbose())
++         std::cout <<  "Tile: " << fNInput << " " << ConvertShapeToString(fShapeInput) << " -> " << fNY << " with shape " << ConvertShapeToString(fShapeY)
++            << " given repeats " << ConvertShapeToString(repeats_vector) << std::endl;
+    }
+ 
+    std::string Generate(std::string OpName){
+@@ -89,17 +100,13 @@ public:
+       std::string output = "tensor_" + fNY;
+       out << "///-------- Tile operator\n";
+       out << "{\n"; // add scope to re-use same names
+-      out << "std::vector<int> input_shape = " << ConvertShapeToString(fShapeInput) << ";\n";
+-      std::vector<size_t> repeats = fShapeY;
+-      for (size_t i = 0; i < repeats.size(); i++)
+-         repeats[i] /= fShapeInput[i];
++      out << "const int input_shape[" << fShapeInput.size() << "] = " << ConvertShapeToString(fShapeInput) << ";\n";
+ 
+-      out << "std::vector<int> repeats = " << ConvertShapeToString(repeats) << ";\n";
+       out << "int inputLength = " << ConvertShapeToLength(fShapeInput) << ";\n";
+       out << "int s = 1;\n";
+       // loop from inverse dim order
+       out << "for (int i = " << fShapeInput.size()-1 << "; i >=0; i--) {\n";
+-      out << SP << "int r = repeats[i];\n";
++      out << SP << "int r = tensor_" << fNRepeats << "[i];\n";
+       // we cannot exclude case where repeats=1 since we need offset
+       //out << SP << "if (r == 1 && i < " << fShapeInput.size()-1 <<  ") continue;\n";
+       out << SP << "int i_offset = 0, o_offset = 0;\n";
diff --git a/root-write-array.patch b/root-write-array.patch
deleted file mode 100644
index 30b5945..0000000
--- a/root-write-array.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From a7be6f726b13a7ccf1c46dec35f53520781159df Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 7 Jun 2024 06:49:39 +0200
-Subject: [PATCH] Put back check for n = 0
-
----
- io/io/src/TBufferFile.cxx | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/io/io/src/TBufferFile.cxx b/io/io/src/TBufferFile.cxx
-index 81e0f95e02..b5b7ef9831 100644
---- a/io/io/src/TBufferFile.cxx
-+++ b/io/io/src/TBufferFile.cxx
-@@ -1948,6 +1948,8 @@ void TBufferFile::WriteArrayDouble32(const Double_t *d, Int_t n, TStreamerElemen
- 
- void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(UChar_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -1974,6 +1976,8 @@ void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -1995,6 +1999,8 @@ void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n)
- 
- void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2023,6 +2029,8 @@ void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Short_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2054,7 +2062,8 @@ void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n)
- {
--   
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = 4;
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2086,6 +2095,8 @@ void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = 8;
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2108,6 +2119,8 @@ void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = 8;
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2128,6 +2141,8 @@ void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Long64_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2154,6 +2169,8 @@ void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2185,6 +2202,8 @@ void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n)
- 
- void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Double_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2212,6 +2231,8 @@ void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n)
- 
- void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerElement *ele)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
-@@ -2270,6 +2291,8 @@ void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerE
- 
- void TBufferFile::WriteFastArrayDouble32(const Double_t *d, Long64_t n, TStreamerElement *ele)
- {
-+   if (n == 0) return;
-+
-    constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t));
-    const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-    if (n < 0 || n > maxElements)
--- 
-2.45.2
-
diff --git a/root.spec b/root.spec
index 9a0316e..b00cbc1 100644
--- a/root.spec
+++ b/root.spec
@@ -24,9 +24,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.32.08
+Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -49,6 +49,9 @@ Source6:	application-x-root.png
 Source7:	JupyROOT-on-EPEL
 #		Script to generate Source0
 Source8:	%{name}-get-src.sh
+#		Clad is a source-transformation automatic differentiation (AD)
+#		library for C++, implemented as a plugin for the Clang compiler
+Source9:	https://github.com/vgvassilev/clad/archive/v1.7/clad-1.7.tar.gz
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
@@ -61,15 +64,15 @@ Patch2:		%{name}-dont-install-minicern.patch
 Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
-#		Adjust stress graphics reference
-#		https://github.com/root-project/root/pull/15735
-Patch5:		%{name}-stress.patch
-#		Avoid segmentation fault on ix86
-#		https://github.com/root-project/root/issues/15738
-#		https://github.com/root-project/root/pull/15780
-Patch6:		%{name}-write-array.patch
-#		Backport build fix from upstream
-Patch7:		%{name}-allow-any-openssl-3.x-with-civetweb.patch
+#		Fix compilation of TMVA SOFIE parser on s390x
+#		https://github.com/root-project/root/pull/17307
+Patch5:		%{name}-Fix-compilation-on-s390x.patch
+#		Make -DCLAD_SOURCE_DIR option work
+#		https://github.com/root-project/root/pull/17308
+Patch6:		%{name}-Make-DCLAD_SOURCE_DIR-option-work.patch
+#		Fix segmentation fault during testing on ix86
+#		https://github.com/root-project/root/pull/17314
+Patch7:		%{name}-tmva-sofie-Fix-Tile-operator.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1267,6 +1270,8 @@ Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
+#		Dataframe helpers are now part of core
+Obsoletes:	%{name}-roofit-dataframe-helpers < 6.34.00
 
 %description roofit-core
 The RooFit packages provide a toolkit for modeling the expected
@@ -1329,28 +1334,6 @@ multiple times for different vector instuction set architectures and
 the optimal code is executed during runtime, as a result of an
 automatic hardware detection mechanism that this library contains.
 
-%if %{dataframe}
-%package roofit-dataframe-helpers
-Summary:	RooFit DaraFrame helpers
-License:	BSD-2-Clause
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description roofit-dataframe-helpers
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains DaraFrame helper classes for RooFit
-%endif
-
 %package roofit-hs3
 Summary:	RooFit HS3
 License:	BSD-2-Clause
@@ -1937,7 +1920,7 @@ This package contains utility functions for ntuples.
 %endif
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -a 9
 
 %patch -P0 -p1
 %patch -P1 -p1
@@ -1987,9 +1970,11 @@ rm etc/notebook/JsMVA/css/*.min.css
 install -p -m 644 %{SOURCE7} bindings/jupyroot
 
 %build
+%if %{?fedora}%{!?fedora:0} == 40
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
 %define _lto_cflags %{nil}
+%endif
 
 unset QTDIR
 unset QTLIB
@@ -2009,9 +1994,8 @@ done
        -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-       -DPython3_EXECUTABLE=%{__python3} \
+       -DPython3_EXECUTABLE:PATH=%{__python3} \
        -Dgnuinstall:BOOL=ON \
-       -Dbuiltin_afterimage:BOOL=ON \
        -Dbuiltin_cfitsio:BOOL=OFF \
        -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_cling:BOOL=ON \
@@ -2054,11 +2038,10 @@ done
        -Dccache:BOOL=OFF \
        -Ddistcc:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
-       -Dclad:BOOL=OFF \
+       -Dclad:BOOL=ON \
+       -DCLAD_SOURCE_DIR:PATH=${PWD}/clad-1.7 \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
-       -Dcudnn:BOOL=OFF \
-       -Dcxxmodules:BOOL=OFF \
        -Ddaos:BOOL=OFF \
 %if %{dataframe}
        -Ddataframe:BOOL=ON \
@@ -2074,7 +2057,10 @@ done
        -Dfitsio:BOOL=ON \
        -Dfortran:BOOL=ON \
        -Dgdml:BOOL=ON \
+       -Dgeom:BOOL=ON \
+       -Dgeombuilder:BOOL=ON \
        -Dgviz:BOOL=ON \
+       -Dhtml:BOOL=ON \
        -Dhttp:BOOL=ON \
        -Dimt:BOOL=ON \
        -Dlibcxx:BOOL=OFF \
@@ -2129,6 +2115,7 @@ done
        -Dssl:BOOL=ON \
        -Dtmva:BOOL=ON \
        -Dtmva-cpu:BOOL=ON \
+       -Dtmva-cudnn:BOOL=OFF \
        -Dtmva-gpu:BOOL=OFF \
        -Dtmva-pymva:BOOL=ON \
        -Dtmva-rmva:BOOL=ON \
@@ -2137,6 +2124,7 @@ done
 %else
        -Dtmva-sofie:BOOL=OFF \
 %endif
+       -Dtpython:BOOL=ON \
        -Dunfold:BOOL=ON \
        -Dunuran:BOOL=ON \
 %if %{?fedora}%{!?fedora:0}
@@ -2154,6 +2142,7 @@ done
        -Dxrootd:BOOL=ON \
        -Dfail-on-missing:BOOL=ON \
        -Dtesting:BOOL=ON \
+       -Dtestsupport:BOOL=ON \
        -Dtest_distrdf_pyspark:BOOL=OFF \
        -Dtest_distrdf_dask:BOOL=OFF \
        -Dclingtest:BOOL=OFF \
@@ -2274,7 +2263,6 @@ sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \
        %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationClassificationKeras.py \
        %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationRegressionKeras.py \
@@ -2293,7 +2281,6 @@ rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
-rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
@@ -2303,13 +2290,11 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TProofMgr/P010_TXProofMgr.C
-rm TProofMonSender/P010_TProofMonSenderML.C
 rm TProofServ/P010_TXProofServ.C
 rm TSlave/P010_TXSlave.C
 rm TSQLServer/P040_TOracleServer.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 rm TVirtualGLImp/P020_TGWin32GL.C
-rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
 rmdir TProofMgr
@@ -2408,7 +2393,7 @@ popd
 #   root://eospublic.cern.ch//eos/opendata/cms/derived-data/
 #   AOD2NanoAODOutreachTool/Run2012BC_DoubleMuParked_Muons.root
 #
-# - gtest-tree-treeplayer-test-treeprocessormt-remotefiles
+# - gtest-tree-treeplayer-treeprocessormt-remotefiles
 # - tutorial-dataframe-df103_NanoAODHiggsAnalysis(-py)?
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
@@ -2438,20 +2423,20 @@ popd
 #   reads input data over network
 #   http://root.cern.ch/files/tutorials/GlobalLandTemperaturesByCity.csv
 #
-# - gtest-net-davix-test-RRawFileDavix
+# - gtest-net-davix-RRawFileDavix
 #   reads input file over network
 #   http://root.cern.ch/files/davix.test
 #
-# - gtest-net-netxng-test-RRawFileNetXNG
+# - gtest-net-netxng-RRawFileNetXNG
 #   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/xrootd.test
 #
-# - gtest-net-netxng-test-TNetXNGFileTest
+# - gtest-net-netxng-TNetXNGFileTest
 #   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
 #
-# - gtest-tmva-tmva-test-rreader
-# - gtest-tmva-tmva-test-rstandardscaler
+# - gtest-tmva-tmva-rreader
+# - gtest-tmva-tmva-rstandardscaler
 # - tutorial-tmva-tmva003_RReader
 # - tutorial-tmva-tmva004_RStandardScaler
 #   reads input data over network
@@ -2484,7 +2469,7 @@ tutorial-multicore-imt101_parTreeProcessing|\
 tutorial-dataframe-df..._SQlite|\
 tutorial-dataframe-df033_Describe-py|\
 tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
-gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
+gtest-tree-treeplayer-treeprocessormt-remotefiles|\
 tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
 tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
 tutorial-dataframe-df105_WBosonAnalysis-py|\
@@ -2496,11 +2481,11 @@ tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
 tutorial-v7-ntuple-ntpl004_dimuon|\
 tutorial-v7-ntuple-ntpl008_import|\
 tutorial-v7-ntuple-ntpl011_global_temperatures|\
-gtest-net-davix-test-RRawFileDavix|\
-gtest-net-netxng-test-RRawFileNetXNG|\
-gtest-net-netxng-test-TNetXNGFileTest|\
-gtest-tmva-tmva-test-rreader|\
-gtest-tmva-tmva-test-rstandardscaler|\
+gtest-net-davix-RRawFileDavix|\
+gtest-net-netxng-RRawFileNetXNG|\
+gtest-net-netxng-TNetXNGFileTest|\
+gtest-tmva-tmva-rreader|\
+gtest-tmva-tmva-rstandardscaler|\
 tutorial-tmva-tmva003_RReader|\
 tutorial-tmva-tmva004_RStandardScaler|\
 tutorial-tmva-tmva103_Application|\
@@ -2510,6 +2495,42 @@ tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
+# gtest-roofit-roofit-vectorisedPDFs-testLandau:
+# Expected equality of these values:
+#   nFarOff
+#     Which is: 1
+#   0u
+#     Which is: 0
+#
+# test-stressgraphics-firefox-skip3d:
+# requires firefox...
+#
+# gtest-tree-treeplayer-treetreeplayertestUnit:
+# segmentation fault
+#
+# tutorial-webcanv-fonts_ttf.cxx:
+# Requires web graphics
+#
+# tutorial-roofit-rf617_simulation_based_inference_multidimensional-py:
+# from sklearn.neural_network import MLPClassifier
+#
+# tutorial-roofit-rf618_mixture_models-py:
+# import xgboost as xgb
+excluded="${excluded}|\
+gtest-roofit-roofit-vectorisedPDFs-testLandau|\
+test-stressgraphics-firefox-skip3d|\
+gtest-tree-treeplayer-treetreeplayertestUnit|\
+tutorial-webcanv-fonts_ttf.cxx|\
+tutorial-roofit-rf617_simulation_based_inference_multidimensional-py|\
+tutorial-roofit-rf618_mixture_models-py"
+
+# Test using tensorflow and torch
+# Disabled for Python >= 3.12, but must be excluded for Python < 3.12
+excluded="${excluded}|\
+pyunittests-bindings-pyroot-pythonizations-batchgen|\
+test-import-tensorflow|\
+test-import-torch"
+
 %if ! %{pandas}
 # - test-import-pandas
 # - tutorial-dataframe-df026_AsNumpyArrays-py
@@ -2524,14 +2545,10 @@ tutorial-roofit-rf409_NumPyPandasToRooFit-py"
 %endif
 
 %ifarch %{ix86}
-# - gtest-tree-dataframe-test-dataframe-concurrency
+# - gtest-tree-dataframe-dataframe-concurrency
 #   "There's already an active task arena."
-#
-# - gtest-tree-dataframe-test-dataframe-simple
-#   free(): invalid pointer
 excluded="${excluded}|\
-gtest-tree-dataframe-test-dataframe-concurrency|\
-gtest-tree-dataframe-test-dataframe-simple"
+gtest-tree-dataframe-dataframe-concurrency"
 %endif
 
 %ifarch aarch64
@@ -2543,60 +2560,62 @@ tutorial-tmva-RBatchGenerator_filters_vectors-py"
 %endif
 
 %ifarch %{power64}
-# - test-stressgraphics(-interpreted)
-#   *** stack smashing detected ***: terminated
-#
 # - tutorial-roostats-IntervalExamples-py
 #   *** Break *** segmentation violation
 excluded="${excluded}|\
-test-stressgraphics|\
+gtest-tree-ntuple-v7-ntuple-evolution|\
 tutorial-roostats-IntervalExamples-py"
 %endif
 
 %ifarch s390x
-# - gtest-roofit-roofitcore-test-testNaNPacker
-# - gtest-roofit-roofitcore-test-testLikelihoodGradientJob
+# - gtest-roofit-roofitcore-testNaNPacker
+# - gtest-roofit-roofitcore-testLikelihoodGradientJob
 #   Uses "Packed NaN" feature, not implemented for big endian.
 excluded="${excluded}|\
-gtest-roofit-roofitcore-test-testNaNPacker|\
-gtest-roofit-roofitcore-test-testLikelihoodGradientJob"
+gtest-roofit-roofitcore-testNaNPacker|\
+gtest-roofit-roofitcore-testLikelihoodGradientJob"
 
-# - gtest-core-dictgen-test-dictgen-base
-# - gtest-tree-dataframe-test-dataframe-unified-constructor
+# - gtest-core-dictgen-dictgen-base
+# - gtest-tmva-sofie-TestCustomModelsFromONNX
+# - gtest-tree-dataframe-dataframe-unified-constructor
 #
-# - gtest-tree-dataframe-test-datasource-ntuple
-# - gtest-tree-ntuple-v7-test-ntuple-basics
-# - gtest-tree-ntuple-v7-test-ntuple-bulk
-# - gtest-tree-ntuple-v7-test-ntuple-compat
-# - gtest-tree-ntuple-v7-test-ntuple-endian
-# - gtest-tree-ntuple-v7-test-ntuple-extended
-# - gtest-tree-ntuple-v7-test-ntuple-friends
-# - gtest-tree-ntuple-v7-test-ntuple-merger
-# - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-modelext
-# - gtest-tree-ntuple-v7-test-ntuple-packing
-# - gtest-tree-ntuple-v7-test-ntuple-parallel-writer
-# - gtest-tree-ntuple-v7-test-ntuple-project
-# - gtest-tree-ntuple-v7-test-ntuple-serialize
-# - gtest-tree-ntuple-v7-test-ntuple-show
-# - gtest-tree-ntuple-v7-test-ntuple-storage
-# - gtest-tree-ntuple-v7-test-ntuple-storage-daos
-# - gtest-tree-ntuple-v7-test-ntuple-types
-# - gtest-tree-ntuple-v7-test-ntuple-view
-# - gtest-tree-ntuple-v7-test-rfield-class
-# - gtest-tree-ntuple-v7-test-rfield-variant
-# - gtest-tree-ntuple-v7-test-rfield-vector
-# - gtest-tree-ntupleutil-v7-test-ntuple-importer
-# - gtest-tree-ntupleutil-v7-test-ntuple-inspector
+# - gtest-tree-dataframe-datasource-ntuple
+# - gtest-tree-ntuple-v7-ntuple-basics
+# - gtest-tree-ntuple-v7-ntuple-bulk
+# - gtest-tree-ntuple-v7-ntuple-cast
+# - gtest-tree-ntuple-v7-ntuple-compat
+# - gtest-tree-ntuple-v7-ntuple-extended
+# - gtest-tree-ntuple-v7-ntuple-friends
+# - gtest-tree-ntuple-v7-ntuple-index
+# - gtest-tree-ntuple-v7-ntuple-merger
+# - gtest-tree-ntuple-v7-ntuple-model
+# - gtest-tree-ntuple-v7-ntuple-modelext
+# - gtest-tree-ntuple-v7-ntuple-multi-column
+# - gtest-tree-ntuple-v7-ntuple-packing
+# - gtest-tree-ntuple-v7-ntuple-parallel-writer
+# - gtest-tree-ntuple-v7-ntuple-project
+# - gtest-tree-ntuple-v7-ntuple-processor
+# - gtest-tree-ntuple-v7-ntuple-show
+# - gtest-tree-ntuple-v7-ntuple-storage
+# - gtest-tree-ntuple-v7-ntuple-storage-daos
+# - gtest-tree-ntuple-v7-ntuple-types
+# - gtest-tree-ntuple-v7-ntuple-view
+# - gtest-tree-ntuple-v7-rfield-class
+# - gtest-tree-ntuple-v7-rfield-streamer
+# - gtest-tree-ntuple-v7-rfield-variant
+# - gtest-tree-ntuple-v7-rfield-vector
+# - gtest-tree-ntupleutil-v7-ntuple-importer
+# - gtest-tree-ntupleutil-v7-ntuple-inspector
 #   https://github.com/root-project/root/issues/12426
 #
-# - pyunittests-distrdf-unit-backend-test-graph-caching
-# - pyunittests-pyroot-pyz-rtensor
-# - pyunittests-pyroot-pyz-stl-vector
+# - pyunittests-bindings-experimental-distrdf-backend-distrdf-unit-backend-graph-caching
+# - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor
+# - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector
 # - tutorial-dataframe-df006_ranges-py
 # - tutorial-fit-combinedFit-py
 # - tutorial-fit-NumericalMinimization-py
 # - tutorial-math-exampleFunction-py
+# - tutorial-pyroot-hsum-py
 # - tutorial-rcanvas-rbox-py
 #   https://github.com/root-project/root/issues/12429
 #
@@ -2608,39 +2627,44 @@ gtest-roofit-roofitcore-test-testLikelihoodGradientJob"
 # - test-stresshistogram
 # - test-stresshistogram-interpreted
 excluded="${excluded}|\
-gtest-core-dictgen-test-dictgen-base|\
-gtest-tree-dataframe-test-dataframe-unified-constructor|\
-gtest-tree-dataframe-test-datasource-ntuple|\
-gtest-tree-ntuple-v7-test-ntuple-basics|\
-gtest-tree-ntuple-v7-test-ntuple-bulk|\
-gtest-tree-ntuple-v7-test-ntuple-compat|\
-gtest-tree-ntuple-v7-test-ntuple-endian|\
-gtest-tree-ntuple-v7-test-ntuple-extended|\
-gtest-tree-ntuple-v7-test-ntuple-friends|\
-gtest-tree-ntuple-v7-test-ntuple-merger|\
-gtest-tree-ntuple-v7-test-ntuple-minifile|\
-gtest-tree-ntuple-v7-test-ntuple-modelext|\
-gtest-tree-ntuple-v7-test-ntuple-packing|\
-gtest-tree-ntuple-v7-test-ntuple-parallel-writer|\
-gtest-tree-ntuple-v7-test-ntuple-project|\
-gtest-tree-ntuple-v7-test-ntuple-serialize|\
-gtest-tree-ntuple-v7-test-ntuple-show|\
-gtest-tree-ntuple-v7-test-ntuple-storage|\
-gtest-tree-ntuple-v7-test-ntuple-storage-daos|\
-gtest-tree-ntuple-v7-test-ntuple-types|\
-gtest-tree-ntuple-v7-test-ntuple-view|\
-gtest-tree-ntuple-v7-test-rfield-class|\
-gtest-tree-ntuple-v7-test-rfield-variant|\
-gtest-tree-ntuple-v7-test-rfield-vector|\
-gtest-tree-ntupleutil-v7-test-ntuple-importer|\
-gtest-tree-ntupleutil-v7-test-ntuple-inspector|\
-pyunittests-distrdf-unit-backend-test-graph-caching|\
-pyunittests-pyroot-pyz-rtensor|\
-pyunittests-pyroot-pyz-stl-vector|\
+gtest-core-dictgen-dictgen-base|\
+gtest-tmva-sofie-TestCustomModelsFromONNX|\
+gtest-tree-dataframe-dataframe-unified-constructor|\
+gtest-tree-dataframe-datasource-ntuple|\
+gtest-tree-ntuple-v7-ntuple-basics|\
+gtest-tree-ntuple-v7-ntuple-bulk|\
+gtest-tree-ntuple-v7-ntuple-cast|\
+gtest-tree-ntuple-v7-ntuple-compat|\
+gtest-tree-ntuple-v7-ntuple-extended|\
+gtest-tree-ntuple-v7-ntuple-friends|\
+gtest-tree-ntuple-v7-ntuple-index|\
+gtest-tree-ntuple-v7-ntuple-merger|\
+gtest-tree-ntuple-v7-ntuple-model\$\$|\
+gtest-tree-ntuple-v7-ntuple-modelext|\
+gtest-tree-ntuple-v7-ntuple-multi-column|\
+gtest-tree-ntuple-v7-ntuple-packing|\
+gtest-tree-ntuple-v7-ntuple-parallel-writer|\
+gtest-tree-ntuple-v7-ntuple-project|\
+gtest-tree-ntuple-v7-ntuple-processor|\
+gtest-tree-ntuple-v7-ntuple-show|\
+gtest-tree-ntuple-v7-ntuple-storage\$\$|\
+gtest-tree-ntuple-v7-ntuple-storage-daos|\
+gtest-tree-ntuple-v7-ntuple-types|\
+gtest-tree-ntuple-v7-ntuple-view|\
+gtest-tree-ntuple-v7-rfield-class|\
+gtest-tree-ntuple-v7-rfield-streamer|\
+gtest-tree-ntuple-v7-rfield-variant|\
+gtest-tree-ntuple-v7-rfield-vector|\
+gtest-tree-ntupleutil-v7-ntuple-importer|\
+gtest-tree-ntupleutil-v7-ntuple-inspector|\
+pyunittests-bindings-experimental-distrdf-backend-distrdf-unit-backend-graph-caching|\
+pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor|\
+pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector|\
 tutorial-dataframe-df006_ranges-py|\
 tutorial-fit-combinedFit-py|\
 tutorial-fit-NumericalMinimization-py|\
 tutorial-math-exampleFunction-py|\
+tutorial-pyroot-hsum-py|\
 tutorial-rcanvas-rbox-py|\
 tutorial-tree-drawsparse|\
 test-stresshistofit\$\$|\
@@ -2653,9 +2677,9 @@ test-stresshistogram-interpreted"
 %ifarch aarch64 %{power64} s390x
 # Fails with gcc 14 on aarch64, ppc64le and s390x
 # https://github.com/root-project/root/issues/14446
-# - gtest-math-matrix-test-testMatrixTSparse
+# - gtest-math-matrix-testMatrixTSparse
 excluded="${excluded}|\
-gtest-math-matrix-test-testMatrixTSparse"
+gtest-math-matrix-testMatrixTSparse"
 %endif
 %endif
 
@@ -2803,6 +2827,7 @@ fi
 %{_datadir}/%{name}/system.rootauthrc
 %{_datadir}/%{name}/system.rootdaemonrc
 %{_datadir}/%{name}/system.rootrc
+%{_datadir}/%{name}/valgrind-root.supp
 %{_datadir}/%{name}/valgrind-root-python.supp
 %{_mandir}/man1/system.rootdaemonrc.1*
 %dir %{_datadir}/%{name}/cmake
@@ -3254,9 +3279,7 @@ fi
 %files proof -f includelist-proof-proof
 %{_bindir}/proofserv
 %{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
 %{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
 %{_libdir}/%{name}/libProof.*
 %{_libdir}/%{name}/libProof_rdict.pcm
 %{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
@@ -3265,7 +3288,6 @@ fi
 %{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
 %{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
 %{_datadir}/%{name}/plugins/TProof/P040_TProof.C
-%{_datadir}/%{name}/valgrind-root.supp
 
 %files proof-bench -f includelist-proof-proofbench
 %{_libdir}/%{name}/libProofBench.*
@@ -3315,12 +3337,6 @@ fi
 %{_libdir}/%{name}/libRooBatchCompute.*
 %{_libdir}/%{name}/libRooBatchCompute_*
 
-%if %{dataframe}
-%files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
-%{_libdir}/%{name}/libRooFitRDataFrameHelpers.*
-%{_libdir}/%{name}/libRooFitRDataFrameHelpers_rdict.pcm
-%endif
-
 %files roofit-hs3 -f includelist-roofit-hs3
 %{_libdir}/%{name}/libRooFitHS3.*
 %{_libdir}/%{name}/libRooFitHS3_rdict.pcm
@@ -3397,30 +3413,31 @@ fi
 %dir %{_includedir}/%{name}/TMVA/DNN/CNN
 %dir %{_includedir}/%{name}/TMVA/DNN/RNN
 %license tmva/doc/LICENSE
-%exclude %{_includedir}/%{name}/TMVA/RBatchGenerator.hxx
-%exclude %{_includedir}/%{name}/TMVA/RBatchLoader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
-%exclude %{_includedir}/%{name}/TMVA/RChunkLoader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
 %exclude %{_includedir}/%{name}/TMVA/RReader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RSofieReader.hxx
 %exclude %{_includedir}/%{name}/TMVA/RStandardScaler.hxx
 %exclude %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
+%exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchGenerator.hxx
+%exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchLoader.hxx
+%exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RChunkLoader.hxx
 
 %if %{dataframe}
 %files tmva-utils
 %{_libdir}/%{name}/libTMVAUtils.*
 %{_libdir}/%{name}/libTMVAUtils_rdict.pcm
 %dir %{_includedir}/%{name}/TMVA
-%{_includedir}/%{name}/TMVA/RBatchGenerator.hxx
-%{_includedir}/%{name}/TMVA/RBatchLoader.hxx
 %{_includedir}/%{name}/TMVA/RBDT.hxx
-%{_includedir}/%{name}/TMVA/RChunkLoader.hxx
 %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
 %{_includedir}/%{name}/TMVA/RReader.hxx
 %{_includedir}/%{name}/TMVA/RSofieReader.hxx
 %{_includedir}/%{name}/TMVA/RStandardScaler.hxx
 %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
+%dir %{_includedir}/%{name}/TMVA/BatchGenerator
+%{_includedir}/%{name}/TMVA/BatchGenerator/RBatchGenerator.hxx
+%{_includedir}/%{name}/TMVA/BatchGenerator/RBatchLoader.hxx
+%{_includedir}/%{name}/TMVA/BatchGenerator/RChunkLoader.hxx
 %endif
 
 %files tmva-python -f includelist-tmva-pymva
@@ -3584,6 +3601,11 @@ fi
 %endif
 
 %changelog
+* Wed Dec 25 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-1
+- Update to 6.34.02
+- Build CLAD plugin
+- Removed package: root-roofit-dataframe-helpers
+
 * Wed Nov 27 2024 Richard W.M. Jones <rjones@redhat.com> - 6.32.08-2
 - Rebuild for libarrow 18
 
diff --git a/sources b/sources
index afea219..c6afe84 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (root-6.32.08.tar.xz) = 268f68745bcf545aff5b3ad4208e8b6b373800da3885cc3d7a8083a6b4ab8c92788a4da0163b3344c24cd62e50a7b74319bc65ee519de4e53f4394330687a2be
+SHA512 (root-6.34.02.tar.xz) = 565218eb073ecec509851c99c9ac018bb9de1abae4be023fe2862e28aa967a4a353d77fce1b8173fea87ed17b943bcd2bbce69a55573a1686f138a6495612fa5
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f
+SHA512 (clad-1.7.tar.gz) = ff9856ed4901625b4c31bc4b5ac97f464667f58c567caaab8b2a2567de4e0908ff0fffbb566fe728fc6184d3d6bc156bbabacf24d83009e36b2956d535171066

From 8d9fc44478f580646c938ca338aad05290c20d6c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 12 Jan 2025 10:48:54 +0100
Subject: [PATCH 288/344] Adjust stressGraphics.ref Build for EPEL 10 Disable
 the R interface for EPEL 10 (R not yet abailable) Enable uring support for
 EPEL 9 (supported in kernel since RHEL 9.3)

---
 root-Adjust-test-stressGraphics.ref.patch | 39 ++++++++++
 root.spec                                 | 92 ++++++++++++++++++-----
 2 files changed, 113 insertions(+), 18 deletions(-)
 create mode 100644 root-Adjust-test-stressGraphics.ref.patch

diff --git a/root-Adjust-test-stressGraphics.ref.patch b/root-Adjust-test-stressGraphics.ref.patch
new file mode 100644
index 0000000..92db744
--- /dev/null
+++ b/root-Adjust-test-stressGraphics.ref.patch
@@ -0,0 +1,39 @@
+From b0f07c642c8edb62788f8519dcdb322f99395661 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 9 Jan 2025 21:44:14 +0100
+Subject: [PATCH] Adjust test/stressGraphics.ref
+
+One of the tests fails with just a few bytes on latest Fedora
+releases. Failures can be seen for both test-stressgraphics and
+test-stressgraphics-interpreted. Failures are reported for sizes being
+201, 202 or 203 bytes larger than the reference, with thw limit
+currently set to 200 bytes.
+
+Test 19: TGaxis 3 (Time on axis)................................... OK
+         PDF output......................................... 19 FAILED
+         Result    = 42723
+         Reference = 42926
+         Error     = 203 (was 200)
+         JPG output................................................ OK
+         PNG output................................................ OK
+         C file result............................................. OK
+---
+ test/stressGraphics.ref | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
+index 28ac0b9b7b..e1382d2d45 100644
+--- a/test/stressGraphics.ref
++++ b/test/stressGraphics.ref
+@@ -17,7 +17,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       150     27511     11000     16867       600     20721       400
+    18     15894       100     19305       200     27187     10300     15925       350     15925       100
+-   19     22521       300     42926       200     43868     17000     19232     11000     22729       300
++   19     22521       300     42926       250     43868     17000     19232     11000     22729       300
+    20      3664       600     14437       150     19824      6300     10396       900      4220       600
+    21     17608       600     13900       150     49440      6300     37586      9000      5938       600
+    22      4866       600     14162       100     30889     10050     21311      1800      4845       600
+-- 
+2.47.1
+
diff --git a/root.spec b/root.spec
index b00cbc1..431d547 100644
--- a/root.spec
+++ b/root.spec
@@ -20,13 +20,20 @@
 %global pandas 0
 %endif
 
+%if %{?rhel}%{!?rhel:0} == 10
+# R not yet available in EPEL 10
+%global rrr 0
+%else
+%global rrr 1
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -73,6 +80,9 @@ Patch6:		%{name}-Make-DCLAD_SOURCE_DIR-option-work.patch
 #		Fix segmentation fault during testing on ix86
 #		https://github.com/root-project/root/pull/17314
 Patch7:		%{name}-tmva-sofie-Fix-Tile-operator.patch
+#		Adjust test/stressGraphics.ref
+#		https://github.com/root-project/root/pull/17398
+Patch8:		%{name}-Adjust-test-stressGraphics.ref.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -134,8 +144,10 @@ BuildRequires:	xrootd-client-devel >= 1:5.0.0
 BuildRequires:	cfitsio-devel
 #		Davix version >= 0.6.4, but not between 0.6.8 and 0.7.0
 BuildRequires:	davix-devel >= 0.7.1
+%if %{rrr}
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
+%endif
 BuildRequires:	readline-devel
 BuildRequires:	tbb-devel >= 2020
 BuildRequires:	libuuid-devel
@@ -146,9 +158,10 @@ BuildRequires:	flexiblas-devel
 %if ! %{bundlejson}
 BuildRequires:	json-devel >= 3.9
 %endif
-%if %{?fedora}%{!?fedora:0}
-#		Disable uring in EPEL 8 and 9 (liburing is available,
-#		but uring not supported by the kernel)
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+#		Disable uring in EPEL 8 (liburing is available,
+#		but uring not supported by the RHEL 8 kernel)
+#		Supported by the RHEL kernel since RHEL 9.3
 BuildRequires:	liburing-devel
 %endif
 %if %{tmvasofieparser}
@@ -425,6 +438,7 @@ A layer on top of RDataFrame to enable distributed computations. It is
 a port of the previously known PyRDF python package.
 %endif
 
+%if %{rrr}
 %package r
 Summary:	R interface for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -451,6 +465,7 @@ Requires:	%{name}-r%{?_isa} = %{version}-%{release}
 %description r-tools
 This package contains a minimizer module for ROOT that uses the ROOT
 R interface.
+%endif
 
 %package genetic
 Summary:	Genetic algorithms for ROOT
@@ -476,6 +491,7 @@ This package contains a library for defining geometries in ROOT.
 Summary:	Geometry builder library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 #		Package split (geom-builder and geom-painter from geom)
@@ -524,6 +540,8 @@ This package contains the 2-dimensional graphics library for ROOT.
 Summary:	AfterImage graphics renderer for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-postscript%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -630,6 +648,7 @@ This package contains a library for defining event displays in ROOT.
 Summary:	GL renderer for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-asimage%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
@@ -822,7 +841,7 @@ from marked up sources.
 %package io
 Summary:	Input/output of ROOT objects
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0}
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
 Requires:	liburing-devel
 %endif
 
@@ -913,6 +932,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 
 %description mathcore
 This package contains the MathCore library for ROOT.
@@ -1100,6 +1120,7 @@ This package contains the ROOT networking library.
 %package net-rpdutils
 Summary:	Authentication utilities used by xproofd
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-rpdutils
 This package contains authentication utilities used by xproofd.
@@ -1201,6 +1222,7 @@ Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
+Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
@@ -1266,7 +1288,10 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-multiprocess%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-zmq%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1317,9 +1342,6 @@ This package contains RooFit classes that use the mathmore library.
 Summary:	Optimized computation functions for PDFs
 License:	BSD-2-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description roofit-batchcompute
 While fitting, a significant amount of time and processing power is
@@ -1344,7 +1366,6 @@ Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 
 %description roofit-hs3
 When using RooFit, statistical models can be conveniently handled and
@@ -1425,6 +1446,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 
 %description hist-factory
@@ -1437,6 +1459,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-fitpanel%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
@@ -1447,6 +1470,7 @@ Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-hs3%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 
 %description xroofit
 The RooFit packages provide a toolkit for modeling the expected
@@ -1571,6 +1595,7 @@ Requires:	python%{python3_pkgversion}-numpy
 %description tmva-python
 Python integration with TMVA.
 
+%if %{rrr}
 %package tmva-r
 Summary:	Toolkit for multivariate data analysis (R)
 License:	BSD-3-Clause
@@ -1581,11 +1606,13 @@ Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 
 %description tmva-r
 R integration with TMVA.
+%endif
 
 %package tmva-sofie
 Summary:	ROOT/TMVA SOFIE (System for Optimized Fast Inference code Emit)
 License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
 %description tmva-sofie
 ROOT/TMVA SOFIE (System for Optimized Fast Inference code Emit)
@@ -1617,6 +1644,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xml%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-viewer%{?_isa} = %{version}-%{release}
 
 %description tmva-gui
@@ -1718,6 +1746,7 @@ written in python.
 %package gui-webdisplay
 Summary:	Web display for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
@@ -1755,6 +1784,7 @@ Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 
 %description gui-webgui6
 This package provides a Web based GUI for ROOT.
@@ -1794,6 +1824,7 @@ This package contains the ROOT file browser (RBrowser) and browser widgets.
 Summary:	Geometry web viewer library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom-painter%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1821,9 +1852,10 @@ This package contains graphics primitives for ROOT 7
 Summary:	Event display library for ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom-webviewer%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf3d-csg%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-browserv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1878,6 +1910,7 @@ This package contains a canvas painter extension for ROOT 7
 Summary:	GUI element for fits in ROOT (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
@@ -1913,6 +1946,9 @@ This package contains an ntuple extension for ROOT 7.
 %package tree-ntuple-utils
 Summary:	Ntuple utility library (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 
 %description tree-ntuple-utils
@@ -1930,6 +1966,7 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
+%patch -P8 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1970,7 +2007,7 @@ rm etc/notebook/JsMVA/css/*.min.css
 install -p -m 644 %{SOURCE7} bindings/jupyroot
 
 %build
-%if %{?fedora}%{!?fedora:0} == 40
+%if %{?fedora}%{!?fedora:0} == 40 || %{?rhel}%{!?rhel:0} == 10
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
 %define _lto_cflags %{nil}
@@ -2086,7 +2123,11 @@ done
 %else
        -Dqt6web:BOOL=OFF \
 %endif
+%if %{rrr}
        -Dr:BOOL=ON \
+%else
+       -Dr:BOOL=OFF \
+%endif
 %if %{roofit}
        -Droofit:BOOL=ON \
 %if %{?fedora}%{!?fedora:0} >= 40
@@ -2118,7 +2159,11 @@ done
        -Dtmva-cudnn:BOOL=OFF \
        -Dtmva-gpu:BOOL=OFF \
        -Dtmva-pymva:BOOL=ON \
+%if %{rrr}
        -Dtmva-rmva:BOOL=ON \
+%else
+       -Dtmva-rmva:BOOL=OFF \
+%endif
 %if %{tmvasofieparser}
        -Dtmva-sofie:BOOL=ON \
 %else
@@ -2127,7 +2172,7 @@ done
        -Dtpython:BOOL=ON \
        -Dunfold:BOOL=ON \
        -Dunuran:BOOL=ON \
-%if %{?fedora}%{!?fedora:0}
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
        -During:BOOL=ON \
 %else
        -During:BOOL=OFF \
@@ -2287,6 +2332,9 @@ rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
 # Remove plugin definitions for non-built and obsolete plugins
 pushd %{buildroot}%{_datadir}/%{name}/plugins
+%if ! %{rrr}
+rm ROOT@@Math@@Minimizer/P090_RMinimizer.C
+%endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TProofMgr/P010_TXProofMgr.C
@@ -2673,15 +2721,13 @@ test-stresshistogram\$\$|\
 test-stresshistogram-interpreted"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 40
-%ifarch aarch64 %{power64} s390x
-# Fails with gcc 14 on aarch64, ppc64le and s390x
+%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10
+# Fails with gcc 14 on aarch64, ppc64le and s390x (on EPEL 10 also x86_64)
 # https://github.com/root-project/root/issues/14446
 # - gtest-math-matrix-testMatrixTSparse
 excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
-%endif
 
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
@@ -2910,6 +2956,7 @@ fi
 %{python3_sitelib}/DistRDF-*.dist-info
 %endif
 
+%if %{rrr}
 %files r -f includelist-bindings-r
 %{_libdir}/%{name}/libRInterface.*
 %{_libdir}/%{name}/libRInterface_rdict.pcm
@@ -2919,6 +2966,7 @@ fi
 %{_libdir}/%{name}/libRtools.*
 %{_libdir}/%{name}/libRtools_rdict.pcm
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C
+%endif
 
 %files genetic -f includelist-math-genetic
 %{_libdir}/%{name}/libGenetic.*
@@ -3444,9 +3492,11 @@ fi
 %{_libdir}/%{name}/libPyMVA.*
 %{_libdir}/%{name}/libPyMVA_rdict.pcm
 
+%if %{rrr}
 %files tmva-r -f includelist-tmva-rmva
 %{_libdir}/%{name}/libRMVA.*
 %{_libdir}/%{name}/libRMVA_rdict.pcm
+%endif
 
 %files tmva-sofie -f includelist-tmva-sofie
 %{_libdir}/%{name}/libROOTTMVASofie.*
@@ -3601,6 +3651,12 @@ fi
 %endif
 
 %changelog
+* Sun Jan 12 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-2
+- Adjust stressGraphics.ref
+- Build for EPEL 10
+- Disable the R interface for EPEL 10 (R not yet abailable)
+- Enable uring support for EPEL 9 (supported in kernel since RHEL 9.3)
+
 * Wed Dec 25 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-1
 - Update to 6.34.02
 - Build CLAD plugin
@@ -3654,7 +3710,7 @@ fi
 * Sat Jun 08 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-2
 - Python 3.13 compatibility
 
-* Mon Jun 03 2024 Mattias Ellert <ellert@ellert.se> - 6.32.00-1
+* Mon Jun 03 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.32.00-1
 - Update to 6.32.00
 - Drop EPEL 8 build (now requires Python >= 3.7 and tbb >= 2020)
 - Dropped patches: 12
@@ -3681,7 +3737,7 @@ fi
 * Mon Mar 25 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.04-2
 - Support StandardSymbolsPS.otf
 
-* Wed Jan 31 2024 Mattias Ellert <ellert@ellert.se> - 6.30.04-1
+* Wed Jan 31 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.04-1
 - Update to 6.30.04
 - Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
   (accepted upstrem)

From 745e82c601a72e0f3a419549894a9fac3194c568 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 15 Jan 2025 06:32:29 +0100
Subject: [PATCH 289/344] Don't add dependencies on root-roofit-multiprocess
 and root-roofit-zmq to root-roofit-core for EPEL builds

---
 root.spec | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/root.spec b/root.spec
index 431d547..dca3376 100644
--- a/root.spec
+++ b/root.spec
@@ -27,13 +27,19 @@
 %global rrr 1
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 40
+%global roofitmp 1
+%else
+%global roofitmp 0
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -171,7 +177,7 @@ BuildRequires:	protobuf-devel >= 3.0
 BuildRequires:	libarrow-devel
 %endif
 %if %{roofit}
-%if %{?fedora}%{!?fedora:0} >= 40
+%if %{roofitmp}
 #		Required for roofit-multiprocess
 #		Requires new zeromq with zmq_ppoll
 BuildRequires:	zeromq-devel >= 4.3.5
@@ -410,7 +416,7 @@ Requires:	%{name}-core = %{version}-%{release}
 #		notebook package was merged with JupyROOT package
 Provides:	%{name}-notebook = %{version}-%{release}
 Obsoletes:	%{name}-notebook < 6.32.00
-Requires:	js-jsroot >= 7.7
+Requires:	js-jsroot >= 7.8
 %if %{?fedora}%{!?fedora:0}
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -1148,7 +1154,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7.7
+Requires:	js-jsroot >= 7.8
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1290,8 +1296,10 @@ Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
+%if %{roofitmp}
 Requires:	%{name}-roofit-multiprocess%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-zmq%{?_isa} = %{version}-%{release}
+%endif
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split / Library split (from roofit)
 Obsoletes:	%{name}-roofit < 6.20.00
@@ -1395,7 +1403,7 @@ suitable for adoption in different disciplines as well.
 
 This package contains the JSON interface to RooFit.
 
-%if %{?fedora}%{!?fedora:0} >= 40
+%if %{roofitmp}
 %package roofit-multiprocess
 Summary:	Multi-process support for RooFit
 License:	BSD-2-Clause
@@ -2130,7 +2138,7 @@ done
 %endif
 %if %{roofit}
        -Droofit:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} >= 40
+%if %{roofitmp}
        -Droofit_multiprocess:BOOL=ON \
 %else
        -Droofit_multiprocess:BOOL=OFF \
@@ -3397,7 +3405,7 @@ fi
 %{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
 %dir %{_includedir}/%{name}/RooFit
 
-%if %{?fedora}%{!?fedora:0} >= 40
+%if %{roofitmp}
 %files roofit-multiprocess -f includelist-roofit-multiprocess
 %{_libdir}/%{name}/libRooFitMultiProcess.*
 %dir %{_includedir}/%{name}/RooFit
@@ -3651,6 +3659,10 @@ fi
 %endif
 
 %changelog
+* Wed Jan 15 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-3
+- Don't add dependencies on root-roofit-multiprocess and root-roofit-zmq
+  to root-roofit-core for EPEL builds
+
 * Sun Jan 12 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-2
 - Adjust stressGraphics.ref
 - Build for EPEL 10

From 2ad57ba760241d470f7bceebe3bc728b9edfe7d3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 22:37:32 +0000
Subject: [PATCH 290/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index dca3376..5e7d337 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3659,6 +3659,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.34.02-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jan 15 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-3
 - Don't add dependencies on root-roofit-multiprocess and root-roofit-zmq
   to root-roofit-core for EPEL builds

From 3487b3a0607005a2c68a7ba59a4ecc790ea51dbd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 31 Jan 2025 13:22:57 +0100
Subject: [PATCH 291/344] Apply patches to fix build with gcc 15 Enable
 roofit-multiprocess for EPEL 10 (dependencies available) Rebuild for pythia8
 8.3.13

---
 root-Add-a-missing-include-to-RTensor.patch   | 26 +++++++
 ...ing-include-to-RVirtualCanvasPainter.patch | 26 +++++++
 root-Fix-out-of-bounds-error-in-pyroot.patch  | 52 ++++++++++++++
 ...-and-conflicting-function-declaratio.patch | 44 ++++++++++++
 ...x-Debug-Assertion-Failure-in-libGpad.patch | 30 ++++++++
 ...kport-fix-for-compilation-issue-with.patch | 41 +++++++++++
 root.spec                                     | 69 ++++++++++++++-----
 7 files changed, 271 insertions(+), 17 deletions(-)
 create mode 100644 root-Add-a-missing-include-to-RTensor.patch
 create mode 100644 root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
 create mode 100644 root-Fix-out-of-bounds-error-in-pyroot.patch
 create mode 100644 root-Remove-redundant-and-conflicting-function-declaratio.patch
 create mode 100644 root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
 create mode 100644 root-llvm-project-Backport-fix-for-compilation-issue-with.patch

diff --git a/root-Add-a-missing-include-to-RTensor.patch b/root-Add-a-missing-include-to-RTensor.patch
new file mode 100644
index 0000000..e5fbd5b
--- /dev/null
+++ b/root-Add-a-missing-include-to-RTensor.patch
@@ -0,0 +1,26 @@
+From cfc922131c8a977e14c6611ed991f0889b0c47c8 Mon Sep 17 00:00:00 2001
+From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
+Date: Fri, 17 Jan 2025 10:35:37 +0100
+Subject: [PATCH 2/2] Add a missing include to RTensor.
+
+In gcc-15, <cstdint> needs to be included to use fixed-size integer
+types.
+---
+ tmva/tmva/inc/TMVA/RTensor.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tmva/tmva/inc/TMVA/RTensor.hxx b/tmva/tmva/inc/TMVA/RTensor.hxx
+index ad152f219a..795cc70689 100644
+--- a/tmva/tmva/inc/TMVA/RTensor.hxx
++++ b/tmva/tmva/inc/TMVA/RTensor.hxx
+@@ -3,6 +3,7 @@
+ 
+ #include <vector>
+ #include <cstddef>     // std::size_t
++#include <cstdint>
+ #include <stdexcept>   // std::runtime_error
+ #include <sstream>     // std::stringstream
+ #include <memory>      // std::shared_ptr
+-- 
+2.48.0
+
diff --git a/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch b/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
new file mode 100644
index 0000000..4acfae1
--- /dev/null
+++ b/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
@@ -0,0 +1,26 @@
+From 2884f67f5a145ef5d2ba1f8050b2b1a543d97881 Mon Sep 17 00:00:00 2001
+From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
+Date: Fri, 17 Jan 2025 10:32:04 +0100
+Subject: [PATCH 1/2] Add a missing include to RVirtualCanvasPainter.
+
+In gcc-15, <cstdint> needs to be included when fixed-size integer types
+are used.
+---
+ graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
+index be2a467280..f5f255ec48 100644
+--- a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
++++ b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
+@@ -9,6 +9,7 @@
+ #ifndef ROOT7_RVirtualCanvasPainter
+ #define ROOT7_RVirtualCanvasPainter
+ 
++#include <cstdint>
+ #include <memory>
+ #include <functional>
+ #include <string>
+-- 
+2.48.0
+
diff --git a/root-Fix-out-of-bounds-error-in-pyroot.patch b/root-Fix-out-of-bounds-error-in-pyroot.patch
new file mode 100644
index 0000000..4a1611e
--- /dev/null
+++ b/root-Fix-out-of-bounds-error-in-pyroot.patch
@@ -0,0 +1,52 @@
+From 4bece824e886f84b7b05e08baea3762d02f892d6 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 29 Jan 2025 00:31:31 +0100
+Subject: [PATCH] Fix out-of-bounds error in pyroot
+
+ 526/1416 Test   #63: pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-tf-pycallables ..........................***Failed   75.51 sec
+test_callable (tf_pycallables.TF1.test_callable)
+Test function provided as callable ... /usr/include/c++/15/bits/stl_bvector.h:1134: std::vector<bool, _Alloc>::reference std::vector<bool, _Alloc>::operator[](size_type) [with _Alloc = std::allocator<bool>; reference = std::vector<bool>::reference; size_type = long unsigned int]: Assertion '__n < this->size()' failed.
+ *** Break *** abort
+
+===========================================================
+The lines below might hint at the cause of the crash. If you see question
+marks as part of the stack trace, try to recompile with debugging information
+enabled and export CLING_DEBUG=1 environment variable before running.
+You may get help by asking at the ROOT forum https://root.cern/forum
+preferably using the command (.forum bug) in the ROOT prompt.
+Only if you are really convinced it is a bug in ROOT then please submit a
+report at https://root.cern/bugs or (preferably) using the command (.gh bug) in
+the ROOT prompt. Please post the ENTIRE stack trace
+from above as an attachment in addition to anything else
+that might help us fixing this issue.
+===========================================================
+ #10 0x00007f6bcac7fea4 in __pthread_kill_implementation () from /lib64/libc.so.6
+ #11 0x00007f6bcac264de in raise () from /lib64/libc.so.6
+ #12 0x00007f6bcac0e350 in abort () from /lib64/libc.so.6
+ #13 0x00007f6bc9a0be02 in std::__glibcxx_assert_fail(char const*, int, char const*, char const*) () from /lib64/libstdc++.so.6
+ #14 0x00007f6bb9b15257 in std::vector<bool, std::allocator<bool> >::operator[](unsigned long) [clone .part.0] [clone .lto_priv.0] (__n=<optimized out>, this=<optimized out>) at /usr/include/c++/15/bits/stl_bvector.h:1134
+ #15 0x00007f6bb9bab976 in std::vector<bool, std::allocator<bool> >::operator[] (this=<synthetic pointer>, __n=0) at /usr/include/c++/15/bits/stl_bvector.h:201
+ #16 CPyCppyy::Utility::ConstructCallbackPreamble (retType="Double_t", argtypes=..., code=Python Exception <class 'IndexError'>: list index out of range
+ #17 0x00007f6bb9b389e0 in PyFunction_AsCPointer (pyobject=<optimized out>, pyobject
+entry=0x7f6bb8f838c0, rettype="Double_t", signature="(Double_t*,Double_t*)") at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2713
+ #18 0x00007f6bb9b39851 in CPyCppyy::(anonymous namespace)::FunctionPointerConverter::SetArg (this=0x55eb25d61d40, pyobject=0x7f6bb8f838c0, para=..., ctxt=0x7ffc484855c0) at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2768
+---
+ bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
+index 7cfb76032a..2741caeb32 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
++++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
+@@ -645,7 +645,7 @@ void CPyCppyy::Utility::ConstructCallbackPreamble(const std::string& retType,
+              << retType << "\"), CPyCppyy::DestroyConverter};\n";
+     std::vector<bool> arg_is_ptr;
+     if (nArgs) {
+-        arg_is_ptr.reserve(nArgs);
++        arg_is_ptr.resize(nArgs);
+         code << "    CPYCPPYY_STATIC std::vector<std::unique_ptr<CPyCppyy::Converter, std::function<void(CPyCppyy::Converter*)>>> argcvs;\n"
+              << "    if (argcvs.empty()) {\n"
+              << "      argcvs.reserve(" << nArgs << ");\n";
+-- 
+2.48.1
+
diff --git a/root-Remove-redundant-and-conflicting-function-declaratio.patch b/root-Remove-redundant-and-conflicting-function-declaratio.patch
new file mode 100644
index 0000000..54a9e32
--- /dev/null
+++ b/root-Remove-redundant-and-conflicting-function-declaratio.patch
@@ -0,0 +1,44 @@
+From d28f5ac3a6947e13b30325bc2b373cff2fcda276 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 19 Jan 2025 13:57:25 +0100
+Subject: [PATCH] Remove redundant (and conflicting) function declarations
+
+The function fchtak() is implemented earlier in the same file. There
+is therefore no need to declare the function later in the same file.
+The later declarations redefines the function with an empty parameter
+list, which conflicts with the original definition.
+
+The function stat() is defined by including <sys/stat.h>. The
+following daclaration redefines the function with an empty parameter
+list, which conflicts with the original definition.
+---
+ misc/minicern/src/cernlib.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/misc/minicern/src/cernlib.c b/misc/minicern/src/cernlib.c
+index b882db2d90..98f7282ce6 100644
+--- a/misc/minicern/src/cernlib.c
++++ b/misc/minicern/src/cernlib.c
+@@ -172,8 +172,8 @@ int cfstati_(char *fname, int *info, int *lgname)
+ #endif
+ {
+    struct stat buf;
+-   char *ptname, *fchtak();
+-   int istat=-1, stat();
++   char *ptname;
++   int istat = -1;
+    ptname = fchtak(fname,*lgname);
+    if (ptname == ((void *)0)) return -1;
+    istat = stat(ptname, &buf);
+@@ -226,7 +226,7 @@ void cfopei_(int *lundes, int *medium, int *nwrec, int *mode, int *nbuf,
+              char *ftext, int *astat, int *lgtx)
+ #endif
+ {
+-   char *pttext, *fchtak();
++   char *pttext;
+    int flags = 0;
+    int fildes;
+    int perm;
+-- 
+2.48.1
+
diff --git a/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch b/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
new file mode 100644
index 0000000..2c2147a
--- /dev/null
+++ b/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
@@ -0,0 +1,30 @@
+From 456d5421706525974d4804e0e1a7880afd7df4fb Mon Sep 17 00:00:00 2001
+From: Bertrand Bellenot <bellenot@users.noreply.github.com>
+Date: Wed, 11 Dec 2024 14:49:52 +0100
+Subject: [PATCH] [gpad] Fix Debug Assertion Failure in libGpad
+
+Fix the following error in Debug mode with Runtime Check on Windows:
+Debug Assertion Failed!
+Epression: vector<bool> subscript out of range
+---
+ graf2d/gpad/src/TPad.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
+index 9c907335f3..dd5abeba91 100644
+--- a/graf2d/gpad/src/TPad.cxx
++++ b/graf2d/gpad/src/TPad.cxx
+@@ -3435,8 +3435,8 @@ void TPad::FillCollideGridTH1(TObject *o)
+             else         y2l = fUymin;
+          }
+          y2 = (Int_t)((y2l-fY1)/ys);
+-         for (j=y1; j<=y2; j++) {
+-         NotFree(x1, j);
++         for (j=y1; j<y2; j++) {
++            NotFree(x1, j);
+          }
+       }
+       x1l = h->GetBinLowEdge(i);
+-- 
+2.48.1
+
diff --git a/root-llvm-project-Backport-fix-for-compilation-issue-with.patch b/root-llvm-project-Backport-fix-for-compilation-issue-with.patch
new file mode 100644
index 0000000..c51d4d3
--- /dev/null
+++ b/root-llvm-project-Backport-fix-for-compilation-issue-with.patch
@@ -0,0 +1,41 @@
+From 60da0f7f5971c86407898408abf540c5a43d2d10 Mon Sep 17 00:00:00 2001
+From: Devajith Valaparambil Sreeramaswamy
+ <devajith.valaparambil.sreeramaswamy@cern.ch>
+Date: Fri, 24 Jan 2025 09:36:13 +0100
+Subject: [PATCH] [llvm-project] Backport fix for compilation issue with gcc-15
+
+Update the LLVM tag with the following commits:
+2468812ca0d9 UPSTREAM: Add missing include to X86MCTargetDesc.h (#123320)
+ed4f96704966 UPSTREAM: [ADT] Add `<cstdint>` to SmallVector (#101761)
+---
+ interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h     | 1 +
+ .../llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h           | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
+index 09676d792d..17444147b1 100644
+--- a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
++++ b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
+@@ -19,6 +19,7 @@
+ #include <algorithm>
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+ #include <functional>
+diff --git a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+index 437a7bd6ff..fd7d794849 100644
+--- a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
++++ b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+@@ -13,6 +13,7 @@
+ #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
+ #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ 
+-- 
+2.48.1
+
diff --git a/root.spec b/root.spec
index 5e7d337..8e8b13f 100644
--- a/root.spec
+++ b/root.spec
@@ -27,7 +27,7 @@
 %global rrr 1
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 40
+%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10
 %global roofitmp 1
 %else
 %global roofitmp 0
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -89,6 +89,22 @@ Patch7:		%{name}-tmva-sofie-Fix-Tile-operator.patch
 #		Adjust test/stressGraphics.ref
 #		https://github.com/root-project/root/pull/17398
 Patch8:		%{name}-Adjust-test-stressGraphics.ref.patch
+#		Fix out of bounds error reported with gcc 15
+#		https://github.com/root-project/root/pull/17249
+Patch9:		%{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
+#		Missing includes for compiling with gcc 15
+#		https://github.com/root-project/root/pull/17443
+Patch10:	%{name}-Add-a-missing-include-to-RVirtualCanvasPainter.patch
+Patch11:	%{name}-Add-a-missing-include-to-RTensor.patch
+#		Conflicting declarations (gcc 15)
+#		https://github.com/root-project/root/pull/17455
+Patch12:	%{name}-Remove-redundant-and-conflicting-function-declaratio.patch
+#		Missing includes for compiling with gcc 15
+#		https://github.com/root-project/root/pull/17510
+Patch13:	%{name}-llvm-project-Backport-fix-for-compilation-issue-with.patch
+#		Fix out of bounds errors reported with gcc 15
+#		https://github.com/root-project/root/pull/17551
+Patch14:	%{name}-Fix-out-of-bounds-error-in-pyroot.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1975,6 +1991,12 @@ This package contains utility functions for ntuples.
 %patch -P6 -p1
 %patch -P7 -p1
 %patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
+%patch -P11 -p1
+%patch -P12 -p1
+%patch -P13 -p1
+%patch -P14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2558,12 +2580,12 @@ test-webgui-ping"
 #   0u
 #     Which is: 0
 #
-# test-stressgraphics-firefox-skip3d:
-# requires firefox...
-#
 # gtest-tree-treeplayer-treetreeplayertestUnit:
 # segmentation fault
 #
+# test-stressgraphics-firefox-skip3d:
+# requires firefox...
+#
 # tutorial-webcanv-fonts_ttf.cxx:
 # Requires web graphics
 #
@@ -2574,8 +2596,8 @@ test-webgui-ping"
 # import xgboost as xgb
 excluded="${excluded}|\
 gtest-roofit-roofit-vectorisedPDFs-testLandau|\
-test-stressgraphics-firefox-skip3d|\
 gtest-tree-treeplayer-treetreeplayertestUnit|\
+test-stressgraphics-firefox-skip3d|\
 tutorial-webcanv-fonts_ttf.cxx|\
 tutorial-roofit-rf617_simulation_based_inference_multidimensional-py|\
 tutorial-roofit-rf618_mixture_models-py"
@@ -2607,20 +2629,18 @@ excluded="${excluded}|\
 gtest-tree-dataframe-dataframe-concurrency"
 %endif
 
-%ifarch aarch64
-# - tutorial-tmva-RBatchGenerator_filters_vectors-py
-#   Randomly segfaults
-#   *** Break *** segmentation violation
-excluded="${excluded}|\
-tutorial-tmva-RBatchGenerator_filters_vectors-py"
-%endif
-
 %ifarch %{power64}
 # - tutorial-roostats-IntervalExamples-py
 #   *** Break *** segmentation violation
 excluded="${excluded}|\
-gtest-tree-ntuple-v7-ntuple-evolution|\
 tutorial-roostats-IntervalExamples-py"
+
+%if %{?fedora}%{!?fedora:0} >= 42
+# - gtest-tree-ntuple-v7-ntuple-evolution
+#   waitpid() failed
+excluded="${excluded}|\
+gtest-tree-ntuple-v7-ntuple-evolution"
+%endif
 %endif
 
 %ifarch s390x
@@ -2649,8 +2669,8 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 # - gtest-tree-ntuple-v7-ntuple-multi-column
 # - gtest-tree-ntuple-v7-ntuple-packing
 # - gtest-tree-ntuple-v7-ntuple-parallel-writer
-# - gtest-tree-ntuple-v7-ntuple-project
 # - gtest-tree-ntuple-v7-ntuple-processor
+# - gtest-tree-ntuple-v7-ntuple-project
 # - gtest-tree-ntuple-v7-ntuple-show
 # - gtest-tree-ntuple-v7-ntuple-storage
 # - gtest-tree-ntuple-v7-ntuple-storage-daos
@@ -2700,8 +2720,8 @@ gtest-tree-ntuple-v7-ntuple-modelext|\
 gtest-tree-ntuple-v7-ntuple-multi-column|\
 gtest-tree-ntuple-v7-ntuple-packing|\
 gtest-tree-ntuple-v7-ntuple-parallel-writer|\
-gtest-tree-ntuple-v7-ntuple-project|\
 gtest-tree-ntuple-v7-ntuple-processor|\
+gtest-tree-ntuple-v7-ntuple-project|\
 gtest-tree-ntuple-v7-ntuple-show|\
 gtest-tree-ntuple-v7-ntuple-storage\$\$|\
 gtest-tree-ntuple-v7-ntuple-storage-daos|\
@@ -2737,6 +2757,16 @@ excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 42
+# Fail with gcc 15 due to changes in std::hash templates
+# - tutorial-roofit-*-py
+# - tutorial-roostats-*-py
+# https://github.com/root-project/root/issues/17456
+excluded="${excluded}|\
+tutorial-roofit-.*-py|\
+tutorial-roostats-.*-py"
+%endif
+
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # TClingDataMemberInfo.Offset fails on s390x
@@ -3659,6 +3689,11 @@ fi
 %endif
 
 %changelog
+* Fri Jan 31 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-5
+- Apply patches to fix build with gcc 15
+- Enable roofit-multiprocess for EPEL 10 (dependencies available)
+- Rebuild for pythia8 8.3.13
+
 * Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.34.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 02870ffba16dcadae0a4e149a4f2c191057c4592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Feb 2025 19:57:12 +0100
Subject: [PATCH 292/344] Add explicit BR: libxcrypt-devel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Esser <besser82@fedoraproject.org>
---
 root.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8e8b13f..54165c3 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -143,6 +143,7 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libpq-devel
+BuildRequires:  libxcrypt-devel
 BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
@@ -3689,6 +3690,9 @@ fi
 %endif
 
 %changelog
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 6.34.02-6
+- Add explicit BR: libxcrypt-devel
+
 * Fri Jan 31 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.02-5
 - Apply patches to fix build with gcc 15
 - Enable roofit-multiprocess for EPEL 10 (dependencies available)

From b1bbc0fadf36cb3c461617b215a41f7b8ea1a0ed Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 2 Feb 2025 13:48:38 -0700
Subject: [PATCH 293/344] Rebuild with gsl 2.8

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 54165c3..78298b2 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3690,6 +3690,9 @@ fi
 %endif
 
 %changelog
+* Sun Feb 02 2025 Orion Poplawski <orion@nwra.com> - 6.34.02-7
+- Rebuild with gsl 2.8
+
 * Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 6.34.02-6
 - Add explicit BR: libxcrypt-devel
 

From 71b6707207dd15f30022c8f640b747cd2c999095 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 13 Feb 2025 21:44:04 -0500
Subject: [PATCH 294/344] Rebuilt for libarrow 19

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 78298b2..cf6ddbd 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3690,6 +3690,9 @@ fi
 %endif
 
 %changelog
+* Fri Feb 14 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 6.34.02-8
+- Rebuilt for libarrow 19
+
 * Sun Feb 02 2025 Orion Poplawski <orion@nwra.com> - 6.34.02-7
 - Rebuild with gsl 2.8
 

From 40be88f67c48e55030b894eaaf0b7ee5d8f5ea89 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 14 Feb 2025 22:05:06 +0100
Subject: [PATCH 295/344] Update to 6.34.04

Drop patches accepted upstream or previously backported
---
 root-Add-a-missing-include-to-RTensor.patch   | 26 ------
 ...ing-include-to-RVirtualCanvasPainter.patch | 26 ------
 root-Fix-compilation-on-s390x.patch           | 38 ---------
 root-Make-DCLAD_SOURCE_DIR-option-work.patch  | 66 ----------------
 ...-and-conflicting-function-declaratio.patch | 44 -----------
 ...kport-fix-for-compilation-issue-with.patch | 41 ----------
 root-tmva-sofie-Fix-Tile-operator.patch       | 79 -------------------
 root.spec                                     | 46 +++--------
 sources                                       |  2 +-
 9 files changed, 14 insertions(+), 354 deletions(-)
 delete mode 100644 root-Add-a-missing-include-to-RTensor.patch
 delete mode 100644 root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
 delete mode 100644 root-Fix-compilation-on-s390x.patch
 delete mode 100644 root-Make-DCLAD_SOURCE_DIR-option-work.patch
 delete mode 100644 root-Remove-redundant-and-conflicting-function-declaratio.patch
 delete mode 100644 root-llvm-project-Backport-fix-for-compilation-issue-with.patch
 delete mode 100644 root-tmva-sofie-Fix-Tile-operator.patch

diff --git a/root-Add-a-missing-include-to-RTensor.patch b/root-Add-a-missing-include-to-RTensor.patch
deleted file mode 100644
index e5fbd5b..0000000
--- a/root-Add-a-missing-include-to-RTensor.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cfc922131c8a977e14c6611ed991f0889b0c47c8 Mon Sep 17 00:00:00 2001
-From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
-Date: Fri, 17 Jan 2025 10:35:37 +0100
-Subject: [PATCH 2/2] Add a missing include to RTensor.
-
-In gcc-15, <cstdint> needs to be included to use fixed-size integer
-types.
----
- tmva/tmva/inc/TMVA/RTensor.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tmva/tmva/inc/TMVA/RTensor.hxx b/tmva/tmva/inc/TMVA/RTensor.hxx
-index ad152f219a..795cc70689 100644
---- a/tmva/tmva/inc/TMVA/RTensor.hxx
-+++ b/tmva/tmva/inc/TMVA/RTensor.hxx
-@@ -3,6 +3,7 @@
- 
- #include <vector>
- #include <cstddef>     // std::size_t
-+#include <cstdint>
- #include <stdexcept>   // std::runtime_error
- #include <sstream>     // std::stringstream
- #include <memory>      // std::shared_ptr
--- 
-2.48.0
-
diff --git a/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch b/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
deleted file mode 100644
index 4acfae1..0000000
--- a/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2884f67f5a145ef5d2ba1f8050b2b1a543d97881 Mon Sep 17 00:00:00 2001
-From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
-Date: Fri, 17 Jan 2025 10:32:04 +0100
-Subject: [PATCH 1/2] Add a missing include to RVirtualCanvasPainter.
-
-In gcc-15, <cstdint> needs to be included when fixed-size integer types
-are used.
----
- graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
-index be2a467280..f5f255ec48 100644
---- a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
-+++ b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx
-@@ -9,6 +9,7 @@
- #ifndef ROOT7_RVirtualCanvasPainter
- #define ROOT7_RVirtualCanvasPainter
- 
-+#include <cstdint>
- #include <memory>
- #include <functional>
- #include <string>
--- 
-2.48.0
-
diff --git a/root-Fix-compilation-on-s390x.patch b/root-Fix-compilation-on-s390x.patch
deleted file mode 100644
index be89d3f..0000000
--- a/root-Fix-compilation-on-s390x.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 67e3b45b5d346a779533636397e28b1c48a21070 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 16 Dec 2024 15:32:21 +0100
-Subject: [PATCH] Fix compilation on s390x
-
-There were changes to the code but the big endian code was not updated
-to match the changes in the little endian code.
----
- tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-index 81a4b23697..1415e06e0f 100644
---- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-+++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
-@@ -131,9 +131,9 @@ std::shared_ptr<void> GetInitializedTensorData(onnx::TensorProto * tensorproto,
- #ifdef R__BYTESWAP
-       std::memcpy(data.get(), tensorproto->raw_data().c_str(), length * sizeof(T));
- #else
--      for (std::size_t k = 0; k < fLength; ++k)
--         (reinterpret_cast<uint32_t *>(data.get()))[k] =
--            Rbswap_32((reinterpret_cast<const uint32_t *>(tensorproto->raw_data().c_str()))[k]);
-+      for (std::size_t k = 0; k < length; ++k)
-+         (reinterpret_cast<typename RByteSwap<sizeof(T)>::value_type *>(data.get()))[k] =
-+            RByteSwap<sizeof(T)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(T)>::value_type *>(tensorproto->raw_data().c_str()))[k]);
- #endif
-    } else {
-       ExtractDataFromTP<T>::Copy(tensorproto, data.get());
-@@ -628,4 +628,4 @@ void RModelParser_ONNX::ParseONNXGraph(RModel & rmodel, const onnx::GraphProto &
- 
- } // namespace SOFIE
- } // namespace Experimental
--} // namespace TMVA
-\ No newline at end of file
-+} // namespace TMVA
--- 
-2.47.1
-
diff --git a/root-Make-DCLAD_SOURCE_DIR-option-work.patch b/root-Make-DCLAD_SOURCE_DIR-option-work.patch
deleted file mode 100644
index a4aaada..0000000
--- a/root-Make-DCLAD_SOURCE_DIR-option-work.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7d5ae0dcfbf770cc3943cc25283bf2d39329d9f3 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Mon, 16 Dec 2024 15:48:42 +0100
-Subject: [PATCH] Make -DCLAD_SOURCE_DIR option work
-
-Using the -DCLAD_SOURCE_DIR currently does not disable the git checkout.
-From the cmake documentation for ExternalProject_Add:
-
-Note: If a download method is specified, any existing contents of the
-source directory may be deleted. Only the URL download method checks
-whether this directory is either missing or empty before initiating
-the download, stopping with an error if it is not empty. All other
-download methods silently discard any previous contents of the source
-directory.
-
-Currently cmake deletes the source directory defined by
--DCLAD_SOURCE_DIR and then tries to recreate it using a git checkout,
-but fails if there is no network available:
-
-Cloning into 'clad-1.7'...
-fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
-Cloning into 'clad-1.7'...
-fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
-Cloning into 'clad-1.7'...
-fatal: unable to access 'https://github.com/vgvassilev/clad.git/': Could not resolve host: github.com
-Had to git clone more than once: 3 times.
-CMake Error at redhat-linux-build/interpreter/cling/tools/plugins/clad/clad-prefix/tmp/clad-gitclone.cmake:50 (message):
-  Failed to clone repository: 'https://github.com/vgvassilev/clad.git'
-
-The attempt to disable the git checkout by setting the
-DOWNLOAD_COMMAND option to an empty string is not working.
-
-This commit fixes the issue by only defining the GIT_REPOSITORY and
-GIT_TAG options when CLAD_SOURCE_DIR is not defined.
----
- interpreter/cling/tools/plugins/clad/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/interpreter/cling/tools/plugins/clad/CMakeLists.txt b/interpreter/cling/tools/plugins/clad/CMakeLists.txt
-index ba5f09786c..3c70d00a10 100644
---- a/interpreter/cling/tools/plugins/clad/CMakeLists.txt
-+++ b/interpreter/cling/tools/plugins/clad/CMakeLists.txt
-@@ -68,8 +68,10 @@ set(_clad_extra_settings
- # If the CLAD_SOURCE_DIR variable is defined in the CMake configuration, we're
- # skipping the download of the repository and use the passed directory.
- if (DEFINED CLAD_SOURCE_DIR)
--  list(APPEND _clad_extra_settings DOWNLOAD_COMMAND "")
-   list(APPEND _clad_extra_settings SOURCE_DIR ${CLAD_SOURCE_DIR})
-+else()
-+  list(APPEND _clad_extra_settings GIT_REPOSITORY https://github.com/vgvassilev/clad.git)
-+  list(APPEND _clad_extra_settings GIT_TAG v1.7)
- endif()
- 
- #list(APPEND _clad_patches_list "patch1.patch" "patch2.patch")
-@@ -82,8 +84,6 @@ endif()
- 
- ExternalProject_Add(
-   clad
--  GIT_REPOSITORY https://github.com/vgvassilev/clad.git
--  GIT_TAG v1.7
-   UPDATE_COMMAND ""
-   PATCH_COMMAND ${_clad_patch_command}
-   CMAKE_ARGS -G ${CMAKE_GENERATOR}
--- 
-2.47.1
-
diff --git a/root-Remove-redundant-and-conflicting-function-declaratio.patch b/root-Remove-redundant-and-conflicting-function-declaratio.patch
deleted file mode 100644
index 54a9e32..0000000
--- a/root-Remove-redundant-and-conflicting-function-declaratio.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d28f5ac3a6947e13b30325bc2b373cff2fcda276 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 19 Jan 2025 13:57:25 +0100
-Subject: [PATCH] Remove redundant (and conflicting) function declarations
-
-The function fchtak() is implemented earlier in the same file. There
-is therefore no need to declare the function later in the same file.
-The later declarations redefines the function with an empty parameter
-list, which conflicts with the original definition.
-
-The function stat() is defined by including <sys/stat.h>. The
-following daclaration redefines the function with an empty parameter
-list, which conflicts with the original definition.
----
- misc/minicern/src/cernlib.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/misc/minicern/src/cernlib.c b/misc/minicern/src/cernlib.c
-index b882db2d90..98f7282ce6 100644
---- a/misc/minicern/src/cernlib.c
-+++ b/misc/minicern/src/cernlib.c
-@@ -172,8 +172,8 @@ int cfstati_(char *fname, int *info, int *lgname)
- #endif
- {
-    struct stat buf;
--   char *ptname, *fchtak();
--   int istat=-1, stat();
-+   char *ptname;
-+   int istat = -1;
-    ptname = fchtak(fname,*lgname);
-    if (ptname == ((void *)0)) return -1;
-    istat = stat(ptname, &buf);
-@@ -226,7 +226,7 @@ void cfopei_(int *lundes, int *medium, int *nwrec, int *mode, int *nbuf,
-              char *ftext, int *astat, int *lgtx)
- #endif
- {
--   char *pttext, *fchtak();
-+   char *pttext;
-    int flags = 0;
-    int fildes;
-    int perm;
--- 
-2.48.1
-
diff --git a/root-llvm-project-Backport-fix-for-compilation-issue-with.patch b/root-llvm-project-Backport-fix-for-compilation-issue-with.patch
deleted file mode 100644
index c51d4d3..0000000
--- a/root-llvm-project-Backport-fix-for-compilation-issue-with.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 60da0f7f5971c86407898408abf540c5a43d2d10 Mon Sep 17 00:00:00 2001
-From: Devajith Valaparambil Sreeramaswamy
- <devajith.valaparambil.sreeramaswamy@cern.ch>
-Date: Fri, 24 Jan 2025 09:36:13 +0100
-Subject: [PATCH] [llvm-project] Backport fix for compilation issue with gcc-15
-
-Update the LLVM tag with the following commits:
-2468812ca0d9 UPSTREAM: Add missing include to X86MCTargetDesc.h (#123320)
-ed4f96704966 UPSTREAM: [ADT] Add `<cstdint>` to SmallVector (#101761)
----
- interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h     | 1 +
- .../llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h           | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
-index 09676d792d..17444147b1 100644
---- a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
-+++ b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h
-@@ -19,6 +19,7 @@
- #include <algorithm>
- #include <cassert>
- #include <cstddef>
-+#include <cstdint>
- #include <cstdlib>
- #include <cstring>
- #include <functional>
-diff --git a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
-index 437a7bd6ff..fd7d794849 100644
---- a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
-+++ b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
-@@ -13,6 +13,7 @@
- #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
- #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
- 
-+#include <cstdint>
- #include <memory>
- #include <string>
- 
--- 
-2.48.1
-
diff --git a/root-tmva-sofie-Fix-Tile-operator.patch b/root-tmva-sofie-Fix-Tile-operator.patch
deleted file mode 100644
index 1bf2667..0000000
--- a/root-tmva-sofie-Fix-Tile-operator.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From ef1f3bba9059cd2e61d7de5f46fbfc26c4746ebc Mon Sep 17 00:00:00 2001
-From: moneta <lorenzo.moneta@cern.ch>
-Date: Thu, 19 Dec 2024 15:22:37 +0100
-Subject: [PATCH] [tmva][sofie] Fix Tile operator
-
-Fix the casting of the input repeats vector data of the Tile operator.
-The type of data should be int64_t and not size_t
-The previous code could have some issue when the size of size_t is 32 bits
----
- tmva/sofie/inc/TMVA/ROperator_Tile.hxx | 31 ++++++++++++++++----------
- 1 file changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/tmva/sofie/inc/TMVA/ROperator_Tile.hxx b/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
-index 869cd55d9a439..3686db1e0914a 100644
---- a/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
-+++ b/tmva/sofie/inc/TMVA/ROperator_Tile.hxx
-@@ -51,12 +51,17 @@ public:
-       }
-       fShapeInput=model.GetTensorShape(fNInput);
- 
--         // Retrieve the data pointer for the repeats tensor
-+      // if repeats vector is not initialized we cannot deduce shape of output
-+      // not support for time being this case
-+      if (!model.IsInitializedTensor(fNRepeats)) {
-+         throw std::runtime_error("TMVA SOFIE Tile Op: non-initialized repeats input is not supported");
-+      }
-+
-+      // Retrieve the data pointer for the repeats tensor
-       auto repptr = model.GetInitializedTensorData(fNRepeats);
-       // Cast the raw pointer to the appropriate type (size_t*)
--      auto repeat_shape = static_cast<size_t*>(repptr.get());
--
--      if (repeat_shape == nullptr) {
-+      auto repeats_data = static_cast<int64_t*>(repptr.get());
-+      if (repeats_data == nullptr) {
-         throw std::runtime_error("Failed to retrieve the data for the repeats tensor.");
-       }
-       // Get the shape of the repeats tensor to determine the number of elements
-@@ -66,12 +71,18 @@ public:
-          throw std::runtime_error("Repeats tensor is not 1D.");
-       }
-       size_t num_elements = repeats_shape[0];
--      // Convert the data to a vector
--      std::vector<size_t> repeats_vector(repeat_shape, repeat_shape + num_elements);
-+      // Convert the data to a vector of size_t
-+      std::vector<size_t> repeats_vector(num_elements);
-+      std::copy(repeats_data, repeats_data + num_elements, repeats_vector.begin());
-+
- 
-       fShapeY = ShapeInference({fShapeInput,repeats_vector})[0];
- 
-       model.AddIntermediateTensor(fNY, model.GetTensorType(fNInput), fShapeY);
-+
-+      if (model.Verbose())
-+         std::cout <<  "Tile: " << fNInput << " " << ConvertShapeToString(fShapeInput) << " -> " << fNY << " with shape " << ConvertShapeToString(fShapeY)
-+            << " given repeats " << ConvertShapeToString(repeats_vector) << std::endl;
-    }
- 
-    std::string Generate(std::string OpName){
-@@ -89,17 +100,13 @@ public:
-       std::string output = "tensor_" + fNY;
-       out << "///-------- Tile operator\n";
-       out << "{\n"; // add scope to re-use same names
--      out << "std::vector<int> input_shape = " << ConvertShapeToString(fShapeInput) << ";\n";
--      std::vector<size_t> repeats = fShapeY;
--      for (size_t i = 0; i < repeats.size(); i++)
--         repeats[i] /= fShapeInput[i];
-+      out << "const int input_shape[" << fShapeInput.size() << "] = " << ConvertShapeToString(fShapeInput) << ";\n";
- 
--      out << "std::vector<int> repeats = " << ConvertShapeToString(repeats) << ";\n";
-       out << "int inputLength = " << ConvertShapeToLength(fShapeInput) << ";\n";
-       out << "int s = 1;\n";
-       // loop from inverse dim order
-       out << "for (int i = " << fShapeInput.size()-1 << "; i >=0; i--) {\n";
--      out << SP << "int r = repeats[i];\n";
-+      out << SP << "int r = tensor_" << fNRepeats << "[i];\n";
-       // we cannot exclude case where repeats=1 since we need offset
-       //out << SP << "if (r == 1 && i < " << fShapeInput.size()-1 <<  ") continue;\n";
-       out << SP << "int i_offset = 0, o_offset = 0;\n";
diff --git a/root.spec b/root.spec
index cf6ddbd..4629e7d 100644
--- a/root.spec
+++ b/root.spec
@@ -37,9 +37,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.34.02
+Version:	6.34.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	8%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -77,34 +77,15 @@ Patch2:		%{name}-dont-install-minicern.patch
 Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
-#		Fix compilation of TMVA SOFIE parser on s390x
-#		https://github.com/root-project/root/pull/17307
-Patch5:		%{name}-Fix-compilation-on-s390x.patch
-#		Make -DCLAD_SOURCE_DIR option work
-#		https://github.com/root-project/root/pull/17308
-Patch6:		%{name}-Make-DCLAD_SOURCE_DIR-option-work.patch
-#		Fix segmentation fault during testing on ix86
-#		https://github.com/root-project/root/pull/17314
-Patch7:		%{name}-tmva-sofie-Fix-Tile-operator.patch
 #		Adjust test/stressGraphics.ref
 #		https://github.com/root-project/root/pull/17398
-Patch8:		%{name}-Adjust-test-stressGraphics.ref.patch
+Patch5:		%{name}-Adjust-test-stressGraphics.ref.patch
 #		Fix out of bounds error reported with gcc 15
 #		https://github.com/root-project/root/pull/17249
-Patch9:		%{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
-#		Missing includes for compiling with gcc 15
-#		https://github.com/root-project/root/pull/17443
-Patch10:	%{name}-Add-a-missing-include-to-RVirtualCanvasPainter.patch
-Patch11:	%{name}-Add-a-missing-include-to-RTensor.patch
-#		Conflicting declarations (gcc 15)
-#		https://github.com/root-project/root/pull/17455
-Patch12:	%{name}-Remove-redundant-and-conflicting-function-declaratio.patch
-#		Missing includes for compiling with gcc 15
-#		https://github.com/root-project/root/pull/17510
-Patch13:	%{name}-llvm-project-Backport-fix-for-compilation-issue-with.patch
+Patch6:		%{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
 #		Fix out of bounds errors reported with gcc 15
 #		https://github.com/root-project/root/pull/17551
-Patch14:	%{name}-Fix-out-of-bounds-error-in-pyroot.patch
+Patch7:		%{name}-Fix-out-of-bounds-error-in-pyroot.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -143,7 +124,7 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libpq-devel
-BuildRequires:  libxcrypt-devel
+BuildRequires:	libxcrypt-devel
 BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
@@ -1991,13 +1972,6 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
-%patch -P12 -p1
-%patch -P13 -p1
-%patch -P14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2581,8 +2555,9 @@ test-webgui-ping"
 #   0u
 #     Which is: 0
 #
+# gtest-tree-treeplayer-ttreeindex-clone
 # gtest-tree-treeplayer-treetreeplayertestUnit:
-# segmentation fault
+# Randomly fail - can't open file that was just created - race condition?
 #
 # test-stressgraphics-firefox-skip3d:
 # requires firefox...
@@ -2597,6 +2572,7 @@ test-webgui-ping"
 # import xgboost as xgb
 excluded="${excluded}|\
 gtest-roofit-roofit-vectorisedPDFs-testLandau|\
+gtest-tree-treeplayer-ttreeindex-clone|\
 gtest-tree-treeplayer-treetreeplayertestUnit|\
 test-stressgraphics-firefox-skip3d|\
 tutorial-webcanv-fonts_ttf.cxx|\
@@ -3690,6 +3666,10 @@ fi
 %endif
 
 %changelog
+* Fri Feb 14 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.04-1
+- Update to 6.34.04
+- Drop patches accepted upstream or previously backported
+
 * Fri Feb 14 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 6.34.02-8
 - Rebuilt for libarrow 19
 
diff --git a/sources b/sources
index c6afe84..4269611 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.34.02.tar.xz) = 565218eb073ecec509851c99c9ac018bb9de1abae4be023fe2862e28aa967a4a353d77fce1b8173fea87ed17b943bcd2bbce69a55573a1686f138a6495612fa5
+SHA512 (root-6.34.04.tar.xz) = fc13e3efc6254b817f48c0009e70943890f8e6b10efcee54c4113293ded1b0e202e3ef635e2150e5f359da6426c6a48b4456dfe7900740b7beaa73c23fa69fb7
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f
 SHA512 (clad-1.7.tar.gz) = ff9856ed4901625b4c31bc4b5ac97f464667f58c567caaab8b2a2567de4e0908ff0fffbb566fe728fc6184d3d6bc156bbabacf24d83009e36b2956d535171066

From 450c67721aa4e1fa7cf2955ef73414d4aede4c8a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 19 Feb 2025 08:36:52 +0100
Subject: [PATCH 296/344] Fix roofit/roostats test failures with gcc 15

---
 ...h_not_enabled-to-names-from-std-name.patch | 35 +++++++++++++++++++
 root.spec                                     | 19 +++++-----
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch

diff --git a/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch b/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
new file mode 100644
index 0000000..0b2803d
--- /dev/null
+++ b/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
@@ -0,0 +1,35 @@
+From 3280847501bfb354a3a9ff1e023c8fd3b74548f4 Mon Sep 17 00:00:00 2001
+From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
+Date: Wed, 12 Feb 2025 14:42:43 +0100
+Subject: [PATCH] [PyROOT] Add __hash_not_enabled to names from std namespace.
+
+With gcc-15, the lookups of std::hash<xxx> lead to the following error:
+input_line_50:1:16: error: explicit instantiation of 'std::__hash_not_enabled'
+   must occur in namespace 'std'
+template class __hash_not_enabled<RooRealVar>;
+
+Adding this class to the list of names that require "std::" fixes the
+error.
+
+Fix #17456.
+---
+ .../cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx      | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
+index 3aa6704a0b..08972d1460 100644
+--- a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
++++ b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
+@@ -275,7 +275,8 @@ public:
+             "slice_array", "slice", "stack", "string", "strstream", "strstreambuf",
+             "time_get_byname", "time_get", "time_put_byname", "time_put", "unary_function",
+             "unary_negate", "unique_ptr", "underflow_error", "unordered_map", "unordered_multimap",
+-            "unordered_multiset", "unordered_set", "valarray", "vector", "weak_ptr", "wstring"};
++            "unordered_multiset", "unordered_set", "valarray", "vector", "weak_ptr", "wstring",
++            "__hash_not_enabled"};
+         for (auto& name : stl_names)
+             gSTLNames.insert(name);
+ 
+-- 
+2.48.1
+
diff --git a/root.spec b/root.spec
index 4629e7d..1d622b4 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -86,6 +86,9 @@ Patch6:		%{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
 #		Fix out of bounds errors reported with gcc 15
 #		https://github.com/root-project/root/pull/17551
 Patch7:		%{name}-Fix-out-of-bounds-error-in-pyroot.patch
+#		Fix roofit/roostats test failures with gcc 15
+#		https://github.com/root-project/root/pull/17702
+Patch8:		%{name}-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1972,6 +1975,7 @@ This package contains utility functions for ntuples.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
+%patch -P8 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2734,16 +2738,6 @@ excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 42
-# Fail with gcc 15 due to changes in std::hash templates
-# - tutorial-roofit-*-py
-# - tutorial-roostats-*-py
-# https://github.com/root-project/root/issues/17456
-excluded="${excluded}|\
-tutorial-roofit-.*-py|\
-tutorial-roostats-.*-py"
-%endif
-
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # TClingDataMemberInfo.Offset fails on s390x
@@ -3666,6 +3660,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.04-2
+- Fix roofit/roostats test failures with gcc 15
+
 * Fri Feb 14 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.04-1
 - Update to 6.34.04
 - Drop patches accepted upstream or previously backported

From fe8a030c521f75f6d2ff98536c1ac92b4287b89a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 31 Mar 2025 15:19:04 +0200
Subject: [PATCH 297/344] Update to 6.34.06

Drop patches accepted upstream or previously backported
---
 root-Fix-out-of-bounds-error-in-pyroot.patch  | 52 ----------------
 ...h_not_enabled-to-names-from-std-name.patch | 35 -----------
 ...h-the-geometries-from-EOS-and-not-fr.patch | 60 +++++++++++++++++++
 ...x-Debug-Assertion-Failure-in-libGpad.patch | 30 ----------
 root-testfiles.sh                             |  7 ---
 root.spec                                     | 52 ++++------------
 sources                                       |  4 +-
 7 files changed, 73 insertions(+), 167 deletions(-)
 delete mode 100644 root-Fix-out-of-bounds-error-in-pyroot.patch
 delete mode 100644 root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
 create mode 100644 root-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
 delete mode 100644 root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch

diff --git a/root-Fix-out-of-bounds-error-in-pyroot.patch b/root-Fix-out-of-bounds-error-in-pyroot.patch
deleted file mode 100644
index 4a1611e..0000000
--- a/root-Fix-out-of-bounds-error-in-pyroot.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4bece824e886f84b7b05e08baea3762d02f892d6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 29 Jan 2025 00:31:31 +0100
-Subject: [PATCH] Fix out-of-bounds error in pyroot
-
- 526/1416 Test   #63: pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-tf-pycallables ..........................***Failed   75.51 sec
-test_callable (tf_pycallables.TF1.test_callable)
-Test function provided as callable ... /usr/include/c++/15/bits/stl_bvector.h:1134: std::vector<bool, _Alloc>::reference std::vector<bool, _Alloc>::operator[](size_type) [with _Alloc = std::allocator<bool>; reference = std::vector<bool>::reference; size_type = long unsigned int]: Assertion '__n < this->size()' failed.
- *** Break *** abort
-
-===========================================================
-The lines below might hint at the cause of the crash. If you see question
-marks as part of the stack trace, try to recompile with debugging information
-enabled and export CLING_DEBUG=1 environment variable before running.
-You may get help by asking at the ROOT forum https://root.cern/forum
-preferably using the command (.forum bug) in the ROOT prompt.
-Only if you are really convinced it is a bug in ROOT then please submit a
-report at https://root.cern/bugs or (preferably) using the command (.gh bug) in
-the ROOT prompt. Please post the ENTIRE stack trace
-from above as an attachment in addition to anything else
-that might help us fixing this issue.
-===========================================================
- #10 0x00007f6bcac7fea4 in __pthread_kill_implementation () from /lib64/libc.so.6
- #11 0x00007f6bcac264de in raise () from /lib64/libc.so.6
- #12 0x00007f6bcac0e350 in abort () from /lib64/libc.so.6
- #13 0x00007f6bc9a0be02 in std::__glibcxx_assert_fail(char const*, int, char const*, char const*) () from /lib64/libstdc++.so.6
- #14 0x00007f6bb9b15257 in std::vector<bool, std::allocator<bool> >::operator[](unsigned long) [clone .part.0] [clone .lto_priv.0] (__n=<optimized out>, this=<optimized out>) at /usr/include/c++/15/bits/stl_bvector.h:1134
- #15 0x00007f6bb9bab976 in std::vector<bool, std::allocator<bool> >::operator[] (this=<synthetic pointer>, __n=0) at /usr/include/c++/15/bits/stl_bvector.h:201
- #16 CPyCppyy::Utility::ConstructCallbackPreamble (retType="Double_t", argtypes=..., code=Python Exception <class 'IndexError'>: list index out of range
- #17 0x00007f6bb9b389e0 in PyFunction_AsCPointer (pyobject=<optimized out>, pyobject
-entry=0x7f6bb8f838c0, rettype="Double_t", signature="(Double_t*,Double_t*)") at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2713
- #18 0x00007f6bb9b39851 in CPyCppyy::(anonymous namespace)::FunctionPointerConverter::SetArg (this=0x55eb25d61d40, pyobject=0x7f6bb8f838c0, para=..., ctxt=0x7ffc484855c0) at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2768
----
- bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-index 7cfb76032a..2741caeb32 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx
-@@ -645,7 +645,7 @@ void CPyCppyy::Utility::ConstructCallbackPreamble(const std::string& retType,
-              << retType << "\"), CPyCppyy::DestroyConverter};\n";
-     std::vector<bool> arg_is_ptr;
-     if (nArgs) {
--        arg_is_ptr.reserve(nArgs);
-+        arg_is_ptr.resize(nArgs);
-         code << "    CPYCPPYY_STATIC std::vector<std::unique_ptr<CPyCppyy::Converter, std::function<void(CPyCppyy::Converter*)>>> argcvs;\n"
-              << "    if (argcvs.empty()) {\n"
-              << "      argcvs.reserve(" << nArgs << ");\n";
--- 
-2.48.1
-
diff --git a/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch b/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
deleted file mode 100644
index 0b2803d..0000000
--- a/root-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3280847501bfb354a3a9ff1e023c8fd3b74548f4 Mon Sep 17 00:00:00 2001
-From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
-Date: Wed, 12 Feb 2025 14:42:43 +0100
-Subject: [PATCH] [PyROOT] Add __hash_not_enabled to names from std namespace.
-
-With gcc-15, the lookups of std::hash<xxx> lead to the following error:
-input_line_50:1:16: error: explicit instantiation of 'std::__hash_not_enabled'
-   must occur in namespace 'std'
-template class __hash_not_enabled<RooRealVar>;
-
-Adding this class to the list of names that require "std::" fixes the
-error.
-
-Fix #17456.
----
- .../cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx      | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
-index 3aa6704a0b..08972d1460 100644
---- a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
-+++ b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx
-@@ -275,7 +275,8 @@ public:
-             "slice_array", "slice", "stack", "string", "strstream", "strstreambuf",
-             "time_get_byname", "time_get", "time_put_byname", "time_put", "unary_function",
-             "unary_negate", "unique_ptr", "underflow_error", "unordered_map", "unordered_multimap",
--            "unordered_multiset", "unordered_set", "valarray", "vector", "weak_ptr", "wstring"};
-+            "unordered_multiset", "unordered_set", "valarray", "vector", "weak_ptr", "wstring",
-+            "__hash_not_enabled"};
-         for (auto& name : stl_names)
-             gSTLNames.insert(name);
- 
--- 
-2.48.1
-
diff --git a/root-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch b/root-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
new file mode 100644
index 0000000..a45ae41
--- /dev/null
+++ b/root-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
@@ -0,0 +1,60 @@
+From 4da50ef374cd231163dff77493f9367cd62583d9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 30 Mar 2025 21:23:14 +0200
+Subject: [PATCH] Revert "[test] Fetch the geometries from EOS and not from the
+ website"
+
+This reverts commit a8a879ce252e45405452db38d9178c7883582a7d.
+---
+ test/stressGeometry.cxx | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
+index 7fb6bf97e7..f8d78f4f54 100644
+--- a/test/stressGeometry.cxx
++++ b/test/stressGeometry.cxx
+@@ -1,6 +1,6 @@
+ // Program to check a TGeo geometry
+ // The first time you run this program, the geometry files will be taken
+-// from /eos/root-eos/testfiles/ (previously from http://root.cern/files)
++// from http://root.cern/files
+ //
+ //    How the program works
+ // If the file <geom_name>_ref.root does not exist, it is generated. The file
+@@ -274,13 +274,13 @@ void stressGeometry(const char *exp="*", Bool_t generate_ref=kFALSE, Bool_t vecg
+          delete gGeoManager;
+          gGeoManager = 0;
+       }
+-      TGeoManager::Import(Form("root://eospublic.cern.ch//eos/root-eos/testfiles/%s",fname.Data()));
++      TGeoManager::Import(Form("http://root.cern/files/%s",fname.Data()));
+       if (!gGeoManager) return;
+       if (vecgeom) TVirtualGeoConverter::Instance()->ConvertGeometry();
+       
+       fname = TString::Format("files/%s_ref_%d.root", exps[i],versions[i]);
+ 
+-      if (gen_ref || !TFile::Open(Form("root://eospublic.cern.ch//eos/root-eos/testfiles//%s_ref_%d.root",exps[i],versions[i]),"CACHEREAD")) {
++      if (gen_ref || !TFile::Open(Form("http://root.cern/files/%s_ref_%d.root",exps[i],versions[i]),"CACHEREAD")) {
+          if (!gen_ref) fprintf(stderr,"File: %s does not exist, generating it\n", fname.Data());
+          else               fprintf(stderr,"Generating reference file %s\n", fname.Data());
+          WriteRef(i);
+@@ -320,7 +320,7 @@ void ReadRef(Int_t kexp) {
+    TFile *f = 0;
+    //use ref_[version[i]] files
+    if (!gen_ref)
+-      fname = TString::Format("root://eospublic.cern.ch//eos/root-eos/testfiles//%s_ref_%d.root", exps[kexp],versions[kexp]);
++      fname = TString::Format("http://root.cern/files/%s_ref_%d.root", exps[kexp],versions[kexp]);
+    else
+       fname.Format("files/%s_ref_%d.root", exps[kexp],versions[kexp]);
+ 
+@@ -546,7 +546,7 @@ void InspectDiff(const char* exp="alice",Long64_t ientry=-1) {
+    Float_t rad    = 0.;
+    TString fname(TString::Format("%s.root",exp));
+    if (gSystem->AccessPathName(fname)) {
+-      TGeoManager::Import(Form("root://eospublic.cern.ch//eos/root-eos/testfiles//%s",fname.Data()));
++      TGeoManager::Import(Form("http://root.cern/files/%s",fname.Data()));
+    } else {
+       TGeoManager::Import(fname);
+    }
+-- 
+2.49.0
+
diff --git a/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch b/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
deleted file mode 100644
index 2c2147a..0000000
--- a/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 456d5421706525974d4804e0e1a7880afd7df4fb Mon Sep 17 00:00:00 2001
-From: Bertrand Bellenot <bellenot@users.noreply.github.com>
-Date: Wed, 11 Dec 2024 14:49:52 +0100
-Subject: [PATCH] [gpad] Fix Debug Assertion Failure in libGpad
-
-Fix the following error in Debug mode with Runtime Check on Windows:
-Debug Assertion Failed!
-Epression: vector<bool> subscript out of range
----
- graf2d/gpad/src/TPad.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
-index 9c907335f3..dd5abeba91 100644
---- a/graf2d/gpad/src/TPad.cxx
-+++ b/graf2d/gpad/src/TPad.cxx
-@@ -3435,8 +3435,8 @@ void TPad::FillCollideGridTH1(TObject *o)
-             else         y2l = fUymin;
-          }
-          y2 = (Int_t)((y2l-fY1)/ys);
--         for (j=y1; j<=y2; j++) {
--         NotFree(x1, j);
-+         for (j=y1; j<y2; j++) {
-+            NotFree(x1, j);
-          }
-       }
-       x1l = h->GetBinLowEdge(i);
--- 
-2.48.1
-
diff --git a/root-testfiles.sh b/root-testfiles.sh
index db4d721..c2451e9 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -72,14 +72,7 @@ wget -N ${SITE}/tesla.root
 wget -N ${SITE}/wa91_ref_3.root
 wget -N ${SITE}/wa91.root
 
-wget -N ${SITE}/AtlasGraphs.root
 wget -N ${SITE}/europe.root
-wget -N ${SITE}/Higgs_data.root
-wget -N ${SITE}/linearIO.root
-wget -N ${SITE}/stressHistogram.5.18.00.root
-wget -N ${SITE}/tmva_class_example.root
-wget -N ${SITE}/tmva_multiclass_example.root
-wget -N ${SITE}/tmva_reg_example.root
 wget -N ${SITE}/usa.root
 
 for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
diff --git a/root.spec b/root.spec
index 1d622b4..b54fbd5 100644
--- a/root.spec
+++ b/root.spec
@@ -37,9 +37,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.34.04
+Version:	6.34.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -80,22 +80,13 @@ Patch4:		%{name}-32bit-tests.patch
 #		Adjust test/stressGraphics.ref
 #		https://github.com/root-project/root/pull/17398
 Patch5:		%{name}-Adjust-test-stressGraphics.ref.patch
-#		Fix out of bounds error reported with gcc 15
-#		https://github.com/root-project/root/pull/17249
-Patch6:		%{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch
-#		Fix out of bounds errors reported with gcc 15
-#		https://github.com/root-project/root/pull/17551
-Patch7:		%{name}-Fix-out-of-bounds-error-in-pyroot.patch
-#		Fix roofit/roostats test failures with gcc 15
-#		https://github.com/root-project/root/pull/17702
-Patch8:		%{name}-PyROOT-Add-__hash_not_enabled-to-names-from-std-name.patch
+#		Revert test change that breaks the test
+Patch6:		%{name}-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 BuildRequires:	make
-#		root on Linux requires cmake 3.16
-#		but 3.19 is needed for flexiblas support
-BuildRequires:	cmake >= 3.19
+BuildRequires:	cmake >= 3.20
 BuildRequires:	libX11-devel
 BuildRequires:	libXpm-devel
 BuildRequires:	libXft-devel
@@ -165,12 +156,7 @@ BuildRequires:	flexiblas-devel
 %if ! %{bundlejson}
 BuildRequires:	json-devel >= 3.9
 %endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-#		Disable uring in EPEL 8 (liburing is available,
-#		but uring not supported by the RHEL 8 kernel)
-#		Supported by the RHEL kernel since RHEL 9.3
 BuildRequires:	liburing-devel
-%endif
 %if %{tmvasofieparser}
 BuildRequires:	protobuf-devel >= 3.0
 %endif
@@ -848,9 +834,7 @@ from marked up sources.
 %package io
 Summary:	Input/output of ROOT objects
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
 Requires:	liburing-devel
-%endif
 
 %description io
 This package provides I/O routines for ROOT objects.
@@ -1974,8 +1958,6 @@ This package contains utility functions for ntuples.
 %patch -P4 -p1
 %patch -P5 -p1
 %patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2181,11 +2163,7 @@ done
        -Dtpython:BOOL=ON \
        -Dunfold:BOOL=ON \
        -Dunuran:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
        -During:BOOL=ON \
-%else
-       -During:BOOL=OFF \
-%endif
        -Dvc:BOOL=OFF \
        -Dvdt:BOOL=OFF \
        -Dveccore:BOOL=OFF \
@@ -2408,20 +2386,8 @@ ln -s ../../files files
 popd
 pushd runtutorials
 ln -s ../../files files
-for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
-	 df014_CsvDataSource_MuRun2010B_py.csv \
-	 df015_CsvDataSource_MuRun2010B.csv ; do
-    ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
-done
-popd
-pushd tmva/tmva/test
-ln -s ../../../../files files
-popd
-pushd tmva/tmva/test/DNN
-ln -s ../../../../../files files
-popd
-pushd tmva/tmva/test/envelope
-ln -s ../../../../../files files
+ln -s ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv CsvDataSource_MuRun2010B.csv
+ln -s ../../files/usa.root usa.root
 popd
 
 # Exclude some tests that can not be run
@@ -3660,6 +3626,10 @@ fi
 %endif
 
 %changelog
+* Fri Mar 28 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.06-1
+- Update to 6.34.06
+- Drop patches accepted upstream or previously backported
+
 * Wed Feb 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.04-2
 - Fix roofit/roostats test failures with gcc 15
 
diff --git a/sources b/sources
index 4269611..47e0594 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.34.04.tar.xz) = fc13e3efc6254b817f48c0009e70943890f8e6b10efcee54c4113293ded1b0e202e3ef635e2150e5f359da6426c6a48b4456dfe7900740b7beaa73c23fa69fb7
-SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f
+SHA512 (root-6.34.06.tar.xz) = 9a22f8a143a8e23f2bfcd19bf23450e55359e9a73972450d25a0e4932cc11bd32473b5bd76c31ad0d1841d7767ccc3ffaf8ca02ef507384bb5fe1c21540144f6
+SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-1.7.tar.gz) = ff9856ed4901625b4c31bc4b5ac97f464667f58c567caaab8b2a2567de4e0908ff0fffbb566fe728fc6184d3d6bc156bbabacf24d83009e36b2956d535171066

From 920e7b25758bfd961c166ae8a12445c4ed047d6b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 17 Apr 2025 23:39:33 +0200
Subject: [PATCH 298/344] Update to 6.34.08

---
 root.spec | 5 ++++-
 sources   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index b54fbd5..0608aa9 100644
--- a/root.spec
+++ b/root.spec
@@ -37,7 +37,7 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.34.06
+Version:	6.34.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -3626,6 +3626,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 17 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.08-1
+- Update to 6.34.08
+
 * Fri Mar 28 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.06-1
 - Update to 6.34.06
 - Drop patches accepted upstream or previously backported
diff --git a/sources b/sources
index 47e0594..99610a2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.34.06.tar.xz) = 9a22f8a143a8e23f2bfcd19bf23450e55359e9a73972450d25a0e4932cc11bd32473b5bd76c31ad0d1841d7767ccc3ffaf8ca02ef507384bb5fe1c21540144f6
+SHA512 (root-6.34.08.tar.xz) = 58699d441555a82f9c2d00fc33719786bc5e4925060122f5e7fb46df28feec1d4047987b4badb20b19c484b13229b173bd110d25b1f3d426d70039847d879299
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-1.7.tar.gz) = ff9856ed4901625b4c31bc4b5ac97f464667f58c567caaab8b2a2567de4e0908ff0fffbb566fe728fc6184d3d6bc156bbabacf24d83009e36b2956d535171066

From aaf51a11c7f70455c6280e665fee7fe7ea282a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Fri, 18 Apr 2025 13:19:10 +0200
Subject: [PATCH 299/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0608aa9..1115c26 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3626,6 +3626,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-2
+- R-maint-sig mass rebuild
+
 * Thu Apr 17 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.34.08-1
 - Update to 6.34.08
 

From ab1aa62b4549a46783007935c11fa3c5fc4a5c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Fri, 18 Apr 2025 20:42:27 +0200
Subject: [PATCH 300/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 1115c26..6b8f195 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3626,6 +3626,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-3
+- R-maint-sig mass rebuild
+
 * Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-2
 - R-maint-sig mass rebuild
 

From 593e7462664d0472fdae7140139498e4e72e71a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Fri, 18 Apr 2025 22:02:09 +0200
Subject: [PATCH 301/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 6b8f195..db5b1df 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3626,6 +3626,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-4
+- R-maint-sig mass rebuild
+
 * Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-3
 - R-maint-sig mass rebuild
 

From 5a7661342949a9958f16f25e8d2788a32bd725ca Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Tue, 3 Jun 2025 15:33:23 +0200
Subject: [PATCH 302/344] Rebuilt for Python 3.14

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index db5b1df..7ee247a 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.34.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3626,6 +3626,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 6.34.08-5
+- Rebuilt for Python 3.14
+
 * Fri Apr 18 2025 Iñaki Úcar <iucar@fedoraproject.org> - 6.34.08-4
 - R-maint-sig mass rebuild
 

From 6edd65804f16c17f662f76cc952fcf0e89bfb3ab Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 9 Jun 2025 14:00:51 +0200
Subject: [PATCH 303/344] Update to 6.36.00

Enable the R interface for EPEL 10.1
Removed subpackages: root-gui-qt5webdisplay, -hist-draw, -histv7 and -html
New subpackage: root-roofit-codegen
---
 root-Adjust-test-stressGraphics.ref.patch     |  42 +-
 root-Fix-test-for-32-bit-architectures.patch  |  55 ++
 root-Ignore-warnings-from-uring-IO.patch      |  64 +++
 ...t-link-to-LLVM-libraries-in-parallel.patch |  47 ++
 root-Update-release-number.patch              |  25 +
 root-Use-size_t-for-offset.patch              |  60 +++
 root.spec                                     | 487 ++++++++----------
 sources                                       |   4 +-
 8 files changed, 493 insertions(+), 291 deletions(-)
 create mode 100644 root-Fix-test-for-32-bit-architectures.patch
 create mode 100644 root-Ignore-warnings-from-uring-IO.patch
 create mode 100644 root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
 create mode 100644 root-Update-release-number.patch
 create mode 100644 root-Use-size_t-for-offset.patch

diff --git a/root-Adjust-test-stressGraphics.ref.patch b/root-Adjust-test-stressGraphics.ref.patch
index 92db744..6f8e6e4 100644
--- a/root-Adjust-test-stressGraphics.ref.patch
+++ b/root-Adjust-test-stressGraphics.ref.patch
@@ -1,19 +1,13 @@
-From b0f07c642c8edb62788f8519dcdb322f99395661 Mon Sep 17 00:00:00 2001
+From 81286803e7791377ae75f40e9c65f8928ad8fe31 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 9 Jan 2025 21:44:14 +0100
+Date: Fri, 30 May 2025 05:31:08 +0200
 Subject: [PATCH] Adjust test/stressGraphics.ref
 
-One of the tests fails with just a few bytes on latest Fedora
-releases. Failures can be seen for both test-stressgraphics and
-test-stressgraphics-interpreted. Failures are reported for sizes being
-201, 202 or 203 bytes larger than the reference, with thw limit
-currently set to 200 bytes.
-
-Test 19: TGaxis 3 (Time on axis)................................... OK
-         PDF output......................................... 19 FAILED
-         Result    = 42723
-         Reference = 42926
-         Error     = 203 (was 200)
+Test 37: TScatter with TPolyMarker test............................ OK
+         PDF output......................................... 37 FAILED
+         Result    = 22236
+         Reference = 22560
+         Error     = 324 (was 300)
          JPG output................................................ OK
          PNG output................................................ OK
          C file result............................................. OK
@@ -22,18 +16,18 @@ Test 19: TGaxis 3 (Time on axis)................................... OK
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 28ac0b9b7b..e1382d2d45 100644
+index a894796951..a8746db4df 100644
 --- a/test/stressGraphics.ref
 +++ b/test/stressGraphics.ref
-@@ -17,7 +17,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-    16     28072       400     23287       200     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       150     27511     11000     16867       600     20721       400
-    18     15894       100     19305       200     27187     10300     15925       350     15925       100
--   19     22521       300     42926       200     43868     17000     19232     11000     22729       300
-+   19     22521       300     42926       250     43868     17000     19232     11000     22729       300
-    20      3664       600     14437       150     19824      6300     10396       900      4220       600
-    21     17608       600     13900       150     49440      6300     37586      9000      5938       600
-    22      4866       600     14162       100     30889     10050     21311      1800      4845       600
+@@ -35,7 +35,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+    34   3304592       100    712308      3000     62688     19000    123056      7000   3396789      1000
+    35      3954       100     14654       300     17378      7800      9629      2000      3794       200
+    36      9073       100     22150       300     27691      7800     20712      2000      9157       200
+-   37     17800       200     22560       300     28599      7800     42618      2000     17600       200
++   37     17800       200     22560       400     28599      7800     42618      2000     17600       200
+    38     12926       200     24304       300     24021      6800     12637      2000     12584       200
+    39     29664       200     19354       300     23024      6500     12821      2000     31317       200
+    40     46000       400     23482       300     38792      8500     30458      4000     46000       400
 -- 
-2.47.1
+2.49.0
 
diff --git a/root-Fix-test-for-32-bit-architectures.patch b/root-Fix-test-for-32-bit-architectures.patch
new file mode 100644
index 0000000..5da0477
--- /dev/null
+++ b/root-Fix-test-for-32-bit-architectures.patch
@@ -0,0 +1,55 @@
+From 9efe32d0f0e89624d7cf5efeca9cf151d9d0b220 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 3 Jun 2025 19:57:31 +0200
+Subject: [PATCH] Fix test for 32 bit architectures
+
+[ RUN      ] TypeReflectionTest.GetSizeOfType
+/builddir/build/BUILD/root-6.36.00-build/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp:79: Failure
+Expected equality of these values:
+  Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4]))
+    Which is: 12
+  16
+[  FAILED  ] TypeReflectionTest.GetSizeOfType (23 ms)
+
+[ RUN      ] ScopeReflectionTest.SizeOf
+/builddir/build/BUILD/root-6.36.00-build/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp:161: Failure
+Expected equality of these values:
+  Cpp::SizeOf(Decls[7])
+    Which is: 12
+  (size_t)16
+    Which is: 16
+[  FAILED  ] ScopeReflectionTest.SizeOf (26 ms)
+---
+ .../CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp     | 2 +-
+ .../CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
+index 0b39080859..14122c6498 100644
+--- a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
++++ b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
+@@ -158,7 +158,7 @@ TEST(ScopeReflectionTest, SizeOf) {
+   EXPECT_EQ(Cpp::SizeOf(Decls[4]), (size_t)0);
+   EXPECT_EQ(Cpp::SizeOf(Decls[5]), (size_t)1);
+   EXPECT_EQ(Cpp::SizeOf(Decls[6]), (size_t)4);
+-  EXPECT_EQ(Cpp::SizeOf(Decls[7]), (size_t)16);
++  EXPECT_EQ(Cpp::SizeOf(Decls[7]), (size_t) (sizeof(size_t) == 4 ? 12 : 16));
+ }
+ 
+ 
+diff --git a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
+index a3e482596d..8f7bc01ebe 100644
+--- a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
++++ b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
+@@ -77,7 +77,7 @@ TEST(TypeReflectionTest, GetSizeOfType) {
+   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[1])), 1);
+   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[2])), 4);
+   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[3])), 8);
+-  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), 16);
++  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), sizeof(size_t) == 4 ? 12 : 16);
+   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetTypeFromScope(Decls[5])), 0);
+   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[6])),
+             sizeof(intptr_t));
+-- 
+2.49.0
+
diff --git a/root-Ignore-warnings-from-uring-IO.patch b/root-Ignore-warnings-from-uring-IO.patch
new file mode 100644
index 0000000..6183dff
--- /dev/null
+++ b/root-Ignore-warnings-from-uring-IO.patch
@@ -0,0 +1,64 @@
+From 1c0b441b9e23ac6a0b7b239a9e06b5caa263cf60 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 7 Jun 2025 16:57:52 +0200
+Subject: [PATCH] Ignore warnings from uring IO
+
+Tests randomly fail because the uring memory is exhausted.
+
+Here are some examples:
+
+[ RUN      ] RNTuple.RandomAccess
+.../root-6.36.00/core/testsupport/src/TestSupport.cxx:79: Failure
+Failed
+Received unexpected diagnostic of severity 2000 at 'RIoUring' reading 'io_uring is unexpectedly not available because:
+Failed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user'.
+Suppress those using ROOT/TestSupport.hxx
+.../root-6.36.00/core/testsupport/src/TestSupport.cxx:79: Failure
+Failed
+Received unexpected diagnostic of severity 2000 at 'RRawFileUnix' reading 'io_uring setup failed, falling back to blocking I/O in ReadV'.
+Suppress those using ROOT/TestSupport.hxx
+[  FAILED  ] RNTuple.RandomAccess (20472 ms)
+
+[ RUN      ] RNTupleDSTest.ChainMT
+.../root-6.34.08/core/testsupport/src/TestSupport.cxx:79: Failure
+Failed
+Received unexpected diagnostic of severity 2000 at 'RIoUring' reading 'io_uring is unexpectedly not available because:
+Failed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user'.
+Suppress those using ROOT/TestSupport.hxx
+.../root-6.34.08/core/testsupport/src/TestSupport.cxx:79: Failure
+Failed
+Received unexpected diagnostic of severity 2000 at 'RRawFileUnix' reading 'io_uring setup failed, falling back to blocking I/O in ReadV'.
+Suppress those using ROOT/TestSupport.hxx
+[  FAILED  ] RNTupleDSTest.ChainMT (1004 ms)
+---
+ core/testsupport/src/TestSupport.cxx | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
+index 9889a432f4..c7ee440746 100644
+--- a/core/testsupport/src/TestSupport.cxx
++++ b/core/testsupport/src/TestSupport.cxx
+@@ -76,6 +76,20 @@ static struct ForbidDiagnostics {
+         return;
+       }
+ 
++      if (level == kWarning
++          && strcmp(location, "RIoUring") == 0
++          && strcmp(msg, "io_uring is unexpectedly not available because:\nFailed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user") == 0) {
++        std::cerr << "Warning in " << location << " " << msg << std::endl;
++        return;
++      }
++
++      if (level == kWarning
++          && strcmp(location, "RRawFileUnix") == 0
++          && strcmp(msg, "io_uring setup failed, falling back to blocking I/O in ReadV") == 0) {
++        std::cerr << "Warning in " << location << " " << msg << std::endl;
++        return;
++      }
++
+       FAIL() << "Received unexpected diagnostic of severity "
+          << level
+          << " at '" << location << "' reading '" << msg << "'.\n"
+-- 
+2.49.0
+
diff --git a/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch b/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
new file mode 100644
index 0000000..875cf05
--- /dev/null
+++ b/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
@@ -0,0 +1,47 @@
+From e59ece55e4eead85b2b6fd8c6ddc2dfa179f0d09 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 2 Jun 2025 21:22:39 +0200
+Subject: [PATCH] Save memory. Do not link to LLVM libraries in parallel
+
+---
+ core/clingutils/test/CMakeLists.txt                        | 3 +++
+ interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt | 6 ++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/core/clingutils/test/CMakeLists.txt b/core/clingutils/test/CMakeLists.txt
+index 15cc3ff48a..f62735e972 100644
+--- a/core/clingutils/test/CMakeLists.txt
++++ b/core/clingutils/test/CMakeLists.txt
+@@ -31,3 +31,6 @@ if(NOT builtin_clang)
+ endif()
+ 
+ ROOT_ADD_UNITTEST_DIR(Core RIO ${CLING_LIBRARIES} $<TARGET_OBJECTS:ClingUtils>)
++
++# Save memory. Do not link to LLVM libraries in parallel
++add_dependencies(coreclingutilstestUnit CppInterOpTests)
+diff --git a/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt b/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
+index 0ba35053fd..c6440cf301 100644
+--- a/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
++++ b/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
+@@ -65,6 +65,9 @@ target_link_libraries(CppInterOpTests
+   clangCppInterOp
+ )
+ 
++# Save memory. Do not link to LLVM libraries in parallel
++add_dependencies(CppInterOpTests DynamicLibraryManagerTests)
++
+ set_output_directory(CppInterOpTests
+   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+   LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+@@ -116,5 +119,8 @@ set_output_directory(DynamicLibraryManagerTests
+ 
+ add_dependencies(DynamicLibraryManagerTests TestSharedLib)
+ 
++# Save memory. Do not link to LLVM libraries in parallel
++add_dependencies(DynamicLibraryManagerTests Cling)
++
+ #export_executable_symbols_for_plugins(TestSharedLib)
+ add_subdirectory(TestSharedLib)
+-- 
+2.49.0
+
diff --git a/root-Update-release-number.patch b/root-Update-release-number.patch
new file mode 100644
index 0000000..c9f05cd
--- /dev/null
+++ b/root-Update-release-number.patch
@@ -0,0 +1,25 @@
+From 0ad965c6a2ed651e4a933434735fbe1c6bf32c1c Mon Sep 17 00:00:00 2001
+From: Danilo Piparo <danilo.piparo@cern.ch>
+Date: Mon, 26 May 2025 10:05:26 +0200
+Subject: [PATCH] Update release number
+
+---
+ core/foundation/inc/ROOT/RVersion.hxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/foundation/inc/ROOT/RVersion.hxx b/core/foundation/inc/ROOT/RVersion.hxx
+index 365a371b2a..d5a3623747 100644
+--- a/core/foundation/inc/ROOT/RVersion.hxx
++++ b/core/foundation/inc/ROOT/RVersion.hxx
+@@ -4,7 +4,7 @@
+ /* Update on release: */
+ #define ROOT_VERSION_MAJOR 6
+ #define ROOT_VERSION_MINOR 36
+-#define ROOT_VERSION_PATCH 00
++#define ROOT_VERSION_PATCH 0
+ #define ROOT_RELEASE_DATE "May 26 2025"
+ 
+ /* Don't change the lines below. */
+-- 
+2.49.0
+
diff --git a/root-Use-size_t-for-offset.patch b/root-Use-size_t-for-offset.patch
new file mode 100644
index 0000000..49d3ab5
--- /dev/null
+++ b/root-Use-size_t-for-offset.patch
@@ -0,0 +1,60 @@
+From 7bfd27ac478356e7c718b18b5eb3a3b277b833d1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 3 Jun 2025 06:49:27 +0200
+Subject: [PATCH] Use size_t for offset
+
+[ RUN      ] VariableReflectionTest.StaticConstExprDatamember
+/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:545: Failure
+Expected equality of these values:
+  3
+  *(int*)offset
+    Which is: 0
+/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:561: Failure
+Expected equality of these values:
+  5
+  *(int*)offset
+    Which is: 0
+/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:580: Failure
+Expected equality of these values:
+  2
+  *(int*)offset
+    Which is: 0
+[  FAILED  ] VariableReflectionTest.StaticConstExprDatamember (9 ms)
+---
+ .../unittests/CppInterOp/VariableReflectionTest.cpp         | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
+index 26dad4f25c..571ae5cd5d 100644
+--- a/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
++++ b/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
+@@ -552,7 +552,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
+   EXPECT_EQ(datamembers.size(), 1);
+ 
+   intptr_t offset = Cpp::GetVariableOffset(datamembers[0]);
+-  EXPECT_EQ(3, *(int*)offset);
++  EXPECT_EQ(3, *(size_t*)offset);
+ 
+   ASTContext& C = Interp->getCI()->getASTContext();
+   std::vector<Cpp::TemplateArgInfo> template_args = {
+@@ -568,7 +568,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
+   EXPECT_EQ(datamembers.size(), 1);
+ 
+   offset = Cpp::GetVariableOffset(datamembers[0]);
+-  EXPECT_EQ(5, *(int*)offset);
++  EXPECT_EQ(5, *(size_t*)offset);
+ 
+   std::vector<Cpp::TemplateArgInfo> ele_template_args = {
+       {C.IntTy.getAsOpaquePtr()}, {C.FloatTy.getAsOpaquePtr()}};
+@@ -587,7 +587,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
+   EXPECT_EQ(datamembers.size(), 1);
+ 
+   offset = Cpp::GetVariableOffset(datamembers[0]);
+-  EXPECT_EQ(2, *(int*)offset);
++  EXPECT_EQ(2, *(size_t*)offset);
+ }
+ 
+ TEST(VariableReflectionTest, GetEnumConstantDatamembers) {
+-- 
+2.49.0
+
diff --git a/root.spec b/root.spec
index 7ee247a..c999668 100644
--- a/root.spec
+++ b/root.spec
@@ -20,8 +20,8 @@
 %global pandas 0
 %endif
 
-%if %{?rhel}%{!?rhel:0} == 10
-# R not yet available in EPEL 10
+%if "%{?dist}" == ".el10_0"
+# R not available in EPEL 10.0
 %global rrr 0
 %else
 %global rrr 1
@@ -37,9 +37,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.34.08
+Version:	6.36.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -64,7 +64,7 @@ Source7:	JupyROOT-on-EPEL
 Source8:	%{name}-get-src.sh
 #		Clad is a source-transformation automatic differentiation (AD)
 #		library for C++, implemented as a plugin for the Clang compiler
-Source9:	https://github.com/vgvassilev/clad/archive/v1.7/clad-1.7.tar.gz
+Source9:	https://github.com/vgvassilev/clad/archive/v1.9/clad-1.9.tar.gz
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
@@ -78,10 +78,24 @@ Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
 #		Adjust test/stressGraphics.ref
-#		https://github.com/root-project/root/pull/17398
+#		https://github.com/root-project/root/pull/18989
 Patch5:		%{name}-Adjust-test-stressGraphics.ref.patch
 #		Revert test change that breaks the test
 Patch6:		%{name}-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
+#		Ignore warnings from uring IO
+#		https://github.com/root-project/root/pull/18994
+Patch7:		%{name}-Ignore-warnings-from-uring-IO.patch
+#		Preserve memory during parallel build
+#		https://github.com/root-project/root/pull/18991
+Patch8:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
+#		Fix Big Endian test failure
+#		https://github.com/root-project/root/pull/18992
+Patch9:		%{name}-Use-size_t-for-offset.patch
+#		Fix 32 bit test failure
+#		https://github.com/root-project/root/pull/18993
+Patch10:	%{name}-Fix-test-for-32-bit-architectures.patch
+#		Remove extra 0 in release number
+Patch11:	%{name}-Update-release-number.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -122,10 +136,6 @@ BuildRequires:	libxcrypt-devel
 BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
 BuildRequires:	python%{python3_pkgversion}-setuptools
 BuildRequires:	python%{python3_pkgversion}-numpy
-%ifarch %{qt5_qtwebengine_arches}
-BuildRequires:	qt5-qtbase-devel
-BuildRequires:	qt5-qtwebengine-devel
-%endif
 %ifarch %{qt6_qtwebengine_arches}
 BuildRequires:	qt6-qtbase-devel
 BuildRequires:	qt6-qtwebengine-devel
@@ -321,6 +331,10 @@ Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
 Obsoletes:	%{name}-doc < 6.26.00
 Obsoletes:	%{name}-io-gfal < 6.30.00
 Obsoletes:	%{name}-roofit-common < 6.30.00
+Obsoletes:	%{name}-gui-qt5webdisplay < 6.36.00
+Obsoletes:	%{name}-hist-draw < 6.36.00
+Obsoletes:	%{name}-histv7 < 6.36.00
+Obsoletes:	%{name}-html < 6.36.00
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -821,16 +835,6 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 %description spectrum-painter
 This package contains a painter of spectra for ROOT.
 
-%package html
-Summary:	HTML documentation generator for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	graphviz
-
-%description html
-This package contains classes to automatically extract documentation
-from marked up sources.
-
 %package io
 Summary:	Input/output of ROOT objects
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1278,7 +1282,6 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
 %if %{roofitmp}
@@ -1388,6 +1391,18 @@ suitable for adoption in different disciplines as well.
 
 This package contains the JSON interface to RooFit.
 
+%package roofit-codegen
+Summary:	Code generation support for RooFit
+License:	BSD-2-Clause
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
+Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
+
+%description roofit-codegen
+This package contains a library providing classes that implement
+code generation support for RooFit.
+
 %if %{roofitmp}
 %package roofit-multiprocess
 Summary:	Multi-process support for RooFit
@@ -1397,7 +1412,7 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-zmq%{?_isa} = %{version}-%{release}
 
 %description roofit-multiprocess
-This package contains a library providing classes that implements
+This package contains a library providing classes that implement
 mult-process support for RooFit.
 
 %package roofit-zmq
@@ -1432,14 +1447,11 @@ RooFit.
 %package hist-factory
 Summary:	RooFit PDFs from ROOT histograms
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io-xmlparser%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roostats%{?_isa} = %{version}-%{release}
 
 %description hist-factory
@@ -1747,17 +1759,6 @@ Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
 %description gui-webdisplay
 This package contains a web display extension for ROOT.
 
-%ifarch %{qt5_qtwebengine_arches}
-%package gui-qt5webdisplay
-Summary:	Qt5 Web display
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net-http%{?_isa} = %{version}-%{release}
-
-%description gui-qt5webdisplay
-This package contains a Qt5 web display extension for ROOT.
-%endif
-
 %ifarch %{qt6_qtwebengine_arches}
 %package gui-qt6webdisplay
 Summary:	Qt6 Web display
@@ -1868,7 +1869,6 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist-draw%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 #		Package split (gui-browsable-v7 from gui-browsable)
@@ -1913,21 +1913,6 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This package contains a library to show a pop-up dialog when fitting
 various kinds of data.
 
-%package histv7
-Summary:	Histogram library for ROOT (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description histv7
-This package contains a library for histogramming in ROOT 7.
-
-%package hist-draw
-Summary:	Histogram drawing (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
-
-%description hist-draw
-This package contains an histogram drawing extension for ROOT 7.
-
 %package tree-ntuple
 Summary:	Ntuple (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1958,6 +1943,11 @@ This package contains utility functions for ntuples.
 %patch -P4 -p1
 %patch -P5 -p1
 %patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
+%patch -P11 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1994,11 +1984,14 @@ rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 rm etc/notebook/JsMVA/js/*.min.js
 rm etc/notebook/JsMVA/css/*.min.css
 
+# Remove executable permissions from source file
+chmod -x interpreter/CppInterOp/lib/Interpreter/CppInterOp.cpp
+
 # Additional documentation
 install -p -m 644 %{SOURCE7} bindings/jupyroot
 
 %build
-%if %{?fedora}%{!?fedora:0} == 40 || %{?rhel}%{!?rhel:0} == 10
+%if %{?rhel}%{!?rhel:0} == 10
 # This package triggers a fault in LLVM when LTO is enabled.  Until LLVM
 # is analyzed and fixed, disable LTO
 %define _lto_cflags %{nil}
@@ -2032,10 +2025,12 @@ done
        -Dbuiltin_fftw3:BOOL=OFF \
        -Dbuiltin_freetype:BOOL=OFF \
        -Dbuiltin_ftgl:BOOL=OFF \
+       -Dbuiltin_gif:BOOL=OFF \
        -Dbuiltin_gl2ps:BOOL=OFF \
        -Dbuiltin_glew:BOOL=OFF \
        -Dbuiltin_gsl:BOOL=OFF \
        -Dbuiltin_gtest:BOOL=OFF \
+       -Dbuiltin_jpeg:BOOL=OFF \
        -Dbuiltin_llvm:BOOL=ON \
        -Dbuiltin_lz4:BOOL=OFF \
        -Dbuiltin_lzma:BOOL=OFF \
@@ -2047,6 +2042,7 @@ done
        -Dbuiltin_openssl:BOOL=OFF \
        -Dbuiltin_openui5:BOOL=ON \
        -Dbuiltin_pcre:BOOL=OFF \
+       -Dbuiltin_png:BOOL=OFF \
        -Dbuiltin_tbb:BOOL=OFF \
        -Dbuiltin_unuran:BOOL=OFF \
        -Dbuiltin_vc:BOOL=OFF \
@@ -2063,11 +2059,12 @@ done
        -Darrow:BOOL=OFF \
 %endif
        -Dasimage:BOOL=ON \
+       -Dasimage_tiff:BOOL=ON \
        -Dccache:BOOL=OFF \
        -Ddistcc:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
        -Dclad:BOOL=ON \
-       -DCLAD_SOURCE_DIR:PATH=${PWD}/clad-1.7 \
+       -DCLAD_SOURCE_DIR:PATH=${PWD}/clad-1.9 \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
        -Ddaos:BOOL=OFF \
@@ -2088,7 +2085,6 @@ done
        -Dgeom:BOOL=ON \
        -Dgeombuilder:BOOL=ON \
        -Dgviz:BOOL=ON \
-       -Dhtml:BOOL=ON \
        -Dhttp:BOOL=ON \
        -Dimt:BOOL=ON \
        -Dlibcxx:BOOL=OFF \
@@ -2104,11 +2100,6 @@ done
        -Dproof:BOOL=ON \
        -Dpyroot:BOOL=ON \
        -Dpythia8:BOOL=ON \
-%ifarch %{qt5_qtwebengine_arches}
-       -Dqt5web:BOOL=ON \
-%else
-       -Dqt5web:BOOL=OFF \
-%endif
 %ifarch %{qt6_qtwebengine_arches}
        -Dqt6web:BOOL=ON \
 %else
@@ -2277,8 +2268,10 @@ jupyter notebook "\$@"
 EOF
 
 # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
-sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
-sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
+sed -e 's!/usr/bin/env bash!/bin/bash!' \
+    -i %{buildroot}%{_bindir}/root-config \
+       %{buildroot}%{_bindir}/rootssh
+sed -e 's!/usr/bin/env python3!%{__python3}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
@@ -2291,17 +2284,10 @@ sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
        %{buildroot}%{_bindir}/rootprint \
        %{buildroot}%{_bindir}/rootrm \
        %{buildroot}%{_bindir}/rootslimtree
-sed -e 's!/usr/bin/env /usr/bin/python.*!%{__python3}!' \
+sed -e 's!/usr/bin/env python3!%{__python3}!' \
     -i %{buildroot}%{_bindir}/rootdrawtree
 sed -e 's!/usr/bin/env python!%{__python3}!' \
-    -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationClassificationKeras.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationRegressionKeras.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ClassificationKeras.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/GenerateModel.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/MulticlassKeras.py \
-       %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
+    -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py
 sed -e 's!/usr/bin/python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/%{name}/pdg_table_update.py
 
@@ -2313,6 +2299,11 @@ rm %{buildroot}%{_bindir}/setxrd*
 rm %{buildroot}%{_bindir}/thisroot*
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
+rm -rf %{buildroot}%{_includedir}/clang
+rm -rf %{buildroot}%{_includedir}/clang-c
+rm -rf %{buildroot}/usr/lib/cmake/CppInterOp
+rm %{buildroot}/usr/lib/libclangCppInterOp.a
+rm -rf %{buildroot}%{_datadir}/%{name}/html
 
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
@@ -2395,54 +2386,47 @@ popd
 # - test-stressIOPlugins-*
 #   requires network access (by design since they test the remote file IO)
 #
-# - tutorial-dataframe-df101_h1Analysis
-# - tutorial-tree-run_h1analysis
-# - tutorial-multicore-imt001_parBranchProcessing
-# - tutorial-multicore-mp103_processSelector
-# - tutorial-multicore-mp104_processH1
-# - tutorial-multicore-mp105_processEntryList
+# - tutorial-analysis-dataframe-df101_h1Analysis
+# - tutorial-analysis-tree-run_h1analysis
+# - tutorial-legacy-multicore-mp104_processH1
 #   requires network access: http://root.cern.ch/files/h1/
 #
-# - tutorial-multicore-imt101_parTreeProcessing
+# - tutorial-io-tree-imt_parTreeProcessing
 #   requires input data: http://root.cern.ch/files/tp_process_imt.root (707 MB)
 #
-# - tutorial-dataframe-df###_SQlite*
+# - tutorial-analysis-dataframe-df###_SQlite*
 #   reads sqlite data over network:
 #   http://root.cern.ch/files/root_download_stats.sqlite
 #
-# - tutorial-dataframe-df033_Describe-py
-# - tutorial-dataframe-df102_NanoAODDimuonAnalysis(-py)?
+# - tutorial-analysis-dataframe-df033_Describe-py
+# - tutorial-analysis-dataframe-df102_NanoAODDimuonAnalysis(-py)?
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/opendata/cms/derived-data/
 #   AOD2NanoAODOutreachTool/Run2012BC_DoubleMuParked_Muons.root
 #
 # - gtest-tree-treeplayer-treeprocessormt-remotefiles
-# - tutorial-dataframe-df103_NanoAODHiggsAnalysis(-py)?
+# - tutorial-analysis-dataframe-df103_NanoAODHiggsAnalysis(-py)?
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
 #
-# - tutorial-dataframe-df104_HiggsToTwoPhotons-py
-# - tutorial-dataframe-df105_WBosonAnalysis-py
-# - tutorial-dataframe-df106_HiggsToFourLeptons(-py)
-# - tutorial-dataframe-df107_SingleTopAnalysis-py
-# - tutorial-rcanvas-df104-py
-# - tutorial-rcanvas-df105-py
+# - tutorial-analysis-dataframe-df104_HiggsToTwoPhotons-py
+# - tutorial-analysis-dataframe-df105_WBosonAnalysis-py
+# - tutorial-analysis-dataframe-df106_HiggsToFourLeptons(-py)
+# - tutorial-analysis-dataframe-df107_SingleTopAnalysis-py
+# - tutorial-experimental-rcanvas-df104-py
+# - tutorial-experimental-rcanvas-df105-py
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/opendata/atlas/OutreachDatasets/2020-01-22/
 #
-# - tutorial-v7-ntuple-ntpl003_lhcbOpenData
-#   reads input data over network
-#   http://root.cern.ch/files/LHCb/lhcb_B2HHH_MagnetUp.root (425 MB)
-#
-# - tutorial-v7-ntuple-ntpl004_dimuon
+# - tutorial-io-ntuple-ntpl004_dimuon
 #   reads input data over network
 #   http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
 #
-# - tutorial-v7-ntuple-ntpl008_import
+# - tutorial-io-ntuple-ntpl008_import
 #   reads input data over network
 #   http://root.cern.ch/files/HiggsTauTauReduced/GluGluToHToTauTau.root (20 MB)
 #
-# - tutorial-v7-ntuple-ntpl011_global_temperatures
+# - tutorial-io-ntuple-ntpl011_global_temperatures
 #   reads input data over network
 #   http://root.cern.ch/files/tutorials/GlobalLandTemperaturesByCity.csv
 #
@@ -2455,67 +2439,41 @@ popd
 #   root://eospublic.cern.ch/eos/root-eos/xrootd.test
 #
 # - gtest-net-netxng-TNetXNGFileTest
+# - tutorial-analysis-parallel-mp_processSelector
 #   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
 #
-# - gtest-tmva-tmva-rreader
-# - gtest-tmva-tmva-rstandardscaler
-# - tutorial-tmva-tmva003_RReader
-# - tutorial-tmva-tmva004_RStandardScaler
-#   reads input data over network
-#   http://root.cern.ch/files/tmva_class_example.root
-#
 # - tutorial-tmva-tmva103_Application
 #   reads input data over network
-#   http://root.cern/files/tmva101.root
-#
-# - tutorial-tmva-RBatchGenerator_NumPy-py
-#   reads input data over network
-#   http://root.cern/files/Higgs_data.root
-#
-# - test-import-numba
-# - tutorial-pyroot-pyroot004_NumbaDeclare-py
-# - pyunittests-pyroot-numbadeclare
-#   these tests require the numba python module which is not available
+#   root://eospublic.cern.ch/eos/root-eos/cms_opendata_2012_nanoaod/SMHiggsToZZTo4L.root
 #
 # - test-webgui-ping
 #   error: Cannot display window in native
 excluded="\
 test-stressIOPlugins|\
-tutorial-dataframe-df101_h1Analysis|\
-tutorial-tree-run_h1analysis|\
-tutorial-multicore-imt001_parBranchProcessing|\
-tutorial-multicore-mp103_processSelector|\
-tutorial-multicore-mp104_processH1|\
-tutorial-multicore-mp105_processEntryList|\
-tutorial-multicore-imt101_parTreeProcessing|\
-tutorial-dataframe-df..._SQlite|\
-tutorial-dataframe-df033_Describe-py|\
-tutorial-dataframe-df102_NanoAODDimuonAnalysis|\
+tutorial-analysis-dataframe-df101_h1Analysis|\
+tutorial-analysis-tree-run_h1analysis|\
+tutorial-legacy-multicore-mp104_processH1|\
+tutorial-io-tree-imt_parTreeProcessing|\
+tutorial-analysis-dataframe-df..._SQlite|\
+tutorial-analysis-dataframe-df033_Describe-py|\
+tutorial-analysis-dataframe-df102_NanoAODDimuonAnalysis|\
 gtest-tree-treeplayer-treeprocessormt-remotefiles|\
-tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
-tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
-tutorial-dataframe-df105_WBosonAnalysis-py|\
-tutorial-dataframe-df106_HiggsToFourLeptons|\
-tutorial-dataframe-df107_SingleTopAnalysis-py|\
-tutorial-rcanvas-df104-py|\
-tutorial-rcanvas-df105-py|\
-tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
-tutorial-v7-ntuple-ntpl004_dimuon|\
-tutorial-v7-ntuple-ntpl008_import|\
-tutorial-v7-ntuple-ntpl011_global_temperatures|\
+tutorial-analysis-dataframe-df103_NanoAODHiggsAnalysis|\
+tutorial-analysis-dataframe-df104_HiggsToTwoPhotons-py|\
+tutorial-analysis-dataframe-df105_WBosonAnalysis-py|\
+tutorial-analysis-dataframe-df106_HiggsToFourLeptons|\
+tutorial-analysis-dataframe-df107_SingleTopAnalysis-py|\
+tutorial-experimental-rcanvas-df104-py|\
+tutorial-experimental-rcanvas-df105-py|\
+tutorial-io-ntuple-ntpl004_dimuon|\
+tutorial-io-ntuple-ntpl008_import|\
+tutorial-io-ntuple-ntpl011_global_temperatures|\
 gtest-net-davix-RRawFileDavix|\
 gtest-net-netxng-RRawFileNetXNG|\
 gtest-net-netxng-TNetXNGFileTest|\
-gtest-tmva-tmva-rreader|\
-gtest-tmva-tmva-rstandardscaler|\
-tutorial-tmva-tmva003_RReader|\
-tutorial-tmva-tmva004_RStandardScaler|\
+tutorial-analysis-parallel-mp_processSelector|\
 tutorial-tmva-tmva103_Application|\
-tutorial-tmva-RBatchGenerator_NumPy-py|\
-test-import-numba|\
-tutorial-pyroot-pyroot004_NumbaDeclare-py|\
-pyunittests-pyroot-numbadeclare|\
 test-webgui-ping"
 
 # gtest-roofit-roofit-vectorisedPDFs-testLandau:
@@ -2532,61 +2490,50 @@ test-webgui-ping"
 # test-stressgraphics-firefox-skip3d:
 # requires firefox...
 #
-# tutorial-webcanv-fonts_ttf.cxx:
+# tutorial-visualisation-webcanv-fonts_ttf.cxx:
 # Requires web graphics
-#
-# tutorial-roofit-rf617_simulation_based_inference_multidimensional-py:
-# from sklearn.neural_network import MLPClassifier
-#
-# tutorial-roofit-rf618_mixture_models-py:
-# import xgboost as xgb
 excluded="${excluded}|\
 gtest-roofit-roofit-vectorisedPDFs-testLandau|\
 gtest-tree-treeplayer-ttreeindex-clone|\
 gtest-tree-treeplayer-treetreeplayertestUnit|\
 test-stressgraphics-firefox-skip3d|\
-tutorial-webcanv-fonts_ttf.cxx|\
-tutorial-roofit-rf617_simulation_based_inference_multidimensional-py|\
-tutorial-roofit-rf618_mixture_models-py"
-
-# Test using tensorflow and torch
-# Disabled for Python >= 3.12, but must be excluded for Python < 3.12
-excluded="${excluded}|\
-pyunittests-bindings-pyroot-pythonizations-batchgen|\
-test-import-tensorflow|\
-test-import-torch"
-
-%if ! %{pandas}
-# - test-import-pandas
-# - tutorial-dataframe-df026_AsNumpyArrays-py
-# - tutorial-dataframe-df035_RDFFromPandas-py
-# - tutorial-roofit-rf409_NumPyPandasToRooFit-py
-#   Requires the pandas python module not (yet) available in RHEL/EPEL 9
-excluded="${excluded}|\
-test-import-pandas|\
-tutorial-dataframe-df026_AsNumpyArrays-py|\
-tutorial-dataframe-df035_RDFFromPandas-py|\
-tutorial-roofit-rf409_NumPyPandasToRooFit-py"
-%endif
+tutorial-visualisation-webcanv-fonts_ttf.cxx"
 
 %ifarch %{ix86}
 # - gtest-tree-dataframe-dataframe-concurrency
 #   "There's already an active task arena."
+#
+# - gtest-hist-hist-TFormulaGradientTests|\
+#   out of memory
+#
+# - pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views
+#   ValueError: buffer is smaller than requested size
 excluded="${excluded}|\
-gtest-tree-dataframe-dataframe-concurrency"
+gtest-tree-dataframe-dataframe-concurrency|\
+gtest-hist-hist-TFormulaGradientTests|\
+pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views"
 %endif
 
 %ifarch %{power64}
-# - tutorial-roostats-IntervalExamples-py
+# - tutorial-roofit-roostats-IntervalExamples-py
 #   *** Break *** segmentation violation
 excluded="${excluded}|\
-tutorial-roostats-IntervalExamples-py"
+tutorial-roofit-roostats-IntervalExamples-py"
 
 %if %{?fedora}%{!?fedora:0} >= 42
-# - gtest-tree-ntuple-v7-ntuple-evolution
+# - gtest-tree-ntuple-ntuple-emulated
+# - gtest-tree-ntuple-ntuple-evolution
 #   waitpid() failed
 excluded="${excluded}|\
-gtest-tree-ntuple-v7-ntuple-evolution"
+gtest-tree-ntuple-ntuple-emulated|\
+gtest-tree-ntuple-ntuple-evolution"
+%endif
+
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
+# tutorial-roofit-roostats-StandardBayesianMCMCDemo-py
+# - ZeroDivisionError: float division by zero
+excluded="${excluded}|\
+tutorial-roofit-roostats-StandardBayesianMCMCDemo-py"
 %endif
 %endif
 
@@ -2602,49 +2549,47 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 # - gtest-tmva-sofie-TestCustomModelsFromONNX
 # - gtest-tree-dataframe-dataframe-unified-constructor
 #
-# - gtest-tree-dataframe-datasource-ntuple
-# - gtest-tree-ntuple-v7-ntuple-basics
-# - gtest-tree-ntuple-v7-ntuple-bulk
-# - gtest-tree-ntuple-v7-ntuple-cast
-# - gtest-tree-ntuple-v7-ntuple-compat
-# - gtest-tree-ntuple-v7-ntuple-extended
-# - gtest-tree-ntuple-v7-ntuple-friends
-# - gtest-tree-ntuple-v7-ntuple-index
-# - gtest-tree-ntuple-v7-ntuple-merger
-# - gtest-tree-ntuple-v7-ntuple-model
-# - gtest-tree-ntuple-v7-ntuple-modelext
-# - gtest-tree-ntuple-v7-ntuple-multi-column
-# - gtest-tree-ntuple-v7-ntuple-packing
-# - gtest-tree-ntuple-v7-ntuple-parallel-writer
-# - gtest-tree-ntuple-v7-ntuple-processor
-# - gtest-tree-ntuple-v7-ntuple-project
-# - gtest-tree-ntuple-v7-ntuple-show
-# - gtest-tree-ntuple-v7-ntuple-storage
-# - gtest-tree-ntuple-v7-ntuple-storage-daos
-# - gtest-tree-ntuple-v7-ntuple-types
-# - gtest-tree-ntuple-v7-ntuple-view
-# - gtest-tree-ntuple-v7-rfield-class
-# - gtest-tree-ntuple-v7-rfield-streamer
-# - gtest-tree-ntuple-v7-rfield-variant
-# - gtest-tree-ntuple-v7-rfield-vector
+# - gtest-tree-ntuple-ntuple-basics
+# - gtest-tree-ntuple-ntuple-bulk
+# - gtest-tree-ntuple-ntuple-cast
+# - gtest-tree-ntuple-ntuple-compat
+# - gtest-tree-ntuple-ntuple-extended
+# - gtest-tree-ntuple-ntuple-join-table
+# - gtest-tree-ntuple-ntuple-largefile2
+# - gtest-tree-ntuple-ntuple-merger
+# - gtest-tree-ntuple-ntuple-model
+# - gtest-tree-ntuple-ntuple-modelext
+# - gtest-tree-ntuple-ntuple-multi-column
+# - gtest-tree-ntuple-ntuple-packing
+# - gtest-tree-ntuple-ntuple-parallel-writer
+# - gtest-tree-ntuple-ntuple-processor
+# - gtest-tree-ntuple-ntuple-processor-chain
+# - gtest-tree-ntuple-ntuple-processor-join
+# - gtest-tree-ntuple-ntuple-project
+# - gtest-tree-ntuple-ntuple-show
+# - gtest-tree-ntuple-ntuple-storage
+# - gtest-tree-ntuple-ntuple-storage-daos
+# - gtest-tree-ntuple-ntuple-types
+# - gtest-tree-ntuple-ntuple-view
+# - gtest-tree-ntuple-rfield-class
+# - gtest-tree-ntuple-rfield-streamer
+# - gtest-tree-ntuple-rfield-variant
+# - gtest-tree-ntuple-rfield-vector
 # - gtest-tree-ntupleutil-v7-ntuple-importer
 # - gtest-tree-ntupleutil-v7-ntuple-inspector
 #   https://github.com/root-project/root/issues/12426
 #
-# - pyunittests-bindings-experimental-distrdf-backend-distrdf-unit-backend-graph-caching
+# - pyunittests-bindings-distrdf-backend-distrdf-unit-backend-graph-caching
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector
-# - tutorial-dataframe-df006_ranges-py
-# - tutorial-fit-combinedFit-py
-# - tutorial-fit-NumericalMinimization-py
+# - tutorial-analysis-dataframe-df006_ranges-py
+# - tutorial-experimental-rcanvas-rbox-py
+# - tutorial-hist-hist007_TH1_liveupdate-py
 # - tutorial-math-exampleFunction-py
-# - tutorial-pyroot-hsum-py
-# - tutorial-rcanvas-rbox-py
+# - tutorial-math-fit-combinedFit-py
+# - tutorial-math-fit-NumericalMinimization-py
 #   https://github.com/root-project/root/issues/12429
 #
-# - tutorial-tree-drawsparse
-#   https://github.com/root-project/root/issues/12431
-#
 # - test-stresshistofit
 # - test-stresshistofit-interpreted
 # - test-stresshistogram
@@ -2652,60 +2597,84 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 excluded="${excluded}|\
 gtest-core-dictgen-dictgen-base|\
 gtest-tmva-sofie-TestCustomModelsFromONNX|\
+gtest-tree-dataframe-dataframe-snapshot-ntuple|\
 gtest-tree-dataframe-dataframe-unified-constructor|\
 gtest-tree-dataframe-datasource-ntuple|\
-gtest-tree-ntuple-v7-ntuple-basics|\
-gtest-tree-ntuple-v7-ntuple-bulk|\
-gtest-tree-ntuple-v7-ntuple-cast|\
-gtest-tree-ntuple-v7-ntuple-compat|\
-gtest-tree-ntuple-v7-ntuple-extended|\
-gtest-tree-ntuple-v7-ntuple-friends|\
-gtest-tree-ntuple-v7-ntuple-index|\
-gtest-tree-ntuple-v7-ntuple-merger|\
-gtest-tree-ntuple-v7-ntuple-model\$\$|\
-gtest-tree-ntuple-v7-ntuple-modelext|\
-gtest-tree-ntuple-v7-ntuple-multi-column|\
-gtest-tree-ntuple-v7-ntuple-packing|\
-gtest-tree-ntuple-v7-ntuple-parallel-writer|\
-gtest-tree-ntuple-v7-ntuple-processor|\
-gtest-tree-ntuple-v7-ntuple-project|\
-gtest-tree-ntuple-v7-ntuple-show|\
-gtest-tree-ntuple-v7-ntuple-storage\$\$|\
-gtest-tree-ntuple-v7-ntuple-storage-daos|\
-gtest-tree-ntuple-v7-ntuple-types|\
-gtest-tree-ntuple-v7-ntuple-view|\
-gtest-tree-ntuple-v7-rfield-class|\
-gtest-tree-ntuple-v7-rfield-streamer|\
-gtest-tree-ntuple-v7-rfield-variant|\
-gtest-tree-ntuple-v7-rfield-vector|\
+gtest-tree-ntuple-ntuple-basics|\
+gtest-tree-ntuple-ntuple-bulk|\
+gtest-tree-ntuple-ntuple-cast|\
+gtest-tree-ntuple-ntuple-compat|\
+gtest-tree-ntuple-ntuple-extended|\
+gtest-tree-ntuple-ntuple-join-table|\
+gtest-tree-ntuple-ntuple-largefile2|\
+gtest-tree-ntuple-ntuple-merger|\
+gtest-tree-ntuple-ntuple-model\$\$|\
+gtest-tree-ntuple-ntuple-modelext|\
+gtest-tree-ntuple-ntuple-multi-column|\
+gtest-tree-ntuple-ntuple-packing|\
+gtest-tree-ntuple-ntuple-parallel-writer|\
+gtest-tree-ntuple-ntuple-processor\$\$|\
+gtest-tree-ntuple-ntuple-processor-chain|\
+gtest-tree-ntuple-ntuple-processor-join|\
+gtest-tree-ntuple-ntuple-project|\
+gtest-tree-ntuple-ntuple-show|\
+gtest-tree-ntuple-ntuple-storage\$\$|\
+gtest-tree-ntuple-ntuple-storage-daos|\
+gtest-tree-ntuple-ntuple-types|\
+gtest-tree-ntuple-ntuple-view|\
+gtest-tree-ntuple-rfield-class|\
+gtest-tree-ntuple-rfield-streamer|\
+gtest-tree-ntuple-rfield-variant|\
+gtest-tree-ntuple-rfield-vector|\
 gtest-tree-ntupleutil-v7-ntuple-importer|\
 gtest-tree-ntupleutil-v7-ntuple-inspector|\
-pyunittests-bindings-experimental-distrdf-backend-distrdf-unit-backend-graph-caching|\
+pyunittests-bindings-distrdf-backend-distrdf-unit-backend-graph-caching|\
 pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor|\
 pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector|\
-tutorial-dataframe-df006_ranges-py|\
-tutorial-fit-combinedFit-py|\
-tutorial-fit-NumericalMinimization-py|\
+tutorial-analysis-dataframe-df006_ranges-py|\
+tutorial-experimental-rcanvas-rbox-py|\
+tutorial-hist-hist007_TH1_liveupdate-py|\
 tutorial-math-exampleFunction-py|\
-tutorial-pyroot-hsum-py|\
-tutorial-rcanvas-rbox-py|\
-tutorial-tree-drawsparse|\
+tutorial-math-fit-combinedFit-py|\
+tutorial-math-fit-NumericalMinimization-py|\
 test-stresshistofit\$\$|\
 test-stresshistofit-interpreted|\
 test-stresshistogram\$\$|\
 test-stresshistogram-interpreted"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10
 # Fails with gcc 14 on aarch64, ppc64le and s390x (on EPEL 10 also x86_64)
 # https://github.com/root-project/root/issues/14446
 # - gtest-math-matrix-testMatrixTSparse
+%if %{?fedora}%{!?fedora:0} >= 40
+%ifarch aarch64 %{power64} s390x
+excluded="${excluded}|\
+gtest-math-matrix-testMatrixTSparse"
+%endif
+%endif
+%if %{?rhel}%{!?rhel:0} >= 10
 excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
+# - https://github.com/root-project/root/issues/18995
+excluded="${excluded}|\
+gtest-tree-tree-testTTreeRegressions"
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 43
+# Failures due to reference counting changes in Python 3.14
+# - https://github.com/root-project/root/issues/18988
+# - https://docs.python.org/3.14/whatsnew/3.14.html
+excluded="${excluded}|\
+pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rdataframe-makenumpy|\
+pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rvec-asrvec"
+%endif
+
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
+# InterpreterTest.Evaluate fails on s390x
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
 GTEST_FILTER=-\
@@ -2713,6 +2682,7 @@ GTEST_FILTER=-\
 RNTuple.StdAtomic:\
 %endif
 %ifarch s390x
+InterpreterTest.Evaluate:\
 TClingDataMemberInfo.Offset:\
 %endif
 RCsvDS.Remote:\
@@ -3103,11 +3073,6 @@ fi
 %{_libdir}/%{name}/libSpectrumPainter.*
 %{_libdir}/%{name}/libSpectrumPainter_rdict.pcm
 
-%files html -f includelist-html
-%{_libdir}/%{name}/libHtml.*
-%{_libdir}/%{name}/libHtml_rdict.pcm
-%{_datadir}/%{name}/html
-
 %files io -f includelist-io-io
 %{_libdir}/%{name}/libRIO.*
 %{_datadir}/%{name}/plugins/TArchiveFile/P010_TZIPFile.C
@@ -3195,8 +3160,6 @@ fi
 %{_libdir}/%{name}/libMinuit2_rdict.pcm
 %dir %{_includedir}/%{name}/Minuit2
 %{_datadir}/%{name}/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P030_TFitterMinuit.C
-%{_datadir}/%{name}/plugins/TVirtualFitter/P040_TFitterFumili.C
 
 %files mlp -f includelist-math-mlp
 %{_libdir}/%{name}/libMLP.*
@@ -3364,14 +3327,16 @@ fi
 %{_libdir}/%{name}/libRooFitHS3.*
 %{_libdir}/%{name}/libRooFitHS3_rdict.pcm
 %dir %{_includedir}/%{name}/RooFitHS3
-%{_datadir}/%{name}/RooFitHS3_wsexportkeys.json
-%{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
 
 %files roofit-jsoninterface -f includelist-roofit-jsoninterface
 %{_libdir}/%{name}/libRooFitJSONInterface.*
 %{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
 %dir %{_includedir}/%{name}/RooFit
 
+%files roofit-codegen -f includelist-roofit-codegen
+%{_libdir}/%{name}/libRooFitCodegen.*
+%{_libdir}/%{name}/libRooFitCodegen_rdict.pcm
+
 %if %{roofitmp}
 %files roofit-multiprocess -f includelist-roofit-multiprocess
 %{_libdir}/%{name}/libRooFitMultiProcess.*
@@ -3538,11 +3503,6 @@ fi
 %{_datadir}/%{name}/runfirefox.sh
 %{_datadir}/%{name}/ui5
 
-%ifarch %{qt5_qtwebengine_arches}
-%files gui-qt5webdisplay
-%{_libdir}/%{name}/libROOTQt5WebDisplay.*
-%endif
-
 %ifarch %{qt6_qtwebengine_arches}
 %files gui-qt6webdisplay
 %{_libdir}/%{name}/libROOTQt6WebDisplay.*
@@ -3590,7 +3550,6 @@ fi
 %{_libdir}/%{name}/libROOTEve_rdict.pcm
 
 %files gui-browsable-v7
-%{_libdir}/%{name}/libROOTHistDrawProvider.*
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
 %{_libdir}/%{name}/libROOTNTupleBrowseProvider.*
 %{_libdir}/%{name}/libROOTNTupleDraw6Provider.*
@@ -3607,14 +3566,6 @@ fi
 %{_libdir}/%{name}/libROOTFitPanelv7.*
 %{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm
 
-%files histv7 -f includelist-hist-histv7
-%{_libdir}/%{name}/libROOTHist.*
-%{_libdir}/%{name}/libROOTHist_rdict.pcm
-
-%files hist-draw -f includelist-hist-histdrawv7
-%{_libdir}/%{name}/libROOTHistDraw.*
-%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
-
 %files tree-ntuple -f includelist-tree-ntuple
 %{_libdir}/%{name}/libROOTNTuple.*
 %{_libdir}/%{name}/libROOTNTuple_rdict.pcm
@@ -3626,6 +3577,12 @@ fi
 %endif
 
 %changelog
+* Sat Jun 07 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.00-1
+- Update to 6.36.00
+- Enable the R interface for EPEL 10.1
+- Removed subpackages: root-gui-qt5webdisplay, -hist-draw, -histv7 and -html
+- New subpackage: root-roofit-codegen
+
 * Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 6.34.08-5
 - Rebuilt for Python 3.14
 
diff --git a/sources b/sources
index 99610a2..a6bdda4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.34.08.tar.xz) = 58699d441555a82f9c2d00fc33719786bc5e4925060122f5e7fb46df28feec1d4047987b4badb20b19c484b13229b173bd110d25b1f3d426d70039847d879299
+SHA512 (root-6.36.00.tar.xz) = 2030961b001494a177b96540711940bb8f11fbcf624edfe3282bd7c2c0ad1ef60ed6a5cac9799dfae0d40f21f33728e6ab906f3da95589412dee592aebfbf4f4
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
-SHA512 (clad-1.7.tar.gz) = ff9856ed4901625b4c31bc4b5ac97f464667f58c567caaab8b2a2567de4e0908ff0fffbb566fe728fc6184d3d6bc156bbabacf24d83009e36b2956d535171066
+SHA512 (clad-1.9.tar.gz) = df0569f12e3381e9285639eee927d9effb2812765caad2d281c41f6673828ab28b7bf8143ae9686090649cf889e757cfead58baa47e907de468185125a4d772c

From 0afdff9faefb7bec445e963dd6ce46b4fd90db27 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 21 Jun 2025 05:38:04 +0200
Subject: [PATCH 304/344] Add root-tree-ntuple and root-tree-ntuple-utils
 dependensies to root-core   (listed in root-config --libs) Rename root-fonts
 package to root-font-files Add optional test dependency python3-pandas now
 available in EPEL 10 Add dependency jupyter-notebook to root-jupyroot for
 EPEL 10.1 and later Fix Python 3.14 refcount issues in tests

---
 root-Fix-test-for-32-bit-architectures.patch  | 24 +++---
 root-Ignore-warnings-from-uring-IO.patch      | 30 ++++----
 ...ference-refcount-values-for-Python-3.patch | 66 ++++++++++++++++
 ...erence-refcount-values-for-Python-3x.patch | 44 +++++++++++
 root.spec                                     | 77 +++++++++++--------
 5 files changed, 181 insertions(+), 60 deletions(-)
 create mode 100644 root-Python-Update-reference-refcount-values-for-Python-3.patch
 create mode 100644 root-Python-Update-reference-refcount-values-for-Python-3x.patch

diff --git a/root-Fix-test-for-32-bit-architectures.patch b/root-Fix-test-for-32-bit-architectures.patch
index 5da0477..879e3df 100644
--- a/root-Fix-test-for-32-bit-architectures.patch
+++ b/root-Fix-test-for-32-bit-architectures.patch
@@ -1,6 +1,6 @@
-From 9efe32d0f0e89624d7cf5efeca9cf151d9d0b220 Mon Sep 17 00:00:00 2001
+From 8f08aac1c5d356352d2bd24b05dcdd092d3ca864 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 3 Jun 2025 19:57:31 +0200
+Date: Thu, 19 Jun 2025 13:28:24 +0200
 Subject: [PATCH] Fix test for 32 bit architectures
 
 [ RUN      ] TypeReflectionTest.GetSizeOfType
@@ -20,33 +20,35 @@ Expected equality of these values:
     Which is: 16
 [  FAILED  ] ScopeReflectionTest.SizeOf (26 ms)
 ---
- .../CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp     | 2 +-
- .../CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp    | 3 ++-
+ .../CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp     | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
-index 0b39080859..14122c6498 100644
+index 0b39080859..d490d0833c 100644
 --- a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
 +++ b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
-@@ -158,7 +158,7 @@ TEST(ScopeReflectionTest, SizeOf) {
+@@ -158,7 +158,8 @@ TEST(ScopeReflectionTest, SizeOf) {
    EXPECT_EQ(Cpp::SizeOf(Decls[4]), (size_t)0);
    EXPECT_EQ(Cpp::SizeOf(Decls[5]), (size_t)1);
    EXPECT_EQ(Cpp::SizeOf(Decls[6]), (size_t)4);
 -  EXPECT_EQ(Cpp::SizeOf(Decls[7]), (size_t)16);
-+  EXPECT_EQ(Cpp::SizeOf(Decls[7]), (size_t) (sizeof(size_t) == 4 ? 12 : 16));
++  struct B {short a; double b;};
++  EXPECT_EQ(Cpp::SizeOf(Decls[7]), sizeof(B));
  }
  
  
 diff --git a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
-index a3e482596d..8f7bc01ebe 100644
+index a3e482596d..28cc32f166 100644
 --- a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
 +++ b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
-@@ -77,7 +77,7 @@ TEST(TypeReflectionTest, GetSizeOfType) {
+@@ -77,7 +77,8 @@ TEST(TypeReflectionTest, GetSizeOfType) {
    EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[1])), 1);
    EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[2])), 4);
    EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[3])), 8);
 -  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), 16);
-+  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), sizeof(size_t) == 4 ? 12 : 16);
++  struct B {int a; double b;};
++  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), sizeof(B));
    EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetTypeFromScope(Decls[5])), 0);
    EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[6])),
              sizeof(intptr_t));
diff --git a/root-Ignore-warnings-from-uring-IO.patch b/root-Ignore-warnings-from-uring-IO.patch
index 6183dff..2208534 100644
--- a/root-Ignore-warnings-from-uring-IO.patch
+++ b/root-Ignore-warnings-from-uring-IO.patch
@@ -1,6 +1,6 @@
-From 1c0b441b9e23ac6a0b7b239a9e06b5caa263cf60 Mon Sep 17 00:00:00 2001
+From f4ac6bf20278c19c88cf98f6062ecfad86b87378 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 7 Jun 2025 16:57:52 +0200
+Date: Thu, 19 Jun 2025 14:02:31 +0200
 Subject: [PATCH] Ignore warnings from uring IO
 
 Tests randomly fail because the uring memory is exhausted.
@@ -31,29 +31,27 @@ Received unexpected diagnostic of severity 2000 at 'RRawFileUnix' reading 'io_ur
 Suppress those using ROOT/TestSupport.hxx
 [  FAILED  ] RNTupleDSTest.ChainMT (1004 ms)
 ---
- core/testsupport/src/TestSupport.cxx | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ core/testsupport/src/TestSupport.cxx | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
-index 9889a432f4..c7ee440746 100644
+index 9889a432f4..4c3395ef16 100644
 --- a/core/testsupport/src/TestSupport.cxx
 +++ b/core/testsupport/src/TestSupport.cxx
-@@ -76,6 +76,20 @@ static struct ForbidDiagnostics {
+@@ -76,6 +76,18 @@ static struct ForbidDiagnostics {
          return;
        }
  
-+      if (level == kWarning
-+          && strcmp(location, "RIoUring") == 0
-+          && strcmp(msg, "io_uring is unexpectedly not available because:\nFailed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user") == 0) {
-+        std::cerr << "Warning in " << location << " " << msg << std::endl;
-+        return;
++      if (level == kWarning && strcmp(location, "RIoUring") == 0 &&
++          strstr(msg, "io_uring is unexpectedly not available because:") != nullptr) {
++         std::cerr << "Warning in " << location << " " << msg << std::endl;
++         return;
 +      }
 +
-+      if (level == kWarning
-+          && strcmp(location, "RRawFileUnix") == 0
-+          && strcmp(msg, "io_uring setup failed, falling back to blocking I/O in ReadV") == 0) {
-+        std::cerr << "Warning in " << location << " " << msg << std::endl;
-+        return;
++      if (level == kWarning && strcmp(location, "RRawFileUnix") == 0 &&
++          strcmp(msg, "io_uring setup failed, falling back to blocking I/O in ReadV") == 0) {
++         std::cerr << "Warning in " << location << " " << msg << std::endl;
++         return;
 +      }
 +
        FAIL() << "Received unexpected diagnostic of severity "
diff --git a/root-Python-Update-reference-refcount-values-for-Python-3.patch b/root-Python-Update-reference-refcount-values-for-Python-3.patch
new file mode 100644
index 0000000..fd341ee
--- /dev/null
+++ b/root-Python-Update-reference-refcount-values-for-Python-3.patch
@@ -0,0 +1,66 @@
+From f26668d48bfc75e9c176f7981e51ddc3b5ed7895 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Wed, 11 Jun 2025 14:15:07 +0200
+Subject: [PATCH] [Python] Update reference refcount values for Python 3.14
+ compatibility
+
+Closes: #18988.
+---
+ .../pyroot/pythonizations/test/rdataframe_makenumpy.py |  9 ++++++++-
+ bindings/pyroot/pythonizations/test/rvec_asrvec.py     | 10 +++++++---
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+index 072148aeb6..c7da723523 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+@@ -75,10 +75,17 @@ class DataFrameFromNumpy(unittest.TestCase):
+     def test_refcount(self):
+         """
+         Check refcounts of associated PyObjects
++
++        In case of Python <=3.14, we expect a refcount of 2 for the data dict,
++        because the call to sys.getrefcount creates a second reference by
++        itself. Starting from Python 3.14, we expect a refcount of 1 because
++        there were changes to the interpreter to avoid some unnecessary ref
++        counts. See also:
++        https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
+         """
+         data = {"x": np.array([1, 2, 3], dtype="float32")}
+         gc.collect()
+-        self.assertEqual(sys.getrefcount(data), 2)
++        self.assertEqual(sys.getrefcount(data), 1 + int(sys.version_info < (3, 14)))
+         self.assertEqual(sys.getrefcount(data["x"]), 2)
+ 
+         df = ROOT.RDF.FromNumpy(data)
+diff --git a/bindings/pyroot/pythonizations/test/rvec_asrvec.py b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
+index 5e6c820705..9d3a294bf1 100644
+--- a/bindings/pyroot/pythonizations/test/rvec_asrvec.py
++++ b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
+@@ -123,8 +123,12 @@ class AsRVec(unittest.TestCase):
+         """
+         Test reference count of returned RVec
+ 
+-        We expect a refcount of 2 for the RVec because the call to sys.getrefcount
+-        creates a second reference by itself.
++        In case of Python <=3.14, we expect a refcount of 2 for the RVec
++        because the call to sys.getrefcount creates a second reference by
++        itself. Starting from Python 3.14, we expect a refcount of 1 because
++        there were changes to the interpreter to avoid some unnecessary ref
++        counts. See also:
++        https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
+         We attach the adopted pyobject to the RVec and increase the refcount of the
+         numpy array. After deletion of the rvec, the refcount of the numpy array
+         is decreased.
+@@ -132,7 +136,7 @@ class AsRVec(unittest.TestCase):
+         np_obj = np.array([1, 2])
+         rvec = ROOT.VecOps.AsRVec(np_obj)
+         gc.collect()
+-        self.assertEqual(sys.getrefcount(rvec), 2)
++        self.assertEqual(sys.getrefcount(rvec), 1 + int(sys.version_info < (3, 14)))
+         self.assertEqual(sys.getrefcount(np_obj), 3)
+         del rvec
+         gc.collect()
+-- 
+2.49.0
+
diff --git a/root-Python-Update-reference-refcount-values-for-Python-3x.patch b/root-Python-Update-reference-refcount-values-for-Python-3x.patch
new file mode 100644
index 0000000..ecb27dc
--- /dev/null
+++ b/root-Python-Update-reference-refcount-values-for-Python-3x.patch
@@ -0,0 +1,44 @@
+From 530d925f9832fe5fd1469ebf145f85227cfce1d4 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 20 Jun 2025 07:21:05 +0200
+Subject: [PATCH] [Python] Update reference refcount values for Python 3.14
+ compatibility
+
+---
+ bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py | 2 +-
+ bindings/pyroot/pythonizations/test/rvec_asrvec.py          | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+index c7da723523..fc0f88155a 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+@@ -90,7 +90,7 @@ class DataFrameFromNumpy(unittest.TestCase):
+ 
+         df = ROOT.RDF.FromNumpy(data)
+         gc.collect()
+-        self.assertEqual(sys.getrefcount(df), 2)
++        self.assertEqual(sys.getrefcount(df), 1 + int(sys.version_info < (3, 14)))
+ 
+         self.assertEqual(sys.getrefcount(data["x"]), 3)
+ 
+diff --git a/bindings/pyroot/pythonizations/test/rvec_asrvec.py b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
+index 9d3a294bf1..f489da826e 100644
+--- a/bindings/pyroot/pythonizations/test/rvec_asrvec.py
++++ b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
+@@ -137,10 +137,10 @@ class AsRVec(unittest.TestCase):
+         rvec = ROOT.VecOps.AsRVec(np_obj)
+         gc.collect()
+         self.assertEqual(sys.getrefcount(rvec), 1 + int(sys.version_info < (3, 14)))
+-        self.assertEqual(sys.getrefcount(np_obj), 3)
++        self.assertEqual(sys.getrefcount(np_obj), 2 + int(sys.version_info < (3, 14)))
+         del rvec
+         gc.collect()
+-        self.assertEqual(sys.getrefcount(np_obj), 2)
++        self.assertEqual(sys.getrefcount(np_obj), 1 + int(sys.version_info < (3, 14)))
+ 
+ 
+ if __name__ == "__main__":
+-- 
+2.49.0
+
diff --git a/root.spec b/root.spec
index c999668..5ef8c6a 100644
--- a/root.spec
+++ b/root.spec
@@ -10,7 +10,7 @@
 
 %global bundlejson 0
 
-%if %{?fedora}%{!?fedora:0}
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
 %ifarch %{ix86} %{arm}
 %global pandas 0
 %else
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -96,6 +96,11 @@ Patch9:		%{name}-Use-size_t-for-offset.patch
 Patch10:	%{name}-Fix-test-for-32-bit-architectures.patch
 #		Remove extra 0 in release number
 Patch11:	%{name}-Update-release-number.patch
+#		https://github.com/root-project/root/issues/18988
+#		https://github.com/root-project/root/pull/19014
+#		https://github.com/root-project/root/pull/19107
+Patch12:	%{name}-Python-Update-reference-refcount-values-for-Python-3.patch
+Patch13:	%{name}-Python-Update-reference-refcount-values-for-Python-3x.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -248,14 +253,17 @@ Requires:	%{name}-core = %{version}-%{release}
 %description icons
 This package contains icons used by the ROOT GUI.
 
-%package fonts
+%package font-files
 Summary:	ROOT font collection
 BuildArch:	noarch
 #		STIX version 0.9 only
 License:	OFL-1.1
 Requires:	%{name}-core = %{version}-%{release}
+#		Package renamed
+Provides:	%{name}-fonts = %{version}-%{release}
+Obsoletes:	%{name}-fonts < 6.36.00-2
 
-%description fonts
+%description font-files
 This package contains fonts used by ROOT that are not available in Fedora.
 In particular it contains STIX version 0.9 that is used by TMathText.
 
@@ -270,7 +278,7 @@ This package contains the tutorial scripts and test suite for ROOT.
 %package core
 Summary:	ROOT core libraries
 License:	LGPL-2.1-or-later AND LGPL-2.0-or-later AND ISC AND MIT AND NCSA
-Requires:	%{name}-fonts = %{version}-%{release}
+Requires:	%{name}-font-files = %{version}-%{release}
 Requires:	%{name}-icons = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-cling%{?_isa} = %{version}-%{release}
@@ -294,6 +302,10 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 %if %{dataframe}
 Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
 %endif
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+%if %{root7}
+Requires:	%{name}-tree-ntuple-utils%{?_isa} = %{version}-%{release}
+%endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		To resolve dependency in installed ROOTConfig.cmake
@@ -417,8 +429,8 @@ Requires:	%{name}-core = %{version}-%{release}
 #		notebook package was merged with JupyROOT package
 Provides:	%{name}-notebook = %{version}-%{release}
 Obsoletes:	%{name}-notebook < 6.32.00
-Requires:	js-jsroot >= 7.8
-%if %{?fedora}%{!?fedora:0}
+Requires:	js-jsroot >= 7.9
+%if %{?fedora}%{!?fedora:0} || ( %{?rhel}%{!?rhel:0} >= 10 && "%{?dist}" != ".el10_0" )
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
 Requires:	jupyter-notebook
@@ -1143,7 +1155,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7.8
+Requires:	js-jsroot >= 7.9
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1672,9 +1684,7 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-%if %{root7}
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
-%endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		Library split (tree-dataframe and vecops from tree-player)
@@ -1826,6 +1836,14 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description geom-webviewer
 This package contains a library for viewing geometries in a web GUI.
 
+%package tree-ntuple
+Summary:	The new ROOT n-tuple class
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+
+%description tree-ntuple
+This package contains the new ROOT n-tuple class (RNTuple).
+
 %if %{root7}
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
@@ -1913,14 +1931,6 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This package contains a library to show a pop-up dialog when fitting
 various kinds of data.
 
-%package tree-ntuple
-Summary:	Ntuple (ROOT 7)
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-
-%description tree-ntuple
-This package contains an ntuple extension for ROOT 7.
-
 %package tree-ntuple-utils
 Summary:	Ntuple utility library (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1948,6 +1958,8 @@ This package contains utility functions for ntuples.
 %patch -P9 -p1
 %patch -P10 -p1
 %patch -P11 -p1
+%patch -P12 -p1
+%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2663,15 +2675,6 @@ excluded="${excluded}|\
 gtest-tree-tree-testTTreeRegressions"
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 43
-# Failures due to reference counting changes in Python 3.14
-# - https://github.com/root-project/root/issues/18988
-# - https://docs.python.org/3.14/whatsnew/3.14.html
-excluded="${excluded}|\
-pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rdataframe-makenumpy|\
-pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rvec-asrvec"
-%endif
-
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # InterpreterTest.Evaluate fails on s390x
@@ -2784,7 +2787,7 @@ fi
 %files icons
 %{_datadir}/%{name}/icons
 
-%files fonts
+%files font-files
 %{_datadir}/%{name}/fonts
 
 %files tutorial
@@ -3536,6 +3539,11 @@ fi
 %{_libdir}/%{name}/libROOTGeomViewer_rdict.pcm
 %{_datadir}/%{name}/plugins/TVirtualGeoPainter/P020_RGeoPainter.C
 
+%files tree-ntuple -f includelist-tree-ntuple
+%{_libdir}/%{name}/libROOTNTuple.*
+%{_libdir}/%{name}/libROOTNTuple_rdict.pcm
+%dir %{_includedir}/%{name}/ROOT/libdaos_mock
+
 %if %{root7}
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
 %{_libdir}/%{name}/libROOTGpadv7.*
@@ -3566,17 +3574,20 @@ fi
 %{_libdir}/%{name}/libROOTFitPanelv7.*
 %{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm
 
-%files tree-ntuple -f includelist-tree-ntuple
-%{_libdir}/%{name}/libROOTNTuple.*
-%{_libdir}/%{name}/libROOTNTuple_rdict.pcm
-%dir %{_includedir}/%{name}/ROOT/libdaos_mock
-
 %files tree-ntuple-utils -f includelist-tree-ntupleutil
 %{_libdir}/%{name}/libROOTNTupleUtil.*
 %{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
 %endif
 
 %changelog
+* Sat Jun 21 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.00-2
+- Add root-tree-ntuple and root-tree-ntuple-utils dependensies to root-core
+  (listed in root-config --libs)
+- Rename root-fonts package to root-font-files
+- Add optional test dependency python3-pandas now available in EPEL 10
+- Add dependency jupyter-notebook to root-jupyroot for EPEL 10.1 and later
+- Fix Python 3.14 refcount issues in tests
+
 * Sat Jun 07 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.00-1
 - Update to 6.36.00
 - Enable the R interface for EPEL 10.1

From 2726b64fa0cbe095e3ea39eb737c9617ee506a55 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 10 Jul 2025 19:21:27 -0400
Subject: [PATCH 305/344] Rebuilt for libarrow 20

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 5ef8c6a..5f5f785 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3580,6 +3580,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 10 2025 Stephen Gallagher <sgallagh@redhat.com> - 6.36.00-3
+- Rebuilt for libarrow 20
+
 * Sat Jun 21 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.00-2
 - Add root-tree-ntuple and root-tree-ntuple-utils dependensies to root-core
   (listed in root-config --libs)

From 3a74b8b61031092540cb0b4280d4e1099de2d010 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 13 Jul 2025 07:11:20 +0200
Subject: [PATCH 306/344] Update to 6.36.02

---
 root-Update-release-number.patch | 25 -----------
 root.spec                        | 74 +++++++++++++++++---------------
 sources                          |  2 +-
 3 files changed, 40 insertions(+), 61 deletions(-)
 delete mode 100644 root-Update-release-number.patch

diff --git a/root-Update-release-number.patch b/root-Update-release-number.patch
deleted file mode 100644
index c9f05cd..0000000
--- a/root-Update-release-number.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0ad965c6a2ed651e4a933434735fbe1c6bf32c1c Mon Sep 17 00:00:00 2001
-From: Danilo Piparo <danilo.piparo@cern.ch>
-Date: Mon, 26 May 2025 10:05:26 +0200
-Subject: [PATCH] Update release number
-
----
- core/foundation/inc/ROOT/RVersion.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/foundation/inc/ROOT/RVersion.hxx b/core/foundation/inc/ROOT/RVersion.hxx
-index 365a371b2a..d5a3623747 100644
---- a/core/foundation/inc/ROOT/RVersion.hxx
-+++ b/core/foundation/inc/ROOT/RVersion.hxx
-@@ -4,7 +4,7 @@
- /* Update on release: */
- #define ROOT_VERSION_MAJOR 6
- #define ROOT_VERSION_MINOR 36
--#define ROOT_VERSION_PATCH 00
-+#define ROOT_VERSION_PATCH 0
- #define ROOT_RELEASE_DATE "May 26 2025"
- 
- /* Don't change the lines below. */
--- 
-2.49.0
-
diff --git a/root.spec b/root.spec
index 5f5f785..0f6e4b9 100644
--- a/root.spec
+++ b/root.spec
@@ -37,9 +37,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.36.00
+Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -94,13 +94,11 @@ Patch9:		%{name}-Use-size_t-for-offset.patch
 #		Fix 32 bit test failure
 #		https://github.com/root-project/root/pull/18993
 Patch10:	%{name}-Fix-test-for-32-bit-architectures.patch
-#		Remove extra 0 in release number
-Patch11:	%{name}-Update-release-number.patch
 #		https://github.com/root-project/root/issues/18988
 #		https://github.com/root-project/root/pull/19014
 #		https://github.com/root-project/root/pull/19107
-Patch12:	%{name}-Python-Update-reference-refcount-values-for-Python-3.patch
-Patch13:	%{name}-Python-Update-reference-refcount-values-for-Python-3x.patch
+Patch11:	%{name}-Python-Update-reference-refcount-values-for-Python-3.patch
+Patch12:	%{name}-Python-Update-reference-refcount-values-for-Python-3x.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1516,6 +1514,8 @@ provides a thin client (interface) to MySQL servers. Using this
 client, one can obtain information from a MySQL database into the
 ROOT environment.
 
+This package is deprecated and will be removed in the next release of ROOT.
+
 %package sql-odbc
 Summary:	ODBC plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1526,6 +1526,8 @@ This package contains the ODBC (Open DataBase Connectivity) plugin
 for ROOT, that allows transparent access to any kind of database that
 supports the ODBC protocol.
 
+This package is deprecated and will be removed in the next release of ROOT.
+
 %package sql-sqlite
 Summary:	Sqlite client plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1548,6 +1550,8 @@ provides a thin client (interface) to PostGreSQL servers. Using this
 client, one can obtain information from a PostGreSQL database into the
 ROOT environment.
 
+This package is deprecated and will be removed in the next release of ROOT.
+
 %package tmva
 Summary:	Toolkit for multivariate data analysis
 License:	BSD-3-Clause
@@ -1959,7 +1963,6 @@ This package contains utility functions for ntuples.
 %patch -P10 -p1
 %patch -P11 -p1
 %patch -P12 -p1
-%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2461,6 +2464,12 @@ popd
 #
 # - test-webgui-ping
 #   error: Cannot display window in native
+#
+# - test-stressgraphics-firefox-skip3d:
+#   requires firefox...
+#
+# - tutorial-visualisation-webcanv-fonts_ttf.cxx:
+#   Requires web graphics
 excluded="\
 test-stressIOPlugins|\
 tutorial-analysis-dataframe-df101_h1Analysis|\
@@ -2486,42 +2495,27 @@ gtest-net-netxng-RRawFileNetXNG|\
 gtest-net-netxng-TNetXNGFileTest|\
 tutorial-analysis-parallel-mp_processSelector|\
 tutorial-tmva-tmva103_Application|\
-test-webgui-ping"
-
-# gtest-roofit-roofit-vectorisedPDFs-testLandau:
-# Expected equality of these values:
-#   nFarOff
-#     Which is: 1
-#   0u
-#     Which is: 0
-#
-# gtest-tree-treeplayer-ttreeindex-clone
-# gtest-tree-treeplayer-treetreeplayertestUnit:
-# Randomly fail - can't open file that was just created - race condition?
-#
-# test-stressgraphics-firefox-skip3d:
-# requires firefox...
-#
-# tutorial-visualisation-webcanv-fonts_ttf.cxx:
-# Requires web graphics
-excluded="${excluded}|\
-gtest-roofit-roofit-vectorisedPDFs-testLandau|\
-gtest-tree-treeplayer-ttreeindex-clone|\
-gtest-tree-treeplayer-treetreeplayertestUnit|\
+test-webgui-ping|\
 test-stressgraphics-firefox-skip3d|\
 tutorial-visualisation-webcanv-fonts_ttf.cxx"
 
+# Duplicated tests
+# https://github.com/root-project/root/issues/19346
+# - gtest-tree-treeplayer-ttreeindex-clone
+# - gtest-tree-treeplayer-ttreeindex-getlistoffriends
+# - gtest-tree-treeplayer-ttreereader-friends
+excluded="${excluded}|\
+gtest-tree-treeplayer-ttreeindex-clone|\
+gtest-tree-treeplayer-ttreeindex-getlistoffriends|\
+gtest-tree-treeplayer-ttreereader-friends"
+
 %ifarch %{ix86}
-# - gtest-tree-dataframe-dataframe-concurrency
-#   "There's already an active task arena."
-#
-# - gtest-hist-hist-TFormulaGradientTests|\
+# - gtest-hist-hist-TFormulaGradientTests
 #   out of memory
 #
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views
 #   ValueError: buffer is smaller than requested size
 excluded="${excluded}|\
-gtest-tree-dataframe-dataframe-concurrency|\
 gtest-hist-hist-TFormulaGradientTests|\
 pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views"
 %endif
@@ -2532,7 +2526,7 @@ pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views"
 excluded="${excluded}|\
 tutorial-roofit-roostats-IntervalExamples-py"
 
-%if %{?fedora}%{!?fedora:0} >= 42
+%if %{?fedora}%{!?fedora:0} == 42
 # - gtest-tree-ntuple-ntuple-emulated
 # - gtest-tree-ntuple-ntuple-evolution
 #   waitpid() failed
@@ -2547,6 +2541,12 @@ gtest-tree-ntuple-ntuple-evolution"
 excluded="${excluded}|\
 tutorial-roofit-roostats-StandardBayesianMCMCDemo-py"
 %endif
+
+%if %{?rhel}%{!?rhel:0} >= 10
+excluded="${excluded}|\
+test-stressgraphics\$\$|\
+test-stressgraphics-interpreted"
+%endif
 %endif
 
 %ifarch s390x
@@ -2687,6 +2687,7 @@ RNTuple.StdAtomic:\
 %ifarch s390x
 InterpreterTest.Evaluate:\
 TClingDataMemberInfo.Offset:\
+TTreeReaderBasic.LorentzVector32:\
 %endif
 RCsvDS.Remote:\
 RNTuple.OpenHTTP:\
@@ -3580,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Sun Jul 13 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.02-1
+- Update to 6.36.02
+
 * Thu Jul 10 2025 Stephen Gallagher <sgallagh@redhat.com> - 6.36.00-3
 - Rebuilt for libarrow 20
 
diff --git a/sources b/sources
index a6bdda4..1a7800f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.36.00.tar.xz) = 2030961b001494a177b96540711940bb8f11fbcf624edfe3282bd7c2c0ad1ef60ed6a5cac9799dfae0d40f21f33728e6ab906f3da95589412dee592aebfbf4f4
+SHA512 (root-6.36.02.tar.xz) = 9c64aa5e7a6bd24a9584024c14700f0c56885b58880bda3e6a78a4db05fc5b980ae0823b5c7aaa3a83dfded36a2cfd0302c798d23a30012418833efa1efbebe8
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-1.9.tar.gz) = df0569f12e3381e9285639eee927d9effb2812765caad2d281c41f6673828ab28b7bf8143ae9686090649cf889e757cfead58baa47e907de468185125a4d772c

From e076764de0887f00a97cf07ed0e61636861d1227 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 13 Jul 2025 18:59:06 +0200
Subject: [PATCH 307/344] Disable two failing test for rawhide ppc64le

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0f6e4b9..9b5c023 100644
--- a/root.spec
+++ b/root.spec
@@ -2526,7 +2526,7 @@ pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views"
 excluded="${excluded}|\
 tutorial-roofit-roostats-IntervalExamples-py"
 
-%if %{?fedora}%{!?fedora:0} == 42
+%if %{?fedora}%{!?fedora:0} >= 42
 # - gtest-tree-ntuple-ntuple-emulated
 # - gtest-tree-ntuple-ntuple-evolution
 #   waitpid() failed

From f25bdb09311e1b26761b2740d90c28c6b65ab946 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 12:04:15 +0000
Subject: [PATCH 308/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9b5c023..9914e68 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3581,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.36.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sun Jul 13 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.02-1
 - Update to 6.36.02
 

From e4856607de1547b83046e27e3fdbcd9262150239 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 13 Aug 2025 11:00:08 -0600
Subject: [PATCH 309/344] Rebuild for libarrow 21

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 9914e68..d50e9a8 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3581,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 13 2025 Orion Poplawski <orion@nwra.com> - 6.36.02-3
+- Rebuild for libarrow 21
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.36.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 146af4880192f2dee65a877f50a171759ce61287 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 15 Aug 2025 15:16:09 +0200
Subject: [PATCH 310/344] Rebuilt for Python 3.14.0rc2 bytecode

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index d50e9a8..17f683a 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3581,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 6.36.02-4
+- Rebuilt for Python 3.14.0rc2 bytecode
+
 * Wed Aug 13 2025 Orion Poplawski <orion@nwra.com> - 6.36.02-3
 - Rebuild for libarrow 21
 

From 3d242ce0250358f8bb9df917116dc03dee58649c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 18 Aug 2025 07:36:23 -0600
Subject: [PATCH 311/344] Rebuild for libarrow 21

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 17f683a..8b5495a 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3581,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 18 2025 Orion Poplawski <orion@nwra.com> - 6.36.02-5
+- Rebuild for libarrow 21
+
 * Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 6.36.02-4
 - Rebuilt for Python 3.14.0rc2 bytecode
 

From cb90d9590dd34bd01e30893406b66054b4a42067 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 20 Aug 2025 06:32:28 +0200
Subject: [PATCH 312/344] Support libarrow 21

---
 root-df-Support-libarrow-21.patch | 44 +++++++++++++++++++++++++++++++
 root.spec                         | 22 ++++++++--------
 2 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 root-df-Support-libarrow-21.patch

diff --git a/root-df-Support-libarrow-21.patch b/root-df-Support-libarrow-21.patch
new file mode 100644
index 0000000..445b33b
--- /dev/null
+++ b/root-df-Support-libarrow-21.patch
@@ -0,0 +1,44 @@
+From 076bdd3f47431d5e3d90837512a4678fadc07ce8 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 Aug 2025 00:28:07 +0200
+Subject: [PATCH] [df] Support libarrow 21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+arrow::internal::GenericToStatus → arrow::ToStatus
+---
+ tree/dataframe/test/datasource_arrow.cxx | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
+index 05493baa3d4..8bbcd5ff70d 100644
+--- a/tree/dataframe/test/datasource_arrow.cxx
++++ b/tree/dataframe/test/datasource_arrow.cxx
+@@ -12,6 +12,7 @@
+ #include <arrow/record_batch.h>
+ #include <arrow/table.h>
+ #include <arrow/type.h>
++#include <arrow/util/config.h>
+ #if defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+@@ -21,9 +22,15 @@
+ #include <iostream>
+ using namespace arrow;
+ 
++#if ARRAY_VERSION_MAJOR >= 21
++#define ASSERT_OK(expr)                                              \
++   for (::arrow::Status _st = ::arrow::ToStatus((expr)); !_st.ok();) \
++   FAIL() << "'" ARROW_STRINGIFY(expr) "' failed with " << _st.ToString()
++#else
+ #define ASSERT_OK(expr)                                                               \
+    for (::arrow::Status _st = ::arrow::internal::GenericToStatus((expr)); !_st.ok();) \
+    FAIL() << "'" ARROW_STRINGIFY(expr) "' failed with " << _st.ToString()
++#endif
+ 
+ // Copied from arrow/testing/builder.h
+ template <typename TYPE, typename C_TYPE = typename TYPE::c_type>
+-- 
+2.50.1
+
diff --git a/root.spec b/root.spec
index 8b5495a..aba7438 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -99,6 +99,8 @@ Patch10:	%{name}-Fix-test-for-32-bit-architectures.patch
 #		https://github.com/root-project/root/pull/19107
 Patch11:	%{name}-Python-Update-reference-refcount-values-for-Python-3.patch
 Patch12:	%{name}-Python-Update-reference-refcount-values-for-Python-3x.patch
+#		https://github.com/root-project/root/pull/19689
+Patch13:	%{name}-df-Support-libarrow-21.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1963,6 +1965,7 @@ This package contains utility functions for ntuples.
 %patch -P10 -p1
 %patch -P11 -p1
 %patch -P12 -p1
+%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2395,6 +2398,7 @@ ln -s ../../files files
 ln -s ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv CsvDataSource_MuRun2010B.csv
 ln -s ../../files/usa.root usa.root
 popd
+popd
 
 # Exclude some tests that can not be run
 #
@@ -2680,7 +2684,7 @@ gtest-tree-tree-testTTreeRegressions"
 # InterpreterTest.Evaluate fails on s390x
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
-GTEST_FILTER=-\
+export GTEST_FILTER=-\
 %ifarch %{ix86}
 RNTuple.StdAtomic:\
 %endif
@@ -2696,15 +2700,8 @@ RSqliteDS.Davix:\
 TChainParsing.DoubleSlash:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
-TFile.ReadWithoutGlobalRegistrationWeb \
-%if ! %{pandas}
-ROOTTEST_IGNORE_PANDAS_PY3=1 \
-%endif
-ROOTTEST_IGNORE_NUMBA_PY3=1 \
-ROOTTEST_IGNORE_JUPYTER_PY3=1 \
-make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\""
-
-popd
+TFile.ReadWithoutGlobalRegistrationWeb
+%ctest -- -E "${excluded}"
 
 %pretrans net-http -p <lua>
 path = "%{_datadir}/%{name}/js"
@@ -3581,6 +3578,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.02-6
+- Support libarrow 21
+
 * Mon Aug 18 2025 Orion Poplawski <orion@nwra.com> - 6.36.02-5
 - Rebuild for libarrow 21
 

From c3014d3347e99c16b504984b9a27a3a66695878b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 20 Aug 2025 08:19:57 +0200
Subject: [PATCH 313/344] Fix typo in patch

---
 root-df-Support-libarrow-21.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/root-df-Support-libarrow-21.patch b/root-df-Support-libarrow-21.patch
index 445b33b..a82683d 100644
--- a/root-df-Support-libarrow-21.patch
+++ b/root-df-Support-libarrow-21.patch
@@ -1,6 +1,6 @@
-From 076bdd3f47431d5e3d90837512a4678fadc07ce8 Mon Sep 17 00:00:00 2001
+From 4bfc8d1ff53b398c8e5bd879ca32ead4321b844a Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 20 Aug 2025 00:28:07 +0200
+Date: Wed, 20 Aug 2025 08:17:16 +0200
 Subject: [PATCH] [df] Support libarrow 21
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,7 +12,7 @@ arrow::internal::GenericToStatus → arrow::ToStatus
  1 file changed, 7 insertions(+)
 
 diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
-index 05493baa3d4..8bbcd5ff70d 100644
+index 05493baa3d4..73749b59afc 100644
 --- a/tree/dataframe/test/datasource_arrow.cxx
 +++ b/tree/dataframe/test/datasource_arrow.cxx
 @@ -12,6 +12,7 @@
@@ -27,7 +27,7 @@ index 05493baa3d4..8bbcd5ff70d 100644
  #include <iostream>
  using namespace arrow;
  
-+#if ARRAY_VERSION_MAJOR >= 21
++#if ARROW_VERSION_MAJOR >= 21
 +#define ASSERT_OK(expr)                                              \
 +   for (::arrow::Status _st = ::arrow::ToStatus((expr)); !_st.ok();) \
 +   FAIL() << "'" ARROW_STRINGIFY(expr) "' failed with " << _st.ToString()

From 895043f78c6763f979e6fdfe9c5d8971063023a4 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 20 Aug 2025 15:39:40 -0600
Subject: [PATCH 314/344] Rebuild for tbb 2022.2.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index aba7438..1bf54c5 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3578,6 +3578,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 20 2025 Jerry James <loganjerry@gmail.com> - 6.36.02-7
+- Rebuild for tbb 2022.2.0
+
 * Tue Aug 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.02-6
 - Support libarrow 21
 

From 18473dc6e6b17b1e09a8d6896bf1a8c2e23aafea Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 20 Aug 2025 15:39:40 -0600
Subject: [PATCH 315/344] Rebuild for tbb 2022.2.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 17f683a..28c79b7 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3581,6 +3581,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 20 2025 Jerry James <loganjerry@gmail.com> - 6.36.02-5
+- Rebuild for tbb 2022.2.0
+
 * Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 6.36.02-4
 - Rebuilt for Python 3.14.0rc2 bytecode
 

From da1ca8ff8fa0341599f6a3c29ae59a04e84ff0ad Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 28 Aug 2025 06:37:03 +0200
Subject: [PATCH 316/344] Update sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 1a7800f..17b366b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.36.02.tar.xz) = 9c64aa5e7a6bd24a9584024c14700f0c56885b58880bda3e6a78a4db05fc5b980ae0823b5c7aaa3a83dfded36a2cfd0302c798d23a30012418833efa1efbebe8
+SHA512 (root-6.36.04.tar.xz) = d8798d777f308e59ebb3429323895757ca9538499dbb1989d70b3a01c2122b2a01911b0e7da673d7a9fc40acd49fdbf6a5b4341266c1b68a8a88d9f904e7919b
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-1.9.tar.gz) = df0569f12e3381e9285639eee927d9effb2812765caad2d281c41f6673828ab28b7bf8143ae9686090649cf889e757cfead58baa47e907de468185125a4d772c

From 84f092c91de687e69580f2a411133949ec8a000e Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 19 Sep 2025 14:53:54 +0200
Subject: [PATCH 317/344] Rebuilt for Python 3.14.0rc3 bytecode

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 84efcc3..bd7f0a7 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3575,6 +3575,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 6.36.04-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
 * Mon Aug 25 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.36.04-1
 - Update to 6.36.04
 

From f287293ea9bc3f93bf7691440897f1b097c380d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 9 Oct 2025 17:11:17 +0200
Subject: [PATCH 318/344] - Rebuilt for new graphviz

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bd7f0a7..8484955 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3575,6 +3575,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 09 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.36.04-3
+- Rebuilt for new graphviz
+
 * Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 6.36.04-2
 - Rebuilt for Python 3.14.0rc3 bytecode
 

From 32ec236e955265c886eee8014b026ce27f9ef8b1 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 29 Oct 2025 09:28:19 -0400
Subject: [PATCH 319/344] Rebuild for libarrow 22

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 8484955..030c783 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.36.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3575,6 +3575,9 @@ fi
 %endif
 
 %changelog
+* Wed Oct 29 2025 Stephen Gallagher <sgallagh@redhat.com> - 6.36.04-4
+- Rebuild for libarrow 22
+
 * Thu Oct 09 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.36.04-3
 - Rebuilt for new graphviz
 

From bbcab50659a25731ca475a38e406352af7ed9108 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 9 Dec 2025 20:53:49 +0100
Subject: [PATCH 320/344] Update to 6.38.00

Removed subpackages: root-proof, root-proof-bench, root-proof-player,
    root-proof-sessionviewer, root-sql-mysql, root-sql-odbc, root-sql-pgsql
New subpackages: root-geom-checker, root-gui-treemap,
    root-tree-ntuple-browse, root-histv7
JsMVA python (sub)module dropped from python3-root package
Compile minuit2 with Open MP support
Dropped patches: 7
New patches: 4
---
 root-Adjust-test-stressGraphics.ref.patch     |  62 ++-
 ...OverflowError-from-RDF-pythonization.patch |  41 --
 root-Fix-a-numpy-test-for-32-bit-archs.patch  |  32 ++
 root-Fix-test-for-32-bit-architectures.patch  |  57 --
 ...Geom-Add-missing-includes-of-TMath.h.patch |  63 +++
 root-Ignore-warnings-from-uring-IO.patch      |  62 ---
 ...ference-refcount-values-for-Python-3.patch |  66 ---
 ...erence-refcount-values-for-Python-3x.patch |  44 --
 ...t-link-to-LLVM-libraries-in-parallel.patch |  16 +-
 root-Use-size_t-for-offset.patch              |  60 ---
 ...tdated-IsSmall-helper-function-in-te.patch |  34 ++
 root-df-Support-libarrow-21.patch             |  44 --
 root-fontconfig.patch                         |  93 ++--
 root-no-export-python-modules.patch           |  44 +-
 ...size-of-long-RVec-instances-in-RVec-.patch | 135 +++++
 root.spec                                     | 503 +++++++-----------
 sources                                       |   4 +-
 17 files changed, 564 insertions(+), 796 deletions(-)
 delete mode 100644 root-Avoid-OverflowError-from-RDF-pythonization.patch
 create mode 100644 root-Fix-a-numpy-test-for-32-bit-archs.patch
 delete mode 100644 root-Fix-test-for-32-bit-architectures.patch
 create mode 100644 root-Geom-Add-missing-includes-of-TMath.h.patch
 delete mode 100644 root-Ignore-warnings-from-uring-IO.patch
 delete mode 100644 root-Python-Update-reference-refcount-values-for-Python-3.patch
 delete mode 100644 root-Python-Update-reference-refcount-values-for-Python-3x.patch
 delete mode 100644 root-Use-size_t-for-offset.patch
 create mode 100644 root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
 delete mode 100644 root-df-Support-libarrow-21.patch
 create mode 100644 root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch

diff --git a/root-Adjust-test-stressGraphics.ref.patch b/root-Adjust-test-stressGraphics.ref.patch
index 6f8e6e4..b4c5871 100644
--- a/root-Adjust-test-stressGraphics.ref.patch
+++ b/root-Adjust-test-stressGraphics.ref.patch
@@ -1,33 +1,49 @@
-From 81286803e7791377ae75f40e9c65f8928ad8fe31 Mon Sep 17 00:00:00 2001
+From f7bfa429deb9dbae9058998888bbcaa84af0ca08 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 30 May 2025 05:31:08 +0200
+Date: Tue, 2 Dec 2025 05:33:31 +0100
 Subject: [PATCH] Adjust test/stressGraphics.ref
 
-Test 37: TScatter with TPolyMarker test............................ OK
-         PDF output......................................... 37 FAILED
-         Result    = 22236
-         Reference = 22560
-         Error     = 324 (was 300)
-         JPG output................................................ OK
-         PNG output................................................ OK
-         C file result............................................. OK
 ---
- test/stressGraphics.ref | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ test/stressGraphics.ref | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index a894796951..a8746db4df 100644
+index 2498ec6d755..4520a5ab113 100644
 --- a/test/stressGraphics.ref
 +++ b/test/stressGraphics.ref
-@@ -35,7 +35,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-    34   3304592       100    712308      3000     62688     19000    123056      7000   3396789      1000
-    35      3954       100     14654       300     17378      7800      9629      2000      3794       200
-    36      9073       100     22150       300     27691      7800     20712      2000      9157       200
--   37     17800       200     22560       300     28599      7800     42618      2000     17600       200
-+   37     17800       200     22560       400     28599      7800     42618      2000     17600       200
-    38     12926       200     24304       300     24021      6800     12637      2000     12584       200
-    39     29664       200     19354       300     23024      6500     12821      2000     31317       200
-    40     46000       400     23482       300     38792      8500     30458      4000     46000       400
+@@ -10,11 +10,11 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+     9      9253       100     14377       150     19851      2400     12199       900      9283       100
+    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
+    11     12971       100     14750        50     34063      2000     32033      1200     13070       150
+-   12      7674       100     13533        50     83557      3000     38505      4000      7720       150
+-   13      5600       400     13242       300     16881       400     15063       800      5638       400
++   12      7674       100     13533       100     83557      3000     38505      4000      7720       150
++   13      5600       400     13242       400     16881       400     15063       800      5638       400
+    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
+    15     15690      5000     17179       200     23076      9500     14232      1500     10437      5000
+-   16     28072       400     23520       200     44462     11000     30062      5000     38007       400
++   16     28072       400     23520       250     44462     11000     30062      5000     38007       400
+    17     20444       400     21520       150     27511     11000     16867       600     20721       400
+    18     15894       100     19305       200     27187     10300     15925       350     15925       100
+    19     22521       300     42926       250     43868     17000     19232     11000     22729       300
+@@ -44,7 +44,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+    43    207729       750     87126       750     76094     38000     54717     11000    210497       800
+    44    401670      6500    156361      2000     62719     34100     45592     14000    410114      6500
+    45    566142      5000    225206      2000     65828     31800     53934      6500    573396      5000
+-   46   3738751     35000   1292739     12000     60580      9900    133547      3500   3783013     35000
++   46   3738751     35000   1292739     13000     60580      9900    133547      3500   3783013     35000
+    47   1466028      9000    853193     50000     38425     13500     91242     18100   1463263      7500
+    48     38312       200     56877       750     36524     11800    119641      8000     38121       200
+    49     19556      1000     31967      1000     36859     10000     37602      8000     19900      3000
+@@ -53,7 +53,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
+    52    270825     10000    115500      1000     45496     11000     34685      5000    272950     10000
+    53     15025      3000     29289       500     42525     11300     33336      3900     14787      4000
+    54    254604      5000    383258      7000     55666     30400     46534      6500    259594      7000
+-   55      4846       150     14075       150     33239       600     25303       500      4877       150
++   55      4846       150     14075       200     33239       600     25303       500      4877       150
+    56   1435879    150000     12837       100     25830       100    365000     15000   1085792    250000
+    57      5884       500     16577       200     40706     14000     30026      4000      5884       500
+    58      5723       700     15720       200     32236     11000     16916      3200      5670       800
 -- 
-2.49.0
+2.52.0
 
diff --git a/root-Avoid-OverflowError-from-RDF-pythonization.patch b/root-Avoid-OverflowError-from-RDF-pythonization.patch
deleted file mode 100644
index 7ac90a6..0000000
--- a/root-Avoid-OverflowError-from-RDF-pythonization.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c3a9293a08fecb288cdd09b399c9c2808923e617 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 27 Aug 2025 17:09:12 +0200
-Subject: [PATCH] Avoid OverflowError from RDF pythonization
-
-Fixes test failures on 32 bit intel ix86.
-
-The following tests FAILED:
-	 62 - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rdataframe-makenumpy (Failed) python python_runtime_deps
-	1257 - tutorial-analysis-dataframe-df032_RDFFromNumpy-py (Failed) python_runtime_deps tutorial
-
-1259/1470 Test #1257: tutorial-analysis-dataframe-df032_RDFFromNumpy-py .............................................***Failed    1.14 sec
-Traceback (most recent call last):
-  File ".../tutorials/analysis/dataframe/df032_RDFFromNumpy.py", line 23, in <module>
-    df = ROOT.RDF.FromNumpy({'x': x, 'y': y})
-  File ".../redhat-linux-build/lib/ROOT/_facade.py", line 349, in MakeNumpyDataFrameCopy
-    return _MakeNumpyDataFrame(np_dict)
-  File ".../redhat-linux-build/lib/ROOT/_pythonization/_rdataframe.py", line 601, in _MakeNumpyDataFrame
-    return ROOT.Internal.RDF.MakeRVecDataFrame(ROOT.__ROOT_Internal.MakePyDeleter(key), *args)
-                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^
-OverflowError: Python int too large to convert to C long
----
- .../pythonizations/python/ROOT/_pythonization/_rdataframe.py    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-index d5cade59805..f9bb2771a73 100644
---- a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-+++ b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
-@@ -584,7 +584,7 @@ def _MakeNumpyDataFrame(np_dict):
- 
-     namespace __ROOT_Internal {
- 
--    inline std::function<void()> MakePyDeleter(std::intptr_t ptr) {
-+    inline std::function<void()> MakePyDeleter(std::uintptr_t ptr) {
-         PyObject *obj = reinterpret_cast<PyObject*>(ptr);
-         Py_INCREF(obj);
-         return [obj](){ Py_DECREF(obj); };
--- 
-2.51.0
-
diff --git a/root-Fix-a-numpy-test-for-32-bit-archs.patch b/root-Fix-a-numpy-test-for-32-bit-archs.patch
new file mode 100644
index 0000000..5e095f3
--- /dev/null
+++ b/root-Fix-a-numpy-test-for-32-bit-archs.patch
@@ -0,0 +1,32 @@
+From 40f8cd0adeb7257778c789e1ae639f260780402b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sun, 7 Dec 2025 19:30:55 +0100
+Subject: [PATCH] Fix a numpy test for 32 bit archs
+
+The default dtype used in numpy array is "int". This type has
+different sizes on 32 and 64 bit architectures. The test tries to use
+the numpy array as a Long64_t dataframe. On 32 bit architectures this
+results in an error.
+
+This commit explicitly changes the numpy array's dtype to "int64" to
+match the Long64_t dataframe type on all architectyres.
+---
+ bindings/pyroot/pythonizations/test/rdataframe_misc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_misc.py b/bindings/pyroot/pythonizations/test/rdataframe_misc.py
+index 1a1efd21b3e..150828613b3 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_misc.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_misc.py
+@@ -132,7 +132,7 @@ class RDataFrameMisc(unittest.TestCase):
+             return
+         out_path = "dataframe_misc_regression_gh20291.root"
+         try:
+-            x, y = numpy.array([1, 2, 3]), numpy.array([4, 5, 6])
++            x, y = numpy.array([1, 2, 3], dtype='int64'), numpy.array([4, 5, 6], dtype='int64')
+             df = ROOT.RDF.FromNumpy({"x": x, "y": y})
+ 
+             df.Snapshot("tree", out_path)
+-- 
+2.52.0
+
diff --git a/root-Fix-test-for-32-bit-architectures.patch b/root-Fix-test-for-32-bit-architectures.patch
deleted file mode 100644
index 879e3df..0000000
--- a/root-Fix-test-for-32-bit-architectures.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8f08aac1c5d356352d2bd24b05dcdd092d3ca864 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 19 Jun 2025 13:28:24 +0200
-Subject: [PATCH] Fix test for 32 bit architectures
-
-[ RUN      ] TypeReflectionTest.GetSizeOfType
-/builddir/build/BUILD/root-6.36.00-build/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp:79: Failure
-Expected equality of these values:
-  Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4]))
-    Which is: 12
-  16
-[  FAILED  ] TypeReflectionTest.GetSizeOfType (23 ms)
-
-[ RUN      ] ScopeReflectionTest.SizeOf
-/builddir/build/BUILD/root-6.36.00-build/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp:161: Failure
-Expected equality of these values:
-  Cpp::SizeOf(Decls[7])
-    Which is: 12
-  (size_t)16
-    Which is: 16
-[  FAILED  ] ScopeReflectionTest.SizeOf (26 ms)
----
- .../CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp    | 3 ++-
- .../CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp     | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
-index 0b39080859..d490d0833c 100644
---- a/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
-+++ b/interpreter/CppInterOp/unittests/CppInterOp/ScopeReflectionTest.cpp
-@@ -158,7 +158,8 @@ TEST(ScopeReflectionTest, SizeOf) {
-   EXPECT_EQ(Cpp::SizeOf(Decls[4]), (size_t)0);
-   EXPECT_EQ(Cpp::SizeOf(Decls[5]), (size_t)1);
-   EXPECT_EQ(Cpp::SizeOf(Decls[6]), (size_t)4);
--  EXPECT_EQ(Cpp::SizeOf(Decls[7]), (size_t)16);
-+  struct B {short a; double b;};
-+  EXPECT_EQ(Cpp::SizeOf(Decls[7]), sizeof(B));
- }
- 
- 
-diff --git a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
-index a3e482596d..28cc32f166 100644
---- a/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
-+++ b/interpreter/CppInterOp/unittests/CppInterOp/TypeReflectionTest.cpp
-@@ -77,7 +77,8 @@ TEST(TypeReflectionTest, GetSizeOfType) {
-   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[1])), 1);
-   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[2])), 4);
-   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[3])), 8);
--  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), 16);
-+  struct B {int a; double b;};
-+  EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[4])), sizeof(B));
-   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetTypeFromScope(Decls[5])), 0);
-   EXPECT_EQ(Cpp::GetSizeOfType(Cpp::GetVariableType(Decls[6])),
-             sizeof(intptr_t));
--- 
-2.49.0
-
diff --git a/root-Geom-Add-missing-includes-of-TMath.h.patch b/root-Geom-Add-missing-includes-of-TMath.h.patch
new file mode 100644
index 0000000..966d8da
--- /dev/null
+++ b/root-Geom-Add-missing-includes-of-TMath.h.patch
@@ -0,0 +1,63 @@
+From 0e1e1f0ba1908ae1020337ed7ec0565bf979b92c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 2 Dec 2025 04:57:30 +0100
+Subject: [PATCH] [Geom] Add missing includes of TMath.h
+
+---
+ geom/geombuilder/src/TGeoParaEditor.cxx | 1 +
+ geom/geombuilder/src/TGeoPconEditor.cxx | 1 +
+ geom/geombuilder/src/TGeoPgonEditor.cxx | 1 +
+ geom/geombuilder/src/TGeoTrapEditor.cxx | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/geom/geombuilder/src/TGeoParaEditor.cxx b/geom/geombuilder/src/TGeoParaEditor.cxx
+index fdc344ba4d2..bd173607d2c 100644
+--- a/geom/geombuilder/src/TGeoParaEditor.cxx
++++ b/geom/geombuilder/src/TGeoParaEditor.cxx
+@@ -27,6 +27,7 @@ Editor for a TGeoPara.
+ #include "TVirtualGeoPainter.h"
+ #include "TVirtualPad.h"
+ #include "TView.h"
++#include "TMath.h"
+ #include "TGButton.h"
+ #include "TGTextEntry.h"
+ #include "TGNumberEntry.h"
+diff --git a/geom/geombuilder/src/TGeoPconEditor.cxx b/geom/geombuilder/src/TGeoPconEditor.cxx
+index a66359853be..50598d2cb90 100644
+--- a/geom/geombuilder/src/TGeoPconEditor.cxx
++++ b/geom/geombuilder/src/TGeoPconEditor.cxx
+@@ -27,6 +27,7 @@ Editor for a TGeoPcon.
+ #include "TVirtualGeoPainter.h"
+ #include "TVirtualPad.h"
+ #include "TView.h"
++#include "TMath.h"
+ #include "TGCanvas.h"
+ #include "TGButton.h"
+ #include "TGTextEntry.h"
+diff --git a/geom/geombuilder/src/TGeoPgonEditor.cxx b/geom/geombuilder/src/TGeoPgonEditor.cxx
+index 949d0045a66..33638d66b2b 100644
+--- a/geom/geombuilder/src/TGeoPgonEditor.cxx
++++ b/geom/geombuilder/src/TGeoPgonEditor.cxx
+@@ -27,6 +27,7 @@ Editor for a TGeoPgon.
+ #include "TVirtualGeoPainter.h"
+ #include "TVirtualPad.h"
+ #include "TView.h"
++#include "TMath.h"
+ #include "TGTextEntry.h"
+ #include "TGNumberEntry.h"
+ #include "TGLabel.h"
+diff --git a/geom/geombuilder/src/TGeoTrapEditor.cxx b/geom/geombuilder/src/TGeoTrapEditor.cxx
+index d9c2916d075..459e0191117 100644
+--- a/geom/geombuilder/src/TGeoTrapEditor.cxx
++++ b/geom/geombuilder/src/TGeoTrapEditor.cxx
+@@ -27,6 +27,7 @@ Editor for a TGeoTrap.
+ #include "TVirtualGeoPainter.h"
+ #include "TVirtualPad.h"
+ #include "TView.h"
++#include "TMath.h"
+ #include "TGButton.h"
+ #include "TGTextEntry.h"
+ #include "TGNumberEntry.h"
+-- 
+2.52.0
+
diff --git a/root-Ignore-warnings-from-uring-IO.patch b/root-Ignore-warnings-from-uring-IO.patch
deleted file mode 100644
index 2208534..0000000
--- a/root-Ignore-warnings-from-uring-IO.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f4ac6bf20278c19c88cf98f6062ecfad86b87378 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 19 Jun 2025 14:02:31 +0200
-Subject: [PATCH] Ignore warnings from uring IO
-
-Tests randomly fail because the uring memory is exhausted.
-
-Here are some examples:
-
-[ RUN      ] RNTuple.RandomAccess
-.../root-6.36.00/core/testsupport/src/TestSupport.cxx:79: Failure
-Failed
-Received unexpected diagnostic of severity 2000 at 'RIoUring' reading 'io_uring is unexpectedly not available because:
-Failed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user'.
-Suppress those using ROOT/TestSupport.hxx
-.../root-6.36.00/core/testsupport/src/TestSupport.cxx:79: Failure
-Failed
-Received unexpected diagnostic of severity 2000 at 'RRawFileUnix' reading 'io_uring setup failed, falling back to blocking I/O in ReadV'.
-Suppress those using ROOT/TestSupport.hxx
-[  FAILED  ] RNTuple.RandomAccess (20472 ms)
-
-[ RUN      ] RNTupleDSTest.ChainMT
-.../root-6.34.08/core/testsupport/src/TestSupport.cxx:79: Failure
-Failed
-Received unexpected diagnostic of severity 2000 at 'RIoUring' reading 'io_uring is unexpectedly not available because:
-Failed to allocate memory for the smallest possible io_uring instance. 'memlock' memory has been exhausted for this user'.
-Suppress those using ROOT/TestSupport.hxx
-.../root-6.34.08/core/testsupport/src/TestSupport.cxx:79: Failure
-Failed
-Received unexpected diagnostic of severity 2000 at 'RRawFileUnix' reading 'io_uring setup failed, falling back to blocking I/O in ReadV'.
-Suppress those using ROOT/TestSupport.hxx
-[  FAILED  ] RNTupleDSTest.ChainMT (1004 ms)
----
- core/testsupport/src/TestSupport.cxx | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
-index 9889a432f4..4c3395ef16 100644
---- a/core/testsupport/src/TestSupport.cxx
-+++ b/core/testsupport/src/TestSupport.cxx
-@@ -76,6 +76,18 @@ static struct ForbidDiagnostics {
-         return;
-       }
- 
-+      if (level == kWarning && strcmp(location, "RIoUring") == 0 &&
-+          strstr(msg, "io_uring is unexpectedly not available because:") != nullptr) {
-+         std::cerr << "Warning in " << location << " " << msg << std::endl;
-+         return;
-+      }
-+
-+      if (level == kWarning && strcmp(location, "RRawFileUnix") == 0 &&
-+          strcmp(msg, "io_uring setup failed, falling back to blocking I/O in ReadV") == 0) {
-+         std::cerr << "Warning in " << location << " " << msg << std::endl;
-+         return;
-+      }
-+
-       FAIL() << "Received unexpected diagnostic of severity "
-          << level
-          << " at '" << location << "' reading '" << msg << "'.\n"
--- 
-2.49.0
-
diff --git a/root-Python-Update-reference-refcount-values-for-Python-3.patch b/root-Python-Update-reference-refcount-values-for-Python-3.patch
deleted file mode 100644
index fd341ee..0000000
--- a/root-Python-Update-reference-refcount-values-for-Python-3.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f26668d48bfc75e9c176f7981e51ddc3b5ed7895 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Wed, 11 Jun 2025 14:15:07 +0200
-Subject: [PATCH] [Python] Update reference refcount values for Python 3.14
- compatibility
-
-Closes: #18988.
----
- .../pyroot/pythonizations/test/rdataframe_makenumpy.py |  9 ++++++++-
- bindings/pyroot/pythonizations/test/rvec_asrvec.py     | 10 +++++++---
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-index 072148aeb6..c7da723523 100644
---- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-+++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-@@ -75,10 +75,17 @@ class DataFrameFromNumpy(unittest.TestCase):
-     def test_refcount(self):
-         """
-         Check refcounts of associated PyObjects
-+
-+        In case of Python <=3.14, we expect a refcount of 2 for the data dict,
-+        because the call to sys.getrefcount creates a second reference by
-+        itself. Starting from Python 3.14, we expect a refcount of 1 because
-+        there were changes to the interpreter to avoid some unnecessary ref
-+        counts. See also:
-+        https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
-         """
-         data = {"x": np.array([1, 2, 3], dtype="float32")}
-         gc.collect()
--        self.assertEqual(sys.getrefcount(data), 2)
-+        self.assertEqual(sys.getrefcount(data), 1 + int(sys.version_info < (3, 14)))
-         self.assertEqual(sys.getrefcount(data["x"]), 2)
- 
-         df = ROOT.RDF.FromNumpy(data)
-diff --git a/bindings/pyroot/pythonizations/test/rvec_asrvec.py b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-index 5e6c820705..9d3a294bf1 100644
---- a/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-+++ b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-@@ -123,8 +123,12 @@ class AsRVec(unittest.TestCase):
-         """
-         Test reference count of returned RVec
- 
--        We expect a refcount of 2 for the RVec because the call to sys.getrefcount
--        creates a second reference by itself.
-+        In case of Python <=3.14, we expect a refcount of 2 for the RVec
-+        because the call to sys.getrefcount creates a second reference by
-+        itself. Starting from Python 3.14, we expect a refcount of 1 because
-+        there were changes to the interpreter to avoid some unnecessary ref
-+        counts. See also:
-+        https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
-         We attach the adopted pyobject to the RVec and increase the refcount of the
-         numpy array. After deletion of the rvec, the refcount of the numpy array
-         is decreased.
-@@ -132,7 +136,7 @@ class AsRVec(unittest.TestCase):
-         np_obj = np.array([1, 2])
-         rvec = ROOT.VecOps.AsRVec(np_obj)
-         gc.collect()
--        self.assertEqual(sys.getrefcount(rvec), 2)
-+        self.assertEqual(sys.getrefcount(rvec), 1 + int(sys.version_info < (3, 14)))
-         self.assertEqual(sys.getrefcount(np_obj), 3)
-         del rvec
-         gc.collect()
--- 
-2.49.0
-
diff --git a/root-Python-Update-reference-refcount-values-for-Python-3x.patch b/root-Python-Update-reference-refcount-values-for-Python-3x.patch
deleted file mode 100644
index ecb27dc..0000000
--- a/root-Python-Update-reference-refcount-values-for-Python-3x.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 530d925f9832fe5fd1469ebf145f85227cfce1d4 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 20 Jun 2025 07:21:05 +0200
-Subject: [PATCH] [Python] Update reference refcount values for Python 3.14
- compatibility
-
----
- bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py | 2 +-
- bindings/pyroot/pythonizations/test/rvec_asrvec.py          | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-index c7da723523..fc0f88155a 100644
---- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-+++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
-@@ -90,7 +90,7 @@ class DataFrameFromNumpy(unittest.TestCase):
- 
-         df = ROOT.RDF.FromNumpy(data)
-         gc.collect()
--        self.assertEqual(sys.getrefcount(df), 2)
-+        self.assertEqual(sys.getrefcount(df), 1 + int(sys.version_info < (3, 14)))
- 
-         self.assertEqual(sys.getrefcount(data["x"]), 3)
- 
-diff --git a/bindings/pyroot/pythonizations/test/rvec_asrvec.py b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-index 9d3a294bf1..f489da826e 100644
---- a/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-+++ b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
-@@ -137,10 +137,10 @@ class AsRVec(unittest.TestCase):
-         rvec = ROOT.VecOps.AsRVec(np_obj)
-         gc.collect()
-         self.assertEqual(sys.getrefcount(rvec), 1 + int(sys.version_info < (3, 14)))
--        self.assertEqual(sys.getrefcount(np_obj), 3)
-+        self.assertEqual(sys.getrefcount(np_obj), 2 + int(sys.version_info < (3, 14)))
-         del rvec
-         gc.collect()
--        self.assertEqual(sys.getrefcount(np_obj), 2)
-+        self.assertEqual(sys.getrefcount(np_obj), 1 + int(sys.version_info < (3, 14)))
- 
- 
- if __name__ == "__main__":
--- 
-2.49.0
-
diff --git a/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch b/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
index 875cf05..4d5587f 100644
--- a/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
+++ b/root-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
@@ -1,4 +1,4 @@
-From e59ece55e4eead85b2b6fd8c6ddc2dfa179f0d09 Mon Sep 17 00:00:00 2001
+From 98a5042a02dd7c1aaa9fbd5e54c8620c6b72484f Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Mon, 2 Jun 2025 21:22:39 +0200
 Subject: [PATCH] Save memory. Do not link to LLVM libraries in parallel
@@ -9,21 +9,21 @@ Subject: [PATCH] Save memory. Do not link to LLVM libraries in parallel
  2 files changed, 9 insertions(+)
 
 diff --git a/core/clingutils/test/CMakeLists.txt b/core/clingutils/test/CMakeLists.txt
-index 15cc3ff48a..f62735e972 100644
+index a6c7aedac99..90ac0139c24 100644
 --- a/core/clingutils/test/CMakeLists.txt
 +++ b/core/clingutils/test/CMakeLists.txt
-@@ -31,3 +31,6 @@ if(NOT builtin_clang)
+@@ -36,3 +36,6 @@ if(NOT builtin_clang)
  endif()
  
- ROOT_ADD_UNITTEST_DIR(Core RIO ${CLING_LIBRARIES} $<TARGET_OBJECTS:ClingUtils>)
+ ROOT_ADD_UNITTEST_DIR(Core ${CLING_LIBRARIES} $<TARGET_OBJECTS:ClingUtils>)
 +
 +# Save memory. Do not link to LLVM libraries in parallel
 +add_dependencies(coreclingutilstestUnit CppInterOpTests)
 diff --git a/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt b/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
-index 0ba35053fd..c6440cf301 100644
+index 4b4b43bdd29..a028802fedc 100644
 --- a/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
 +++ b/interpreter/CppInterOp/unittests/CppInterOp/CMakeLists.txt
-@@ -65,6 +65,9 @@ target_link_libraries(CppInterOpTests
+@@ -66,6 +66,9 @@ target_link_libraries(CppInterOpTests
    clangCppInterOp
  )
  
@@ -33,7 +33,7 @@ index 0ba35053fd..c6440cf301 100644
  set_output_directory(CppInterOpTests
    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
-@@ -116,5 +119,8 @@ set_output_directory(DynamicLibraryManagerTests
+@@ -129,5 +132,8 @@ set_output_directory(DynamicLibraryManagerTests
  
  add_dependencies(DynamicLibraryManagerTests TestSharedLib)
  
@@ -43,5 +43,5 @@ index 0ba35053fd..c6440cf301 100644
  #export_executable_symbols_for_plugins(TestSharedLib)
  add_subdirectory(TestSharedLib)
 -- 
-2.49.0
+2.52.0
 
diff --git a/root-Use-size_t-for-offset.patch b/root-Use-size_t-for-offset.patch
deleted file mode 100644
index 49d3ab5..0000000
--- a/root-Use-size_t-for-offset.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7bfd27ac478356e7c718b18b5eb3a3b277b833d1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 3 Jun 2025 06:49:27 +0200
-Subject: [PATCH] Use size_t for offset
-
-[ RUN      ] VariableReflectionTest.StaticConstExprDatamember
-/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:545: Failure
-Expected equality of these values:
-  3
-  *(int*)offset
-    Which is: 0
-/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:561: Failure
-Expected equality of these values:
-  5
-  *(int*)offset
-    Which is: 0
-/builddir/build/BUILD/root-6.36.00/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp:580: Failure
-Expected equality of these values:
-  2
-  *(int*)offset
-    Which is: 0
-[  FAILED  ] VariableReflectionTest.StaticConstExprDatamember (9 ms)
----
- .../unittests/CppInterOp/VariableReflectionTest.cpp         | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp b/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
-index 26dad4f25c..571ae5cd5d 100644
---- a/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
-+++ b/interpreter/CppInterOp/unittests/CppInterOp/VariableReflectionTest.cpp
-@@ -552,7 +552,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
-   EXPECT_EQ(datamembers.size(), 1);
- 
-   intptr_t offset = Cpp::GetVariableOffset(datamembers[0]);
--  EXPECT_EQ(3, *(int*)offset);
-+  EXPECT_EQ(3, *(size_t*)offset);
- 
-   ASTContext& C = Interp->getCI()->getASTContext();
-   std::vector<Cpp::TemplateArgInfo> template_args = {
-@@ -568,7 +568,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
-   EXPECT_EQ(datamembers.size(), 1);
- 
-   offset = Cpp::GetVariableOffset(datamembers[0]);
--  EXPECT_EQ(5, *(int*)offset);
-+  EXPECT_EQ(5, *(size_t*)offset);
- 
-   std::vector<Cpp::TemplateArgInfo> ele_template_args = {
-       {C.IntTy.getAsOpaquePtr()}, {C.FloatTy.getAsOpaquePtr()}};
-@@ -587,7 +587,7 @@ TEST(VariableReflectionTest, StaticConstExprDatamember) {
-   EXPECT_EQ(datamembers.size(), 1);
- 
-   offset = Cpp::GetVariableOffset(datamembers[0]);
--  EXPECT_EQ(2, *(int*)offset);
-+  EXPECT_EQ(2, *(size_t*)offset);
- }
- 
- TEST(VariableReflectionTest, GetEnumConstantDatamembers) {
--- 
-2.49.0
-
diff --git a/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch b/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
new file mode 100644
index 0000000..58ba414
--- /dev/null
+++ b/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
@@ -0,0 +1,34 @@
+From fd18e83ae79760f7e8cca6f28b6d0f89d912b152 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Wed, 26 Nov 2025 12:40:03 +0100
+Subject: [PATCH] [VecOps] Remove outdated `IsSmall` helper function in tests
+
+The commit 2605710bea7b1 changed from using the `ROOT::Detail::VecOps::`
+namespace explicitly for `IsSmall` to a `using` statement. However,
+there was also a remnant `IsSmall` function with an outdated
+implementation in the test file itself, which we can now remove.
+---
+ math/vecops/test/vecops_rvec.cxx | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
+index 034f06ca211..432c673a553 100644
+--- a/math/vecops/test/vecops_rvec.cxx
++++ b/math/vecops/test/vecops_rvec.cxx
+@@ -1493,13 +1493,6 @@ TEST(VecOps, Construct)
+    EXPECT_TRUE(fourVects[2] == ref2);
+ }
+ 
+-bool IsSmall(const RVec<int> &v)
+-{
+-   // the first array element is right after the 3 data members of SmallVectorBase
+-   return reinterpret_cast<std::uintptr_t>(v.begin()) - reinterpret_cast<std::uintptr_t>(&v) ==
+-          sizeof(void *) + 2 * sizeof(int);
+-}
+-
+ // this is a regression test for https://github.com/root-project/root/issues/6796
+ TEST(VecOps, MemoryAdoptionAndClear)
+ {
+-- 
+2.52.0
+
diff --git a/root-df-Support-libarrow-21.patch b/root-df-Support-libarrow-21.patch
deleted file mode 100644
index a82683d..0000000
--- a/root-df-Support-libarrow-21.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4bfc8d1ff53b398c8e5bd879ca32ead4321b844a Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 20 Aug 2025 08:17:16 +0200
-Subject: [PATCH] [df] Support libarrow 21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-arrow::internal::GenericToStatus → arrow::ToStatus
----
- tree/dataframe/test/datasource_arrow.cxx | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
-index 05493baa3d4..73749b59afc 100644
---- a/tree/dataframe/test/datasource_arrow.cxx
-+++ b/tree/dataframe/test/datasource_arrow.cxx
-@@ -12,6 +12,7 @@
- #include <arrow/record_batch.h>
- #include <arrow/table.h>
- #include <arrow/type.h>
-+#include <arrow/util/config.h>
- #if defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-@@ -21,9 +22,15 @@
- #include <iostream>
- using namespace arrow;
- 
-+#if ARROW_VERSION_MAJOR >= 21
-+#define ASSERT_OK(expr)                                              \
-+   for (::arrow::Status _st = ::arrow::ToStatus((expr)); !_st.ok();) \
-+   FAIL() << "'" ARROW_STRINGIFY(expr) "' failed with " << _st.ToString()
-+#else
- #define ASSERT_OK(expr)                                                               \
-    for (::arrow::Status _st = ::arrow::internal::GenericToStatus((expr)); !_st.ok();) \
-    FAIL() << "'" ARROW_STRINGIFY(expr) "' failed with " << _st.ToString()
-+#endif
- 
- // Copied from arrow/testing/builder.h
- template <typename TYPE, typename C_TYPE = typename TYPE::c_type>
--- 
-2.50.1
-
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 185b1c4..b2c4e99 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,4 +1,4 @@
-From c5f13cb25c3b803346d1a6cac483badbcf2ced62 Mon Sep 17 00:00:00 2001
+From b5735870eb7e65a8c840643540a0676ab40697e0 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Sat, 11 May 2024 20:09:47 +0200
 Subject: [PATCH] Use system fonts via fontconfig
@@ -15,14 +15,13 @@ Subject: [PATCH] Use system fonts via fontconfig
  graf3d/gl/CMakeLists.txt              |   1 +
  graf3d/gl/src/TGLFontManager.cxx      | 123 ++++++++++-
  graf3d/gl/src/TGLText.cxx             |  56 +++--
- gui/gui/src/TGApplication.cxx         |  10 +-
- 12 files changed, 494 insertions(+), 201 deletions(-)
+ 11 files changed, 493 insertions(+), 192 deletions(-)
 
 diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
-index 992713264a..32bfc0bbb9 100644
+index f0d2124a8f6..41ad4c73020 100644
 --- a/core/base/src/TApplication.cxx
 +++ b/core/base/src/TApplication.cxx
-@@ -251,18 +251,12 @@ void TApplication::InitializeGraphics(Bool_t only_web)
+@@ -253,18 +253,12 @@ void TApplication::InitializeGraphics(Bool_t only_web)
        LoadGraphicsLibs();
  
        // Try to load TrueType font renderer. Only try to load if not in batch
@@ -43,7 +42,7 @@ index 992713264a..32bfc0bbb9 100644
           if (gClassTable->GetDict("TGX11TTF")) {
              // in principle we should not have linked anything against libGX11TTF
              // but with ACLiC this can happen, initialize TGX11TTF by hand
-@@ -276,7 +270,6 @@ void TApplication::InitializeGraphics(Bool_t only_web)
+@@ -278,7 +272,6 @@ void TApplication::InitializeGraphics(Bool_t only_web)
           }
        }
     #endif
@@ -52,10 +51,10 @@ index 992713264a..32bfc0bbb9 100644
  
     if (!only_web || !fAppImp) {
 diff --git a/graf2d/asimage/CMakeLists.txt b/graf2d/asimage/CMakeLists.txt
-index 31114ad45d..be95419491 100644
+index b5ccf983473..8ee57c1fac0 100644
 --- a/graf2d/asimage/CMakeLists.txt
 +++ b/graf2d/asimage/CMakeLists.txt
-@@ -30,6 +30,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
+@@ -28,6 +28,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
      ${FREETYPE_LIBRARIES}
      ${X11_LIBRARIES}
      ZLIB::ZLIB
@@ -64,7 +63,7 @@ index 31114ad45d..be95419491 100644
      Core
      Graf
 diff --git a/graf2d/asimage/src/TASImage.cxx b/graf2d/asimage/src/TASImage.cxx
-index 7e046f4724..137265bd4a 100644
+index 6ea60a78801..e85d804b7ec 100644
 --- a/graf2d/asimage/src/TASImage.cxx
 +++ b/graf2d/asimage/src/TASImage.cxx
 @@ -117,6 +117,8 @@ extern "C" {
@@ -76,7 +75,7 @@ index 7e046f4724..137265bd4a 100644
  // auxiliary functions for general polygon filling
  #include "TASPolyUtils.c"
  
-@@ -2595,11 +2597,88 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
+@@ -2620,11 +2622,88 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
     // This is for backward compatibility...
     if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
  
@@ -170,7 +169,7 @@ index 7e046f4724..137265bd4a 100644
  
     if (fn.EndsWith(".pfa") || fn.EndsWith(".PFA") || fn.EndsWith(".pfb") || fn.EndsWith(".PFB") || fn.EndsWith(".ttf") || fn.EndsWith(".TTF") || fn.EndsWith(".otf") || fn.EndsWith(".OTF")) {
        ttfont = kTRUE;
-@@ -2623,7 +2702,7 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
+@@ -2648,7 +2727,7 @@ void TASImage::DrawText(Int_t x, Int_t y, const char *text, Int_t size,
        return;
     }
  
@@ -180,7 +179,7 @@ index 7e046f4724..137265bd4a 100644
     if (!font) {
        font = get_asfont(gFontManager, "fixed", 0, size, ASF_GuessWho);
 diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt
-index d7d1b77c21..c4ebb994a4 100644
+index d7d1b77c21a..c4ebb994a4a 100644
 --- a/graf2d/graf/CMakeLists.txt
 +++ b/graf2d/graf/CMakeLists.txt
 @@ -91,6 +91,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
@@ -192,7 +191,7 @@ index d7d1b77c21..c4ebb994a4 100644
      Hist
      Matrix
 diff --git a/graf2d/graf/inc/TTF.h b/graf2d/graf/inc/TTF.h
-index 0bef9dcb95..ea96fe47ce 100644
+index 864ce06b4f0..050796d1ded 100644
 --- a/graf2d/graf/inc/TTF.h
 +++ b/graf2d/graf/inc/TTF.h
 @@ -76,9 +76,10 @@ protected:
@@ -208,7 +207,7 @@ index 0bef9dcb95..ea96fe47ce 100644
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
 diff --git a/graf2d/graf/src/TTF.cxx b/graf2d/graf/src/TTF.cxx
-index ca38ed1f9c..8f1d62686b 100644
+index 758bb98c192..7b1b06cd0ed 100644
 --- a/graf2d/graf/src/TTF.cxx
 +++ b/graf2d/graf/src/TTF.cxx
 @@ -25,6 +25,8 @@ Interface to the freetype 2 library.
@@ -233,7 +232,7 @@ index ca38ed1f9c..8f1d62686b 100644
  FT_Matrix     *TTF::fgRotMatrix      = nullptr;
  FT_Library     TTF::fgLibrary;
  FT_BBox        TTF::fgCBox;
-@@ -72,6 +75,11 @@ void TTF::Init()
+@@ -71,6 +74,11 @@ void TTF::Init()
        return;
     }
  
@@ -245,7 +244,7 @@ index ca38ed1f9c..8f1d62686b 100644
     // load default font (arialbd)
     SetTextFont(62);
  }
-@@ -109,12 +117,15 @@ Short_t TTF::CharToUnicode(UInt_t code)
+@@ -108,12 +116,15 @@ Short_t TTF::CharToUnicode(UInt_t code)
           charmap  = fgFace[fgCurFontIdx]->charmaps[i];
           platform = charmap->platform_id;
           encoding = charmap->encoding_id;
@@ -265,7 +264,7 @@ index ca38ed1f9c..8f1d62686b 100644
           {
              fgCharMap[fgCurFontIdx] = charmap;
              if (FT_Set_Charmap(fgFace[fgCurFontIdx], fgCharMap[fgCurFontIdx]))
-@@ -387,21 +398,145 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+@@ -392,21 +403,145 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
     }
     const char *basename = gSystem->BaseName(fontname);
  
@@ -423,7 +422,7 @@ index ca38ed1f9c..8f1d62686b 100644
        }
     }
  
-@@ -411,28 +546,13 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+@@ -416,28 +551,13 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
              kTTMaxFonts);
        Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
        fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
@@ -437,7 +436,7 @@ index ca38ed1f9c..8f1d62686b 100644
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
 -
 -   if (!ttfont) {
--      Error("TTF::SetTextFont", "font file %s not found in path", fontname);
+-      Error("TTF::SetTextFont", "font file %s not found in path %s", fontname, ttpath);
 -      if (fgFontCount) {
 -         Warning("TTF::SetTextFont", "using default font %s", fgFontName[0]);
 -         fgCurFontIdx = 0;    // use font 0 (default font, set in ctor)
@@ -454,7 +453,7 @@ index ca38ed1f9c..8f1d62686b 100644
        Error("TTF::SetTextFont", "error loading font %s", ttfont);
        delete [] ttfont;
        if (tface) FT_Done_Face(tface);
-@@ -448,19 +568,20 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+@@ -453,19 +573,20 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
     delete [] ttfont;
  
     fgFontName[fgFontCount] = StrDup(basename);
@@ -478,7 +477,7 @@ index ca38ed1f9c..8f1d62686b 100644
     }
  
     return 0;
-@@ -489,70 +610,50 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+@@ -494,70 +615,50 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
  
  void TTF::SetTextFont(Font_t fontnumber)
  {
@@ -588,7 +587,7 @@ index ca38ed1f9c..8f1d62686b 100644
  
  ////////////////////////////////////////////////////////////////////////////////
 diff --git a/graf2d/postscript/CMakeLists.txt b/graf2d/postscript/CMakeLists.txt
-index eb091bbb39..a05023a3f4 100644
+index eb091bbb396..a05023a3f41 100644
 --- a/graf2d/postscript/CMakeLists.txt
 +++ b/graf2d/postscript/CMakeLists.txt
 @@ -27,6 +27,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Postscript
@@ -600,7 +599,7 @@ index eb091bbb39..a05023a3f4 100644
      Graf
  )
 diff --git a/graf2d/postscript/src/TPostScript.cxx b/graf2d/postscript/src/TPostScript.cxx
-index 09ea7ffa9c..180fd5e3c1 100644
+index df9e3ae16ea..1e353e1ca53 100644
 --- a/graf2d/postscript/src/TPostScript.cxx
 +++ b/graf2d/postscript/src/TPostScript.cxx
 @@ -234,6 +234,7 @@ To change the color model use `gStyle->SetColorModelPS(c)`.
@@ -611,7 +610,7 @@ index 09ea7ffa9c..180fd5e3c1 100644
  
  #include "strlcpy.h"
  #include "snprintf.h"
-@@ -1585,56 +1586,60 @@ Bool_t TPostScript::FontEmbedType42(const char *filename)
+@@ -1584,56 +1585,60 @@ Bool_t TPostScript::FontEmbedType42(const char *filename)
  
  void TPostScript::FontEmbed(void)
  {
@@ -715,7 +714,7 @@ index 09ea7ffa9c..180fd5e3c1 100644
           } else {
              if (FontEmbedType2(ttfont)) {
                 // nothing
-@@ -1643,12 +1648,13 @@ void TPostScript::FontEmbed(void)
+@@ -1642,12 +1647,13 @@ void TPostScript::FontEmbed(void)
              } else if(FontEmbedType42(ttfont)) {
                 // nothing
              } else {
@@ -733,7 +732,7 @@ index 09ea7ffa9c..180fd5e3c1 100644
        }
     }
     PrintStr("%%IncludeResource: font Times-Roman@");
-@@ -2837,10 +2843,10 @@ void TPostScript::Text(Double_t xx, Double_t yy, const wchar_t *chars)
+@@ -2836,10 +2842,10 @@ void TPostScript::Text(Double_t xx, Double_t yy, const wchar_t *chars)
        { "Root.PSFont.9", "/FreeMonoOblique" },
        { "Root.PSFont.10", "/FreeMonoBold" },
        { "Root.PSFont.11", "/FreeMonoBoldOblique" },
@@ -748,10 +747,10 @@ index 09ea7ffa9c..180fd5e3c1 100644
        { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
        { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
 diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt
-index a874da9e1d..5454469606 100644
+index e759473ca0f..c453397fc52 100644
 --- a/graf3d/gl/CMakeLists.txt
 +++ b/graf3d/gl/CMakeLists.txt
-@@ -208,6 +208,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
+@@ -211,6 +211,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
      ${GL2PS_LIBRARIES}
      ${X11_LIBRARIES}
      RGlew
@@ -760,7 +759,7 @@ index a874da9e1d..5454469606 100644
      Hist
      Gui
 diff --git a/graf3d/gl/src/TGLFontManager.cxx b/graf3d/gl/src/TGLFontManager.cxx
-index 776e9d286f..c4134c5980 100644
+index 58ea1188d59..647642de615 100644
 --- a/graf3d/gl/src/TGLFontManager.cxx
 +++ b/graf3d/gl/src/TGLFontManager.cxx
 @@ -36,6 +36,7 @@
@@ -771,7 +770,7 @@ index 776e9d286f..c4134c5980 100644
  
  /** \class TGLFont
  \ingroup opengl
-@@ -450,16 +451,120 @@ void TGLFontManager::RegisterFont(Int_t sizeIn, Int_t fileID, TGLFont::EMode mod
+@@ -448,16 +449,120 @@ void TGLFontManager::RegisterFont(Int_t sizeIn, Int_t fileID, TGLFont::EMode mod
     FontMap_i it = fFontMap.find(TGLFont(size, fileID, mode));
     if (it == fFontMap.end())
     {
@@ -902,7 +901,7 @@ index 776e9d286f..c4134c5980 100644
        FTFont* ftfont = 0;
        switch (mode)
 diff --git a/graf3d/gl/src/TGLText.cxx b/graf3d/gl/src/TGLText.cxx
-index f84f5193d2..8a672c787c 100644
+index 2ed3ee0917a..03feb0ee0a4 100644
 --- a/graf3d/gl/src/TGLText.cxx
 +++ b/graf3d/gl/src/TGLText.cxx
 @@ -32,6 +32,8 @@
@@ -914,7 +913,7 @@ index f84f5193d2..8a672c787c 100644
  #define FTGL_BITMAP  0
  #define FTGL_PIXMAP  1
  #define FTGL_OUTLINE 2
-@@ -176,27 +178,35 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
+@@ -175,27 +177,35 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
  {
     int fontid = fontnumber / 10;
  
@@ -971,7 +970,7 @@ index f84f5193d2..8a672c787c 100644
  
     if (fGLTextFont) delete fGLTextFont;
  
-@@ -204,7 +214,9 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
+@@ -203,7 +213,9 @@ void TGLText::SetGLTextFont(Font_t fontnumber)
  
     fGLTextFont = new FTGLPolygonFont(ttfont);
  
@@ -982,32 +981,6 @@ index f84f5193d2..8a672c787c 100644
        Error("SetGLTextFont","Cannot set FTGL::FaceSize");
 -   delete [] ttfont;
  }
-diff --git a/gui/gui/src/TGApplication.cxx b/gui/gui/src/TGApplication.cxx
-index 72d7dbbf95..73a44fdd7f 100644
---- a/gui/gui/src/TGApplication.cxx
-+++ b/gui/gui/src/TGApplication.cxx
-@@ -81,20 +81,12 @@ TGApplication::TGApplication(const char *appClassName,
-    gROOT->SetBatch(kFALSE);
- 
-    if (strcmp(appClassName, "proofserv")) {
--      const char *ttpath = gEnv->GetValue("Root.TTFontPath",
--                                          TROOT::GetTTFFontDir());
--      char *ttfont = gSystem->Which(ttpath, "arialbd.ttf", kReadPermission);
--      // Added by cholm for use of DFSG - fonts - based on fix by Kevin
--      if (!ttfont)
--         ttfont = gSystem->Which(ttpath, "FreeSansBold.ttf", kReadPermission);
--      if (ttfont && gEnv->GetValue("Root.UseTTFonts", 1)) {
-+      if (gEnv->GetValue("Root.UseTTFonts", 1)) {
-          TPluginHandler *h;
-          if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualX", "x11ttf")))
-             if (h->LoadPlugin() == -1)
-                Info("TGApplication", "no TTF support");
-       }
--
--      delete [] ttfont;
-    }
- 
-    // Create the canvas colors early so they are allocated before
 -- 
-2.45.0
+2.52.0
 
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index be22620..cb56d35 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,16 +1,38 @@
---- root-6.32.00/bindings/pyroot/pythonizations/CMakeLists.txt	2024-05-28 06:06:46.000000000 +0200
-+++ root-6.32.00/bindings/pyroot/pythonizations/CMakeLists.txt	2024-05-29 09:47:08.960324940 +0200
-@@ -189,11 +189,10 @@
- # Create meta-target PyROOT3 (INTERFACE library)
- # Export of targets are not supported for custom targets(add_custom_targets())
- add_library(PyROOT INTERFACE)
+From e0dec6edd0678c2c52aaeb2f3645378ffeaa2d73 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 4 Dec 2025 23:13:28 +0100
+Subject: [PATCH] Dont export Python modules
+
+---
+ bindings/pyroot/pythonizations/CMakeLists.txt | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
+index 1230f18ca47..2df4b733320 100644
+--- a/bindings/pyroot/pythonizations/CMakeLists.txt
++++ b/bindings/pyroot/pythonizations/CMakeLists.txt
+@@ -202,11 +202,6 @@ foreach(py_source ${py_sources})
+                       COMMENT "Compiling PyROOT source ${py_source} for Python ${Python3_VERSION}")
+ endforeach()
+ 
+-# Create meta-target PyROOT3 (INTERFACE library)
+-# Export of targets are not supported for custom targets(add_custom_targets())
+-add_library(PyROOT INTERFACE)
 -target_link_libraries(PyROOT INTERFACE cppyy_backend cppyy ROOTPythonizations)
-+target_link_libraries(PyROOT INTERFACE cppyy_backend cppyy)
+-
+ # Define library output directories for build and install trees
+ set(pymoduledir_build "${localruntimedir}/ROOT")
+ set(pymoduledir_install "${CMAKE_INSTALL_PYTHONDIR}/ROOT")
+@@ -231,8 +226,7 @@ if(NOT MSVC)
+ endif()
  
  # Install library
 -install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
--                            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-+install(TARGETS ${libname}  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
-                             LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
-                             ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
+-                            RUNTIME DESTINATION ${pymoduledir_install} COMPONENT libraries
++install(TARGETS ${libname}  RUNTIME DESTINATION ${pymoduledir_install} COMPONENT libraries
+                             LIBRARY DESTINATION ${pymoduledir_install}  COMPONENT libraries
+                             ARCHIVE DESTINATION ${pymoduledir_install} COMPONENT libraries)
  
+-- 
+2.52.0
+
diff --git a/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch b/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
new file mode 100644
index 0000000..369ce3e
--- /dev/null
+++ b/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
@@ -0,0 +1,135 @@
+From 44c501ac9fdb9049783d9738a9603eec572f52f0 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Wed, 26 Nov 2025 18:11:25 +0100
+Subject: [PATCH] [vecops] Adaptive size of long RVec instances in RVec test
+
+For the tests to make sense, some vectors need to be longer than the
+maximum small vector size. This maximum size is compiler and
+architecture dependent. For `RVec<int>` on ARM64 with gcc 14, the
+small vector capacity turns out to be 60, which is larger than the
+current test vector size of 18.
+
+Therefore, the test is refactored to adapt the large vector size
+automatically, according to the maximum small vector size.
+---
+ math/vecops/test/vecops_rvec.cxx | 81 +++++++++++++++++++++++++-------
+ 1 file changed, 63 insertions(+), 18 deletions(-)
+
+diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
+index 432c673a553..8cbe36ee6d8 100644
+--- a/math/vecops/test/vecops_rvec.cxx
++++ b/math/vecops/test/vecops_rvec.cxx
+@@ -1672,15 +1672,35 @@ TEST_P(VecOpsSwap, BothSmallVectors)
+ 
+ TEST_P(VecOpsSwap, BothRegularVectors)
+ {
+-   RVec<int> fixed_vreg1{1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3};
+-   RVec<int> fixed_vreg2{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
+-   RVec<int> fixed_vreg3{7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7};
++   constexpr std::size_t smallVecSize = ROOT::Internal::VecOps::RVecInlineStorageSize<int>::value;
++
++   // The number of elemens in the large RVecs will be the smallest multiple of
++   // three that larger than smallVecSize.
++   constexpr int nCycle = 3;
++   constexpr std::size_t nElems = ((smallVecSize / nCycle) + 1) * nCycle;
++
++   RVec<int> fixed_vreg1(nElems);
++   RVec<int> fixed_vreg2(nElems);
++   RVec<int> fixed_vreg3(nElems + 1);
+    RVec<int> fixed_vmocksmall{0, 7};
+ 
+-   RVec<int> vreg1{1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3};
+-   RVec<int> vreg2{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
+-   RVec<int> vreg3{7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7};
+-   RVec<int> vmocksmall{0, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 7, 8, 9, 7, 8, 9};
++   RVec<int> vreg1(nElems);
++   RVec<int> vreg2(nElems);
++   RVec<int> vreg3(nElems + 1);
++   RVec<int> vmocksmall(nElems + 1);
++
++   for (std::size_t i = 0; i < nElems; ++i) {
++      vreg1[i] = (i % nCycle) + 1;
++      vreg2[i] = vreg1[i] + nCycle;
++      vreg3[i] = vreg2[i] + nCycle;
++      fixed_vreg1[i] = vreg1[i];
++      fixed_vreg2[i] = vreg2[i];
++      fixed_vreg3[i] = vreg3[i];
++      vmocksmall[i + 1] = vreg3[i];
++   }
++   fixed_vreg3[nElems] = fixed_vreg3[0];
++   vreg3[nElems] = vreg3[0];
++
+    vmocksmall.erase(vmocksmall.begin() + 2, vmocksmall.end());
+    // vmocksmall is a regular vector of size 2
+ 
+@@ -1798,11 +1818,22 @@ TEST_P(VecOpsSwap, BothAdoptingVectors)
+ // in cases where ROOT::VecOps::swap produces 1 regular and 1 adopting vector
+ TEST_P(VecOpsSwap, SmallRegularVectors)
+ {
++   constexpr std::size_t smallVecSize = ROOT::Internal::VecOps::RVecInlineStorageSize<int>::value;
++
++   // The number of elemens in the large RVecs will be the smallest multiple of
++   // three that larger than smallVecSize.
++   constexpr int nCycle = 3;
++   constexpr std::size_t nElems1 = ((smallVecSize / nCycle) + 1) * nCycle;
++   constexpr std::size_t nElems2 = nElems1 + nCycle; // some vectors should be larger than others
++
+    RVec<int> fixed_vsmall{1, 2, 3};
+    RVec<int> fixed_vreg1{4, 5, 6};
+    RVec<int> fixed_vreg2{7, 8};
+    RVec<int> fixed_vreg3{9, 10, 11, 12, 13, 14};
+-   RVec<int> fixed_vreg4{15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
++   RVec<int> fixed_vreg4(nElems1);
++   for (std::size_t i = 0; i < nElems1; ++i) {
++      fixed_vreg4[i] = i + 15;
++   }
+ 
+    // need multiple hard copies since after swap of a small and a regular,
+    // there is no fixed policy whether 2 regular vectors are produced or 1 small and 1 regular
+@@ -1815,19 +1846,33 @@ TEST_P(VecOpsSwap, SmallRegularVectors)
+    RVec<int> vsmall7{1, 2, 3};
+    RVec<int> vsmall8{1, 2, 3};
+ 
+-   RVec<int> vreg1{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
+-   vreg1.erase(vreg1.begin() + 3, vreg1.end()); // regular vector of size 3
+-   RVec<int> vreg10{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
++   RVec<int> vreg1;
++   RVec<int> vreg10;
++   RVec<int> vreg2{7, 8};
++   RVec<int> vreg20{7, 8};
++   RVec<int> vreg3{9, 10, 11, 12, 13, 14};
++   RVec<int> vreg30{9, 10, 11, 12, 13, 14};
++   RVec<int> vreg4(nElems1);
++
++   for (std::size_t i = 0; i < nElems2; ++i) {
++      double val = (i % nCycle) + 4;
++      vreg1.push_back(val);
++      vreg10.push_back(vreg1.back());
++      vreg2.push_back(val);
++      vreg20.push_back(vreg2.back());
++      vreg3.push_back(val);
++      vreg30.push_back(vreg3.back());
++   }
++   for (std::size_t i = 0; i < nElems1; ++i) {
++      vreg4[i] = i + 15;
++   }
++
++   vreg1.erase(vreg1.begin() + 3, vreg1.end());    // regular vector of size 3
+    vreg10.erase(vreg10.begin() + 3, vreg10.end()); // regular vector of size 3
+-   RVec<int> vreg2{7, 8, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
+-   vreg2.erase(vreg2.begin() + 2, vreg2.end()); // regular vector of size 2
+-   RVec<int> vreg20{7, 8, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
++   vreg2.erase(vreg2.begin() + 2, vreg2.end());    // regular vector of size 2
+    vreg20.erase(vreg20.begin() + 2, vreg20.end()); // regular vector of size 2
+-   RVec<int> vreg3{9, 10, 11, 12, 13, 14, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
+-   vreg3.erase(vreg3.begin() + 6, vreg3.end()); // regular vector of size 6
+-   RVec<int> vreg30{9, 10, 11, 12, 13, 14, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
++   vreg3.erase(vreg3.begin() + 6, vreg3.end());    // regular vector of size 6
+    vreg30.erase(vreg30.begin() + 6, vreg30.end()); // regular vector of size 6
+-   RVec<int> vreg4{15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
+    // vreg4 is a regular vector that cannot "fit" to small vector
+ 
+    // verify that initially vectors are not small
+-- 
+2.52.0
+
diff --git a/root.spec b/root.spec
index 030c783..87599a4 100644
--- a/root.spec
+++ b/root.spec
@@ -37,9 +37,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.36.04
+Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -64,7 +64,7 @@ Source7:	JupyROOT-on-EPEL
 Source8:	%{name}-get-src.sh
 #		Clad is a source-transformation automatic differentiation (AD)
 #		library for C++, implemented as a plugin for the Clang compiler
-Source9:	https://github.com/vgvassilev/clad/archive/v1.9/clad-1.9.tar.gz
+Source9:	https://github.com/vgvassilev/clad/archive/v2.2/clad-2.2.tar.gz
 #		Use system fonts
 Patch0:		%{name}-fontconfig.patch
 #		Reduce memory usage during linking on ARM and x86 by generating
@@ -78,31 +78,22 @@ Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
 #		Adjust test/stressGraphics.ref
-#		https://github.com/root-project/root/pull/18989
+#		https://github.com/root-project/root/pull/30667
 Patch5:		%{name}-Adjust-test-stressGraphics.ref.patch
 #		Revert test change that breaks the test
 Patch6:		%{name}-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
-#		Ignore warnings from uring IO
-#		https://github.com/root-project/root/pull/18994
-Patch7:		%{name}-Ignore-warnings-from-uring-IO.patch
 #		Preserve memory during parallel build
 #		https://github.com/root-project/root/pull/18991
-Patch8:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
-#		Fix Big Endian test failure
-#		https://github.com/root-project/root/pull/18992
-Patch9:		%{name}-Use-size_t-for-offset.patch
-#		Fix 32 bit test failure
-#		https://github.com/root-project/root/pull/18993
-Patch10:	%{name}-Fix-test-for-32-bit-architectures.patch
-#		https://github.com/root-project/root/issues/18988
-#		https://github.com/root-project/root/pull/19014
-#		https://github.com/root-project/root/pull/19107
-Patch11:	%{name}-Python-Update-reference-refcount-values-for-Python-3.patch
-Patch12:	%{name}-Python-Update-reference-refcount-values-for-Python-3x.patch
-#		https://github.com/root-project/root/pull/19689
-Patch13:	%{name}-df-Support-libarrow-21.patch
-#		https://github.com/root-project/root/pull/19764
-Patch14:	%{name}-Avoid-OverflowError-from-RDF-pythonization.patch
+Patch7:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
+#		Add missing includes of TMath.h
+#		https://github.com/root-project/root/pull/20601
+Patch8:		%{name}-Geom-Add-missing-includes-of-TMath.h.patch
+#		Fix numpy vs dataframe type mismatch om ix86
+#		https://github.com/root-project/root/pull/20668
+Patch9:		%{name}-Fix-a-numpy-test-for-32-bit-archs.patch
+#		Backport a test fix from upstream
+Patch10:	%{name}-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
+Patch11:	%{name}-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -133,12 +124,9 @@ BuildRequires:	libxml2-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
 BuildRequires:	unuran-devel
-BuildRequires:	mariadb-connector-c-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	unixODBC-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	libpq-devel
 BuildRequires:	libxcrypt-devel
 BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
 BuildRequires:	python%{python3_pkgversion}-setuptools
@@ -148,10 +136,6 @@ BuildRequires:	qt6-qtbase-devel
 BuildRequires:	qt6-qtwebengine-devel
 %endif
 BuildRequires:	openssl-devel
-%if %{?fedora}%{!?fedora:0} >= 41
-#		Needed by civetweb.c in root-net-http
-BuildRequires:	openssl-devel-engine
-%endif
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
@@ -191,8 +175,6 @@ BuildRequires:	cppzmq-devel
 %if %{pandas}
 BuildRequires:	python%{python3_pkgversion}-pandas
 %endif
-BuildRequires:	python%{python3_pkgversion}-rcssmin
-BuildRequires:	uglify-js3
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
 BuildRequires:	gmock-devel
@@ -214,6 +196,7 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-multiproc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	hicolor-icon-theme
 Obsoletes:	emacs-%{name} < 5.34.28
@@ -229,9 +212,7 @@ the bulk of the data. Included are histogramming methods in an
 arbitrary number of dimensions, curve fitting, function evaluation,
 minimization, graphics and visualization classes to allow the easy
 setup of an analysis system that can query and process the data
-interactively or in batch mode, as well as a general parallel
-processing framework, PROOF, that can considerably speed up an
-analysis.
+interactively or in batch mode.
 
 Thanks to the built-in C++ interpreter cling, the command, the
 scripting and the programming language are all C++. The interpreter
@@ -305,9 +286,7 @@ Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-dataframe%{?_isa} = %{version}-%{release}
 %endif
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
-%if %{root7}
 Requires:	%{name}-tree-ntuple-utils%{?_isa} = %{version}-%{release}
-%endif
 Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
 Requires:	%{name}-vecops%{?_isa} = %{version}-%{release}
 #		To resolve dependency in installed ROOTConfig.cmake
@@ -328,6 +307,7 @@ Requires:	font(droidsansfallback)
 Obsoletes:	%{name}-ruby < 6.00.00
 Obsoletes:	%{name}-vdt < 6.10.00
 Obsoletes:	%{name}-proof-pq2 < 6.16.00
+Obsoletes:	%{name}-proofd < 6.16.00
 Obsoletes:	%{name}-rootd < 6.16.00
 Obsoletes:	%{name}-geocad < 6.18.00
 Obsoletes:	%{name}-graf-qt < 6.18.00
@@ -340,6 +320,7 @@ Obsoletes:	%{name}-net-globus < 6.18.00
 Obsoletes:	%{name}-net-ldap < 6.18.00
 Obsoletes:	%{name}-net-krb5 < 6.18.00
 Obsoletes:	%{name}-table < 6.18.00
+Obsoletes:	%{name}-xproof < 6.22.08-2
 Obsoletes:	%{name}-memstat < 6.26.00
 Obsoletes:	%{name}-montecarlo-vmc < 6.26.00
 Obsoletes:	%{name}-doc < 6.26.00
@@ -347,8 +328,14 @@ Obsoletes:	%{name}-io-gfal < 6.30.00
 Obsoletes:	%{name}-roofit-common < 6.30.00
 Obsoletes:	%{name}-gui-qt5webdisplay < 6.36.00
 Obsoletes:	%{name}-hist-draw < 6.36.00
-Obsoletes:	%{name}-histv7 < 6.36.00
 Obsoletes:	%{name}-html < 6.36.00
+Obsoletes:	%{name}-proof < 6.38.00
+Obsoletes:	%{name}-proof-bench < 6.38.00
+Obsoletes:	%{name}-proof-player < 6.38.00
+Obsoletes:	%{name}-proof-sessionviewer < 6.38.00
+Obsoletes:	%{name}-sql-mysql < 6.38.00
+Obsoletes:	%{name}-sql-odbc < 6.38.00
+Obsoletes:	%{name}-sql-pgsql < 6.38.00
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -414,8 +401,6 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split (tpython from Python bindings)
 Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
-#		JsMVA python module is now a submodule of ROOT python module
-Provides:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Obsoletes:	python%{python3_pkgversion}-jsmva < 6.32.00
 
 %description -n python%{python3_pkgversion}-%{name}
@@ -431,7 +416,7 @@ Requires:	%{name}-core = %{version}-%{release}
 #		notebook package was merged with JupyROOT package
 Provides:	%{name}-notebook = %{version}-%{release}
 Obsoletes:	%{name}-notebook < 6.32.00
-Requires:	js-jsroot >= 7.9
+Requires:	js-jsroot >= 7.10
 %if %{?fedora}%{!?fedora:0} || ( %{?rhel}%{!?rhel:0} >= 10 && "%{?dist}" != ".el10_0" )
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -521,8 +506,8 @@ Obsoletes:	%{name}-geom < 6.28.00
 %description geom-builder
 This package contains a library for building geometries in ROOT.
 
-%package geom-painter
-Summary:	Geometry painter library for ROOT
+%package geom-checker
+Summary:	Geometry checker library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
@@ -531,6 +516,17 @@ Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+
+%description geom-checker
+This package contains a library for checking geometries in ROOT.
+
+%package geom-painter
+Summary:	Geometry painter library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 #		Package split (geom-builder and geom-painter from geom)
 Obsoletes:	%{name}-geom < 6.28.00
 
@@ -716,6 +712,8 @@ Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple-browse%{?_isa} = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-graf-x11%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-ged%{?_isa} = %{version}-%{release}
@@ -797,6 +795,14 @@ Recorded events are:
 All the recorded events from one session are stored in one TFile
 and can be replayed again anytime.
 
+%package gui-treemap
+Summary:	GUI element for tree maps in ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+
+%description gui-treemap
+This package contains a library to show tree maps in the ROOT GUI.
+
 %package hbook
 Summary:	Hbook library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -940,7 +946,6 @@ Summary:	Core mathematics library for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 #		Dynamic dependencies
 Requires:	%{name}-mathmore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-minuit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-minuit2%{?_isa} = %{version}-%{release}
 
 %description mathcore
@@ -1127,17 +1132,16 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 This package contains the ROOT networking library.
 
 %package net-rpdutils
-Summary:	Authentication utilities used by xproofd
+Summary:	Authentication utilities used by rootd
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-rpdutils
-This package contains authentication utilities used by xproofd.
+This package contains authentication utilities used by rootd.
 
 %package net-auth
 Summary:	Authentication extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 
 %description net-auth
@@ -1155,9 +1159,11 @@ access to http based storage such as webdav and S3.
 
 %package net-http
 Summary:	HTTP server extension for ROOT
+#		The system civetweb is not compiled with websocket support
+Provides:	bundled(civetweb)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7.9
+Requires:	js-jsroot >= 7.10
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1191,71 +1197,6 @@ Requires:	%{name}-net%{?_isa} = %{version}-%{release}
 This package contains the NetX extension for ROOT, i.e. a client for
 the xrootd server. Only the new (NetXNG) version is provided.
 
-%package proof
-Summary:	PROOF extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Obsoletes:	%{name}-clarens < 5.34.01
-Obsoletes:	%{name}-peac < 5.34.01
-#		Package split (proof-player from proof)
-Obsoletes:	%{name}-proof < 6.14.00
-Obsoletes:	%{name}-proofd < 6.16.00
-Obsoletes:	%{name}-xproof < 6.22.08-2
-
-%description proof
-This package contains the proof extension for ROOT. This provides a
-client to use in a PROOF environment.
-
-%package proof-bench
-Summary:	PROOF benchmarking
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof-player%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-bench
-This package contains the steering class for PROOF benchmarks.
-
-%package proof-player
-Summary:	PROOF player extension for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf3d%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-player%{?_isa} = %{version}-%{release}
-#		Package split (proof-player from proof)
-Obsoletes:	%{name}-proof < 6.14.00
-
-%description proof-player
-This package contains the proof player extension for ROOT.
-
-%package proof-sessionviewer
-Summary:	GUI to browse an interactive PROOF session
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
-Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires:	%{name}-gui%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires:	%{name}-proof%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-
-%description proof-sessionviewer
-This package contains a library for browsing an interactive PROOF
-session in ROOT.
-
 %if %{roofit}
 %package roofit
 Summary:	ROOT extension for modeling expected distributions - toolkit
@@ -1507,31 +1448,6 @@ suitable for adoption in different disciplines as well.
 This package contains extra tools for RooFit projects.
 %endif
 
-%package sql-mysql
-Summary:	MySQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-mysql
-This package contains the MySQL plugin for ROOT. This plugin
-provides a thin client (interface) to MySQL servers. Using this
-client, one can obtain information from a MySQL database into the
-ROOT environment.
-
-This package is deprecated and will be removed in the next release of ROOT.
-
-%package sql-odbc
-Summary:	ODBC plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-odbc
-This package contains the ODBC (Open DataBase Connectivity) plugin
-for ROOT, that allows transparent access to any kind of database that
-supports the ODBC protocol.
-
-This package is deprecated and will be removed in the next release of ROOT.
-
 %package sql-sqlite
 Summary:	Sqlite client plugin for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -1543,19 +1459,6 @@ provides a thin client (interface) to sqlite servers. Using this
 client, one can obtain information from a sqlite database into the
 ROOT environment.
 
-%package sql-pgsql
-Summary:	PostgreSQL client plugin for ROOT
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-net%{?_isa} = %{version}-%{release}
-
-%description sql-pgsql
-This package contains the PostGreSQL plugin for ROOT. This plugin
-provides a thin client (interface) to PostGreSQL servers. Using this
-client, one can obtain information from a PostGreSQL database into the
-ROOT environment.
-
-This package is deprecated and will be removed in the next release of ROOT.
-
 %package tmva
 Summary:	Toolkit for multivariate data analysis
 License:	BSD-3-Clause
@@ -1615,6 +1518,7 @@ License:	BSD-3-Clause
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-numpy
 
 %description tmva-python
@@ -1805,9 +1709,12 @@ This package provides a Web based GUI for ROOT.
 Summary:	ROOT GUI browsable providers
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-geom%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-treemap%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple-browse%{?_isa} = %{version}-%{release}
 #		Package split (gui-browsable-v7 from gui-browsable)
 Obsoletes:	%{name}-gui-browsable < 6.32.06
 
@@ -1852,6 +1759,31 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description tree-ntuple
 This package contains the new ROOT n-tuple class (RNTuple).
 
+%package tree-ntuple-browse
+Summary:	N-Tuple browsing library for ROOT
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf%{?_isa} = %{version}-%{release}
+Requires:	%{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-treemap%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple-utils%{?_isa} = %{version}-%{release}
+
+%description tree-ntuple-browse
+This package contains a library for browsing n-tuples.
+
+%package tree-ntuple-utils
+Summary:	Ntuple utility library
+Requires:	%{name}-core%{?_isa} = %{version}-%{release}
+Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
+Requires:	%{name}-io%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+
+%description tree-ntuple-utils
+This package contains utility functions for ntuples.
+
 %if %{root7}
 %package graf-gpadv7
 Summary:	Canvas and pad library for ROOT (ROOT 7)
@@ -1894,9 +1826,11 @@ Summary:	Additional ROOT GUI browsable providers (ROOT 7)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-graf-gpadv7%{?_isa} = %{version}-%{release}
 Requires:	%{name}-gui-browsable%{?_isa} = %{version}-%{release}
+Requires:	%{name}-gui-treemap%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
+Requires:	%{name}-tree-ntuple-browse%{?_isa} = %{version}-%{release}
 #		Package split (gui-browsable-v7 from gui-browsable)
 Obsoletes:	%{name}-gui-browsable < 6.32.06
 
@@ -1939,16 +1873,12 @@ Requires:	%{name}-mathcore%{?_isa} = %{version}-%{release}
 This package contains a library to show a pop-up dialog when fitting
 various kinds of data.
 
-%package tree-ntuple-utils
-Summary:	Ntuple utility library (ROOT 7)
+%package histv7
+Summary:	Histogram library for ROOT 7
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
-Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	%{name}-tree-ntuple%{?_isa} = %{version}-%{release}
 
-%description tree-ntuple-utils
-This package contains utility functions for ntuples.
+%description histv7
+This package contains a library for histogramming in ROOT 7.
 %endif
 
 %prep
@@ -1966,9 +1896,6 @@ This package contains utility functions for ntuples.
 %patch -P9 -p1
 %patch -P10 -p1
 %patch -P11 -p1
-%patch -P12 -p1
-%patch -P13 -p1
-%patch -P14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1994,20 +1921,11 @@ rm core/lzma/src/*.tar.gz
 rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
 #  * unuran
 rm math/unuran/src/*.tar.gz
-#  * xrootd-private-devel headers
-rm -rf proof/xrdinc/*
 #  * x11 extension headers
 rm -rf graf2d/x11/inc/X11
 #  * jsroot
 rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
 
-# Remove pre-minified script and style files
-rm etc/notebook/JsMVA/js/*.min.js
-rm etc/notebook/JsMVA/css/*.min.css
-
-# Remove executable permissions from source file
-chmod -x interpreter/CppInterOp/lib/Interpreter/CppInterOp.cpp
-
 # Additional documentation
 install -p -m 644 %{SOURCE7} bindings/jupyroot
 
@@ -2022,14 +1940,6 @@ unset QTDIR
 unset QTLIB
 unset QTINC
 
-# Minify script and style files
-for s in etc/notebook/JsMVA/js/*.js ; do
-    uglifyjs-3 ${s} -c -m -o ${s%.js}.min.js
-done
-for s in etc/notebook/JsMVA/css/*.css ; do
-    python3 -m rcssmin < ${s} > ${s%.css}.min.css
-done
-
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}/%{name} \
@@ -2039,6 +1949,7 @@ done
        -DPython3_EXECUTABLE:PATH=%{__python3} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_cfitsio:BOOL=OFF \
+       -Dbuiltin_civetweb:BOOL=ON \
        -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_cling:BOOL=ON \
        -Dbuiltin_cppzmq:BOOL=OFF \
@@ -2084,8 +1995,9 @@ done
        -Dccache:BOOL=OFF \
        -Ddistcc:BOOL=OFF \
        -Dcefweb:BOOL=OFF \
+       -Dcheck_connection:BOOL=OFF \
        -Dclad:BOOL=ON \
-       -DCLAD_SOURCE_DIR:PATH=${PWD}/clad-1.9 \
+       -DCLAD_SOURCE_DIR:PATH=${PWD}/clad-2.2 \
        -Dcocoa:BOOL=OFF \
        -Dcuda:BOOL=OFF \
        -Ddaos:BOOL=OFF \
@@ -2097,6 +2009,8 @@ done
        -Ddavix:BOOL=ON \
        -Ddcache:BOOL=ON \
        -Ddev:BOOL=OFF \
+       -Dexperimental_adaptivecpp=OFF \
+       -Dexperimental_genvectorx=OFF \
        -Dfcgi:BOOL=ON \
        -Dfftw3:BOOL=ON \
        -DFIREFOX_EXECUTABLE:PATH=/usr/bin/firefox \
@@ -2112,13 +2026,9 @@ done
        -Dmathmore:BOOL=ON \
        -Dmemory_termination:BOOL=OFF \
        -Dminuit2_mpi:BOOL=OFF \
-       -Dminuit2_omp:BOOL=OFF \
+       -Dminuit2_omp:BOOL=ON \
        -Dmpi:BOOL=OFF \
-       -Dmysql:BOOL=ON \
-       -Dodbc:BOOL=ON \
        -Dopengl:BOOL=ON \
-       -Dpgsql:BOOL=ON \
-       -Dproof:BOOL=ON \
        -Dpyroot:BOOL=ON \
        -Dpythia8:BOOL=ON \
 %ifarch %{qt6_qtwebengine_arches}
@@ -2148,7 +2058,6 @@ done
 %else
        -Droot7:BOOL=OFF \
 %endif
-       -Drpath:BOOL=OFF \
        -Druby:BOOL=OFF \
        -Druntime_cxxmodules:BOOL=OFF \
        -Dshadowpw:BOOL=ON \
@@ -2157,6 +2066,7 @@ done
        -Dspectrum:BOOL=ON \
        -Dsqlite:BOOL=ON \
        -Dssl:BOOL=ON \
+       -Dthisroot_scripts:BOOL=OFF \
        -Dtmva:BOOL=ON \
        -Dtmva-cpu:BOOL=ON \
        -Dtmva-cudnn:BOOL=OFF \
@@ -2227,8 +2137,8 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
    %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/%{name}
 
 # Fix python extension suffix
-mv %{buildroot}%{python3_sitearch}/libROOTPythonizations.so \
-   %{buildroot}%{python3_sitearch}/libROOTPythonizations%{python3_ext_suffix}
+mv %{buildroot}%{python3_sitearch}/ROOT/libROOTPythonizations.so \
+   %{buildroot}%{python3_sitearch}/ROOT/libROOTPythonizations%{python3_ext_suffix}
 
 # Move noarch python modules to sitelib
 if [ "%{python3_sitelib}" != "%{python3_sitearch}" ] ; then
@@ -2273,6 +2183,7 @@ rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/html
 rm -rf %{buildroot}%{_datadir}/%{name}/notebook/kernels
 rm     %{buildroot}%{_datadir}/%{name}/notebook/jupyter_notebook_config.py
+rmdir  %{buildroot}%{_datadir}/%{name}/notebook
 
 # Replace the rootnb.exe wrapper with a simpler one
 cat > %{buildroot}%{_bindir}/rootnb.exe << EOF
@@ -2313,17 +2224,9 @@ sed -e 's!/usr/bin/python!%{__python3}!' \
     -i %{buildroot}%{_datadir}/%{name}/pdg_table_update.py
 
 # Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
-rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
 rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_bindir}/setxrd*
-rm %{buildroot}%{_bindir}/thisroot*
 rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
-rm -rf %{buildroot}%{_includedir}/clang
-rm -rf %{buildroot}%{_includedir}/clang-c
-rm -rf %{buildroot}/usr/lib/cmake/CppInterOp
-rm %{buildroot}/usr/lib/libclangCppInterOp.a
 rm -rf %{buildroot}%{_datadir}/%{name}/html
 
 # Only used on Windows
@@ -2336,17 +2239,10 @@ rm ROOT@@Math@@Minimizer/P090_RMinimizer.C
 %endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
-rm TProofMgr/P010_TXProofMgr.C
-rm TProofServ/P010_TXProofServ.C
-rm TSlave/P010_TXSlave.C
-rm TSQLServer/P040_TOracleServer.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
 rm TVirtualGLImp/P020_TGWin32GL.C
 rm TVirtualX/P030_TGWin32.C
 rm TVirtualX/P050_TGQuartz.C
-rmdir TProofMgr
-rmdir TProofServ
-rmdir TSlave
 rmdir TVirtualGeoConverter
 popd
 
@@ -2435,8 +2331,8 @@ popd
 # - tutorial-analysis-dataframe-df105_WBosonAnalysis-py
 # - tutorial-analysis-dataframe-df106_HiggsToFourLeptons(-py)
 # - tutorial-analysis-dataframe-df107_SingleTopAnalysis-py
-# - tutorial-experimental-rcanvas-df104-py
-# - tutorial-experimental-rcanvas-df105-py
+# - tutorial-visualisation-rcanvas-df104-py
+# - tutorial-visualisation-rcanvas-df105-py
 #   reads input data over network:
 #   root://eospublic.cern.ch//eos/opendata/atlas/OutreachDatasets/2020-01-22/
 #
@@ -2465,7 +2361,7 @@ popd
 #   reads input file over network
 #   root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
 #
-# - tutorial-tmva-tmva103_Application
+# - tutorial-machine_learning-tmva100_DataPreparation-py
 #   reads input data over network
 #   root://eospublic.cern.ch/eos/root-eos/cms_opendata_2012_nanoaod/SMHiggsToZZTo4L.root
 #
@@ -2475,6 +2371,9 @@ popd
 # - test-stressgraphics-firefox-skip3d:
 #   requires firefox...
 #
+# - test-stressgraphics-svg
+#   Font metric differences
+#
 # - tutorial-visualisation-webcanv-fonts_ttf.cxx:
 #   Requires web graphics
 excluded="\
@@ -2492,8 +2391,8 @@ tutorial-analysis-dataframe-df104_HiggsToTwoPhotons-py|\
 tutorial-analysis-dataframe-df105_WBosonAnalysis-py|\
 tutorial-analysis-dataframe-df106_HiggsToFourLeptons|\
 tutorial-analysis-dataframe-df107_SingleTopAnalysis-py|\
-tutorial-experimental-rcanvas-df104-py|\
-tutorial-experimental-rcanvas-df105-py|\
+tutorial-visualisation-rcanvas-df104-py|\
+tutorial-visualisation-rcanvas-df105-py|\
 tutorial-io-ntuple-ntpl004_dimuon|\
 tutorial-io-ntuple-ntpl008_import|\
 tutorial-io-ntuple-ntpl011_global_temperatures|\
@@ -2501,52 +2400,39 @@ gtest-net-davix-RRawFileDavix|\
 gtest-net-netxng-RRawFileNetXNG|\
 gtest-net-netxng-TNetXNGFileTest|\
 tutorial-analysis-parallel-mp_processSelector|\
-tutorial-tmva-tmva103_Application|\
+tutorial-machine_learning-tmva100_DataPreparation-py|\
 test-webgui-ping|\
 test-stressgraphics-firefox-skip3d|\
+test-stressgraphics-svg|\
 tutorial-visualisation-webcanv-fonts_ttf.cxx"
 
-# Duplicated tests
-# https://github.com/root-project/root/issues/19346
-# - gtest-tree-treeplayer-ttreeindex-clone
-# - gtest-tree-treeplayer-ttreeindex-getlistoffriends
-# - gtest-tree-treeplayer-ttreereader-friends
-excluded="${excluded}|\
-gtest-tree-treeplayer-ttreeindex-clone|\
-gtest-tree-treeplayer-ttreeindex-getlistoffriends|\
-gtest-tree-treeplayer-ttreereader-friends"
-
 %ifarch %{ix86}
 # - gtest-hist-hist-TFormulaGradientTests
 #   out of memory
 #
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views
 #   ValueError: buffer is smaller than requested size
+#
+# - tmva-sofie-test-TestCustomModelsFromONNX
+#   Expected equality of these values:
+#     output.size()
+#       Which is: 1000
+#     sizeof(Slice_Neg::output) / sizeof(float)
+#       Which is: 900
 excluded="${excluded}|\
 gtest-hist-hist-TFormulaGradientTests|\
-pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views"
+pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views|\
+tmva-sofie-test-TestCustomModelsFromONNX\$\$"
 %endif
 
 %ifarch %{power64}
-# - tutorial-roofit-roostats-IntervalExamples-py
-#   *** Break *** segmentation violation
-excluded="${excluded}|\
-tutorial-roofit-roostats-IntervalExamples-py"
-
 %if %{?fedora}%{!?fedora:0} >= 42
 # - gtest-tree-ntuple-ntuple-emulated
-# - gtest-tree-ntuple-ntuple-evolution
+# - gtest-tree-ntuple-ntuple-evolution-shape
 #   waitpid() failed
 excluded="${excluded}|\
 gtest-tree-ntuple-ntuple-emulated|\
-gtest-tree-ntuple-ntuple-evolution"
-%endif
-
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
-# tutorial-roofit-roostats-StandardBayesianMCMCDemo-py
-# - ZeroDivisionError: float division by zero
-excluded="${excluded}|\
-tutorial-roofit-roostats-StandardBayesianMCMCDemo-py"
+gtest-tree-ntuple-ntuple-evolution-shape"
 %endif
 %endif
 
@@ -2559,13 +2445,16 @@ gtest-roofit-roofitcore-testNaNPacker|\
 gtest-roofit-roofitcore-testLikelihoodGradientJob"
 
 # - gtest-core-dictgen-dictgen-base
-# - gtest-tmva-sofie-TestCustomModelsFromONNX
+# - gtest-tree-dataframe-dataframe-concurrency
+# - gtest-tree-dataframe-dataframe-snapshot-ntuple
 # - gtest-tree-dataframe-dataframe-unified-constructor
-#
+# - gtest-tree-dataframe-dataframe-vary
+# - gtest-tree-dataframe-datasource-ntuple
 # - gtest-tree-ntuple-ntuple-basics
 # - gtest-tree-ntuple-ntuple-bulk
 # - gtest-tree-ntuple-ntuple-cast
 # - gtest-tree-ntuple-ntuple-compat
+# - gtest-tree-ntuple-ntuple-evolution-type
 # - gtest-tree-ntuple-ntuple-extended
 # - gtest-tree-ntuple-ntuple-join-table
 # - gtest-tree-ntuple-ntuple-largefile2
@@ -2588,19 +2477,22 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 # - gtest-tree-ntuple-rfield-streamer
 # - gtest-tree-ntuple-rfield-variant
 # - gtest-tree-ntuple-rfield-vector
-# - gtest-tree-ntupleutil-v7-ntuple-importer
-# - gtest-tree-ntupleutil-v7-ntuple-inspector
+# - gtest-tree-ntupleutil-ntuple-importer
+# - gtest-tree-ntupleutil-ntuple-inspector
+# - gtest-tree-tree-testTTreeRegressions
 #   https://github.com/root-project/root/issues/12426
 #
 # - pyunittests-bindings-distrdf-backend-distrdf-unit-backend-graph-caching
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor
 # - pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector
+# - pyunittests-io-io-rfile-py
+# - tmva-sofie-test-TestCustomModelsFromONNX
 # - tutorial-analysis-dataframe-df006_ranges-py
-# - tutorial-experimental-rcanvas-rbox-py
 # - tutorial-hist-hist007_TH1_liveupdate-py
 # - tutorial-math-exampleFunction-py
 # - tutorial-math-fit-combinedFit-py
 # - tutorial-math-fit-NumericalMinimization-py
+# - tutorial-visualisation-rcanvas-rbox-py
 #   https://github.com/root-project/root/issues/12429
 #
 # - test-stresshistofit
@@ -2609,14 +2501,16 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 # - test-stresshistogram-interpreted
 excluded="${excluded}|\
 gtest-core-dictgen-dictgen-base|\
-gtest-tmva-sofie-TestCustomModelsFromONNX|\
+gtest-tree-dataframe-dataframe-concurrency|\
 gtest-tree-dataframe-dataframe-snapshot-ntuple|\
 gtest-tree-dataframe-dataframe-unified-constructor|\
+gtest-tree-dataframe-dataframe-vary|\
 gtest-tree-dataframe-datasource-ntuple|\
 gtest-tree-ntuple-ntuple-basics|\
 gtest-tree-ntuple-ntuple-bulk|\
 gtest-tree-ntuple-ntuple-cast|\
 gtest-tree-ntuple-ntuple-compat|\
+gtest-tree-ntuple-ntuple-evolution-type|\
 gtest-tree-ntuple-ntuple-extended|\
 gtest-tree-ntuple-ntuple-join-table|\
 gtest-tree-ntuple-ntuple-largefile2|\
@@ -2639,17 +2533,20 @@ gtest-tree-ntuple-rfield-class|\
 gtest-tree-ntuple-rfield-streamer|\
 gtest-tree-ntuple-rfield-variant|\
 gtest-tree-ntuple-rfield-vector|\
-gtest-tree-ntupleutil-v7-ntuple-importer|\
-gtest-tree-ntupleutil-v7-ntuple-inspector|\
+gtest-tree-ntupleutil-ntuple-importer|\
+gtest-tree-ntupleutil-ntuple-inspector|\
+gtest-tree-tree-testTTreeRegressions|\
 pyunittests-bindings-distrdf-backend-distrdf-unit-backend-graph-caching|\
 pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-rtensor|\
 pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-stl-vector|\
+pyunittests-io-io-rfile-py|\
+tmva-sofie-test-TestCustomModelsFromONNX|\
 tutorial-analysis-dataframe-df006_ranges-py|\
-tutorial-experimental-rcanvas-rbox-py|\
 tutorial-hist-hist007_TH1_liveupdate-py|\
 tutorial-math-exampleFunction-py|\
 tutorial-math-fit-combinedFit-py|\
 tutorial-math-fit-NumericalMinimization-py|\
+tutorial-visualisation-rcanvas-rbox-py|\
 test-stresshistofit\$\$|\
 test-stresshistofit-interpreted|\
 test-stresshistogram\$\$|\
@@ -2670,17 +2567,14 @@ excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
-# - https://github.com/root-project/root/issues/18995
-excluded="${excluded}|\
-gtest-tree-tree-testTTreeRegressions"
-%endif
-
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # InterpreterTest.Evaluate fails on s390x
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
+# TTreeRegressions.PrintClustersRounding
+# relies on specific versions of compression libraries
+# https://github.com/root-project/root/issues/18995
 export GTEST_FILTER=-\
 %ifarch %{ix86}
 RNTuple.StdAtomic:\
@@ -2691,13 +2585,15 @@ TClingDataMemberInfo.Offset:\
 TTreeReaderBasic.LorentzVector32:\
 %endif
 RCsvDS.Remote:\
+RFile.RemoteRead:\
 RNTuple.OpenHTTP:\
 RRawFile.Remote:\
 RSqliteDS.Davix:\
 TChainParsing.DoubleSlash:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
-TFile.ReadWithoutGlobalRegistrationWeb
+TFile.ReadWithoutGlobalRegistrationWeb:\
+TTreeRegressions.PrintClustersRounding
 %ctest -- -E "${excluded}"
 
 %pretrans net-http -p <lua>
@@ -2764,6 +2660,8 @@ fi
 %{_bindir}/hadd
 %{_bindir}/root
 %{_bindir}/root.exe
+%{_bindir}/rootbrowse
+%{_bindir}/rootls
 %{_bindir}/rootn.exe
 %{_bindir}/rootreadspeed
 %{_bindir}/roots
@@ -2846,6 +2744,7 @@ fi
 %{_pkgdocdir}/LICENSE
 %doc %{_pkgdocdir}/DEVELOPMENT.md
 %doc %{_pkgdocdir}/ReleaseNotes
+%doc %{_pkgdocdir}/root_citation.bib
 %license LICENSE LGPL2_1.txt
 
 %files multiproc -f includelist-core-multiproc
@@ -2874,14 +2773,9 @@ fi
 
 %files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
 %{python3_sitearch}/cppyy
-%{python3_sitearch}/cppyy_backend
 %{python3_sitearch}/ROOT
 %{python3_sitearch}/ROOT-*.dist-info
-%{python3_sitearch}/libcppyy.so
-%{python3_sitearch}/libcppyy_backend.so
-%{python3_sitearch}/libROOTPythonizations%{python3_ext_suffix}
-%{_libdir}/%{name}/libcppyy.*
-%{_libdir}/%{name}/libcppyy_backend.*
+%{_libdir}/%{name}/libCPyCppyy.*
 %dir %{_includedir}/%{name}/CPyCppyy
 
 %files -n python%{python3_pkgversion}-jupyroot
@@ -2889,7 +2783,6 @@ fi
 %{python3_sitelib}/JupyROOT-*.dist-info
 %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
 %{_bindir}/rootnb.exe
-%{_datadir}/%{name}/notebook
 %doc bindings/jupyroot/README.md
 %doc bindings/jupyroot/JupyROOT-on-EPEL
 
@@ -3044,6 +2937,10 @@ fi
 %{_libdir}/%{name}/libRecorder.*
 %{_libdir}/%{name}/libRecorder_rdict.pcm
 
+%files gui-treemap -f includelist-gui-treemap
+%{_libdir}/%{name}/libROOTTreeMap.*
+%{_libdir}/%{name}/libROOTTreeMap_rdict.pcm
+
 %files hbook -f includelist-hist-hbook
 %{_bindir}/g2root
 %{_bindir}/h2root
@@ -3085,7 +2982,6 @@ fi
 %files io-sql -f includelist-io-sql
 %{_libdir}/%{name}/libSQLIO.*
 %{_libdir}/%{name}/libSQLIO_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P090_TSQLFile.C
 
 %files io-xml -f includelist-io-xml
 %{_libdir}/%{name}/libXMLIO.*
@@ -3260,44 +3156,6 @@ fi
 %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C
 %{_datadir}/%{name}/plugins/ROOT@@Internal@@RRawFile/P020_RRawFileNetXNG.C
 
-%files proof -f includelist-proof-proof
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_mandir}/man1/proofserv.1*
-%{_libdir}/%{name}/libProof.*
-%{_libdir}/%{name}/libProof_rdict.pcm
-%{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C
-%{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C
-%{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C
-%{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C
-%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
-%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
-
-%files proof-bench -f includelist-proof-proofbench
-%{_libdir}/%{name}/libProofBench.*
-%{_libdir}/%{name}/libProofBench_rdict.pcm
-%{_datadir}/%{name}/proof
-
-%files proof-player -f includelist-proof-proofplayer
-%{_libdir}/%{name}/libProofDraw.*
-%{_libdir}/%{name}/libProofDraw_rdict.pcm
-%{_libdir}/%{name}/libProofPlayer.*
-%{_libdir}/%{name}/libProofPlayer_rdict.pcm
-%{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P020_TProofPlayerRemote.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P030_TProofPlayerLocal.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
-%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
-
-%files proof-sessionviewer -f includelist-gui-sessionviewer
-%{_libdir}/%{name}/libSessionViewer.*
-%{_libdir}/%{name}/libSessionViewer_rdict.pcm
-%{_datadir}/%{name}/plugins/TProofProgressDialog/P010_TProofProgressDialog.C
-%{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C
-%{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C
-
 %if %{roofit}
 %files roofit -f includelist-roofit-roofit
 %{_libdir}/%{name}/libRooFit.*
@@ -3368,26 +3226,11 @@ fi
 %dir %{_includedir}/%{name}/RooFit/xRooFit
 %endif
 
-%files sql-mysql -f includelist-sql-mysql
-%{_libdir}/%{name}/libRMySQL.*
-%{_libdir}/%{name}/libRMySQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P010_TMySQLServer.C
-
-%files sql-odbc -f includelist-sql-odbc
-%{_libdir}/%{name}/libRODBC.*
-%{_libdir}/%{name}/libRODBC_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C
-
 %files sql-sqlite -f includelist-sql-sqlite
 %{_libdir}/%{name}/libRSQLite.*
 %{_libdir}/%{name}/libRSQLite_rdict.pcm
 %{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C
 
-%files sql-pgsql -f includelist-sql-pgsql
-%{_libdir}/%{name}/libPgSQL.*
-%{_libdir}/%{name}/libPgSQL_rdict.pcm
-%{_datadir}/%{name}/plugins/TSQLServer/P020_TPgSQLServer.C
-
 %files tmva -f includelist-tmva-tmva
 %{_libdir}/%{name}/libTMVA.*
 %{_libdir}/%{name}/libTMVA_rdict.pcm
@@ -3407,6 +3250,7 @@ fi
 %exclude %{_includedir}/%{name}/TMVA/RTensorUtils.hxx
 %exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchGenerator.hxx
 %exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchLoader.hxx
+%exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RChunkConstructor.hxx
 %exclude %{_includedir}/%{name}/TMVA/BatchGenerator/RChunkLoader.hxx
 
 %if %{dataframe}
@@ -3423,6 +3267,7 @@ fi
 %dir %{_includedir}/%{name}/TMVA/BatchGenerator
 %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchGenerator.hxx
 %{_includedir}/%{name}/TMVA/BatchGenerator/RBatchLoader.hxx
+%{_includedir}/%{name}/TMVA/BatchGenerator/RChunkConstructor.hxx
 %{_includedir}/%{name}/TMVA/BatchGenerator/RChunkLoader.hxx
 %endif
 
@@ -3483,11 +3328,9 @@ fi
 %{_libdir}/%{name}/libUnfold_rdict.pcm
 
 %files cli
-%{_bindir}/rootbrowse
 %{_bindir}/rootcp
 %{_bindir}/rootdrawtree
 %{_bindir}/rooteventselector
-%{_bindir}/rootls
 %{_bindir}/rootmkdir
 %{_bindir}/rootmv
 %{_bindir}/rootprint
@@ -3518,6 +3361,8 @@ fi
 %{_libdir}/%{name}/libROOTBranchBrowseProvider.*
 %{_libdir}/%{name}/libROOTGeoBrowseProvider.*
 %{_libdir}/%{name}/libROOTLeafDraw6Provider.*
+%{_libdir}/%{name}/libROOTNTupleBrowseProvider.*
+%{_libdir}/%{name}/libROOTNTupleDraw6Provider.*
 %{_libdir}/%{name}/libROOTObjectDraw6Provider.*
 
 %files gui-browserv7 -f includelist-gui-browserv7
@@ -3529,6 +3374,11 @@ fi
 %{_libdir}/%{name}/libROOTBrowserWidgets.*
 %{_datadir}/%{name}/plugins/TBrowserImp/P030_RWebBrowserImp.C
 
+%files geom-checker -f includelist-geom-geomchecker
+%{_libdir}/%{name}/libGeomChecker.*
+%{_libdir}/%{name}/libGeomChecker_rdict.pcm
+%{_datadir}/%{name}/plugins/TVirtualGeoChecker/P010_TGeoChecker.C
+
 %files geom-webviewer -f includelist-geom-webviewer
 %{_libdir}/%{name}/libROOTGeomViewer.*
 %{_libdir}/%{name}/libROOTGeomViewer_rdict.pcm
@@ -3539,6 +3389,14 @@ fi
 %{_libdir}/%{name}/libROOTNTuple_rdict.pcm
 %dir %{_includedir}/%{name}/ROOT/libdaos_mock
 
+%files tree-ntuple-browse -f includelist-tree-ntuplebrowse
+%{_libdir}/%{name}/libROOTNTupleBrowse.*
+%{_libdir}/%{name}/libROOTNTupleBrowse_rdict.pcm
+
+%files tree-ntuple-utils -f includelist-tree-ntupleutil
+%{_libdir}/%{name}/libROOTNTupleUtil.*
+%{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
+
 %if %{root7}
 %files graf-gpadv7 -f includelist-graf2d-gpadv7
 %{_libdir}/%{name}/libROOTGpadv7.*
@@ -3554,8 +3412,6 @@ fi
 
 %files gui-browsable-v7
 %{_libdir}/%{name}/libROOTLeafDraw7Provider.*
-%{_libdir}/%{name}/libROOTNTupleBrowseProvider.*
-%{_libdir}/%{name}/libROOTNTupleDraw6Provider.*
 %{_libdir}/%{name}/libROOTNTupleDraw7Provider.*
 %{_libdir}/%{name}/libROOTObjectDraw7Provider.*
 
@@ -3569,12 +3425,23 @@ fi
 %{_libdir}/%{name}/libROOTFitPanelv7.*
 %{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm
 
-%files tree-ntuple-utils -f includelist-tree-ntupleutil
-%{_libdir}/%{name}/libROOTNTupleUtil.*
-%{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
+%files histv7 -f includelist-hist-histv7
+%{_libdir}/%{name}/libROOTHist.*
+%{_libdir}/%{name}/libROOTHist_rdict.pcm
 %endif
 
 %changelog
+* Tue Dec 09 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-1
+- Update to 6.38.00
+- Removed subpackages: root-proof, root-proof-bench, root-proof-player,
+    root-proof-sessionviewer, root-sql-mysql, root-sql-odbc, root-sql-pgsql
+- New subpackages: root-geom-checker, root-gui-treemap,
+    root-tree-ntuple-browse, root-histv7
+- JsMVA python (sub)module dropped from python3-root package
+- Compile minuit2 with Open MP support
+- Dropped patches: 7
+- New patches: 4
+
 * Wed Oct 29 2025 Stephen Gallagher <sgallagh@redhat.com> - 6.36.04-4
 - Rebuild for libarrow 22
 
diff --git a/sources b/sources
index 17b366b..98e90e5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.36.04.tar.xz) = d8798d777f308e59ebb3429323895757ca9538499dbb1989d70b3a01c2122b2a01911b0e7da673d7a9fc40acd49fdbf6a5b4341266c1b68a8a88d9f904e7919b
+SHA512 (root-6.38.00.tar.xz) = 7c452b509e8171a0cbb7c102a3d4c07333fc8535f1b2c2ab0b9f7434604f098989a78bb71c41039dd41dbbd3438ea8703939826092f075d9d730b6b53c84ac55
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
-SHA512 (clad-1.9.tar.gz) = df0569f12e3381e9285639eee927d9effb2812765caad2d281c41f6673828ab28b7bf8143ae9686090649cf889e757cfead58baa47e907de468185125a4d772c
+SHA512 (clad-2.2.tar.gz) = 6f76d706a829901fc0fcdb38b5ddad6ea8ad9186ea48a4b6b585fc62974a2cda11b96a448c25daaba0586962d6428773e7ab751236c6afa72a91d12f30f2d05e

From bdcedb0537a0d54cdf6dbd091ed2d84e385f361f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 13 Dec 2025 12:55:11 +0100
Subject: [PATCH 321/344] Skip RPATH using -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
 (replaces   previously used root specific -Drpath:BOOL=OFF no longer
 available) Backport fixes to python module Rebuild for pythia8 8.3.16

---
 ...e-related-to-finding-CPyCppyy-API-he.patch | 109 ++++++++++++++++++
 ...now-irrelevant-load_cpp_backend-call.patch |  46 ++++++++
 root.spec                                     |  14 ++-
 3 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
 create mode 100644 root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch

diff --git a/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch b/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
new file mode 100644
index 0000000..882247f
--- /dev/null
+++ b/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
@@ -0,0 +1,109 @@
+From 251de0f8b237ce041df4960f831fe4a1fade6d92 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Sat, 6 Dec 2025 17:39:40 +0100
+Subject: [PATCH] [cppyy] Remove code related to finding CPyCppyy API header
+ path
+
+This is not needed for ROOT, because the CPyCppyy API headers are
+installed with the other ROOT headers anyway, and ROOT knows where to
+find them already.
+---
+ .../cppyy/cppyy/python/cppyy/__init__.py      | 82 -------------------
+ 1 file changed, 82 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py b/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
+index 68e3c49e5fe..c8dd458bfdd 100644
+--- a/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
++++ b/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
+@@ -297,88 +297,6 @@ elif ispypy:
+     if os.path.exists(apipath) and os.path.exists(os.path.join(apipath, 'Python.h')):
+         add_include_path(apipath)
+ 
+-# add access to extra headers for dispatcher (CPyCppyy only (?))
+-if not ispypy:
+-    try:
+-        apipath_extra = os.environ['CPPYY_API_PATH']
+-        if os.path.basename(apipath_extra) == 'CPyCppyy':
+-            apipath_extra = os.path.dirname(apipath_extra)
+-    except KeyError:
+-        apipath_extra = None
+-
+-    if apipath_extra is None:
+-        try:
+-            if 0x30a0000 <= sys.hexversion:
+-                import importlib.metadata as m
+-
+-                for p in m.files('CPyCppyy'):
+-                    if p.match('API.h'):
+-                        ape = p.locate()
+-                        break
+-                del p, m
+-            else:
+-                import pkg_resources as pr
+-
+-                d = pr.get_distribution('CPyCppyy')
+-                for line in d.get_metadata_lines('RECORD'):
+-                    if 'API.h' in line:
+-                        ape = os.path.join(d.location, line[0:line.find(',')])
+-                        break
+-                del line, d, pr
+-
+-            if os.path.exists(ape):
+-                apipath_extra = os.path.dirname(os.path.dirname(ape))
+-            del ape
+-        except Exception:
+-            pass
+-
+-    if apipath_extra is None:
+-        ldversion = sysconfig.get_config_var('LDVERSION')
+-        if not ldversion:
+-            ldversion = sys.version[:3]
+-
+-        apipath_extra = os.path.join(os.path.dirname(apipath), 'site', 'python'+ldversion)
+-        if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
+-            import glob
+-            import platform
+-
+-            if platform.system() == "Windows":
+-                # Install locations are handled differently on Windows
+-                import libcppyy
+-
+-                ape = os.path.dirname(libcppyy.__file__)
+-            else:
+-                import cppyy.libcppyy as libcppyy
+-
+-                ape = os.path.dirname(libcppyy.__file__)
+-            # a "normal" structure finds the include directory up to 3 levels up,
+-            # ie. dropping lib/pythonx.y[md]/site-packages
+-            for i in range(3):
+-                if os.path.exists(os.path.join(ape, 'include')):
+-                    break
+-                ape = os.path.dirname(ape)
+-
+-            ape = os.path.join(ape, 'include')
+-            if os.path.exists(os.path.join(ape, 'CPyCppyy')):
+-                apipath_extra = ape
+-            else:
+-              # add back pythonx.y or site/pythonx.y if present
+-                for p in glob.glob(os.path.join(ape, 'python'+sys.version[:3]+'*'))+\
+-                         glob.glob(os.path.join(ape, '*', 'python'+sys.version[:3]+'*')):
+-                    if os.path.exists(os.path.join(p, 'CPyCppyy')):
+-                        apipath_extra = p
+-                        break
+-
+-    if apipath_extra.lower() != 'none':
+-        if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
+-            warnings.warn("CPyCppyy API not found (tried: %s); "
+-                          "set CPPYY_API_PATH envar to the 'CPyCppyy' API directory to fix"
+-                          % apipath_extra)
+-        else:
+-            add_include_path(apipath_extra)
+-
+-    del apipath_extra
+-
+ if os.getenv('CONDA_PREFIX'):
+   # MacOS, Linux
+     include_path = os.path.join(os.getenv('CONDA_PREFIX'), 'include')
+-- 
+2.52.0
+
diff --git a/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch b/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
new file mode 100644
index 0000000..a79c861
--- /dev/null
+++ b/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
@@ -0,0 +1,46 @@
+From f4577e76a5dc23842d6be0a82df804f71fc820ef Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Mon, 1 Dec 2025 16:51:36 +0100
+Subject: [PATCH] [cppyy] Remove now irrelevant `load_cpp_backend()` call
+
+As we don't have a separate `cppyy_backend` anymore (neither as a Python
+package, nor as a shared library), trying to load the backend library
+will always give an exception that will be caught as an `ImportError`.
+
+It would be cleaner if this code branch is not even taken.
+---
+ .../cppyy/cppyy/python/cppyy/_cpython_cppyy.py       | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py b/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
+index bac078ea7c9..f98a34a697c 100644
+--- a/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
++++ b/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
+@@ -19,24 +19,12 @@ __all__ = [
+     '_end_capture_stderr'
+     ]
+ 
+-# First load the dependency libraries of the backend, then pull in the libcppyy
+-# extension module. If the backed can't be loaded, it was probably linked
+-# statically into the extension module, so we don't error out at this point.
+-try:
+-    from cppyy_backend import loader
+-    c = loader.load_cpp_backend()
+-except ImportError:
+-    c = None
+-
+ if platform.system() == "Windows":
+     # On Windows, the library has to be searched without prefix
+     import libcppyy as _backend
+ else:
+     import cppyy.libcppyy as _backend
+ 
+-if c is not None:
+-    _backend._cpp_backend = c
+-
+ # explicitly expose APIs from libcppyy
+ _w = ctypes.CDLL(_backend.__file__, ctypes.RTLD_GLOBAL)
+ 
+-- 
+2.52.0
+
diff --git a/root.spec b/root.spec
index 87599a4..53ba016 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -94,6 +94,9 @@ Patch9:		%{name}-Fix-a-numpy-test-for-32-bit-archs.patch
 #		Backport a test fix from upstream
 Patch10:	%{name}-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
 Patch11:	%{name}-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
+#		Backport fixes to python module
+Patch12:	root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
+Patch13:	root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1896,6 +1899,8 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P9 -p1
 %patch -P10 -p1
 %patch -P11 -p1
+%patch -P12 -p1
+%patch -P13 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1946,6 +1951,7 @@ unset QTINC
        -DCMAKE_INSTALL_PYTHONDIR:PATH=%{python3_sitearch} \
        -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir}/%{name} \
        -DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
+       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
        -DPython3_EXECUTABLE:PATH=%{__python3} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_cfitsio:BOOL=OFF \
@@ -3431,6 +3437,12 @@ fi
 %endif
 
 %changelog
+* Thu Dec 11 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-2
+- Skip RPATH using -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON (replaces
+  previously used root specific -Drpath:BOOL=OFF no longer available)
+- Backport fixes to python module
+- Rebuild for pythia8 8.3.16
+
 * Tue Dec 09 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-1
 - Update to 6.38.00
 - Removed subpackages: root-proof, root-proof-bench, root-proof-player,

From 64acc88ed18cb79b3caa678ea22c6a9b2ba36f61 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 18 Dec 2025 13:08:34 +0100
Subject: [PATCH 322/344] Don't install the python modules twice

Fix Requires and Provides in the python3-root rpm
---
 ...n-t-install-the-python-modules-twice.patch | 70 +++++++++++++++++++
 root-no-export-python-modules.patch           | 19 ++++-
 root.spec                                     | 18 +++--
 3 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 root-PyROOT-Don-t-install-the-python-modules-twice.patch

diff --git a/root-PyROOT-Don-t-install-the-python-modules-twice.patch b/root-PyROOT-Don-t-install-the-python-modules-twice.patch
new file mode 100644
index 0000000..608765d
--- /dev/null
+++ b/root-PyROOT-Don-t-install-the-python-modules-twice.patch
@@ -0,0 +1,70 @@
+From f09b4ce027b31dcd19ea8a398c35c5dfbcc0507f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Thu, 18 Dec 2025 11:49:12 +0100
+Subject: [PATCH] [PyROOT] Don't install the python modules twice
+
+The binary python modules were moved one directory level down into the
+ROOT and cppyy directories, so that they reside alongside the python
+files in the same directories. The install rule for the python files
+must therefore be extended to exclude the binary modules (PATTERN *.so
+EXCLUDE) so that these are not installed a second time overwriting the
+files installed by the install rule for the binary modules with another
+copy with the wrong file permissions.
+
+Also use the no-version option for the cppyy binary module as is
+already done for the pythonization binary module, since it is now
+installed in the python directory. Before it was installed in the
+library directory with an unversioned symlink in the python directory.
+---
+ bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 2 +-
+ bindings/pyroot/cppyy/cppyy/CMakeLists.txt    | 5 +++--
+ bindings/pyroot/pythonizations/CMakeLists.txt | 3 ++-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+index bb48c032974..065a89348ff 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
++++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+@@ -73,7 +73,7 @@ endif()
+ add_library(cppyy SHARED src/CPyCppyyPyModule.cxx)
+ 
+ # Set the suffix to '.so' and the prefix to 'lib'
+-set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES}
++set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES_NO_VERSION}
+   LIBRARY_OUTPUT_DIRECTORY ${localruntimedir}/cppyy)
+ if(MSVC)
+   target_link_libraries(cppyy PRIVATE CPyCppyy)
+diff --git a/bindings/pyroot/cppyy/cppyy/CMakeLists.txt b/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
+index 3a29b4525f7..842ad12df97 100644
+--- a/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
++++ b/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
+@@ -31,8 +31,9 @@ endforeach()
+ # Install Python sources and bytecode
+ install(DIRECTORY ${localruntimedir}/cppyy
+         DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
+-        COMPONENT libraries)
++        COMPONENT libraries
++        PATTERN *.so EXCLUDE)
+ 
+ if(NOT MSVC)
+   ROOT_ADD_TEST_SUBDIRECTORY(test)
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
+index 1230f18ca47..b415ba13697 100644
+--- a/bindings/pyroot/pythonizations/CMakeLists.txt
++++ b/bindings/pyroot/pythonizations/CMakeLists.txt
+@@ -239,7 +239,8 @@ install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
+ # Install Python sources and bytecode
+ install(DIRECTORY ${localruntimedir}/ROOT
+         DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
+-        COMPONENT libraries)
++        COMPONENT libraries
++        PATTERN *.so EXCLUDE)
+ 
+ # Install headers required by pythonizations
+ install(FILES ${PYROOT_EXTRA_HEADERS}
+-- 
+2.52.0
+
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index cb56d35..d3fa4bc 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,12 +1,27 @@
-From e0dec6edd0678c2c52aaeb2f3645378ffeaa2d73 Mon Sep 17 00:00:00 2001
+From b4e57c8ccd59d69fe61fa5f6470b3a99ba52aeeb Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Thu, 4 Dec 2025 23:13:28 +0100
 Subject: [PATCH] Dont export Python modules
 
 ---
+ bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 3 +--
  bindings/pyroot/pythonizations/CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ 2 files changed, 2 insertions(+), 9 deletions(-)
 
+diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+index bb48c032974..c34069855b2 100644
+--- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
++++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
+@@ -119,8 +119,7 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
+                             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
+                             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ 
+-install(TARGETS cppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
+-                            RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
++install(TARGETS cppyy       RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
+                             LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries
+                             ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries)
+ 
 diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
 index 1230f18ca47..2df4b733320 100644
 --- a/bindings/pyroot/pythonizations/CMakeLists.txt
diff --git a/root.spec b/root.spec
index 53ba016..14bfa6e 100644
--- a/root.spec
+++ b/root.spec
@@ -34,12 +34,12 @@
 %endif
 
 # Do not generate autoprovides for Python modules
-%global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
+%global __provides_exclude_from ^%{python3_sitearch}/.*/lib.*\\.so$
 
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -95,8 +95,11 @@ Patch9:		%{name}-Fix-a-numpy-test-for-32-bit-archs.patch
 Patch10:	%{name}-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
 Patch11:	%{name}-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
 #		Backport fixes to python module
-Patch12:	root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
-Patch13:	root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
+Patch12:	%{name}-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
+Patch13:	%{name}-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
+#		Don't install the python modules twice
+#		https://github.com/root-project/root/pull/20753
+Patch14:	%{name}-PyROOT-Don-t-install-the-python-modules-twice.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1901,6 +1904,7 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P11 -p1
 %patch -P12 -p1
 %patch -P13 -p1
+%patch -P14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2145,6 +2149,8 @@ mv %{buildroot}%{_libdir}/%{name}/*-gdb.py \
 # Fix python extension suffix
 mv %{buildroot}%{python3_sitearch}/ROOT/libROOTPythonizations.so \
    %{buildroot}%{python3_sitearch}/ROOT/libROOTPythonizations%{python3_ext_suffix}
+mv %{buildroot}%{python3_sitearch}/cppyy/libcppyy.so \
+   %{buildroot}%{python3_sitearch}/cppyy/libcppyy%{python3_ext_suffix}
 
 # Move noarch python modules to sitelib
 if [ "%{python3_sitelib}" != "%{python3_sitearch}" ] ; then
@@ -3437,6 +3443,10 @@ fi
 %endif
 
 %changelog
+* Thu Dec 18 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-3
+- Don't install the python modules twice
+- Fix Requires and Provides in the python3-root rpm
+
 * Thu Dec 11 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-2
 - Skip RPATH using -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON (replaces
   previously used root specific -Drpath:BOOL=OFF no longer available)

From 732511f3a61f117f94d369c4893f661834c30619 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 20 Dec 2025 12:41:20 +0100
Subject: [PATCH 323/344] Exclude tests for Fedora 43+ on s390x that fail due
 to hardware   acceleration in the zlib-ng library.

---
 root.spec | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 14bfa6e..5271fad 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2563,6 +2563,19 @@ test-stresshistofit\$\$|\
 test-stresshistofit-interpreted|\
 test-stresshistogram\$\$|\
 test-stresshistogram-interpreted"
+
+# The zlib-ng library is compiled with hardware acceleration support on s390x
+# in Fedora 43 and later.
+# This means that some tests that compare the size of compressed data fail.
+# - test-stress
+# - gtest-tree-readspeed-readspeed-general
+# - gtest-tree-tree-testTBranch
+%if %{?fedora}%{!?fedora:0} >= 43
+excluded="${excluded}|\
+test-stress\$\$|\
+gtest-tree-readspeed-readspeed-general|\
+gtest-tree-tree-testTBranch"
+%endif
 %endif
 
 # Fails with gcc 14 on aarch64, ppc64le and s390x (on EPEL 10 also x86_64)
@@ -3443,6 +3456,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-4
+- Exclude tests for Fedora 43+ on s390x that fail due to hardware
+  acceleration in the zlib-ng library.
+
 * Thu Dec 18 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-3
 - Don't install the python modules twice
 - Fix Requires and Provides in the python3-root rpm

From 27b349be2a41e7e56de88f7b894c2bddca19589f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 25 Dec 2025 17:38:55 +0100
Subject: [PATCH 324/344] Fix test for stricter syntax in numpy 2.4.0
 (backport)

---
 ...1-Pythonization-test-for-NumPy-2.4.0.patch | 82 +++++++++++++++++++
 root.spec                                     |  9 +-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch

diff --git a/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch b/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
new file mode 100644
index 0000000..2bc2576
--- /dev/null
+++ b/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
@@ -0,0 +1,82 @@
+From d5135f7869406396b3ba8e944c71dbdd67d3ea01 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Tue, 23 Dec 2025 19:04:45 +0100
+Subject: [PATCH] [Python] Fix TF1 Pythonization test for NumPy 2.4.0
+
+The new NumPy 2.4.0 is more strict when implicitly converting 1-element
+arrays to scalars. It doesn't do that anymore, causing the TF1
+Pythonization tests to fail (see log below).
+
+This actually pointed to a real mistake in setting up the test, where a
+2D array was used to define the TFormula parameters while it should be a
+1D array.
+
+```txt
+ 962/3718 Test   #93: pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-tf-pycallables ..............................***Failed    3.05 sec
+test_callable (tf_pycallables.TF1.test_callable)
+Test function provided as callable ... ok
+test_evalpar (tf_pycallables.TF1.test_evalpar)
+Test the 2D Numpy array pythonizations for TF1::EvalPar ... ERROR
+test_evalpar_dynamic (tf_pycallables.TF1.test_evalpar_dynamic)
+Test the 2D NumPy pythonizations with dynamic TF1 data dimensions ... ok
+test_fitgauss (tf_pycallables.TF1.test_fitgauss)
+Test fitting a histogram to a Python function ... ok
+test_identity (tf_pycallables.TF1.test_identity)
+Test simple function without parameters ... ok
+test_params (tf_pycallables.TF1.test_params)
+Test function with parameters ... ok
+test_params (tf_pycallables.TF2.test_params)
+Test function with parameters ... ok
+test_params (tf_pycallables.TF3.test_params)
+Test function with parameters ... ok
+
+======================================================================
+ERROR: test_evalpar (tf_pycallables.TF1.test_evalpar)
+Test the 2D Numpy array pythonizations for TF1::EvalPar
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/github/home/ROOT-CI/src/bindings/pyroot/pythonizations/test/tf_pycallables.py", line 129, in test_evalpar
+    expected_value = pyf_tf1_coulomb(x[i, ::2], params)
+  File "/github/home/ROOT-CI/src/bindings/pyroot/pythonizations/test/tf_pycallables.py", line 33, in pyf_tf1_coulomb
+    return p[1] * x[0] * x[1] / (p[0]**2) * math.exp(-p[2] / p[0])
+                                            ~~~~~~~~^^^^^^^^^^^^^^
+TypeError: only 0-dimensional arrays can be converted to Python scalars
+
+----------------------------------------------------------------------
+Ran 8 tests in 1.469s
+
+FAILED (errors=1)
+CMake Error at /github/home/ROOT-CI/src/cmake/modules/RootTestDriver.cmake:232 (message):
+  error code: 1
+
+```
+---
+ .../pyroot/pythonizations/test/tf_pycallables.py     | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/tf_pycallables.py b/bindings/pyroot/pythonizations/test/tf_pycallables.py
+index 2a7d6b72462..5a223030ec9 100644
+--- a/bindings/pyroot/pythonizations/test/tf_pycallables.py
++++ b/bindings/pyroot/pythonizations/test/tf_pycallables.py
+@@ -116,11 +116,13 @@ class TF1(unittest.TestCase):
+             [3.0, 10, 4.0]
+         ])
+ 
+-        params = np.array([
+-            [1.0],       # Distance between charges r
+-            [8.99e9],    # Coulomb constant k (in N·m²/C²)
+-            [0.1]        # Additional factor for modulation
+-        ])
++        params = np.array(
++            [
++                1.0,  # Distance between charges r
++                8.99e9,  # Coulomb constant k (in N·m²/C²)
++                0.1,  # Additional factor for modulation
++            ]
++        )
+ 
+         # Slice to avoid the dummy column of 10's
+         res = rtf1_coulomb.EvalPar(x[:, ::2], params)
+-- 
+2.52.0
+
diff --git a/root.spec b/root.spec
index 5271fad..def5fea 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -100,6 +100,9 @@ Patch13:	%{name}-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
 #		Don't install the python modules twice
 #		https://github.com/root-project/root/pull/20753
 Patch14:	%{name}-PyROOT-Don-t-install-the-python-modules-twice.patch
+#		Fix test for stricter syntax in numpy 2.4.0 (backport)
+#		https://github.com/root-project/root/pull/20775
+Patch15:	%{name}-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1905,6 +1908,7 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P12 -p1
 %patch -P13 -p1
 %patch -P14 -p1
+%patch -P15 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -3456,6 +3460,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 25 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-5
+- Fix test for stricter syntax in numpy 2.4.0 (backport)
+
 * Fri Dec 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-4
 - Exclude tests for Fedora 43+ on s390x that fail due to hardware
   acceleration in the zlib-ng library.

From e8626580cf8e9350b3987c302cf19a1ab740f5e0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 12 Jan 2026 00:03:45 +0100
Subject: [PATCH 325/344] Fixes for gcc 16

---
 ...-Use-TRandom3-in-test-RooFuncWrapper.patch | 50 +++++++++++++++++++
 root-fontconfig.patch                         | 21 +++++---
 root-gcc-16-libstdc-links-to-libatomic.patch  | 32 ++++++++++++
 root.spec                                     | 21 +++++++-
 4 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
 create mode 100644 root-gcc-16-libstdc-links-to-libatomic.patch

diff --git a/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch b/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
new file mode 100644
index 0000000..34bdebc
--- /dev/null
+++ b/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
@@ -0,0 +1,50 @@
+From e1f42658629ad67ce7cb224a1379d133f61f2e35 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Sun, 11 Jan 2026 10:25:51 +0100
+Subject: [PATCH] [RF] Use TRandom3 in test RooFuncWrapper
+
+Use TRandom3 instead of the `<random>` to get compiler-independent,
+reproducible behavior.
+---
+ roofit/roofitcore/test/testRooFuncWrapper.cxx | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/roofit/roofitcore/test/testRooFuncWrapper.cxx b/roofit/roofitcore/test/testRooFuncWrapper.cxx
+index 2ebdf95333f..189e8f2e266 100644
+--- a/roofit/roofitcore/test/testRooFuncWrapper.cxx
++++ b/roofit/roofitcore/test/testRooFuncWrapper.cxx
+@@ -34,12 +34,12 @@
+ #include <RooWorkspace.h>
+ 
+ #include <ROOT/StringUtils.hxx>
++#include <TMath.h>
+ #include <TROOT.h>
++#include <TRandom3.h>
+ #include <TSystem.h>
+-#include <TMath.h>
+ 
+ #include <functional>
+-#include <random>
+ 
+ #include "gtest_wrapper.h"
+ 
+@@ -66,13 +66,13 @@ double getNumDerivative(const RooAbsReal &pdf, RooRealVar &var, const RooArgSet
+ 
+ void randomizeParameters(const RooArgSet &parameters)
+ {
++   TRandom3 rng(1337);
++
+    double lowerBound = -0.1;
+    double upperBound = 0.1;
+-   std::uniform_real_distribution<double> unif(lowerBound, upperBound);
+-   std::default_random_engine re;
+ 
+    for (auto *param : parameters) {
+-      double mul = unif(re);
++      double mul = rng.Uniform(lowerBound, upperBound);
+ 
+       auto par = dynamic_cast<RooAbsRealLValue *>(param);
+       if (!par)
+-- 
+2.52.0
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index b2c4e99..4e5e607 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,4 +1,4 @@
-From b5735870eb7e65a8c840643540a0676ab40697e0 Mon Sep 17 00:00:00 2001
+From 4d450f306a8ab8220f43675c70f399d89e5a4a03 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Sat, 11 May 2024 20:09:47 +0200
 Subject: [PATCH] Use system fonts via fontconfig
@@ -9,13 +9,13 @@ Subject: [PATCH] Use system fonts via fontconfig
  graf2d/asimage/src/TASImage.cxx       |  91 +++++++-
  graf2d/graf/CMakeLists.txt            |   1 +
  graf2d/graf/inc/TTF.h                 |   3 +-
- graf2d/graf/src/TTF.cxx               | 291 +++++++++++++++++---------
+ graf2d/graf/src/TTF.cxx               | 295 +++++++++++++++++---------
  graf2d/postscript/CMakeLists.txt      |   1 +
- graf2d/postscript/src/TPostScript.cxx | 106 +++++-----
+ graf2d/postscript/src/TPostScript.cxx | 106 ++++-----
  graf3d/gl/CMakeLists.txt              |   1 +
  graf3d/gl/src/TGLFontManager.cxx      | 123 ++++++++++-
  graf3d/gl/src/TGLText.cxx             |  56 +++--
- 11 files changed, 493 insertions(+), 192 deletions(-)
+ 11 files changed, 495 insertions(+), 194 deletions(-)
 
 diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
 index f0d2124a8f6..41ad4c73020 100644
@@ -207,7 +207,7 @@ index 864ce06b4f0..050796d1ded 100644
     static TTF::TTGlyph   fgGlyphs[kMaxGlyphs];    ///< glyphs
     static Bool_t         fgHinting;               ///< use hinting (true by default)
 diff --git a/graf2d/graf/src/TTF.cxx b/graf2d/graf/src/TTF.cxx
-index 758bb98c192..7b1b06cd0ed 100644
+index 758bb98c192..c90d0ac70a9 100644
 --- a/graf2d/graf/src/TTF.cxx
 +++ b/graf2d/graf/src/TTF.cxx
 @@ -25,6 +25,8 @@ Interface to the freetype 2 library.
@@ -453,9 +453,12 @@ index 758bb98c192..7b1b06cd0ed 100644
        Error("TTF::SetTextFont", "error loading font %s", ttfont);
        delete [] ttfont;
        if (tface) FT_Done_Face(tface);
-@@ -453,19 +573,20 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
-    delete [] ttfont;
+@@ -450,24 +570,25 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
+       }
+    }
  
+-   delete [] ttfont;
+-
     fgFontName[fgFontCount] = StrDup(basename);
 +   fgFontIdx[fgFontCount]  = ttindex;
 +   fgFontIta[fgFontCount]  = italic;
@@ -476,7 +479,11 @@ index 758bb98c192..7b1b06cd0ed 100644
 +      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, nullptr );
     }
  
++   delete [] ttfont;
++
     return 0;
+ }
+ 
 @@ -494,70 +615,50 @@ Int_t TTF::SetTextFont(const char *fontname, Int_t italic)
  
  void TTF::SetTextFont(Font_t fontnumber)
diff --git a/root-gcc-16-libstdc-links-to-libatomic.patch b/root-gcc-16-libstdc-links-to-libatomic.patch
new file mode 100644
index 0000000..776fff3
--- /dev/null
+++ b/root-gcc-16-libstdc-links-to-libatomic.patch
@@ -0,0 +1,32 @@
+From 7b1632f5602a1bb6e6278d66c25640349c852ab1 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 9 Jan 2026 00:32:27 +0100
+Subject: [PATCH] Starting with gcc 16, libstdc++ links to libatomic. Add to
+ whitelist.
+
+$ ldd /lib64/libstdc++.so.6
+	linux-vdso.so.1 (0x00007f3cb4c13000)
+	libm.so.6 => /lib64/libm.so.6 (0x00007f3cb4afc000)
+	libatomic.so.1 => /lib64/libatomic.so.1 (0x00007f3cb4af1000)
+	libc.so.6 => /lib64/libc.so.6 (0x00007f3cb460d000)
+	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f3cb4ac5000)
+	/lib64/ld-linux-x86-64.so.2 (0x00007f3cb4c15000)
+---
+ bindings/pyroot/pythonizations/test/import_load_libs.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
+index 63feeca89ba..18906ff921e 100644
+--- a/bindings/pyroot/pythonizations/test/import_load_libs.py
++++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
+@@ -77,6 +77,7 @@ class ImportLoadLibs(unittest.TestCase):
+         "ld.*",
+         "libffi",
+         "libgcc_s",
++        "libatomic",
+         # AddressSanitizer runtime and ROOT configuration
+         "libclang_rt.asan-.*",
+         "libROOTSanitizerConfig",
+-- 
+2.52.0
+
diff --git a/root.spec b/root.spec
index def5fea..4cd9565 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -103,6 +103,13 @@ Patch14:	%{name}-PyROOT-Don-t-install-the-python-modules-twice.patch
 #		Fix test for stricter syntax in numpy 2.4.0 (backport)
 #		https://github.com/root-project/root/pull/20775
 Patch15:	%{name}-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
+#		Starting with gcc 16, libstdc++ links to libatomic
+#		https://github.com/root-project/root/pull/20826
+Patch16:	%{name}-gcc-16-libstdc-links-to-libatomic.patch
+#		Test fails with gcc 16 (which uses c++20 as default)
+#		https://github.com/root-project/root/issues/20831
+#		https://github.com/root-project/root/pull/20841
+Patch17:	%{name}-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1909,6 +1916,8 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P13 -p1
 %patch -P14 -p1
 %patch -P15 -p1
+%patch -P16 -p1
+%patch -P17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2475,6 +2484,7 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob"
 # - gtest-tree-ntuple-ntuple-join-table
 # - gtest-tree-ntuple-ntuple-largefile2
 # - gtest-tree-ntuple-ntuple-merger
+# - gtest-tree-ntuple-ntuple-metrics
 # - gtest-tree-ntuple-ntuple-model
 # - gtest-tree-ntuple-ntuple-modelext
 # - gtest-tree-ntuple-ntuple-multi-column
@@ -2531,6 +2541,7 @@ gtest-tree-ntuple-ntuple-extended|\
 gtest-tree-ntuple-ntuple-join-table|\
 gtest-tree-ntuple-ntuple-largefile2|\
 gtest-tree-ntuple-ntuple-merger|\
+gtest-tree-ntuple-ntuple-metrics|\
 gtest-tree-ntuple-ntuple-model\$\$|\
 gtest-tree-ntuple-ntuple-modelext|\
 gtest-tree-ntuple-ntuple-multi-column|\
@@ -2598,6 +2609,9 @@ gtest-math-matrix-testMatrixTSparse"
 
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
+# TH3D.FillThreadSafe and RDFHelpers.Histo3DThreadSafe fail on ix86
+# due to alignment issues with std::atomic_ref
+# https://github.com/root-project/root/issues/20834
 # InterpreterTest.Evaluate fails on s390x
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
@@ -2607,6 +2621,8 @@ gtest-math-matrix-testMatrixTSparse"
 export GTEST_FILTER=-\
 %ifarch %{ix86}
 RNTuple.StdAtomic:\
+TH3D.FillThreadSafe:\
+RDFHelpers.Histo3DThreadSafe:\
 %endif
 %ifarch s390x
 InterpreterTest.Evaluate:\
@@ -3460,6 +3476,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 12 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-6
+- Fixes for gcc 16
+
 * Thu Dec 25 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-5
 - Fix test for stricter syntax in numpy 2.4.0 (backport)
 

From 3f365df48ef48959449f3b8cfee0667d05deb9cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 11:26:33 +0000
Subject: [PATCH 326/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 4cd9565..beb0004 100644
--- a/root.spec
+++ b/root.spec
@@ -39,7 +39,7 @@
 Name:		root
 Version:	6.38.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3476,6 +3476,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.38.00-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Mon Jan 12 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.00-6
 - Fixes for gcc 16
 

From 7ecd76a31df8d9395464a256ff8e3b2ed269a301 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 15 Mar 2026 18:58:09 +0100
Subject: [PATCH 327/344] Update to 6.38.04

Rebuild for pythia8 8.3.17
Dropped patches: 11
New patches: 1
---
 root-Adjust-test-stressGraphics.ref.patch     |  49 -----
 ...ython-version-file-to-wrong-location.patch |  29 +++
 root-Fix-a-numpy-test-for-32-bit-archs.patch  |  32 ----
 ...Geom-Add-missing-includes-of-TMath.h.patch |  63 -------
 ...n-t-install-the-python-modules-twice.patch |  70 --------
 ...1-Pythonization-test-for-NumPy-2.4.0.patch |  82 ---------
 ...-Use-TRandom3-in-test-RooFuncWrapper.patch |  50 ------
 ...tdated-IsSmall-helper-function-in-te.patch |  34 ----
 ...e-related-to-finding-CPyCppyy-API-he.patch | 109 ------------
 ...now-irrelevant-load_cpp_backend-call.patch |  46 -----
 root-gcc-16-libstdc-links-to-libatomic.patch  |  32 ----
 ...size-of-long-RVec-instances-in-RVec-.patch | 135 --------------
 root.spec                                     | 168 ++++++++----------
 sources                                       |   2 +-
 14 files changed, 100 insertions(+), 801 deletions(-)
 delete mode 100644 root-Adjust-test-stressGraphics.ref.patch
 create mode 100644 root-Avoid-additional-python-version-file-to-wrong-location.patch
 delete mode 100644 root-Fix-a-numpy-test-for-32-bit-archs.patch
 delete mode 100644 root-Geom-Add-missing-includes-of-TMath.h.patch
 delete mode 100644 root-PyROOT-Don-t-install-the-python-modules-twice.patch
 delete mode 100644 root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
 delete mode 100644 root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
 delete mode 100644 root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
 delete mode 100644 root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
 delete mode 100644 root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
 delete mode 100644 root-gcc-16-libstdc-links-to-libatomic.patch
 delete mode 100644 root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch

diff --git a/root-Adjust-test-stressGraphics.ref.patch b/root-Adjust-test-stressGraphics.ref.patch
deleted file mode 100644
index b4c5871..0000000
--- a/root-Adjust-test-stressGraphics.ref.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f7bfa429deb9dbae9058998888bbcaa84af0ca08 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 2 Dec 2025 05:33:31 +0100
-Subject: [PATCH] Adjust test/stressGraphics.ref
-
----
- test/stressGraphics.ref | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 2498ec6d755..4520a5ab113 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -10,11 +10,11 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-     9      9253       100     14377       150     19851      2400     12199       900      9283       100
-    10      8863        70     13645       100     24343      1100     23278      1700      8894        70
-    11     12971       100     14750        50     34063      2000     32033      1200     13070       150
--   12      7674       100     13533        50     83557      3000     38505      4000      7720       150
--   13      5600       400     13242       300     16881       400     15063       800      5638       400
-+   12      7674       100     13533       100     83557      3000     38505      4000      7720       150
-+   13      5600       400     13242       400     16881       400     15063       800      5638       400
-    14  14190539   4000000     12926       100     23076      9500     25987      3000  14190704   4000000
-    15     15690      5000     17179       200     23076      9500     14232      1500     10437      5000
--   16     28072       400     23520       200     44462     11000     30062      5000     38007       400
-+   16     28072       400     23520       250     44462     11000     30062      5000     38007       400
-    17     20444       400     21520       150     27511     11000     16867       600     20721       400
-    18     15894       100     19305       200     27187     10300     15925       350     15925       100
-    19     22521       300     42926       250     43868     17000     19232     11000     22729       300
-@@ -44,7 +44,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-    43    207729       750     87126       750     76094     38000     54717     11000    210497       800
-    44    401670      6500    156361      2000     62719     34100     45592     14000    410114      6500
-    45    566142      5000    225206      2000     65828     31800     53934      6500    573396      5000
--   46   3738751     35000   1292739     12000     60580      9900    133547      3500   3783013     35000
-+   46   3738751     35000   1292739     13000     60580      9900    133547      3500   3783013     35000
-    47   1466028      9000    853193     50000     38425     13500     91242     18100   1463263      7500
-    48     38312       200     56877       750     36524     11800    119641      8000     38121       200
-    49     19556      1000     31967      1000     36859     10000     37602      8000     19900      3000
-@@ -53,7 +53,7 @@ Test#   PS1Ref#   PS1Err#   PDFRef#   PDFErr#   JPGRef#   JPGErr#   PNGRef#   PN
-    52    270825     10000    115500      1000     45496     11000     34685      5000    272950     10000
-    53     15025      3000     29289       500     42525     11300     33336      3900     14787      4000
-    54    254604      5000    383258      7000     55666     30400     46534      6500    259594      7000
--   55      4846       150     14075       150     33239       600     25303       500      4877       150
-+   55      4846       150     14075       200     33239       600     25303       500      4877       150
-    56   1435879    150000     12837       100     25830       100    365000     15000   1085792    250000
-    57      5884       500     16577       200     40706     14000     30026      4000      5884       500
-    58      5723       700     15720       200     32236     11000     16916      3200      5670       800
--- 
-2.52.0
-
diff --git a/root-Avoid-additional-python-version-file-to-wrong-location.patch b/root-Avoid-additional-python-version-file-to-wrong-location.patch
new file mode 100644
index 0000000..cbbab31
--- /dev/null
+++ b/root-Avoid-additional-python-version-file-to-wrong-location.patch
@@ -0,0 +1,29 @@
+From 3f1a626fbe09504c05c5ecec47beb6aa6498d87f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Fri, 13 Mar 2026 08:58:40 +0100
+Subject: [PATCH] Avoid additional python version file to wrong location
+
+(cherry picked from commit 3db196516a2073b3f20e9b82019818a6bef23b01)
+---
+ bindings/pyroot/pythonizations/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
+index 40207644a41..68b632c2ae0 100644
+--- a/bindings/pyroot/pythonizations/CMakeLists.txt
++++ b/bindings/pyroot/pythonizations/CMakeLists.txt
+@@ -157,9 +157,10 @@ endforeach()
+ 
+ # The Python version at build time should be easy to figure out from Python, so
+ # we can raise an exception if the used Python version is not compatible.
++# The file will be implicitly installed by install(DIRECTORY ...) in the
++# ROOT_PYTHON_PACKAGE function.
+ set(python_version_file "${localruntimedir}/ROOT/_python_version.py")
+ file(WRITE "${python_version_file}" "_root_python_version = \"${Python3_VERSION}\"\n")
+-install(FILES "${python_version_file}" DESTINATION "${CMAKE_INSTALL_PYTHONDIR}")
+ 
+ # A custom target that depends on the Python sources being present in the build
+ # directory. This will be used as a dependency of the pythonization libraries,
+-- 
+2.53.0
+
diff --git a/root-Fix-a-numpy-test-for-32-bit-archs.patch b/root-Fix-a-numpy-test-for-32-bit-archs.patch
deleted file mode 100644
index 5e095f3..0000000
--- a/root-Fix-a-numpy-test-for-32-bit-archs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 40f8cd0adeb7257778c789e1ae639f260780402b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sun, 7 Dec 2025 19:30:55 +0100
-Subject: [PATCH] Fix a numpy test for 32 bit archs
-
-The default dtype used in numpy array is "int". This type has
-different sizes on 32 and 64 bit architectures. The test tries to use
-the numpy array as a Long64_t dataframe. On 32 bit architectures this
-results in an error.
-
-This commit explicitly changes the numpy array's dtype to "int64" to
-match the Long64_t dataframe type on all architectyres.
----
- bindings/pyroot/pythonizations/test/rdataframe_misc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/rdataframe_misc.py b/bindings/pyroot/pythonizations/test/rdataframe_misc.py
-index 1a1efd21b3e..150828613b3 100644
---- a/bindings/pyroot/pythonizations/test/rdataframe_misc.py
-+++ b/bindings/pyroot/pythonizations/test/rdataframe_misc.py
-@@ -132,7 +132,7 @@ class RDataFrameMisc(unittest.TestCase):
-             return
-         out_path = "dataframe_misc_regression_gh20291.root"
-         try:
--            x, y = numpy.array([1, 2, 3]), numpy.array([4, 5, 6])
-+            x, y = numpy.array([1, 2, 3], dtype='int64'), numpy.array([4, 5, 6], dtype='int64')
-             df = ROOT.RDF.FromNumpy({"x": x, "y": y})
- 
-             df.Snapshot("tree", out_path)
--- 
-2.52.0
-
diff --git a/root-Geom-Add-missing-includes-of-TMath.h.patch b/root-Geom-Add-missing-includes-of-TMath.h.patch
deleted file mode 100644
index 966d8da..0000000
--- a/root-Geom-Add-missing-includes-of-TMath.h.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0e1e1f0ba1908ae1020337ed7ec0565bf979b92c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 2 Dec 2025 04:57:30 +0100
-Subject: [PATCH] [Geom] Add missing includes of TMath.h
-
----
- geom/geombuilder/src/TGeoParaEditor.cxx | 1 +
- geom/geombuilder/src/TGeoPconEditor.cxx | 1 +
- geom/geombuilder/src/TGeoPgonEditor.cxx | 1 +
- geom/geombuilder/src/TGeoTrapEditor.cxx | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/geom/geombuilder/src/TGeoParaEditor.cxx b/geom/geombuilder/src/TGeoParaEditor.cxx
-index fdc344ba4d2..bd173607d2c 100644
---- a/geom/geombuilder/src/TGeoParaEditor.cxx
-+++ b/geom/geombuilder/src/TGeoParaEditor.cxx
-@@ -27,6 +27,7 @@ Editor for a TGeoPara.
- #include "TVirtualGeoPainter.h"
- #include "TVirtualPad.h"
- #include "TView.h"
-+#include "TMath.h"
- #include "TGButton.h"
- #include "TGTextEntry.h"
- #include "TGNumberEntry.h"
-diff --git a/geom/geombuilder/src/TGeoPconEditor.cxx b/geom/geombuilder/src/TGeoPconEditor.cxx
-index a66359853be..50598d2cb90 100644
---- a/geom/geombuilder/src/TGeoPconEditor.cxx
-+++ b/geom/geombuilder/src/TGeoPconEditor.cxx
-@@ -27,6 +27,7 @@ Editor for a TGeoPcon.
- #include "TVirtualGeoPainter.h"
- #include "TVirtualPad.h"
- #include "TView.h"
-+#include "TMath.h"
- #include "TGCanvas.h"
- #include "TGButton.h"
- #include "TGTextEntry.h"
-diff --git a/geom/geombuilder/src/TGeoPgonEditor.cxx b/geom/geombuilder/src/TGeoPgonEditor.cxx
-index 949d0045a66..33638d66b2b 100644
---- a/geom/geombuilder/src/TGeoPgonEditor.cxx
-+++ b/geom/geombuilder/src/TGeoPgonEditor.cxx
-@@ -27,6 +27,7 @@ Editor for a TGeoPgon.
- #include "TVirtualGeoPainter.h"
- #include "TVirtualPad.h"
- #include "TView.h"
-+#include "TMath.h"
- #include "TGTextEntry.h"
- #include "TGNumberEntry.h"
- #include "TGLabel.h"
-diff --git a/geom/geombuilder/src/TGeoTrapEditor.cxx b/geom/geombuilder/src/TGeoTrapEditor.cxx
-index d9c2916d075..459e0191117 100644
---- a/geom/geombuilder/src/TGeoTrapEditor.cxx
-+++ b/geom/geombuilder/src/TGeoTrapEditor.cxx
-@@ -27,6 +27,7 @@ Editor for a TGeoTrap.
- #include "TVirtualGeoPainter.h"
- #include "TVirtualPad.h"
- #include "TView.h"
-+#include "TMath.h"
- #include "TGButton.h"
- #include "TGTextEntry.h"
- #include "TGNumberEntry.h"
--- 
-2.52.0
-
diff --git a/root-PyROOT-Don-t-install-the-python-modules-twice.patch b/root-PyROOT-Don-t-install-the-python-modules-twice.patch
deleted file mode 100644
index 608765d..0000000
--- a/root-PyROOT-Don-t-install-the-python-modules-twice.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f09b4ce027b31dcd19ea8a398c35c5dfbcc0507f Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 18 Dec 2025 11:49:12 +0100
-Subject: [PATCH] [PyROOT] Don't install the python modules twice
-
-The binary python modules were moved one directory level down into the
-ROOT and cppyy directories, so that they reside alongside the python
-files in the same directories. The install rule for the python files
-must therefore be extended to exclude the binary modules (PATTERN *.so
-EXCLUDE) so that these are not installed a second time overwriting the
-files installed by the install rule for the binary modules with another
-copy with the wrong file permissions.
-
-Also use the no-version option for the cppyy binary module as is
-already done for the pythonization binary module, since it is now
-installed in the python directory. Before it was installed in the
-library directory with an unversioned symlink in the python directory.
----
- bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 2 +-
- bindings/pyroot/cppyy/cppyy/CMakeLists.txt    | 5 +++--
- bindings/pyroot/pythonizations/CMakeLists.txt | 3 ++-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-index bb48c032974..065a89348ff 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-+++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-@@ -73,7 +73,7 @@ endif()
- add_library(cppyy SHARED src/CPyCppyyPyModule.cxx)
- 
- # Set the suffix to '.so' and the prefix to 'lib'
--set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES}
-+set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES_NO_VERSION}
-   LIBRARY_OUTPUT_DIRECTORY ${localruntimedir}/cppyy)
- if(MSVC)
-   target_link_libraries(cppyy PRIVATE CPyCppyy)
-diff --git a/bindings/pyroot/cppyy/cppyy/CMakeLists.txt b/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
-index 3a29b4525f7..842ad12df97 100644
---- a/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
-+++ b/bindings/pyroot/cppyy/cppyy/CMakeLists.txt
-@@ -31,8 +31,9 @@ endforeach()
- # Install Python sources and bytecode
- install(DIRECTORY ${localruntimedir}/cppyy
-         DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
--        COMPONENT libraries)
-+        COMPONENT libraries
-+        PATTERN *.so EXCLUDE)
- 
- if(NOT MSVC)
-   ROOT_ADD_TEST_SUBDIRECTORY(test)
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
-index 1230f18ca47..b415ba13697 100644
---- a/bindings/pyroot/pythonizations/CMakeLists.txt
-+++ b/bindings/pyroot/pythonizations/CMakeLists.txt
-@@ -239,7 +239,8 @@ install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
- # Install Python sources and bytecode
- install(DIRECTORY ${localruntimedir}/ROOT
-         DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
--        COMPONENT libraries)
-+        COMPONENT libraries
-+        PATTERN *.so EXCLUDE)
- 
- # Install headers required by pythonizations
- install(FILES ${PYROOT_EXTRA_HEADERS}
--- 
-2.52.0
-
diff --git a/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch b/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
deleted file mode 100644
index 2bc2576..0000000
--- a/root-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From d5135f7869406396b3ba8e944c71dbdd67d3ea01 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Tue, 23 Dec 2025 19:04:45 +0100
-Subject: [PATCH] [Python] Fix TF1 Pythonization test for NumPy 2.4.0
-
-The new NumPy 2.4.0 is more strict when implicitly converting 1-element
-arrays to scalars. It doesn't do that anymore, causing the TF1
-Pythonization tests to fail (see log below).
-
-This actually pointed to a real mistake in setting up the test, where a
-2D array was used to define the TFormula parameters while it should be a
-1D array.
-
-```txt
- 962/3718 Test   #93: pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-tf-pycallables ..............................***Failed    3.05 sec
-test_callable (tf_pycallables.TF1.test_callable)
-Test function provided as callable ... ok
-test_evalpar (tf_pycallables.TF1.test_evalpar)
-Test the 2D Numpy array pythonizations for TF1::EvalPar ... ERROR
-test_evalpar_dynamic (tf_pycallables.TF1.test_evalpar_dynamic)
-Test the 2D NumPy pythonizations with dynamic TF1 data dimensions ... ok
-test_fitgauss (tf_pycallables.TF1.test_fitgauss)
-Test fitting a histogram to a Python function ... ok
-test_identity (tf_pycallables.TF1.test_identity)
-Test simple function without parameters ... ok
-test_params (tf_pycallables.TF1.test_params)
-Test function with parameters ... ok
-test_params (tf_pycallables.TF2.test_params)
-Test function with parameters ... ok
-test_params (tf_pycallables.TF3.test_params)
-Test function with parameters ... ok
-
-======================================================================
-ERROR: test_evalpar (tf_pycallables.TF1.test_evalpar)
-Test the 2D Numpy array pythonizations for TF1::EvalPar
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/github/home/ROOT-CI/src/bindings/pyroot/pythonizations/test/tf_pycallables.py", line 129, in test_evalpar
-    expected_value = pyf_tf1_coulomb(x[i, ::2], params)
-  File "/github/home/ROOT-CI/src/bindings/pyroot/pythonizations/test/tf_pycallables.py", line 33, in pyf_tf1_coulomb
-    return p[1] * x[0] * x[1] / (p[0]**2) * math.exp(-p[2] / p[0])
-                                            ~~~~~~~~^^^^^^^^^^^^^^
-TypeError: only 0-dimensional arrays can be converted to Python scalars
-
-----------------------------------------------------------------------
-Ran 8 tests in 1.469s
-
-FAILED (errors=1)
-CMake Error at /github/home/ROOT-CI/src/cmake/modules/RootTestDriver.cmake:232 (message):
-  error code: 1
-
-```
----
- .../pyroot/pythonizations/test/tf_pycallables.py     | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/tf_pycallables.py b/bindings/pyroot/pythonizations/test/tf_pycallables.py
-index 2a7d6b72462..5a223030ec9 100644
---- a/bindings/pyroot/pythonizations/test/tf_pycallables.py
-+++ b/bindings/pyroot/pythonizations/test/tf_pycallables.py
-@@ -116,11 +116,13 @@ class TF1(unittest.TestCase):
-             [3.0, 10, 4.0]
-         ])
- 
--        params = np.array([
--            [1.0],       # Distance between charges r
--            [8.99e9],    # Coulomb constant k (in N·m²/C²)
--            [0.1]        # Additional factor for modulation
--        ])
-+        params = np.array(
-+            [
-+                1.0,  # Distance between charges r
-+                8.99e9,  # Coulomb constant k (in N·m²/C²)
-+                0.1,  # Additional factor for modulation
-+            ]
-+        )
- 
-         # Slice to avoid the dummy column of 10's
-         res = rtf1_coulomb.EvalPar(x[:, ::2], params)
--- 
-2.52.0
-
diff --git a/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch b/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
deleted file mode 100644
index 34bdebc..0000000
--- a/root-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e1f42658629ad67ce7cb224a1379d133f61f2e35 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Sun, 11 Jan 2026 10:25:51 +0100
-Subject: [PATCH] [RF] Use TRandom3 in test RooFuncWrapper
-
-Use TRandom3 instead of the `<random>` to get compiler-independent,
-reproducible behavior.
----
- roofit/roofitcore/test/testRooFuncWrapper.cxx | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/roofit/roofitcore/test/testRooFuncWrapper.cxx b/roofit/roofitcore/test/testRooFuncWrapper.cxx
-index 2ebdf95333f..189e8f2e266 100644
---- a/roofit/roofitcore/test/testRooFuncWrapper.cxx
-+++ b/roofit/roofitcore/test/testRooFuncWrapper.cxx
-@@ -34,12 +34,12 @@
- #include <RooWorkspace.h>
- 
- #include <ROOT/StringUtils.hxx>
-+#include <TMath.h>
- #include <TROOT.h>
-+#include <TRandom3.h>
- #include <TSystem.h>
--#include <TMath.h>
- 
- #include <functional>
--#include <random>
- 
- #include "gtest_wrapper.h"
- 
-@@ -66,13 +66,13 @@ double getNumDerivative(const RooAbsReal &pdf, RooRealVar &var, const RooArgSet
- 
- void randomizeParameters(const RooArgSet &parameters)
- {
-+   TRandom3 rng(1337);
-+
-    double lowerBound = -0.1;
-    double upperBound = 0.1;
--   std::uniform_real_distribution<double> unif(lowerBound, upperBound);
--   std::default_random_engine re;
- 
-    for (auto *param : parameters) {
--      double mul = unif(re);
-+      double mul = rng.Uniform(lowerBound, upperBound);
- 
-       auto par = dynamic_cast<RooAbsRealLValue *>(param);
-       if (!par)
--- 
-2.52.0
-
diff --git a/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch b/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
deleted file mode 100644
index 58ba414..0000000
--- a/root-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fd18e83ae79760f7e8cca6f28b6d0f89d912b152 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Wed, 26 Nov 2025 12:40:03 +0100
-Subject: [PATCH] [VecOps] Remove outdated `IsSmall` helper function in tests
-
-The commit 2605710bea7b1 changed from using the `ROOT::Detail::VecOps::`
-namespace explicitly for `IsSmall` to a `using` statement. However,
-there was also a remnant `IsSmall` function with an outdated
-implementation in the test file itself, which we can now remove.
----
- math/vecops/test/vecops_rvec.cxx | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
-index 034f06ca211..432c673a553 100644
---- a/math/vecops/test/vecops_rvec.cxx
-+++ b/math/vecops/test/vecops_rvec.cxx
-@@ -1493,13 +1493,6 @@ TEST(VecOps, Construct)
-    EXPECT_TRUE(fourVects[2] == ref2);
- }
- 
--bool IsSmall(const RVec<int> &v)
--{
--   // the first array element is right after the 3 data members of SmallVectorBase
--   return reinterpret_cast<std::uintptr_t>(v.begin()) - reinterpret_cast<std::uintptr_t>(&v) ==
--          sizeof(void *) + 2 * sizeof(int);
--}
--
- // this is a regression test for https://github.com/root-project/root/issues/6796
- TEST(VecOps, MemoryAdoptionAndClear)
- {
--- 
-2.52.0
-
diff --git a/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch b/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
deleted file mode 100644
index 882247f..0000000
--- a/root-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 251de0f8b237ce041df4960f831fe4a1fade6d92 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Sat, 6 Dec 2025 17:39:40 +0100
-Subject: [PATCH] [cppyy] Remove code related to finding CPyCppyy API header
- path
-
-This is not needed for ROOT, because the CPyCppyy API headers are
-installed with the other ROOT headers anyway, and ROOT knows where to
-find them already.
----
- .../cppyy/cppyy/python/cppyy/__init__.py      | 82 -------------------
- 1 file changed, 82 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py b/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
-index 68e3c49e5fe..c8dd458bfdd 100644
---- a/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
-+++ b/bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py
-@@ -297,88 +297,6 @@ elif ispypy:
-     if os.path.exists(apipath) and os.path.exists(os.path.join(apipath, 'Python.h')):
-         add_include_path(apipath)
- 
--# add access to extra headers for dispatcher (CPyCppyy only (?))
--if not ispypy:
--    try:
--        apipath_extra = os.environ['CPPYY_API_PATH']
--        if os.path.basename(apipath_extra) == 'CPyCppyy':
--            apipath_extra = os.path.dirname(apipath_extra)
--    except KeyError:
--        apipath_extra = None
--
--    if apipath_extra is None:
--        try:
--            if 0x30a0000 <= sys.hexversion:
--                import importlib.metadata as m
--
--                for p in m.files('CPyCppyy'):
--                    if p.match('API.h'):
--                        ape = p.locate()
--                        break
--                del p, m
--            else:
--                import pkg_resources as pr
--
--                d = pr.get_distribution('CPyCppyy')
--                for line in d.get_metadata_lines('RECORD'):
--                    if 'API.h' in line:
--                        ape = os.path.join(d.location, line[0:line.find(',')])
--                        break
--                del line, d, pr
--
--            if os.path.exists(ape):
--                apipath_extra = os.path.dirname(os.path.dirname(ape))
--            del ape
--        except Exception:
--            pass
--
--    if apipath_extra is None:
--        ldversion = sysconfig.get_config_var('LDVERSION')
--        if not ldversion:
--            ldversion = sys.version[:3]
--
--        apipath_extra = os.path.join(os.path.dirname(apipath), 'site', 'python'+ldversion)
--        if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
--            import glob
--            import platform
--
--            if platform.system() == "Windows":
--                # Install locations are handled differently on Windows
--                import libcppyy
--
--                ape = os.path.dirname(libcppyy.__file__)
--            else:
--                import cppyy.libcppyy as libcppyy
--
--                ape = os.path.dirname(libcppyy.__file__)
--            # a "normal" structure finds the include directory up to 3 levels up,
--            # ie. dropping lib/pythonx.y[md]/site-packages
--            for i in range(3):
--                if os.path.exists(os.path.join(ape, 'include')):
--                    break
--                ape = os.path.dirname(ape)
--
--            ape = os.path.join(ape, 'include')
--            if os.path.exists(os.path.join(ape, 'CPyCppyy')):
--                apipath_extra = ape
--            else:
--              # add back pythonx.y or site/pythonx.y if present
--                for p in glob.glob(os.path.join(ape, 'python'+sys.version[:3]+'*'))+\
--                         glob.glob(os.path.join(ape, '*', 'python'+sys.version[:3]+'*')):
--                    if os.path.exists(os.path.join(p, 'CPyCppyy')):
--                        apipath_extra = p
--                        break
--
--    if apipath_extra.lower() != 'none':
--        if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
--            warnings.warn("CPyCppyy API not found (tried: %s); "
--                          "set CPPYY_API_PATH envar to the 'CPyCppyy' API directory to fix"
--                          % apipath_extra)
--        else:
--            add_include_path(apipath_extra)
--
--    del apipath_extra
--
- if os.getenv('CONDA_PREFIX'):
-   # MacOS, Linux
-     include_path = os.path.join(os.getenv('CONDA_PREFIX'), 'include')
--- 
-2.52.0
-
diff --git a/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch b/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
deleted file mode 100644
index a79c861..0000000
--- a/root-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f4577e76a5dc23842d6be0a82df804f71fc820ef Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Mon, 1 Dec 2025 16:51:36 +0100
-Subject: [PATCH] [cppyy] Remove now irrelevant `load_cpp_backend()` call
-
-As we don't have a separate `cppyy_backend` anymore (neither as a Python
-package, nor as a shared library), trying to load the backend library
-will always give an exception that will be caught as an `ImportError`.
-
-It would be cleaner if this code branch is not even taken.
----
- .../cppyy/cppyy/python/cppyy/_cpython_cppyy.py       | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py b/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
-index bac078ea7c9..f98a34a697c 100644
---- a/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
-+++ b/bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py
-@@ -19,24 +19,12 @@ __all__ = [
-     '_end_capture_stderr'
-     ]
- 
--# First load the dependency libraries of the backend, then pull in the libcppyy
--# extension module. If the backed can't be loaded, it was probably linked
--# statically into the extension module, so we don't error out at this point.
--try:
--    from cppyy_backend import loader
--    c = loader.load_cpp_backend()
--except ImportError:
--    c = None
--
- if platform.system() == "Windows":
-     # On Windows, the library has to be searched without prefix
-     import libcppyy as _backend
- else:
-     import cppyy.libcppyy as _backend
- 
--if c is not None:
--    _backend._cpp_backend = c
--
- # explicitly expose APIs from libcppyy
- _w = ctypes.CDLL(_backend.__file__, ctypes.RTLD_GLOBAL)
- 
--- 
-2.52.0
-
diff --git a/root-gcc-16-libstdc-links-to-libatomic.patch b/root-gcc-16-libstdc-links-to-libatomic.patch
deleted file mode 100644
index 776fff3..0000000
--- a/root-gcc-16-libstdc-links-to-libatomic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b1632f5602a1bb6e6278d66c25640349c852ab1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 9 Jan 2026 00:32:27 +0100
-Subject: [PATCH] Starting with gcc 16, libstdc++ links to libatomic. Add to
- whitelist.
-
-$ ldd /lib64/libstdc++.so.6
-	linux-vdso.so.1 (0x00007f3cb4c13000)
-	libm.so.6 => /lib64/libm.so.6 (0x00007f3cb4afc000)
-	libatomic.so.1 => /lib64/libatomic.so.1 (0x00007f3cb4af1000)
-	libc.so.6 => /lib64/libc.so.6 (0x00007f3cb460d000)
-	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f3cb4ac5000)
-	/lib64/ld-linux-x86-64.so.2 (0x00007f3cb4c15000)
----
- bindings/pyroot/pythonizations/test/import_load_libs.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bindings/pyroot/pythonizations/test/import_load_libs.py b/bindings/pyroot/pythonizations/test/import_load_libs.py
-index 63feeca89ba..18906ff921e 100644
---- a/bindings/pyroot/pythonizations/test/import_load_libs.py
-+++ b/bindings/pyroot/pythonizations/test/import_load_libs.py
-@@ -77,6 +77,7 @@ class ImportLoadLibs(unittest.TestCase):
-         "ld.*",
-         "libffi",
-         "libgcc_s",
-+        "libatomic",
-         # AddressSanitizer runtime and ROOT configuration
-         "libclang_rt.asan-.*",
-         "libROOTSanitizerConfig",
--- 
-2.52.0
-
diff --git a/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch b/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
deleted file mode 100644
index 369ce3e..0000000
--- a/root-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 44c501ac9fdb9049783d9738a9603eec572f52f0 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser@cern.ch>
-Date: Wed, 26 Nov 2025 18:11:25 +0100
-Subject: [PATCH] [vecops] Adaptive size of long RVec instances in RVec test
-
-For the tests to make sense, some vectors need to be longer than the
-maximum small vector size. This maximum size is compiler and
-architecture dependent. For `RVec<int>` on ARM64 with gcc 14, the
-small vector capacity turns out to be 60, which is larger than the
-current test vector size of 18.
-
-Therefore, the test is refactored to adapt the large vector size
-automatically, according to the maximum small vector size.
----
- math/vecops/test/vecops_rvec.cxx | 81 +++++++++++++++++++++++++-------
- 1 file changed, 63 insertions(+), 18 deletions(-)
-
-diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
-index 432c673a553..8cbe36ee6d8 100644
---- a/math/vecops/test/vecops_rvec.cxx
-+++ b/math/vecops/test/vecops_rvec.cxx
-@@ -1672,15 +1672,35 @@ TEST_P(VecOpsSwap, BothSmallVectors)
- 
- TEST_P(VecOpsSwap, BothRegularVectors)
- {
--   RVec<int> fixed_vreg1{1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3};
--   RVec<int> fixed_vreg2{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
--   RVec<int> fixed_vreg3{7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7};
-+   constexpr std::size_t smallVecSize = ROOT::Internal::VecOps::RVecInlineStorageSize<int>::value;
-+
-+   // The number of elemens in the large RVecs will be the smallest multiple of
-+   // three that larger than smallVecSize.
-+   constexpr int nCycle = 3;
-+   constexpr std::size_t nElems = ((smallVecSize / nCycle) + 1) * nCycle;
-+
-+   RVec<int> fixed_vreg1(nElems);
-+   RVec<int> fixed_vreg2(nElems);
-+   RVec<int> fixed_vreg3(nElems + 1);
-    RVec<int> fixed_vmocksmall{0, 7};
- 
--   RVec<int> vreg1{1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3};
--   RVec<int> vreg2{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
--   RVec<int> vreg3{7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7};
--   RVec<int> vmocksmall{0, 7, 8, 9, 7, 8, 9, 7, 8, 9, 7, 8, 7, 8, 9, 7, 8, 9};
-+   RVec<int> vreg1(nElems);
-+   RVec<int> vreg2(nElems);
-+   RVec<int> vreg3(nElems + 1);
-+   RVec<int> vmocksmall(nElems + 1);
-+
-+   for (std::size_t i = 0; i < nElems; ++i) {
-+      vreg1[i] = (i % nCycle) + 1;
-+      vreg2[i] = vreg1[i] + nCycle;
-+      vreg3[i] = vreg2[i] + nCycle;
-+      fixed_vreg1[i] = vreg1[i];
-+      fixed_vreg2[i] = vreg2[i];
-+      fixed_vreg3[i] = vreg3[i];
-+      vmocksmall[i + 1] = vreg3[i];
-+   }
-+   fixed_vreg3[nElems] = fixed_vreg3[0];
-+   vreg3[nElems] = vreg3[0];
-+
-    vmocksmall.erase(vmocksmall.begin() + 2, vmocksmall.end());
-    // vmocksmall is a regular vector of size 2
- 
-@@ -1798,11 +1818,22 @@ TEST_P(VecOpsSwap, BothAdoptingVectors)
- // in cases where ROOT::VecOps::swap produces 1 regular and 1 adopting vector
- TEST_P(VecOpsSwap, SmallRegularVectors)
- {
-+   constexpr std::size_t smallVecSize = ROOT::Internal::VecOps::RVecInlineStorageSize<int>::value;
-+
-+   // The number of elemens in the large RVecs will be the smallest multiple of
-+   // three that larger than smallVecSize.
-+   constexpr int nCycle = 3;
-+   constexpr std::size_t nElems1 = ((smallVecSize / nCycle) + 1) * nCycle;
-+   constexpr std::size_t nElems2 = nElems1 + nCycle; // some vectors should be larger than others
-+
-    RVec<int> fixed_vsmall{1, 2, 3};
-    RVec<int> fixed_vreg1{4, 5, 6};
-    RVec<int> fixed_vreg2{7, 8};
-    RVec<int> fixed_vreg3{9, 10, 11, 12, 13, 14};
--   RVec<int> fixed_vreg4{15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
-+   RVec<int> fixed_vreg4(nElems1);
-+   for (std::size_t i = 0; i < nElems1; ++i) {
-+      fixed_vreg4[i] = i + 15;
-+   }
- 
-    // need multiple hard copies since after swap of a small and a regular,
-    // there is no fixed policy whether 2 regular vectors are produced or 1 small and 1 regular
-@@ -1815,19 +1846,33 @@ TEST_P(VecOpsSwap, SmallRegularVectors)
-    RVec<int> vsmall7{1, 2, 3};
-    RVec<int> vsmall8{1, 2, 3};
- 
--   RVec<int> vreg1{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
--   vreg1.erase(vreg1.begin() + 3, vreg1.end()); // regular vector of size 3
--   RVec<int> vreg10{4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
-+   RVec<int> vreg1;
-+   RVec<int> vreg10;
-+   RVec<int> vreg2{7, 8};
-+   RVec<int> vreg20{7, 8};
-+   RVec<int> vreg3{9, 10, 11, 12, 13, 14};
-+   RVec<int> vreg30{9, 10, 11, 12, 13, 14};
-+   RVec<int> vreg4(nElems1);
-+
-+   for (std::size_t i = 0; i < nElems2; ++i) {
-+      double val = (i % nCycle) + 4;
-+      vreg1.push_back(val);
-+      vreg10.push_back(vreg1.back());
-+      vreg2.push_back(val);
-+      vreg20.push_back(vreg2.back());
-+      vreg3.push_back(val);
-+      vreg30.push_back(vreg3.back());
-+   }
-+   for (std::size_t i = 0; i < nElems1; ++i) {
-+      vreg4[i] = i + 15;
-+   }
-+
-+   vreg1.erase(vreg1.begin() + 3, vreg1.end());    // regular vector of size 3
-    vreg10.erase(vreg10.begin() + 3, vreg10.end()); // regular vector of size 3
--   RVec<int> vreg2{7, 8, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
--   vreg2.erase(vreg2.begin() + 2, vreg2.end()); // regular vector of size 2
--   RVec<int> vreg20{7, 8, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
-+   vreg2.erase(vreg2.begin() + 2, vreg2.end());    // regular vector of size 2
-    vreg20.erase(vreg20.begin() + 2, vreg20.end()); // regular vector of size 2
--   RVec<int> vreg3{9, 10, 11, 12, 13, 14, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
--   vreg3.erase(vreg3.begin() + 6, vreg3.end()); // regular vector of size 6
--   RVec<int> vreg30{9, 10, 11, 12, 13, 14, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6};
-+   vreg3.erase(vreg3.begin() + 6, vreg3.end());    // regular vector of size 6
-    vreg30.erase(vreg30.begin() + 6, vreg30.end()); // regular vector of size 6
--   RVec<int> vreg4{15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
-    // vreg4 is a regular vector that cannot "fit" to small vector
- 
-    // verify that initially vectors are not small
--- 
-2.52.0
-
diff --git a/root.spec b/root.spec
index beb0004..8c7a55d 100644
--- a/root.spec
+++ b/root.spec
@@ -20,12 +20,7 @@
 %global pandas 0
 %endif
 
-%if "%{?dist}" == ".el10_0"
-# R not available in EPEL 10.0
-%global rrr 0
-%else
 %global rrr 1
-%endif
 
 %if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10
 %global roofitmp 1
@@ -37,9 +32,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/.*/lib.*\\.so$
 
 Name:		root
-Version:	6.38.00
+Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	7%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -77,39 +72,14 @@ Patch2:		%{name}-dont-install-minicern.patch
 Patch3:		%{name}-no-export-python-modules.patch
 #		Run some test on 32 bit that upstream has disabled
 Patch4:		%{name}-32bit-tests.patch
-#		Adjust test/stressGraphics.ref
-#		https://github.com/root-project/root/pull/30667
-Patch5:		%{name}-Adjust-test-stressGraphics.ref.patch
 #		Revert test change that breaks the test
-Patch6:		%{name}-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
+Patch5:		%{name}-Revert-test-Fetch-the-geometries-from-EOS-and-not-fr.patch
 #		Preserve memory during parallel build
 #		https://github.com/root-project/root/pull/18991
-Patch7:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
-#		Add missing includes of TMath.h
-#		https://github.com/root-project/root/pull/20601
-Patch8:		%{name}-Geom-Add-missing-includes-of-TMath.h.patch
-#		Fix numpy vs dataframe type mismatch om ix86
-#		https://github.com/root-project/root/pull/20668
-Patch9:		%{name}-Fix-a-numpy-test-for-32-bit-archs.patch
-#		Backport a test fix from upstream
-Patch10:	%{name}-VecOps-Remove-outdated-IsSmall-helper-function-in-te.patch
-Patch11:	%{name}-vecops-Adaptive-size-of-long-RVec-instances-in-RVec-.patch
-#		Backport fixes to python module
-Patch12:	%{name}-cppyy-Remove-now-irrelevant-load_cpp_backend-call.patch
-Patch13:	%{name}-cppyy-Remove-code-related-to-finding-CPyCppyy-API-he.patch
-#		Don't install the python modules twice
-#		https://github.com/root-project/root/pull/20753
-Patch14:	%{name}-PyROOT-Don-t-install-the-python-modules-twice.patch
-#		Fix test for stricter syntax in numpy 2.4.0 (backport)
-#		https://github.com/root-project/root/pull/20775
-Patch15:	%{name}-Python-Fix-TF1-Pythonization-test-for-NumPy-2.4.0.patch
-#		Starting with gcc 16, libstdc++ links to libatomic
-#		https://github.com/root-project/root/pull/20826
-Patch16:	%{name}-gcc-16-libstdc-links-to-libatomic.patch
-#		Test fails with gcc 16 (which uses c++20 as default)
-#		https://github.com/root-project/root/issues/20831
-#		https://github.com/root-project/root/pull/20841
-Patch17:	%{name}-RF-Use-TRandom3-in-test-RooFuncWrapper.patch
+Patch6:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
+#		https://github.com/root-project/root/pull/21604
+#		https://github.com/root-project/root/pull/21605
+Patch7:		%{name}-Avoid-additional-python-version-file-to-wrong-location.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -144,9 +114,9 @@ BuildRequires:	sqlite-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libxcrypt-devel
-BuildRequires:	python%{python3_pkgversion}-devel >= 3.7
-BuildRequires:	python%{python3_pkgversion}-setuptools
-BuildRequires:	python%{python3_pkgversion}-numpy
+BuildRequires:	python3-devel >= 3.9
+BuildRequires:	python3-setuptools
+BuildRequires:	python3-numpy
 %ifarch %{qt6_qtwebengine_arches}
 BuildRequires:	qt6-qtbase-devel
 BuildRequires:	qt6-qtwebengine-devel
@@ -189,7 +159,7 @@ BuildRequires:	cppzmq-devel
 %endif
 %endif
 %if %{pandas}
-BuildRequires:	python%{python3_pkgversion}-pandas
+BuildRequires:	python3-pandas
 %endif
 BuildRequires:	perl-generators
 BuildRequires:	gtest-devel
@@ -399,63 +369,63 @@ This package contains the unit test support library for ROOT.
 %package tpython
 Summary:	ROOT's TPython interface
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
+Requires:	python3-%{name}%{?_isa} = %{version}-%{release}
 #		Package split (tpython from Python bindings)
-Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
+Obsoletes:	python3-%{name} < 6.22.00
 
 %description tpython
 This package contains ROOT's TPython interface. It makes it possible
 to call Python from ROOT.
 
-%package -n python%{python3_pkgversion}-%{name}
+%package -n python3-%{name}
 Summary:	Python extension for ROOT
-%py_provides	python%{python3_pkgversion}-%{name}
-Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
-Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
+%py_provides	python3-%{name}
+Provides:	%{name}-python3 = %{version}-%{release}
+Obsoletes:	%{name}-python3 < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
 #		Package split (tpython from Python bindings)
-Obsoletes:	python%{python3_pkgversion}-%{name} < 6.22.00
-Obsoletes:	python%{python3_pkgversion}-jsmva < 6.32.00
+Obsoletes:	python3-%{name} < 6.22.00
+Obsoletes:	python3-jsmva < 6.32.00
 
-%description -n python%{python3_pkgversion}-%{name}
+%description -n python3-%{name}
 This package contains the Python extension for ROOT. It makes it
 possible to use ROOT classes in Python.
 
-%package -n python%{python3_pkgversion}-jupyroot
+%package -n python3-jupyroot
 Summary:	ROOT Jupyter kernel
 BuildArch:	noarch
-%py_provides	python%{python3_pkgversion}-jupyroot
-Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
+%py_provides	python3-jupyroot
+Requires:	python3-%{name} = %{version}-%{release}
 Requires:	%{name}-core = %{version}-%{release}
 #		notebook package was merged with JupyROOT package
 Provides:	%{name}-notebook = %{version}-%{release}
 Obsoletes:	%{name}-notebook < 6.32.00
 Requires:	js-jsroot >= 7.10
-%if %{?fedora}%{!?fedora:0} || ( %{?rhel}%{!?rhel:0} >= 10 && "%{?dist}" != ".el10_0" )
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
 Requires:	jupyter-notebook
 #		python-metakernel not available in RHEL/EPEL
 #		some functionality missing
-Requires:	python%{python3_pkgversion}-ipython
-Requires:	python%{python3_pkgversion}-metakernel
+Requires:	python3-ipython
+Requires:	python3-metakernel
 Requires:	python-jupyter-filesystem
 %endif
 
-%description -n python%{python3_pkgversion}-jupyroot
+%description -n python3-jupyroot
 The Jupyter kernel for the ROOT notebook.
 
 %if %{distrdf}
-%package -n python%{python3_pkgversion}-distrdf
+%package -n python3-distrdf
 Summary:	Distributed RDataFrame
 BuildArch:	noarch
-%py_provides	python%{python3_pkgversion}-distrdf
-Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
+%py_provides	python3-distrdf
+Requires:	python3-%{name} = %{version}-%{release}
 Requires:	%{name}-tree-dataframe = %{version}-%{release}
 
-%description -n python%{python3_pkgversion}-distrdf
+%description -n python3-distrdf
 A layer on top of RDataFrame to enable distributed computations. It is
 a port of the previously known PyRDF python package.
 %endif
@@ -1165,7 +1135,7 @@ This package contains the basic authentication algorithms used by ROOT.
 
 %package net-davix
 Summary:	Davix extension for ROOT
-Requires:	davix-libs%{?_isa} >= 0.6.4
+Requires:	davix-libs%{?_isa} >= 0.7.1
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 
@@ -1319,7 +1289,7 @@ provided here process whole data arrays (batches) instead of a single
 event at a time, as in the legacy evaluate() function in roofit. In
 addition, the code is written in a manner that allows for compiler
 optimizations, notably auto-vectorization. This library is compiled
-multiple times for different vector instuction set architectures and
+multiple times for different vector instruction set architectures and
 the optimal code is executed during runtime, as a result of an
 automatic hardware detection mechanism that this library contains.
 
@@ -1535,7 +1505,7 @@ Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tmva-sofie%{?_isa} = %{version}-%{release}
 Requires:	%{name}-tree%{?_isa} = %{version}-%{release}
-Requires:	python%{python3_pkgversion}-numpy
+Requires:	python3-numpy
 
 %description tmva-python
 Python integration with TMVA.
@@ -1680,7 +1650,7 @@ An algorithm to unfold distributions from detector to truth level.
 %package cli
 Summary:	ROOT command line utilities
 BuildArch:	noarch
-Requires:	python%{python3_pkgversion}-%{name} = %{version}-%{release}
+Requires:	python3-%{name} = %{version}-%{release}
 
 %description cli
 The ROOT command line utilities is a set of scripts for common tasks
@@ -1908,16 +1878,6 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
-%patch -P12 -p1
-%patch -P13 -p1
-%patch -P14 -p1
-%patch -P15 -p1
-%patch -P16 -p1
-%patch -P17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2197,10 +2157,9 @@ echo 'Version: %{version}' >> \
 mkdir -p %{buildroot}%{_datadir}/jupyter/kernels
 
 cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \
-   %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
-sed -e 's/ROOT C++/& (Python 3)/' \
-    -e 's!python[0-9]*\.[0-9]*!%{__python3}!' \
-    -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json
+   %{buildroot}%{_datadir}/jupyter/kernels/python3-jupyroot
+sed -e 's!python[0-9]*\.[0-9]*!%{__python3}!' \
+    -i %{buildroot}%{_datadir}/jupyter/kernels/python3-jupyroot/kernel.json
 sed -e '/^\#!/d' \
     -i %{buildroot}%{python3_sitelib}/JupyROOT/kernel/rootkernel.py
 
@@ -2289,7 +2248,7 @@ sed -e 's/FATAL_ERROR \(.*imported\)/WARNING \1/' \
 but this file does not exist.\
 If this target is used you need to install the package that provides this\
 file using \\"dnf install\\".\
-If this target is not used this warning can be ignored.")' \
+If this target is not used this warning can be ignored.'$'\x22'')' \
     -e '/Possible reasons include/,/)/d' \
     -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
 
@@ -2435,9 +2394,6 @@ tutorial-visualisation-webcanv-fonts_ttf.cxx"
 # - gtest-hist-hist-TFormulaGradientTests
 #   out of memory
 #
-# - pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views
-#   ValueError: buffer is smaller than requested size
-#
 # - tmva-sofie-test-TestCustomModelsFromONNX
 #   Expected equality of these values:
 #     output.size()
@@ -2446,7 +2402,6 @@ tutorial-visualisation-webcanv-fonts_ttf.cxx"
 #       Which is: 900
 excluded="${excluded}|\
 gtest-hist-hist-TFormulaGradientTests|\
-pyunittests-bindings-pyroot-pythonizations-pyroot-array-numpy-views|\
 tmva-sofie-test-TestCustomModelsFromONNX\$\$"
 %endif
 
@@ -2580,12 +2535,12 @@ test-stresshistogram\$\$|\
 test-stresshistogram-interpreted"
 
 # The zlib-ng library is compiled with hardware acceleration support on s390x
-# in Fedora 43 and later.
+# in Fedora 43 and later and RHEL 10.1 and later
 # This means that some tests that compare the size of compressed data fail.
 # - test-stress
 # - gtest-tree-readspeed-readspeed-general
 # - gtest-tree-tree-testTBranch
-%if %{?fedora}%{!?fedora:0} >= 43
+%if %{?fedora}%{!?fedora:0} >= 43 || %{?rhel}%{!?rhel:0} >= 10
 excluded="${excluded}|\
 test-stress\$\$|\
 gtest-tree-readspeed-readspeed-general|\
@@ -2607,11 +2562,24 @@ excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
+# Test failures with GCC 16 on AArch64
+# https://bugzilla.redhat.com/show_bug.cgi?id=2440537
+# https://github.com/root-project/root/issues/21565
+%if %{?fedora}%{!?fedora:0} >= 44
+%ifarch aarch64
+excluded="${excluded}|\
+gtest-tree-ntuple-ntuple-cast|\
+gtest-tree-ntuple-ntuple-join-table|\
+gtest-tree-ntuple-ntuple-packing|\
+gtest-tree-ntuple-ntuple-show|\
+gtest-tree-ntuple-ntuple-types|\
+gtest-tree-ntuple-ntuple-view|\
+gtest-tree-ntupleutil-ntuple-importer"
+%endif
+%endif
+
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
-# TH3D.FillThreadSafe and RDFHelpers.Histo3DThreadSafe fail on ix86
-# due to alignment issues with std::atomic_ref
-# https://github.com/root-project/root/issues/20834
 # InterpreterTest.Evaluate fails on s390x
 # TClingDataMemberInfo.Offset fails on s390x
 # https://github.com/root-project/root/issues/14512
@@ -2621,8 +2589,6 @@ gtest-math-matrix-testMatrixTSparse"
 export GTEST_FILTER=-\
 %ifarch %{ix86}
 RNTuple.StdAtomic:\
-TH3D.FillThreadSafe:\
-RDFHelpers.Histo3DThreadSafe:\
 %endif
 %ifarch s390x
 InterpreterTest.Evaluate:\
@@ -2654,14 +2620,14 @@ for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
     ln -fnrs %{_jsdir}/jsroot/$x %{_datadir}/%{name}/js/$x
 done
 
-%pre -n python%{python3_pkgversion}-%{name}
+%pre -n python3-%{name}
 if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
     for alt in `grep python3.*/.*.so /var/lib/alternatives/libPyROOT.so` ; do
 	%{_sbindir}/update-alternatives --remove libPyROOT.so $alt
     done
 fi
 
-%post -n python%{python3_pkgversion}-jupyroot
+%post -n python3-jupyroot
 mkdir -p /etc/jupyter
 if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
     sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
@@ -2680,7 +2646,7 @@ c.ServerApp.extra_static_paths.append('%{_jsdir}/jsroot')
 # Extra static paths for JupyROOT - end - do not remove this line
 EOF
 
-%postun -n python%{python3_pkgversion}-jupyroot
+%postun -n python3-jupyroot
 if [ $1 -eq 0 ] ; then
     if [ -e /etc/jupyter/jupyter_notebook_config.py ] ; then
 	sed '/Extra static paths for JupyROOT - start/','/Extra static paths for JupyROOT - end/'d -i /etc/jupyter/jupyter_notebook_config.py
@@ -2816,23 +2782,23 @@ fi
 %{_libdir}/%{name}/libROOTTPython.*
 %{_libdir}/%{name}/libROOTTPython_rdict.pcm
 
-%files -n python%{python3_pkgversion}-%{name} -f includelist-bindings-pyroot
+%files -n python3-%{name} -f includelist-bindings-pyroot
 %{python3_sitearch}/cppyy
 %{python3_sitearch}/ROOT
 %{python3_sitearch}/ROOT-*.dist-info
 %{_libdir}/%{name}/libCPyCppyy.*
 %dir %{_includedir}/%{name}/CPyCppyy
 
-%files -n python%{python3_pkgversion}-jupyroot
+%files -n python3-jupyroot
 %{python3_sitelib}/JupyROOT
 %{python3_sitelib}/JupyROOT-*.dist-info
-%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot
+%{_datadir}/jupyter/kernels/python3-jupyroot
 %{_bindir}/rootnb.exe
 %doc bindings/jupyroot/README.md
 %doc bindings/jupyroot/JupyROOT-on-EPEL
 
 %if %{distrdf}
-%files -n python%{python3_pkgversion}-distrdf
+%files -n python3-distrdf
 %{python3_sitelib}/DistRDF
 %{python3_sitelib}/DistRDF-*.dist-info
 %endif
@@ -3476,6 +3442,12 @@ fi
 %endif
 
 %changelog
+* Fri Mar 13 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-1
+- Update to 6.38.04
+- Rebuild for pythia8 8.3.17
+- Dropped patches: 11
+- New patches: 1
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.38.00-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 
diff --git a/sources b/sources
index 98e90e5..11e9563 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.38.00.tar.xz) = 7c452b509e8171a0cbb7c102a3d4c07333fc8535f1b2c2ab0b9f7434604f098989a78bb71c41039dd41dbbd3438ea8703939826092f075d9d730b6b53c84ac55
+SHA512 (root-6.38.04.tar.xz) = 3f8b4bf1f778008e1d6d3a711ac791391fb32971c03bd6367994e137cc16a87a3e382ce962f9197eef386c736fb8a525eb47606eef5f3390d85942b0d6b641b6
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-2.2.tar.gz) = 6f76d706a829901fc0fcdb38b5ddad6ea8ad9186ea48a4b6b585fc62974a2cda11b96a448c25daaba0586962d6428773e7ab751236c6afa72a91d12f30f2d05e

From 3cd581f0e0166c914e47c488d19d93e3e8fd7100 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 5 Apr 2026 07:49:26 +0200
Subject: [PATCH 328/344] Compatibility with Python 3.15

---
 root-python-3.15.patch | 38 ++++++++++++++++++++++++++++++++++++++
 root.spec              | 21 +++++++++++++++------
 2 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 root-python-3.15.patch

diff --git a/root-python-3.15.patch b/root-python-3.15.patch
new file mode 100644
index 0000000..a40cf3f
--- /dev/null
+++ b/root-python-3.15.patch
@@ -0,0 +1,38 @@
+From 4171724228a849959542fcb0b0c1ec10d8e94999 Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Fri, 3 Apr 2026 22:56:04 +0200
+Subject: [PATCH] [Python] Set `__spec__` attribute and not `__cached__` for
+ ROOT facade
+
+The Python documentation [1] says:
+
+> It is strongly recommended that you use module.__spec__.cached instead
+  of module.__cached__.
+
+So this commit suggests to transfer the full `__spec__` attribute from
+the ROOT module to the facade, instead of `__cached__`.
+
+This also avoids errors when importing ROOT with Python 3.15, where
+`__cached__` will cease to be set or taken into consideration by the
+import system or standard library.
+
+Closes #21787.
+
+[1] https://docs.python.org/3/reference/datamodel.html#module.__cached__
+---
+ bindings/pyroot/pythonizations/python/ROOT/_facade.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/pyroot/pythonizations/python/ROOT/_facade.py b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+index c22ae40da4c2d..da8b6681ec2f2 100644
+--- a/bindings/pyroot/pythonizations/python/ROOT/_facade.py
++++ b/bindings/pyroot/pythonizations/python/ROOT/_facade.py
+@@ -142,7 +142,7 @@ def __init__(self, module, is_ipython):
+         self.__all__ = module.__all__
+         self.__name__ = module.__name__
+         self.__file__ = module.__file__
+-        self.__cached__ = module.__cached__
++        self.__spec__ = module.__spec__
+         self.__path__ = module.__path__
+         self.__doc__ = module.__doc__
+         self.__package__ = module.__package__
diff --git a/root.spec b/root.spec
index 8c7a55d..6b745ef 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -80,6 +80,10 @@ Patch6:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
 #		https://github.com/root-project/root/pull/21604
 #		https://github.com/root-project/root/pull/21605
 Patch7:		%{name}-Avoid-additional-python-version-file-to-wrong-location.patch
+#		Compatibility with Python 3.15
+#		https://github.com/root-project/root/issues/21787
+#		https://github.com/root-project/root/pull/21790
+Patch8:		%{name}-python-3.15.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -1878,6 +1882,7 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
+%patch -P8 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2191,10 +2196,8 @@ sed -e 's!/usr/bin/env python3!%{__python3}!' \
     -e '/import sys/d' \
     -e '/import cmdLineUtils/iimport sys' \
     -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \
-    -i %{buildroot}%{_bindir}/rootbrowse \
-       %{buildroot}%{_bindir}/rootcp \
+    -i %{buildroot}%{_bindir}/rootcp \
        %{buildroot}%{_bindir}/rooteventselector \
-       %{buildroot}%{_bindir}/rootls \
        %{buildroot}%{_bindir}/rootmkdir \
        %{buildroot}%{_bindir}/rootmv \
        %{buildroot}%{_bindir}/rootprint \
@@ -2407,13 +2410,16 @@ tmva-sofie-test-TestCustomModelsFromONNX\$\$"
 
 %ifarch %{power64}
 %if %{?fedora}%{!?fedora:0} >= 42
-# - gtest-tree-ntuple-ntuple-emulated
 # - gtest-tree-ntuple-ntuple-evolution-shape
 #   waitpid() failed
 excluded="${excluded}|\
-gtest-tree-ntuple-ntuple-emulated|\
 gtest-tree-ntuple-ntuple-evolution-shape"
 %endif
+
+# - gtest-tree-ntuple-ntuple-emulated
+¤   Random failures
+excluded="${excluded}|\
+gtest-tree-ntuple-ntuple-emulated"
 %endif
 
 %ifarch s390x
@@ -3442,6 +3448,9 @@ fi
 %endif
 
 %changelog
+* Sun Apr 05 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-2
+- Compatibility with Python 3.15
+
 * Fri Mar 13 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-1
 - Update to 6.38.04
 - Rebuild for pythia8 8.3.17

From 7870548730df0d90639b75f34bcbec41b61efe39 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 5 Apr 2026 15:17:50 +0200
Subject: [PATCH 329/344] typo

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 6b745ef..5ffaafd 100644
--- a/root.spec
+++ b/root.spec
@@ -2417,7 +2417,7 @@ gtest-tree-ntuple-ntuple-evolution-shape"
 %endif
 
 # - gtest-tree-ntuple-ntuple-emulated
-¤   Random failures
+#   Random failures
 excluded="${excluded}|\
 gtest-tree-ntuple-ntuple-emulated"
 %endif

From 666c050fcf50ee6f0fea08696e49053a374b0daa Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 6 Apr 2026 06:05:00 +0200
Subject: [PATCH 330/344] Exclude failing test on ppc64le

---
 root.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 5ffaafd..48c0b27 100644
--- a/root.spec
+++ b/root.spec
@@ -2417,9 +2417,11 @@ gtest-tree-ntuple-ntuple-evolution-shape"
 %endif
 
 # - gtest-tree-ntuple-ntuple-emulated
+# - gtest-tree-ntuple-ntuple-merger
 #   Random failures
 excluded="${excluded}|\
-gtest-tree-ntuple-ntuple-emulated"
+gtest-tree-ntuple-ntuple-emulatedy|\
+gtest-tree-ntuple-ntuple-merger"
 %endif
 
 %ifarch s390x

From 8adc8228e37b3d007befa44773e2d217e4cf000f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 8 Apr 2026 09:40:20 +0200
Subject: [PATCH 331/344] typo

---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 48c0b27..c0472b3 100644
--- a/root.spec
+++ b/root.spec
@@ -2420,7 +2420,7 @@ gtest-tree-ntuple-ntuple-evolution-shape"
 # - gtest-tree-ntuple-ntuple-merger
 #   Random failures
 excluded="${excluded}|\
-gtest-tree-ntuple-ntuple-emulatedy|\
+gtest-tree-ntuple-ntuple-emulated|\
 gtest-tree-ntuple-ntuple-merger"
 %endif
 

From 6ac6cee053aafe51346fa4dc666bd4437ca20fd3 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 10 Apr 2026 05:35:33 +0200
Subject: [PATCH 332/344] Run some tests on aarch64 Fedora 44+ again (gcc 16
 regression fixed)

---
 root.spec | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/root.spec b/root.spec
index c0472b3..3e165f4 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2570,22 +2570,6 @@ excluded="${excluded}|\
 gtest-math-matrix-testMatrixTSparse"
 %endif
 
-# Test failures with GCC 16 on AArch64
-# https://bugzilla.redhat.com/show_bug.cgi?id=2440537
-# https://github.com/root-project/root/issues/21565
-%if %{?fedora}%{!?fedora:0} >= 44
-%ifarch aarch64
-excluded="${excluded}|\
-gtest-tree-ntuple-ntuple-cast|\
-gtest-tree-ntuple-ntuple-join-table|\
-gtest-tree-ntuple-ntuple-packing|\
-gtest-tree-ntuple-ntuple-show|\
-gtest-tree-ntuple-ntuple-types|\
-gtest-tree-ntuple-ntuple-view|\
-gtest-tree-ntupleutil-ntuple-importer"
-%endif
-%endif
-
 # Filter out parts of tests that require remote network access
 # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic)
 # InterpreterTest.Evaluate fails on s390x
@@ -3450,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 09 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-3
+- Run some tests on aarch64 Fedora 44+ again (gcc 16 regression fixed)
+
 * Sun Apr 05 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-2
 - Compatibility with Python 3.15
 

From bf6d9e6993d3e7309c0fd75ca3a136f01b0688ed Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 22 Apr 2026 04:32:33 +0200
Subject: [PATCH 333/344] Rebuilt for xrootd 6

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 3e165f4..7dcf7c8 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3434,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 22 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-4
+- Rebuilt for xrootd 6
+
 * Thu Apr 09 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-3
 - Run some tests on aarch64 Fedora 44+ again (gcc 16 regression fixed)
 

From f0f346078883ecc18c391764210ebfcc42149491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Sun, 26 Apr 2026 01:06:15 +0200
Subject: [PATCH 334/344] R-maint-sig mass rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 7dcf7c8..974f2a0 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3434,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Sat Apr 25 2026 Iñaki Úcar <iucar@fedoraproject.org> - 6.38.04-5
+- R-maint-sig mass rebuild
+
 * Wed Apr 22 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-4
 - Rebuilt for xrootd 6
 

From f908b994824867ef7965522586c63ea54eb9fff1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 6 May 2026 16:04:23 +0200
Subject: [PATCH 335/344] Combined rebuild for xrootd and R

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 974f2a0..a9315e7 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3434,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Wed May 06 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.38.04-6
+- Combined rebuild for xrootd and R
+
 * Sat Apr 25 2026 Iñaki Úcar <iucar@fedoraproject.org> - 6.38.04-5
 - R-maint-sig mass rebuild
 

From d4e0e388fbe47fcb5b2512b9cbac0a39db8ee248 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Thu, 4 Jun 2026 11:41:52 +0200
Subject: [PATCH 336/344] Rebuilt for Python 3.15

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 974f2a0..f39b3bf 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3434,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 6.38.04-6
+- Rebuilt for Python 3.15
+
 * Sat Apr 25 2026 Iñaki Úcar <iucar@fedoraproject.org> - 6.38.04-5
 - R-maint-sig mass rebuild
 

From c2cc1e8dde307a522eaab9b94d700148df92a715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 14 May 2026 14:18:14 +0200
Subject: [PATCH 337/344] Use protobuf in version 3.x only

This is part of https://fedoraproject.org/wiki/Changes/Protobuf_5.x/6.x
This package does not sucessfully build with new protobuf per
  https://copr.fedorainfracloud.org/coprs/mochaa/protobuf/monitor/
so limiting to protobuf version 3.
Once the protobuf is rebase this will automatically pick up compat
package protobuf3

I am not bumping release as this does not need a rebuild now.
---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index f39b3bf..bfc9972 100644
--- a/root.spec
+++ b/root.spec
@@ -149,7 +149,7 @@ BuildRequires:	json-devel >= 3.9
 %endif
 BuildRequires:	liburing-devel
 %if %{tmvasofieparser}
-BuildRequires:	protobuf-devel >= 3.0
+BuildRequires:	protobuf-devel < 4
 %endif
 %ifnarch %{ix86} %{arm}
 BuildRequires:	libarrow-devel

From 4d451d1e2deb4148a356e0300ba7f8811eac01e4 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Fri, 12 Jun 2026 19:37:03 -0400
Subject: [PATCH 338/344] Rebuilt for openssl 4.0

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index bfc9972..d5f2b2f 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.38.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3434,6 +3434,9 @@ fi
 %endif
 
 %changelog
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 6.38.04-7
+- Rebuilt for openssl 4.0
+
 * Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 6.38.04-6
 - Rebuilt for Python 3.15
 

From 9960faac7b1bfd388478afff94aec8af6af423df Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 29 Jun 2026 08:27:48 +0200
Subject: [PATCH 339/344] Revert "Use protobuf in version 3.x only"

This reverts commit c2cc1e8dde307a522eaab9b94d700148df92a715.
---
 root.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index d5f2b2f..9fa7d9c 100644
--- a/root.spec
+++ b/root.spec
@@ -149,7 +149,7 @@ BuildRequires:	json-devel >= 3.9
 %endif
 BuildRequires:	liburing-devel
 %if %{tmvasofieparser}
-BuildRequires:	protobuf-devel < 4
+BuildRequires:	protobuf-devel >= 3.0
 %endif
 %ifnarch %{ix86} %{arm}
 BuildRequires:	libarrow-devel

From ed3d5ff5a89b011ddb3c6a2e163fd46b85c97d80 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jul 2026 23:39:18 +0000
Subject: [PATCH 340/344] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 988893e..0b11f52 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.40.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3542,6 +3542,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.40.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Sat Jun 20 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.40.02-1
 - Update to 6.40.02
 - Rename the jupyroot and distrdf packages to reflect that they are

From 83ecd08a85664726617faedbf131b9702fb8017a Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Wed, 22 Jul 2026 17:48:47 +0200
Subject: [PATCH 341/344] Rebuilt for Python 3.15.0b4 ABI change

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index 0b11f52..b16b24c 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.40.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3542,6 +3542,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 6.40.02-3
+- Rebuilt for Python 3.15.0b4 ABI change
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.40.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

From bd92cbd636b082a058d6336546d8ef76a139b64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 19 Aug 2026 12:08:55 +0200
Subject: [PATCH 342/344] Rebuilt for new graphviz

---
 root.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/root.spec b/root.spec
index b16b24c..7458f81 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	6.40.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -3542,6 +3542,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 6.40.02-4
+- Rebuilt for new graphviz
+
 * Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 6.40.02-3
 - Rebuilt for Python 3.15.0b4 ABI change
 

From 3abc226a6f33ba3e7a04f721688bcfb5d48c26cd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 26 Aug 2026 15:49:39 +0200
Subject: [PATCH 343/344] Use the system civetweb library since it now supports
 web sockets

Drop the davix module for Fedora 45+ (davix will soon be retired)
---
 root.spec | 46 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/root.spec b/root.spec
index 7458f81..e316729 100644
--- a/root.spec
+++ b/root.spec
@@ -28,13 +28,19 @@
 %global roofitmp 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 45 || %{?rhel}%{!?rhel:0} >= 11
+%global davix 0
+%else
+%global davix 1
+%endif
+
 # Do not generate autoprovides for Python modules
 %global __provides_exclude_from ^%{python3_sitearch}/.*/lib.*\\.so$
 
 Name:		root
 Version:	6.40.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -135,9 +141,12 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	xrootd-client-devel >= 1:5.0.0
 BuildRequires:	cfitsio-devel
+BuildRequires:	civetweb-devel
 BuildRequires:	curl-devel
+%if %{davix}
 #		Davix version >= 0.6.4, but not between 0.6.8 and 0.7.0
 BuildRequires:	davix-devel >= 0.7.1
+%endif
 %if %{rrr}
 BuildRequires:	R-Rcpp-devel
 BuildRequires:	R-RInside-devel
@@ -332,6 +341,9 @@ Obsoletes:	%{name}-proof-sessionviewer < 6.38.00
 Obsoletes:	%{name}-sql-mysql < 6.38.00
 Obsoletes:	%{name}-sql-odbc < 6.38.00
 Obsoletes:	%{name}-sql-pgsql < 6.38.00
+%if ! %{davix}
+Obsoletes:	%{name}-net-davix < 6.40.02-5
+%endif
 
 %description core
 This package contains the core libraries used by ROOT: libCore, libNew,
@@ -1166,6 +1178,7 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 This package contains the curl extension for TOOT. It provides access
 to http based storage e.g. S3.
 
+%if %{davix}
 %package net-davix
 Summary:	Davix extension for ROOT
 Requires:	davix-libs%{?_isa} >= 0.7.1
@@ -1175,11 +1188,10 @@ Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 %description net-davix
 This package contains the davix extension for ROOT, that provides
 access to http based storage such as webdav and S3.
+%endif
 
 %package net-http
 Summary:	HTTP server extension for ROOT
-#		The system civetweb is not compiled with websocket support
-Provides:	bundled(civetweb)
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
 Requires:	js-jsroot >= 7.11
@@ -1965,6 +1977,8 @@ rm builtins/pcre/pcre-*.tar.bz2
 rm builtins/xxhash/xxhash.c builtins/xxhash/xxhash.h
 #  * unuran
 rm math/unuran/src/*.tar.gz
+#  * civetweb
+rm -rf net/http/civetweb
 #  * x11 extension headers
 rm -rf graf2d/x11/inc/X11
 #  * jsroot
@@ -1991,7 +2005,7 @@ install -p -m 644 %{SOURCE7} \
        -DPython3_EXECUTABLE:PATH=%{__python3} \
        -Dgnuinstall:BOOL=ON \
        -Dbuiltin_cfitsio:BOOL=OFF \
-       -Dbuiltin_civetweb:BOOL=ON \
+       -Dbuiltin_civetweb:BOOL=OFF \
        -Dbuiltin_clang:BOOL=ON \
        -Dbuiltin_cling:BOOL=ON \
        -Dbuiltin_cppzmq:BOOL=OFF \
@@ -2045,7 +2059,11 @@ install -p -m 644 %{SOURCE7} \
 %else
        -Ddataframe:BOOL=OFF \
 %endif
+%if %{davix}
        -Ddavix:BOOL=ON \
+%else
+       -Ddavix:BOOL=OFF \
+%endif
        -Ddcache:BOOL=ON \
        -Ddev:BOOL=OFF \
        -Dexperimental_adaptivecpp=OFF \
@@ -2251,6 +2269,11 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
 %if ! %{rrr}
 rm ROOT@@Math@@Minimizer/P090_RMinimizer.C
 %endif
+%if ! %{davix}
+rm ROOT@@Internal@@RRawFile/P010_RRawFileDavix.C
+rm TFile/P130_TDavixFile.C
+rm TSystem/P045_TDavixSystem.C
+%endif
 rm TGLManager/P020_TGWin32GLManager.C
 rm TGLManager/P030_TGOSXGLManager.C
 rm TVirtualGeoConverter/P010_TGeoVGConverter.C
@@ -3225,12 +3248,14 @@ fi
 %{_datadir}/%{name}/plugins/ROOT@@Internal@@RRawFile/P015_RRawFileCurl.C
 %{_datadir}/%{name}/plugins/TFile/P140_TCurlFile.C
 
+%if %{davix}
 %files net-davix -f includelist-net-davix
 %{_libdir}/%{name}/libRDAVIX.*
 %{_libdir}/%{name}/libRDAVIX_rdict.pcm
 %{_datadir}/%{name}/plugins/TFile/P130_TDavixFile.C
 %{_datadir}/%{name}/plugins/TSystem/P045_TDavixSystem.C
 %{_datadir}/%{name}/plugins/ROOT@@Internal@@RRawFile/P010_RRawFileDavix.C
+%endif
 
 %files net-http -f includelist-net-http
 %{_libdir}/%{name}/libRHTTP.*
@@ -3248,7 +3273,7 @@ fi
 %ghost %{_datadir}/%{name}/js/scripts
 %ghost %{_datadir}/%{name}/js/files/draw.htm
 %ghost %{_datadir}/%{name}/js/files/online.htm
-%doc net/http/README.txt net/http/civetweb/*.md
+%doc net/http/README.txt
 
 %files net-httpsniff -f includelist-net-httpsniff
 %{_libdir}/%{name}/libRHTTPSniff.*
@@ -3542,6 +3567,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 26 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.40.02-5
+- Use the system civetweb library since it now supports web sockets
+- Drop the davix module for Fedora 45+ (davix will soon be retired)
+
 * Wed Aug 19 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 6.40.02-4
 - Rebuilt for new graphviz
 
@@ -3554,10 +3583,9 @@ fi
 * Sat Jun 20 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.40.02-1
 - Update to 6.40.02
 - Rename the jupyroot and distrdf packages to reflect that they are
-  now submodules of the main pyyhon package
-- New subpackages: root-package graf3d-glad, root-package net-curl,
-  root-package tmva-sofie-parser-python, root-package tree-ml,
-  root-package histv7util
+  now submodules of the main python package
+- New subpackages: root-graf3d-glad, root-net-curl,
+  root-tmva-sofie-parser-python, root-tree-ml, root-histv7util
 - Dropped patches: 2
 - New patches: 7
 

From 817304bc57c3eaa01a58b8c0f4c6adeeef705081 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 30 Aug 2026 08:05:14 +0200
Subject: [PATCH 344/344] Update to 6.40.04

The root-roofit-jsoninterface package was merged with root-roofit-hs3
Fix calculation of kerning distances in generated PDF files
Dropped patches: 1
New patches: 2
---
 ...tput-filenames-in-tests-pdftitle.cxx.patch |  68 --------
 root-no-export-python-modules.patch           |  16 +-
 ...ion-of-kerning-distances-in-generate.patch |  68 ++++++++
 ...ete-big-endian-support-for-ONNX-init.patch | 146 ++++++++++++++++++
 root.spec                                     |  61 +++-----
 sources                                       |   2 +-
 6 files changed, 244 insertions(+), 117 deletions(-)
 delete mode 100644 root-Use-different-output-filenames-in-tests-pdftitle.cxx.patch
 create mode 100644 root-pdf-Fix-calculation-of-kerning-distances-in-generate.patch
 create mode 100644 root-tmva-sofie-Complete-big-endian-support-for-ONNX-init.patch

diff --git a/root-Use-different-output-filenames-in-tests-pdftitle.cxx.patch b/root-Use-different-output-filenames-in-tests-pdftitle.cxx.patch
deleted file mode 100644
index ac337b4..0000000
--- a/root-Use-different-output-filenames-in-tests-pdftitle.cxx.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 28cff2a71e084210b9265cc1c6a4691afc840556 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 27 Jun 2026 15:56:57 +0200
-Subject: [PATCH] Use different output filenames in tests pdftitle.cxx and
- pdfurl.cxx
-
-This avoids failures when one test overwrites the other's output:
-
-[==========] Running 1 test from 1 test suite.
-[----------] Global test environment set-up.
-[----------] 1 test from TPad
-[ RUN      ] TPad.PDFUrl
-ROOT::TestSupport::ForbidDiagnostics::handler(): Diagnostic in 'TCanvas::Print':
-pdf file output.pdf has been created
-ROOT::TestSupport::ForbidDiagnostics::handler(): Diagnostic in 'TCanvas::Print':
-Current canvas added to pdf file output.pdf
-ROOT::TestSupport::ForbidDiagnostics::handler(): Diagnostic in 'TCanvas::Print':
-Current canvas added to pdf file output.pdf
-ROOT::TestSupport::ForbidDiagnostics::handler(): Diagnostic in 'TCanvas::Print':
-pdf file output.pdf has been closed
-/builddir/build/BUILD/root-6.40.02/graf2d/gpad/test/pdfurl.cxx:33: Failure
-Expected equality of these values:
-  statCode
-    Which is: 1
-  0
-PDF file was not created.
-[  FAILED  ] TPad.PDFUrl (373 ms)
-[----------] 1 test from TPad (373 ms total)
-[----------] Global test environment tear-down
-[==========] 1 test from 1 test suite ran. (374 ms total)
-[  PASSED  ] 0 tests.
-[  FAILED  ] 1 test, listed below:
-[  FAILED  ] TPad.PDFUrl
- 1 FAILED TEST
----
- graf2d/gpad/test/pdftitle.cxx | 2 +-
- graf2d/gpad/test/pdfurl.cxx   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/graf2d/gpad/test/pdftitle.cxx b/graf2d/gpad/test/pdftitle.cxx
-index 9162df2cd84..57c0935133f 100644
---- a/graf2d/gpad/test/pdftitle.cxx
-+++ b/graf2d/gpad/test/pdftitle.cxx
-@@ -5,7 +5,7 @@
- 
- TEST(TPad, PDFTitle)
- {
--    const TString pdfFile = "output.pdf";
-+    const TString pdfFile = "pdftitle.pdf";
- 
-     // Generate a multi-page PDF with a title
-     TCanvas c;
-diff --git a/graf2d/gpad/test/pdfurl.cxx b/graf2d/gpad/test/pdfurl.cxx
-index c0a77ce8dc9..43b114c8f41 100644
---- a/graf2d/gpad/test/pdfurl.cxx
-+++ b/graf2d/gpad/test/pdfurl.cxx
-@@ -6,7 +6,7 @@
- 
- TEST(TPad, PDFUrl)
- {
--   const TString pdfFile = "output.pdf";
-+   const TString pdfFile = "pdfurl.pdf";
- 
-    // Generate a multi-page PDF with page titles and #url in TLatex
-    TCanvas c1;
--- 
-2.54.0
-
diff --git a/root-no-export-python-modules.patch b/root-no-export-python-modules.patch
index f5c5106..d3522f5 100644
--- a/root-no-export-python-modules.patch
+++ b/root-no-export-python-modules.patch
@@ -1,4 +1,4 @@
-From 4b14d9d83ff154eca3672570f9be66513268209f Mon Sep 17 00:00:00 2001
+From ea7bed3a096949588b1b9086ddf66b2f7892a385 Mon Sep 17 00:00:00 2001
 From: Mattias Ellert <mattias.ellert@physics.uu.se>
 Date: Thu, 4 Dec 2025 23:13:28 +0100
 Subject: [PATCH] Dont export Python modules
@@ -9,18 +9,18 @@ Subject: [PATCH] Dont export Python modules
  2 files changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-index c21fb317f8c..7f1717e3f4b 100644
+index 95ca00bde9f..a12d3f05e4d 100644
 --- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
 +++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
-@@ -117,8 +117,7 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
+@@ -120,8 +120,7 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
                              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
  
 -install(TARGETS cppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
--                            RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
-+install(TARGETS cppyy       RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
-                             LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries
-                             ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries)
+-                            RUNTIME DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries # Windows
++install(TARGETS cppyy       RUNTIME DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries # Windows
+                             LIBRARY DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries
+                             ARCHIVE DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries)
  
 diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
 index 32d7d54b8da..5128e6d337c 100644
@@ -50,5 +50,5 @@ index 32d7d54b8da..5128e6d337c 100644
                              ARCHIVE DESTINATION ${pymoduledir_install} COMPONENT libraries)
  
 -- 
-2.54.0
+2.55.0
 
diff --git a/root-pdf-Fix-calculation-of-kerning-distances-in-generate.patch b/root-pdf-Fix-calculation-of-kerning-distances-in-generate.patch
new file mode 100644
index 0000000..598d7b0
--- /dev/null
+++ b/root-pdf-Fix-calculation-of-kerning-distances-in-generate.patch
@@ -0,0 +1,68 @@
+From 87e5571eef573a1ab802c9b5b68e4215045689b9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Sat, 29 Aug 2026 13:15:53 +0200
+Subject: [PATCH] [pdf] Fix calculation of kerning distances in generated PDF
+ files
+
+Note that this uses the system fonts on Fedora rather than the bundled
+fonts in the root sources.
+
+Using the following test program
+
+void ttest()
+{
+  auto c = new TCanvas("c", "", 300, 100);
+  auto t = new TText(0.1, 0.4, "Raw assymmetry");
+  t->SetTextSize(0.5);
+  t->SetTextFont(132);
+  t->Draw();
+  c->Print("ttest.pdf");
+  c->Print("ttest.eps");
+  c->Print("ttest.png");
+}
+
+The .eps and .png images look like expected. But the .pdf image only
+shows the initial capital "R", not the full "Raw assymmetry" text.
+
+After decompressing the generated .pdf file:
+
+cpdf -decompress ttest.pdf -o ttest.dec.pdf
+
+the decompressed file shows that the kerning distances are incorrect:
+
+[(R)  -2147483648(a)  24(w)  -2147483648( )  0(a)  0(s)  -2147483648(s)  17(y)  0(m)  0(m)  8(e)  8(t)  0(r)  -2147483648(y) ]
+
+Something has clearly gone wrong here. -2147483648 is the minimum
+value that can be stored in a 16 bit signed integer.
+
+The origin of the problem is a calculation of a difference between a
+UInt_t (i.e. unsigned) value and an Int_t (i.e. signed) value in the
+TPDF::Text() method. Casting the UInt_t to an Int_t before calculating
+the difference, as done in this commit, fixes the problem. With this
+change the kerning distances are better:
+
+[(R)  -2(a)  24(w)  -2( )  0(a)  0(s)  -2(s)  17(y)  0(m)  0(m)  8(e)  8(t)  0(r)  -2(y) ]
+
+and the generated .pdf file shows the complete text. The generated
+.png and .eps files do not change (except for the time stamp in the
+.eps file).
+---
+ graf2d/postscript/src/TPDF.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/graf2d/postscript/src/TPDF.cxx b/graf2d/postscript/src/TPDF.cxx
+index 21a2506010f..e1cd9b10d10 100644
+--- a/graf2d/postscript/src/TPDF.cxx
++++ b/graf2d/postscript/src/TPDF.cxx
+@@ -1943,7 +1943,7 @@ void TPDF::Text(Double_t xx, Double_t yy, const char *chars)
+             tmp[0] = chars[i-1];
+             UInt_t width=0;
+             t.GetTextAdvance(width, &tmp[0], kFALSE);
+-            Double_t wwl = gPad->AbsPixeltoX(width - charDeltas[i]) - gPad->AbsPixeltoX(0);
++            Double_t wwl = gPad->AbsPixeltoX((Int_t)width - charDeltas[i]) - gPad->AbsPixeltoX(0);
+             wwl -= 0.5*(gPad->AbsPixeltoX(1) - gPad->AbsPixeltoX(0)); // half a pixel ~ rounding error
+             charDeltas[i] = (Int_t)((1000.0/Float_t(fontsize))*(XtoPDF(wwl) - XtoPDF(0))/scale);
+         }
+-- 
+2.55.0
+
diff --git a/root-tmva-sofie-Complete-big-endian-support-for-ONNX-init.patch b/root-tmva-sofie-Complete-big-endian-support-for-ONNX-init.patch
new file mode 100644
index 0000000..d7d0181
--- /dev/null
+++ b/root-tmva-sofie-Complete-big-endian-support-for-ONNX-init.patch
@@ -0,0 +1,146 @@
+From 2fec5822e305b9b203894aa0fe3e4dded1f673cc Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Wed, 8 Jul 2026 11:13:16 +0200
+Subject: [PATCH] [tmva][sofie] Complete big-endian support for ONNX
+ initializer tensors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Follow-up to the last commit ("[tmva][sofie] Fix big endian"), which
+byte-swapped raw_data initializers on big-endian platforms but left a
+few gaps:
+
+- Initializers with data_location == EXTERNAL were still read from the
+  external weights file without swapping, silently producing
+  byte-reversed weights on big-endian machines.
+
+- The type switch only handled FLOAT, DOUBLE, INT32 and INT64. One-byte
+  types (BOOL, UINT8, INT8), which parse fine on little-endian via
+  plain memcpy, now threw on big-endian, and the other fixed-width
+  types (INT16, UINT16, UINT32, UINT64) were rejected as well.
+
+- The swap loops dereferenced the protobuf string buffer through
+  reinterpret_cast'ed uint32_t*/uint64_t* pointers, which is a
+  misaligned access on strict-alignment targets (e.g. SPARC) since
+  the buffer carries no alignment guarantee.
+
+Replace the four copy-pasted swap loops with a width-dispatched helper,
+CopyLEToHost, that plain-copies 1-byte element types and byte-swaps
+2/4/8-byte elements through a memcpy'd temporary (no misaligned loads,
+valid for in-place use), and call it from both the raw_data and the
+external-data paths.
+
+🤖 Done with the help of AI
+---
+ tmva/sofie_parsers/src/RModelParser_ONNX.cxx | 73 ++++++++++++--------
+ 1 file changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+index ac4cc7d5740..1c14d12ba30 100644
+--- a/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
++++ b/tmva/sofie_parsers/src/RModelParser_ONNX.cxx
+@@ -4,6 +4,7 @@
+ 
+ #include <stdexcept>
+ #include <string>
++#include <cstring>
+ #include <memory>
+ #include <cassert>
+ #include <iostream>
+@@ -155,6 +156,45 @@ struct ExtractDataFromTP<int64_t> {
+    }
+ };
+ 
++#ifndef R__BYTESWAP
++namespace {
++
++// Copy nbytes from source to dest, byte-swapping each N-byte element. The
++// temporary avoids misaligned loads from the protobuf string buffer and makes
++// in-place swapping (dest == source) valid.
++template <std::size_t N>
++void CopyBswap(void *dest, const void *source, std::size_t nbytes)
++{
++   using value_type = typename RByteSwap<N>::value_type;
++   auto dst = static_cast<unsigned char *>(dest);
++   auto src = static_cast<const unsigned char *>(source);
++   for (std::size_t k = 0; k < nbytes; k += N) {
++      value_type v;
++      std::memcpy(&v, src + k, N);
++      v = RByteSwap<N>::bswap(v);
++      std::memcpy(dst + k, &v, N);
++   }
++}
++
++// Copy a buffer of little-endian tensor elements to host (big-endian) byte order
++void CopyLEToHost(void *dest, const void *source, std::size_t nbytes, ETensorType tensor_type)
++{
++   switch (GetTypeSize(tensor_type)) {
++   case 1:
++      if (dest != source)
++         std::memcpy(dest, source, nbytes);
++      break;
++   case 2: CopyBswap<2>(dest, source, nbytes); break;
++   case 4: CopyBswap<4>(dest, source, nbytes); break;
++   case 8: CopyBswap<8>(dest, source, nbytes); break;
++   default:
++      throw std::runtime_error("Data type " + ConvertTypeToString(tensor_type) + " in tensor is not supported!\n");
++   }
++}
++
++} // anonymous namespace
++#endif
++
+ std::shared_ptr<void> RModelParser_ONNX::GetInitializedTensorData(onnx::TensorProto *tensorproto, size_t tensor_size, ETensorType tensor_type)
+ {
+ 
+@@ -172,34 +212,7 @@ std::shared_ptr<void> RModelParser_ONNX::GetInitializedTensorData(onnx::TensorPr
+          std::memcpy(data.get(), tensorproto->raw_data().c_str(), tensor_size);
+ #else
+          // big-endian architectures - need to swap bytes
+-         switch (tensor_type) {
+-            case ETensorType::FLOAT:
+-               for (std::size_t k = 0; k < tensor_size / sizeof(float); ++k)
+-                  (reinterpret_cast<typename RByteSwap<sizeof(float)>::value_type *>(data.get()))[k] =
+-                     RByteSwap<sizeof(float)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(float)>::value_type *>(
+-                        tensorproto->raw_data().c_str()))[k]);
+-               break;
+-            case ETensorType::DOUBLE:
+-               for (std::size_t k = 0; k < tensor_size / sizeof(double); ++k)
+-                  (reinterpret_cast<typename RByteSwap<sizeof(double)>::value_type *>(data.get()))[k] =
+-                     RByteSwap<sizeof(double)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(double)>::value_type *>(
+-                        tensorproto->raw_data().c_str()))[k]);
+-               break;
+-            case ETensorType::INT32:
+-               for (std::size_t k = 0; k < tensor_size / sizeof(int32_t); ++k)
+-                  (reinterpret_cast<typename RByteSwap<sizeof(int32_t)>::value_type *>(data.get()))[k] =
+-                     RByteSwap<sizeof(int32_t)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(int32_t)>::value_type *>(
+-                        tensorproto->raw_data().c_str()))[k]);
+-               break;
+-            case ETensorType::INT64:
+-               for (std::size_t k = 0; k < tensor_size / sizeof(int64_t); ++k)
+-                  (reinterpret_cast<typename RByteSwap<sizeof(int64_t)>::value_type *>(data.get()))[k] =
+-                     RByteSwap<sizeof(int64_t)>::bswap((reinterpret_cast<const typename RByteSwap<sizeof(int64_t)>::value_type *>(
+-                        tensorproto->raw_data().c_str()))[k]);
+-               break;
+-            default:
+-               throw std::runtime_error("Data type " + ConvertTypeToString(tensor_type) + " in tensor is not supported!\n");
+-         }
++         CopyLEToHost(data.get(), tensorproto->raw_data().c_str(), tensor_size, tensor_type);
+ #endif
+       } else {
+          // case tensor data are stored as specific types and not in raw_data
+@@ -262,6 +275,10 @@ std::shared_ptr<void> RModelParser_ONNX::GetInitializedTensorData(onnx::TensorPr
+ 
+       fDataFile.seekg(offset);
+       fDataFile.read(reinterpret_cast<char *>(data.get()), buffer_size);
++#ifndef R__BYTESWAP
++      // external data is stored little-endian like raw_data - swap in place
++      CopyLEToHost(data.get(), data.get(), buffer_size, tensor_type);
++#endif
+    }
+ 
+    return data;
+-- 
+2.55.0
+
diff --git a/root.spec b/root.spec
index e316729..0b03a05 100644
--- a/root.spec
+++ b/root.spec
@@ -38,9 +38,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/.*/lib.*\\.so$
 
 Name:		root
-Version:	6.40.02
+Version:	6.40.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -87,14 +87,15 @@ Patch6:		%{name}-Save-memory-Do-not-link-to-LLVM-libraries-in-parallel.patch
 Patch7:		%{name}-Revert-cppyy-Mark-addressof-test-as-xfail-on-modules.patch
 #		Adjust stressGraphics reference
 Patch8:		%{name}-Adjust-stressGraphics-reference.patch
-#		https://github.com/root-project/root/pull/22722
-Patch9:		%{name}-Use-different-output-filenames-in-tests-pdftitle.cxx.patch
 #		https://github.com/root-project/root/pull/22723
-Patch10:	%{name}-tmva-sofie-Fix-big-endian.patch
+Patch9:		%{name}-tmva-sofie-Fix-big-endian.patch
+Patch10:	%{name}-tmva-sofie-Complete-big-endian-support-for-ONNX-init.patch
 #		https://github.com/root-project/root/pull/22724
 Patch11:	%{name}-core-The-old-TUUID-constructor-can-create-either-ver.patch
 Patch12:	%{name}-tree-df-Do-not-fail-test-on-32-bit-due-to-mis-aligne.patch
 Patch13:	%{name}-tree-nt-Compare-size-to-the-size-of-the-struct.patch
+#		https://github.com/root-project/root/pull/23188
+Patch14:	%{name}-pdf-Fix-calculation-of-kerning-distances-in-generate.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -426,7 +427,7 @@ Obsoletes:	%{name}-notebook < 6.32.00
 #		Package renamed (jupyroot is now a submodule)
 %py_provides	python3-jupyroot
 Obsoletes:	python3-jupyroot < 6.40.00
-Requires:	js-jsroot >= 7.11
+Requires:	js-jsroot >= 7.11.1
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 10
 #		jupyter-notebook not available in RHEL/EPEL
 #		some functionality missing
@@ -1194,7 +1195,7 @@ access to http based storage such as webdav and S3.
 Summary:	HTTP server extension for ROOT
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-io%{?_isa} = %{version}-%{release}
-Requires:	js-jsroot >= 7.11
+Requires:	js-jsroot >= 7.11.1
 #		Library split (net-httpsniff from net-http)
 Obsoletes:	%{name}-net-http < 6.14.00
 
@@ -1341,41 +1342,22 @@ automatic hardware detection mechanism that this library contains.
 %package roofit-hs3
 Summary:	RooFit HS3
 License:	BSD-2-Clause
+#		roofit-jsoninterface was merged with roofit-hs3
+Provides:	%{name}-roofit-jsoninterface = %{version}-%{release}
+Obsoletes:	%{name}-roofit-jsoninterface < 6.40.04
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist%{?_isa} = %{version}-%{release}
 Requires:	%{name}-hist-factory%{?_isa} = %{version}-%{release}
 Requires:	%{name}-matrix%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit%{?_isa} = %{version}-%{release}
 Requires:	%{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires:	%{name}-roofit-jsoninterface%{?_isa} = %{version}-%{release}
 
 %description roofit-hs3
 When using RooFit, statistical models can be conveniently handled and
 stored as a RooWorkspace. However, for the sake of interoperability
 with other statistical frameworks, and also ease of manipulation, it
 may be useful to store statistical models in text form. This library
-sets out to achieve exactly that, exporting to and importing from JSON
-and YML.
-
-%package roofit-jsoninterface
-Summary:	JSON interface to RooFit
-License:	BSD-2-Clause
-Requires:	%{name}-core%{?_isa} = %{version}-%{release}
-
-%description roofit-jsoninterface
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains the JSON interface to RooFit.
+sets out to achieve exactly that, exporting to and importing from JSON.
 
 %package roofit-codegen
 Summary:	Code generation support for RooFit
@@ -1963,6 +1945,7 @@ This package contains a library for histogramming in ROOT 7.
 %patch -P11 -p1
 %patch -P12 -p1
 %patch -P13 -p1
+%patch -P14 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * ftgl
@@ -2423,9 +2406,6 @@ popd
 #
 # - tutorial-visualisation-webcanv-fonts_ttf.cxx:
 #   Requires web graphics
-#
-# - tmva-sofie-test-TestCladAutodiff
-#   Fails often...
 excluded="\
 test-stressIOPlugins-http|\
 test-stressIOPlugins-xroot|\
@@ -2461,8 +2441,7 @@ tutorial-machine_learning-tmva100_DataPreparation-py|\
 test-webgui-ping|\
 test-stressgraphics-firefox-skip3d|\
 test-stressgraphics-svg|\
-tutorial-visualisation-webcanv-fonts_ttf.cxx|\
-tmva-sofie-test-TestCladAutodiff"
+tutorial-visualisation-webcanv-fonts_ttf.cxx"
 
 %if %{?rhel}%{!?rhel:0} == 9
 # - pyunittests-bindings-pyroot-cppyy-cppyy-test-datatypes
@@ -3315,11 +3294,6 @@ fi
 %{_libdir}/%{name}/libRooFitHS3_rdict.pcm
 %dir %{_includedir}/%{name}/RooFitHS3
 
-%files roofit-jsoninterface -f includelist-roofit-jsoninterface
-%{_libdir}/%{name}/libRooFitJSONInterface.*
-%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
-%dir %{_includedir}/%{name}/RooFit
-
 %files roofit-codegen -f includelist-roofit-codegen
 %{_libdir}/%{name}/libRooFitCodegen.*
 %{_libdir}/%{name}/libRooFitCodegen_rdict.pcm
@@ -3567,6 +3541,13 @@ fi
 %endif
 
 %changelog
+* Sat Aug 29 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.40.04-1
+- Update to 6.40.04
+- The root-roofit-jsoninterface package was merged with root-roofit-hs3
+- Fix calculation of kerning distances in generated PDF files
+- Dropped patches: 1
+- New patches: 2
+
 * Wed Aug 26 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.40.02-5
 - Use the system civetweb library since it now supports web sockets
 - Drop the davix module for Fedora 45+ (davix will soon be retired)
diff --git a/sources b/sources
index f863ce7..a9df00b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (root-6.40.02.tar.xz) = 8a815a24db14a4160be00c21d275d5b527573b02844568b0f549f236c2b481c7ad3f43076a9e862a740c7b0784b2bfb54461d2c0d7eec2816f56d4428aa1c811
+SHA512 (root-6.40.04.tar.xz) = 674ea3de3f58d3bde15637925bec80984552cb5c4f6259ec68c2f7dc566014d9a3b2ee005e0f89b5cf20d9e5188dc5c9185d886a6701e315bb4771b068939282
 SHA512 (root-testfiles.tar.xz) = 4bb7f8ca00b1427ba49f6428e9cfe5908a2ffdd2ce4134d3bc169a0629198352b5500fe0cf92c121d148e5af41f7016c96038a77794a4d37d94e6ec0a9d75670
 SHA512 (clad-2.3.tar.gz) = 2d7e008ad88dd9e4b44d73e3187f8b1883e475845f5ac2d3b2c8e728508422e1e60e279940fefe322995751490f61f7d4768498c3660f9afa1206cc0e83bea33