ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/root.spec
(Generate patch)

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.157 by dlange, Tue May 5 03:19:51 2009 UTC vs.
Revision 1.169 by elmer, Tue Jul 7 15:06:48 2009 UTC

# Line 3 | Line 3
3   ## INITENV SET ROOTSYS %i
4   #Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
5   Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6 + %define closingbrace )
7 + %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo flase;; esac)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
# Line 20 | Line 22 | Patch12: root-5.22-00a-smatrix
22   Patch13: root-5.22-00a-fireworks1
23   Patch14: root-5.22-00a-Reflex-gendict_selclass
24   Patch15: root-5.22-00a-MatrixInversion
25 + Patch16: root-5.22-00a-gcc44
26 + Patch17: root-5.22-00a-fireworks2
27 + Patch18: root-5.22-00a-fireworks3
28 + Patch19: root-5.22-00a-TBranchElement
29 + Patch20: root-5.22-00a-tmplt
30 + Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
31 + Patch22: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
32  
33   %define cpu %(echo %cmsplatf | cut -d_ -f2)
34   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
35  
36   Requires: gccxml gsl castor libjpg dcap pcre python
37  
38 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
38 > %if "%online" != "true"
39   Requires: qt openssl mysql libpng zlib libungif xrootd
40   %else
41   %define skiplibtiff true
# Line 58 | Line 67 | Requires: libtiff
67   %patch13 -p1
68   %patch14 -p0
69   %patch15 -p0
70 + # patch16 is compiler version dependent, see below
71 + %patch17 -p1
72 + %patch18 -p1
73 + %patch19 -p0
74 + %patch20 -p0
75 + %patch21 -p0
76 + # work around patch issue...
77 + rm graf3d/gl/src/gl2ps.c
78 + # patch22 is compiler version dependent, see below
79 +
80 + case %gccver in
81 +  4.3.*)
82 + %patch22 -p1
83 +  ;;
84 +  4.4.*)
85 + %patch16 -p1
86 +  ;;
87 + esac
88  
89   %build
90 +
91   mkdir -p %i
92   export ROOTSYS=%_builddir/root
93  
94 < %if "%cmsplatf" == "slc4onl_ia32_gcc346"
94 > %if "%online" == "true"
95   # Build without mysql, and use system qt.
96   # Also skip xrootd and odbc for online case:
97  
98 < EXTRA_CONFIG_ARGS="
98 > EXTRA_CONFIG_ARGS="--with-f77=/usr
99               --disable-mysql
100               --disable-xrootd
101               --disable-odbc
102 <             --enable-qt"
102 >             --disable-qt --disable-qtgsi"
103   %else
104 < EXTRA_CONFIG_ARGS="
104 > EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
105               --with-xrootd=$XROOTD_ROOT
106               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
107               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
108               --with-ssl-incdir=${OPENSSL_ROOT}/include
109 <             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
109 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib
110 >             --enable-qtgsi"
111   %endif
112  
113 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
85 <             --enable-table
113 > CONFIG_ARGS="--enable-table
114               --disable-builtin-pcre
115               --disable-builtin-freetype
116               --disable-builtin-zlib
117               --with-gccxml=${GCCXML_ROOT}
118               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
119               --enable-explicitlink
92 –             --enable-qtgsi
120               --enable-mathmore
121               --enable-reflex  
122               --enable-cintex
# Line 116 | Line 143 | case $(uname)-$(uname -p) in
143    Linux-i*86)
144      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
145    Darwin*)
146 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
146 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
147    Linux-ppc64*)
148      ./configure linux $CONFIG_ARGS --disable-rfio;;
149   esac
# Line 194 | Line 221 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
221   <doc type=BuildSystem::ToolDoc version=1.0>
222   <Tool name=roothistmatrix version=%v>
223   <info url="http://root.cern.ch/root/"></info>
197 – <lib name=Gpad>
198 – <lib name=Graf>
224   <lib name=Hist>
225   <lib name=Matrix>
226   <use name=ROOTCore>
227   </Tool>
228   EOF_TOOLFILE
229  
230 + # rootgpad toolfile
231 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
232 + <doc type=BuildSystem::ToolDoc version=1.0>
233 + <Tool name=rootgpad version=%v>
234 + <info url="http://root.cern.ch/root/"></info>
235 + <lib name=Gpad>
236 + <lib name=Graf>
237 + <use name=roothistmatrix>
238 + </Tool>
239 + EOF_TOOLFILE
240 +
241   # rootphysics toolfile
242   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
243   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 220 | Line 256 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
256   <lib name=TreePlayer>
257   <lib name=Graf3d>
258   <lib name=Postscript>
259 < <use name=ROOTPhysics>
259 > <use name=rootgpad>
260   </Tool>
261   EOF_TOOLFILE
262  
# Line 247 | Line 283 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
283   <use name=qt>
284   <use name=libjpg>
285   <use name=libpng>
286 < <use name=ROOT>
286 > <use name=rootgpad>
287   </Tool>
288   EOF_TOOLFILE
289  
# Line 269 | Line 305 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
305   <Tool name=rootminuit version=%v>
306   <info url="http://root.cern.ch/root/"></info>
307   <lib name=Minuit>
308 < <use name=ROOT>
308 > <use name=rootgpad>
309   </Tool>
310   EOF_TOOLFILE
311  
# Line 279 | Line 315 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
315   <Tool name=rootminuit2 version=%v>
316   <info url="http://root.cern.ch/root/"></info>
317   <lib name=Minuit2>
318 < <use name=ROOT>
318 > <use name=rootgpad>
319   </Tool>
320   EOF_TOOLFILE
321  
# Line 308 | Line 344 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
344   <Tool name=roothtml version=%v>
345   <info url="http://root.cern.ch/root/"></info>
346   <lib name=Html>
347 < <use name=RootHistMatrix>
347 > <use name=rootgpad>
348   </Tool>
349   EOF_TOOLFILE
350  
# Line 320 | Line 356 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
356   <lib name=RooFit>
357   <lib name=RooFitCore>
358   <use name=ROOTMinuit>
323 – <use name=ROOTHtml>
359   </Tool>
360   EOF_TOOLFILE
361  
# Line 341 | Line 376 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
376   <info url="http://root.cern.ch/root/"></info>
377   <lib name=TMVA>
378   <use name=ROOTMLP>
379 + <use name=rootminuit>
380   </Tool>
381   EOF_TOOLFILE
382  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines