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.155 by elmer, Thu Apr 16 21:08:49 2009 UTC vs.
Revision 1.163 by andreasp, Tue May 19 09:01:05 2009 UTC

# Line 15 | Line 15 | Patch7:  root-5.22-00a-Reflex-Class
15   Patch8:  root-5.22-00a-Cintex
16   Patch9:  root-5.22-00a-roofit-silence-static-printout
17   Patch10: root-5.22-00a-TMVA-just-shut-the-hell-up
18 + Patch11: root-5.22-00a-th1
19 + Patch12: root-5.22-00a-smatrix
20 + Patch13: root-5.22-00a-fireworks1
21 + Patch14: root-5.22-00a-Reflex-gendict_selclass
22 + Patch15: root-5.22-00a-MatrixInversion
23 + Patch16: root-5.22-00a-gcc44
24 + Patch17: root-5.22-00a-fireworks2
25 + Patch18: root-5.22-00a-fireworks3
26 + Patch19: root-5.22-00a-TBranchElement
27 + Patch20: root-5.22-00a-tmplt
28 + Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
29  
30   %define cpu %(echo %cmsplatf | cut -d_ -f2)
31   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 48 | Line 59 | Requires: libtiff
59   %patch8 -p0
60   %patch9 -p1
61   %patch10 -p1
62 <
62 > %patch11 -p1
63 > %patch12 -p1
64 > %patch13 -p1
65 > %patch14 -p0
66 > %patch15 -p0
67 > %patch16 -p1
68 > %patch17 -p1
69 > %patch18 -p1
70 > %patch19 -p0
71 > %patch20 -p0
72 > %patch21 -p0
73 > # work around patch issue...
74 > rm graf3d/gl/src/gl2ps.c
75 >
76 > case %gccver in
77 >  4.4)
78 > %patch16 -p1
79 >  ;;
80 > esac
81 >
82   %build
83 +
84   mkdir -p %i
85   export ROOTSYS=%_builddir/root
86  
# Line 106 | Line 137 | case $(uname)-$(uname -p) in
137    Linux-i*86)
138      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
139    Darwin*)
140 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
140 >    rm ${LIBJPG_ROOT}/lib/libjpeg.dylib
141 >    rm ${LIBTIFF_ROOT}/lib/libtiff.dylib
142 >    rm ${LIBPNG_ROOT}/lib/libpng.dylib
143 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
144    Linux-ppc64*)
145      ./configure linux $CONFIG_ARGS --disable-rfio;;
146   esac
# Line 184 | Line 218 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218   <doc type=BuildSystem::ToolDoc version=1.0>
219   <Tool name=roothistmatrix version=%v>
220   <info url="http://root.cern.ch/root/"></info>
187 – <lib name=Gpad>
188 – <lib name=Graf>
221   <lib name=Hist>
222   <lib name=Matrix>
223   <use name=ROOTCore>
224   </Tool>
225   EOF_TOOLFILE
226  
227 + # rootgpad toolfile
228 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
229 + <doc type=BuildSystem::ToolDoc version=1.0>
230 + <Tool name=rootgpad version=%v>
231 + <info url="http://root.cern.ch/root/"></info>
232 + <lib name=Gpad>
233 + <lib name=Graf>
234 + <use name=roothistmatrix>
235 + </Tool>
236 + EOF_TOOLFILE
237 +
238   # rootphysics toolfile
239   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
240   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 210 | Line 253 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
253   <lib name=TreePlayer>
254   <lib name=Graf3d>
255   <lib name=Postscript>
256 < <use name=ROOTPhysics>
256 > <use name=rootgpad>
257   </Tool>
258   EOF_TOOLFILE
259  
# Line 237 | Line 280 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
280   <use name=qt>
281   <use name=libjpg>
282   <use name=libpng>
283 < <use name=ROOT>
283 > <use name=rootgpad>
284   </Tool>
285   EOF_TOOLFILE
286  
# Line 259 | Line 302 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
302   <Tool name=rootminuit version=%v>
303   <info url="http://root.cern.ch/root/"></info>
304   <lib name=Minuit>
305 < <use name=ROOT>
305 > <use name=rootgpad>
306   </Tool>
307   EOF_TOOLFILE
308  
# Line 269 | Line 312 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
312   <Tool name=rootminuit2 version=%v>
313   <info url="http://root.cern.ch/root/"></info>
314   <lib name=Minuit2>
315 < <use name=ROOT>
315 > <use name=rootgpad>
316   </Tool>
317   EOF_TOOLFILE
318  
# Line 298 | Line 341 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
341   <Tool name=roothtml version=%v>
342   <info url="http://root.cern.ch/root/"></info>
343   <lib name=Html>
344 < <use name=RootHistMatrix>
344 > <use name=rootgpad>
345   </Tool>
346   EOF_TOOLFILE
347  
# Line 310 | Line 353 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
353   <lib name=RooFit>
354   <lib name=RooFitCore>
355   <use name=ROOTMinuit>
313 – <use name=ROOTHtml>
356   </Tool>
357   EOF_TOOLFILE
358  
# Line 331 | Line 373 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
373   <info url="http://root.cern.ch/root/"></info>
374   <lib name=TMVA>
375   <use name=ROOTMLP>
376 + <use name=rootminuit>
377   </Tool>
378   EOF_TOOLFILE
379  

Diff Legend

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