From 01f8f751371ddd32f090295096dda1ff07850f5b Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Feb 13 2012 06:24:08 +0000 Subject: Update to 5.32.00 --- 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 Chi2FCN : public ::ROOT::Math::BasicFitMethodFunction { ++class Chi2FCN : public ROOT::Math::BasicFitMethodFunction { + + public: ++ typedef ROOT::Math::BasicFitMethodFunction BaseObjFunction; ++ typedef typename BaseObjFunction::BaseFunction BaseFunction; + +- +- +- typedef ::ROOT::Math::BasicFitMethodFunction BaseObjFunction; +- typedef typename BaseObjFunction::BaseFunction BaseFunction; +- +- //typedef typename ::ROOT::Math::ParamFunctionTrait::PFType IModelFunction; +- typedef ::ROOT::Math::IParamMultiFunction IModelFunction; ++ //typedef typename ROOT::Math::ParamFunctionTrait::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 LogLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction { ++class LogLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction { + + public: ++ typedef ROOT::Math::BasicFitMethodFunction BaseObjFunction; ++ typedef typename BaseObjFunction::BaseFunction BaseFunction; + +- +- +- typedef ::ROOT::Math::BasicFitMethodFunction 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 PoissonLikelihoodFCN : public ::ROOT::Math::BasicFitMethodFunction { ++class PoissonLikelihoodFCN : public ROOT::Math::BasicFitMethodFunction { + + public: ++ typedef ROOT::Math::BasicFitMethodFunction BaseObjFunction; ++ typedef typename BaseObjFunction::BaseFunction BaseFunction; + +- +- typedef ::ROOT::Math::BasicFitMethodFunction 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 #include #include 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 - 5.32.00-1 +- Update to 5.32.00 + * Fri Feb 10 2012 Petr Pisar - 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