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.185 by elmer, Wed Dec 9 12:59:11 2009 UTC vs.
Revision 1.190 by eulisse, Mon Feb 15 17:40:07 2010 UTC

# Line 25 | Line 25 | Patch15: root-5.22-00d-fireworks5
25   Patch16: root-5.22-00d-genreflex_python26_popen3
26   Patch17: root-5.22-00d-fireworks6
27   Patch18: root-5.22-00d-linker-gnu-hash-style
28 < Patch19: root-5.22-00d-TFile-version3-Init
28 > Patch19: root-5.22-00d-TFile-version3-Init
29 > Patch20: root-5.22-00d-cint-namespace
30  
31   %define cpu %(echo %cmsplatf | cut -d_ -f2)
32  
# Line 76 | Line 77 | rm graf3d/gl/src/gl2ps.c.orig
77   %patch16 -p1
78   %patch17 -p1
79   %patch19 -p1
80 + %patch20 -p1
81  
82   case %gccver in
83    4.3.*)
# Line 264 | Line 266 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
266    </tool>
267   EOF_TOOLFILE
268  
269 < # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
270 < # have been removed for the moment)
269 > # rootinteractive toolfile (GQt/qt lib dependencies
270 > # have been moved to rootqt.xml)
271   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
272    <tool name="rootinteractive" version="%v">
273      <info url="http://root.cern.ch/root/"/>
274      <lib name="Rint"/>
273    <lib name="GQt"/>
275      <lib name="Gui"/>
275    <use name="qt"/>
276      <use name="libjpg"/>
277      <use name="libpng"/>
278      <use name="rootgpad"/>
279    </tool>
280   EOF_TOOLFILE
281  
282 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
283 +  <tool name="rootqt" version="%v">
284 +    <info url="http://root.cern.ch/root/"/>
285 +    <lib name="GQt"/>
286 +    <use name="qt"/>
287 +  </tool>
288 + EOF_TOOLFILE
289 +
290   # rootmath toolfile
291   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
292    <tool name="rootmath" version="%v">

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines