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.112 by dlange, Wed Apr 9 00:15:05 2008 UTC vs.
Revision 1.123 by andreasp, Wed Aug 27 19:07:52 2008 UTC

# Line 11 | Line 11 | Patch3: root-5.18-00a-TBufferXML
11   Patch4: root-5.18-00a-Cintex
12   Patch5: root-5.18-00a-Cintex2
13   Patch6: root-5.18-00a-TBufferFile
14 + Patch7: root-5.18-00a-cintexquickfix2
15 + Patch8: root-5.18-00a-gendict-performance
16 + Patch9: root-5.18-00a-TClass-classNameSize
17  
18   %define cpu %(echo %cmsplatf | cut -d_ -f2)
19   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
20  
21   Requires: gccxml gsl castor libjpg dcap pcre python
22  
23 < %if "%{?online_release:set}" != "set"
23 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
24   Requires: qt openssl mysql libpng zlib libungif xrootd
25   %else
26   %define skiplibtiff true
# Line 40 | Line 43 | Requires: libtiff
43   %patch4 -p0
44   %patch5 -p0
45   %patch6 -p0
46 + %patch7 -p0
47 + %patch8 -p1
48 + %patch9 -p0
49  
50   %build
51   mkdir -p %i
52   export ROOTSYS=%_builddir/root
53  
54 < %if "%{?online_release:set}" == "set"
54 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
55   # Build without mysql, and use system qt.
56   # Also skip xrootd and odbc for online case:
57  
# Line 148 | Line 154 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
154   </Tool>
155   EOF_TOOLFILE
156  
157 < # root toolfile
157 > # root toolfile, alias for rootphysics. Using rootphysics is preferred.
158   cat << \EOF_TOOLFILE >%i/etc/scram.d/root
159   <doc type=BuildSystem::ToolDoc version=1.0>
160   <Tool name=root version=%v>
161   <info url="http://root.cern.ch/root/"></info>
162 + <use name=rootphysics>
163 + </Tool>
164 + EOF_TOOLFILE
165 +
166 + # roothistmatrix toolfile
167 + cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix
168 + <doc type=BuildSystem::ToolDoc version=1.0>
169 + <Tool name=roothistmatrix version=%v>
170 + <info url="http://root.cern.ch/root/"></info>
171 + <lib name=Hist>
172 + <lib name=Matrix>
173 + <use name=ROOTCore>
174 + </Tool>
175 + EOF_TOOLFILE
176 +
177 + # rootphysics toolfile
178 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
179 + <doc type=BuildSystem::ToolDoc version=1.0>
180 + <Tool name=rootphysics version=%v>
181 + <info url="http://root.cern.ch/root/"></info>
182 + <lib name=Physics>
183 + <use name=roothistmatrix>
184 + </Tool>
185 + EOF_TOOLFILE
186 +
187 + # rootgraphics toolfile, identical to old "root" toolfile
188 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics
189 + <doc type=BuildSystem::ToolDoc version=1.0>
190 + <Tool name=rootgraphics version=%v>
191 + <info url="http://root.cern.ch/root/"></info>
192   <lib name=TreePlayer>
193   <lib name=Gpad>
194   <lib name=Graf3d>
# Line 296 | Line 332 | EOF_TOOLFILE
332   %post
333   %{relocateConfig}etc/scram.d/root
334   %{relocateConfig}etc/scram.d/rootcore
335 + %{relocateConfig}etc/scram.d/roothistmatrix
336 + %{relocateConfig}etc/scram.d/rootphysics
337 + %{relocateConfig}etc/scram.d/rootgraphics
338   %{relocateConfig}etc/scram.d/rootcintex
339   %{relocateConfig}etc/scram.d/rootinteractive
340   %{relocateConfig}etc/scram.d/rootmath

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines