From 27dd599357abc3a4560b7c45f76f5adbf39f70e0 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Aug 30 2010 04:29:57 +0000 Subject: - Update to 5.26.00d - Improved doc generation script --- diff --git a/.gitignore b/.gitignore index da6658b..bdb49b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -root-5.26.00c.tar.gz +root-5.26.00d.tar.gz diff --git a/root-cern-filename.patch b/root-cern-filename.patch new file mode 100644 index 0000000..7efe061 --- /dev/null +++ b/root-cern-filename.patch @@ -0,0 +1,23 @@ +diff -ur root-5.26.00d.orig/tutorials/tree/cernbuild.C root-5.26.00d/tutorials/tree/cernbuild.C +--- root-5.26.00d.orig/tutorials/tree/cernbuild.C 2010-08-24 13:29:47.000000000 +0200 ++++ root-5.26.00d/tutorials/tree/cernbuild.C 2010-08-29 10:20:56.069801363 +0200 +@@ -18,6 +18,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()); + dir.ReplaceAll("cernbuild.C",""); + dir.ReplaceAll("/./","/"); +@@ -70,7 +71,10 @@ + tree->Write(); + + fclose(fp); +- if (get) return hfile; + delete hfile; ++ if (get) { ++ hfile = TFile::Open(filename); ++ return hfile; ++ } + return 0; + } diff --git a/root-cern-ppc.patch b/root-cern-ppc.patch new file mode 100644 index 0000000..dfba748 --- /dev/null +++ b/root-cern-ppc.patch @@ -0,0 +1,11 @@ +--- 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-html.C b/root-html.C index 249ba16..0fe9c46 100644 --- a/root-html.C +++ b/root-html.C @@ -1,8 +1,17 @@ { gEnv->SetValue("Root.PluginPath", "@PWD@/etc/plugins"); - gSystem->AddIncludePath("@PWD@/include"); - gSystem->AddIncludePath("@PWD@/cint/cint/include"); - gSystem->AddIncludePath("@PWD@/cint/cint/stl"); + 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"); + gInterpreter->AddIncludePath("@PWD@/include"); + gInterpreter->AddIncludePath("@PWD@/cint/cint/include"); + gInterpreter->AddIncludePath("@PWD@/cint/cint/stl"); + gInterpreter->AddIncludePath("@PWD@/cint/cint/lib"); + #include + #include + #include + #include gROOT->GetPluginManager()->LoadHandlersFromPluginDirs(""); gROOT->GetPluginManager()->AddHandler("TVirtualPS","image", "TImageDump","Postscript", @@ -13,6 +22,7 @@ gROOT->GetPluginManager()->AddHandler("TVirtualGraphPainter", "*", "TGraphPainter","GraphPainter", "TGraphPainter()"); + delete (TFile*) gROOT->ProcessLine(".x tutorials/hsimple.C"); THtml html; html.SetProductName("ROOT"); html.SetEtcDir("@PWD@/etc/html"); diff --git a/root-no-2dfit-example.patch b/root-no-2dfit-example.patch deleted file mode 100644 index ff3b147..0000000 --- a/root-no-2dfit-example.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur root-5.24.00b.orig/hist/hist/src/TGraph2D.cxx root-5.24.00b/hist/hist/src/TGraph2D.cxx ---- root-5.24.00b.orig/hist/hist/src/TGraph2D.cxx 2009-10-11 22:39:45.000000000 +0200 -+++ root-5.24.00b/hist/hist/src/TGraph2D.cxx 2009-11-30 23:18:50.892771913 +0100 -@@ -155,14 +155,6 @@ - End_Macro - Begin_Html - --2D graphs can be fitted as shown by the following example: -- --End_Html --Begin_Macro(source) --../../../tutorials/fit/graph2dfit.C --End_Macro --Begin_Html -- - Example showing the PCOL option. - - End_Html diff --git a/root-no-candlechart-example.patch b/root-no-candlechart-example.patch deleted file mode 100644 index a95df9b..0000000 --- a/root-no-candlechart-example.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur root-5.24.00b.orig/tree/treeviewer/src/TParallelCoord.cxx root-5.24.00b/tree/treeviewer/src/TParallelCoord.cxx ---- root-5.24.00b.orig/tree/treeviewer/src/TParallelCoord.cxx 2009-10-11 22:39:38.000000000 +0200 -+++ root-5.24.00b/tree/treeviewer/src/TParallelCoord.cxx 2009-11-30 22:21:44.200770648 +0100 -@@ -71,24 +71,6 @@ -

Candle chart:

-

- TParallelCoord can also be used to display a candle chart. In that mode, every variable is drawn in the same scale. The candle chart can be combined with the parallel coordinates mode, drawing the candle sticks over the axes. --End_Html --Begin_Macro(source) --{ -- TCanvas *c1 = new TCanvas("c1"); -- 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"); -- TParallelCoordVar* grade = (TParallelCoordVar*)para->GetVarList()->FindObject("Grade"); -- grade->AddRange(new TParallelCoordRange(grade,11.5,14)); -- para->AddSelection("less30"); -- para->GetCurrentSelection()->SetLineColor(kViolet); -- TParallelCoordVar* age = (TParallelCoordVar*)para->GetVarList()->FindObject("Age"); -- age->AddRange(new TParallelCoordRange(age,21,30)); -- return c1; --} --End_Macro --Begin_Html -

Some references: -

    -
  • Alfred Inselberg's Homepage , with Visual Tutorial, History, Selected Publications and Applications.
    • diff --git a/root-no-earth-example.patch b/root-no-earth-example.patch deleted file mode 100644 index 14566e8..0000000 --- a/root-no-earth-example.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur root-5.24.00b.orig/hist/histpainter/src/THistPainter.cxx root-5.24.00b/hist/histpainter/src/THistPainter.cxx ---- root-5.24.00b.orig/hist/histpainter/src/THistPainter.cxx 2009-10-11 22:39:45.000000000 +0200 -+++ root-5.24.00b/hist/histpainter/src/THistPainter.cxx 2009-12-01 06:43:25.556769440 +0100 -@@ -1417,12 +1411,6 @@ - - - --End_Html --Begin_Macro(source) --../../../tutorials/graphics/earth.C --End_Macro --Begin_Html -- - -

    The LEGO options

    - diff --git a/root-no-hbar-example.patch b/root-no-hbar-example.patch deleted file mode 100644 index 546e640..0000000 --- a/root-no-hbar-example.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur root-5.24.00b.orig/hist/histpainter/src/THistPainter.cxx root-5.24.00b/hist/histpainter/src/THistPainter.cxx ---- root-5.24.00b.orig/hist/histpainter/src/THistPainter.cxx 2009-10-11 22:39:45.000000000 +0200 -+++ root-5.24.00b/hist/histpainter/src/THistPainter.cxx 2009-11-30 22:14:15.540020376 +0100 -@@ -933,12 +933,6 @@ -
- - --End_Html --Begin_Macro(source) --../../../tutorials/hist/hbars.C --End_Macro --Begin_Html -- - To control the bar width (default is the bin width) TH1::SetBarWidth() - should be used. -
diff --git a/root-no-multipalette-example.patch b/root-no-multipalette-example.patch deleted file mode 100644 index 99d756b..0000000 --- a/root-no-multipalette-example.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur root-5.26.00.orig/core/base/src/TColor.cxx root-5.26.00/core/base/src/TColor.cxx ---- root-5.26.00.orig/core/base/src/TColor.cxx 2009-12-14 20:17:59.000000000 +0100 -+++ root-5.26.00/core/base/src/TColor.cxx 2010-01-13 10:45:45.189319077 +0100 -@@ -230,11 +230,7 @@ -

- As only one palette is active, one need to use TExec to be able to - display plots using differents palettes on the same pad. --The following macro illustrate this feature. --End_Html --Begin_Macro(source) --../../../tutorials/graphs/multipalette.C --End_Macro */ -+End_Html */ - - - //______________________________________________________________________________ -Endast i root-5.26.00/core/base/src: TColor.cxx~ diff --git a/root.spec b/root.spec index 13d5471..9ab3f70 100644 --- a/root.spec +++ b/root.spec @@ -11,9 +11,9 @@ %endif Name: root -Version: 5.26.00c +Version: 5.26.00d %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 4%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework Group: Applications/Engineering @@ -22,8 +22,8 @@ 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 # mv root root-%{version} -# rm -rf root-%{version}/fonts # tar -z -c -f root-%{version}.tar.gz root-%{version} Source0: %{name}-%{version}.tar.gz # Script to extract the list of include files in a subpackage @@ -51,13 +51,12 @@ Patch5: %{name}-dpm-rfio.patch # Missing explicit linking # (backported from root svn trunk) Patch6: %{name}-missing-explicit-link.patch -# Remove things that fail during doc generation: -Patch10: %{name}-split-latex.patch -Patch11: %{name}-no-2dfit-example.patch -Patch12: %{name}-no-hbar-example.patch -Patch13: %{name}-no-earth-example.patch -Patch14: %{name}-no-candlechart-example.patch -Patch15: %{name}-no-multipalette-example.patch +# Can't split latex markup into multiple lines +Patch7: %{name}-split-latex.patch +# Fix broken macro +Patch8: %{name}-cern-filename.patch +# Workaround for broken Form() on ppc +Patch9: %{name}-cern-ppc.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 @@ -91,6 +90,9 @@ BuildRequires: mesa-libGLU-devel BuildRequires: postgresql-devel BuildRequires: python-devel BuildRequires: qt-devel +%if %{?fedora}%{!?fedora:0} >= 14 +BuildRequires: qt-webkit-devel +%endif BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: openssl-devel @@ -848,12 +850,9 @@ package to use root with GNU Emacs. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -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 \ @@ -895,6 +894,9 @@ sed s/"plateau."/"plateau"/ -i test/stressFit.cxx iconv -f macintosh -t utf-8 README/CREDITS | sed s/È/é/ > README/CREDITS.new mv README/CREDITS.new README/CREDITS +# Typo in documentation +sed s/SePalette/SetPalette/g -i hist/histpainter/src/THistPainter.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 @@ -938,6 +940,11 @@ sed '/CopyFileFromEtcDir("ROOT.css");/a\ CopyFileFromEtcDir("root-banner.png");\ CopyFileFromEtcDir("rootdrawing-logo.png");' -i html/src/THtml.cxx +# 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 + %build unset QTDIR unset QTLIB @@ -1095,6 +1102,7 @@ ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_sitearch}`/libRuby.so \ # 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 @@ -1946,6 +1954,10 @@ fi %{emacs_lispdir}/root/*.el %changelog +* Fri Aug 27 2010 Mattias Ellert - 5.26.00d-1 +- Update to 5.26.00d +- Improved doc generation script + * Mon Aug 02 2010 Mattias Ellert - 5.26.00c-4 - Don't remove the prec_stl directory - Create a separate tutorial package for the tutorial and test suite diff --git a/sources b/sources index b538a5e..dc8fad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7aa6ff3f5ba47593c1b6ab8df8307211 root-5.26.00c.tar.gz +9d82b8ab4bed56d65fa3cdf937bce7c0 root-5.26.00d.tar.gz