[root] - Update to 5.26.00d - Improved doc generation script
Mattias Ellert
ellert at fedoraproject.org
Mon Aug 30 04:34:04 UTC 2010
commit 27dd599357abc3a4560b7c45f76f5adbf39f70e0
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Aug 30 06:29:57 2010 +0200
- Update to 5.26.00d
- Improved doc generation script
.gitignore | 2 +-
root-cern-filename.patch | 23 ++++++++++++++++++
root-cern-ppc.patch | 11 +++++++++
root-html.C | 16 ++++++++++--
root-no-2dfit-example.patch | 18 --------------
root-no-candlechart-example.patch | 28 ----------------------
root-no-earth-example.patch | 16 -------------
root-no-hbar-example.patch | 16 -------------
root-no-multipalette-example.patch | 17 --------------
root.spec | 44 ++++++++++++++++++++++-------------
sources | 2 +-
11 files changed, 77 insertions(+), 116 deletions(-)
---
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 at PWD@/include");
+ gSystem->AddIncludePath("-I at PWD@/cint/cint/include");
+ gSystem->AddIncludePath("-I at PWD@/cint/cint/stl");
+ gSystem->AddIncludePath("-I at 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",
"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.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 <mattias.ellert at fysast.uu.se> - 5.26.00d-1
+- Update to 5.26.00d
+- Improved doc generation script
+
* Mon Aug 02 2010 Mattias Ellert <mattias.ellert at 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
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
More information about the scm-commits
mailing list