[root/f17] Update to 5.32.01
Mattias Ellert
ellert at fedoraproject.org
Sat Mar 3 09:27:48 UTC 2012
commit f53cf6e9e30045aa2532e0b78c7c7670f7e9422d
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Mar 3 10:27:27 2012 +0100
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(-)
---
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 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");
+ 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.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 at 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 at lists.fedoraproject.org> - 5.32.00-3
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list