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.152 by dlange, Tue Apr 7 02:01:59 2009 UTC vs.
Revision 1.157 by dlange, Tue May 5 03:19:51 2009 UTC

# Line 4 | Line 4
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  
7 < Patch0:  root-5.18-00-libpng
7 > Patch0:  root-5.18-00-libpng
8   Patch1:  root-5.21-04-CINT-maxlongline
9   Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
10   Patch3:  root-5.22-00a-TMVA-shut-the-hell-up-again
# Line 14 | Line 14 | Patch6:  root-5.22-00a-fireworks-graf3d-
14   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  
24   %define cpu %(echo %cmsplatf | cut -d_ -f2)
25   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 43 | Line 49 | Requires: libtiff
49   %patch4 -p1
50   %patch5 -p1
51   %patch6 -p1
52 <
52 > %patch7 -p0
53 > %patch8 -p0
54 > %patch9 -p1
55 > %patch10 -p1
56 > %patch11 -p1
57 > %patch12 -p1
58 > %patch13 -p1
59 > %patch14 -p0
60 > %patch15 -p0
61 >
62   %build
63   mkdir -p %i
64   export ROOTSYS=%_builddir/root
# Line 143 | Line 158 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
158   <doc type=BuildSystem::ToolDoc version=1.0>
159   <Tool name=rootcore version=%v>
160   <info url="http://root.cern.ch/root/"></info>
146 – <lib name=Cint>
147 – <lib name=Core>
148 – <lib name=RIO>
149 – <lib name=Net>
161   <lib name=Tree>
162 + <lib name=Net>
163 + <lib name=Thread>
164 + <lib name=MathCore>
165 + <lib name=RIO>
166 + <lib name=Core>
167 + <lib name=Cint>
168   <Client>
169   <Environment name=ROOTCORE_BASE default="%i"></Environment>
170   <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
# Line 177 | Line 194 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
194   <doc type=BuildSystem::ToolDoc version=1.0>
195   <Tool name=roothistmatrix version=%v>
196   <info url="http://root.cern.ch/root/"></info>
197 + <lib name=Gpad>
198 + <lib name=Graf>
199   <lib name=Hist>
200   <lib name=Matrix>
201   <use name=ROOTCore>
# Line 199 | Line 218 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218   <Tool name=rootgraphics version=%v>
219   <info url="http://root.cern.ch/root/"></info>
220   <lib name=TreePlayer>
202 – <lib name=Gpad>
221   <lib name=Graf3d>
204 – <lib name=Graf>
205 – <lib name=Hist>
206 – <lib name=Matrix>
207 – <lib name=Physics>
222   <lib name=Postscript>
223 < <use name=ROOTCore>
223 > <use name=ROOTPhysics>
224   </Tool>
225   EOF_TOOLFILE
226  
# Line 228 | Line 242 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
242   <Tool name=rootinteractive version=%v>
243   <info url="http://root.cern.ch/root/"></info>
244   <lib name=Rint>
231 – <use name=libjpg>
232 – <use name=libpng>
233 – <use name=ROOT>
234 – </Tool>
235 – EOF_TOOLFILE
236 –
237 – # rootinteractive2 toolfile (temporary, to allow access to Qt4)
238 – cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
239 – <doc type=BuildSystem::ToolDoc version=1.0>
240 – <Tool name=rootinteractive2 version=%v>
241 – <info url="http://root.cern.ch/root/"></info>
242 – <lib name=Rint>
245   <lib name=GQt>
246 + <lib name=Gui>
247   <use name=qt>
248   <use name=libjpg>
249   <use name=libpng>
# Line 248 | Line 251 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
251   </Tool>
252   EOF_TOOLFILE
253  
251 –
254   # rootmath toolfile
255   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
256   <doc type=BuildSystem::ToolDoc version=1.0>
257   <Tool name=rootmath version=%v>
258   <info url="http://root.cern.ch/root/"></info>
257 – <lib name=MathCore>
258 – <lib name=MathMore>
259   <lib name=GenVector>
260 + <lib name=MathMore>
261   <use name=ROOTCore>
262   <use name=gsl>
263   </Tool>
# Line 307 | Line 308 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308   <Tool name=roothtml version=%v>
309   <info url="http://root.cern.ch/root/"></info>
310   <lib name=Html>
311 < <use name=ROOT>
311 > <use name=RootHistMatrix>
312   </Tool>
313   EOF_TOOLFILE
314  
# Line 316 | Line 317 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
317   <doc type=BuildSystem::ToolDoc version=1.0>
318   <Tool name=rootroofit version=%v>
319   <info url="http://root.cern.ch/root/"></info>
319 – <lib name=RooFitCore>
320   <lib name=RooFit>
321 + <lib name=RooFitCore>
322   <use name=ROOTMinuit>
323   <use name=ROOTHtml>
324   </Tool>
# Line 329 | Line 330 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
330   <Tool name=rootmlp version=%v>
331   <info url="http://root.cern.ch/root/"></info>
332   <lib name=MLP>
333 < <use name=ROOT>
333 > <use name=RootGraphics>
334   </Tool>
335   EOF_TOOLFILE
336  
# Line 348 | Line 349 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
349   <doc type=BuildSystem::ToolDoc version=1.0>
350   <Tool name=rootthread version=%v>
351   <info url="http://root.cern.ch/root/"></info>
351 – <lib name=Thread>
352   <use name=ROOTCore>
353   </Tool>
354   EOF_TOOLFILE

Diff Legend

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