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.145 by elmer, Thu Feb 12 23:28:10 2009 UTC vs.
Revision 1.195 by elmer, Thu Apr 8 15:28:15 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00a
1 > ### RPM lcg root 5.22.00d
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
3 > ## INITENV SET ROOTSYS %i
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 + %define closingbrace )
7 + %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9 < Patch0:  root-5.18-00-libpng
10 < Patch1:  root-5.21-04-CINT-maxlongline
11 < Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
9 > Patch0: root-5.18-00-libpng
10 > Patch1: root-5.21-04-CINT-maxlongline
11 > Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
12 > Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
13 > Patch4: root-5.22-00d-fireworks-graf3d-gui
14 > Patch5: root-5.22-00a-roofit-silence-static-printout
15 > Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16 > Patch7: root-5.22-00a-th1
17 > Patch8: root-5.22-00d-makelib-ldl
18 > Patch9: root-5.22-00a-fireworks1
19 > Patch10: root-5.22-00a-gcc44
20 > Patch11: root-5.22-00a-fireworks2
21 > Patch12: root-5.22-00a-fireworks3
22 > Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23 > Patch14: root-5.22-00a-fireworks4
24 > 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
29 > Patch20: root-5.22-00d-cint-namespace
30 > Patch21: root-5.22-00d-fireworks7
31 > Patch22: root-5.22-00d-TMath-Vavilov
32 > Patch23: root-5.22-00d-TBranchElement-dropped-data-member
33  
34   %define cpu %(echo %cmsplatf | cut -d_ -f2)
12 %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
35  
36   Requires: gccxml gsl castor libjpg dcap pcre python
37  
38 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
39 < Requires: qt openssl mysql libpng zlib libungif xrootd
38 > %if "%online" != "true"
39 > Requires: qt openssl libpng zlib libungif xrootd
40   %else
41   %define skiplibtiff true
42   %endif
# Line 32 | Line 54 | Requires: libtiff
54   %patch0 -p1
55   %patch1 -p1
56   %patch2 -p1
57 + %patch3 -p1
58 + %patch4 -p1
59 +
60 + %patch5 -p1
61 + %patch6 -p1
62 + %patch7 -p1
63 + %patch8 -p1
64 + %patch9 -p1
65 +
66 + # patch10 is compiler version dependent, see below
67 + %patch11 -p1
68 + %patch12 -p1
69 + # patch13 is compiler version dependent, see below
70 +
71 + # work around patch issue...
72 + rm graf3d/gl/src/gl2ps.c
73 + %patch14 -p1
74 + #work around patch issues in patch14(?)
75 + rm graf3d/eve/inc/TEveLegoOverlay.h.orig
76 + rm graf3d/eve/src/TEveLegoOverlay.cxx
77 + rm graf3d/gl/inc/gl2ps.h.orig
78 + rm graf3d/gl/src/gl2ps.c.orig
79 + %patch15 -p1
80 + %patch16 -p1
81 + %patch17 -p1
82 + %patch19 -p1
83 + %patch20 -p1
84 + %patch21 -p1
85 + %patch22 -p1
86 + %patch23 -p1
87 +
88 + case %gccver in
89 +  4.3.*)
90 + %patch13 -p1
91 +  ;;
92 +  4.4.*)
93 + %patch10 -p1
94 +  ;;
95 + esac
96 +
97 + # The following patch can only be applied on SLC5 or later (extra linker
98 + # options only available with the SLC5 binutils)
99 + case %cmsplatf in
100 +  slc5_* | slc5onl_* )
101 + %patch18 -p1
102 +  ;;
103 + esac
104  
105   %build
106 +
107   mkdir -p %i
108   export ROOTSYS=%_builddir/root
109 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
110  
111 < %if "%cmsplatf" == "slc4onl_ia32_gcc346"
112 < # Build without mysql, and use system qt.
42 < # Also skip xrootd and odbc for online case:
111 > %if "%online" == "true"
112 > # Use system qt. Also skip xrootd and odbc for online case:
113  
114 < EXTRA_CONFIG_ARGS="
45 <             --disable-mysql
114 > EXTRA_CONFIG_ARGS="--with-f77=/usr
115               --disable-xrootd
116               --disable-odbc
117 <             --enable-qt"
117 >             --disable-qt --disable-qtgsi"
118   %else
119 < EXTRA_CONFIG_ARGS="
119 > EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
120               --with-xrootd=$XROOTD_ROOT
52             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
121               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
122               --with-ssl-incdir=${OPENSSL_ROOT}/include
123 <             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
123 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib
124 >             --enable-qtgsi"
125   %endif
126  
127 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
59 <             --enable-table
127 > CONFIG_ARGS="--enable-table
128               --disable-builtin-pcre
129               --disable-builtin-freetype
130               --disable-builtin-zlib
131               --with-gccxml=${GCCXML_ROOT}
132 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
132 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
133               --enable-explicitlink
66             --enable-qtgsi
134               --enable-mathmore
135               --enable-reflex  
136               --enable-cintex
137               --enable-minuit2
71             --enable-roofit
138               --disable-ldap
139               --disable-krb5
140               --with-gsl-incdir=${GSL_ROOT}/include
# Line 76 | Line 142 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
142               --with-dcap-libdir=${DCAP_ROOT}/lib
143               --with-dcap-incdir=${DCAP_ROOT}/include
144               --disable-pgsql
145 +             --disable-mysql
146               --disable-xml ${EXTRA_CONFIG_ARGS}"
147  
148 < #case %gccver in
82 < #  4.*)
83 < #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
84 < #  ;;
85 < #esac
86 <
87 < case $(uname)-$(uname -p) in
148 > case $(uname)-$(uname -m) in
149    Linux-x86_64)
150      ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
151    Linux-i*86)
152      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
153    Darwin*)
154 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
154 >    case %cmsplatf in
155 >    *_ia32_* )
156 >      comparch=i386 ;;
157 >    *_amd64_* )
158 >      comparch=x86_64 ;;
159 >    * )
160 >      comparch=ppc ;;
161 >    esac
162 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
163 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
164    Linux-ppc64*)
165      ./configure linux $CONFIG_ARGS --disable-rfio;;
166   esac
167  
168 < make  %makeprocesses
168 > case %cmsplatf in
169 >  osx*)
170 >   makeopts=
171 >  ;;
172 >  *)
173 >   makeopts="%makeprocesses"
174 >  ;;
175 > esac
176 >
177 > make $makeopts
178   make cintdlls
179 +
180   %install
181   # Override installers if we are using GNU fileutils cp.  On OS X
182   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 118 | Line 198 | cp -r cint/reflex/python/genreflex $ROOT
198   # SCRAM ToolBox toolfile
199   mkdir -p %i/etc/scram.d
200   # rootcore toolfile
201 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore
202 < <doc type=BuildSystem::ToolDoc version=1.0>
203 < <Tool name=rootcore version=%v>
204 < <info url="http://root.cern.ch/root/"></info>
205 < <lib name=Cint>
206 < <lib name=Core>
207 < <lib name=RIO>
208 < <lib name=Net>
209 < <lib name=Tree>
210 < <Client>
211 < <Environment name=ROOTCORE_BASE default="%i"></Environment>
212 < <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
213 < <Environment name=INCLUDE default="$ROOTCORE_BASE/include"></Environment>
214 < <Environment name=INCLUDE default="$ROOTCORE_BASE/cint"></Environment>
215 < </Client>
216 < <use name=sockets>
217 < <use name=pcre>
218 < <use name=zlib>
219 < <Runtime name=PATH value="$ROOTCORE_BASE/bin" type=path>
220 < <Runtime name=ROOTSYS value="$ROOTCORE_BASE/">
221 < <Runtime name=PYTHONPATH value="$ROOTCORE_BASE/lib" type=path>
222 < </Tool>
201 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore.xml
202 >  <tool name="rootcore" version="%v">
203 >    <info url="http://root.cern.ch/root/"/>
204 >    <lib name="Tree"/>
205 >    <lib name="Net"/>
206 >    <lib name="Thread"/>
207 >    <lib name="MathCore"/>
208 >    <lib name="RIO"/>
209 >    <lib name="Core"/>
210 >    <lib name="Cint"/>
211 >    <client>
212 >      <environment name="ROOTCORE_BASE" default="%i"/>
213 >      <environment name="LIBDIR" default="$ROOTCORE_BASE/lib"/>
214 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/include"/>
215 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/cint"/>
216 >    </client>
217 >    <runtime name="PATH" value="$ROOTCORE_BASE/bin" type="path"/>
218 >    <runtime name="ROOTSYS" value="$ROOTCORE_BASE/"/>
219 >    <runtime name="PYTHONPATH" value="$ROOTCORE_BASE/lib" type="path"/>
220 >    <use name="sockets"/>
221 >    <use name="pcre"/>
222 >    <use name="zlib"/>
223 >  </tool>
224   EOF_TOOLFILE
225  
226   # root toolfile, alias for rootphysics. Using rootphysics is preferred.
227 < cat << \EOF_TOOLFILE >%i/etc/scram.d/root
228 < <doc type=BuildSystem::ToolDoc version=1.0>
229 < <Tool name=root version=%v>
230 < <info url="http://root.cern.ch/root/"></info>
231 < <use name=rootphysics>
151 < </Tool>
227 > cat << \EOF_TOOLFILE >%i/etc/scram.d/root.xml
228 >  <tool name="root" version="%v">
229 >    <info url="http://root.cern.ch/root/"/>
230 >    <use name="rootphysics"/>
231 >  </tool>
232   EOF_TOOLFILE
233  
234   # roothistmatrix toolfile
235 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix
236 < <doc type=BuildSystem::ToolDoc version=1.0>
237 < <Tool name=roothistmatrix version=%v>
238 < <info url="http://root.cern.ch/root/"></info>
239 < <lib name=Hist>
240 < <lib name=Matrix>
241 < <use name=ROOTCore>
242 < </Tool>
235 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
236 >  <tool name="roothistmatrix" version="%v">
237 >    <info url="http://root.cern.ch/root/"/>
238 >    <lib name="Hist"/>
239 >    <lib name="Matrix"/>
240 >    <use name="ROOTCore"/>
241 >  </tool>
242 > EOF_TOOLFILE
243 >
244 > # rootgpad toolfile
245 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
246 >  <tool name="rootgpad" version="%v">
247 >    <info url="http://root.cern.ch/root/"/>
248 >    <lib name="Gpad"/>
249 >    <lib name="Graf"/>
250 >    <use name="roothistmatrix"/>
251 >  </tool>
252   EOF_TOOLFILE
253  
254   # rootphysics toolfile
255 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
256 < <doc type=BuildSystem::ToolDoc version=1.0>
257 < <Tool name=rootphysics version=%v>
258 < <info url="http://root.cern.ch/root/"></info>
259 < <lib name=Physics>
260 < <use name=roothistmatrix>
172 < </Tool>
255 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics.xml
256 >  <tool name="rootphysics" version="%v">
257 >    <info url="http://root.cern.ch/root/"/>
258 >    <lib name="Physics"/>
259 >    <use name="roothistmatrix"/>
260 >  </tool>
261   EOF_TOOLFILE
262  
263   # rootgraphics toolfile, identical to old "root" toolfile
264 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics
265 < <doc type=BuildSystem::ToolDoc version=1.0>
266 < <Tool name=rootgraphics version=%v>
267 < <info url="http://root.cern.ch/root/"></info>
268 < <lib name=TreePlayer>
269 < <lib name=Gpad>
270 < <lib name=Graf3d>
271 < <lib name=Graf>
184 < <lib name=Hist>
185 < <lib name=Matrix>
186 < <lib name=Physics>
187 < <lib name=Postscript>
188 < <use name=ROOTCore>
189 < </Tool>
264 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics.xml
265 >  <tool name="rootgraphics" version="%v">
266 >    <info url="http://root.cern.ch/root/"/>
267 >    <lib name="TreePlayer"/>
268 >    <lib name="Graf3d"/>
269 >    <lib name="Postscript"/>
270 >    <use name="rootgpad"/>
271 >  </tool>
272   EOF_TOOLFILE
273  
274   # rootcintex toolfile
275 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex
276 < <doc type=BuildSystem::ToolDoc version=1.0>
277 < <Tool name=rootcintex version=%v>
278 < <info url="http://root.cern.ch/root/"></info>
279 < <lib name=Cintex>
280 < <use name=ROOTRflx>
281 < <use name=ROOTCore>
282 < </Tool>
283 < EOF_TOOLFILE
284 <
285 < # rootinteractive toolfile
286 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
287 < <doc type=BuildSystem::ToolDoc version=1.0>
288 < <Tool name=rootinteractive version=%v>
289 < <info url="http://root.cern.ch/root/"></info>
290 < <lib name=Rint>
291 < <lib name=GQt>
292 < <use name=qt>
293 < <use name=libjpg>
294 < <use name=libpng>
295 < <use name=ROOT>
296 < </Tool>
275 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex.xml
276 >  <tool name="rootcintex" version="%v">
277 >    <info url="http://root.cern.ch/root/"/>
278 >    <lib name="Cintex"/>
279 >    <use name="ROOTRflx"/>
280 >    <use name="ROOTCore"/>
281 >  </tool>
282 > EOF_TOOLFILE
283 >
284 > # rootinteractive toolfile (GQt/qt lib dependencies
285 > # have been moved to rootqt.xml)
286 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
287 >  <tool name="rootinteractive" version="%v">
288 >    <info url="http://root.cern.ch/root/"/>
289 >    <lib name="Rint"/>
290 >    <lib name="Gui"/>
291 >    <use name="libjpg"/>
292 >    <use name="libpng"/>
293 >    <use name="rootgpad"/>
294 >  </tool>
295 > EOF_TOOLFILE
296 >
297 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
298 >  <tool name="rootqt" version="%v">
299 >    <info url="http://root.cern.ch/root/"/>
300 >    <lib name="GQt"/>
301 >    <use name="qt"/>
302 >  </tool>
303   EOF_TOOLFILE
304  
305   # rootmath toolfile
306 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
307 < <doc type=BuildSystem::ToolDoc version=1.0>
308 < <Tool name=rootmath version=%v>
309 < <info url="http://root.cern.ch/root/"></info>
310 < <lib name=MathCore>
311 < <lib name=MathMore>
312 < <lib name=GenVector>
313 < <use name=ROOTCore>
226 < <use name=gsl>
227 < </Tool>
306 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
307 >  <tool name="rootmath" version="%v">
308 >    <info url="http://root.cern.ch/root/"/>
309 >    <lib name="GenVector"/>
310 >    <lib name="MathMore"/>
311 >    <use name="ROOTCore"/>
312 >    <use name="gsl"/>
313 >  </tool>
314   EOF_TOOLFILE
315  
316   # rootminuit toolfile
317 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit
318 < <doc type=BuildSystem::ToolDoc version=1.0>
319 < <Tool name=rootminuit version=%v>
320 < <info url="http://root.cern.ch/root/"></info>
321 < <lib name=Minuit>
322 < <use name=ROOT>
237 < </Tool>
317 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit.xml
318 >  <tool name="rootminuit" version="%v">
319 >    <info url="http://root.cern.ch/root/"/>
320 >    <lib name="Minuit"/>
321 >    <use name="rootgpad"/>
322 >  </tool>
323   EOF_TOOLFILE
324  
325   # rootminuit2 toolfile
326 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2
327 < <doc type=BuildSystem::ToolDoc version=1.0>
328 < <Tool name=rootminuit2 version=%v>
329 < <info url="http://root.cern.ch/root/"></info>
330 < <lib name=Minuit2>
331 < <use name=ROOT>
247 < </Tool>
326 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2.xml
327 >  <tool name="rootminuit2" version="%v">
328 >    <info url="http://root.cern.ch/root/"/>
329 >    <lib name="Minuit2"/>
330 >    <use name="rootgpad"/>
331 >  </tool>
332   EOF_TOOLFILE
333  
334   # rootrflx toolfile
335 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx
336 < <doc type=BuildSystem::ToolDoc version=1.0>
337 < <Tool name=rootrflx version=%v>
338 < <info url="http://root.cern.ch/root/"></info>
339 < <lib name=Reflex>
340 < <Client>
341 < <Environment name=ROOTRFLX_BASE default="%i"></Environment>
342 < <Environment name=LIBDIR default="$ROOTRFLX_BASE/lib"></Environment>
343 < <Environment name=INCLUDE default="$ROOTRFLX_BASE/include"></Environment>
344 < </Client>
345 < <use name=sockets>
346 < <use name=gccxml>
347 < <Runtime name=PATH value="$ROOTRFLX_BASE/bin" type=path>
348 < <Runtime name=ROOTSYS value="$ROOTRFLX_BASE/">
349 < <Runtime name=GENREFLEX value="$ROOTRFLX_BASE/bin/genreflex">
266 < </Tool>
335 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx.xml
336 >  <tool name="rootrflx" version="%v">
337 >    <info url="http://root.cern.ch/root/"/>
338 >    <lib name="Reflex"/>
339 >    <client>
340 >      <environment name="ROOTRFLX_BASE" default="%i"/>
341 >      <environment name="LIBDIR" default="$ROOTRFLX_BASE/lib"/>
342 >      <environment name="INCLUDE" default="$ROOTRFLX_BASE/include"/>
343 >    </client>
344 >    <runtime name="PATH" value="$ROOTRFLX_BASE/bin" type="path"/>
345 >    <runtime name="ROOTSYS" value="$ROOTRFLX_BASE/"/>
346 >    <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/genreflex"/>
347 >    <use name="sockets"/>
348 >    <use name="gccxml"/>
349 >  </tool>
350   EOF_TOOLFILE
351  
352   # roothtml toolfile
353 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml
354 < <doc type=BuildSystem::ToolDoc version=1.0>
355 < <Tool name=roothtml version=%v>
356 < <info url="http://root.cern.ch/root/"></info>
357 < <lib name=Html>
358 < <use name=ROOT>
276 < </Tool>
277 < EOF_TOOLFILE
278 <
279 < # rootroofit toolfile
280 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
281 < <doc type=BuildSystem::ToolDoc version=1.0>
282 < <Tool name=rootroofit version=%v>
283 < <info url="http://root.cern.ch/root/"></info>
284 < <lib name=RooFitCore>
285 < <lib name=RooFit>
286 < <use name=ROOTMinuit>
287 < <use name=ROOTHtml>
288 < </Tool>
353 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml.xml
354 >  <tool name="roothtml" version="%v">
355 >    <info url="http://root.cern.ch/root/"/>
356 >    <lib name="Html"/>
357 >    <use name="rootgpad"/>
358 >  </tool>
359   EOF_TOOLFILE
360  
361   # rootmlp toolfile
362 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
363 < <doc type=BuildSystem::ToolDoc version=1.0>
364 < <Tool name=rootmlp version=%v>
365 < <info url="http://root.cern.ch/root/"></info>
366 < <lib name=MLP>
367 < <use name=ROOT>
298 < </Tool>
362 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp.xml
363 >  <tool name="rootmlp" version="%v">
364 >    <info url="http://root.cern.ch/root/"/>
365 >    <lib name="MLP"/>
366 >    <use name="RootGraphics"/>
367 >  </tool>
368   EOF_TOOLFILE
369  
370   # roottmva toolfile
371 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva
372 < <doc type=BuildSystem::ToolDoc version=1.0>
373 < <Tool name=roottmva version=%v>
374 < <info url="http://root.cern.ch/root/"></info>
375 < <lib name=TMVA>
376 < <use name=ROOTMLP>
377 < </Tool>
371 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva.xml
372 >  <tool name="roottmva" version="%v">
373 >    <info url="http://root.cern.ch/root/"/>
374 >    <lib name="TMVA"/>
375 >    <use name="ROOTMLP"/>
376 >    <use name="rootminuit"/>
377 >  </tool>
378   EOF_TOOLFILE
379  
380   # rootthread toolfile
381 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread
382 < <doc type=BuildSystem::ToolDoc version=1.0>
383 < <Tool name=rootthread version=%v>
384 < <info url="http://root.cern.ch/root/"></info>
385 < <lib name=Thread>
317 < <use name=ROOTCore>
318 < </Tool>
381 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread.xml
382 >  <tool name="rootthread" version="%v">
383 >    <info url="http://root.cern.ch/root/"/>
384 >    <use name="ROOTCore"/>
385 >  </tool>
386   EOF_TOOLFILE
387  
388   %post
389 < %{relocateConfig}etc/scram.d/root
323 < %{relocateConfig}etc/scram.d/rootcore
324 < %{relocateConfig}etc/scram.d/roothistmatrix
325 < %{relocateConfig}etc/scram.d/rootphysics
326 < %{relocateConfig}etc/scram.d/rootgraphics
327 < %{relocateConfig}etc/scram.d/rootcintex
328 < %{relocateConfig}etc/scram.d/rootinteractive
329 < %{relocateConfig}etc/scram.d/rootmath
330 < %{relocateConfig}etc/scram.d/rootminuit
331 < %{relocateConfig}etc/scram.d/rootminuit2
332 < %{relocateConfig}etc/scram.d/rootrflx
333 < %{relocateConfig}etc/scram.d/roothtml
334 < %{relocateConfig}etc/scram.d/rootroofit
335 < %{relocateConfig}etc/scram.d/rootmlp
336 < %{relocateConfig}etc/scram.d/roottmva
337 < %{relocateConfig}etc/scram.d/rootthread
389 > perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines