From f9dd6d5cb9ae45d30b37b39598cb02732470b214 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jun 10 2012 15:15:48 +0000 Subject: Update to 5.34.00 - New sub-package: root-io-gfal --- 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 + #endif +-#if !defined(__hpux) ++#if !defined(__USE_POSIX) && !defined(__hpux) + # if defined(__APPLE__) + # include + # 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 + #endif +-#if !defined(__hpux) ++#if !defined(__USE_POSIX) && !defined(__hpux) + #if defined(__APPLE__) + #include + #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 + #include + #include ++#include + #include + #include + #include 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 - 5.34.00-1 +- Update to 5.34.00 +- New sub-package: root-io-gfal + * Thu May 17 2012 Mattias Ellert - 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