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.107 by dlange, Sat Mar 8 02:24:13 2008 UTC vs.
Revision 1.194 by elmer, Mon Mar 29 11:46:34 2010 UTC

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