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.160 by dlange, Sat May 9 15:49:24 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  
28   %define cpu %(echo %cmsplatf | cut -d_ -f2)
29   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 48 | Line 57 | Requires: libtiff
57   %patch8 -p0
58   %patch9 -p1
59   %patch10 -p1
60 <
60 > %patch11 -p1
61 > %patch12 -p1
62 > %patch13 -p1
63 > %patch14 -p0
64 > %patch15 -p0
65 > %patch16 -p1
66 > %patch17 -p1
67 > %patch18 -p1
68 > %patch19 -p0
69 >
70 > case %gccver in
71 >  4.4)
72 > %patch16 -p1
73 >  ;;
74 > esac
75 >
76   %build
77   mkdir -p %i
78   export ROOTSYS=%_builddir/root
# Line 184 | Line 208 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
208   <doc type=BuildSystem::ToolDoc version=1.0>
209   <Tool name=roothistmatrix version=%v>
210   <info url="http://root.cern.ch/root/"></info>
187 – <lib name=Gpad>
188 – <lib name=Graf>
211   <lib name=Hist>
212   <lib name=Matrix>
213   <use name=ROOTCore>
214   </Tool>
215   EOF_TOOLFILE
216  
217 + # rootgpad toolfile
218 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
219 + <doc type=BuildSystem::ToolDoc version=1.0>
220 + <Tool name=rootgpad version=%v>
221 + <info url="http://root.cern.ch/root/"></info>
222 + <lib name=Gpad>
223 + <lib name=Graf>
224 + <use name=roothistmatrix>
225 + </Tool>
226 + EOF_TOOLFILE
227 +
228   # rootphysics toolfile
229   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
230   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 210 | Line 243 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
243   <lib name=TreePlayer>
244   <lib name=Graf3d>
245   <lib name=Postscript>
246 < <use name=ROOTPhysics>
246 > <use name=rootgpad>
247   </Tool>
248   EOF_TOOLFILE
249  
# Line 237 | Line 270 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
270   <use name=qt>
271   <use name=libjpg>
272   <use name=libpng>
273 < <use name=ROOT>
273 > <use name=rootgpad>
274   </Tool>
275   EOF_TOOLFILE
276  
# Line 259 | Line 292 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
292   <Tool name=rootminuit version=%v>
293   <info url="http://root.cern.ch/root/"></info>
294   <lib name=Minuit>
295 < <use name=ROOT>
295 > <use name=rootgpad>
296   </Tool>
297   EOF_TOOLFILE
298  
# Line 269 | Line 302 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
302   <Tool name=rootminuit2 version=%v>
303   <info url="http://root.cern.ch/root/"></info>
304   <lib name=Minuit2>
305 < <use name=ROOT>
305 > <use name=rootgpad>
306   </Tool>
307   EOF_TOOLFILE
308  
# Line 298 | Line 331 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
331   <Tool name=roothtml version=%v>
332   <info url="http://root.cern.ch/root/"></info>
333   <lib name=Html>
334 < <use name=RootHistMatrix>
334 > <use name=rootgpad>
335   </Tool>
336   EOF_TOOLFILE
337  
# Line 310 | Line 343 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
343   <lib name=RooFit>
344   <lib name=RooFitCore>
345   <use name=ROOTMinuit>
313 – <use name=ROOTHtml>
346   </Tool>
347   EOF_TOOLFILE
348  
# Line 331 | Line 363 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
363   <info url="http://root.cern.ch/root/"></info>
364   <lib name=TMVA>
365   <use name=ROOTMLP>
366 + <use name=rootminuit>
367   </Tool>
368   EOF_TOOLFILE
369  

Diff Legend

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