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.162 by dlange, Thu May 14 07:56:00 2009 UTC

# Line 20 | Line 20 | 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 58 | Line 64 | Requires: libtiff
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   mkdir -p %i
# Line 194 | Line 214 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
214   <doc type=BuildSystem::ToolDoc version=1.0>
215   <Tool name=roothistmatrix version=%v>
216   <info url="http://root.cern.ch/root/"></info>
197 – <lib name=Gpad>
198 – <lib name=Graf>
217   <lib name=Hist>
218   <lib name=Matrix>
219   <use name=ROOTCore>
220   </Tool>
221   EOF_TOOLFILE
222  
223 + # rootgpad toolfile
224 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
225 + <doc type=BuildSystem::ToolDoc version=1.0>
226 + <Tool name=rootgpad version=%v>
227 + <info url="http://root.cern.ch/root/"></info>
228 + <lib name=Gpad>
229 + <lib name=Graf>
230 + <use name=roothistmatrix>
231 + </Tool>
232 + EOF_TOOLFILE
233 +
234   # rootphysics toolfile
235   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
236   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 220 | Line 249 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
249   <lib name=TreePlayer>
250   <lib name=Graf3d>
251   <lib name=Postscript>
252 < <use name=ROOTPhysics>
252 > <use name=rootgpad>
253   </Tool>
254   EOF_TOOLFILE
255  
# Line 247 | Line 276 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
276   <use name=qt>
277   <use name=libjpg>
278   <use name=libpng>
279 < <use name=ROOT>
279 > <use name=rootgpad>
280   </Tool>
281   EOF_TOOLFILE
282  
# Line 269 | Line 298 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
298   <Tool name=rootminuit version=%v>
299   <info url="http://root.cern.ch/root/"></info>
300   <lib name=Minuit>
301 < <use name=ROOT>
301 > <use name=rootgpad>
302   </Tool>
303   EOF_TOOLFILE
304  
# Line 279 | Line 308 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308   <Tool name=rootminuit2 version=%v>
309   <info url="http://root.cern.ch/root/"></info>
310   <lib name=Minuit2>
311 < <use name=ROOT>
311 > <use name=rootgpad>
312   </Tool>
313   EOF_TOOLFILE
314  
# Line 308 | Line 337 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
337   <Tool name=roothtml version=%v>
338   <info url="http://root.cern.ch/root/"></info>
339   <lib name=Html>
340 < <use name=RootHistMatrix>
340 > <use name=rootgpad>
341   </Tool>
342   EOF_TOOLFILE
343  
# Line 320 | Line 349 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
349   <lib name=RooFit>
350   <lib name=RooFitCore>
351   <use name=ROOTMinuit>
323 – <use name=ROOTHtml>
352   </Tool>
353   EOF_TOOLFILE
354  
# Line 341 | Line 369 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
369   <info url="http://root.cern.ch/root/"></info>
370   <lib name=TMVA>
371   <use name=ROOTMLP>
372 + <use name=rootminuit>
373   </Tool>
374   EOF_TOOLFILE
375  

Diff Legend

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