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.153 by muzaffar, Wed Apr 8 07:04:44 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 227 | 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>
230 – <use name=libjpg>
231 – <use name=libpng>
232 – <use name=ROOT>
233 – </Tool>
234 – EOF_TOOLFILE
235 –
236 – # rootinteractive2 toolfile (temporary, to allow access to Qt4)
237 – cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
238 – <doc type=BuildSystem::ToolDoc version=1.0>
239 – <Tool name=rootinteractive2 version=%v>
240 – <info url="http://root.cern.ch/root/"></info>
235   <lib name=GQt>
236   <lib name=Gui>
237   <use name=qt>
238 < <use name=RootInteractive>
238 > <use name=libjpg>
239 > <use name=libpng>
240 > <use name=ROOT>
241   </Tool>
242   EOF_TOOLFILE
243  
248 –
244   # rootmath toolfile
245   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
246   <doc type=BuildSystem::ToolDoc version=1.0>

Diff Legend

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