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.155 by elmer, Thu Apr 16 21:08:49 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  
19   %define cpu %(echo %cmsplatf | cut -d_ -f2)
20   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 43 | Line 44 | Requires: libtiff
44   %patch4 -p1
45   %patch5 -p1
46   %patch6 -p1
47 + %patch7 -p0
48 + %patch8 -p0
49 + %patch9 -p1
50 + %patch10 -p1
51  
52   %build
53   mkdir -p %i
# Line 143 | Line 148 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
148   <doc type=BuildSystem::ToolDoc version=1.0>
149   <Tool name=rootcore version=%v>
150   <info url="http://root.cern.ch/root/"></info>
146 – <lib name=Cint>
147 – <lib name=Core>
148 – <lib name=RIO>
149 – <lib name=Net>
151   <lib name=Tree>
152 + <lib name=Net>
153 + <lib name=Thread>
154 + <lib name=MathCore>
155 + <lib name=RIO>
156 + <lib name=Core>
157 + <lib name=Cint>
158   <Client>
159   <Environment name=ROOTCORE_BASE default="%i"></Environment>
160   <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
# Line 177 | Line 184 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
184   <doc type=BuildSystem::ToolDoc version=1.0>
185   <Tool name=roothistmatrix version=%v>
186   <info url="http://root.cern.ch/root/"></info>
187 + <lib name=Gpad>
188 + <lib name=Graf>
189   <lib name=Hist>
190   <lib name=Matrix>
191   <use name=ROOTCore>
# Line 199 | Line 208 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
208   <Tool name=rootgraphics version=%v>
209   <info url="http://root.cern.ch/root/"></info>
210   <lib name=TreePlayer>
202 – <lib name=Gpad>
211   <lib name=Graf3d>
204 – <lib name=Graf>
205 – <lib name=Hist>
206 – <lib name=Matrix>
207 – <lib name=Physics>
212   <lib name=Postscript>
213 < <use name=ROOTCore>
213 > <use name=ROOTPhysics>
214   </Tool>
215   EOF_TOOLFILE
216  
# Line 228 | Line 232 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
232   <Tool name=rootinteractive version=%v>
233   <info url="http://root.cern.ch/root/"></info>
234   <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>
235   <lib name=GQt>
236 + <lib name=Gui>
237   <use name=qt>
238   <use name=libjpg>
239   <use name=libpng>
# Line 248 | Line 241 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
241   </Tool>
242   EOF_TOOLFILE
243  
251 –
244   # rootmath toolfile
245   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
246   <doc type=BuildSystem::ToolDoc version=1.0>
247   <Tool name=rootmath version=%v>
248   <info url="http://root.cern.ch/root/"></info>
257 – <lib name=MathCore>
258 – <lib name=MathMore>
249   <lib name=GenVector>
250 + <lib name=MathMore>
251   <use name=ROOTCore>
252   <use name=gsl>
253   </Tool>
# Line 307 | Line 298 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
298   <Tool name=roothtml version=%v>
299   <info url="http://root.cern.ch/root/"></info>
300   <lib name=Html>
301 < <use name=ROOT>
301 > <use name=RootHistMatrix>
302   </Tool>
303   EOF_TOOLFILE
304  
# Line 316 | Line 307 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
307   <doc type=BuildSystem::ToolDoc version=1.0>
308   <Tool name=rootroofit version=%v>
309   <info url="http://root.cern.ch/root/"></info>
319 – <lib name=RooFitCore>
310   <lib name=RooFit>
311 + <lib name=RooFitCore>
312   <use name=ROOTMinuit>
313   <use name=ROOTHtml>
314   </Tool>
# Line 329 | Line 320 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
320   <Tool name=rootmlp version=%v>
321   <info url="http://root.cern.ch/root/"></info>
322   <lib name=MLP>
323 < <use name=ROOT>
323 > <use name=RootGraphics>
324   </Tool>
325   EOF_TOOLFILE
326  
# Line 348 | Line 339 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
339   <doc type=BuildSystem::ToolDoc version=1.0>
340   <Tool name=rootthread version=%v>
341   <info url="http://root.cern.ch/root/"></info>
351 – <lib name=Thread>
342   <use name=ROOTCore>
343   </Tool>
344   EOF_TOOLFILE

Diff Legend

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